Merge branch 'main' into new-library/merchantapi-AefQy

gapic-libraries-bom/pom.xml

@@ -782,6 +782,13 @@
         <type>pom</type>
         <scope>import</scope>
       </dependency>
+      <dependency>
+        <groupId>com.google.cloud</groupId>
+        <artifactId>google-cloud-networkservices-bom</artifactId>
+        <version>0.0.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-networkservices:current} -->
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
       <dependency>
         <groupId>com.google.cloud</groupId>
         <artifactId>google-cloud-notebooks-bom</artifactId>
@@ -864,6 +871,13 @@
         <type>pom</type>
         <scope>import</scope>
       </dependency>
+      <dependency>
+        <groupId>com.google.cloud</groupId>
+        <artifactId>google-cloud-privilegedaccessmanager-bom</artifactId>
+        <version>0.0.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-privilegedaccessmanager:current} -->
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
       <dependency>
         <groupId>com.google.cloud</groupId>
         <artifactId>google-cloud-profiler-bom</artifactId>

generation_config.yaml

@@ -1125,7 +1125,6 @@ libraries:
   issue_tracker: https://issuetracker.google.com/issues?q=status:open%20componentid:310170
   GAPICs:
   - proto_path: google/cloud/iot/v1
-
 - api_shortname: merchantapi
   name_pretty: Merchant API
   product_documentation: https://developers.google.com/merchant/api
@@ -1142,6 +1141,38 @@ libraries:
   - proto_path: google/shopping/merchant/datasources/v1beta
   library_name: java-shopping-merchant-datasources
   requires_billing: true
+- api_shortname: merchantapi
+  name_pretty: Merchant API
+  product_documentation: https://developers.google.com/merchant/api
+  api_description: Programmatically manage your Merchant Center accounts.
+  client_documentation: 
+    https://cloud.google.com/java/docs/reference/google-shopping-merchant-accounts/latest/overview
+  release_level: preview
+  distribution_name: com.google.shopping:google-shopping-merchant-accounts
+  api_id: merchantapi.googleapis.com
+  library_type: GAPIC_AUTO
+  group_id: com.google.shopping
+  cloud_api: false
+  GAPICs:
+  - proto_path: google/shopping/merchant/accounts/v1beta
+  library_name: java-shopping-merchant-accounts
+  requires_billing: true
+- api_shortname: merchantapi
+  name_pretty: Merchant API
+  product_documentation: https://developers.google.com/merchant/api
+  api_description: Programmatically manage your Merchant Center accounts.
+  client_documentation: 
+    https://cloud.google.com/java/docs/reference/google-shopping-merchant-promotions/latest/overview
+  release_level: preview
+  distribution_name: com.google.shopping:google-shopping-merchant-promotions
+  api_id: merchantapi.googleapis.com
+  library_type: GAPIC_AUTO
+  group_id: com.google.shopping
+  cloud_api: false
+  GAPICs:
+  - proto_path: google/shopping/merchant/promotions/v1beta
+  library_name: java-shopping-merchant-promotions
+  requires_billing: true
 - api_shortname: cloudkms
   name_pretty: Cloud Key Management Service
   product_documentation: https://cloud.google.com/kms
@@ -1429,6 +1460,24 @@ libraries:
   - proto_path: google/cloud/networkconnectivity/v1
   - proto_path: google/cloud/networkconnectivity/v1alpha1
 
+- api_shortname: networkservices
+  name_pretty: Network Services API
+  product_documentation: https://cloud.google.com/products/networking
+  api_description: Google Cloud offers a broad portfolio of networking services built
+    on top of planet-scale infrastructure that leverages automation, advanced AI,
+    and programmability, enabling enterprises to connect, scale, secure, modernize
+    and optimize their infrastructure.
+  client_documentation: 
+    https://cloud.google.com/java/docs/reference/google-cloud-networkservices/latest/overview
+  release_level: preview
+  distribution_name: com.google.cloud:google-cloud-networkservices
+  api_id: networkservices.googleapis.com
+  library_type: GAPIC_AUTO
+  group_id: com.google.cloud
+  cloud_api: true
+  GAPICs:
+  - proto_path: google/cloud/networkservices/v1
+  requires_billing: true
 - api_shortname: notebooks
   name_pretty: AI Platform Notebooks
   product_documentation: https://cloud.google.com/ai-platform-notebooks
@@ -1572,6 +1621,23 @@ libraries:
   GAPICs:
   - proto_path: google/cloud/privatecatalog/v1beta1
 
+- api_shortname: privilegedaccessmanager
+  name_pretty: Privileged Access Manager API
+  product_documentation: https://cloud.google.com/iam/docs/pam-overview
+  api_description: You can use Privileged Access Manager (PAM) to control just-in-time
+    temporary privilege elevation for select principals, and to view audit logs afterwards
+    to find out who had access to what and when.
+  client_documentation: 
+    https://cloud.google.com/java/docs/reference/google-cloud-privilegedaccessmanager/latest/overview
+  release_level: preview
+  distribution_name: com.google.cloud:google-cloud-privilegedaccessmanager
+  api_id: privilegedaccessmanager.googleapis.com
+  library_type: GAPIC_AUTO
+  group_id: com.google.cloud
+  cloud_api: true
+  GAPICs:
+  - proto_path: google/cloud/privilegedaccessmanager/v1
+  requires_billing: true
 - api_shortname: cloudprofiler
   name_pretty: Cloud Profiler
   product_documentation: https://cloud.google.com/profiler/docs

java-java-shopping-merchant-accounts/.OwlBot-hermetic.yaml

@@ -0,0 +1,35 @@
+# Copyright 2024 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+
+deep-remove-regex:
+- "/java-java-shopping-merchant-accounts/grpc-google-.*/src"
+- "/java-java-shopping-merchant-accounts/proto-google-.*/src"
+- "/java-java-shopping-merchant-accounts/google-.*/src"
+- "/java-java-shopping-merchant-accounts/samples/snippets/generated"
+
+deep-preserve-regex:
+- "/java-java-shopping-merchant-accounts/google-.*/src/test/java/com/google/cloud/.*/v.*/it/IT.*Test.java"
+
+deep-copy-regex:
+- source: "/google/shopping/merchant/accounts/(v.*)/.*-java/proto-google-.*/src"
+  dest: "/owl-bot-staging/java-java-shopping-merchant-accounts/$1/proto-google-shopping-merchant-accounts-$1/src"
+- source: "/google/shopping/merchant/accounts/(v.*)/.*-java/grpc-google-.*/src"
+  dest: "/owl-bot-staging/java-java-shopping-merchant-accounts/$1/grpc-google-shopping-merchant-accounts-$1/src"
+- source: "/google/shopping/merchant/accounts/(v.*)/.*-java/gapic-google-.*/src"
+  dest: "/owl-bot-staging/java-java-shopping-merchant-accounts/$1/google-shopping-merchant-accounts/src"
+- source: "/google/shopping/merchant/accounts/(v.*)/.*-java/samples/snippets/generated"
+  dest: "/owl-bot-staging/java-java-shopping-merchant-accounts/$1/samples/snippets/generated"
+
+api-name: merchantapi

java-java-shopping-merchant-accounts/.repo-metadata.json

@@ -0,0 +1,16 @@
+{
+  "api_shortname": "merchantapi",
+  "name_pretty": "Merchant API",
+  "product_documentation": "https://developers.google.com/merchant/api",
+  "api_description": "Programmatically manage your Merchant Center accounts.",
+  "client_documentation": "https://cloud.google.com/java/docs/reference/google-shopping-merchant-accounts/latest/overview",
+  "release_level": "preview",
+  "transport": "both",
+  "language": "java",
+  "repo": "googleapis/google-cloud-java",
+  "repo_short": "java-java-shopping-merchant-accounts",
+  "distribution_name": "com.google.shopping:google-shopping-merchant-accounts",
+  "api_id": "merchantapi.googleapis.com",
+  "library_type": "GAPIC_AUTO",
+  "requires_billing": true
+}