tweaks

Author: jplock

Makefile

@@ -1,4 +1,4 @@
-.PHONY: setup build deploy clean format outdated
+.PHONY: setup build deploy clean format outdated bootstrap
 
 setup:
 	python3 -m venv .venv
@@ -20,3 +20,6 @@ format:
 
 outdated:
 	.venv/bin/python3 -m pip list -o
+
+bootstrap:
+	aws --region us-east-1 cloudformation deploy --template-file github_ci_template.yml --stack-name orgs-prescriptive-guidance-cicd --capabilities CAPABILITY_IAM CAPABILITY_NAMED_IAM

README.md

@@ -58,13 +58,13 @@ aws --region us-east-1 cloudformation deploy \
 aws --region us-east-1 cloudformation describe-stacks --stack-name orgs-prescriptive-guidance-cicd --query "Stacks[0].Outputs"
 ```
 
-Then, follow this [guide](https://docs.github.com/en/actions/writing-workflows/choosing-what-your-workflow-does/store-information-in-variables#creating-configuration-variables-for-a-repository) to create these GitHub Action variables in the repository:
+Then, follow this [guide](https://docs.github.com/en/actions/writing-workflows/choosing-what-your-workflow-does/store-information-in-variables#creating-configuration-variables-for-a-repository) to create GitHub Action variables in the repository:
 
 * `ARTIFACT_BUCKET` = value of `oArtifactBucket` from above
 * `ASSUME_ROLE_ARN` = value of `oGitHubRoleArn` from above
 * `CF_ROLE_ARN` = value of `oCloudFormationRoleArn` from above
 
-The variables should match the image below:
+The variables should look like the image below:
 
 ![GitHub Action Variables](./docs/github_actions_variables.png)
 

requirements-dev.txt

@@ -1,3 +1,3 @@
 black==24.10.0
 aws-lambda-powertools[all,aws-sdk]==3.3.0
-boto3-stubs[iam,organizations,cloudformation]==1.35.63
+boto3-stubs[iam,organizations,cloudformation]==1.35.77

src/activation_lambda/index.py

@@ -52,6 +52,10 @@
 
 try:
     root_id = os.getenv("ROOT_ID")
+
+    response = cloudformation.describe_organizations_access(CallAs="SELF")
+    status: str = response.get("Status")
+    logger.info("Organizations Access Status: " + status)
 except Exception as e:
     helper.init_failure(e)
 
@@ -68,10 +72,6 @@
 
 @helper.create
 def create(event: dict, context: LambdaContext):
-    response = cloudformation.describe_organizations_access(CallAs="SELF")
-    status: str = response.get("Status")
-    logger.info("Organizations Access Status: " + status)
-
     if status == "ACTIVE":
         logger.warning("Organizations access is already active")
     else:
@@ -107,10 +107,6 @@ def create(event: dict, context: LambdaContext):
 
 @helper.delete
 def delete(event: dict, context: LambdaContext):
-    response = cloudformation.describe_organizations_access(CallAs="SELF")
-    status: str = response.get("Status")
-    logger.info("Organizations Access Status: " + status)
-
     if status == "DISABLED":
         logger.warning("Organizations access is already disabled")
     else: