standardizing environements

gugzkumar · Dec 23, 2019 · 17dba4f · 17dba4f
1 parent fdbefe5
commit 17dba4f
Show file tree

Hide file tree

Showing 9 changed files with 38 additions and 50 deletions.
diff --git a/...structure/bin/CheetSheetInfrastructure.ts → .aws-infrastructure/bin/cdk.ts b/...structure/bin/CheetSheetInfrastructure.ts → .aws-infrastructure/bin/cdk.ts
@@ -2,6 +2,7 @@
 import 'source-map-support/register';
 import cdk = require('@aws-cdk/core');
 import { CheetSheetInfrastructureStack } from '../lib/CheetSheetInfrastructure-stack';
+import { CheetSheetNetworkStack } from '../lib/CheetSheetNetwork-stack';
 const ENVIRONMENT = process.env['ENVIRONMENT'] || '';
 
 if (ENVIRONMENT === '') {
@@ -18,3 +19,12 @@ new CheetSheetInfrastructureStack(
         }
     }
 );
+new CheetSheetNetworkStack(
+    app,
+    `CheetSheetNetworkStack-${ENVIRONMENT}`,
+    {
+        env: {
+            'region': process.env['AWS_DEFAULT_REGION']
+        }
+    }
+);
diff --git a/.aws-infrastructure/cdk.json b/.aws-infrastructure/cdk.json
@@ -1,3 +1,3 @@
 {
-  "app": "npx ts-node bin/CheetSheetInfrastructure.ts"
+  "app": "npx ts-node bin/cdk.ts"
 }
diff --git a/.aws-infrastructure/package.json b/.aws-infrastructure/package.json
@@ -2,7 +2,7 @@
   "name": "cheet-sheet-infrastructure",
   "version": "0.1.0",
   "bin": {
-    "src": "bin/CheetSheetInfrastructure.js"
+    "src": "bin/cdk.js"
   },
   "scripts": {
     "build": "tsc",

diff --git a/README.md b/README.md
@@ -22,9 +22,15 @@ DO NOT TRY REPLICATING SERVICES
 - https://aws.amazon.com/premiumsupport/knowledge-center/decode-verify-cognito-json-token/
 - https://github.com/jpadilla/pyjwt/issues/359
 
+## Run Infrastructure Deploy Environment
+```
+docker-compose -f docker-compose.deploy.infrastructure.yml down -v && docker-compose -f docker-compose.deploy.infrastructure.yml up --build -d
+```
 
+## Run Code Deploy Environment
+```
 docker-compose -f docker-compose.deploy.code.yml down -v && docker-compose -f docker-compose.deploy.code.yml up --build -d
-docker-compose -f docker-compose.deploy.infrastructure.yml down -v && docker-compose -f docker-compose.deploy.infrastructure.yml up --build -d
+```
 
 
 

diff --git a/api/src/__core__/settings.py b/api/src/__core__/settings.py
@@ -1,5 +1,4 @@
 from os import environ
-from __core__.utilities import decode_base64_to_json
 
 AVAILABLE_FILE_TYPES = [
     'abap', 'abc', 'actionscript', 'ada', 'apache_conf', 'apex', 'applescript', 'asciidoc', 'asl',

diff --git a/api/standup-api.sh b/api/standup-api.sh
@@ -1,6 +1,4 @@
 # Starts the API with SAM LOCAL
-# sam build --use-container
-# sam local start-api --host 0.0.0.0 -p 3000 -v $SAM_LOCAL_ABSOLUTE_PATH
-# pip install -r ./requirements.txt -t src/__dependencies__
 sam local start-api --skip-pull-image --host 0.0.0.0 -p 3000 -v $SAM_LOCAL_ABSOLUTE_PATH \
-    --parameter-overrides LayerArn=$LAMBDA_LAYER
+    --parameter-overrides LayerArn=$LAMBDA_LAYER RoleArn=$LAMBDA_IAM_ROLE SheetDataBucket=$SHEET_DATA_S3_BUCKET \
+    CognitoClientId=$COGNITO_CLIENT_ID CognitoJWKSBase64=$COGNITO_JWKS_BASE64
diff --git a/api/template.yaml b/api/template.yaml
@@ -9,6 +9,18 @@ Parameters:
   LayerArn:
     Type: String
     Default: Override This Variable from the CLI
+  RoleArn:
+    Type: String
+    Default: Override This Variable from the CLI
+  SheetDataBucket:
+    Type: String
+    Default: Override This Variable from the CLI
+  CognitoClientId:
+    Type: String
+    Default: Override This Variable from the CLI
+  CognitoJWKSBase64:
+    Type: String
+    Default: Override This Variable from the CLI
 
 
 # More info about Globals: https://github.com/awslabs/serverless-application-model/blob/master/docs/globals.rst
@@ -19,12 +31,9 @@ Globals:
     MemorySize: 512
     Environment:
       Variables:
-        CLIENT_UI_SUBDOMAIN: $CLIENT_UI_SUBDOMAIN
-        SHEET_DATA_S3_BUCKET: $SHEET_DATA_S3_BUCKET
-        COGNITO_CLIENT_ID: $COGNITO_CLIENT_ID
-        COGNITO_JWKS_BASE64: $COGNITO_JWKS_BASE64
-        APP_ADMIN_USER: $APP_ADMIN_USER
-        PUBLIC_SHEETS_FOLDER: $PUBLIC_SHEETS_FOLDER
+        SHEET_DATA_S3_BUCKET: !Sub '${SheetDataBucket}'
+        COGNITO_CLIENT_ID: !Sub '${CognitoClientId}'
+        COGNITO_JWKS_BASE64: !Sub '${CognitoJWKSBase64}'
   Api:
     Cors:
       AllowMethods: "'*'"
@@ -40,7 +49,7 @@ Resources:
       Handler: app.main
       Layers:
         - !Sub '${LayerArn}'
-      Role: arn:aws:iam::056825751459:role/service-role/scratch-cheet-sheet-lambda-role
+      Role: !Sub '${RoleArn}'
       Events:
         #/sheet
         GetSheet:

diff --git a/client-ui/src/app/index-card/index-card.component.html b/client-ui/src/app/index-card/index-card.component.html
@@ -24,7 +24,7 @@
     </mat-card-content>
     <mat-card-actions *ifEditMode style="z-index: 200;">
       <button mat-raised-button (click)="clickEdit($event)">EDIT</button>
-      <button mat-raised-button color="warn">DELETE</button>
+      <button mat-raised-button color="warn">REMOVE</button>
     </mat-card-actions>
   </mat-card>
 </div>
diff --git a/docker-compose.utils.yml b/docker-compose.utils.yml