Change summary
.github/workflows/cd.yml | 8 +++++---
main.tf | 7 ++++++-
2 files changed, 11 insertions(+), 4 deletions(-)
Detailed changes
@@ -20,6 +20,7 @@ jobs:
AWS_DEFAULT_REGION: us-east-1
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+ SMOOTHIE_REPO_KEYS: "${{ secrets.SMOOTHIE_REPO_KEYS }}"
steps:
- name: Install Go
@@ -72,9 +73,10 @@ jobs:
id: tfvars
run: |
TF_VARS=$(cat <<EOF
- -var "environment=$ENVIRONMENT" \
- -var "aws_region=$AWS_DEFAULT_REGION" \
- -var "app_image=$CONTAINER_REPO:$GITHUB_SHA-snapshot"
+ -var environment="$ENVIRONMENT" \
+ -var aws_region="$AWS_DEFAULT_REGION" \
+ -var app_image="$CONTAINER_REPO:$GITHUB_SHA-snapshot" \
+ -var authorization_keys="$(echo -n $SMOOTHIE_REPO_KEYS)"
EOF
)
echo "::set-output name=vars::$TF_VARS"
@@ -22,10 +22,14 @@ variable "force_new_deployment" {
default = false
}
+variable "authorization_keys" {
+ default = ""
+}
+
module "smoothie" {
/* source = "../terraform-aws-smoothie" */
source = "app.terraform.io/charm/smoothie/aws"
- version = "0.1.4"
+ version = "0.2.0"
environment = var.environment
aws_region = var.aws_region
@@ -37,4 +41,5 @@ module "smoothie" {
fargate_memory = "2048"
force_new_deployment = var.force_new_deployment
app_use_default_ssh_port = true
+ authorization_keys = var.authorization_keys
}