diff --git a/orca-clouddriver/src/main/groovy/com/netflix/spinnaker/orca/clouddriver/tasks/providers/appengine/AppEngineServerGroupCreator.groovy b/orca-clouddriver/src/main/groovy/com/netflix/spinnaker/orca/clouddriver/tasks/providers/appengine/AppEngineServerGroupCreator.groovy index 838c617d1c..6322f50713 100644 --- a/orca-clouddriver/src/main/groovy/com/netflix/spinnaker/orca/clouddriver/tasks/providers/appengine/AppEngineServerGroupCreator.groovy +++ b/orca-clouddriver/src/main/groovy/com/netflix/spinnaker/orca/clouddriver/tasks/providers/appengine/AppEngineServerGroupCreator.groovy @@ -75,8 +75,10 @@ class AppEngineServerGroupCreator implements ServerGroupCreator { List configArtifacts = operation.configArtifacts if (configArtifacts != null && configArtifacts.size() > 0) { operation.configArtifacts = configArtifacts.collect { artifactAccountPair -> - def artifact = artifactUtils.getBoundArtifactForStage(stage, artifactAccountPair.id, artifactAccountPair.artifact) - artifact.artifactAccount = artifactAccountPair.account + def artifact = artifactUtils.getBoundArtifactForStage(stage, artifactAccountPair.id, objectMapper.convertValue(artifactAccountPair.artifact, Artifact.class)) + if (artifactAccountPair.account != null){ + artifact.artifactAccount = artifactAccountPair.account + } return artifact } }