Skip to content
This repository has been archived by the owner on Aug 4, 2023. It is now read-only.

Commit

Permalink
fix: updated global terraform tags and svc aws version (#619)
Browse files Browse the repository at this point in the history
* fix: implemented global tags

* fix: removed commas

* fix: resolved formatting issues

* fix: updated aws version on sharedsvc to resolve default tag issue

* fix: removed old lock file to generate a new file with the updated provider

* fix: updated versions and lock file

* feat: adds terraform lock providers

Co-authored-by: nabil.aziz <[email protected]>
Co-authored-by: Tim Spotswood <[email protected]>
  • Loading branch information
3 people authored Aug 25, 2022
1 parent b11514b commit 9527e30
Show file tree
Hide file tree
Showing 15 changed files with 229 additions and 104 deletions.
10 changes: 10 additions & 0 deletions stacks/product-aws/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,16 @@ provider "aws" {
region = var.region

skip_metadata_api_check = true

default_tags {
tags = {
Org = "liatrio"
Team = "flywheel"
Repo = "github.com/liatrio/lead-terraform"
ManagedBy = "terraform"
}
}

}

provider "helm" {
Expand Down
10 changes: 10 additions & 0 deletions stages/apps/lead/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,16 @@ terraform {

provider "aws" {
region = var.region

default_tags {
tags = {
Org = "liatrio"
Team = "flywheel"
Repo = "github.com/liatrio/lead-terraform"
ManagedBy = "terraform"
}
}

}

data "aws_eks_cluster" "cluster" {
Expand Down
206 changes: 109 additions & 97 deletions stages/apps/sharedsvc/.terraform.lock.hcl

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 9 additions & 0 deletions stages/apps/sharedsvc/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,15 @@ terraform {

provider "aws" {
region = var.region

default_tags {
tags = {
Org = "liatrio"
Team = "flywheel"
Repo = "github.com/liatrio/lead-terraform"
ManagedBy = "terraform"
}
}
}

data "aws_eks_cluster" "cluster" {
Expand Down
12 changes: 6 additions & 6 deletions stages/apps/sharedsvc/versions.tf
Original file line number Diff line number Diff line change
Expand Up @@ -3,31 +3,31 @@ terraform {
required_providers {
aws = {
source = "hashicorp/aws"
version = "~> 3.3.0"
version = "~> 3.56.0"
}
external = {
source = "hashicorp/external"
version = "~> 2.0.0"
version = "~> 2.2.0"
}
helm = {
source = "hashicorp/helm"
version = "1.3.0"
version = "2.3.0"
}
kubernetes = {
source = "hashicorp/kubernetes"
version = ">= 2.4.1"
}
null = {
source = "hashicorp/null"
version = "~> 3.0.0"
version = "~> 3.1.0"
}
random = {
source = "hashicorp/random"
version = "~> 3.0.1"
version = "~> 3.1.0"
}
vault = {
source = "hashicorp/vault"
version = "2.24.0"
}
}
}
}
10 changes: 10 additions & 0 deletions stages/cloud-provider/aws/lead/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,16 @@ terraform {

provider "aws" {
region = var.region

default_tags {
tags = {
Org = "liatrio"
Team = "flywheel"
Repo = "github.com/liatrio/lead-terraform"
ManagedBy = "terraform"
}
}

}

data "aws_eks_cluster" "cluster" {
Expand Down
10 changes: 10 additions & 0 deletions stages/cloud-provider/aws/sharedsvc/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,16 @@ terraform {

provider "aws" {
region = var.region

default_tags {
tags = {
Org = "liatrio"
Team = "flywheel"
Repo = "github.com/liatrio/lead-terraform"
ManagedBy = "terraform"
}
}

}

data "aws_eks_cluster" "cluster" {
Expand Down
2 changes: 1 addition & 1 deletion stages/cloud-provider/aws/sharedsvc/versions.tf
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ terraform {
required_providers {
aws = {
source = "hashicorp/aws"
version = ">= 3.37.0"
version = ">= 3.56.0"
}
}
}
9 changes: 9 additions & 0 deletions stages/config/lead/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,15 @@ terraform {

provider "aws" {
region = var.region

default_tags {
tags = {
Org = "liatrio"
Team = "flywheel"
Repo = "github.com/liatrio/lead-terraform"
ManagedBy = "terraform"
}
}
}

data "aws_caller_identity" "current" {}
Expand Down
Loading

0 comments on commit 9527e30

Please sign in to comment.