more makefile targets for deployment

Author: anthony-nhs

Makefile

@@ -12,46 +12,68 @@ lint:
 	poetry run flake8 scripts/*.py --config .flake8
 	shellcheck scripts/*.sh
 
-test:
-	poetry run scripts/download_dependencies.py
+test: download-dependencies
 	mvn test
 
 check-licences:
 	scripts/check_python_licenses.sh
 	mvn validate
 
 clean-packages:
-	rm -f src/main/resources/*.tgz
+	rm -f src/main/resources/package/*.tgz
 
 clean: clean-packages
 	rm -rf target
 	mvn clean
+	rm -rf .aws-sam
 
 update-manifest:
 	poetry run scripts/update_manifest.py
 
-build:
-	poetry run scripts/download_dependencies.py
+build: download-dependencies
 	mvn package
 
 build-latest: clean-packages update-manifest build
 
 run:
 	mvn spring-boot:run
 
+download-dependencies:
+	poetry run scripts/download_dependencies.py
+
 sam-validate: 
 	sam validate --template-file SAMtemplates/main_template.yaml --region eu-west-2
 	sam validate --template-file SAMtemplates/lambda_resources.yaml --region eu-west-2
 
-
-sam-build: sam-validate
+sam-build: sam-validate download-dependencies
 	sam build --template-file SAMtemplates/main_template.yaml --region eu-west-2
 
-sam-sync: guard-AWS_DEFAULT_PROFILE guard-stack_name
+sam-sync: guard-AWS_DEFAULT_PROFILE guard-stack_name download-dependencies
 	sam sync \
 		--stack-name $$stack_name \
 		--watch \
 		--template-file SAMtemplates/main_template.yaml
 
+sam-deploy-package: guard-artifact_bucket guard-artifact_bucket_prefix guard-stack_name guard-template_file guard-cloud_formation_execution_role guard-VERSION_NUMBER guard-COMMIT_ID guard-LOG_LEVEL guard-LOG_RETENTION_DAYS
+	sam deploy \
+		--template-file $$template_file \
+		--stack-name $$stack_name \
+		--capabilities CAPABILITY_NAMED_IAM CAPABILITY_AUTO_EXPAND \
+		--region eu-west-2 \
+		--s3-bucket $$artifact_bucket \
+		--s3-prefix $$artifact_bucket_prefix \
+		--config-file samconfig_package_and_deploy.toml \
+		--no-fail-on-empty-changeset \
+		--role-arn $$cloud_formation_execution_role \
+		--no-confirm-changeset \
+		--force-upload \
+		--tags "version=$$VERSION_NUMBER" \
+		--parameter-overrides \
+			  EnableSplunk=true \
+			  VersionNumber=$$VERSION_NUMBER \
+			  CommitId=$$COMMIT_ID \
+			  LogLevel=$$LOG_LEVEL \
+			  LogRetentionDays=$$LOG_RETENTION_DAYS 
+
 aws-login:
 	aws sso login --sso-session sso-session

samconfig.toml

@@ -0,0 +1,31 @@
+# More information about the configuration file can be found here:
+# https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/serverless-sam-cli-config.html
+version = 0.1
+
+[default]
+[default.global.parameters]
+stack_name = "sam-app"
+
+[default.build.parameters]
+cached = true
+parallel = true
+
+[default.validate.parameters]
+lint = true
+
+[default.deploy.parameters]
+capabilities = ["CAPABILITY_IAM", "CAPABILITY_AUTO_EXPAND"]
+confirm_changeset = true
+resolve_s3 = true
+
+[default.package.parameters]
+resolve_s3 = true
+
+[default.sync.parameters]
+watch = true
+
+[default.local_start_api.parameters]
+warm_containers = "EAGER"
+
+[default.local_start_lambda.parameters]
+warm_containers = "EAGER"

samconfig_package_and_deploy.toml

@@ -0,0 +1,31 @@
+# More information about the configuration file can be found here:
+# https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/serverless-sam-cli-config.html
+version = 0.1
+
+[default]
+[default.global.parameters]
+stack_name = "sam-app"
+
+[default.build.parameters]
+cached = true
+parallel = true
+
+[default.validate.parameters]
+lint = true
+
+[default.deploy.parameters]
+capabilities = ["CAPABILITY_IAM", "CAPABILITY_AUTO_EXPAND"]
+confirm_changeset = true
+resolve_s3 = false
+
+[default.package.parameters]
+resolve_s3 = false
+
+[default.sync.parameters]
+watch = true
+
+[default.local_start_api.parameters]
+warm_containers = "EAGER"
+
+[default.local_start_lambda.parameters]
+warm_containers = "EAGER"