From cd8445cf693e7f5fe60b296d4751b6a797aed160 Mon Sep 17 00:00:00 2001 From: chris3ware <36608309+chris3ware@users.noreply.github.com> Date: Sun, 8 Sep 2024 07:26:11 +0100 Subject: [PATCH 1/3] ci(tofu-ci): Remove terramate files --- terraform/cdn/stack.tm.hcl | 5 ----- terraform/org/stack.tm.hcl | 5 ----- terramate.tm.hcl | 7 ------- 3 files changed, 17 deletions(-) delete mode 100644 terraform/cdn/stack.tm.hcl delete mode 100644 terraform/org/stack.tm.hcl delete mode 100644 terramate.tm.hcl diff --git a/terraform/cdn/stack.tm.hcl b/terraform/cdn/stack.tm.hcl deleted file mode 100644 index c4e9e28..0000000 --- a/terraform/cdn/stack.tm.hcl +++ /dev/null @@ -1,5 +0,0 @@ -stack { - name = "cdn" - description = "cdn" - id = "2a8bb47c-6650-4378-8f65-abf0b2cbb17b" -} diff --git a/terraform/org/stack.tm.hcl b/terraform/org/stack.tm.hcl deleted file mode 100644 index b907031..0000000 --- a/terraform/org/stack.tm.hcl +++ /dev/null @@ -1,5 +0,0 @@ -stack { - name = "org" - description = "org" - id = "fdb908a4-5fad-4a0c-aa2f-d4854e67946b" -} diff --git a/terramate.tm.hcl b/terramate.tm.hcl deleted file mode 100644 index e2110d3..0000000 --- a/terramate.tm.hcl +++ /dev/null @@ -1,7 +0,0 @@ -terramate { - config { - cloud { - organization = "3ware" - } - } -} \ No newline at end of file From 1b9084fa2a67f9230bbf08157d4a4a82a0149ec4 Mon Sep 17 00:00:00 2001 From: chris3ware <36608309+chris3ware@users.noreply.github.com> Date: Sun, 8 Sep 2024 07:31:59 +0100 Subject: [PATCH 2/3] chore(org): tofu upgrade --- terraform/org/providers.tf | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/terraform/org/providers.tf b/terraform/org/providers.tf index 5537eef..dc72282 100644 --- a/terraform/org/providers.tf +++ b/terraform/org/providers.tf @@ -1,5 +1,6 @@ provider "aws" { - region = "us-east-1" + profile = "3ware-org-admin" + region = "us-east-1" default_tags { tags = { @@ -11,7 +12,7 @@ provider "aws" { } } terraform { - required_version = ">= 1.7.2" + required_version = ">= 1.7.1" required_providers { aws = { source = "hashicorp/aws" @@ -19,11 +20,11 @@ terraform { } } - cloud { - organization = "3ware" - hostname = "app.terraform.io" - workspaces { - name = "aws-net-spec-org" - } - } + # cloud { + # organization = "3ware" + # hostname = "app.terraform.io" + # workspaces { + # name = "aws-net-spec-org" + # } + # } } From d18702d9e72569aaf23c92d769475a586a5f236e Mon Sep 17 00:00:00 2001 From: chris3ware <36608309+chris3ware@users.noreply.github.com> Date: Sun, 8 Sep 2024 07:53:52 +0100 Subject: [PATCH 3/3] chore(tofu): Upgrade to version 1.8.2 --- .trunk/trunk.yaml | 2 +- terraform/cdn/.terraform.lock.hcl | 40 ------------------------------- terraform/cdn/providers.tf | 5 ++-- terraform/org/providers.tf | 16 ++++++------- terraform/vpc-peer/providers.tf | 17 ++++++------- terraform/vpc/.terraform.lock.hcl | 22 ----------------- terraform/vpc/providers.tf | 19 ++++++++------- 7 files changed, 31 insertions(+), 90 deletions(-) delete mode 100644 terraform/cdn/.terraform.lock.hcl delete mode 100644 terraform/vpc/.terraform.lock.hcl diff --git a/.trunk/trunk.yaml b/.trunk/trunk.yaml index 272d5c2..de81936 100644 --- a/.trunk/trunk.yaml +++ b/.trunk/trunk.yaml @@ -20,7 +20,7 @@ lint: disabled: - terrascan enabled: - - tofu@1.8.1: + - tofu@1.8.2: commands: [fmt, validate] - checkov@3.2.243 - trivy@0.55.0 diff --git a/terraform/cdn/.terraform.lock.hcl b/terraform/cdn/.terraform.lock.hcl deleted file mode 100644 index fa84b9d..0000000 --- a/terraform/cdn/.terraform.lock.hcl +++ /dev/null @@ -1,40 +0,0 @@ -# This file is maintained automatically by "tofu init". -# Manual edits may be lost in future updates. - -provider "registry.opentofu.org/hashicorp/aws" { - version = "5.66.0" - constraints = ">= 4.40.0, >= 5.12.0, >= 5.24.0, >= 5.27.0, >= 5.37.0" - hashes = [ - "h1:+YoLhtFWy3U17eYqOxN7ousu4tjePbIS55x2dq4sg8o=", - "h1:ZCTMtibl5ZdRopMlmBj/qcPtp6b7426h8tQ+MITGKow=", - "zh:03f472f0d968c21a46b1e699116f886f3aa80eb491874d389dd3d032fe26235d", - "zh:110b13057cbede6e829bd5b5dba93d693d0c40a9027e5e57c4dd49d112f783ad", - "zh:4055cba8177833e9717895c338d2fe484b6aed9d03a473f662af8ce2aa5a0dfc", - "zh:4b7d85fd9026e2765a16095f44e5823aba27e70f51ee53661488421d6bc37470", - "zh:5d1431970aa318740f81ec5173eff5806905a4f41550b1607bb023b81f9e1840", - "zh:7bc55c13e70e6e33c03f78a399c7db9f8e37bb687216a442b6e3d1a15e3c067d", - "zh:8282829f348f6f820a2a95abc551ae483dd9031e49a58affe23f3a3f18bda393", - "zh:966a3b12b381dad726651a6821b9f2b21238294cb92b85242470fd6435847bbf", - "zh:abb08d6b918e34c0f36296eebad817aff1baf487b8310452df07d90aa42f390a", - "zh:d39f5e3e101bac6da0ba782c27e1eb47457fbbb4640be1c055625aab20eae354", - ] -} - -provider "registry.opentofu.org/hashicorp/random" { - version = "3.3.2" - constraints = "~> 3.3.2" - hashes = [ - "h1:3cVQP2pZt7WXSmZVYRj75U8PTP17Tbo+LubWAJJvt6s=", - "h1:m0fg+H1nspsKGEgZiLrxmPnlHebN+GbPK8bj6shhfz0=", - "zh:06940c8bc66b49e27c4a7030242df2211be2635bc061b656c9110b521f0d6f71", - "zh:0aa9d7f1d7971b662485ca2474fc13ab2dba7951ad56f37d08ccf92c2e918bec", - "zh:0e265e4154792c79865c27c55661f63c3df56e9ab961f47c4014f255e4aa3c33", - "zh:2d8305ed9ddd1907b81a208170c7599ffb99eacf2639cf40b5c7fe384585ee87", - "zh:43c7dd999908ead0e98a053c294b7d53546c45d6317e9124df39f6ed31e5fce8", - "zh:5ddce4cb91ddda675071166d975cc5af2ccb5efabbf327e9e5d21f0b93c9ab6c", - "zh:777ef4bba1f1875c4bcda9c2207bb00a24758a2a6c9097446c84d7cc20356673", - "zh:81542311f3d1fac213c9c25d3650de2a0d54cc480ec9c5abc16d88f9802b82b0", - "zh:9031150598307c66e61c13f7ca7b750ff8c4e373dc912f869d8ca81f9d1b4a2e", - "zh:9c8caf2248dadd21480bd2705680d76e9939f2b5956b6863789bbe0ec5457892", - ] -} \ No newline at end of file diff --git a/terraform/cdn/providers.tf b/terraform/cdn/providers.tf index c762d8b..2107872 100644 --- a/terraform/cdn/providers.tf +++ b/terraform/cdn/providers.tf @@ -1,5 +1,6 @@ provider "aws" { - region = "us-east-1" + profile = "ans-gen" + region = "us-east-1" default_tags { tags = { @@ -12,7 +13,7 @@ provider "aws" { } terraform { - required_version = ">= 1.7.2" + required_version = ">= 1.8.2" required_providers { aws = { source = "hashicorp/aws" diff --git a/terraform/org/providers.tf b/terraform/org/providers.tf index dc72282..2ce11dd 100644 --- a/terraform/org/providers.tf +++ b/terraform/org/providers.tf @@ -12,7 +12,7 @@ provider "aws" { } } terraform { - required_version = ">= 1.7.1" + required_version = ">= 1.8.2" required_providers { aws = { source = "hashicorp/aws" @@ -20,11 +20,11 @@ terraform { } } - # cloud { - # organization = "3ware" - # hostname = "app.terraform.io" - # workspaces { - # name = "aws-net-spec-org" - # } - # } + cloud { + organization = "3ware" + hostname = "app.terraform.io" + workspaces { + name = "aws-net-spec-org" + } + } } diff --git a/terraform/vpc-peer/providers.tf b/terraform/vpc-peer/providers.tf index 082be6f..6b2315f 100644 --- a/terraform/vpc-peer/providers.tf +++ b/terraform/vpc-peer/providers.tf @@ -1,19 +1,18 @@ provider "aws" { - profile = "ans-gen" - region = "us-east-1" + region = "us-east-1" default_tags { tags = { - "Project" = "aws-network-specialty" - "Environment" = "general" - "Demo" = "VPC-PEERING" - "Terraform" = true + "3ware:project-id" = "aws-network-speciality" + "3ware:environment-type" = "dev" + "3ware:service" = "vpc-peer" + "3ware:tofu" = true } } } terraform { - required_version = ">= 1.7.2" + required_version = ">= 1.8.2" required_providers { aws = { source = "hashicorp/aws" @@ -25,8 +24,10 @@ terraform { } } - backend "remote" { + cloud { organization = "3ware" + hostname = "app.terraform.io" + workspaces { name = "aws-net-spec-vpc-peer" } diff --git a/terraform/vpc/.terraform.lock.hcl b/terraform/vpc/.terraform.lock.hcl deleted file mode 100644 index fa8669d..0000000 --- a/terraform/vpc/.terraform.lock.hcl +++ /dev/null @@ -1,22 +0,0 @@ -# This file is maintained automatically by "terraform init". -# Manual edits may be lost in future updates. - -provider "registry.terraform.io/hashicorp/aws" { - version = "4.23.0" - constraints = ">= 3.63.0, >= 3.71.0" - hashes = [ - "h1:j6RGCfnoLBpzQVOKUbGyxf4EJtRvQClKplO+WdXL5O0=", - "zh:17adbedc9a80afc571a8de7b9bfccbe2359e2b3ce1fffd02b456d92248ec9294", - "zh:23d8956b031d78466de82a3d2bbe8c76cc58482c931af311580b8eaef4e6a38f", - "zh:343fe19e9a9f3021e26f4af68ff7f4828582070f986b6e5e5b23d89df5514643", - "zh:6b8ff83d884b161939b90a18a4da43dd464c4b984f54b5f537b2870ce6bd94bc", - "zh:7777d614d5e9d589ad5508eecf4c6d8f47d50fcbaf5d40fa7921064240a6b440", - "zh:82f4578861a6fd0cde9a04a1926920bd72d993d524e5b34d7738d4eff3634c44", - "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425", - "zh:a08fefc153bbe0586389e814979cf7185c50fcddbb2082725991ed02742e7d1e", - "zh:ae789c0e7cb777d98934387f8888090ccb2d8973ef10e5ece541e8b624e1fb00", - "zh:b4608aab78b4dbb32c629595797107fc5a84d1b8f0682f183793d13837f0ecf0", - "zh:ed2c791c2354764b565f9ba4be7fc845c619c1a32cefadd3154a5665b312ab00", - "zh:f94ac0072a8545eebabf417bc0acbdc77c31c006ad8760834ee8ee5cdb64e743", - ] -} diff --git a/terraform/vpc/providers.tf b/terraform/vpc/providers.tf index b10263d..35faf4a 100644 --- a/terraform/vpc/providers.tf +++ b/terraform/vpc/providers.tf @@ -1,28 +1,29 @@ provider "aws" { - profile = "ans-gen" - region = "us-east-1" + region = "us-east-1" default_tags { tags = { - "Project" = "aws-network-specialty" - "Environment" = "general" - "Demo" = "VPC" - "Terraform" = true + "3ware:project-id" = "aws-network-speciality" + "3ware:environment-type" = "dev" + "3ware:service" = "vpc" + "3ware:tofu" = true } } } terraform { - required_version = ">= 1.7.2" + required_version = ">= 1.8.2" required_providers { aws = { source = "hashicorp/aws" - version = ">= 3.71.0" + version = ">= 4.0.0" } } - backend "remote" { + cloud { organization = "3ware" + hostname = "app.terraform.io" + workspaces { name = "aws-net-spec-vpc" }