Merge branch 'main' into owl-bot-copy-packages-google-maps-routeoptim…

…ization

.github/workflows/presubmit.yaml

@@ -9,6 +9,8 @@ jobs:
         node: [14, 16, 18, 20]
     steps:
       - uses: actions/checkout@v4
+        with:
+          fetch-depth: 300
       - uses: pnpm/action-setup@v2
         with:
           version: ^6.24.1

ci/run_conditional_tests.sh

@@ -37,7 +37,7 @@ if [ ${BUILD_TYPE} == "presubmit" ]; then
     GIT_DIFF_ARG="origin/main..."
 
     # Then fetch enough history for finding the common commit.
-    git fetch origin main --deepen=200
+    git fetch origin main --deepen=300
 
 elif [ ${BUILD_TYPE} == "continuous" ]; then
     # For continuous build, we want to know the difference in the last

packages/google-cloud-channel/README.md

@@ -44,7 +44,7 @@ Google APIs Client Libraries, in [Client Libraries Explained][explained].
 1.  [Select or create a Cloud Platform project][projects].
 1.  [Enable billing for your project][billing].
 1.  [Enable the Cloud Channel API API][enable_api].
-1.  [Set up authentication with a service account][auth] so you can access the
+1.  [Set up authentication][auth] so you can access the
     API from your local workstation.
 
 ### Installing the client library
@@ -296,4 +296,4 @@ See [LICENSE](https://github.com/googleapis/google-cloud-node/blob/main/LICENSE)
 [projects]: https://console.cloud.google.com/project
 [billing]: https://support.google.com/cloud/answer/6293499#enable-billing
 [enable_api]: https://console.cloud.google.com/flows/enableapi?apiid=cloudchannel.googleapis.com
-[auth]: https://cloud.google.com/docs/authentication/getting-started
+[auth]: https://cloud.google.com/docs/authentication/external/set-up-adc-local

packages/google-cloud-channel/protos/google/cloud/channel/v1/service.proto

@@ -1472,8 +1472,14 @@ message CheckCloudIdentityAccountsExistRequest {
   // Parent uses the format: accounts/{account_id}
   string parent = 1 [(google.api.field_behavior) = REQUIRED];
 
-  // Required. Domain to fetch for Cloud Identity account customer.
+  // Required. Domain to fetch for Cloud Identity account customers, including
+  // domain and team customers. For team customers, please use the domain for
+  // their emails.
   string domain = 2 [(google.api.field_behavior) = REQUIRED];
+
+  // Optional. Primary admin email to fetch for Cloud Identity account team
+  // customer.
+  string primary_admin_email = 4 [(google.api.field_behavior) = OPTIONAL];
 }
 
 // Entity representing a Cloud Identity account that may be
@@ -1494,6 +1500,13 @@ message CloudIdentityCustomerAccount {
 
   // If existing = true, the Cloud Identity ID of the customer.
   string customer_cloud_identity_id = 4;
+
+  // If existing = true, the type of the customer.
+  CloudIdentityInfo.CustomerType customer_type = 5;
+
+  // If existing = true, and is 2-tier customer, the channel partner of the
+  // customer.
+  string channel_partner_cloud_identity_id = 6;
 }
 
 // Response message for
@@ -1603,6 +1616,9 @@ message ImportCustomerRequest {
 
     // Required. Customer's Cloud Identity ID
     string cloud_identity_id = 3 [(google.api.field_behavior) = REQUIRED];
+
+    // Required. Customer's primary admin email.
+    string primary_admin_email = 8 [(google.api.field_behavior) = REQUIRED];
   }
 
   // Required. The resource name of the reseller's account.