fix(google): prevent parent server group from overwriting null clone …

…autohealing policies
spinnaker · Jan 9, 2019 · d4127fa · d4127fa
1 parent 4eef691
commit d4127fa
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/.../modules/google/src/serverGroup/configure/wizard/autoHealingPolicy/autoHealingPolicy.html b/.../modules/google/src/serverGroup/configure/wizard/autoHealingPolicy/autoHealingPolicy.html
@@ -5,7 +5,7 @@
     </div>
     <div class="col-md-6 checkbox">
       <label>
-        <input type="checkbox" ng-model="command.enableAutoHealing"/>
+        <input type="checkbox" ng-model="command.enableAutoHealing" ng-change="ctrl.onEnableAutoHealingChange()"/>
       </label>
     </div>
   </div>

diff --git a/...cripts/modules/google/src/serverGroup/configure/wizard/cloneServerGroup.gce.controller.js b/...cripts/modules/google/src/serverGroup/configure/wizard/cloneServerGroup.gce.controller.js
@@ -388,6 +388,14 @@ module.exports = angular
       gceServerGroupConfigurationService.refreshHealthChecks($scope.command);
     };
 
+    this.onEnableAutoHealingChange = function() {
+      // Prevent empty auto-healing policies from being overwritten by those of their ancestors
+      $scope.command.overwriteAncestorAutoHealingPolicy =
+        $scope.command.stack === 'clone' &&
+        $scope.command.autoHealingPolicy != null &&
+        $scope.command.enableAutoHealing === false;
+    };
+
     this.setAutoHealingPolicy = function(autoHealingPolicy) {
       $scope.command.autoHealingPolicy = autoHealingPolicy;
     };