fix(infra/modules): update for min tf v0.13 (#2370)

GoogleCloudPlatform · May 24, 2024 · 99d34c2 · 99d34c2
1 parent 2553b23
commit 99d34c2
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 4 deletions.
diff --git a/infra/modules/real_time_enforcer_roles/main.tf b/infra/modules/real_time_enforcer_roles/main.tf
@@ -58,7 +58,7 @@ resource "google_organization_iam_custom_role" "forseti-enforcer-writer" {
 resource "random_id" "prevent_destroy" {
   count = "${var.prevent_destroy ? 1 : 0}"
   byte_length = 8
-  keepers {
+  keepers = {
     viewer = "${google_organization_iam_custom_role.forseti-enforcer-viewer.role_id}"
     writer = "${google_organization_iam_custom_role.forseti-enforcer-writer.role_id}"
   }

diff --git a/infra/modules/real_time_enforcer_roles/versions.tf b/infra/modules/real_time_enforcer_roles/versions.tf
@@ -0,0 +1,19 @@
+/**
+ * Copyright 2024 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+terraform {
+  required_version = ">= 0.13.7"
+}
diff --git a/infra/modules/seed_project/variables.tf b/infra/modules/seed_project/variables.tf
@@ -4,7 +4,7 @@ variable "username" {
 
 variable "owner_emails" {
   description = "A list of identities to add as owners on the project in the member format described here: https://cloud.google.com/iam/docs/overview#iam_policy"
-  type        = "list"
+  type        = list
 }
 
 variable "seed_project_services" {
@@ -22,7 +22,7 @@ variable "seed_project_services" {
     "serviceusage.googleapis.com",
   ]
 
-  type = "list"
+  type = list
 }
 
 variable "seed_project_roles" {
@@ -36,7 +36,7 @@ variable "seed_project_roles" {
     "roles/resourcemanager.projectIamAdmin",
   ]
 
-  type = "list"
+  type = list
 }
 
 variable "org_id" {

diff --git a/infra/modules/seed_project/versions.tf b/infra/modules/seed_project/versions.tf
@@ -0,0 +1,19 @@
+/**
+ * Copyright 2024 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+terraform {
+  required_version = ">= 0.13.7"
+}