Merge pull request #147 from MLPlatformWebsite/pjc-transfer-linaro-scripts

Remove more profile references

Author: pcolmer

.github-env-master

@@ -1,4 +1,3 @@
-AWS_STATIC_SITE_PROFILE=mlplatform-org-buildbot
 AWS_STATIC_SITE_URL=production-mlplatform-org
 CF_DIST_ID_STATIC_LO=E2U7UQCLK7G1EJ
 CLOUDFRONT_ADD_SECURITY_HEADERS_ARN=arn:aws:lambda:us-east-1:841045539419:function:cloudfront-add-security-headers:1

tools/invalidate-cloudfront.sh

@@ -5,8 +5,7 @@ NEW_CHANGES="/*"
 
 echo "======== CREATING INVALIDATION ========"
 echo "--distribution-id \"$CF_DIST_ID_STATIC_LO\" --paths $NEW_CHANGES"
-invID=$(aws --profile "$AWS_STATIC_SITE_PROFILE" cloudfront create-invalidation \
---distribution-id "$CF_DIST_ID_STATIC_LO" --paths "$NEW_CHANGES" --query Invalidation.Id --output text)
+invID=$(aws cloudfront create-invalidation --distribution-id "$CF_DIST_ID_STATIC_LO" --paths "$NEW_CHANGES" --query Invalidation.Id --output text)
 export invID
 
 echo "======== INVALIDATION ID ========"
@@ -16,18 +15,15 @@ echo "======== POLLING COMPLETED INVALIDATION ========"
 # Increasingly, a single call to cloudfront wait invalidation-completed has been erroring
 # out with "max attempts exceeded". We now run this in a do loop to ensure that we repeat
 # the call until it is all finished.
-until aws --profile "$AWS_STATIC_SITE_PROFILE" cloudfront wait invalidation-completed \
-            --distribution-id "$CF_DIST_ID_STATIC_LO" --id "${invID}" 2>/dev/null
+until aws cloudfront wait invalidation-completed --distribution-id "$CF_DIST_ID_STATIC_LO" --id "${invID}" 2>/dev/null
 do
     # Still waiting - output some progress
     echo "Still waiting ..."
-    aws --profile "$AWS_STATIC_SITE_PROFILE" cloudfront get-invalidation \
-    --distribution-id "$CF_DIST_ID_STATIC_LO" --id "${invID}"
+    aws cloudfront get-invalidation --distribution-id "$CF_DIST_ID_STATIC_LO" --id "${invID}"
     sleep 10
 done
 
 # and final confirmation
-aws --profile "$AWS_STATIC_SITE_PROFILE" cloudfront get-invalidation \
---distribution-id "$CF_DIST_ID_STATIC_LO" --id "${invID}"
+aws cloudfront get-invalidation --distribution-id "$CF_DIST_ID_STATIC_LO" --id "${invID}"
 
 echo "======== INVALIDATION COMPLETED ========"

tools/lambda-security-headers.py

@@ -7,9 +7,6 @@
 import boto3
 
 
-_PROFILE = (
-    "AWS_STATIC_SITE_PROFILE"
-)
 _CFDIST = (
     "CF_DIST_ID_STATIC_LO"
 )
@@ -31,8 +28,7 @@ def get_env_var(env):
 
 def build_lambda_arn(function_name) -> str:
     """ Get the latest version for the function """
-    profile = get_env_var(_PROFILE)
-    session = boto3.Session(profile_name=profile)
+    session = boto3.Session()
     client = session.client('lambda', 'us-east-1')
     versions = client.list_versions_by_function(FunctionName=function_name)["Versions"]
     # Find the highest version number
@@ -61,8 +57,7 @@ def get_lambda_arn() -> str:
 def is_function_attached():
     """ Is the function attached to the distribution? """
     func = get_lambda_arn()
-    profile = get_env_var(_PROFILE)
-    session = boto3.Session(profile_name=profile)
+    session = boto3.Session()
     cf_client = session.client('cloudfront', 'us-east-1')
     config = cf_client.get_distribution_config(
         Id=get_env_var(_CFDIST)
@@ -88,8 +83,7 @@ def attach_function():
         "EventType": "origin-response",
         "LambdaFunctionARN": func
     }
-    profile = get_env_var(_PROFILE)
-    session = boto3.Session(profile_name=profile)
+    session = boto3.Session()
     cf_client = session.client('cloudfront', 'us-east-1')
     config = cf_client.get_distribution_config(
         Id=get_env_var(_CFDIST)