Titus - ensure soft and hard contraints are unique when copying from …

…source job
spinnaker · Mar 26, 2018 · 402b6f7 · 402b6f7
1 parent 26a820f
commit 402b6f7
Showing 1 changed file with 16 additions and 2 deletions.
diff --git a/.../groovy/com/netflix/spinnaker/clouddriver/titus/deploy/handlers/TitusDeployHandler.groovy b/.../groovy/com/netflix/spinnaker/clouddriver/titus/deploy/handlers/TitusDeployHandler.groovy
@@ -133,8 +133,22 @@ class TitusDeployHandler implements DeployHandler<TitusDeployDescription> {
         description.inService = description.inService ?: sourceJob.inService
         description.migrationPolicy = description.migrationPolicy ?: sourceJob.migrationPolicy
         description.jobType = description.jobType ?: "service"
-        description.softConstraints = description.softConstraints ?: sourceJob.softConstraints
-        description.hardConstraints = description.hardConstraints ?: sourceJob.hardConstraints
+        if (!description.hardConstraints) description.hardConstraints = []
+        if (!description.softConstraints) description.softConstraints = []
+        if (description.softConstraints.empty && sourceJob.softConstraints) {
+          sourceJob.softConstraints.each {
+            if (!description.hardConstraints.contains(it)) {
+              description.softConstraints.add(it)
+            }
+          }
+        }
+        if (description.hardConstraints.empty && sourceJob.hardConstraints) {
+          sourceJob.hardConstraints.each {
+            if (!description.softConstraints.contains(it)) {
+              description.hardConstraints.add(it)
+            }
+          }
+        }
       }
 
       task.updateStatus BASE_PHASE, "Preparing deployment to ${account}:${region}${subnet ? ':' + subnet : ''}..."