Create infra and deployment commands

Makefile

@@ -1,9 +1,6 @@
 SELF_DIR := $(dir $(lastword $(MAKEFILE_LIST)))
 include $(SELF_DIR)/Makefile.base.mk
 
-bootstrap-infra:
-	pnpm nx run tools:bootstrap-infra
-	pnpm nx run --output-style=stream infra-shared:bootstrap
 
 setup:
 	pnpm nx run-many --skip-nx-cache --target=setup --projects=core,backend,workers,webapp,e2e-tests
@@ -12,13 +9,6 @@ setup:
 # Infrastructure deployment
 #
 
-deploy-env-infra:
-	pnpm nx run --output-style=stream infra-shared:deploy:global
-	pnpm nx run --output-style=stream infra-shared:deploy:main
-	pnpm nx run --output-style=stream infra-shared:deploy:db
-	pnpm nx run --output-style=stream infra-functions:deploy
-	pnpm nx run --output-style=stream infra-shared:deploy:ci
-	pnpm nx run --output-style=stream infra-shared:deploy:components
 
 upload-version:
 	pnpm nx run --output-style=stream tools:upload-version migrations,api,workers,webapp

Makefile.base.mk

@@ -34,11 +34,6 @@ export HOST_UID
 USER_SHELL=$(shell env | grep '^SHELL=' | cut -d '=' -f 2)
 
 
-
-aws-login:
-	aws-vault login $(AWS_VAULT_PROFILE)
-
-
 secrets-editor: SERVICE_NAME?=
 secrets-editor:
 	pnpm nx run ssm-editor:compose-build-image

packages/backend/project.json

@@ -92,6 +92,15 @@
         "commands": ["nx cdk:deploy:api", "nx cdk:deploy:migrations"],
         "parallel": false
       }
+    },
+    "diff": {
+      "executor": "nx:run-commands",
+      "options": {
+        "cwd": "packages/backend",
+        "color": true,
+        "commands": ["nx diff:api", "nx diff:migrations"],
+        "parallel": false
+      }
     }
   },
   "tags": ["service"]

packages/infra/infra-functions/package.json

@@ -8,6 +8,7 @@
   "scripts": {
     "build": "sls package",
     "deploy": "sls deploy",
+    "diff": "echo 'no-diff-available'",
     "remove": "sls remove"
   },
   "dependencies": {

packages/infra/infra-functions/serverless.yml

@@ -7,7 +7,7 @@ provider:
   runtime: nodejs16.x
   versionFunctions: false
   stage: "${env:ENV_STAGE}"
-  region: "${env:AWS_DEFAULT_REGION}"
+  region: "${env:AWS_REGION, env:AWS_DEFAULT_REGION}"
   stackName: ${self:custom.conf.stackName}
   iamRoleStatements: ${self:custom.conf.iam}
   environment: ${self:custom.conf.environment}

packages/internal/cli/src/commands/aws/deploy-app.ts

@@ -0,0 +1,18 @@
+import { Command } from '@oclif/core';
+
+import { initConfig } from '../../config/init';
+import { runCommand } from '../../lib/runCommand';
+
+export default class DeployApp extends Command {
+  static description = 'Get currently selected ENV stage';
+
+  static examples = [`$ saas aws bootstrap`];
+
+  async run(): Promise<void> {
+    await initConfig(this, { requireAws: true });
+
+    await runCommand('pnpm', ['nx', 'run', 'backend:deploy']);
+    await runCommand('pnpm', ['nx', 'run', 'workers:deploy']);
+    await runCommand('pnpm', ['nx', 'run', 'webapp:deploy']);
+  }
+}

packages/internal/cli/src/commands/aws/login.ts

@@ -4,7 +4,7 @@ import { initConfig } from '../../config/init';
 import { runCommand } from '../../lib/runCommand';
 import { assertAwsVaultInstalled } from '../../lib/awsVault';
 
-export default class GetEnv extends Command {
+export default class AwsLogin extends Command {
   static description = 'Get currently selected ENV stage';
 
   static examples = [`$ saas aws login`];

packages/internal/cli/src/commands/backend/build.ts

@@ -7,7 +7,7 @@ import { runCommand } from '../../lib/runCommand';
 export default class BackendBuild extends Command {
   static description = 'Starts all backend services';
 
-  static examples = [`$ saas backend up`];
+  static examples = [`$ <%= config.bin %> <%= command.id %>`];
 
   async run(): Promise<void> {
     const { envStage, version, awsRegion, awsAccountId } = await initConfig(

packages/internal/cli/src/commands/backend/down.ts

@@ -7,7 +7,7 @@ import { assertDockerIsRunning } from '../../lib/docker';
 export default class BackendUp extends Command {
   static description = 'Stops all backend services';
 
-  static examples = [`$ saas backend down`];
+  static examples = [`$ <%= config.bin %> <%= command.id %>`];
 
   async run(): Promise<void> {
     await initConfig(this, { requireLocalEnvStage: true });

packages/internal/cli/src/commands/backend/remote-shell.ts

@@ -6,13 +6,10 @@ import { initConfig } from '../../config/init';
 import { runCommand } from '../../lib/runCommand';
 
 export default class RemoteShell extends Command {
-  static description = 'Say hello world';
+  static description = 'Use aws execute-command to start a /bin/bash session inside a running backend task in ' +
+      'ECS cluster';
 
-  static examples = [
-    `<%= config.bin %> <%= command.id %>
-hello world! (./src/commands/hello/world.ts)
-`,
-  ];
+  static examples = [`<%= config.bin %> <%= command.id %>`];
 
   static flags = {};
 

packages/internal/cli/src/commands/deploy.ts

@@ -0,0 +1,33 @@
+import { Command, Flags } from '@oclif/core';
+
+import { initConfig } from '../config/init';
+import { runCommand } from '../lib/runCommand';
+
+export default class Deploy extends Command {
+  static description = 'Starts both backend and frontend';
+
+  static examples = [`$ <%= config.bin %> <%= command.id %>`];
+
+  static flags = {
+    diff: Flags.boolean({
+      default: false,
+      description:
+        'Perform a dry run and list all changes that would be applied in AWS account',
+      required: false,
+    }),
+  };
+
+  async run(): Promise<void> {
+    const { flags } = await this.parse(Deploy);
+    await initConfig(this, { requireAws: true });
+
+    const verb = flags.diff ? 'diff' : 'deploy';
+    await runCommand('pnpm', [
+      'nx',
+      'run-many',
+      '--output-style=stream',
+      `--target=${verb}`,
+      '--projects=backend,workers,webapp',
+    ]);
+  }
+}

packages/internal/cli/src/commands/infra/bootstrap.ts

@@ -0,0 +1,22 @@
+import { Command } from '@oclif/core';
+
+import { initConfig } from '../../config/init';
+import { runCommand } from '../../lib/runCommand';
+
+export default class InfraBootstrap extends Command {
+  static description =
+    'Bootstrap infrastructure in AWS account by creating resources necessary to start working with SaaS ' +
+    'Boilerplate';
+
+  static examples = [`<%= config.bin %> <%= command.id %>`];
+
+  async run(): Promise<void> {
+    await initConfig(this, {
+      requireAws: true,
+      validateEnvStageVariables: false,
+    });
+
+    await runCommand('pnpm', ['nx', 'run', 'tools:bootstrap-infra']);
+    await runCommand('pnpm', ['nx', 'run', 'infra-shared:bootstrap']);
+  }
+}

packages/internal/cli/src/commands/infra/deploy.ts

@@ -0,0 +1,33 @@
+import { Command, Flags } from '@oclif/core';
+
+import { initConfig } from '../../config/init';
+import { runCommand } from '../../lib/runCommand';
+
+export default class InfraDeploy extends Command {
+  static description =
+    'Deploy infrastructure of a currently selected environment stage to AWS account';
+
+  static examples = [`$ <%= config.bin %> <%= command.id %>`];
+
+  static flags = {
+    diff: Flags.boolean({
+      default: false,
+      description:
+        'Perform a dry run and list all changes that would be applied',
+      required: false,
+    }),
+  };
+
+  async run(): Promise<void> {
+    const { flags } = await this.parse(InfraDeploy);
+    await initConfig(this, { requireAws: true });
+
+    const verb = flags.diff ? 'diff' : 'deploy';
+    await runCommand('pnpm', ['nx', 'run', `infra-shared:${verb}:global`]);
+    await runCommand('pnpm', ['nx', 'run', `infra-shared:${verb}:main`]);
+    await runCommand('pnpm', ['nx', 'run', `infra-shared:${verb}:db`]);
+    await runCommand('pnpm', ['nx', 'run', `infra-functions:${verb}`]);
+    await runCommand('pnpm', ['nx', 'run', `infra-shared:${verb}:ci`]);
+    await runCommand('pnpm', ['nx', 'run', `infra-shared:${verb}:components`]);
+  }
+}

packages/internal/cli/src/commands/webapp/up.ts

@@ -5,7 +5,7 @@ import { runCommand } from '../../lib/runCommand';
 export default class WebappUp extends Command {
   static description = 'Starts frontend service';
 
-  static examples = [`$ saas webapp up`];
+  static examples = [`$ <%= config.bin %> <%= command.id %>`];
 
   async run(): Promise<void> {
     await initConfig(this, { requireLocalEnvStage: true });

packages/internal/cli/src/config/aws.ts

@@ -41,8 +41,9 @@ async function loadStageEnv(
       Object.keys(parsed).length
     } environmental variables from SSM Parameter Store using chamber.\n`
   );
+
   // @ts-ignore
-  dotenv.populate(process.env, parsed);
+  dotenv.populate(process.env, parsed, { override: true });
 
   if (shouldValidate) {
     await validateStageEnv();

packages/internal/cli/src/config/init.ts

@@ -7,7 +7,7 @@ import { resolve } from 'path';
 
 import { ENV_STAGE_LOCAL, loadDotenv, loadVersionEnv } from './env';
 import { initAWS } from './aws';
-import { getEnvStage } from './storage';
+import { loadEnvStage } from './storage';
 
 const exec = promisify(childProcess.exec);
 
@@ -34,7 +34,7 @@ export const initConfig = async (
   const rootPath = await getRootPath();
   await loadDotenv({ rootPath });
   const version = await loadVersionEnv();
-  const envStage = await getEnvStage();
+  const envStage = await loadEnvStage();
   const projectName = process.env.PROJECT_NAME;
 
   if (!projectName) {

packages/internal/cli/src/config/storage.ts

@@ -21,9 +21,11 @@ export const getConfigStorage = async () => {
   return storage;
 };
 
-export const getEnvStage = async (): Promise<string> => {
+export const loadEnvStage = async (): Promise<string> => {
   const storage = await getConfigStorage();
-  return (await storage.getItem(getEnvStageKey())) ?? ENV_STAGE_LOCAL;
+  const value = (await storage.getItem(getEnvStageKey())) ?? ENV_STAGE_LOCAL;
+  process.env.ENV_STAGE = value;
+  return value;
 };
 
 export const setEnvStage = async (value: string) => {

packages/webapp/project.json

@@ -78,6 +78,15 @@
         ],
         "parallel": false
       }
+    },
+    "diff": {
+      "executor": "nx:run-commands",
+      "options": {
+        "cwd": "packages/webapp",
+        "color": true,
+        "commands": ["pnpm run cdk diff *WebAppStack"],
+        "parallel": false
+      }
     }
   },
   "tags": []

packages/workers/package.json

@@ -7,7 +7,8 @@
     "stop-task-scheduling-executions": "/bin/bash ./scripts/stop-task-scheduling-executions.sh",
     "lint:js": "eslint .",
     "sls": "sls",
-    "serverless": "serverless"
+    "serverless": "serverless",
+    "diff": "echo 'no-diff-available'"
   },
   "author": "",
   "license": "ISC",