Skip to content

Commit 419e5d9

Browse files
yoshi-code-botyoshi-code-bot
authored
Merge branch 'googleapis:main' into main
2 parents c4220bd + eff4e54 commit 419e5d9

File tree

2,350 files changed

+958459
-7352
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

2,350 files changed

+958459
-7352
lines changed

‎gapic-libraries-bom/pom.xml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1039,6 +1039,13 @@
10391039
<type>pom</type>
10401040
<scope>import</scope>
10411041
</dependency>
1042+
<dependency>
1043+
<groupId>com.google.cloud</groupId>
1044+
<artifactId>google-cloud-saasservicemgmt-bom</artifactId>
1045+
<version>0.0.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-saasservicemgmt:current} -->
1046+
<type>pom</type>
1047+
<scope>import</scope>
1048+
</dependency>
10421049
<dependency>
10431050
<groupId>com.google.cloud</groupId>
10441051
<artifactId>google-cloud-scheduler-bom</artifactId>

‎generation_config.yaml‎

Lines changed: 42 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
gapic_generator_version: 2.61.0
2-
googleapis_commitish: 09f2446e4a30d6d79dff93e14bbc992b855ebaaf
2+
googleapis_commitish: b0316578aaf7434e3c5bb93badd252f67aacf8d5
33
libraries_bom_version: 26.65.0
44

55
# the libraries are ordered with respect to library name, which is
@@ -1242,6 +1242,7 @@ libraries:
12421242
group_id: com.google.shopping
12431243
cloud_api: false
12441244
GAPICs:
1245+
- proto_path: google/shopping/merchant/issueresolution/v1
12451246
- proto_path: google/shopping/merchant/issueresolution/v1beta
12461247
library_name: java-shopping-merchant-issue-resolution
12471248
requires_billing: true
@@ -1259,6 +1260,7 @@ libraries:
12591260
group_id: com.google.shopping
12601261
cloud_api: false
12611262
GAPICs:
1263+
- proto_path: google/shopping/merchant/ordertracking/v1
12621264
- proto_path: google/shopping/merchant/ordertracking/v1beta
12631265
library_name: java-shopping-merchant-order-tracking
12641266
requires_billing: true
@@ -2028,6 +2030,22 @@ libraries:
20282030
GAPICs:
20292031
- proto_path: google/cloud/run/v2
20302032

2033+
- api_shortname: saasservicemgmt
2034+
name_pretty: SaaS Runtime API
2035+
product_documentation: https://cloud.google.com/saas-runtime/docs/overview
2036+
api_description: "Model, deploy, and operate your SaaS at scale.\t"
2037+
client_documentation:
2038+
https://cloud.google.com/java/docs/reference/google-cloud-saasservicemgmt/latest/overview
2039+
release_level: preview
2040+
distribution_name: com.google.cloud:google-cloud-saasservicemgmt
2041+
api_id: saasservicemgmt.googleapis.com
2042+
library_type: GAPIC_AUTO
2043+
group_id: com.google.cloud
2044+
cloud_api: true
2045+
GAPICs:
2046+
- proto_path: google/cloud/saasplatform/saasservicemgmt/v1beta1
2047+
requires_billing: true
2048+
rpc_documentation: https://cloud.google.com/saas-runtime/docs/apis
20312049
- api_shortname: cloudscheduler
20322050
name_pretty: Google Cloud Scheduler
20332051
product_documentation: https://cloud.google.com/scheduler/docs
@@ -2232,6 +2250,7 @@ libraries:
22322250
group_id: com.google.shopping
22332251
cloud_api: false
22342252
GAPICs:
2253+
- proto_path: google/shopping/merchant/accounts/v1
22352254
- proto_path: google/shopping/merchant/accounts/v1beta
22362255
library_name: shopping-merchant-accounts
22372256
requires_billing: true
@@ -2265,6 +2284,7 @@ libraries:
22652284
group_id: com.google.shopping
22662285
cloud_api: false
22672286
GAPICs:
2287+
- proto_path: google/shopping/merchant/datasources/v1
22682288
- proto_path: google/shopping/merchant/datasources/v1beta
22692289
library_name: shopping-merchant-datasources
22702290
requires_billing: true
@@ -2278,7 +2298,22 @@ libraries:
22782298
GAPICs:
22792299
- proto_path: google/shopping/merchant/inventories/v1
22802300
- proto_path: google/shopping/merchant/inventories/v1beta
2281-
2301+
- api_shortname: shopping-merchant-notifications
2302+
name_pretty: Merchant Notifications API
2303+
product_documentation: https://developers.google.com/merchant/api
2304+
api_description: Programmatically manage your Merchant Center accounts.
2305+
client_documentation:
2306+
https://cloud.google.com/java/docs/reference/google-shopping-merchant-notifications/latest/overview
2307+
release_level: preview
2308+
distribution_name: com.google.shopping:google-shopping-merchant-notifications
2309+
api_id: shopping-merchant-notifications.googleapis.com
2310+
library_type: GAPIC_AUTO
2311+
group_id: com.google.shopping
2312+
cloud_api: false
2313+
GAPICs:
2314+
- proto_path: google/shopping/merchant/notifications/v1
2315+
- proto_path: google/shopping/merchant/notifications/v1beta
2316+
requires_billing: true
22822317
- api_shortname: shopping-merchant-lfp
22832318
name_pretty: Merchant LFP API
22842319
product_documentation: https://developers.google.com/merchant/api
@@ -2292,6 +2327,7 @@ libraries:
22922327
group_id: com.google.shopping
22932328
cloud_api: false
22942329
GAPICs:
2330+
- proto_path: google/shopping/merchant/lfp/v1
22952331
- proto_path: google/shopping/merchant/lfp/v1beta
22962332
requires_billing: true
22972333

@@ -2324,6 +2360,7 @@ libraries:
23242360
group_id: com.google.shopping
23252361
cloud_api: false
23262362
GAPICs:
2363+
- proto_path: google/shopping/merchant/products/v1
23272364
- proto_path: google/shopping/merchant/products/v1beta
23282365
library_name: shopping-merchant-products
23292366
- api_shortname: merchantapi
@@ -2339,6 +2376,7 @@ libraries:
23392376
group_id: com.google.shopping
23402377
cloud_api: false
23412378
GAPICs:
2379+
- proto_path: google/shopping/merchant/promotions/v1
23422380
- proto_path: google/shopping/merchant/promotions/v1beta
23432381
library_name: shopping-merchant-promotions
23442382
requires_billing: true
@@ -2355,6 +2393,7 @@ libraries:
23552393
group_id: com.google.shopping
23562394
cloud_api: false
23572395
GAPICs:
2396+
- proto_path: google/shopping/merchant/quota/v1
23582397
- proto_path: google/shopping/merchant/quota/v1beta
23592398
requires_billing: true
23602399

@@ -2366,6 +2405,7 @@ libraries:
23662405
cloud_api: false
23672406
distribution_name: com.google.shopping:google-shopping-merchant-reports
23682407
GAPICs:
2408+
- proto_path: google/shopping/merchant/reports/v1
23692409
- proto_path: google/shopping/merchant/reports/v1beta
23702410
- proto_path: google/shopping/merchant/reports/v1alpha
23712411

‎java-aiplatform/google-cloud-aiplatform/src/main/java/com/google/cloud/aiplatform/v1beta1/VertexRagDataServiceClient.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1881,6 +1881,7 @@ public final OperationFuture<Empty, DeleteOperationMetadata> deleteRagFileAsync(
18811881
* .setName(
18821882
* RagFileName.of("[PROJECT]", "[LOCATION]", "[RAG_CORPUS]", "[RAG_FILE]")
18831883
* .toString())
1884+
* .setForceDelete(true)
18841885
* .build();
18851886
* vertexRagDataServiceClient.deleteRagFileAsync(request).get();
18861887
* }
@@ -1913,6 +1914,7 @@ public final OperationFuture<Empty, DeleteOperationMetadata> deleteRagFileAsync(
19131914
* .setName(
19141915
* RagFileName.of("[PROJECT]", "[LOCATION]", "[RAG_CORPUS]", "[RAG_FILE]")
19151916
* .toString())
1917+
* .setForceDelete(true)
19161918
* .build();
19171919
* OperationFuture<Empty, DeleteOperationMetadata> future =
19181920
* vertexRagDataServiceClient.deleteRagFileOperationCallable().futureCall(request);
@@ -1945,6 +1947,7 @@ public final OperationFuture<Empty, DeleteOperationMetadata> deleteRagFileAsync(
19451947
* .setName(
19461948
* RagFileName.of("[PROJECT]", "[LOCATION]", "[RAG_CORPUS]", "[RAG_FILE]")
19471949
* .toString())
1950+
* .setForceDelete(true)
19481951
* .build();
19491952
* ApiFuture<Operation> future =
19501953
* vertexRagDataServiceClient.deleteRagFileCallable().futureCall(request);

‎java-aiplatform/proto-google-cloud-aiplatform-v1beta1/src/main/java/com/google/cloud/aiplatform/v1beta1/AutoscalingMetricSpec.java‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -198,8 +198,8 @@ public int getMonitoredResourceLabelsCount() {
198198
*
199199
*
200200
* <pre>
201-
* Optional. The Cloud Monitoring monitored resource labels used for metrics
202-
* filtering. See Cloud Monitoring Labels
201+
* Optional. The Cloud Monitoring monitored resource labels as key value pairs
202+
* used for metrics filtering. See Cloud Monitoring Labels
203203
* https://cloud.google.com/monitoring/api/v3/metric-model#generic-label-info
204204
* </pre>
205205
*
@@ -226,8 +226,8 @@ public java.util.Map<java.lang.String, java.lang.String> getMonitoredResourceLab
226226
*
227227
*
228228
* <pre>
229-
* Optional. The Cloud Monitoring monitored resource labels used for metrics
230-
* filtering. See Cloud Monitoring Labels
229+
* Optional. The Cloud Monitoring monitored resource labels as key value pairs
230+
* used for metrics filtering. See Cloud Monitoring Labels
231231
* https://cloud.google.com/monitoring/api/v3/metric-model#generic-label-info
232232
* </pre>
233233
*
@@ -244,8 +244,8 @@ public java.util.Map<java.lang.String, java.lang.String> getMonitoredResourceLab
244244
*
245245
*
246246
* <pre>
247-
* Optional. The Cloud Monitoring monitored resource labels used for metrics
248-
* filtering. See Cloud Monitoring Labels
247+
* Optional. The Cloud Monitoring monitored resource labels as key value pairs
248+
* used for metrics filtering. See Cloud Monitoring Labels
249249
* https://cloud.google.com/monitoring/api/v3/metric-model#generic-label-info
250250
* </pre>
251251
*
@@ -270,8 +270,8 @@ public java.util.Map<java.lang.String, java.lang.String> getMonitoredResourceLab
270270
*
271271
*
272272
* <pre>
273-
* Optional. The Cloud Monitoring monitored resource labels used for metrics
274-
* filtering. See Cloud Monitoring Labels
273+
* Optional. The Cloud Monitoring monitored resource labels as key value pairs
274+
* used for metrics filtering. See Cloud Monitoring Labels
275275
* https://cloud.google.com/monitoring/api/v3/metric-model#generic-label-info
276276
* </pre>
277277
*
@@ -967,8 +967,8 @@ public int getMonitoredResourceLabelsCount() {
967967
*
968968
*
969969
* <pre>
970-
* Optional. The Cloud Monitoring monitored resource labels used for metrics
971-
* filtering. See Cloud Monitoring Labels
970+
* Optional. The Cloud Monitoring monitored resource labels as key value pairs
971+
* used for metrics filtering. See Cloud Monitoring Labels
972972
* https://cloud.google.com/monitoring/api/v3/metric-model#generic-label-info
973973
* </pre>
974974
*
@@ -995,8 +995,8 @@ public java.util.Map<java.lang.String, java.lang.String> getMonitoredResourceLab
995995
*
996996
*
997997
* <pre>
998-
* Optional. The Cloud Monitoring monitored resource labels used for metrics
999-
* filtering. See Cloud Monitoring Labels
998+
* Optional. The Cloud Monitoring monitored resource labels as key value pairs
999+
* used for metrics filtering. See Cloud Monitoring Labels
10001000
* https://cloud.google.com/monitoring/api/v3/metric-model#generic-label-info
10011001
* </pre>
10021002
*
@@ -1013,8 +1013,8 @@ public java.util.Map<java.lang.String, java.lang.String> getMonitoredResourceLab
10131013
*
10141014
*
10151015
* <pre>
1016-
* Optional. The Cloud Monitoring monitored resource labels used for metrics
1017-
* filtering. See Cloud Monitoring Labels
1016+
* Optional. The Cloud Monitoring monitored resource labels as key value pairs
1017+
* used for metrics filtering. See Cloud Monitoring Labels
10181018
* https://cloud.google.com/monitoring/api/v3/metric-model#generic-label-info
10191019
* </pre>
10201020
*
@@ -1039,8 +1039,8 @@ public java.util.Map<java.lang.String, java.lang.String> getMonitoredResourceLab
10391039
*
10401040
*
10411041
* <pre>
1042-
* Optional. The Cloud Monitoring monitored resource labels used for metrics
1043-
* filtering. See Cloud Monitoring Labels
1042+
* Optional. The Cloud Monitoring monitored resource labels as key value pairs
1043+
* used for metrics filtering. See Cloud Monitoring Labels
10441044
* https://cloud.google.com/monitoring/api/v3/metric-model#generic-label-info
10451045
* </pre>
10461046
*
@@ -1071,8 +1071,8 @@ public Builder clearMonitoredResourceLabels() {
10711071
*
10721072
*
10731073
* <pre>
1074-
* Optional. The Cloud Monitoring monitored resource labels used for metrics
1075-
* filtering. See Cloud Monitoring Labels
1074+
* Optional. The Cloud Monitoring monitored resource labels as key value pairs
1075+
* used for metrics filtering. See Cloud Monitoring Labels
10761076
* https://cloud.google.com/monitoring/api/v3/metric-model#generic-label-info
10771077
* </pre>
10781078
*
@@ -1099,8 +1099,8 @@ public java.util.Map<java.lang.String, java.lang.String> getMutableMonitoredReso
10991099
*
11001100
*
11011101
* <pre>
1102-
* Optional. The Cloud Monitoring monitored resource labels used for metrics
1103-
* filtering. See Cloud Monitoring Labels
1102+
* Optional. The Cloud Monitoring monitored resource labels as key value pairs
1103+
* used for metrics filtering. See Cloud Monitoring Labels
11041104
* https://cloud.google.com/monitoring/api/v3/metric-model#generic-label-info
11051105
* </pre>
11061106
*
@@ -1124,8 +1124,8 @@ public Builder putMonitoredResourceLabels(java.lang.String key, java.lang.String
11241124
*
11251125
*
11261126
* <pre>
1127-
* Optional. The Cloud Monitoring monitored resource labels used for metrics
1128-
* filtering. See Cloud Monitoring Labels
1127+
* Optional. The Cloud Monitoring monitored resource labels as key value pairs
1128+
* used for metrics filtering. See Cloud Monitoring Labels
11291129
* https://cloud.google.com/monitoring/api/v3/metric-model#generic-label-info
11301130
* </pre>
11311131
*

‎java-aiplatform/proto-google-cloud-aiplatform-v1beta1/src/main/java/com/google/cloud/aiplatform/v1beta1/AutoscalingMetricSpecOrBuilder.java‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,8 @@ public interface AutoscalingMetricSpecOrBuilder
8282
*
8383
*
8484
* <pre>
85-
* Optional. The Cloud Monitoring monitored resource labels used for metrics
86-
* filtering. See Cloud Monitoring Labels
85+
* Optional. The Cloud Monitoring monitored resource labels as key value pairs
86+
* used for metrics filtering. See Cloud Monitoring Labels
8787
* https://cloud.google.com/monitoring/api/v3/metric-model#generic-label-info
8888
* </pre>
8989
*
@@ -97,8 +97,8 @@ public interface AutoscalingMetricSpecOrBuilder
9797
*
9898
*
9999
* <pre>
100-
* Optional. The Cloud Monitoring monitored resource labels used for metrics
101-
* filtering. See Cloud Monitoring Labels
100+
* Optional. The Cloud Monitoring monitored resource labels as key value pairs
101+
* used for metrics filtering. See Cloud Monitoring Labels
102102
* https://cloud.google.com/monitoring/api/v3/metric-model#generic-label-info
103103
* </pre>
104104
*
@@ -116,8 +116,8 @@ public interface AutoscalingMetricSpecOrBuilder
116116
*
117117
*
118118
* <pre>
119-
* Optional. The Cloud Monitoring monitored resource labels used for metrics
120-
* filtering. See Cloud Monitoring Labels
119+
* Optional. The Cloud Monitoring monitored resource labels as key value pairs
120+
* used for metrics filtering. See Cloud Monitoring Labels
121121
* https://cloud.google.com/monitoring/api/v3/metric-model#generic-label-info
122122
* </pre>
123123
*
@@ -131,8 +131,8 @@ public interface AutoscalingMetricSpecOrBuilder
131131
*
132132
*
133133
* <pre>
134-
* Optional. The Cloud Monitoring monitored resource labels used for metrics
135-
* filtering. See Cloud Monitoring Labels
134+
* Optional. The Cloud Monitoring monitored resource labels as key value pairs
135+
* used for metrics filtering. See Cloud Monitoring Labels
136136
* https://cloud.google.com/monitoring/api/v3/metric-model#generic-label-info
137137
* </pre>
138138
*
@@ -150,8 +150,8 @@ java.lang.String getMonitoredResourceLabelsOrDefault(
150150
*
151151
*
152152
* <pre>
153-
* Optional. The Cloud Monitoring monitored resource labels used for metrics
154-
* filtering. See Cloud Monitoring Labels
153+
* Optional. The Cloud Monitoring monitored resource labels as key value pairs
154+
* used for metrics filtering. See Cloud Monitoring Labels
155155
* https://cloud.google.com/monitoring/api/v3/metric-model#generic-label-info
156156
* </pre>
157157
*

0 commit comments

Comments
 (0)