feat: [google-cloud-channel] Add support for primary_admin_email as customer_identity for ImportCustomer (#13126)

BEGIN_COMMIT_OVERRIDE
feat: Add support for primary_admin_email as customer_identity for
ImportCustomer
feat: Add support for importing team customer from a different reseller
feat: Add support to look up team customer Cloud Identity information
docs: Clarify the expected value of the domain field for team type
customers
END_COMMIT_OVERRIDE

- [ ] Regenerate this pull request now.

feat: Add support for importing team customer from a different reseller
feat: Add support to look up team customer Cloud Identity information
docs: Clarify the expected value of the domain field for team type
customers

PiperOrigin-RevId: 682051698

Source-Link:
googleapis/googleapis@b6a27d1

Source-Link:
googleapis/googleapis-gen@efd321b
Copy-Tag:
eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLWNoYW5uZWwvLk93bEJvdC55YW1sIiwiaCI6ImVmZDMyMWI2OWQ4ZTQwMzJjMjY5MGMxOWU4MTMxZDdiMTcwMmY5NzcifQ==

---------

Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>
Co-authored-by: ohmayr <omairnaveed@ymail.com>

Author: gcf-owl-bot[bot]

packages/google-cloud-channel/google/cloud/channel_v1/types/service.py

@@ -127,7 +127,12 @@ class CheckCloudIdentityAccountsExistRequest(proto.Message):
             the format: accounts/{account_id}
         domain (str):
             Required. Domain to fetch for Cloud Identity
-            account customer.
+            account customers, including domain and team
+            customers. For team customers, please use the
+            domain for their emails.
+        primary_admin_email (str):
+            Optional. Primary admin email to fetch for
+            Cloud Identity account team customer.
     """
 
     parent: str = proto.Field(
@@ -138,6 +143,10 @@ class CheckCloudIdentityAccountsExistRequest(proto.Message):
         proto.STRING,
         number=2,
     )
+    primary_admin_email: str = proto.Field(
+        proto.STRING,
+        number=4,
+    )
 
 
 class CloudIdentityCustomerAccount(proto.Message):
@@ -159,6 +168,11 @@ class CloudIdentityCustomerAccount(proto.Message):
         customer_cloud_identity_id (str):
             If existing = true, the Cloud Identity ID of
             the customer.
+        customer_type (google.cloud.channel_v1.types.CloudIdentityInfo.CustomerType):
+            If existing = true, the type of the customer.
+        channel_partner_cloud_identity_id (str):
+            If existing = true, and is 2-tier customer,
+            the channel partner of the customer.
     """
 
     existing: bool = proto.Field(
@@ -177,6 +191,15 @@ class CloudIdentityCustomerAccount(proto.Message):
         proto.STRING,
         number=4,
     )
+    customer_type: common.CloudIdentityInfo.CustomerType = proto.Field(
+        proto.ENUM,
+        number=5,
+        enum=common.CloudIdentityInfo.CustomerType,
+    )
+    channel_partner_cloud_identity_id: str = proto.Field(
+        proto.STRING,
+        number=6,
+    )
 
 
 class CheckCloudIdentityAccountsExistResponse(proto.Message):
@@ -373,6 +396,10 @@ class ImportCustomerRequest(proto.Message):
         cloud_identity_id (str):
             Required. Customer's Cloud Identity ID
 
+            This field is a member of `oneof`_ ``customer_identity``.
+        primary_admin_email (str):
+            Required. Customer's primary admin email.
+
             This field is a member of `oneof`_ ``customer_identity``.
         parent (str):
             Required. The resource name of the reseller's account.
@@ -413,6 +440,11 @@ class ImportCustomerRequest(proto.Message):
         number=3,
         oneof="customer_identity",
     )
+    primary_admin_email: str = proto.Field(
+        proto.STRING,
+        number=8,
+        oneof="customer_identity",
+    )
     parent: str = proto.Field(
         proto.STRING,
         number=1,

packages/google-cloud-channel/scripts/fixup_channel_v1_keywords.py

@@ -44,7 +44,7 @@ class channelCallTransformer(cst.CSTTransformer):
         'change_offer': ('name', 'offer', 'parameters', 'purchase_order_id', 'request_id', 'billing_account', ),
         'change_parameters': ('name', 'parameters', 'request_id', 'purchase_order_id', ),
         'change_renewal_settings': ('name', 'renewal_settings', 'request_id', ),
-        'check_cloud_identity_accounts_exist': ('parent', 'domain', ),
+        'check_cloud_identity_accounts_exist': ('parent', 'domain', 'primary_admin_email', ),
         'create_channel_partner_link': ('parent', 'channel_partner_link', ),
         'create_channel_partner_repricing_config': ('parent', 'channel_partner_repricing_config', ),
         'create_customer': ('parent', 'customer', ),
@@ -59,7 +59,7 @@ class channelCallTransformer(cst.CSTTransformer):
         'get_customer': ('name', ),
         'get_customer_repricing_config': ('name', ),
         'get_entitlement': ('name', ),
-        'import_customer': ('domain', 'cloud_identity_id', 'parent', 'overwrite_if_exists', 'auth_token', 'channel_partner_id', 'customer', ),
+        'import_customer': ('domain', 'cloud_identity_id', 'primary_admin_email', 'parent', 'overwrite_if_exists', 'auth_token', 'channel_partner_id', 'customer', ),
         'list_channel_partner_links': ('parent', 'page_size', 'page_token', 'view', ),
         'list_channel_partner_repricing_configs': ('parent', 'page_size', 'page_token', 'filter', ),
         'list_customer_repricing_configs': ('parent', 'page_size', 'page_token', 'filter', ),

packages/google-cloud-channel/tests/unit/gapic/channel_v1/test_cloud_channel_service.py

@@ -2110,6 +2110,7 @@ def test_check_cloud_identity_accounts_exist_non_empty_request_with_auto_populat
     request = service.CheckCloudIdentityAccountsExistRequest(
         parent="parent_value",
         domain="domain_value",
+        primary_admin_email="primary_admin_email_value",
     )
 
     # Mock the actual call within the gRPC stub, and fake the request.
@@ -2125,6 +2126,7 @@ def test_check_cloud_identity_accounts_exist_non_empty_request_with_auto_populat
         assert args[0] == service.CheckCloudIdentityAccountsExistRequest(
             parent="parent_value",
             domain="domain_value",
+            primary_admin_email="primary_admin_email_value",
         )
 
 
@@ -3397,6 +3399,7 @@ def test_import_customer_non_empty_request_with_auto_populated_field():
     request = service.ImportCustomerRequest(
         domain="domain_value",
         cloud_identity_id="cloud_identity_id_value",
+        primary_admin_email="primary_admin_email_value",
         parent="parent_value",
         auth_token="auth_token_value",
         channel_partner_id="channel_partner_id_value",
@@ -3414,6 +3417,7 @@ def test_import_customer_non_empty_request_with_auto_populated_field():
         assert args[0] == service.ImportCustomerRequest(
             domain="domain_value",
             cloud_identity_id="cloud_identity_id_value",
+            primary_admin_email="primary_admin_email_value",
             parent="parent_value",
             auth_token="auth_token_value",
             channel_partner_id="channel_partner_id_value",