Improve deploy.sh & standardise resource names for better integration

JamesJJ · Mar 10, 2021 · 9d383b0 · 9d383b0
1 parent ebfdce3
commit 9d383b0
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 6 deletions.
diff --git a/aws-serverless/deploy.sh b/aws-serverless/deploy.sh
@@ -2,14 +2,24 @@
 
 set -eou pipefail
 
-SANITY="../main.go"
+SAM_DIR="$(dirname "$0")"
+FUNC_DIR_RELATIVE=".."
+
+cd "${SAM_DIR}"
+
+SANITY="${FUNC_DIR_RELATIVE}/main.go"
 if [ ! -f "${SANITY}" ] ; then
   echo "ERROR: File not found: ${SANITY}" 1>&2
   exit 1
 fi
 
-GOOS=linux GOARCH=amd64 go build -o main ..
+cd "${FUNC_DIR_RELATIVE}"
+GOOS=linux GOARCH=amd64 go build -o main
+cd -
+
+mv "${FUNC_DIR_RELATIVE}/main" ./
+sam deploy -g --tags "tenant=fcg"
+rm -f ./main
 
-sam deploy --tags "tenant=fcg" -g
 
 
diff --git a/aws-serverless/samconfig.toml b/aws-serverless/samconfig.toml
@@ -2,8 +2,9 @@ version = 0.1
 [default]
 [default.deploy]
 [default.deploy.parameters]
-stack_name = "dmarc-report-lambda"
-s3_prefix = "dmarc_report_lambda"
+stack_name = "dmarc-report-parser"
+s3_prefix = "dmarc-report-parser"
 region = "us-west-2"
 confirm_changeset = true
 capabilities = "CAPABILITY_IAM"
+parameter_overrides = "DELETESQS=\"true\" EMPTYPOLLS=\"1\" MOVE=\"archive-dmarc\" VERBOSE=\"false\""
diff --git a/aws-serverless/template.yml b/aws-serverless/template.yml
@@ -23,7 +23,7 @@ Resources:
       DelaySeconds: "0"
       MaximumMessageSize: "262144"
       MessageRetentionPeriod: "1209600"
-      QueueName: ses-received-dmarc-emails
+      QueueName: !Join [ "-", [ !Ref AWS::StackName , "sqs" ] ]
       ReceiveMessageWaitTimeSeconds: "10"
       VisibilityTimeout: "3600"
   SQSQueuePolicy: 
@@ -53,6 +53,7 @@ Resources:
   Function:
     Type: AWS::Serverless::Function
     Properties:
+      FunctionName: !Join [ "-", [ !Ref AWS::StackName , "lambda" ] ]
       Handler: main
       Runtime: go1.x
       CodeUri: .