Skip to content
This repository was archived by the owner on Sep 16, 2023. It is now read-only.

Commit a36ac4f

Browse files
fix: Modify the bazel.BUILD file by hand to include the compliance protos which are not autogenerated (#791)
* fix: Modify the bazel.BUILD file by hand to include the compliance protos which are not autogenerated PiperOrigin-RevId: 420306668 Source-Link: googleapis/googleapis@9a8910e Source-Link: https://github.com/googleapis/googleapis-gen/commit/24c9bfc4d59f50a49e22a6070d1c229f523defdc Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiMjRjOWJmYzRkNTlmNTBhNDllMjJhNjA3MGQxYzIyOWY1MjNkZWZkYyJ9 * 🦉 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 0998a83 commit a36ac4f

File tree

6 files changed

+82
-78
lines changed

6 files changed

+82
-78
lines changed

google-cloud-containeranalysis/src/main/java/com/google/cloud/devtools/containeranalysis/v1/ContainerAnalysisClient.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -553,8 +553,8 @@ public final TestIamPermissionsResponse testIamPermissions(TestIamPermissionsReq
553553
* }
554554
* }</pre>
555555
*
556-
* @param parent The name of the project to get a vulnerability summary for in the form of
557-
* `projects/[PROJECT_ID]`.
556+
* @param parent Required. The name of the project to get a vulnerability summary for in the form
557+
* of `projects/[PROJECT_ID]`.
558558
* @param filter The filter expression.
559559
* @throws com.google.api.gax.rpc.ApiException if the remote call fails
560560
*/
@@ -583,8 +583,8 @@ public final VulnerabilityOccurrencesSummary getVulnerabilityOccurrencesSummary(
583583
* }
584584
* }</pre>
585585
*
586-
* @param parent The name of the project to get a vulnerability summary for in the form of
587-
* `projects/[PROJECT_ID]`.
586+
* @param parent Required. The name of the project to get a vulnerability summary for in the form
587+
* of `projects/[PROJECT_ID]`.
588588
* @param filter The filter expression.
589589
* @throws com.google.api.gax.rpc.ApiException if the remote call fails
590590
*/

google-cloud-containeranalysis/src/main/java/com/google/cloud/devtools/containeranalysis/v1/package-info.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,9 @@
1515
*/
1616

1717
/**
18-
* The interfaces provided are listed below, along with usage samples.
18+
* A client to Container Analysis API
19+
*
20+
* <p>The interfaces provided are listed below, along with usage samples.
1921
*
2022
* <p>======================= ContainerAnalysisClient =======================
2123
*

proto-google-cloud-containeranalysis-v1/src/main/java/com/google/containeranalysis/v1/Containeranalysis.java

Lines changed: 52 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -55,51 +55,52 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
5555
+ "gle/api/field_behavior.proto\032\031google/api"
5656
+ "/resource.proto\032\036google/iam/v1/iam_polic"
5757
+ "y.proto\032\032google/iam/v1/policy.proto\032\037goo"
58-
+ "gle/protobuf/timestamp.proto\032\036grafeas/v1"
59-
+ "/vulnerability.proto\"\200\001\n)GetVulnerabilit"
60-
+ "yOccurrencesSummaryRequest\022C\n\006parent\030\001 \001"
61-
+ "(\tB3\372A-\n+cloudresourcemanager.googleapis"
62-
+ ".com/Project\340A\002\022\016\n\006filter\030\002 \001(\t\"\220\002\n\037Vuln"
63-
+ "erabilityOccurrencesSummary\022j\n\006counts\030\001 "
64-
+ "\003(\0132Z.google.devtools.containeranalysis."
65-
+ "v1.VulnerabilityOccurrencesSummary.Fixab"
66-
+ "leTotalByDigest\032\200\001\n\024FixableTotalByDigest"
67-
+ "\022\024\n\014resource_uri\030\001 \001(\t\022&\n\010severity\030\002 \001(\016"
68-
+ "2\024.grafeas.v1.Severity\022\025\n\rfixable_count\030"
69-
+ "\003 \001(\003\022\023\n\013total_count\030\004 \001(\0032\242\010\n\021Container"
70-
+ "Analysis\022\322\001\n\014SetIamPolicy\022\".google.iam.v"
71-
+ "1.SetIamPolicyRequest\032\025.google.iam.v1.Po"
72-
+ "licy\"\206\001\202\323\344\223\002n\"./v1/{resource=projects/*/"
73-
+ "notes/*}:setIamPolicy:\001*Z9\"4/v1/{resourc"
74-
+ "e=projects/*/occurrences/*}:setIamPolicy"
75-
+ ":\001*\332A\017resource,policy\022\312\001\n\014GetIamPolicy\022\""
76-
+ ".google.iam.v1.GetIamPolicyRequest\032\025.goo"
77-
+ "gle.iam.v1.Policy\"\177\202\323\344\223\002n\"./v1/{resource"
78-
+ "=projects/*/notes/*}:getIamPolicy:\001*Z9\"4"
79-
+ "/v1/{resource=projects/*/occurrences/*}:"
80-
+ "getIamPolicy:\001*\332A\010resource\022\203\002\n\022TestIamPe"
81-
+ "rmissions\022(.google.iam.v1.TestIamPermiss"
82-
+ "ionsRequest\032).google.iam.v1.TestIamPermi"
83-
+ "ssionsResponse\"\227\001\202\323\344\223\002z\"4/v1/{resource=p"
84-
+ "rojects/*/notes/*}:testIamPermissions:\001*"
85-
+ "Z?\":/v1/{resource=projects/*/occurrences"
86-
+ "/*}:testIamPermissions:\001*\332A\024resource,per"
87-
+ "missions\022\216\002\n\"GetVulnerabilityOccurrences"
88-
+ "Summary\022O.google.devtools.containeranaly"
89-
+ "sis.v1.GetVulnerabilityOccurrencesSummar"
90-
+ "yRequest\032E.google.devtools.containeranal"
91-
+ "ysis.v1.VulnerabilityOccurrencesSummary\""
92-
+ "P\202\323\344\223\002:\0228/v1/{parent=projects/*}/occurre"
93-
+ "nces:vulnerabilitySummary\332A\rparent,filte"
94-
+ "r\032T\312A containeranalysis.googleapis.com\322A"
95-
+ ".https://www.googleapis.com/auth/cloud-p"
96-
+ "latformB\370\001\n\037com.google.containeranalysis"
97-
+ ".v1P\001ZUgoogle.golang.org/genproto/google"
98-
+ "apis/devtools/containeranalysis/v1;conta"
99-
+ "ineranalysis\242\002\003GCA\252\002*Google.Cloud.DevToo"
100-
+ "ls.ContainerAnalysis.V1\312\002!Google\\Cloud\\C"
101-
+ "ontainerAnalysis\\V1\352\002$Google::Cloud::Con"
102-
+ "tainerAnalysis::V1b\006proto3"
58+
+ "gle/protobuf/timestamp.proto\032\027grafeas/v1"
59+
+ "/common.proto\032\030grafeas/v1/grafeas.proto\032"
60+
+ "\031grafeas/v1/severity.proto\"\200\001\n)GetVulner"
61+
+ "abilityOccurrencesSummaryRequest\022C\n\006pare"
62+
+ "nt\030\001 \001(\tB3\340A\002\372A-\n+cloudresourcemanager.g"
63+
+ "oogleapis.com/Project\022\016\n\006filter\030\002 \001(\t\"\220\002"
64+
+ "\n\037VulnerabilityOccurrencesSummary\022j\n\006cou"
65+
+ "nts\030\001 \003(\0132Z.google.devtools.containerana"
66+
+ "lysis.v1.VulnerabilityOccurrencesSummary"
67+
+ ".FixableTotalByDigest\032\200\001\n\024FixableTotalBy"
68+
+ "Digest\022\024\n\014resource_uri\030\001 \001(\t\022&\n\010severity"
69+
+ "\030\002 \001(\0162\024.grafeas.v1.Severity\022\025\n\rfixable_"
70+
+ "count\030\003 \001(\003\022\023\n\013total_count\030\004 \001(\0032\242\010\n\021Con"
71+
+ "tainerAnalysis\022\322\001\n\014SetIamPolicy\022\".google"
72+
+ ".iam.v1.SetIamPolicyRequest\032\025.google.iam"
73+
+ ".v1.Policy\"\206\001\202\323\344\223\002n\"./v1/{resource=proje"
74+
+ "cts/*/notes/*}:setIamPolicy:\001*Z9\"4/v1/{r"
75+
+ "esource=projects/*/occurrences/*}:setIam"
76+
+ "Policy:\001*\332A\017resource,policy\022\312\001\n\014GetIamPo"
77+
+ "licy\022\".google.iam.v1.GetIamPolicyRequest"
78+
+ "\032\025.google.iam.v1.Policy\"\177\202\323\344\223\002n\"./v1/{re"
79+
+ "source=projects/*/notes/*}:getIamPolicy:"
80+
+ "\001*Z9\"4/v1/{resource=projects/*/occurrenc"
81+
+ "es/*}:getIamPolicy:\001*\332A\010resource\022\203\002\n\022Tes"
82+
+ "tIamPermissions\022(.google.iam.v1.TestIamP"
83+
+ "ermissionsRequest\032).google.iam.v1.TestIa"
84+
+ "mPermissionsResponse\"\227\001\202\323\344\223\002z\"4/v1/{reso"
85+
+ "urce=projects/*/notes/*}:testIamPermissi"
86+
+ "ons:\001*Z?\":/v1/{resource=projects/*/occur"
87+
+ "rences/*}:testIamPermissions:\001*\332A\024resour"
88+
+ "ce,permissions\022\216\002\n\"GetVulnerabilityOccur"
89+
+ "rencesSummary\022O.google.devtools.containe"
90+
+ "ranalysis.v1.GetVulnerabilityOccurrences"
91+
+ "SummaryRequest\032E.google.devtools.contain"
92+
+ "eranalysis.v1.VulnerabilityOccurrencesSu"
93+
+ "mmary\"P\202\323\344\223\002:\0228/v1/{parent=projects/*}/o"
94+
+ "ccurrences:vulnerabilitySummary\332A\rparent"
95+
+ ",filter\032T\312A containeranalysis.googleapis"
96+
+ ".com\322A.https://www.googleapis.com/auth/c"
97+
+ "loud-platformB\370\001\n\037com.google.containeran"
98+
+ "alysis.v1P\001ZUgoogle.golang.org/genproto/"
99+
+ "googleapis/devtools/containeranalysis/v1"
100+
+ ";containeranalysis\242\002\003GCA\252\002*Google.Cloud."
101+
+ "DevTools.ContainerAnalysis.V1\312\002!Google\\C"
102+
+ "loud\\ContainerAnalysis\\V1\352\002$Google::Clou"
103+
+ "d::ContainerAnalysis::V1b\006proto3"
103104
};
104105
descriptor =
105106
com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(
@@ -112,7 +113,9 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
112113
com.google.iam.v1.IamPolicyProto.getDescriptor(),
113114
com.google.iam.v1.PolicyProto.getDescriptor(),
114115
com.google.protobuf.TimestampProto.getDescriptor(),
115-
io.grafeas.v1.Vulnerability.getDescriptor(),
116+
io.grafeas.v1.Common.getDescriptor(),
117+
io.grafeas.v1.GrafeasOuterClass.getDescriptor(),
118+
io.grafeas.v1.SeverityOuterClass.getDescriptor(),
116119
});
117120
internal_static_google_devtools_containeranalysis_v1_GetVulnerabilityOccurrencesSummaryRequest_descriptor =
118121
getDescriptor().getMessageTypes().get(0);
@@ -157,7 +160,9 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
157160
com.google.iam.v1.IamPolicyProto.getDescriptor();
158161
com.google.iam.v1.PolicyProto.getDescriptor();
159162
com.google.protobuf.TimestampProto.getDescriptor();
160-
io.grafeas.v1.Vulnerability.getDescriptor();
163+
io.grafeas.v1.Common.getDescriptor();
164+
io.grafeas.v1.GrafeasOuterClass.getDescriptor();
165+
io.grafeas.v1.SeverityOuterClass.getDescriptor();
161166
}
162167

163168
// @@protoc_insertion_point(outer_class_scope)

proto-google-cloud-containeranalysis-v1/src/main/java/com/google/containeranalysis/v1/GetVulnerabilityOccurrencesSummaryRequest.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
129129
*
130130
*
131131
* <pre>
132-
* The name of the project to get a vulnerability summary for in the form of
132+
* Required. The name of the project to get a vulnerability summary for in the form of
133133
* `projects/[PROJECT_ID]`.
134134
* </pre>
135135
*
@@ -155,7 +155,7 @@ public java.lang.String getParent() {
155155
*
156156
*
157157
* <pre>
158-
* The name of the project to get a vulnerability summary for in the form of
158+
* Required. The name of the project to get a vulnerability summary for in the form of
159159
* `projects/[PROJECT_ID]`.
160160
* </pre>
161161
*
@@ -582,7 +582,7 @@ public Builder mergeFrom(
582582
*
583583
*
584584
* <pre>
585-
* The name of the project to get a vulnerability summary for in the form of
585+
* Required. The name of the project to get a vulnerability summary for in the form of
586586
* `projects/[PROJECT_ID]`.
587587
* </pre>
588588
*
@@ -607,7 +607,7 @@ public java.lang.String getParent() {
607607
*
608608
*
609609
* <pre>
610-
* The name of the project to get a vulnerability summary for in the form of
610+
* Required. The name of the project to get a vulnerability summary for in the form of
611611
* `projects/[PROJECT_ID]`.
612612
* </pre>
613613
*
@@ -632,7 +632,7 @@ public com.google.protobuf.ByteString getParentBytes() {
632632
*
633633
*
634634
* <pre>
635-
* The name of the project to get a vulnerability summary for in the form of
635+
* Required. The name of the project to get a vulnerability summary for in the form of
636636
* `projects/[PROJECT_ID]`.
637637
* </pre>
638638
*
@@ -656,7 +656,7 @@ public Builder setParent(java.lang.String value) {
656656
*
657657
*
658658
* <pre>
659-
* The name of the project to get a vulnerability summary for in the form of
659+
* Required. The name of the project to get a vulnerability summary for in the form of
660660
* `projects/[PROJECT_ID]`.
661661
* </pre>
662662
*
@@ -676,7 +676,7 @@ public Builder clearParent() {
676676
*
677677
*
678678
* <pre>
679-
* The name of the project to get a vulnerability summary for in the form of
679+
* Required. The name of the project to get a vulnerability summary for in the form of
680680
* `projects/[PROJECT_ID]`.
681681
* </pre>
682682
*

proto-google-cloud-containeranalysis-v1/src/main/java/com/google/containeranalysis/v1/GetVulnerabilityOccurrencesSummaryRequestOrBuilder.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public interface GetVulnerabilityOccurrencesSummaryRequestOrBuilder
2727
*
2828
*
2929
* <pre>
30-
* The name of the project to get a vulnerability summary for in the form of
30+
* Required. The name of the project to get a vulnerability summary for in the form of
3131
* `projects/[PROJECT_ID]`.
3232
* </pre>
3333
*
@@ -42,7 +42,7 @@ public interface GetVulnerabilityOccurrencesSummaryRequestOrBuilder
4242
*
4343
*
4444
* <pre>
45-
* The name of the project to get a vulnerability summary for in the form of
45+
* Required. The name of the project to get a vulnerability summary for in the form of
4646
* `projects/[PROJECT_ID]`.
4747
* </pre>
4848
*

proto-google-cloud-containeranalysis-v1/src/main/proto/google/devtools/containeranalysis/v1/containeranalysis.proto

Lines changed: 14 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright 2019 Google LLC
1+
// Copyright 2021 Google LLC
22
//
33
// Licensed under the Apache License, Version 2.0 (the "License");
44
// you may not use this file except in compliance with the License.
@@ -23,7 +23,9 @@ import "google/api/resource.proto";
2323
import "google/iam/v1/iam_policy.proto";
2424
import "google/iam/v1/policy.proto";
2525
import "google/protobuf/timestamp.proto";
26-
import "grafeas/v1/vulnerability.proto";
26+
import "grafeas/v1/common.proto";
27+
import "grafeas/v1/grafeas.proto";
28+
import "grafeas/v1/severity.proto";
2729

2830
option csharp_namespace = "Google.Cloud.DevTools.ContainerAnalysis.V1";
2931
option go_package = "google.golang.org/genproto/googleapis/devtools/containeranalysis/v1;containeranalysis";
@@ -48,8 +50,7 @@ option php_namespace = "Google\\Cloud\\ContainerAnalysis\\V1";
4850
// image with the vulnerability referring to that note.
4951
service ContainerAnalysis {
5052
option (google.api.default_host) = "containeranalysis.googleapis.com";
51-
option (google.api.oauth_scopes) =
52-
"https://www.googleapis.com/auth/cloud-platform";
53+
option (google.api.oauth_scopes) = "https://www.googleapis.com/auth/cloud-platform";
5354

5455
// Sets the access control policy on the specified note or occurrence.
5556
// Requires `containeranalysis.notes.setIamPolicy` or
@@ -59,8 +60,7 @@ service ContainerAnalysis {
5960
// The resource takes the format `projects/[PROJECT_ID]/notes/[NOTE_ID]` for
6061
// notes and `projects/[PROJECT_ID]/occurrences/[OCCURRENCE_ID]` for
6162
// occurrences.
62-
rpc SetIamPolicy(google.iam.v1.SetIamPolicyRequest)
63-
returns (google.iam.v1.Policy) {
63+
rpc SetIamPolicy(google.iam.v1.SetIamPolicyRequest) returns (google.iam.v1.Policy) {
6464
option (google.api.http) = {
6565
post: "/v1/{resource=projects/*/notes/*}:setIamPolicy"
6666
body: "*"
@@ -80,8 +80,7 @@ service ContainerAnalysis {
8080
// The resource takes the format `projects/[PROJECT_ID]/notes/[NOTE_ID]` for
8181
// notes and `projects/[PROJECT_ID]/occurrences/[OCCURRENCE_ID]` for
8282
// occurrences.
83-
rpc GetIamPolicy(google.iam.v1.GetIamPolicyRequest)
84-
returns (google.iam.v1.Policy) {
83+
rpc GetIamPolicy(google.iam.v1.GetIamPolicyRequest) returns (google.iam.v1.Policy) {
8584
option (google.api.http) = {
8685
post: "/v1/{resource=projects/*/notes/*}:getIamPolicy"
8786
body: "*"
@@ -100,8 +99,7 @@ service ContainerAnalysis {
10099
// The resource takes the format `projects/[PROJECT_ID]/notes/[NOTE_ID]` for
101100
// notes and `projects/[PROJECT_ID]/occurrences/[OCCURRENCE_ID]` for
102101
// occurrences.
103-
rpc TestIamPermissions(google.iam.v1.TestIamPermissionsRequest)
104-
returns (google.iam.v1.TestIamPermissionsResponse) {
102+
rpc TestIamPermissions(google.iam.v1.TestIamPermissionsRequest) returns (google.iam.v1.TestIamPermissionsResponse) {
105103
option (google.api.http) = {
106104
post: "/v1/{resource=projects/*/notes/*}:testIamPermissions"
107105
body: "*"
@@ -114,9 +112,7 @@ service ContainerAnalysis {
114112
}
115113

116114
// Gets a summary of the number and severity of occurrences.
117-
rpc GetVulnerabilityOccurrencesSummary(
118-
GetVulnerabilityOccurrencesSummaryRequest)
119-
returns (VulnerabilityOccurrencesSummary) {
115+
rpc GetVulnerabilityOccurrencesSummary(GetVulnerabilityOccurrencesSummaryRequest) returns (VulnerabilityOccurrencesSummary) {
120116
option (google.api.http) = {
121117
get: "/v1/{parent=projects/*}/occurrences:vulnerabilitySummary"
122118
};
@@ -126,12 +122,13 @@ service ContainerAnalysis {
126122

127123
// Request to get a vulnerability summary for some set of occurrences.
128124
message GetVulnerabilityOccurrencesSummaryRequest {
129-
// The name of the project to get a vulnerability summary for in the form of
125+
// Required. The name of the project to get a vulnerability summary for in the form of
130126
// `projects/[PROJECT_ID]`.
131127
string parent = 1 [
132-
(google.api.resource_reference).type =
133-
"cloudresourcemanager.googleapis.com/Project",
134-
(google.api.field_behavior) = REQUIRED
128+
(google.api.field_behavior) = REQUIRED,
129+
(google.api.resource_reference) = {
130+
type: "cloudresourcemanager.googleapis.com/Project"
131+
}
135132
];
136133

137134
// The filter expression.

0 commit comments

Comments
 (0)