Skip to content

Commit 76cf487

Browse files
afcastanomergify[bot]
authored andcommitted
feat(gcb): Ability to invoke existing GCB triggers (#3288)
* feat(gcb): Ability to invoke existing GCB triggers * style(gcb): Use enum to specify the google cloud build definition source
1 parent 77ac9ba commit 76cf487

5 files changed

Lines changed: 117 additions & 10 deletions

File tree

‎orca/orca-igor/src/main/groovy/com/netflix/spinnaker/orca/igor/IgorService.java‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717

1818
import com.netflix.spinnaker.kork.artifacts.model.Artifact;
1919
import com.netflix.spinnaker.orca.igor.model.GoogleCloudBuild;
20+
import com.netflix.spinnaker.orca.igor.model.GoogleCloudBuildRepoSource;
2021
import java.util.List;
2122
import java.util.Map;
2223
import retrofit.http.*;
@@ -78,4 +79,10 @@ GoogleCloudBuild getGoogleCloudBuild(
7879
@GET("/gcb/builds/{account}/{buildId}/artifacts")
7980
List<Artifact> getGoogleCloudBuildArtifacts(
8081
@Path("account") String account, @Path("buildId") String buildId);
82+
83+
@POST("/gcb/triggers/{account}/{triggerId}/run")
84+
GoogleCloudBuild runGoogleCloudBuildTrigger(
85+
@Path("account") String account,
86+
@Path("triggerId") String triggerId,
87+
@Body GoogleCloudBuildRepoSource repoSource);
8188
}
Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
/*
2+
* Copyright 2019 Andres Castano.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License")
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
17+
package com.netflix.spinnaker.orca.igor.model;
18+
19+
import com.fasterxml.jackson.annotation.JsonCreator;
20+
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
21+
import com.fasterxml.jackson.annotation.JsonProperty;
22+
import lombok.Builder;
23+
import lombok.Getter;
24+
25+
@Builder
26+
@Getter
27+
@JsonIgnoreProperties(ignoreUnknown = true)
28+
public class GoogleCloudBuildRepoSource {
29+
private final String branchName;
30+
private final String commitSha;
31+
private final String tagName;
32+
33+
@JsonCreator
34+
public GoogleCloudBuildRepoSource(
35+
@JsonProperty("branchName") String branchName,
36+
@JsonProperty("commitSha") String commitSha,
37+
@JsonProperty("tagName") String tagName) {
38+
this.branchName = branchName;
39+
this.commitSha = commitSha;
40+
this.tagName = tagName;
41+
}
42+
}

‎orca/orca-igor/src/main/groovy/com/netflix/spinnaker/orca/igor/model/GoogleCloudBuildStageDefinition.java‎

Lines changed: 23 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,10 @@ public class GoogleCloudBuildStageDefinition implements RetryableStageDefinition
2727
private final String account;
2828
private final GoogleCloudBuild buildInfo;
2929
private final Map<String, Object> buildDefinition;
30-
private final String buildDefinitionSource;
30+
private final BuildDefinitionSource buildDefinitionSource;
3131
private final GoogleCloudBuildDefinitionArtifact buildDefinitionArtifact;
32+
private final String triggerId;
33+
private final GoogleCloudBuildRepoSource repoSource;
3234
private final int consecutiveErrors;
3335

3436
// There does not seem to be a way to auto-generate a constructor using our current version of
@@ -41,14 +43,19 @@ public GoogleCloudBuildStageDefinition(
4143
@JsonProperty("buildDefinitionSource") String buildDefinitionSource,
4244
@JsonProperty("buildDefinitionArtifact")
4345
GoogleCloudBuildDefinitionArtifact buildDefinitionArtifact,
46+
@JsonProperty("triggerId") String triggerId,
47+
@JsonProperty("repoSource") GoogleCloudBuildRepoSource repoSource,
4448
@JsonProperty("consecutiveErrors") Integer consecutiveErrors) {
4549
this.account = account;
4650
this.buildInfo = build;
4751
this.buildDefinition = buildDefinition;
48-
this.buildDefinitionSource = buildDefinitionSource;
52+
this.buildDefinitionSource = BuildDefinitionSource.fromString(buildDefinitionSource);
4953
this.buildDefinitionArtifact =
5054
Optional.ofNullable(buildDefinitionArtifact)
5155
.orElse(new GoogleCloudBuildDefinitionArtifact(null, null, null));
56+
this.repoSource =
57+
Optional.ofNullable(repoSource).orElse(new GoogleCloudBuildRepoSource(null, null, null));
58+
this.triggerId = triggerId;
5259
this.consecutiveErrors = Optional.ofNullable(consecutiveErrors).orElse(0);
5360
}
5461

@@ -67,4 +74,18 @@ public GoogleCloudBuildDefinitionArtifact(
6774
this.artifactId = artifactId;
6875
}
6976
}
77+
78+
public enum BuildDefinitionSource {
79+
STAGE,
80+
ARTIFACT,
81+
TRIGGER;
82+
83+
public static BuildDefinitionSource fromString(String buildDefinitionSource) {
84+
try {
85+
return valueOf(buildDefinitionSource.toUpperCase());
86+
} catch (NullPointerException | IllegalArgumentException e) {
87+
return STAGE;
88+
}
89+
}
90+
}
7091
}

‎orca/orca-igor/src/main/groovy/com/netflix/spinnaker/orca/igor/tasks/StartGoogleCloudBuildTask.java‎

Lines changed: 20 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -55,15 +55,27 @@ public TaskResult execute(@Nonnull Stage stage) {
5555
GoogleCloudBuildStageDefinition stageDefinition =
5656
stage.mapTo(GoogleCloudBuildStageDefinition.class);
5757

58-
Map<String, Object> buildDefinition;
59-
if (stageDefinition.getBuildDefinitionSource() != null
60-
&& stageDefinition.getBuildDefinitionSource().equals("artifact")) {
61-
buildDefinition = getBuildDefinitionFromArtifact(stage, stageDefinition);
62-
} else {
63-
buildDefinition = stageDefinition.getBuildDefinition();
58+
GoogleCloudBuild result;
59+
switch (stageDefinition.getBuildDefinitionSource()) {
60+
case ARTIFACT:
61+
result =
62+
igorService.createGoogleCloudBuild(
63+
stageDefinition.getAccount(),
64+
getBuildDefinitionFromArtifact(stage, stageDefinition));
65+
break;
66+
case TRIGGER:
67+
result =
68+
igorService.runGoogleCloudBuildTrigger(
69+
stageDefinition.getAccount(),
70+
stageDefinition.getTriggerId(),
71+
stageDefinition.getRepoSource());
72+
break;
73+
default:
74+
result =
75+
igorService.createGoogleCloudBuild(
76+
stageDefinition.getAccount(), stageDefinition.getBuildDefinition());
6477
}
65-
GoogleCloudBuild result =
66-
igorService.createGoogleCloudBuild(stageDefinition.getAccount(), buildDefinition);
78+
6779
Map<String, Object> context = stage.getContext();
6880
context.put("buildInfo", result);
6981
return TaskResult.builder(ExecutionStatus.SUCCEEDED).context(context).build();

‎orca/orca-igor/src/test/groovy/com/netflix/spinnaker/orca/igor/tasks/StartGoogleCloudBuildTaskSpec.groovy‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,31 @@ class StartGoogleCloudBuildTaskSpec extends Specification {
8181
result.context.buildInfo == igorResponse
8282
}
8383

84+
def "starts a build defined as a gcb trigger"() {
85+
given:
86+
def igorResponse = GoogleCloudBuild.builder()
87+
.id("98edf783-162c-4047-9721-beca8bd2c275")
88+
.build()
89+
def stage = new Stage(execution, "googleCloudBuild", [
90+
account: ACCOUNT,
91+
buildDefinitionSource: "trigger",
92+
triggerId: "myTriggerId",
93+
repoSource: [
94+
branchName: "myBranch"
95+
],
96+
name: "My GCB Stage"
97+
])
98+
99+
when:
100+
TaskResult result = task.execute(stage);
101+
102+
then:
103+
1 * igorService.runGoogleCloudBuildTrigger(
104+
ACCOUNT,"myTriggerId",{ it.getBranchName() == "myBranch" }) >> igorResponse
105+
106+
result.context.buildInfo == igorResponse
107+
}
108+
84109
def "starts a build defined as an artifact"() {
85110
given:
86111
def igorResponse = GoogleCloudBuild.builder()

0 commit comments

Comments
 (0)