Skip to content

Commit 59426b1

Browse files
feat: [serviceusage] introduce resource class serviceusage.googleapis.com/Service (#9841)
* feat: introduce resource class serviceusage.googleapis.com/Service feat: added ConsumerQuotaLimit.supported_locations feat: added ProducerQuotaPolicy message and QuotaBucket.producer_quota_policy field chore: reformatted protos PiperOrigin-RevId: 565811363 Source-Link: googleapis/googleapis@57d9a31 Source-Link: https://github.com/googleapis/googleapis-gen/commit/f6678e2bfaad1dedaf1c67943d1f678a879899c2 Copy-Tag: eyJwIjoiamF2YS1zZXJ2aWNlLXVzYWdlLy5Pd2xCb3QueWFtbCIsImgiOiJmNjY3OGUyYmZhYWQxZGVkYWYxYzY3OTQzZDFmNjc4YTg3OTg5OWMyIn0= * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md --------- Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>
1 parent 82ca5cf commit 59426b1

File tree

26 files changed

+3616
-460
lines changed

26 files changed

+3616
-460
lines changed

java-service-usage/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file:
2020
<dependency>
2121
<groupId>com.google.cloud</groupId>
2222
<artifactId>libraries-bom</artifactId>
23-
<version>26.19.0</version>
23+
<version>26.23.0</version>
2424
<type>pom</type>
2525
<scope>import</scope>
2626
</dependency>
@@ -195,7 +195,7 @@ Java is a registered trademark of Oracle and/or its affiliates.
195195
[kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/google-cloud-java/java11.html
196196
[stability-image]: https://img.shields.io/badge/stability-stable-green
197197
[maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-service-usage.svg
198-
[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-service-usage/2.21.0
198+
[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-service-usage/2.24.0
199199
[authentication]: https://github.com/googleapis/google-cloud-java#authentication
200200
[auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes
201201
[predefined-iam-roles]: https://cloud.google.com/iam/docs/understanding-roles#predefined_roles

java-service-usage/google-cloud-service-usage/src/main/resources/META-INF/native-image/com.google.api.serviceusage.v1beta1/reflect-config.json

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -233,6 +233,15 @@
233233
"allDeclaredClasses": true,
234234
"allPublicClasses": true
235235
},
236+
{
237+
"name": "com.google.api.FieldBehavior",
238+
"queryAllDeclaredConstructors": true,
239+
"queryAllPublicConstructors": true,
240+
"queryAllDeclaredMethods": true,
241+
"allPublicMethods": true,
242+
"allDeclaredClasses": true,
243+
"allPublicClasses": true
244+
},
236245
{
237246
"name": "com.google.api.GoSettings",
238247
"queryAllDeclaredConstructors": true,
@@ -1448,6 +1457,24 @@
14481457
"allDeclaredClasses": true,
14491458
"allPublicClasses": true
14501459
},
1460+
{
1461+
"name": "com.google.api.serviceusage.v1beta1.ProducerQuotaPolicy",
1462+
"queryAllDeclaredConstructors": true,
1463+
"queryAllPublicConstructors": true,
1464+
"queryAllDeclaredMethods": true,
1465+
"allPublicMethods": true,
1466+
"allDeclaredClasses": true,
1467+
"allPublicClasses": true
1468+
},
1469+
{
1470+
"name": "com.google.api.serviceusage.v1beta1.ProducerQuotaPolicy$Builder",
1471+
"queryAllDeclaredConstructors": true,
1472+
"queryAllPublicConstructors": true,
1473+
"queryAllDeclaredMethods": true,
1474+
"allPublicMethods": true,
1475+
"allDeclaredClasses": true,
1476+
"allPublicClasses": true
1477+
},
14511478
{
14521479
"name": "com.google.api.serviceusage.v1beta1.QuotaBucket",
14531480
"queryAllDeclaredConstructors": true,

java-service-usage/google-cloud-service-usage/src/test/java/com/google/api/serviceusage/v1beta1/ServiceUsageClientHttpJsonTest.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -485,6 +485,7 @@ public void getConsumerQuotaLimitTest() throws Exception {
485485
.setIsPrecise(true)
486486
.setAllowsAdminOverrides(true)
487487
.addAllQuotaBuckets(new ArrayList<QuotaBucket>())
488+
.addAllSupportedLocations(new ArrayList<String>())
488489
.build();
489490
mockService.addResponse(expectedResponse);
490491

java-service-usage/google-cloud-service-usage/src/test/java/com/google/api/serviceusage/v1beta1/ServiceUsageClientTest.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -451,6 +451,7 @@ public void getConsumerQuotaLimitTest() throws Exception {
451451
.setIsPrecise(true)
452452
.setAllowsAdminOverrides(true)
453453
.addAllQuotaBuckets(new ArrayList<QuotaBucket>())
454+
.addAllSupportedLocations(new ArrayList<String>())
454455
.build();
455456
mockServiceUsage.addResponse(expectedResponse);
456457

java-service-usage/proto-google-cloud-service-usage-v1/src/main/java/com/google/api/serviceusage/v1/ResourcesProto.java

Lines changed: 36 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -54,30 +54,35 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
5454
+ "n.proto\032\031google/api/endpoint.proto\032#goog"
5555
+ "le/api/monitored_resource.proto\032\033google/"
5656
+ "api/monitoring.proto\032\026google/api/quota.p"
57-
+ "roto\032\026google/api/usage.proto\032\031google/pro"
58-
+ "tobuf/api.proto\"\224\001\n\007Service\022\014\n\004name\030\001 \001("
59-
+ "\t\022\016\n\006parent\030\005 \001(\t\0229\n\006config\030\002 \001(\0132).goog"
60-
+ "le.api.serviceusage.v1.ServiceConfig\0220\n\005"
61-
+ "state\030\004 \001(\0162!.google.api.serviceusage.v1"
62-
+ ".State\"\225\003\n\rServiceConfig\022\014\n\004name\030\001 \001(\t\022\r"
63-
+ "\n\005title\030\002 \001(\t\022\"\n\004apis\030\003 \003(\0132\024.google.pro"
64-
+ "tobuf.Api\0220\n\rdocumentation\030\006 \001(\0132\031.googl"
65-
+ "e.api.Documentation\022 \n\005quota\030\n \001(\0132\021.goo"
66-
+ "gle.api.Quota\0222\n\016authentication\030\013 \001(\0132\032."
67-
+ "google.api.Authentication\022 \n\005usage\030\017 \001(\013"
68-
+ "2\021.google.api.Usage\022\'\n\tendpoints\030\022 \003(\0132\024"
69-
+ ".google.api.Endpoint\022D\n\023monitored_resour"
70-
+ "ces\030\031 \003(\0132\'.google.api.MonitoredResource"
71-
+ "Descriptor\022*\n\nmonitoring\030\034 \001(\0132\026.google."
72-
+ "api.Monitoring\"+\n\021OperationMetadata\022\026\n\016r"
73-
+ "esource_names\030\002 \003(\t*9\n\005State\022\025\n\021STATE_UN"
74-
+ "SPECIFIED\020\000\022\014\n\010DISABLED\020\001\022\013\n\007ENABLED\020\002B\330"
75-
+ "\001\n\036com.google.api.serviceusage.v1B\016Resou"
76-
+ "rcesProtoP\001ZDcloud.google.com/go/service"
77-
+ "usage/apiv1/serviceusagepb;serviceusagep"
78-
+ "b\252\002\034Google.Cloud.ServiceUsage.V1\312\002\034Googl"
79-
+ "e\\Cloud\\ServiceUsage\\V1\352\002\037Google::Cloud:"
80-
+ ":ServiceUsage::V1b\006proto3"
57+
+ "roto\032\031google/api/resource.proto\032\026google/"
58+
+ "api/usage.proto\032\031google/protobuf/api.pro"
59+
+ "to\"\275\002\n\007Service\022\014\n\004name\030\001 \001(\t\022\016\n\006parent\030\005"
60+
+ " \001(\t\0229\n\006config\030\002 \001(\0132).google.api.servic"
61+
+ "eusage.v1.ServiceConfig\0220\n\005state\030\004 \001(\0162!"
62+
+ ".google.api.serviceusage.v1.State:\246\001\352A\242\001"
63+
+ "\n#serviceusage.googleapis.com/Service\022%p"
64+
+ "rojects/{project}/services/{service}\022#fo"
65+
+ "lders/{folder}/services/{service}\022/organ"
66+
+ "izations/{organization}/services/{servic"
67+
+ "e}\"\225\003\n\rServiceConfig\022\014\n\004name\030\001 \001(\t\022\r\n\005ti"
68+
+ "tle\030\002 \001(\t\022\"\n\004apis\030\003 \003(\0132\024.google.protobu"
69+
+ "f.Api\0220\n\rdocumentation\030\006 \001(\0132\031.google.ap"
70+
+ "i.Documentation\022 \n\005quota\030\n \001(\0132\021.google."
71+
+ "api.Quota\0222\n\016authentication\030\013 \001(\0132\032.goog"
72+
+ "le.api.Authentication\022 \n\005usage\030\017 \001(\0132\021.g"
73+
+ "oogle.api.Usage\022\'\n\tendpoints\030\022 \003(\0132\024.goo"
74+
+ "gle.api.Endpoint\022D\n\023monitored_resources\030"
75+
+ "\031 \003(\0132\'.google.api.MonitoredResourceDesc"
76+
+ "riptor\022*\n\nmonitoring\030\034 \001(\0132\026.google.api."
77+
+ "Monitoring\"+\n\021OperationMetadata\022\026\n\016resou"
78+
+ "rce_names\030\002 \003(\t*9\n\005State\022\025\n\021STATE_UNSPEC"
79+
+ "IFIED\020\000\022\014\n\010DISABLED\020\001\022\013\n\007ENABLED\020\002B\330\001\n\036c"
80+
+ "om.google.api.serviceusage.v1B\016Resources"
81+
+ "ProtoP\001ZDcloud.google.com/go/serviceusag"
82+
+ "e/apiv1/serviceusagepb;serviceusagepb\252\002\034"
83+
+ "Google.Cloud.ServiceUsage.V1\312\002\034Google\\Cl"
84+
+ "oud\\ServiceUsage\\V1\352\002\037Google::Cloud::Ser"
85+
+ "viceUsage::V1b\006proto3"
8186
};
8287
descriptor =
8388
com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(
@@ -89,6 +94,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
8994
com.google.api.MonitoredResourceProto.getDescriptor(),
9095
com.google.api.MonitoringProto.getDescriptor(),
9196
com.google.api.QuotaProto.getDescriptor(),
97+
com.google.api.ResourceProto.getDescriptor(),
9298
com.google.api.UsageProto.getDescriptor(),
9399
com.google.protobuf.ApiProto.getDescriptor(),
94100
});
@@ -125,12 +131,18 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
125131
new java.lang.String[] {
126132
"ResourceNames",
127133
});
134+
com.google.protobuf.ExtensionRegistry registry =
135+
com.google.protobuf.ExtensionRegistry.newInstance();
136+
registry.add(com.google.api.ResourceProto.resource);
137+
com.google.protobuf.Descriptors.FileDescriptor.internalUpdateFileDescriptor(
138+
descriptor, registry);
128139
com.google.api.AuthProto.getDescriptor();
129140
com.google.api.DocumentationProto.getDescriptor();
130141
com.google.api.EndpointProto.getDescriptor();
131142
com.google.api.MonitoredResourceProto.getDescriptor();
132143
com.google.api.MonitoringProto.getDescriptor();
133144
com.google.api.QuotaProto.getDescriptor();
145+
com.google.api.ResourceProto.getDescriptor();
134146
com.google.api.UsageProto.getDescriptor();
135147
com.google.protobuf.ApiProto.getDescriptor();
136148
}

0 commit comments

Comments
 (0)