Skip to content

Commit

Permalink
feat: upgrade to latest version of AFT (#69)
Browse files Browse the repository at this point in the history
* feat: upgrade to latest version of AFT

This will allow us to manage our shared accounts as well as our
management account.

Upgrades all the existing terraform-modules to the latest version 3.0.2

Upgrades the AWS Provider to > 4.9.0, < 5
  • Loading branch information
CalvinRodo authored Jun 10, 2022
1 parent d66495e commit 5cae913
Show file tree
Hide file tree
Showing 20 changed files with 150 additions and 156 deletions.
22 changes: 22 additions & 0 deletions terragrunt/aft/.terraform.lock.hcl

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

110 changes: 29 additions & 81 deletions terragrunt/aft/main/.terraform.lock.hcl

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

2 changes: 1 addition & 1 deletion terragrunt/aft/main/assume_roles.tf
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ module "assume_plan_role" {
}

module "attach_tf_plan_policy_assume" {
source = "github.com/cds-snc/terraform-modules?ref=v2.0.2//attach_tf_plan_policy"
source = "github.com/cds-snc/terraform-modules?ref=v3.0.2//attach_tf_plan_policy"
account_id = data.aws_caller_identity.current.account_id
role_name = "assume_plan"
bucket_name = "${var.billing_code}-tf"
Expand Down
2 changes: 1 addition & 1 deletion terragrunt/aft/main/main.tf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module "password_policy" {
source = "github.com/cds-snc/terraform-modules?ref=v1.0.14//aws_goc_password_policy"
source = "github.com/cds-snc/terraform-modules?ref=v3.0.2//aws_goc_password_policy"
}

4 changes: 2 additions & 2 deletions terragrunt/aft/main/oidc_role.tf
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ locals {
data "aws_caller_identity" "current" {}

module "gh_oidc_roles" {
source = "github.com/cds-snc/terraform-modules?ref=v1.0.11//gh_oidc_role"
source = "github.com/cds-snc/terraform-modules?ref=v3.0.2//gh_oidc_role"
roles = [
{
name = local.plan_name
Expand All @@ -24,7 +24,7 @@ module "gh_oidc_roles" {
}

module "attach_tf_plan_policy" {
source = "github.com/cds-snc/terraform-modules?ref=v1.0.11//attach_tf_plan_policy"
source = "github.com/cds-snc/terraform-modules?ref=v3.0.2//attach_tf_plan_policy"
account_id = data.aws_caller_identity.current.account_id
role_name = local.plan_name
bucket_name = "${var.billing_code}-tf"
Expand Down
2 changes: 1 addition & 1 deletion terragrunt/aft/main/slack_notify.tf
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module "aft_slack_notification" {
source = "github.com/cds-snc/terraform-modules?ref=v2.0.0//notify_slack"
source = "github.com/cds-snc/terraform-modules?ref=v3.0.2//notify_slack"
billing_tag_value = var.billing_code
function_name = "aft_slack_notification"
project_name = "Account Factory for Terraform"
Expand Down
22 changes: 22 additions & 0 deletions terragrunt/audit/.terraform.lock.hcl

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

55 changes: 28 additions & 27 deletions terragrunt/audit/main/.terraform.lock.hcl

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

2 changes: 1 addition & 1 deletion terragrunt/audit/main/assume_roles.tf
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ module "assume_plan_role" {
}

module "attach_tf_plan_policy_assume" {
source = "github.com/cds-snc/terraform-modules?ref=v2.0.2//attach_tf_plan_policy"
source = "github.com/cds-snc/terraform-modules?ref=v3.0.2//attach_tf_plan_policy"
account_id = data.aws_caller_identity.current.account_id
role_name = "assume_plan"
bucket_name = "${var.billing_code}-tf"
Expand Down
4 changes: 2 additions & 2 deletions terragrunt/audit/main/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ locals {
data "aws_caller_identity" "current" {}

module "gh_oidc_roles" {
source = "github.com/cds-snc/terraform-modules?ref=v2.0.2//gh_oidc_role"
source = "github.com/cds-snc/terraform-modules?ref=v3.0.2//gh_oidc_role"
roles = [
{
name = local.plan_name
Expand All @@ -26,7 +26,7 @@ module "gh_oidc_roles" {
}

module "attach_tf_plan_policy" {
source = "github.com/cds-snc/terraform-modules?ref=v2.0.2//attach_tf_plan_policy"
source = "github.com/cds-snc/terraform-modules?ref=v3.0.2//attach_tf_plan_policy"
account_id = data.aws_caller_identity.current.account_id
role_name = local.plan_name
bucket_name = "${var.billing_code}-tf"
Expand Down
2 changes: 1 addition & 1 deletion terragrunt/common/provider.tf
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ terraform {
required_providers {
aws = {
source = "hashicorp/aws"
version = "< 4"
version = "> 4.9.0, < 5"
}
}
}
Expand Down
Loading

0 comments on commit 5cae913

Please sign in to comment.