Remove dependence on template provider. Allow v4 of Terraform AWS provider.

tobyclemson · tobyclemson · commit 30296f3bbced · 2022-06-20T19:15:42.000+01:00
diff --git a/spec/infra/harness/terraform.tf b/spec/infra/harness/terraform.tf
@@ -4,11 +4,7 @@ terraform {
   required_providers {
     aws = {
       source = "hashicorp/aws"
-      version = "~> 3.29"
-    }
-    template = {
-      source = "hashicorp/template"
-      version = "~> 2.1"
+      version = "~> 4.10"
     }
   }
 }
diff --git a/spec/infra/prerequisites/main.tf b/spec/infra/prerequisites/main.tf
@@ -27,18 +27,21 @@ resource "aws_s3_bucket" "access_logs_bucket" {
   force_destroy = true
 }
 
-data "template_file" "access_logs_bucket_policy" {
-  template = file("${path.root}/policies/bucket-policy.json.tpl")
-
-  vars = {
-    bucket_name = var.access_logs_bucket
-    bucket_prefix = var.access_logs_bucket_prefix
-    account_id = data.aws_caller_identity.current.account_id
-    load_balancer_account_id = lookup(var.load_balancer_account_ids, var.region)
+data "aws_iam_policy_document" "access_logs_bucket_policy" {
+  statement {
+    actions = ["s3:PutObject"]
+    effect = "Allow"
+    resources = [
+      "arn:aws:s3:::${var.access_logs_bucket}/${var.access_logs_bucket_prefix}/AWSLogs/${data.aws_caller_identity.current.account_id}/*"
+    ]
+    principals {
+      identifiers = [lookup(var.load_balancer_account_ids, var.region)]
+      type        = "AWS"
+    }
   }
 }
 
 resource "aws_s3_bucket_policy" "access_logs_bucket" {
   bucket = aws_s3_bucket.access_logs_bucket.id
-  policy = data.template_file.access_logs_bucket_policy.rendered
+  policy = data.aws_iam_policy_document.access_logs_bucket_policy.json
 }
diff --git a/spec/infra/prerequisites/policies/bucket-policy.json.tpl b/spec/infra/prerequisites/policies/bucket-policy.json.tpl
diff --git a/spec/infra/prerequisites/terraform.tf b/spec/infra/prerequisites/terraform.tf
@@ -4,11 +4,7 @@ terraform {
   required_providers {
     aws = {
       source = "hashicorp/aws"
-      version = "~> 3.29"
-    }
-    template = {
-      source = "hashicorp/template"
-      version = "~> 2.1"
+      version = "~> 4.10"
     }
   }
 }
diff --git a/state/permanent.tfstate b/state/permanent.tfstate
@@ -1,7 +1,7 @@
 {
   "version": 4,
-  "terraform_version": "0.12.17",
-  "serial": 2,
+  "terraform_version": "1.0.11",
+  "serial": 5,
   "lineage": "3521251f-4362-c85b-ecc3-3920f672cebe",
   "outputs": {
     "certificate_arn": {
@@ -20,14 +20,19 @@
           "schema_version": 0,
           "attributes": {
             "arn": "arn:aws:iam::579878096224:server-certificate/wildcard-certificate-test",
-            "certificate_body": "0587fb9421fca430dc32eaae42d377bf776ac67c",
-            "certificate_chain": null,
-            "id": "ASCAYOA3NRVQJ6IGAUT6H",
+            "certificate_body": "-----BEGIN CERTIFICATE-----\nMIIEqDCCApACCQCjF3dqc4N9tTANBgkqhkiG9w0BAQsFADAWMRQwEgYDVQQDDAtl\neGFtcGxlLmNvbTAeFw0yMTA1MTgxNDAwMDJaFw0zMTA1MTYxNDAwMDJaMBYxFDAS\nBgNVBAMMC2V4YW1wbGUuY29tMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKC\nAgEAy30MBWlRXBFpU+vRsUCA6EhLsEcJhZWqNvyJ7ezm4JqQBWN1HDsjffxqqcQF\nx7KrFAvfcR12q5HT7UPg6cJHP/3QHfIC8EKFFDd2zVHD5h2FOJ6f6EU8qHrpByao\nTT91vSJf4PgoUcABBehMGhW1723qJLIaDm/CsjP6XHzCvM+qIMDejY0GuZ5WoQRg\nkcFxbRMBolZ4DqGHyTuAr45SZZnkCUriGTzviL6mp8myNUBU1jRYWcbt6mv1dzwB\niwt2ZOabH5ZsFg6/5KA4qeB5LB1Sv1v03qoR8i62SluCMTP/MaTxX3UXVCasihkl\nXJNz00uKvtUXFH3gjbT5Zwg9DP7clM8iJSOjGuTU5i902NwwnQekIcCGmWRMBArn\nGykdZe+nF53G8TWnUqqNdH6foOeWOczXolCKlk0L4LFjZIRMqpn6DGUgrXCJ9ceJ\nKI3whQGnigz5F99jhg5aWcyCCNi1nwHnvWHk20OhRT+CZ35Lvi1+Cu8ulCid8ZFT\nqI/kc8q6XnJL4QgTGXZ9wwWT1KNuBVLPJDlmCgO2IKxRo9b5s6kpHdz413nkDK+p\nk9UcwwGw8qEOp6uX41dnTexbsnm1Z8ZTzq8oB/ZM2+F3+8c6xV6+evY7ruR+qfnm\nQvItaLcse8d2F6FXTjZ6Aai99Ffsv+wUPXExtwA6jecnIc8CAwEAATANBgkqhkiG\n9w0BAQsFAAOCAgEAml/SmUUBaNLelfosD2M5fAnO71CS1OeP3TSvj9nVN1HwhccG\nlXw2Z9OWjE9ZsLdvgrC/nPTsGdrnFmUQDyri78e1mLU52M51Tbzuw89FavdB/DLE\ngONqH0o6Okv16K9VrqKp6LxwGaaRLHX0p5ICXMCa7eI0+2uY5CyRbv+TJNvqgw+G\n0UuWyj7nqDzStubayrDY3kMr6SJDDsKtViPtpCNbjkx5dUMfFM+bl2ekT6LnxeS/\njyYGdPaGNNde3jHsnhCdCYBCzEQuAvy9jj012HIyhCOLxhU8DD7Uu6oByuP9pA+j\nikz4PMa3NXSrUV+nazrm3b3VfoRnnIRFMcmSwSnATfc8dGQaY2N/uDA5P5soiIIV\n1mcw8wm4XyrYGevF/pgriU4q2YTOPaUtQTwTmRrMCaBfZBXzeOUBaFeKMbEuRkzi\nN+n2nRkR8LqjNPFIZwo0SOhNp8WBOftsa76+8X/o4MuV7i81JpifQMtfoARSL2pO\nqkWWzK4sxD4Z3JK8zxCe8n1vg98YDMTz8f8+oieLl51aqwjr7BRTojDcsUTbJqIL\nVtNdai0bd6WGyGLTOy7NbsaHKL5FSg5DpaAOpa4wCkO2a6MKkKB9a1q8IlySZWOl\nCtVNVZewIqdgBOjGU6RVoYVibp0PrAFEsu3Ngc9VHW1AOzMtXWiFxePn9qQ=\n-----END CERTIFICATE-----",
+            "certificate_chain": "",
+            "expiration": "2031-05-16T14:00:02Z",
+            "id": "ASCAYOA3NRVQJ64RSS573",
             "name": "wildcard-certificate-test",
             "name_prefix": null,
             "path": "/",
-            "private_key": "3839eeeacf53a41295f52e8ad199b9319c5c08b2"
+            "private_key": "-----BEGIN PRIVATE KEY-----\nMIIJQwIBADANBgkqhkiG9w0BAQEFAASCCS0wggkpAgEAAoICAQDLfQwFaVFcEWlT\n69GxQIDoSEuwRwmFlao2/Int7ObgmpAFY3UcOyN9/GqpxAXHsqsUC99xHXarkdPt\nQ+Dpwkc//dAd8gLwQoUUN3bNUcPmHYU4np/oRTyoeukHJqhNP3W9Il/g+ChRwAEF\n6EwaFbXvbeokshoOb8KyM/pcfMK8z6ogwN6NjQa5nlahBGCRwXFtEwGiVngOoYfJ\nO4CvjlJlmeQJSuIZPO+IvqanybI1QFTWNFhZxu3qa/V3PAGLC3Zk5psflmwWDr/k\noDip4HksHVK/W/TeqhHyLrZKW4IxM/8xpPFfdRdUJqyKGSVck3PTS4q+1RcUfeCN\ntPlnCD0M/tyUzyIlI6Ma5NTmL3TY3DCdB6QhwIaZZEwECucbKR1l76cXncbxNadS\nqo10fp+g55Y5zNeiUIqWTQvgsWNkhEyqmfoMZSCtcIn1x4kojfCFAaeKDPkX32OG\nDlpZzIII2LWfAee9YeTbQ6FFP4Jnfku+LX4K7y6UKJ3xkVOoj+RzyrpeckvhCBMZ\ndn3DBZPUo24FUs8kOWYKA7YgrFGj1vmzqSkd3PjXeeQMr6mT1RzDAbDyoQ6nq5fj\nV2dN7FuyebVnxlPOrygH9kzb4Xf7xzrFXr569juu5H6p+eZC8i1otyx7x3YXoVdO\nNnoBqL30V+y/7BQ9cTG3ADqN5ychzwIDAQABAoICAFBWVDKmu9pPfXgGeEk0oDAU\nqt0zjozQ49zFo2btytEN9KJL++ZjasXIrAvOOkH3RheqAFNWQI3ICxV3YQqpCxw2\nhr3r2EEm4gdzRlIVX/Qv33LVHWjEPQh/ThTmrDejQEallZjqIHD2DvFYHwOFYsje\najyGnEbq1MEqSEPPdcq5af94ZeUYsnkCDE2RvtaMus1HXbPL06ZjG4rVFR86X0mB\nkkgg6lbwedlQ+9buiI8BkPzouaDoKvIMIWMrq6hLpDh92uyDpLSoqhYHM5fN6ckC\n4rJuCaUHHAKzcoC01Be84Zml9y2qusUcZ64180wzYt0ey+4/jtcmQ0tvEbAdzovo\nh9aY74QOqQXmUhXiQNPTXZj2LVRahJX+fjq9q2IME7fMWEFjVxkBk3qPAgf9Cj5o\n9G6u/GnHGvmpaaqZbJ1P5rUkMMzNZOmDdw1uTcVmh15OCN2GmsB5szF5eoBhwrQR\nsKQQEwzDkoWgwe0s8g07Xta4Lw60FEME8uIRXfopqtil62bfpeIzAAl1RvqtKVEB\nnaUFLiuKbCqD3x5wzVxx2HamdgXT44WULgV5YqhaR0UEYNUj8WVUwOr6/de/KgSj\nltMun0r2ptVbPXBvK5EivlOuexQwaEEmjg5aFDX9TRbsyPyGdjW5kXr5SviEzC5j\ngTtDUxiN5kMoijg5PJihAoIBAQDuSXSPtum8wLrIiLBbf9712vfu7XwxOMYFkDbI\nO2JKLYinKGjxrs4pSxsrA5GLHqfOUM8eVoL+vxZOoZs5LZQD7iUMMln4K5rufZuB\nIzFaEKZJ/6DutLaProzInhfQKmmsF0SSqP39hxo9aQhgHim852ERecjAsr411EnX\nZ34HfjpYmlRFZtEfhI20yBuAyu/bq5UdzAjjLPdl8sIWfX+TI8t2cuXla7GYQYE+\n7oYFzuEEHW+bUAbF6nhDAFfFVS6DMmr41p/3HiDG68vTzPu/Bt2BYwBnsyNKMn51\nvwJ9zbVK9jNTlb58mvvCtDRB6iSmNd8CKfWlzqSv1eA21h8HAoIBAQDanWKH0qKn\nrhHVu6zZxIOanF1d1K4R+dv3nXRLLbGiOqUu2UuOn/Wv4pjfAshYYbuf6+sSwqc/\n2/7pWOq/6SC8zV1qGj5YmRuHFrFoqNpKAofaZHT8i5ZRybhNE7kWnDqqhh161HoH\nOu9GxfEYT2H5O9EZB+QJsBr1KcvHI/5KNvyhCuDY4uggGZfVkpcSw+K2jqBiGQFU\nSV5xvO9qeYTmDN+uFad+g2rds3ePH8I6t+Uo/jbt2t+awb5PTbRYwWrBs8cQOttF\nyJoW6b45H3Nf2Zuh7QOsoHlAROEDJgEjHN+1vvJ6dWQgzj6tGYIhL462fLGTKP2P\nH7O37mqm1Gz5AoIBAAV2DYPVr1myGRXLfC88qQF9eT0ymCwQnwk1muvP4JrOnFko\nZe9UEEmF/SNpO4aytynVVEnftbTc8EfxEDupPcExTgwPg1xas3xPyKaXBeSIiScd\nArU10xFL8NIQPX952V4mUl4CHYAX/pP1uklpp486xlC+N8mizxUwvlh/eLX3QKMT\nNmc4ygYs5YqFI4w6GnEwZ4R9Tp7WQv1FKQmW6ruWkG0wiPBPHYzdw3aLxOqRKTsM\n6afnl6AllYgDk/9jymMbXrRBRv1E5X9pnAxIoGRqZd03RaUax+5FZfyQ2h/D/Smw\nptB9mBYG/0ohEymHkjt09J16FLUuHTwibLcVBTUCggEBAI5KIfeFgZjiE3mpzbdv\n0LixTZPk+ed5WVKxiR/lfdi5kwoLJMKQGrmAI0AD76KW+if8xeRQDcvixOfcl+6R\nLl20zThiHHJONTyX6KDWRj4lp4beG8bEk/Jn+S0xySaOSSD0afuokERkd5j4/RN1\nl69A37gLCsHDfchUi+3x33EumP+4tOB1z+AUyF6aKvprxQRNkNZIsDTMDEy7TJlg\nvr99YZlNPtd5cfUa+paNdT4Cs4Ua8WWfMCrqL5QuX1PlkDbDbK2DoXSqPKDtQoKr\nlcytNj8OpXWWfVT3f/0sn1DbWkBRKEHMZn9zvhesoqY27gyY3HuMEn01hSQSahhr\n6wECggEBAOXDqBaMNtti01xmFRK3NqYhfspt0I9W71AdOiC/ES408qff9lo1SEZD\nL6LWHrMI4LtyKLqhCgDKtebEnNO4fLhL63kBq3xDnmt0muMAg9UrelEkqbQVpoS6\nku+upiWT0A45Km42klyrmT7ifo4OsXpV84uBjZuB4yaAr2PIvnpZZvjSOkl2zay1\n2TSmN6aFJAQzFA+bFic1TrV3Kyk1g5XDCV3N1w3+IE66ww3NO1V8TV218VprqZT+\n2/TQ5EKO5sUCBo8SX6RoWwxvP57TVc0bThJf5COVihLK4HUYO8JT1zNN7NJaR2Dy\nsXtfG6EhcUmDTfAwyS/kzfEqZhXV+aY=\n-----END PRIVATE KEY-----",
+            "tags": null,
+            "tags_all": {},
+            "upload_date": "2022-06-20T17:38:47Z"
           },
+          "sensitive_attributes": [],
           "private": "bnVsbA=="
         }
       ]
diff --git a/terraform.tf b/terraform.tf
@@ -4,7 +4,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "~> 3.29"
+      version = ">= 3.29"
     }
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -4,11 +4,7 @@ terraform {`
`4`	`4`	`required_providers {`
`5`	`5`	`aws = {`
`6`	`6`	`source = "hashicorp/aws"`
`7`		`- version = "~> 3.29"`
`8`		`- }`
`9`		`- template = {`
`10`		`- source = "hashicorp/template"`
`11`		`- version = "~> 2.1"`
	`7`	`+ version = "~> 4.10"`
`12`	`8`	`}`
`13`	`9`	`}`
`14`	`10`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ terraform {`
`4`	`4`	`required_providers {`
`5`	`5`	`aws = {`
`6`	`6`	`source = "hashicorp/aws"`
`7`		`- version = "~> 3.29"`
	`7`	`+ version = ">= 3.29"`
`8`	`8`	`}`
`9`	`9`	`}`
`10`	`10`	`}`