From 373375dbbc35bbcb5c5a3d4ab3342efc4870bb51 Mon Sep 17 00:00:00 2001 From: Peter Mikus Date: Wed, 27 Apr 2022 15:28:42 +0200 Subject: feat(infra): Terraform updates Signed-off-by: Peter Mikus Change-Id: I3d7ecad9125e3ff55c0b4e1da5cda5a1ff22d690 --- .../terraform-aws-fdio-csit-dash-app-base/main.tf | 9 +++++++-- .../terraform-aws-fdio-csit-dash-app-base/variables.tf | 6 ++++++ .../terraform-aws-fdio-csit-dash-app-base/versions.tf | 2 +- 3 files changed, 14 insertions(+), 3 deletions(-) (limited to 'fdio.infra.terraform/terraform-aws-fdio-csit-dash-app-base') diff --git a/fdio.infra.terraform/terraform-aws-fdio-csit-dash-app-base/main.tf b/fdio.infra.terraform/terraform-aws-fdio-csit-dash-app-base/main.tf index 1de8c391b1..7ecca06394 100644 --- a/fdio.infra.terraform/terraform-aws-fdio-csit-dash-app-base/main.tf +++ b/fdio.infra.terraform/terraform-aws-fdio-csit-dash-app-base/main.tf @@ -1,3 +1,8 @@ +locals { + name = "fdio-csit-dash-app" + version = "fdio-csit-dash-app-${var.version}" +} + data "vault_aws_access_credentials" "creds" { backend = "${var.vault_name}-path" role = "${var.vault_name}-role" @@ -6,6 +11,6 @@ data "vault_aws_access_credentials" "creds" { module "elastic_beanstalk_application_version" { source = "../terraform-aws-elastic-beanstalk-application-version" application_description = "FD.io CSIT Results Dashboard" - application_name = "fdio-csit-dash-app" - application_version_name = "fdio-csit-dash-app-base" + application_name = local.name + application_version_name = local.version } diff --git a/fdio.infra.terraform/terraform-aws-fdio-csit-dash-app-base/variables.tf b/fdio.infra.terraform/terraform-aws-fdio-csit-dash-app-base/variables.tf index 7147227213..cf89f28fcb 100644 --- a/fdio.infra.terraform/terraform-aws-fdio-csit-dash-app-base/variables.tf +++ b/fdio.infra.terraform/terraform-aws-fdio-csit-dash-app-base/variables.tf @@ -26,3 +26,9 @@ variable "vault_name" { type = string default = "dynamic-aws-creds-vault-fdio-csit-jenkins" } + +variable "version" { + description = "Application version string." + type = number + default = 1 +} diff --git a/fdio.infra.terraform/terraform-aws-fdio-csit-dash-app-base/versions.tf b/fdio.infra.terraform/terraform-aws-fdio-csit-dash-app-base/versions.tf index 4afbbc00a7..4b05b16b27 100644 --- a/fdio.infra.terraform/terraform-aws-fdio-csit-dash-app-base/versions.tf +++ b/fdio.infra.terraform/terraform-aws-fdio-csit-dash-app-base/versions.tf @@ -2,7 +2,7 @@ terraform { backend "consul" { address = "10.32.8.14:8500" scheme = "http" - path = "terraform/dash" + path = "terraform/app-base" } required_providers { aws = { -- cgit 1.2.3-korg