feat: Allow creating new AppStream enabled account

addons/addon-base-raas-ui/packages/base-raas-ui/src/models/forms/CreateAwsAccountForm.js

@@ -15,7 +15,7 @@
 
 import { createForm } from '../../helpers/form';
 
-const createAwsAccountFormFields = {
+const createBaseAwsAccountFormFields = {
   accountName: {
     label: 'Account Name',
     placeholder: 'Type the name of this account',
@@ -43,12 +43,56 @@ const createAwsAccountFormFields = {
   },
 };
 
-function getCreateAwsAccountFormFields() {
-  return createAwsAccountFormFields;
+const createAwsAccountAppStreamFormFields = {
+  appStreamFleetDesiredInstances: {
+    label: 'AppStream Fleet Desired Instance',
+    placeholder: 'Number of users that can concurrently access a workspace through AppStream',
+    rules: 'required|integer',
+  },
+  appStreamDisconnectTimeoutSeconds: {
+    label: 'AppStreamDisconnectTimeoutSeconds',
+    placeholder: 'The amount of time that a streaming session remains active after users disconnect',
+    rules: 'required|integer',
+  },
+  appStreamIdleDisconnectTimeoutSeconds: {
+    label: 'AppStreamIdleDisconnectTimeoutSeconds',
+    placeholder:
+      'The amount of time that users can be idle (inactive) before they are disconnected from their streaming session',
+    rules: 'required|integer',
+  },
+  appStreamMaxUserDurationSeconds: {
+    label: 'AppStreamMaxUserDurationSeconds',
+    placeholder: 'The maximum amount of time that a streaming session can remain active, in seconds',
+    rules: 'required|integer',
+  },
+  appStreamImageName: {
+    label: 'AppStreamImageName',
+    placeholder: 'The name of the image used to create the fleet',
+    rules: 'required|string',
+  },
+  appStreamInstanceType: {
+    label: 'AppStreamInstanceType',
+    placeholder:
+      'The instance type to use when launching fleet instances. List of images available at https://aws.amazon.com/appstream2/pricing/',
+    rules: 'required|string',
+  },
+  appStreamFleetType: {
+    label: 'AppStreamFleetType',
+    placeholder: 'The fleet type. Should be either ALWAYS_ON or ON_DEMAND',
+    rules: ['required', 'regex:/^ALWAYS_ON|ON_DEMAND$/'],
+  },
+};
+
+function getCreateBaseAwsAccountFormFields() {
+  return createBaseAwsAccountFormFields;
+}
+
+function getCreateAwsAccountAppStreamFormFields() {
+  return createAwsAccountAppStreamFormFields;
 }
 
-function getCreateAwsAccountForm() {
-  return createForm(createAwsAccountFormFields);
+function getCreateAwsAccountForm(fields) {
+  return createForm(fields);
 }
 
-export { getCreateAwsAccountFormFields, getCreateAwsAccountForm };
+export { getCreateBaseAwsAccountFormFields, getCreateAwsAccountForm, getCreateAwsAccountAppStreamFormFields };

addons/addon-base-raas-ui/packages/base-raas-ui/src/parts/accounts/CreateAwsAccount.js

@@ -24,7 +24,11 @@ import { displayError } from '@aws-ee/base-ui/dist/helpers/notification';
 import { createLink } from '@aws-ee/base-ui/dist/helpers/routing';
 import validate from '@aws-ee/base-ui/dist/models/forms/Validate';
 
-import { getCreateAwsAccountForm, getCreateAwsAccountFormFields } from '../../models/forms/CreateAwsAccountForm';
+import {
+  getCreateAwsAccountForm,
+  getCreateBaseAwsAccountFormFields,
+  getCreateAwsAccountAppStreamFormFields,
+} from '../../models/forms/CreateAwsAccountForm';
 
 class CreateAwsAccount extends React.Component {
   constructor(props) {
@@ -34,8 +38,13 @@ class CreateAwsAccount extends React.Component {
       this.validationErrors = new Map();
       this.awsAccount = {};
     });
-    this.form = getCreateAwsAccountForm();
-    this.createAwsAccountFormFields = getCreateAwsAccountFormFields();
+
+    let fields = getCreateBaseAwsAccountFormFields();
+    if (process.env.REACT_APP_IS_APP_STREAM_ENABLED === 'true') {
+      fields = { ...fields, ...getCreateAwsAccountAppStreamFormFields() };
+    }
+    this.form = getCreateAwsAccountForm(fields);
+    this.createAwsAccountFormFields = fields;
   }
 
   render() {

addons/addon-base-raas/packages/base-raas-cfn-templates/src/templates/onboard-account.cfn.yml

@@ -670,10 +670,10 @@ Resources:
       EnableDefaultInternetAccess: False
       FleetType: !Ref AppStreamFleetType
       IdleDisconnectTimeoutInSeconds: !Ref AppStreamIdleDisconnectTimeoutSeconds
-      ImageName: !Ref AppStreamImageName
+      ImageArn: !Sub 'arn:aws:appstream:${AWS::Region}:${CentralAccountId}:image/${AppStreamImageName}'
       InstanceType: !Ref AppStreamInstanceType
       MaxUserDurationInSeconds: !Ref AppStreamMaxUserDurationSeconds
-      Name: 'ServiceWorkbenchFleet'
+      Name: !Sub ${Namespace}-ServiceWorkbenchFleet
       StreamView: 'APP'
       VpcConfig:
         SecurityGroupIds:
@@ -689,7 +689,7 @@ Resources:
         Enabled: False
       Description: 'SWB AppStream Stack'
       DisplayName: 'SWB Stack'
-      Name: 'ServiceWorkbenchStack'
+      Name: !Sub ${Namespace}-ServiceWorkbenchStack
       UserSettings:
         - Action: 'CLIPBOARD_COPY_FROM_LOCAL_DEVICE'
           Permission: 'ENABLED'
@@ -777,3 +777,15 @@ Outputs:
     Value: !GetAtt VPC.DefaultSecurityGroup
     Export:
       Name: !Join ['', [Ref: Namespace, '-SwbVPCDefaultSG']]
+
+  AppStreamStackName:
+    Description: Name of the stack created by AppStream
+    Condition: isAppStream
+    Value: !Sub ${Namespace}-ServiceWorkbenchStack
+
+  VPCDefaultSG:
+    Description: Default SG for VPC
+    Condition: isAppStream
+    Value: !GetAtt VPC.DefaultSecurityGroup
+    Export:
+      Name: !Join ['', [Ref: Namespace, '-SwbVPCDefaultSG']]

addons/addon-base-raas/packages/base-raas-services/lib/account/__tests__/account-service.test.js

@@ -40,6 +40,7 @@ const AccountService = require('../account-service');
 // Tested Methods: provisionAccount, update, delete
 describe('accountService', () => {
   let service = null;
+  let settingsService = null;
   let dbService = null;
   let wfService = null;
   const error = { code: 'ConditionalCheckFailedException' };
@@ -56,6 +57,7 @@ describe('accountService', () => {
     await container.initServices();
 
     service = await container.find('accountService');
+    settingsService = await container.find('settings');
     dbService = await container.find('dbService');
     wfService = await container.find('workflowTriggerService');
     service.assertAuthorized = jest.fn();
@@ -71,87 +73,176 @@ describe('accountService', () => {
   });
 
   describe('provisionAccount tests', () => {
-    it('should fail to create account with no credentials', async () => {
-      // BUILD
-      // OPERATE
-      try {
-        await service.provisionAccount({}, {});
-        expect.hasAssertions();
-      } catch (err) {
-        // CHECK
-        expect(err.message).toEqual('Input has validation errors');
-      }
-    });
-
-    it('should fail to create account with partial credentials', async () => {
-      // BUILD
-      const dataMissing = {
-        accountName: 'Winston Bishop',
-        accountEmail: 'beanbagchair@example.com',
-        masterRoleArn: '',
-        externalId: '',
-        description: '',
-      };
-
-      // OPERATE
-      try {
-        await service.provisionAccount({}, dataMissing);
-        expect.hasAssertions();
-      } catch (err) {
-        // CHECK
-        expect(err.message).toEqual(
-          'Creating AWS account process has not been correctly configured: missing AWS account ID, VPC ID and VPC Subnet ID.',
-        );
-      }
-    });
-
-    it('should successfully try to provision an account with full credentials', async () => {
-      // BUILD
+    describe('crendentials', () => {
       const iptData = {
         accountName: "Who's that girl?",
         accountEmail: 'itsjest@example.com',
         masterRoleArn: 'reagan :/',
         externalId: '837 Traction Ave',
         description: 'A classic nodejs-lodash mess-around',
       };
-      const outputData = {
+
+      it('should fail to create account with no credentials', async () => {
+        // BUILD
+        // OPERATE
+        try {
+          await service.provisionAccount({}, {});
+          expect.hasAssertions();
+        } catch (err) {
+          // CHECK
+          expect(err.message).toEqual('Input has validation errors');
+        }
+      });
+
+      it('should fail to create account with partial credentials', async () => {
+        // BUILD
+        const inputDataMissing = {
+          ...iptData,
+          masterRoleArn: '',
+          externalId: '',
+          description: '',
+        };
+
+        // OPERATE
+        try {
+          await service.provisionAccount({}, inputDataMissing);
+          expect.hasAssertions();
+        } catch (err) {
+          // CHECK
+          expect(err.message).toEqual(
+            'Creating AWS account process has not been correctly configured: missing AWS account ID, VPC ID and VPC Subnet ID.',
+          );
+        }
+      });
+
+      it('should successfully try to provision an account with full credentials', async () => {
+        // BUILD
+        const fullIptData = { ...iptData };
+        const outputData = {
+          accountName: "Who's that girl?",
+          accountEmail: 'itsjest@example.com',
+          masterRoleArn: 'reagan :/',
+          externalId: '837 Traction Ave',
+          description: 'A classic nodejs-lodash mess-around',
+          callerAccountId: '111111111111',
+        };
+        service.audit = jest.fn();
+        wfService.triggerWorkflow = jest.fn();
+        AWSMock.mock('STS', 'getCallerIdentity', {
+          UserId: 'Jeet',
+          Account: '111111111111',
+          Arn: 'arn:aws:sts::111111111111:assumed-role/Jeet/Jeet',
+        });
+
+        // OPERATE
+        await service.provisionAccount({}, fullIptData);
+
+        // CHECK
+        expect(wfService.triggerWorkflow).toHaveBeenCalledWith(
+          {},
+          {
+            workflowId: 'wf-provision-account',
+          },
+          expect.objectContaining(outputData),
+        );
+        expect(service.audit).toHaveBeenCalledWith(
+          {},
+          {
+            action: 'provision-account',
+            body: {
+              accountName: "Who's that girl?",
+              accountEmail: 'itsjest@example.com',
+              description: 'A classic nodejs-lodash mess-around',
+            },
+          },
+        );
+      });
+    });
+    describe('AppStream', () => {
+      const iptData = {
         accountName: "Who's that girl?",
         accountEmail: 'itsjest@example.com',
         masterRoleArn: 'reagan :/',
         externalId: '837 Traction Ave',
         description: 'A classic nodejs-lodash mess-around',
-        callerAccountId: '111111111111',
+        appStreamFleetDesiredInstances: '2',
+        appStreamDisconnectTimeoutSeconds: '60',
+        appStreamIdleDisconnectTimeoutSeconds: '600',
+        appStreamMaxUserDurationSeconds: '86400',
+        appStreamImageName: 'SWB_v1',
+        appStreamInstanceType: 'stream.standard.medium',
+        appStreamFleetType: 'ALWAYS_ON',
       };
-      service.audit = jest.fn();
-      wfService.triggerWorkflow = jest.fn();
-      AWSMock.mock('STS', 'getCallerIdentity', {
-        UserId: 'Jeet',
-        Account: '111111111111',
-        Arn: 'arn:aws:sts::111111111111:assumed-role/Jeet/Jeet',
+      it('should fail to create account without required AppStream params', async () => {
+        // BUILD
+        const inputMissingAppStreamData = {
+          ...iptData,
+        };
+        delete inputMissingAppStreamData.appStreamImageName;
+        delete inputMissingAppStreamData.appStreamInstanceType;
+
+        settingsService.get = jest.fn(key => {
+          if (key === 'isAppStreamEnabled') {
+            return 'true';
+          }
+          return undefined;
+        });
+
+        // OPERATE && CHECK
+        await expect(service.provisionAccount({}, inputMissingAppStreamData)).rejects.toThrow(
+          'Not all required App Stream params are defined. These params need to be defined: appStreamImageName,appStreamInstanceType',
+        );
       });
 
-      // OPERATE
-      await service.provisionAccount({}, iptData);
+      it('should successfully try to provision an account with full all provided AppStream params', async () => {
+        // BUILD
+        const inputFullData = { ...iptData };
+        const outputData = {
+          accountName: "Who's that girl?",
+          accountEmail: 'itsjest@example.com',
+          masterRoleArn: 'reagan :/',
+          externalId: '837 Traction Ave',
+          description: 'A classic nodejs-lodash mess-around',
+          callerAccountId: '111111111111',
+        };
+        service.audit = jest.fn();
+        wfService.triggerWorkflow = jest.fn();
+        AWSMock.mock('STS', 'getCallerIdentity', {
+          UserId: 'Jeet',
+          Account: '111111111111',
+          Arn: 'arn:aws:sts::111111111111:assumed-role/Jeet/Jeet',
+        });
 
-      // CHECK
-      expect(wfService.triggerWorkflow).toHaveBeenCalledWith(
-        {},
-        {
-          workflowId: 'wf-provision-account',
-        },
-        expect.objectContaining(outputData),
-      );
-      expect(service.audit).toHaveBeenCalledWith(
-        {},
-        {
-          action: 'provision-account',
-          body: {
-            accountName: "Who's that girl?",
-            accountEmail: 'itsjest@example.com',
-            description: 'A classic nodejs-lodash mess-around',
+        settingsService.get = jest.fn(key => {
+          if (key === 'isAppStreamEnabled') {
+            return 'true';
+          }
+          return undefined;
+        });
+
+        // OPERATE
+        await service.provisionAccount({}, inputFullData);
+
+        // CHECK
+        expect(wfService.triggerWorkflow).toHaveBeenCalledWith(
+          {},
+          {
+            workflowId: 'wf-provision-account',
           },
-        },
-      );
+          expect.objectContaining(outputData),
+        );
+        expect(service.audit).toHaveBeenCalledWith(
+          {},
+          {
+            action: 'provision-account',
+            body: {
+              accountName: "Who's that girl?",
+              accountEmail: 'itsjest@example.com',
+              description: 'A classic nodejs-lodash mess-around',
+            },
+          },
+        );
+      });
     });
   });