From 1446faca4d7e6d24079722c8dd56f51c35f4d010 Mon Sep 17 00:00:00 2001
From: Michael Plump <plumpy@google.com>
Date: Fri, 11 Dec 2020 14:18:57 -0500
Subject: [PATCH] feat(targetShape): remove the ALPHA conditional on the
 targetShape (#8787)

This feature has now launched to GA:
https://cloud.google.com/compute/docs/instance-groups/distributing-instances-with-regional-instance-groups#setting_a_policy_for_distributing_instances_across_zones
---
 .../configure/serverGroupConfiguration.service.js     |  2 +-
 .../wizard/zones/targetShapeSelector.directive.html   |  5 +----
 .../details/serverGroupDetails.gce.controller.js      | 11 -----------
 .../src/serverGroup/details/serverGroupDetails.html   |  4 ++--
 4 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/app/scripts/modules/google/src/serverGroup/configure/serverGroupConfiguration.service.js b/app/scripts/modules/google/src/serverGroup/configure/serverGroupConfiguration.service.js
index 708cc5fcd2e..118c275ecf2 100644
--- a/app/scripts/modules/google/src/serverGroup/configure/serverGroupConfiguration.service.js
+++ b/app/scripts/modules/google/src/serverGroup/configure/serverGroupConfiguration.service.js
@@ -175,7 +175,7 @@ angular
 
       function configureDistributionPolicyTargetShape(command) {
         const accountDetails = command.backingData.credentialsKeyedByAccount[command.credentials];
-        if (accountDetails.computeVersion === 'ALPHA' && !command.distributionPolicy.targetShape) {
+        if (!command.distributionPolicy.targetShape) {
           command.distributionPolicy.targetShape = 'EVEN';
         }
       }
diff --git a/app/scripts/modules/google/src/serverGroup/configure/wizard/zones/targetShapeSelector.directive.html b/app/scripts/modules/google/src/serverGroup/configure/wizard/zones/targetShapeSelector.directive.html
index 8f6bca18832..8352dde1e99 100644
--- a/app/scripts/modules/google/src/serverGroup/configure/wizard/zones/targetShapeSelector.directive.html
+++ b/app/scripts/modules/google/src/serverGroup/configure/wizard/zones/targetShapeSelector.directive.html
@@ -1,7 +1,4 @@
-<div
-  class="form-group"
-  ng-if="vm.command.regional && vm.command.backingData.credentialsKeyedByAccount[vm.command.credentials].computeVersion === 'ALPHA'"
->
+<div class="form-group">
   <div class="col-md-3 sm-label-right"><b>Target Shape</b></div>
   <div class="col-md-3">
     <ui-select ng-model="vm.command.distributionPolicy.targetShape" class="form-control input-sm" required>
diff --git a/app/scripts/modules/google/src/serverGroup/details/serverGroupDetails.gce.controller.js b/app/scripts/modules/google/src/serverGroup/details/serverGroupDetails.gce.controller.js
index a85b53c28d5..de2ddeefa39 100644
--- a/app/scripts/modules/google/src/serverGroup/details/serverGroupDetails.gce.controller.js
+++ b/app/scripts/modules/google/src/serverGroup/details/serverGroupDetails.gce.controller.js
@@ -157,7 +157,6 @@ angular
             augmentTagsWithHelp();
             configureEntityTagTargets();
             processLabels();
-            retrieveComputeVersion(details.account);
           } else {
             autoClose();
           }
@@ -275,12 +274,6 @@ angular
         }
       };
 
-      const retrieveComputeVersion = (accountId) => {
-        AccountService.getAccountDetails(accountId).then((accountDetails) => {
-          this.serverGroup.computeVersion = accountDetails.computeVersion;
-        });
-      };
-
       const processLabels = () => {
         if (!_.size(this.serverGroup.instanceTemplateLabels)) {
           delete this.serverGroup.instanceTemplateLabels;
@@ -511,10 +504,6 @@ angular
         return null;
       };
 
-      this.isAlphaListed = () => {
-        return this.serverGroup.computeVersion === 'ALPHA';
-      };
-
       const configureEntityTagTargets = () => {
         this.entityTagTargets = ClusterTargetBuilder.buildClusterTargets(this.serverGroup);
       };
diff --git a/app/scripts/modules/google/src/serverGroup/details/serverGroupDetails.html b/app/scripts/modules/google/src/serverGroup/details/serverGroupDetails.html
index 837ccd46b0d..d0befd3ad32 100644
--- a/app/scripts/modules/google/src/serverGroup/details/serverGroupDetails.html
+++ b/app/scripts/modules/google/src/serverGroup/details/serverGroupDetails.html
@@ -106,8 +106,8 @@ <h4 class="text-center" ng-if="ctrl.serverGroup.isDisabled">[SERVER GROUP IS DIS
             <li ng-repeat="zone in ctrl.serverGroup.zones">{{zone}}</li>
           </ul>
         </dd>
-        <dt ng-if="ctrl.serverGroup.regional && ctrl.isAlphaListed()">Target Shape</dt>
-        <dd ng-if="ctrl.serverGroup.regional && ctrl.isAlphaListed()">
+        <dt ng-if="ctrl.serverGroup.regional">Target Shape</dt>
+        <dd ng-if="ctrl.serverGroup.regional">
           {{ctrl.serverGroup.distributionPolicy.targetShape}}
         </dd>
       </dl>