fix(appengine): allow sequence to be suppressed in servergroup names (#…

…6667)
spinnaker · Mar 12, 2019 · 49affe7 · 49affe7
1 parent 35e82ac
commit 49affe7
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 0 deletions.
diff --git a/app/scripts/modules/appengine/src/helpContents/appengineHelpContents.ts b/app/scripts/modules/appengine/src/helpContents/appengineHelpContents.ts
@@ -69,6 +69,15 @@ const helpContents = [
     value: `The full URL to the container image to use for deployment. The URL must be one of the valid GCR hostnames,
               for example <b>gcr.io/my-project/image:tag</b>`,
   },
+  {
+    key: 'appengine.serverGroup.suppress-version-string',
+    value: `Spinnaker automatically versions your server groups. This means deployments through Spinnaker receive a
+              short version string at the end of their name, like "v001". In most cases you will want to keep this
+              version as part of the name. Preventing this string from being added to your server group will stop
+              it from being considered when rolling back, promoting new versions or executing deployment strategies.
+              If you are certain that you do not want the version string applied to this server group then check
+              this box.`,
+  },
   {
     key: 'appengine.loadBalancer.shardBy.cookie',
     value:

diff --git a/app/scripts/modules/appengine/src/serverGroup/configure/serverGroupCommandBuilder.service.ts b/app/scripts/modules/appengine/src/serverGroup/configure/serverGroupCommandBuilder.service.ts
@@ -38,6 +38,7 @@ export interface IAppengineServerGroupCommand {
   selectedProvider: string;
   promote?: boolean;
   stopPreviousVersion?: boolean;
+  suppressVersionString?: boolean;
   type?: string;
   backingData: any;
   viewState: IViewState;

diff --git a/app/scripts/modules/appengine/src/serverGroup/configure/wizard/advancedSettings.html b/app/scripts/modules/appengine/src/serverGroup/configure/wizard/advancedSettings.html
@@ -22,4 +22,14 @@
       <platform-health-override command="command" platform-health-type="platformHealth"> </platform-health-override>
     </div>
   </div>
+
+  <div class="form-group">
+    <div class="col-md-4 sm-label-right">
+      Supress Version String
+      <help-field key="appengine.serverGroup.suppress-version-string"></help-field>
+    </div>
+    <div class="col-md-7">
+      <input type="checkbox" ng-model="command.suppressVersionString" />
+    </div>
+  </div>
 </div>
diff --git a/app/scripts/modules/appengine/src/serverGroup/transformer.ts b/app/scripts/modules/appengine/src/serverGroup/transformer.ts
@@ -35,6 +35,7 @@ export class AppengineDeployDescription {
   public sourceType: string;
   public storageAccountName?: string;
   public containerImageUrl?: string;
+  public suppressVersionString?: boolean;
 
   constructor(command: IAppengineServerGroupCommand) {
     this.credentials = command.credentials;
@@ -64,6 +65,7 @@ export class AppengineDeployDescription {
     this.sourceType = command.sourceType;
     this.storageAccountName = command.storageAccountName;
     this.containerImageUrl = command.containerImageUrl;
+    this.suppressVersionString = command.suppressVersionString;
   }
 }