feat: Merge Egress, AppStream and Account Update features

.github/workflows/deploy-integ-appstream-egress.yml

@@ -0,0 +1,130 @@
+#
+#  Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+#  SPDX-License-Identifier: Apache-2.0
+#
+
+name: Deploy & Integration Test (AppStream and Egress Enabled)
+on:
+  push:
+    branches:
+      - feat-secure-workspace-egress
+jobs:
+  pre-deployment-check:
+    name: Pre deployment check
+    runs-on: ubuntu-18.04
+    timeout-minutes: 10
+    steps:
+      - name: "Block Concurrent Deployments"
+        uses: softprops/turnstyle@v1
+        with:
+          poll-interval-seconds: 10
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+  deploy:
+    name: Deploy to AppStream Dev
+    runs-on: ubuntu-18.04
+    needs: pre-deployment-check
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Use Node.js
+        uses: actions/setup-node@v1
+        with:
+          node-version: 12
+      - uses: actions/setup-go@v2
+        with:
+          go-version: 1.13
+      - name: Install pnpm
+        run: npm install -g pnpm
+      - name: Install dependencies
+        run: ./scripts/install.sh
+      - name: Build all packages
+        run: ./scripts/build-all-packages.sh
+      - name: Deploy
+        env:
+          STAGE_NAME: tre
+          AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID_APPSTREAM_EGRESS}}
+          AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY_APPSTREAM_EGRESS }}
+        run: |
+          cp ./main/end-to-end-tests/e2eGitHubConfig.AppStreamEgress.yml ./main/config/settings/${STAGE_NAME}.yml
+          ./scripts/environment-deploy.sh ${STAGE_NAME}
+  infrastructure-test:
+    name: Infrastructure test
+    runs-on: ubuntu-18.04
+    needs: deploy
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Use Node.js
+        uses: actions/setup-node@v1
+        with:
+          node-version: 12
+      - name: Install pnpm and system libraries
+        run: npm install -g pnpm
+      - name: Install dependencies
+        run: pnpm install
+        working-directory: main/infrastructure-tests
+      - name: Run infrastructure tests
+        run: pnpm run testAppStreamEgressEnabled -- --stage=github
+        working-directory: ./main/infrastructure-tests
+        env:
+          AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID_APPSTREAM_EGRESS }}
+          AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY_APPSTREAM_EGRESS }}
+          INFRA_TESTS_HOSTING_ACCOUNT_ID: ${{ secrets.INFRA_TESTS_HOSTING_ACCOUNT_ID }}
+          INFRA_TESTS_HOSTING_ACCOUNT_STACK_NAME: ${{ secrets.INFRA_TESTS_HOSTING_ACCOUNT_STACK_NAME }}
+  integration-test:
+    name: Integration test
+    runs-on: ubuntu-18.04
+    needs: infrastructure-test
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Use Node.js
+        uses: actions/setup-node@v1
+        with:
+          node-version: 12
+      - name: Install pnpm and system libraries
+        run: |
+          npm install -g pnpm
+          sudo apt-get install libgtk2.0-0 libgtk-3-0 libgbm-dev libnotify-dev libgconf-2-4 libnss3 libxss1 libasound2 libxtst6 xauth xvfb
+      - name: Install dependencies
+        run: pnpm install
+        working-directory: main/integration-tests
+      - name: Run integration tests
+        run: ./scripts/run-integration-tests.sh ${STAGE_NAME} AppStreamEgress
+        working-directory: ./
+        env:
+          DEPLOYMENT_BUCKET: ${{ secrets.DEPLOYMENT_BUCKET_APPSTREAM_EGRESS}}
+          STAGE_NAME: tre
+          AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID_APPSTREAM_EGRESS }}
+          AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY_APPSTREAM_EGRESS }}
+          aws-region: us-east-1
+  cypress-test:
+    name: Cypress test
+    runs-on: ubuntu-18.04
+    needs: integration-test
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Use Node.js
+        uses: actions/setup-node@v1
+        with:
+          node-version: 12
+      - name: Install pnpm and system libraries
+        run: |
+          npm install -g pnpm
+          sudo apt-get install libgtk2.0-0 libgtk-3-0 libgbm-dev libnotify-dev libgconf-2-4 libnss3 libxss1 libasound2 libxtst6 xauth xvfb
+      - name: Install dependencies
+        run: pnpm install
+        working-directory: main/end-to-end-tests
+      - name: Run cypress test
+        run: pnpm run cypress:run-tests:github:appstream-egress-enabled
+        working-directory: main/end-to-end-tests
+        env:
+          # Env parameters for cypress tests need header 'CYPRESS_' or 'cypress_'
+          # Cypress will strip the header and pass it to the tests
+          CYPRESS_BASE_URL: ${{ secrets.CYPRESS_BASE_URL_APPSTREAM_EGRESS}}
+          CYPRESS_researcherEmail: ${{ secrets.CYPRESS_RESEARCHER_EMAIL_APPSTREAM_EGRESS}}
+          CYPRESS_researcherPassword: ${{ secrets.CYPRESS_RESEARCHER_PASSWORD_APPSTREAM_EGRESS}}
+          CYPRESS_adminEmail: ${{ secrets.CYPRESS_ADMIN_EMAIL_APPSTREAM_EGRESS}}
+          CYPRESS_adminPassword: ${{ secrets.CYPRESS_ADMIN_PASSWORD_APPSTREAM_EGRESS}}

.gitignore

@@ -32,6 +32,7 @@ docs/build
 */*/*/config/settings/*.yml
 !*/*/*/config/settings/.defaults.yml
 !*/*/*/config/settings/example*.yml
+!main/infrastructure-tests/config/settings/github.yml
 
 # rStudio specific
 source/ServiceWorkbenchOnAWS/main/solution/machine-images/config/infra/files/rstudio/*

CHANGELOG.md

@@ -360,4 +360,4 @@ We recommend to apply this patch as soon as possible
 
 ### Added
 
-- Initial launch! :rocket:
+- Initial launch! :rocket:

addons/addon-base-post-deployment/packages/base-post-deployment/package.json

@@ -2,14 +2,14 @@
   "name": "@aws-ee/base-post-deployment",
   "version": "1.0.0",
   "private": true,
-  "description": "A library containing base set of post-deployment steps to be run with solutions based on <TODO-NAME> addons",
+  "description": "A library containing base set of post-deployment steps",
   "author": "Amazon Web Services",
   "license": "Apache-2.0",
   "dependencies": {
     "@aws-ee/base-api-services": "workspace:*",
     "@aws-ee/base-services": "workspace:*",
     "@aws-ee/base-services-container": "workspace:*",
-    "aws-sdk": "^2.647.0",
+    "aws-sdk": "^2.1000.0",
     "generate-password": "^1.5.0",
     "lodash": "^4.17.21"
   },

addons/addon-base-pre-deployment/packages/base-pre-deployment/.eslintrc.json

@@ -0,0 +1,25 @@
+{
+  "extends": ["plugin:jest/recommended", "airbnb-base", "prettier"],
+  "plugins": ["jest", "prettier"],
+  "rules": {
+    "prettier/prettier": ["error"],
+    "no-unused-vars": [
+      "error",
+      {
+        "varsIgnorePattern": "^_.+",
+        "argsIgnorePattern": "^_",
+        "caughtErrorsIgnorePattern": "^_",
+        "args": "after-used",
+        "ignoreRestSiblings": true
+      }
+    ],
+    "prefer-destructuring": 0,
+    "no-underscore-dangle": 0,
+    "no-param-reassign": 0,
+    "class-methods-use-this": 0,
+    "no-use-before-define": 0
+  },
+  "env": {
+    "jest/globals": true
+  }
+}

addons/addon-base-pre-deployment/packages/base-pre-deployment/.gitignore

@@ -0,0 +1,23 @@
+**/.class
+**/.DS_Store
+**/coverage
+**/node_modules
+
+**/npm-debug.log
+**/pnpm-debug.log
+
+# Serverless directories
+.serverless
+
+# Webpack generated directories
+.webpack
+
+# VisualStudioCode.gitignore
+.vscode/*
+!.vscode/settings.json
+!.vscode/tasks.json
+!.vscode/launch.json
+!.vscode/extensions.json
+
+# IntelliJ Idea Module Files
+*.iml

addons/addon-base-pre-deployment/packages/base-pre-deployment/.prettierrc.json

@@ -0,0 +1,7 @@
+{
+  "tabWidth": 2,
+  "printWidth": 120,
+  "singleQuote": true,
+  "quoteProps": "consistent",
+  "trailingComma": "all"
+}

addons/addon-base-pre-deployment/packages/base-pre-deployment/README.md

@@ -0,0 +1,13 @@
+## To invoke pre deployment locally
+
+After you run
+
+```
+$ pnpx sls deploy -s <stage>
+```
+
+You can invoke lambda locally
+
+```
+$ pnpx sls invoke local -f preDeployment -s <stage>
+```

addons/addon-base-pre-deployment/packages/base-pre-deployment/jest.config.js

@@ -0,0 +1,26 @@
+/*
+ *  Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License").
+ *  You may not use this file except in compliance with the License.
+ *  A copy of the License is located at
+ *
+ *  http://aws.amazon.com/apache2.0
+ *
+ *  or in the "license" file accompanying this file. This file is distributed
+ *  on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ *  express or implied. See the License for the specific language governing
+ *  permissions and limitations under the License.
+ */
+
+// jest.config.js
+module.exports = {
+  // verbose: true,
+  notify: false,
+  testEnvironment: 'node',
+  // testPathIgnorePatterns: ['service.test.js'],
+
+  // Configure JUnit reporter as CodeBuild currently only supports JUnit or Cucumber reports
+  // See https://docs.aws.amazon.com/codebuild/latest/userguide/test-reporting.html
+  reporters: ['default', ['jest-junit', { suiteName: 'jest tests', outputDirectory: './.build/test' }]],
+};

addons/addon-base-pre-deployment/packages/base-pre-deployment/jsconfig.json

@@ -0,0 +1,6 @@
+{
+  "exclude": [
+    "node_modules",
+    "**/node_modules/*"
+  ]
+}

addons/addon-base-pre-deployment/packages/base-pre-deployment/lib/deployment-store-service.js

@@ -0,0 +1,88 @@
+/*
+ *  Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License").
+ *  You may not use this file except in compliance with the License.
+ *  A copy of the License is located at
+ *
+ *  http://aws.amazon.com/apache2.0
+ *
+ *  or in the "license" file accompanying this file. This file is distributed
+ *  on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ *  express or implied. See the License for the specific language governing
+ *  permissions and limitations under the License.
+ */
+
+const Service = require('@aws-ee/base-services-container/lib/service');
+const { runAndCatch } = require('@aws-ee/base-services/lib/helpers/utils');
+
+const createOrUpdateSchema = require('./schema/deployment-item');
+
+const settingKeys = {
+  tableName: 'dbDeploymentStore',
+};
+
+class DeploymentStoreService extends Service {
+  constructor() {
+    super();
+    this.dependency(['jsonSchemaValidationService', 'dbService']);
+  }
+
+  async init() {
+    await super.init();
+    const [dbService] = await this.service(['dbService']);
+    const table = this.settings.get(settingKeys.tableName);
+
+    this._getter = () => dbService.helper.getter().table(table);
+    this._updater = () => dbService.helper.updater().table(table);
+    this._query = () => dbService.helper.query().table(table);
+    this._deleter = () => dbService.helper.deleter().table(table);
+  }
+
+  async find({ type, id, fields = [] }) {
+    return this._getter()
+      .key({ type, id })
+      .projection(fields)
+      .get();
+  }
+
+  async mustFind({ type, id, fields = [] }) {
+    const result = await this.find({ type, id, fields });
+    if (!result) throw this.boom.notFound(`deployment item of type "${type}" and id "${id}" does not exist`, true);
+    return result;
+  }
+
+  async createOrUpdate(rawData) {
+    const [validationService] = await this.service(['jsonSchemaValidationService']);
+
+    // Validate input
+    await validationService.ensureValid(rawData, createOrUpdateSchema);
+
+    const { type, id } = rawData;
+
+    // Time to save the the db object
+    return this._updater()
+      .key({ type, id })
+      .item(rawData)
+      .update();
+  }
+
+  async delete({ type, id }) {
+    // Lets now remove the item from the database
+    const result = await runAndCatch(
+      async () => {
+        return this._deleter()
+          .condition('attribute_exists(type) and attribute_exists(id)') // yes we need this
+          .key({ type, id })
+          .delete();
+      },
+      async () => {
+        throw this.boom.notFound(`deployment item of type "${type}" and id "${id}" does not exist`, true);
+      },
+    );
+
+    return result;
+  }
+}
+
+module.exports = DeploymentStoreService;