federated ssm

Author: urz9999

package-lock.json

@@ -16,12 +16,12 @@
             "email": "paolo.diciaula@besharp.it"
         },
         {
-          "name" : "Eric Villa",
-          "email": "eric@noovolari.com"
+            "name": "Eric Villa",
+            "email": "eric@noovolari.com"
         },
         {
-          "name": "Andrea Cavagna",
-          "email": "andrea.cavagna@noovolari.com"
+            "name": "Andrea Cavagna",
+            "email": "andrea.cavagna@noovolari.com"
         }
     ],
     "repository": "https://github.com/Noovolari/leapp",
@@ -198,7 +198,7 @@
         "@types/jasminewd2": "~2.0.3",
         "@types/node": "^10.17.27",
         "codelyzer": "^5.2.2",
-        "electron": "8.5.2",
+        "electron": "^8.5.2",
         "electron-builder": "^22.7.0",
         "electron-builder-squirrel-windows": "^21.1.3",
         "electron-installer-dmg": "^3.0.0",

package.json

@@ -48,9 +48,9 @@ export class AppComponent implements OnInit {
 
     // Prevent Dev Tool to show on production mode
     this.app.currentBrowserWindow().webContents.on('devtools-opened', () => {
-      // if (environment.production) {
+      if (environment.production) {
         this.app.currentBrowserWindow().webContents.closeDevTools();
-      // }
+      }
     });
 
     // We get the right moment to set an hook to app close

src/app/app.component.ts

@@ -60,6 +60,9 @@ export class AwsStrategy extends RefreshCredentialsStrategy {
     const secretKey = await this.keychainService.getSecret(environment.appName, this.appService.keychainGenerateSecretString(session.account.accountName, (session.account as AwsPlainAccount).user));
     const credentials = {default: {aws_access_key_id: accessKey, aws_secret_access_key: secretKey}};
 
+    workspace.ssmCredentials = credentials;
+    this.configurationService.updateWorkspaceSync(workspace);
+
     this.fileService.iniWriteSync(this.appService.awsCredentialPath(), credentials);
     this.configurationService.disableLoadingWhenReady(workspace, session);
   }

src/app/models/strategies/awsStrategy.ts

@@ -13,5 +13,5 @@ export interface Workspace {
   azureProfile: string;
 
   sessions: Session[];
-  awsCredentials?: AwsCredentials;
+  ssmCredentials?: any;
 }

src/app/models/workspace.ts

@@ -147,13 +147,19 @@ export class SsmService {
    * @param data - the credential information
    * @param region - the region for the client
    */
-  setConfig(data: { default: AwsCredential }, region) {
-    return {
+  setConfig(data: AwsCredential , region) {
+
+    return data.aws_session_token ? {
+      region,
+      credentials: {
+        accessKeyId: data.aws_access_key_id,
+        secretAccessKey: data.aws_secret_access_key,
+        sessionToken: data.aws_session_token
+      }} : {
       region,
       credentials: {
-        accessKeyId: data.default.aws_access_key_id,
-        secretAccessKey: data.default.aws_secret_access_key,
-        sessionToken: data.default.aws_session_token
+        accessKeyId: data.aws_access_key_id,
+        secretAccessKey: data.aws_secret_access_key
       }};
   }
 }

src/app/services/ssm.service.ts

@@ -411,6 +411,9 @@ export class WorkspaceService extends NativeService {
     credential.aws_secret_access_key = secretAccessKey;
     credential.aws_session_token = sessionToken;
 
+    workspace.ssmCredentials = credential;
+    this.configurationService.updateWorkspaceSync(workspace);
+
     // Return it!
     return {default: credential};
   }

src/app/services/workspace.service.ts

@@ -7,7 +7,7 @@
     <a dropdownToggle class="drop-list-container" aria-controls="drop-list" (click)="openDropDown($event);"><i
       class="fa fa-ellipsis-v"></i></a>
     <div id="drop-list" *dropdownMenu class="dropdown-menu drop-list dropdown-menu-right" role="menu" aria-labelledby="button-basic">
-      <a (click)="ssmModalOpen(session, $event);" *ngIf="(session.account.type === eAccountType.AWS || session.account.type === eAccountType.AWS_PLAIN_USER) && session.active">SSM session</a>
+      <a (click)="ssmModalOpen(session, $event);" *ngIf="(session.account.type === eAccountType.AWS) && session.active">SSM session</a>
       <a (click)="removeAccount(session, $event);">Remove account</a>
       <ng-container *ngIf="session.account.type === eAccountType.AWS">
       <a (click)="copyCredentials(session, 1, $event);">Copy Account Number</a>
@@ -24,7 +24,7 @@
 <ng-template #ssmModalTemplate>
   <div class="modal-header">
     <button type="button" class="back" aria-label="Close" (click)="modalRef.hide();"><i class="fa fa-arrow-left"></i></button>
-    <b>{{session.account.accountName}}</b> - {{$any(session.account).role.name}} | <b>SSM</b>
+    <b>{{session.account.accountName}}</b> - {{$any(session.account).role ? $any(session.account).role.name : 'Plain' }} | <b>SSM</b>
   </div>
   <div class="modal-body">
 

src/app/session/session-card/session-card.component.html

@@ -181,7 +181,8 @@ export class SessionCardComponent implements OnInit {
     if (this.selectedSsmRegion) {
       this.ssmloading = true;
       // Set the aws credentials to instanziate the ssm client
-      const credentials = this.configurationService.getDefaultWorkspaceSync().awsCredentials;
+      const credentials = this.configurationService.getDefaultWorkspaceSync().ssmCredentials;
+
       // Check the result of the call
       this.ssmService.setInfo(credentials, this.selectedSsmRegion).subscribe(result => {
         this.instances = result.instances;