OP-21070 - Backporting changes related to OP-21127 feature (#84)

OpsMx · Sep 19, 2023 · b2ba044 · b2ba044
1 parent 5b96042
commit b2ba044
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 4 deletions.
diff --git a/packages/amazon/src/serverGroup/details/AmazonServerGroupActions.tsx b/packages/amazon/src/serverGroup/details/AmazonServerGroupActions.tsx
@@ -289,7 +289,7 @@ export class AmazonServerGroupActions extends React.Component<IAmazonServerGroup
     const entityTagTargets: IOwnerOption[] = ClusterTargetBuilder.buildClusterTargets(serverGroup);
 
     return (
-      <Dropdown className="dropdown" id="server-group-actions-dropdown">
+      SETTINGS.adHocInfraEditEnabled ? (<Dropdown className="dropdown" id="server-group-actions-dropdown">
         <Dropdown.Toggle className="btn btn-sm btn-primary dropdown-toggle">Server Group Actions</Dropdown.Toggle>
         <Dropdown.Menu className="dropdown-menu">
           {this.isRollbackEnabled() && (
@@ -336,7 +336,7 @@ export class AmazonServerGroupActions extends React.Component<IAmazonServerGroup
             />
           )}
         </Dropdown.Menu>
-      </Dropdown>
+      </Dropdown>):null
     );
   }
 }
diff --git a/packages/core/src/config/settings.ts b/packages/core/src/config/settings.ts
@@ -139,6 +139,7 @@ export interface ISpinnakerSettings {
   triggerTypes: string[];
   useClassicFirewallLabels: boolean;
   kubernetesAdHocInfraWritesEnabled: boolean;
+  adHocInfraEditEnabled: boolean;
   changelogUrl: string;
 }
 
@@ -151,6 +152,7 @@ SETTINGS.analytics = SETTINGS.analytics || {};
 SETTINGS.providers = SETTINGS.providers || {};
 SETTINGS.defaultTimeZone = SETTINGS.defaultTimeZone || 'America/Los_Angeles';
 SETTINGS.dockerInsights = SETTINGS.dockerInsights || { enabled: false, url: '' };
+SETTINGS.adHocInfraEditEnabled = SETTINGS.adHocInfraEditEnabled ?? true;
 SETTINGS.changelogUrl =
   SETTINGS.changelogUrl || 'https://www.spinnaker.io/community/releases/versions/:version-changelog';
 SETTINGS.managedDelivery = SETTINGS.managedDelivery || {

diff --git a/packages/ecs/src/serverGroup/details/serverGroupDetails.ecs.controller.js b/packages/ecs/src/serverGroup/details/serverGroupDetails.ecs.controller.js
@@ -12,6 +12,7 @@ import {
   SERVER_GROUP_WRITER,
   ServerGroupReader,
   ServerGroupWarningMessageService,
+  SETTINGS,
   SubnetReader,
 } from '@spinnaker/core';
 
@@ -313,6 +314,8 @@ angular
         });
       };
 
+      this.isEditEnabled = () =>  SETTINGS.adHocInfraEditEnabled;
+
       this.resizeServerGroup = () => {
         $uibModal.open({
           templateUrl: overrideRegistry.getTemplate('ecs.resize.modal', require('./resize/resizeServerGroup.html')),

diff --git a/packages/ecs/src/serverGroup/details/serverGroupDetails.html b/packages/ecs/src/serverGroup/details/serverGroupDetails.html
@@ -34,7 +34,7 @@ <h3 class="horizontal middle space-between flex-1" select-on-dbl-click>
       </h3>
     </div>
     <div>
-      <div class="actions" ng-class="{ insights: ctrl.serverGroup.insightActions.length > 0 }">
+      <div class="actions" ng-class="{ insights: ctrl.serverGroup.insightActions.length > 0 }" ng-if=" ctrl.isEditEnabled">
         <div class="dropdown" uib-dropdown dropdown-append-to-body>
           <button type="button" class="btn btn-sm btn-primary dropdown-toggle" uib-dropdown-toggle>
             Server Group Actions <span class="caret"></span>

diff --git a/packages/kubernetes/src/serverGroup/details/details.controller.ts b/packages/kubernetes/src/serverGroup/details/details.controller.ts
@@ -196,6 +196,10 @@ class KubernetesServerGroupDetailsController implements IController {
       });
   }
 
+  public isEditEnabled () {
+    return SETTINGS.adHocInfraEditEnabled;
+  }  
+
   private configureEntityTagTargets(): IOwnerOption[] {
     return ClusterTargetBuilder.buildClusterTargets(this.serverGroup);
   }

diff --git a/packages/kubernetes/src/serverGroup/details/details.html b/packages/kubernetes/src/serverGroup/details/details.html
@@ -37,7 +37,7 @@ <h3 class="horizontal middle space-between flex-1" select-on-dbl-click>
         </render-if-feature>
       </h3>
     </div>
-    <div class="actions">
+    <div class="actions" ng-if="ctrl.isEditEnabled()">
       <div class="dropdown" uib-dropdown dropdown-append-to-body>
         <button type="button" class="btn btn-sm btn-primary dropdown-toggle" uib-dropdown-toggle ng-hide="isDisabled">
           {{ctrl.serverGroup.kind | robotToHuman}} Actions <span class="caret"></span>