AWS and ECS changes according to new requirement And fixed build rela…

…ted issue (#83)
OpsMx · Oct 26, 2023 · 494dcd6 · 494dcd6
1 parent e043909
commit 494dcd6
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 31 deletions.
diff --git a/packages/amazon/src/serverGroup/details/AmazonServerGroupActions.tsx b/packages/amazon/src/serverGroup/details/AmazonServerGroupActions.tsx
@@ -287,7 +287,7 @@ export class AmazonServerGroupActions extends React.Component<IAmazonServerGroup
 
     return (
       <>
-        {AWSProviderSettings.adHocInfraWritesEnabled && (
+        {AWSProviderSettings.adHocInfraWritesEnabled && 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">

diff --git a/packages/core/src/config/settings.ts b/packages/core/src/config/settings.ts
@@ -151,7 +151,7 @@ export interface ISpinnakerSettings {
   kubernetesAdHocInfraWritesEnabled: boolean;
   kubernetesAdHocInfraEditEnabled: boolean;
   changelogUrl: string;
-  ecsAdHocInfraEditEnabled: boolean;
+  adHocInfraEditEnabled: boolean;
 }
 
 export const SETTINGS: ISpinnakerSettings = (window as any).spinnakerSettings || {};
@@ -161,7 +161,7 @@ SETTINGS.feature = SETTINGS.feature || {};
 SETTINGS.feature.roscoMode = SETTINGS.feature.roscoMode ?? true;
 SETTINGS.kubernetesAdHocInfraWritesEnabled = SETTINGS.kubernetesAdHocInfraWritesEnabled ?? true;
 SETTINGS.kubernetesAdHocInfraEditEnabled = SETTINGS.kubernetesAdHocInfraEditEnabled ?? false;
-SETTINGS.ecsAdHocInfraEditEnabled = SETTINGS.ecsAdHocInfraEditEnabled ?? false;
+SETTINGS.adHocInfraEditEnabled = SETTINGS.adHocInfraEditEnabled ?? true;
 SETTINGS.analytics = SETTINGS.analytics || {};
 SETTINGS.providers = SETTINGS.providers || {};
 SETTINGS.defaultTimeZone = SETTINGS.defaultTimeZone || 'America/Los_Angeles';

diff --git a/packages/ecs/src/serverGroup/details/serverGroupDetails.ecs.controller.js b/packages/ecs/src/serverGroup/details/serverGroupDetails.ecs.controller.js
@@ -366,19 +366,7 @@ angular
       };
 
       this.isEditEnabled = () => {
-        const authenticatedUser = AuthenticationService.getAuthenticatedUser();
-        const applicationAttr = this.application.attributes;
-        const isExist = (arr1, arr2) => {
-          return arr1?.some((v) => arr2?.includes(v));
-        };
-        const isWriteEnabled = () => {
-          if (authenticatedUser.name !== applicationAttr.user && applicationAttr.permissions) {
-            return isExist(applicationAttr.permissions?.WRITE, authenticatedUser.roles);
-          } else {
-            return true;
-          }
-        };
-        return SETTINGS.ecsAdHocInfraEditEnabled ? isWriteEnabled() : true;
+        return SETTINGS.adHocInfraEditEnabled;
       };
     },
   ]);
diff --git a/test/functional/cypress/integration/ecs/clusters_list.spec.js b/test/functional/cypress/integration/ecs/clusters_list.spec.js
@@ -29,16 +29,6 @@ describe('Amazon ECS: aws-prod-ecsdemo cluster', () => {
     cy.get('.sub-group:contains("aws-prod-ecsdemo")')
       .find('.server-group:contains("v000")')
       .click({ force: true });
-
-    cy.get('.btn:contains("Server Group Actions")')
-      .click()
-      .get('.dropdown-menu')
-      .get('.ng-scope')
-      .should('contain.text', 'Rollback');
-
-    cy.get('a:contains("Rollback")').click({ force: true });
-
-    cy.get('.modal-title').should('contain.text', 'Rollback aws-prod-ecsdemo');
   });
 
   it('shows stored details view and ECS server group actions', () => {
@@ -47,11 +37,6 @@ describe('Amazon ECS: aws-prod-ecsdemo cluster', () => {
     cy.get('.sub-group:contains("aws-prod-ecsdemo")')
       .find('.server-group:contains("v000")')
       .click({ force: true });
-
-    cy.get('.btn:contains("Server Group Actions")')
-      .click()
-      .get('a:contains("Rollback")')
-      .click();
   });
 
   it('shows stored instance details view action', () => {