Merge pull request #24 from ministryofjustice/tf12-upgrade-ecr

Upgrade ecr example to tf0.12
ministryofjustice · Nov 27, 2019 · eaecae4 · eaecae4
2 parents d0157c4 + dcc1b12
commit eaecae4
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 36 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
diff --git a/README.md b/README.md
@@ -23,7 +23,7 @@ module "best_team_ecr_credentials" {
 
   # This is a new input
   providers = {
-    aws = "aws.london"
+    aws = aws.london
   }
 }
 ```

diff --git a/examples/ecr.tf b/examples/ecr.tf
@@ -5,14 +5,14 @@
  *
  */
 module "example_team_ecr_credentials" {
-  source    = "github.com/ministryofjustice/cloud-platform-terraform-ecr-credentials?ref=3.4"
+  source    = "github.com/ministryofjustice/cloud-platform-terraform-ecr-credentials?ref=4.0"
   repo_name = "example-module"
   team_name = "example-team"
 
   # aws_region = "eu-west-2"     # This input is deprecated from version 3.2 of this module
 
   providers = {
-    aws = "aws.london"
+    aws = aws.london
   }
 }
 
@@ -22,10 +22,11 @@ resource "kubernetes_secret" "example_team_ecr_credentials" {
     namespace = "my-namespace"
   }
 
-  data {
-    access_key_id     = "${module.example_team_ecr_credentials.access_key_id}"
-    secret_access_key = "${module.example_team_ecr_credentials.secret_access_key}"
-    repo_arn          = "${module.example_team_ecr_credentials.repo_arn}"
-    repo_url          = "${module.example_team_ecr_credentials.repo_url}"
+  data = {
+    access_key_id     = module.example_team_ecr_credentials.access_key_id
+    secret_access_key = module.example_team_ecr_credentials.secret_access_key
+    repo_arn          = module.example_team_ecr_credentials.repo_arn
+    repo_url          = module.example_team_ecr_credentials.repo_url
   }
 }
+
diff --git a/examples/main.tf b/examples/main.tf
@@ -17,3 +17,4 @@ provider "aws" {
   alias  = "ireland"
   region = "eu-west-1"
 }
+
diff --git a/examples/versions.tf b/examples/versions.tf
@@ -0,0 +1,4 @@
+
+terraform {
+  required_version = ">= 0.12"
+}
Original file line number	Diff line number	Diff line change
Expand Up		@@ -17,3 +17,4 @@ provider "aws" {
		alias = "ireland"
		region = "eu-west-1"
		}