Merge pull request #35 from byu-oit/fix/aws-provider-5

yoshutch · web-flow · commit 2641a3cc5536 · 2023-12-20T14:38:09.000-07:00
fix: support aws provider v5
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -16,14 +16,14 @@ jobs:
           matrix='{
             "env":[
               {
-                "tf_version":"0.13.2",
-                "tf_working_dir":"./examples/ci-13",
+                "tf_version":"1.0.0",
+                "tf_working_dir":"./examples/ci-1_0",
                 "aws_account":"977306314792",
                 "aws_gha_role":"terraform-rds-dev-gha"
               },
               {
-                "tf_version":"0.12.26",
-                "tf_working_dir":"./examples/ci-12",
+                "tf_version":"1.2.0",
+                "tf_working_dir":"./examples/ci-1_2",
                 "aws_account":"977306314792",
                 "aws_gha_role":"terraform-rds-dev-gha"
               }
diff --git a/README.md b/README.md
@@ -6,7 +6,7 @@ This terraform deploys an RDS instance.
 ## Usage
 ```hcl
 module "rds" {
-  source = "github.com/byu-oit/terraform-aws-rds?ref=v2.6.1"
+  source = "github.com/byu-oit/terraform-aws-rds?ref=v3.0.0"
 
   identifier              = "example"
   engine                  = "mysql"
@@ -22,7 +22,8 @@ module "rds" {
 ```
 
 ## Requirements
-* Terraform version 0.12.16 or greater
+* Terraform version 1.0.0 or greater
+* AWS Provider version 4.0 or greater
 
 ## Inputs
 | Name                                  | Type                            | Description                                                                                                                                                                                                                                                                                                        | Default                                                                                   |
diff --git a/examples/ci-1_0/ci.tf b/examples/ci-1_0/ci.tf
@@ -1,14 +1,19 @@
 terraform {
-  required_version = "0.12.26"
+  required_version = "1.0.0"
+  required_providers {
+    aws = {
+      source  = "hashicorp/aws"
+      version = "~> 4.0"
+    }
+  }
 }
 
 provider "aws" {
-  version = "~> 3.0"
-  region  = "us-west-2"
+  region = "us-west-2"
 }
 
 module "acs" {
-  source = "github.com/byu-oit/terraform-aws-acs-info.git?ref=v3.0.0"
+  source = "github.com/byu-oit/terraform-aws-acs-info.git?ref=v4.0.0"
 }
 
 module "rds" {
@@ -28,17 +33,20 @@ module "rds" {
 }
 
 output "instance" {
-  value = module.rds.instance
+  value     = module.rds.instance
+  sensitive = true
 }
 
 output "security_group" {
   value = module.rds.security_group
 }
 
 output "master_username_parameter" {
-  value = module.rds.master_username_parameter
+  value     = module.rds.master_username_parameter
+  sensitive = true
 }
 
 output "master_password_parameter" {
-  value = module.rds.master_password_parameter
+  value     = module.rds.master_password_parameter
+  sensitive = true
 }
diff --git a/examples/ci-1_2/ci.tf b/examples/ci-1_2/ci.tf
@@ -1,14 +1,19 @@
 terraform {
-  required_version = "0.13.2"
+  required_version = "1.2.0"
+  required_providers {
+    aws = {
+      source  = "hashicorp/aws"
+      version = "~> 5.0"
+    }
+  }
 }
 
 provider "aws" {
-  version = "~> 3.0"
-  region  = "us-west-2"
+  region = "us-west-2"
 }
 
 module "acs" {
-  source = "github.com/byu-oit/terraform-aws-acs-info.git?ref=v3.1.0"
+  source = "github.com/byu-oit/terraform-aws-acs-info.git?ref=v4.0.0"
 }
 
 module "rds" {
@@ -28,17 +33,20 @@ module "rds" {
 }
 
 output "instance" {
-  value = module.rds.instance
+  value     = module.rds.instance
+  sensitive = true
 }
 
 output "security_group" {
   value = module.rds.security_group
 }
 
 output "master_username_parameter" {
-  value = module.rds.master_username_parameter
+  value     = module.rds.master_username_parameter
+  sensitive = true
 }
 
 output "master_password_parameter" {
-  value = module.rds.master_password_parameter
+  value     = module.rds.master_password_parameter
+  sensitive = true
 }
diff --git a/examples/simple/simple.tf b/examples/simple/simple.tf
@@ -1,14 +1,22 @@
+terraform {
+  required_providers {
+    aws = {
+      source  = "hashicorp/aws"
+      version = ">= 4.0"
+    }
+  }
+}
+
 provider "aws" {
-  version = "~> 3.0"
-  region  = "us-west-2"
+  region = "us-west-2"
 }
 
 module "acs" {
-  source = "github.com/byu-oit/terraform-aws-acs-info.git?ref=v3.0.0"
+  source = "github.com/byu-oit/terraform-aws-acs-info.git?ref=v4.0.0"
 }
 
 module "rds" {
-  source = "github.com/byu-oit/terraform-aws-rds?ref=v2.6.1"
+  source = "github.com/byu-oit/terraform-aws-rds?ref=v3.0.0"
   //  source                  = "../.."
   identifier              = "example"
   engine                  = "mysql"
diff --git a/main.tf b/main.tf
@@ -1,7 +1,10 @@
 terraform {
-  required_version = ">= 0.12.16"
+  required_version = ">= 1.0.0"
   required_providers {
-    aws = ">= 3.0"
+    aws = {
+      source  = "hashicorp/aws"
+      version = ">= 4.0"
+    }
   }
 }
 
@@ -24,7 +27,7 @@ resource "random_string" "default" {
   count   = var.master_username == null ? 1 : 0
   length  = 16
   special = false
-  number  = false
+  numeric = false
   keepers = {
     recreate_username = false
   }
@@ -58,7 +61,7 @@ resource "aws_db_instance" "database" {
   engine_version       = var.engine_version
   parameter_group_name = aws_db_parameter_group.parameter_group.name
 
-  name                                = var.db_name
+  db_name                             = var.db_name
   username                            = var.master_username != null ? var.master_username : aws_ssm_parameter.master_username.value
   password                            = var.master_password != null ? var.master_password : aws_ssm_parameter.master_password.value
   allocated_storage                   = var.allocated_storage
diff --git a/outputs.tf b/outputs.tf
@@ -1,13 +1,15 @@
 output "instance" {
-  value = aws_db_instance.database
+  value     = aws_db_instance.database
+  sensitive = true
 }
 
 output "security_group" {
   value = aws_security_group.db_security_group
 }
 
 output "master_username_parameter" {
-  value = aws_ssm_parameter.master_username
+  value     = aws_ssm_parameter.master_username
+  sensitive = true
 }
 
 output "master_password_parameter" {

Original file line number	Diff line number	Diff line change
`@@ -16,14 +16,14 @@ jobs:`
`16`	`16`	`matrix='{`
`17`	`17`	`"env":[`
`18`	`18`	`{`
`19`		`- "tf_version":"0.13.2",`
`20`		`- "tf_working_dir":"./examples/ci-13",`
	`19`	`+ "tf_version":"1.0.0",`
	`20`	`+ "tf_working_dir":"./examples/ci-1_0",`
`21`	`21`	`"aws_account":"977306314792",`
`22`	`22`	`"aws_gha_role":"terraform-rds-dev-gha"`
`23`	`23`	`},`
`24`	`24`	`{`
`25`		`- "tf_version":"0.12.26",`
`26`		`- "tf_working_dir":"./examples/ci-12",`
	`25`	`+ "tf_version":"1.2.0",`
	`26`	`+ "tf_working_dir":"./examples/ci-1_2",`
`27`	`27`	`"aws_account":"977306314792",`
`28`	`28`	`"aws_gha_role":"terraform-rds-dev-gha"`
`29`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,14 +1,19 @@`
`1`	`1`	`terraform {`
`2`		`- required_version = "0.12.26"`
	`2`	`+ required_version = "1.0.0"`
	`3`	`+ required_providers {`
	`4`	`+ aws = {`
	`5`	`+ source = "hashicorp/aws"`
	`6`	`+ version = "~> 4.0"`
	`7`	`+ }`
	`8`	`+ }`
`3`	`9`	`}`
`4`	`10`
`5`	`11`	`provider "aws" {`
`6`		`- version = "~> 3.0"`
`7`		`- region = "us-west-2"`
	`12`	`+ region = "us-west-2"`
`8`	`13`	`}`
`9`	`14`
`10`	`15`	`module "acs" {`
`11`		`- source = "github.com/byu-oit/terraform-aws-acs-info.git?ref=v3.0.0"`
	`16`	`+ source = "github.com/byu-oit/terraform-aws-acs-info.git?ref=v4.0.0"`
`12`	`17`	`}`
`13`	`18`
`14`	`19`	`module "rds" {`
`@@ -28,17 +33,20 @@ module "rds" {`
`28`	`33`	`}`
`29`	`34`
`30`	`35`	`output "instance" {`
`31`		`- value = module.rds.instance`
	`36`	`+ value = module.rds.instance`
	`37`	`+ sensitive = true`
`32`	`38`	`}`
`33`	`39`
`34`	`40`	`output "security_group" {`
`35`	`41`	`value = module.rds.security_group`
`36`	`42`	`}`
`37`	`43`
`38`	`44`	`output "master_username_parameter" {`
`39`		`- value = module.rds.master_username_parameter`
	`45`	`+ value = module.rds.master_username_parameter`
	`46`	`+ sensitive = true`
`40`	`47`	`}`
`41`	`48`
`42`	`49`	`output "master_password_parameter" {`
`43`		`- value = module.rds.master_password_parameter`
	`50`	`+ value = module.rds.master_password_parameter`
	`51`	`+ sensitive = true`
`44`	`52`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,14 +1,19 @@`
`1`	`1`	`terraform {`
`2`		`- required_version = "0.13.2"`
	`2`	`+ required_version = "1.2.0"`
	`3`	`+ required_providers {`
	`4`	`+ aws = {`
	`5`	`+ source = "hashicorp/aws"`
	`6`	`+ version = "~> 5.0"`
	`7`	`+ }`
	`8`	`+ }`
`3`	`9`	`}`
`4`	`10`
`5`	`11`	`provider "aws" {`
`6`		`- version = "~> 3.0"`
`7`		`- region = "us-west-2"`
	`12`	`+ region = "us-west-2"`
`8`	`13`	`}`
`9`	`14`
`10`	`15`	`module "acs" {`
`11`		`- source = "github.com/byu-oit/terraform-aws-acs-info.git?ref=v3.1.0"`
	`16`	`+ source = "github.com/byu-oit/terraform-aws-acs-info.git?ref=v4.0.0"`
`12`	`17`	`}`
`13`	`18`
`14`	`19`	`module "rds" {`
`@@ -28,17 +33,20 @@ module "rds" {`
`28`	`33`	`}`
`29`	`34`
`30`	`35`	`output "instance" {`
`31`		`- value = module.rds.instance`
	`36`	`+ value = module.rds.instance`
	`37`	`+ sensitive = true`
`32`	`38`	`}`
`33`	`39`
`34`	`40`	`output "security_group" {`
`35`	`41`	`value = module.rds.security_group`
`36`	`42`	`}`
`37`	`43`
`38`	`44`	`output "master_username_parameter" {`
`39`		`- value = module.rds.master_username_parameter`
	`45`	`+ value = module.rds.master_username_parameter`
	`46`	`+ sensitive = true`
`40`	`47`	`}`
`41`	`48`
`42`	`49`	`output "master_password_parameter" {`
`43`		`- value = module.rds.master_password_parameter`
	`50`	`+ value = module.rds.master_password_parameter`
	`51`	`+ sensitive = true`
`44`	`52`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,13 +1,15 @@`
`1`	`1`	`output "instance" {`
`2`		`- value = aws_db_instance.database`
	`2`	`+ value = aws_db_instance.database`
	`3`	`+ sensitive = true`
`3`	`4`	`}`
`4`	`5`
`5`	`6`	`output "security_group" {`
`6`	`7`	`value = aws_security_group.db_security_group`
`7`	`8`	`}`
`8`	`9`
`9`	`10`	`output "master_username_parameter" {`
`10`		`- value = aws_ssm_parameter.master_username`
	`11`	`+ value = aws_ssm_parameter.master_username`
	`12`	`+ sensitive = true`
`11`	`13`	`}`
`12`	`14`
`13`	`15`	`output "master_password_parameter" {`