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

Commit 84ce78e

Browse files
feat: Update cloudbuild proto with the service_account for BYOSA Triggers. (#586)
- [ ] Regenerate this pull request now. Committer: @emoryruscus PiperOrigin-RevId: 392957767 Source-Link: googleapis/googleapis@5572865 Source-Link: https://github.com/googleapis/googleapis-gen/commit/bc40f42cd8c669e2a87a2cc672e70c37f361d224
1 parent 33af5f8 commit 84ce78e

File tree

7 files changed

+933
-459
lines changed

7 files changed

+933
-459
lines changed

google-cloud-build/src/test/java/com/google/cloud/devtools/cloudbuild/v1/CloudBuildClientTest.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -565,6 +565,7 @@ public void createBuildTriggerTest() throws Exception {
565565
.addAllIgnoredFiles(new ArrayList<String>())
566566
.addAllIncludedFiles(new ArrayList<String>())
567567
.setFilter("filter-1274492040")
568+
.setServiceAccount("serviceAccount1079137720")
568569
.build();
569570
mockCloudBuild.addResponse(expectedResponse);
570571

@@ -620,6 +621,7 @@ public void getBuildTriggerTest() throws Exception {
620621
.addAllIgnoredFiles(new ArrayList<String>())
621622
.addAllIncludedFiles(new ArrayList<String>())
622623
.setFilter("filter-1274492040")
624+
.setServiceAccount("serviceAccount1079137720")
623625
.build();
624626
mockCloudBuild.addResponse(expectedResponse);
625627

@@ -756,6 +758,7 @@ public void updateBuildTriggerTest() throws Exception {
756758
.addAllIgnoredFiles(new ArrayList<String>())
757759
.addAllIncludedFiles(new ArrayList<String>())
758760
.setFilter("filter-1274492040")
761+
.setServiceAccount("serviceAccount1079137720")
759762
.build();
760763
mockCloudBuild.addResponse(expectedResponse);
761764

proto-google-cloud-build-v1/src/main/java/com/google/cloudbuild/v1/BuildStep.java

Lines changed: 186 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ private BuildStep() {
4848
secretEnv_ = com.google.protobuf.LazyStringArrayList.EMPTY;
4949
volumes_ = java.util.Collections.emptyList();
5050
status_ = 0;
51+
script_ = "";
5152
}
5253

5354
@java.lang.Override
@@ -208,6 +209,13 @@ private BuildStep(
208209
pullTiming_ = subBuilder.buildPartial();
209210
}
210211

212+
break;
213+
}
214+
case 154:
215+
{
216+
java.lang.String s = input.readStringRequireUtf8();
217+
218+
script_ = s;
211219
break;
212220
}
213221
default:
@@ -1090,6 +1098,57 @@ public com.google.cloudbuild.v1.Build.Status getStatus() {
10901098
return result == null ? com.google.cloudbuild.v1.Build.Status.UNRECOGNIZED : result;
10911099
}
10921100

1101+
public static final int SCRIPT_FIELD_NUMBER = 19;
1102+
private volatile java.lang.Object script_;
1103+
/**
1104+
*
1105+
*
1106+
* <pre>
1107+
* A shell script to be executed in the step.
1108+
* When script is provided, the user cannot specify the entrypoint or args.
1109+
* </pre>
1110+
*
1111+
* <code>string script = 19;</code>
1112+
*
1113+
* @return The script.
1114+
*/
1115+
@java.lang.Override
1116+
public java.lang.String getScript() {
1117+
java.lang.Object ref = script_;
1118+
if (ref instanceof java.lang.String) {
1119+
return (java.lang.String) ref;
1120+
} else {
1121+
com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
1122+
java.lang.String s = bs.toStringUtf8();
1123+
script_ = s;
1124+
return s;
1125+
}
1126+
}
1127+
/**
1128+
*
1129+
*
1130+
* <pre>
1131+
* A shell script to be executed in the step.
1132+
* When script is provided, the user cannot specify the entrypoint or args.
1133+
* </pre>
1134+
*
1135+
* <code>string script = 19;</code>
1136+
*
1137+
* @return The bytes for script.
1138+
*/
1139+
@java.lang.Override
1140+
public com.google.protobuf.ByteString getScriptBytes() {
1141+
java.lang.Object ref = script_;
1142+
if (ref instanceof java.lang.String) {
1143+
com.google.protobuf.ByteString b =
1144+
com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
1145+
script_ = b;
1146+
return b;
1147+
} else {
1148+
return (com.google.protobuf.ByteString) ref;
1149+
}
1150+
}
1151+
10931152
private byte memoizedIsInitialized = -1;
10941153

10951154
@java.lang.Override
@@ -1143,6 +1202,9 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
11431202
if (pullTiming_ != null) {
11441203
output.writeMessage(13, getPullTiming());
11451204
}
1205+
if (!getScriptBytes().isEmpty()) {
1206+
com.google.protobuf.GeneratedMessageV3.writeString(output, 19, script_);
1207+
}
11461208
unknownFields.writeTo(output);
11471209
}
11481210

@@ -1211,6 +1273,9 @@ public int getSerializedSize() {
12111273
if (pullTiming_ != null) {
12121274
size += com.google.protobuf.CodedOutputStream.computeMessageSize(13, getPullTiming());
12131275
}
1276+
if (!getScriptBytes().isEmpty()) {
1277+
size += com.google.protobuf.GeneratedMessageV3.computeStringSize(19, script_);
1278+
}
12141279
size += unknownFields.getSerializedSize();
12151280
memoizedSize = size;
12161281
return size;
@@ -1248,6 +1313,7 @@ public boolean equals(final java.lang.Object obj) {
12481313
if (!getTimeout().equals(other.getTimeout())) return false;
12491314
}
12501315
if (status_ != other.status_) return false;
1316+
if (!getScript().equals(other.getScript())) return false;
12511317
if (!unknownFields.equals(other.unknownFields)) return false;
12521318
return true;
12531319
}
@@ -1301,6 +1367,8 @@ public int hashCode() {
13011367
}
13021368
hash = (37 * hash) + STATUS_FIELD_NUMBER;
13031369
hash = (53 * hash) + status_;
1370+
hash = (37 * hash) + SCRIPT_FIELD_NUMBER;
1371+
hash = (53 * hash) + getScript().hashCode();
13041372
hash = (29 * hash) + unknownFields.hashCode();
13051373
memoizedHashCode = hash;
13061374
return hash;
@@ -1489,6 +1557,8 @@ public Builder clear() {
14891557
}
14901558
status_ = 0;
14911559

1560+
script_ = "";
1561+
14921562
return this;
14931563
}
14941564

@@ -1565,6 +1635,7 @@ public com.google.cloudbuild.v1.BuildStep buildPartial() {
15651635
result.timeout_ = timeoutBuilder_.build();
15661636
}
15671637
result.status_ = status_;
1638+
result.script_ = script_;
15681639
onBuilt();
15691640
return result;
15701641
}
@@ -1709,6 +1780,10 @@ public Builder mergeFrom(com.google.cloudbuild.v1.BuildStep other) {
17091780
if (other.status_ != 0) {
17101781
setStatusValue(other.getStatusValue());
17111782
}
1783+
if (!other.getScript().isEmpty()) {
1784+
script_ = other.script_;
1785+
onChanged();
1786+
}
17121787
this.mergeUnknownFields(other.unknownFields);
17131788
onChanged();
17141789
return this;
@@ -4206,6 +4281,117 @@ public Builder clearStatus() {
42064281
return this;
42074282
}
42084283

4284+
private java.lang.Object script_ = "";
4285+
/**
4286+
*
4287+
*
4288+
* <pre>
4289+
* A shell script to be executed in the step.
4290+
* When script is provided, the user cannot specify the entrypoint or args.
4291+
* </pre>
4292+
*
4293+
* <code>string script = 19;</code>
4294+
*
4295+
* @return The script.
4296+
*/
4297+
public java.lang.String getScript() {
4298+
java.lang.Object ref = script_;
4299+
if (!(ref instanceof java.lang.String)) {
4300+
com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
4301+
java.lang.String s = bs.toStringUtf8();
4302+
script_ = s;
4303+
return s;
4304+
} else {
4305+
return (java.lang.String) ref;
4306+
}
4307+
}
4308+
/**
4309+
*
4310+
*
4311+
* <pre>
4312+
* A shell script to be executed in the step.
4313+
* When script is provided, the user cannot specify the entrypoint or args.
4314+
* </pre>
4315+
*
4316+
* <code>string script = 19;</code>
4317+
*
4318+
* @return The bytes for script.
4319+
*/
4320+
public com.google.protobuf.ByteString getScriptBytes() {
4321+
java.lang.Object ref = script_;
4322+
if (ref instanceof String) {
4323+
com.google.protobuf.ByteString b =
4324+
com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
4325+
script_ = b;
4326+
return b;
4327+
} else {
4328+
return (com.google.protobuf.ByteString) ref;
4329+
}
4330+
}
4331+
/**
4332+
*
4333+
*
4334+
* <pre>
4335+
* A shell script to be executed in the step.
4336+
* When script is provided, the user cannot specify the entrypoint or args.
4337+
* </pre>
4338+
*
4339+
* <code>string script = 19;</code>
4340+
*
4341+
* @param value The script to set.
4342+
* @return This builder for chaining.
4343+
*/
4344+
public Builder setScript(java.lang.String value) {
4345+
if (value == null) {
4346+
throw new NullPointerException();
4347+
}
4348+
4349+
script_ = value;
4350+
onChanged();
4351+
return this;
4352+
}
4353+
/**
4354+
*
4355+
*
4356+
* <pre>
4357+
* A shell script to be executed in the step.
4358+
* When script is provided, the user cannot specify the entrypoint or args.
4359+
* </pre>
4360+
*
4361+
* <code>string script = 19;</code>
4362+
*
4363+
* @return This builder for chaining.
4364+
*/
4365+
public Builder clearScript() {
4366+
4367+
script_ = getDefaultInstance().getScript();
4368+
onChanged();
4369+
return this;
4370+
}
4371+
/**
4372+
*
4373+
*
4374+
* <pre>
4375+
* A shell script to be executed in the step.
4376+
* When script is provided, the user cannot specify the entrypoint or args.
4377+
* </pre>
4378+
*
4379+
* <code>string script = 19;</code>
4380+
*
4381+
* @param value The bytes for script to set.
4382+
* @return This builder for chaining.
4383+
*/
4384+
public Builder setScriptBytes(com.google.protobuf.ByteString value) {
4385+
if (value == null) {
4386+
throw new NullPointerException();
4387+
}
4388+
checkByteStringIsUtf8(value);
4389+
4390+
script_ = value;
4391+
onChanged();
4392+
return this;
4393+
}
4394+
42094395
@java.lang.Override
42104396
public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
42114397
return super.setUnknownFields(unknownFields);

proto-google-cloud-build-v1/src/main/java/com/google/cloudbuild/v1/BuildStepOrBuilder.java

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -653,4 +653,31 @@ public interface BuildStepOrBuilder
653653
* @return The status.
654654
*/
655655
com.google.cloudbuild.v1.Build.Status getStatus();
656+
657+
/**
658+
*
659+
*
660+
* <pre>
661+
* A shell script to be executed in the step.
662+
* When script is provided, the user cannot specify the entrypoint or args.
663+
* </pre>
664+
*
665+
* <code>string script = 19;</code>
666+
*
667+
* @return The script.
668+
*/
669+
java.lang.String getScript();
670+
/**
671+
*
672+
*
673+
* <pre>
674+
* A shell script to be executed in the step.
675+
* When script is provided, the user cannot specify the entrypoint or args.
676+
* </pre>
677+
*
678+
* <code>string script = 19;</code>
679+
*
680+
* @return The bytes for script.
681+
*/
682+
com.google.protobuf.ByteString getScriptBytes();
656683
}

0 commit comments

Comments
 (0)