fix: Revert attribution fix (#845)

* revert: Fix attribution for safer cluster modules (#830)

* update to 14.0

* temporarily test with 0.14x tf image in ci

* bump setup pf versions

* bump setup provider

* fix setup pf

* kitchen fix for 0.14

* bump networking

* bump iap example

* switch back to 0.13 tests

* fmt

README.md

@@ -123,7 +123,6 @@ Then perform the following commands on the root folder:
 
 | Name | Description | Type | Default | Required |
 |------|-------------|------|---------|:--------:|
-| \_parent\_module | (Internal) Parent module which should be referenced in API calls. | `string` | `""` | no |
 | add\_cluster\_firewall\_rules | Create additional firewall rules | `bool` | `false` | no |
 | add\_shadow\_firewall\_rules | Create GKE shadow firewall (the same as default firewall rules with firewall logs enabled). | `bool` | `false` | no |
 | basic\_auth\_password | The password to be used with Basic Authentication. | `string` | `""` | no |

autogen/main/variables.tf.tmpl

@@ -626,9 +626,3 @@ variable "enable_tpu" {
   default     = false
 }
 {% endif %}
-
-variable "_parent_module" {
-  type = string
-  description = "(Internal) Parent module which should be referenced in API calls."
-  default = ""
-}

autogen/main/versions.tf.tmpl

@@ -17,10 +17,6 @@
 {% set module_path_str =  module_path|string %}
 {% set module_registry_name = module_path_str.split('/')[-1] %}
 
-locals {
-  blueprint_name = join("/", compact([var._parent_module, "terraform-google-kubernetes-engine{% if module_registry_name %}:{{ module_registry_name }}{% endif %}/v14.0.0"]))
-}
-
 terraform {
   required_version = ">=0.13"
 
@@ -36,7 +32,7 @@ terraform {
     }
   }
   provider_meta "google-beta" {
-    module_name = "blueprints/terraform/${local.blueprint_name}"
+    module_name = "blueprints/terraform/terraform-google-kubernetes-engine{% if module_registry_name %}:{{ module_registry_name }}{% endif %}/v14.0.0"
   }
 {% else %}
   required_providers {
@@ -50,7 +46,7 @@ terraform {
     }
   }
   provider_meta "google" {
-    module_name = "blueprints/terraform/${local.blueprint_name}"
+    module_name = "blueprints/terraform/terraform-google-kubernetes-engine{% if module_registry_name %}:{{ module_registry_name }}{% endif %}/v14.0.0"
   }
 {% endif %}
 }

autogen/safer-cluster/main.tf.tmpl

@@ -168,6 +168,4 @@ module "gke" {
   gce_pd_csi_driver = var.gce_pd_csi_driver
 
   notification_config_topic = var.notification_config_topic
-
-  _parent_module = local.blueprint_name
 }

autogen/safer-cluster/variables.tf.tmpl

@@ -375,9 +375,3 @@ variable "notification_config_topic" {
   description = "The desired Pub/Sub topic to which notifications will be sent by GKE. Format is projects/{project}/topics/{topic}."
   default     = ""
 }
-
-variable "_parent_module" {
-  type = string
-  description = "(Internal) Parent module which should be referenced in API calls."
-  default = ""
-}

autogen/safer-cluster/versions.tf.tmpl

@@ -19,14 +19,10 @@
 {% set module_path_str =  module_path|string %}
 {% set module_registry_name = module_path_str.split('/')[-1] %}
 
-locals {
-  blueprint_name = join("/", compact([var._parent_module, "terraform-google-kubernetes-engine{% if module_registry_name %}:{{ module_registry_name }}{% endif %}/v14.0.0"]))
-}
-
 terraform {
   required_version = ">=0.13"
 
   provider_meta "google-beta" {
-    module_name = "blueprints/terraform/${local.blueprint_name}"
+    module_name = "blueprints/terraform/terraform-google-kubernetes-engine{% if module_registry_name %}:{{ module_registry_name }}{% endif %}/v14.0.0"
   }
 }

examples/private_zonal_with_networking/main.tf

@@ -25,7 +25,7 @@ provider "kubernetes" {
 
 module "gcp-network" {
   source       = "terraform-google-modules/network/google"
-  version      = "~> 2.5"
+  version      = "~> 3.1"
   project_id   = var.project_id
   network_name = var.network
 

examples/safer_cluster_iap_bastion/bastion.tf

@@ -28,7 +28,7 @@ data "template_file" "startup_script" {
 
 module "bastion" {
   source         = "terraform-google-modules/bastion-host/google"
-  version        = "~> 2.0"
+  version        = "~> 3.0"
   network        = module.vpc.network_self_link
   subnet         = module.vpc.subnets_self_links[0]
   project        = module.enabled_google_apis.project_id

examples/simple_regional_with_networking/main.tf

@@ -15,7 +15,7 @@
  */
 
 provider "google" {
-  version = "~> 3.42.0"
+  version = "~> 3.45.0"
 }
 
 data "google_client_config" "default" {}
@@ -29,7 +29,7 @@ provider "kubernetes" {
 
 module "gcp-network" {
   source       = "terraform-google-modules/network/google"
-  version      = "~> 2.5"
+  version      = "~> 3.1"
   project_id   = var.project_id
   network_name = var.network
 

modules/beta-private-cluster-update-variant/README.md

@@ -154,7 +154,6 @@ Then perform the following commands on the root folder:
 
 | Name | Description | Type | Default | Required |
 |------|-------------|------|---------|:--------:|
-| \_parent\_module | (Internal) Parent module which should be referenced in API calls. | `string` | `""` | no |
 | add\_cluster\_firewall\_rules | Create additional firewall rules | `bool` | `false` | no |
 | add\_shadow\_firewall\_rules | Create GKE shadow firewall (the same as default firewall rules with firewall logs enabled). | `bool` | `false` | no |
 | authenticator\_security\_group | The name of the RBAC security group for use with Google security groups in Kubernetes RBAC. Group name must be in format gke-security-groups@yourdomain.com | `string` | `null` | no |

modules/beta-private-cluster-update-variant/variables.tf

@@ -602,9 +602,3 @@ variable "enable_tpu" {
   description = "Enable Cloud TPU resources in the cluster. WARNING: changing this after cluster creation is destructive!"
   default     = false
 }
-
-variable "_parent_module" {
-  type        = string
-  description = "(Internal) Parent module which should be referenced in API calls."
-  default     = ""
-}

modules/beta-private-cluster-update-variant/versions.tf

@@ -15,10 +15,6 @@
  */
 
 
-locals {
-  blueprint_name = join("/", compact([var._parent_module, "terraform-google-kubernetes-engine:beta-private-cluster-update-variant/v14.0.0"]))
-}
-
 terraform {
   required_version = ">=0.13"
 
@@ -33,6 +29,6 @@ terraform {
     }
   }
   provider_meta "google-beta" {
-    module_name = "blueprints/terraform/${local.blueprint_name}"
+    module_name = "blueprints/terraform/terraform-google-kubernetes-engine:beta-private-cluster-update-variant/v14.0.0"
   }
 }

modules/beta-private-cluster/README.md

@@ -132,7 +132,6 @@ Then perform the following commands on the root folder:
 
 | Name | Description | Type | Default | Required |
 |------|-------------|------|---------|:--------:|
-| \_parent\_module | (Internal) Parent module which should be referenced in API calls. | `string` | `""` | no |
 | add\_cluster\_firewall\_rules | Create additional firewall rules | `bool` | `false` | no |
 | add\_shadow\_firewall\_rules | Create GKE shadow firewall (the same as default firewall rules with firewall logs enabled). | `bool` | `false` | no |
 | authenticator\_security\_group | The name of the RBAC security group for use with Google security groups in Kubernetes RBAC. Group name must be in format gke-security-groups@yourdomain.com | `string` | `null` | no |

modules/beta-private-cluster/variables.tf

@@ -602,9 +602,3 @@ variable "enable_tpu" {
   description = "Enable Cloud TPU resources in the cluster. WARNING: changing this after cluster creation is destructive!"
   default     = false
 }
-
-variable "_parent_module" {
-  type        = string
-  description = "(Internal) Parent module which should be referenced in API calls."
-  default     = ""
-}

modules/beta-private-cluster/versions.tf

@@ -15,10 +15,6 @@
  */
 
 
-locals {
-  blueprint_name = join("/", compact([var._parent_module, "terraform-google-kubernetes-engine:beta-private-cluster/v14.0.0"]))
-}
-
 terraform {
   required_version = ">=0.13"
 
@@ -33,6 +29,6 @@ terraform {
     }
   }
   provider_meta "google-beta" {
-    module_name = "blueprints/terraform/${local.blueprint_name}"
+    module_name = "blueprints/terraform/terraform-google-kubernetes-engine:beta-private-cluster/v14.0.0"
   }
 }

modules/beta-public-cluster-update-variant/README.md

@@ -148,7 +148,6 @@ Then perform the following commands on the root folder:
 
 | Name | Description | Type | Default | Required |
 |------|-------------|------|---------|:--------:|
-| \_parent\_module | (Internal) Parent module which should be referenced in API calls. | `string` | `""` | no |
 | add\_cluster\_firewall\_rules | Create additional firewall rules | `bool` | `false` | no |
 | add\_shadow\_firewall\_rules | Create GKE shadow firewall (the same as default firewall rules with firewall logs enabled). | `bool` | `false` | no |
 | authenticator\_security\_group | The name of the RBAC security group for use with Google security groups in Kubernetes RBAC. Group name must be in format gke-security-groups@yourdomain.com | `string` | `null` | no |

modules/beta-public-cluster-update-variant/variables.tf

@@ -571,9 +571,3 @@ variable "enable_tpu" {
   description = "Enable Cloud TPU resources in the cluster. WARNING: changing this after cluster creation is destructive!"
   default     = false
 }
-
-variable "_parent_module" {
-  type        = string
-  description = "(Internal) Parent module which should be referenced in API calls."
-  default     = ""
-}

modules/beta-public-cluster-update-variant/versions.tf

@@ -15,10 +15,6 @@
  */
 
 
-locals {
-  blueprint_name = join("/", compact([var._parent_module, "terraform-google-kubernetes-engine:beta-public-cluster-update-variant/v14.0.0"]))
-}
-
 terraform {
   required_version = ">=0.13"
 
@@ -33,6 +29,6 @@ terraform {
     }
   }
   provider_meta "google-beta" {
-    module_name = "blueprints/terraform/${local.blueprint_name}"
+    module_name = "blueprints/terraform/terraform-google-kubernetes-engine:beta-public-cluster-update-variant/v14.0.0"
   }
 }

modules/beta-public-cluster/README.md

@@ -126,7 +126,6 @@ Then perform the following commands on the root folder:
 
 | Name | Description | Type | Default | Required |
 |------|-------------|------|---------|:--------:|
-| \_parent\_module | (Internal) Parent module which should be referenced in API calls. | `string` | `""` | no |
 | add\_cluster\_firewall\_rules | Create additional firewall rules | `bool` | `false` | no |
 | add\_shadow\_firewall\_rules | Create GKE shadow firewall (the same as default firewall rules with firewall logs enabled). | `bool` | `false` | no |
 | authenticator\_security\_group | The name of the RBAC security group for use with Google security groups in Kubernetes RBAC. Group name must be in format gke-security-groups@yourdomain.com | `string` | `null` | no |

modules/beta-public-cluster/variables.tf

@@ -571,9 +571,3 @@ variable "enable_tpu" {
   description = "Enable Cloud TPU resources in the cluster. WARNING: changing this after cluster creation is destructive!"
   default     = false
 }
-
-variable "_parent_module" {
-  type        = string
-  description = "(Internal) Parent module which should be referenced in API calls."
-  default     = ""
-}

modules/beta-public-cluster/versions.tf

@@ -15,10 +15,6 @@
  */
 
 
-locals {
-  blueprint_name = join("/", compact([var._parent_module, "terraform-google-kubernetes-engine:beta-public-cluster/v14.0.0"]))
-}
-
 terraform {
   required_version = ">=0.13"
 
@@ -33,6 +29,6 @@ terraform {
     }
   }
   provider_meta "google-beta" {
-    module_name = "blueprints/terraform/${local.blueprint_name}"
+    module_name = "blueprints/terraform/terraform-google-kubernetes-engine:beta-public-cluster/v14.0.0"
   }
 }

modules/private-cluster-update-variant/README.md

@@ -151,7 +151,6 @@ Then perform the following commands on the root folder:
 
 | Name | Description | Type | Default | Required |
 |------|-------------|------|---------|:--------:|
-| \_parent\_module | (Internal) Parent module which should be referenced in API calls. | `string` | `""` | no |
 | add\_cluster\_firewall\_rules | Create additional firewall rules | `bool` | `false` | no |
 | add\_shadow\_firewall\_rules | Create GKE shadow firewall (the same as default firewall rules with firewall logs enabled). | `bool` | `false` | no |
 | basic\_auth\_password | The password to be used with Basic Authentication. | `string` | `""` | no |

modules/private-cluster-update-variant/variables.tf

@@ -468,9 +468,3 @@ variable "impersonate_service_account" {
   default     = ""
 }
 
-
-variable "_parent_module" {
-  type        = string
-  description = "(Internal) Parent module which should be referenced in API calls."
-  default     = ""
-}

modules/private-cluster-update-variant/versions.tf

@@ -15,10 +15,6 @@
  */
 
 
-locals {
-  blueprint_name = join("/", compact([var._parent_module, "terraform-google-kubernetes-engine:private-cluster-update-variant/v14.0.0"]))
-}
-
 terraform {
   required_version = ">=0.13"
 
@@ -33,6 +29,6 @@ terraform {
     }
   }
   provider_meta "google" {
-    module_name = "blueprints/terraform/${local.blueprint_name}"
+    module_name = "blueprints/terraform/terraform-google-kubernetes-engine:private-cluster-update-variant/v14.0.0"
   }
 }

modules/private-cluster/README.md

@@ -129,7 +129,6 @@ Then perform the following commands on the root folder:
 
 | Name | Description | Type | Default | Required |
 |------|-------------|------|---------|:--------:|
-| \_parent\_module | (Internal) Parent module which should be referenced in API calls. | `string` | `""` | no |
 | add\_cluster\_firewall\_rules | Create additional firewall rules | `bool` | `false` | no |
 | add\_shadow\_firewall\_rules | Create GKE shadow firewall (the same as default firewall rules with firewall logs enabled). | `bool` | `false` | no |
 | basic\_auth\_password | The password to be used with Basic Authentication. | `string` | `""` | no |

modules/private-cluster/variables.tf

@@ -468,9 +468,3 @@ variable "impersonate_service_account" {
   default     = ""
 }
 
-
-variable "_parent_module" {
-  type        = string
-  description = "(Internal) Parent module which should be referenced in API calls."
-  default     = ""
-}

modules/private-cluster/versions.tf

@@ -15,10 +15,6 @@
  */
 
 
-locals {
-  blueprint_name = join("/", compact([var._parent_module, "terraform-google-kubernetes-engine:private-cluster/v14.0.0"]))
-}
-
 terraform {
   required_version = ">=0.13"
 
@@ -33,6 +29,6 @@ terraform {
     }
   }
   provider_meta "google" {
-    module_name = "blueprints/terraform/${local.blueprint_name}"
+    module_name = "blueprints/terraform/terraform-google-kubernetes-engine:private-cluster/v14.0.0"
   }
 }

modules/safer-cluster-update-variant/README.md

@@ -201,7 +201,6 @@ For simplicity, we suggest using `roles/container.admin` and
 
 | Name | Description | Type | Default | Required |
 |------|-------------|------|---------|:--------:|
-| \_parent\_module | (Internal) Parent module which should be referenced in API calls. | `string` | `""` | no |
 | add\_cluster\_firewall\_rules | Create additional firewall rules | `bool` | `false` | no |
 | authenticator\_security\_group | The name of the RBAC security group for use with Google security groups in Kubernetes RBAC. Group name must be in format gke-security-groups@yourdomain.com | `string` | `null` | no |
 | cloudrun | (Beta) Enable CloudRun addon | `bool` | `false` | no |

modules/safer-cluster-update-variant/main.tf

@@ -164,6 +164,4 @@ module "gke" {
   gce_pd_csi_driver = var.gce_pd_csi_driver
 
   notification_config_topic = var.notification_config_topic
-
-  _parent_module = local.blueprint_name
 }

modules/safer-cluster-update-variant/variables.tf

@@ -375,9 +375,3 @@ variable "notification_config_topic" {
   description = "The desired Pub/Sub topic to which notifications will be sent by GKE. Format is projects/{project}/topics/{topic}."
   default     = ""
 }
-
-variable "_parent_module" {
-  type        = string
-  description = "(Internal) Parent module which should be referenced in API calls."
-  default     = ""
-}

modules/safer-cluster-update-variant/versions.tf

@@ -17,14 +17,10 @@
 // This file was automatically generated from a template in ./autogen/safer-cluster
 
 
-locals {
-  blueprint_name = join("/", compact([var._parent_module, "terraform-google-kubernetes-engine:safer-cluster-update-variant/v14.0.0"]))
-}
-
 terraform {
   required_version = ">=0.13"
 
   provider_meta "google-beta" {
-    module_name = "blueprints/terraform/${local.blueprint_name}"
+    module_name = "blueprints/terraform/terraform-google-kubernetes-engine:safer-cluster-update-variant/v14.0.0"
   }
 }

modules/safer-cluster/README.md

@@ -201,7 +201,6 @@ For simplicity, we suggest using `roles/container.admin` and
 
 | Name | Description | Type | Default | Required |
 |------|-------------|------|---------|:--------:|
-| \_parent\_module | (Internal) Parent module which should be referenced in API calls. | `string` | `""` | no |
 | add\_cluster\_firewall\_rules | Create additional firewall rules | `bool` | `false` | no |
 | authenticator\_security\_group | The name of the RBAC security group for use with Google security groups in Kubernetes RBAC. Group name must be in format gke-security-groups@yourdomain.com | `string` | `null` | no |
 | cloudrun | (Beta) Enable CloudRun addon | `bool` | `false` | no |

modules/safer-cluster/main.tf

@@ -164,6 +164,4 @@ module "gke" {
   gce_pd_csi_driver = var.gce_pd_csi_driver
 
   notification_config_topic = var.notification_config_topic
-
-  _parent_module = local.blueprint_name
 }