Moving CDK app into package

Author: ivan-khvostishkov

.gitignore

@@ -14,3 +14,4 @@
 __pycache__
 /tests/output/
 /tests/.pytest_cache/
+/cdk.out/

.gitlab-ci.yml

@@ -7,6 +7,8 @@ run_tests:
   stage: test
   resource_group: ssh-helper-tests
   script:
+    - export AWS_REGION=eu-west-1
+    - export AWS_DEFAULT_REGION=eu-west-1
     # Install the package
     - pip freeze --all | tee pip_freeze_before.txt
     - pip install '.'
@@ -25,15 +27,23 @@ run_tests:
     - apt-get install -y nodejs
     - npm install -g aws-cdk
     - cdk --version
-    - cd cdk
+    - REGION=$AWS_REGION
     - USER_ROLE=$GITLAB_ROLE_ARN
-    - cdk deploy SSH-IAM-SSM-Stack-Tests --require-approval never -c sagemaker_role=$SAGEMAKER_ROLE -c user_role=$USER_ROLE
-    - cdk deploy SSH-IAM-SSM-Stack --require-approval never -c sagemaker_role=$SAGEMAKER_ROLE -c user_role=$USER_ROLE
-    - cdk deploy SSM-Advanced-Tier-Stack --require-approval never -c sagemaker_role=$SAGEMAKER_ROLE -c user_role=$USER_ROLE
-    - AWS_REGION=eu-west-2 cdk deploy SSM-Advanced-Tier-Stack --require-approval never -c sagemaker_role=$SAGEMAKER_ROLE -c user_role=$USER_ROLE
-    - cd -
+    - APP="python -m sagemaker_ssh_helper.cdk.app"
+    # cdk bootstrap aws://"$ACCOUNT_ID"/"$REGION" --require-approval never
+    - AWS_REGION=$REGION cdk -a "$APP" deploy SSH-IAM-SSM-Stack-Tests 
+        --require-approval never -c sagemaker_role=$SAGEMAKER_ROLE -c user_role=$USER_ROLE
+    - AWS_REGION=$REGION cdk -a "$APP" deploy SSH-IAM-SSM-Stack
+        --require-approval never -c sagemaker_role=$SAGEMAKER_ROLE -c user_role=$USER_ROLE
+    - AWS_REGION=$REGION cdk -a "$APP" deploy SSM-Advanced-Tier-Stack
+        --require-approval never -c sagemaker_role=$SAGEMAKER_ROLE -c user_role=$USER_ROLE
+    - REGION=eu-west-2
+    # cdk bootstrap aws://"$ACCOUNT_ID"/"$REGION" --require-approval never
+    - AWS_REGION=$REGION cdk -a "$APP" deploy SSM-Advanced-Tier-Stack
+        --require-approval never -c sagemaker_role=$SAGEMAKER_ROLE -c user_role=$USER_ROLE
     # Configure local env
     - sm-local-configure
+    - source tests/generate_sagemaker_config.sh
     # Assume CI/CD role
     - sts=( $(
         aws sts assume-role

.idea/sagemaker-ssh-helper.iml

@@ -28,22 +28,17 @@ Note that if you connect to AWS from your local CLI as an IAM user, you will nee
 b. Execute the following commands (you can copy-paste them as a whole script):
 
 ```shell
-git clone --depth 1 https://github.com/aws-samples/sagemaker-ssh-helper.git
+pip install 'sagemaker-ssh-helper[cdk]'
 
-cd sagemaker-ssh-helper/
-pip install '.[cdk]'
+APP="python -m sagemaker_ssh_helper.cdk.app"
 
-cd cdk/
+cdk bootstrap aws://"$ACCOUNT_ID"/"$REGION"
 
-cdk bootstrap aws://"$ACCOUNT_ID"/"$REGION" \
+AWS_REGION="$REGION" cdk -a "$APP" deploy SSH-IAM-SSM-Stack \
   -c sagemaker_role="$SAGEMAKER_ROLE_ARN" \
   -c user_role="$USER_ROLE_ARN"
 
-cdk deploy SSH-IAM-SSM-Stack \
-  -c sagemaker_role="$SAGEMAKER_ROLE_ARN" \
-  -c user_role="$USER_ROLE_ARN"
-
-cdk deploy SSM-Advanced-Tier-Stack \
+AWS_REGION="$REGION" cdk -a "$APP" deploy SSM-Advanced-Tier-Stack \
   -c sagemaker_role="$SAGEMAKER_ROLE_ARN" \
   -c user_role="$USER_ROLE_ARN"
 ```
@@ -55,11 +50,9 @@ REGION=
 ```
 
 ```shell
-cdk bootstrap aws://"$ACCOUNT_ID"/"$REGION" \
-  -c sagemaker_role="$SAGEMAKER_ROLE_ARN" \
-  -c user_role="$USER_ROLE_ARN"
+cdk bootstrap aws://"$ACCOUNT_ID"/"$REGION"
 
-AWS_REGION="$REGION" cdk deploy SSM-Advanced-Tier-Stack \
+AWS_REGION="$REGION" cdk -a "$APP" deploy SSM-Advanced-Tier-Stack \
   -c sagemaker_role="$SAGEMAKER_ROLE_ARN" \
   -c user_role="$USER_ROLE_ARN"
 ```

IAM_SSM_Setup.md

@@ -0,0 +1,15 @@
+#!/usr/bin/env python3
+import aws_cdk as cdk
+
+from sagemaker_ssh_helper.cdk.cdk.cdk_stack import CdkStack
+from sagemaker_ssh_helper.cdk.iam_ssm.iam_ssm_stack import IamSsmStack
+from sagemaker_ssh_helper.cdk.iam_ssm.iam_ssm_stack_tests import IamSsmStackTests
+from sagemaker_ssh_helper.cdk.iam_ssm.ssm_advanced_tier_stack import SsmAdvancedTierStack
+
+app = cdk.App()
+CdkStack(app, "CdkStack")
+IamSsmStack(app, "SSH-IAM-SSM-Stack")
+IamSsmStackTests(app, "SSH-IAM-SSM-Stack-Tests")
+SsmAdvancedTierStack(app, "SSM-Advanced-Tier-Stack")
+
+app.synth()

cdk/app.py

@@ -1,15 +1,18 @@
 import aws_cdk as core
 import aws_cdk.assertions as assertions
+import pytest
+
+from sagemaker_ssh_helper.cdk.cdk.cdk_stack import CdkStack
 
-from cdk.cdk_stack import CdkStack
 
 # example tests. To run these tests, uncomment this file along with the example
 # resource in cdk/cdk_stack.py
+@pytest.mark.manual
 def test_sqs_queue_created():
     app = core.App()
     stack = CdkStack(app, "cdk")
     template = assertions.Template.from_stack(stack)
 
-#     template.has_resource_properties("AWS::SQS::Queue", {
-#         "VisibilityTimeout": 300
-#     })
+    template.has_resource_properties("AWS::SQS::Queue", {
+        "VisibilityTimeout": 300
+    })

cdk/.gitignore renamed to sagemaker_ssh_helper/cdk/.gitignore

@@ -0,0 +1,10 @@
+#!/bin/bash
+
+mkdir -p /root/.config/sagemaker
+
+cat > /root/.config/sagemaker/config.yaml <<EOF
+SchemaVersion: '1.0'
+SageMaker:
+  TrainingJob:
+    RoleArn: '$SAGEMAKER_ROLE'
+EOF