feat(gce): avoid empty tags

spinnaker · Sep 24, 2024 · e6ad49a · e6ad49a
1 parent 53ae2aa
commit e6ad49a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 17 deletions.
diff --git a/.../google/src/serverGroup/configure/wizard/advancedSettings/advancedSettings.directive.html b/.../google/src/serverGroup/configure/wizard/advancedSettings/advancedSettings.directive.html
@@ -92,7 +92,7 @@
     <b>Resource Manager Tags</b>
     <help-field key="gce.serverGroup.resourceManagerTags"></help-field>
   </div>
-  <map-editor model="vm.command.resourceManagerTags" add-button-label="Add New Tag" allow-empty="true"></map-editor>
+  <map-editor model="vm.command.resourceManagerTags" add-button-label="Add New Tag" allow-empty="false"></map-editor>
 </div>
 <div class="form-group">
   <div class="sm-label-left">

diff --git a/.../serverGroup/configure/wizard/advancedSettings/advancedSettingsSelector.directive.spec.js b/.../serverGroup/configure/wizard/advancedSettings/advancedSettingsSelector.directive.spec.js
@@ -18,7 +18,7 @@ describe('Directive: GCE Group Advanced Settings Selector', function () {
       );
       this.gceTagManager = gceTagManager;
       this.scope = $rootScope.$new();
-      this.scope.command = { instanceMetadata: [], tags: [], labels: [], authScopes: [] };
+      this.scope.command = { instanceMetadata: [], tags: [], labels: [], authScopes: [], resourceManagerTags: [] };
       this.elem = angular.element(
         '<gce-server-group-advanced-settings-selector command="command"></gce-server-group-advanced-settings-selector>',
       );
@@ -55,19 +55,4 @@ describe('Directive: GCE Group Advanced Settings Selector', function () {
     expect(this.scope.command.tags[0].value).toEqual('myTag2');
     expect(this.gceTagManager.updateSelectedTags).toHaveBeenCalled();
   });
-
-  it('should correctly add ResourceManagerTags to the command', function () {
-    expect(this.scope.command.resourceManagerTags.length).toEqual(0);
-
-    this.elem.find('table.resourceManagerTags button').trigger('click');
-    this.scope.$apply();
-    expect(this.scope.command.tags.length).toEqual(1);
-
-    this.elem.find('table.resourceManagerTags input').val('myTag').trigger('input');
-    this.scope.$apply();
-
-    expect(this.scope.command.tags.length).toEqual(1);
-    expect(this.scope.command.tags[0].value).toEqual('myTag');
-  });
-
 });