@@ -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}
0 commit comments