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

Commit 22be2f6

Browse files
gcf-owl-bot[bot]gcf-owl-bot[bot]
authored
fix: Set the transport of grafeas back to grpc only (#498)
- [ ] Regenerate this pull request now. PiperOrigin-RevId: 457789598 Source-Link: googleapis/googleapis@220f5d8 Source-Link: https://github.com/googleapis/googleapis-gen/commit/54c8e63125700c2f1da4e325b4a87a951c19dacb Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiNTRjOGU2MzEyNTcwMGMyZjFkYTRlMzI1YjRhODdhOTUxYzE5ZGFjYiJ9 feat: Enable REST transport for most of Java and Go clients PiperOrigin-RevId: 456641589 Source-Link: googleapis/googleapis@8a251f5 Source-Link: https://github.com/googleapis/googleapis-gen/commit/4ca52a529cf01308d9714950edffbea3560cfbdb Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiNGNhNTJhNTI5Y2YwMTMwOGQ5NzE0OTUwZWRmZmJlYTM1NjBjZmJkYiJ9 chore: Integrate new gapic-generator-java and rules_gapic PiperOrigin-RevId: 454027580 Source-Link: googleapis/googleapis@1b22277 Source-Link: https://github.com/googleapis/googleapis-gen/commit/e04cea20d0d12eb5c3bdb360a9e72b654edcb638 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiZTA0Y2VhMjBkMGQxMmViNWMzYmRiMzYwYTllNzJiNjU0ZWRjYjYzOCJ9 feat:Import of Grafeas from Github PiperOrigin-RevId: 453542250 Source-Link: googleapis/googleapis@ac9c393 Source-Link: https://github.com/googleapis/googleapis-gen/commit/d1e2f1ab3de6b5a36186d69165412aa686aefb26 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiZDFlMmYxYWIzZGU2YjVhMzYxODZkNjkxNjU0MTJhYTY4NmFlZmIyNiJ9 chore(deps): upgrade gapic-generator-java to 2.8.0 and update gax-java to 2.18.1 PiperOrigin-RevId: 450543911 Source-Link: googleapis/googleapis@5528344 Source-Link: https://github.com/googleapis/googleapis-gen/commit/9f6775cab1958982b88967a43e5e806af0f135db Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiOWY2Nzc1Y2FiMTk1ODk4MmI4ODk2N2E0M2U1ZTgwNmFmMGYxMzVkYiJ9
1 parent deab833 commit 22be2f6

Some content is hidden

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

43 files changed

+15445
-684
lines changed

‎src/main/java/io/grafeas/v1/CVSS.java‎

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,8 @@
2525
* <pre>
2626
* Common Vulnerability Scoring System.
2727
* For details, see https://www.first.org/cvss/specification-document
28-
* This is a message we will try to use for storing multiple versions of
29-
* CVSS. The intention is that as new versions of CVSS scores get added, we
30-
* will be able to modify this message rather than adding new protos for each
31-
* new version of the score.
28+
* This is a message we will try to use for storing various versions of CVSS
29+
* rather than making a separate proto for storing a specific version.
3230
* </pre>
3331
*
3432
* Protobuf type {@code grafeas.v1.CVSS}
@@ -184,13 +182,13 @@ private CVSS(
184182
}
185183

186184
public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
187-
return io.grafeas.v1.CvssProto.internal_static_grafeas_v1_CVSS_descriptor;
185+
return io.grafeas.v1.CVSSProto.internal_static_grafeas_v1_CVSS_descriptor;
188186
}
189187

190188
@java.lang.Override
191189
protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
192190
internalGetFieldAccessorTable() {
193-
return io.grafeas.v1.CvssProto.internal_static_grafeas_v1_CVSS_fieldAccessorTable
191+
return io.grafeas.v1.CVSSProto.internal_static_grafeas_v1_CVSS_fieldAccessorTable
194192
.ensureFieldAccessorsInitialized(
195193
io.grafeas.v1.CVSS.class, io.grafeas.v1.CVSS.Builder.class);
196194
}
@@ -1480,10 +1478,8 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
14801478
* <pre>
14811479
* Common Vulnerability Scoring System.
14821480
* For details, see https://www.first.org/cvss/specification-document
1483-
* This is a message we will try to use for storing multiple versions of
1484-
* CVSS. The intention is that as new versions of CVSS scores get added, we
1485-
* will be able to modify this message rather than adding new protos for each
1486-
* new version of the score.
1481+
* This is a message we will try to use for storing various versions of CVSS
1482+
* rather than making a separate proto for storing a specific version.
14871483
* </pre>
14881484
*
14891485
* Protobuf type {@code grafeas.v1.CVSS}
@@ -1493,13 +1489,13 @@ public static final class Builder extends com.google.protobuf.GeneratedMessageV3
14931489
// @@protoc_insertion_point(builder_implements:grafeas.v1.CVSS)
14941490
io.grafeas.v1.CVSSOrBuilder {
14951491
public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
1496-
return io.grafeas.v1.CvssProto.internal_static_grafeas_v1_CVSS_descriptor;
1492+
return io.grafeas.v1.CVSSProto.internal_static_grafeas_v1_CVSS_descriptor;
14971493
}
14981494

14991495
@java.lang.Override
15001496
protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
15011497
internalGetFieldAccessorTable() {
1502-
return io.grafeas.v1.CvssProto.internal_static_grafeas_v1_CVSS_fieldAccessorTable
1498+
return io.grafeas.v1.CVSSProto.internal_static_grafeas_v1_CVSS_fieldAccessorTable
15031499
.ensureFieldAccessorsInitialized(
15041500
io.grafeas.v1.CVSS.class, io.grafeas.v1.CVSS.Builder.class);
15051501
}
@@ -1550,7 +1546,7 @@ public Builder clear() {
15501546

15511547
@java.lang.Override
15521548
public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
1553-
return io.grafeas.v1.CvssProto.internal_static_grafeas_v1_CVSS_descriptor;
1549+
return io.grafeas.v1.CVSSProto.internal_static_grafeas_v1_CVSS_descriptor;
15541550
}
15551551

15561552
@java.lang.Override

‎src/main/java/io/grafeas/v1/CvssProto.java‎ renamed to ‎src/main/java/io/grafeas/v1/CVSSProto.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919

2020
package io.grafeas.v1;
2121

22-
public final class CvssProto {
23-
private CvssProto() {}
22+
public final class CVSSProto {
23+
private CVSSProto() {}
2424

2525
public static void registerAllExtensions(com.google.protobuf.ExtensionRegistryLite registry) {}
2626

@@ -111,7 +111,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
111111
+ "PECIFIED\020\000\022\023\n\017SCOPE_UNCHANGED\020\001\022\021\n\rSCOPE"
112112
+ "_CHANGED\020\002\"R\n\006Impact\022\026\n\022IMPACT_UNSPECIFI"
113113
+ "ED\020\000\022\017\n\013IMPACT_HIGH\020\001\022\016\n\nIMPACT_LOW\020\002\022\017\n"
114-
+ "\013IMPACT_NONE\020\003B\\\n\rio.grafeas.v1B\tCvssPro"
114+
+ "\013IMPACT_NONE\020\003B\\\n\rio.grafeas.v1B\tCVSSPro"
115115
+ "toP\001Z8google.golang.org/genproto/googlea"
116116
+ "pis/grafeas/v1;grafeas\242\002\003GRAb\006proto3"
117117
};

‎src/main/java/io/grafeas/v1/CVSSv3.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -172,13 +172,13 @@ private CVSSv3(
172172
}
173173

174174
public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
175-
return io.grafeas.v1.CvssProto.internal_static_grafeas_v1_CVSSv3_descriptor;
175+
return io.grafeas.v1.CVSSProto.internal_static_grafeas_v1_CVSSv3_descriptor;
176176
}
177177

178178
@java.lang.Override
179179
protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
180180
internalGetFieldAccessorTable() {
181-
return io.grafeas.v1.CvssProto.internal_static_grafeas_v1_CVSSv3_fieldAccessorTable
181+
return io.grafeas.v1.CVSSProto.internal_static_grafeas_v1_CVSSv3_fieldAccessorTable
182182
.ensureFieldAccessorsInitialized(
183183
io.grafeas.v1.CVSSv3.class, io.grafeas.v1.CVSSv3.Builder.class);
184184
}
@@ -1338,13 +1338,13 @@ public static final class Builder extends com.google.protobuf.GeneratedMessageV3
13381338
// @@protoc_insertion_point(builder_implements:grafeas.v1.CVSSv3)
13391339
io.grafeas.v1.CVSSv3OrBuilder {
13401340
public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
1341-
return io.grafeas.v1.CvssProto.internal_static_grafeas_v1_CVSSv3_descriptor;
1341+
return io.grafeas.v1.CVSSProto.internal_static_grafeas_v1_CVSSv3_descriptor;
13421342
}
13431343

13441344
@java.lang.Override
13451345
protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
13461346
internalGetFieldAccessorTable() {
1347-
return io.grafeas.v1.CvssProto.internal_static_grafeas_v1_CVSSv3_fieldAccessorTable
1347+
return io.grafeas.v1.CVSSProto.internal_static_grafeas_v1_CVSSv3_fieldAccessorTable
13481348
.ensureFieldAccessorsInitialized(
13491349
io.grafeas.v1.CVSSv3.class, io.grafeas.v1.CVSSv3.Builder.class);
13501350
}
@@ -1393,7 +1393,7 @@ public Builder clear() {
13931393

13941394
@java.lang.Override
13951395
public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
1396-
return io.grafeas.v1.CvssProto.internal_static_grafeas_v1_CVSSv3_descriptor;
1396+
return io.grafeas.v1.CVSSProto.internal_static_grafeas_v1_CVSSv3_descriptor;
13971397
}
13981398

13991399
@java.lang.Override

‎src/main/java/io/grafeas/v1/Common.java‎

Lines changed: 44 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,18 @@ public static void registerAllExtensions(com.google.protobuf.ExtensionRegistry r
4444
internal_static_grafeas_v1_EnvelopeSignature_descriptor;
4545
static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
4646
internal_static_grafeas_v1_EnvelopeSignature_fieldAccessorTable;
47+
static final com.google.protobuf.Descriptors.Descriptor
48+
internal_static_grafeas_v1_FileLocation_descriptor;
49+
static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
50+
internal_static_grafeas_v1_FileLocation_fieldAccessorTable;
51+
static final com.google.protobuf.Descriptors.Descriptor
52+
internal_static_grafeas_v1_License_descriptor;
53+
static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
54+
internal_static_grafeas_v1_License_fieldAccessorTable;
55+
static final com.google.protobuf.Descriptors.Descriptor
56+
internal_static_grafeas_v1_Digest_descriptor;
57+
static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
58+
internal_static_grafeas_v1_Digest_fieldAccessorTable;
4759

4860
public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
4961
return descriptor;
@@ -60,14 +72,17 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
6072
+ "\001(\014\022\024\n\014payload_type\030\002 \001(\t\0221\n\nsignatures\030"
6173
+ "\003 \003(\0132\035.grafeas.v1.EnvelopeSignature\"/\n\021"
6274
+ "EnvelopeSignature\022\013\n\003sig\030\001 \001(\014\022\r\n\005keyid\030"
63-
+ "\002 \001(\t*\276\001\n\010NoteKind\022\031\n\025NOTE_KIND_UNSPECIF"
64-
+ "IED\020\000\022\021\n\rVULNERABILITY\020\001\022\t\n\005BUILD\020\002\022\t\n\005I"
65-
+ "MAGE\020\003\022\013\n\007PACKAGE\020\004\022\016\n\nDEPLOYMENT\020\005\022\r\n\tD"
66-
+ "ISCOVERY\020\006\022\017\n\013ATTESTATION\020\007\022\013\n\007UPGRADE\020\010"
67-
+ "\022\016\n\nCOMPLIANCE\020\t\022\024\n\020DSSE_ATTESTATION\020\nBQ"
68-
+ "\n\rio.grafeas.v1P\001Z8google.golang.org/gen"
69-
+ "proto/googleapis/grafeas/v1;grafeas\242\002\003GR"
70-
+ "Ab\006proto3"
75+
+ "\002 \001(\t\"!\n\014FileLocation\022\021\n\tfile_path\030\001 \001(\t"
76+
+ "\"/\n\007License\022\022\n\nexpression\030\001 \001(\t\022\020\n\010comme"
77+
+ "nts\030\002 \001(\t\",\n\006Digest\022\014\n\004algo\030\001 \001(\t\022\024\n\014dig"
78+
+ "est_bytes\030\002 \001(\014*\276\001\n\010NoteKind\022\031\n\025NOTE_KIN"
79+
+ "D_UNSPECIFIED\020\000\022\021\n\rVULNERABILITY\020\001\022\t\n\005BU"
80+
+ "ILD\020\002\022\t\n\005IMAGE\020\003\022\013\n\007PACKAGE\020\004\022\016\n\nDEPLOYM"
81+
+ "ENT\020\005\022\r\n\tDISCOVERY\020\006\022\017\n\013ATTESTATION\020\007\022\013\n"
82+
+ "\007UPGRADE\020\010\022\016\n\nCOMPLIANCE\020\t\022\024\n\020DSSE_ATTES"
83+
+ "TATION\020\nBQ\n\rio.grafeas.v1P\001Z8google.gola"
84+
+ "ng.org/genproto/googleapis/grafeas/v1;gr"
85+
+ "afeas\242\002\003GRAb\006proto3"
7186
};
7287
descriptor =
7388
com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(
@@ -101,6 +116,27 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
101116
new java.lang.String[] {
102117
"Sig", "Keyid",
103118
});
119+
internal_static_grafeas_v1_FileLocation_descriptor = getDescriptor().getMessageTypes().get(4);
120+
internal_static_grafeas_v1_FileLocation_fieldAccessorTable =
121+
new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
122+
internal_static_grafeas_v1_FileLocation_descriptor,
123+
new java.lang.String[] {
124+
"FilePath",
125+
});
126+
internal_static_grafeas_v1_License_descriptor = getDescriptor().getMessageTypes().get(5);
127+
internal_static_grafeas_v1_License_fieldAccessorTable =
128+
new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
129+
internal_static_grafeas_v1_License_descriptor,
130+
new java.lang.String[] {
131+
"Expression", "Comments",
132+
});
133+
internal_static_grafeas_v1_Digest_descriptor = getDescriptor().getMessageTypes().get(6);
134+
internal_static_grafeas_v1_Digest_fieldAccessorTable =
135+
new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
136+
internal_static_grafeas_v1_Digest_descriptor,
137+
new java.lang.String[] {
138+
"Algo", "DigestBytes",
139+
});
104140
}
105141

106142
// @@protoc_insertion_point(outer_class_scope)

‎src/main/java/io/grafeas/v1/Compliance.java‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -67,15 +67,16 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
6767
+ "\021scan_instructions\030\007 \001(\014\032M\n\014CisBenchmark"
6868
+ "\022\025\n\rprofile_level\030\001 \001(\005\022&\n\010severity\030\002 \001("
6969
+ "\0162\024.grafeas.v1.SeverityB\021\n\017compliance_ty"
70-
+ "pe\"5\n\021ComplianceVersion\022\017\n\007cpe_uri\030\001 \001(\t"
71-
+ "\022\017\n\007version\030\002 \001(\t\"p\n\024ComplianceOccurrenc"
72-
+ "e\0229\n\023non_compliant_files\030\002 \003(\0132\034.grafeas"
73-
+ ".v1.NonCompliantFile\022\035\n\025non_compliance_r"
74-
+ "eason\030\003 \001(\t\"I\n\020NonCompliantFile\022\014\n\004path\030"
75-
+ "\001 \001(\t\022\027\n\017display_command\030\002 \001(\t\022\016\n\006reason"
76-
+ "\030\003 \001(\tBQ\n\rio.grafeas.v1P\001Z8google.golang"
77-
+ ".org/genproto/googleapis/grafeas/v1;graf"
78-
+ "eas\242\002\003GRAb\006proto3"
70+
+ "pe\"Q\n\021ComplianceVersion\022\017\n\007cpe_uri\030\001 \001(\t"
71+
+ "\022\032\n\022benchmark_document\030\003 \001(\t\022\017\n\007version\030"
72+
+ "\002 \001(\t\"p\n\024ComplianceOccurrence\0229\n\023non_com"
73+
+ "pliant_files\030\002 \003(\0132\034.grafeas.v1.NonCompl"
74+
+ "iantFile\022\035\n\025non_compliance_reason\030\003 \001(\t\""
75+
+ "I\n\020NonCompliantFile\022\014\n\004path\030\001 \001(\t\022\027\n\017dis"
76+
+ "play_command\030\002 \001(\t\022\016\n\006reason\030\003 \001(\tBQ\n\rio"
77+
+ ".grafeas.v1P\001Z8google.golang.org/genprot"
78+
+ "o/googleapis/grafeas/v1;grafeas\242\002\003GRAb\006p"
79+
+ "roto3"
7980
};
8081
descriptor =
8182
com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(
@@ -111,7 +112,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
111112
new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
112113
internal_static_grafeas_v1_ComplianceVersion_descriptor,
113114
new java.lang.String[] {
114-
"CpeUri", "Version",
115+
"CpeUri", "BenchmarkDocument", "Version",
115116
});
116117
internal_static_grafeas_v1_ComplianceOccurrence_descriptor =
117118
getDescriptor().getMessageTypes().get(2);

0 commit comments

Comments
 (0)