feat!: add Terraform 0.13 constraint and module attribution (#89)

* feat!: add Terraform 0.13 constraint and module attribution

* Added GKE API and bumped versions

* Regenerate docs

Co-authored-by: James Duncan <jdun@google.com>
Co-authored-by: Morgante Pell <morgantep@google.com>

Author: 3 people

Makefile

@@ -18,7 +18,7 @@
 # Make will use bash instead of sh
 SHELL := /usr/bin/env bash -O extglob
 
-DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 0.12.0
+DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 0.13
 DOCKER_IMAGE_DEVELOPER_TOOLS := cft/developer-tools
 REGISTRY_URL := gcr.io/cloud-foundation-cicd
 

README.md

@@ -41,24 +41,24 @@ Setting it to `never` will *never* gcloud download and setting it to `always` wi
 ## Inputs
 
 | Name | Description | Type | Default | Required |
-|------|-------------|:----:|:-----:|:-----:|
-| additional\_components | Additional gcloud CLI components to install. Defaults to none. Valid value are components listed in `gcloud components list` | list | `<list>` | no |
-| create\_cmd\_body | On create, the command body you'd like to run with your entrypoint. | string | `"info"` | no |
-| create\_cmd\_entrypoint | On create, the command entrypoint you'd like to use. Can also be set to a custom script. Module's bin directory will be prepended to path. | string | `"gcloud"` | no |
-| create\_cmd\_triggers | List of any additional triggers for the create command execution. | map | `<map>` | no |
-| destroy\_cmd\_body | On destroy, the command body you'd like to run with your entrypoint. | string | `"info"` | no |
-| destroy\_cmd\_entrypoint | On destroy, the command entrypoint you'd like to use.  Can also be set to a custom script. Module's bin directory will be prepended to path. | string | `"gcloud"` | no |
-| enabled | Flag to optionally disable usage of this module. | bool | `"true"` | no |
-| gcloud\_download\_url | Custom gcloud download url. Optional. | string | `""` | no |
-| gcloud\_sdk\_version | The gcloud sdk version to download. | string | `"281.0.0"` | no |
-| jq\_download\_url | Custom jq download url. Optional. | string | `""` | no |
-| jq\_version | The jq version to download. | string | `"1.6"` | no |
-| module\_depends\_on | List of modules or resources this module depends on. | list | `<list>` | no |
-| platform | Platform CLI will run on. Defaults to linux. Valid values: linux, darwin | string | `"linux"` | no |
-| service\_account\_key\_file | Path to service account key file to run `gcloud auth activate-service-account` with. Optional. | string | `""` | no |
-| skip\_download | Whether to skip downloading gcloud (assumes gcloud is already available outside the module) | bool | `"true"` | no |
-| upgrade | Whether to upgrade gcloud at runtime | bool | `"true"` | no |
-| use\_tf\_google\_credentials\_env\_var | Use GOOGLE_CREDENTIALS environment variable to run `gcloud auth activate-service-account` with. Optional. | string | `"false"` | no |
+|------|-------------|------|---------|:--------:|
+| additional\_components | Additional gcloud CLI components to install. Defaults to none. Valid value are components listed in `gcloud components list` | `list` | `[]` | no |
+| create\_cmd\_body | On create, the command body you'd like to run with your entrypoint. | `string` | `"info"` | no |
+| create\_cmd\_entrypoint | On create, the command entrypoint you'd like to use. Can also be set to a custom script. Module's bin directory will be prepended to path. | `string` | `"gcloud"` | no |
+| create\_cmd\_triggers | List of any additional triggers for the create command execution. | `map` | `{}` | no |
+| destroy\_cmd\_body | On destroy, the command body you'd like to run with your entrypoint. | `string` | `"info"` | no |
+| destroy\_cmd\_entrypoint | On destroy, the command entrypoint you'd like to use.  Can also be set to a custom script. Module's bin directory will be prepended to path. | `string` | `"gcloud"` | no |
+| enabled | Flag to optionally disable usage of this module. | `bool` | `true` | no |
+| gcloud\_download\_url | Custom gcloud download url. Optional. | `string` | `""` | no |
+| gcloud\_sdk\_version | The gcloud sdk version to download. | `string` | `"281.0.0"` | no |
+| jq\_download\_url | Custom jq download url. Optional. | `string` | `""` | no |
+| jq\_version | The jq version to download. | `string` | `"1.6"` | no |
+| module\_depends\_on | List of modules or resources this module depends on. | `list` | `[]` | no |
+| platform | Platform CLI will run on. Defaults to linux. Valid values: linux, darwin | `string` | `"linux"` | no |
+| service\_account\_key\_file | Path to service account key file to run `gcloud auth activate-service-account` with. Optional. | `string` | `""` | no |
+| skip\_download | Whether to skip downloading gcloud (assumes gcloud is already available outside the module) | `bool` | `true` | no |
+| upgrade | Whether to upgrade gcloud at runtime | `bool` | `true` | no |
+| use\_tf\_google\_credentials\_env\_var | Use GOOGLE\_CREDENTIALS environment variable to run `gcloud auth activate-service-account` with. Optional. | `bool` | `false` | no |
 
 ## Outputs
 

build/int.cloudbuild.yaml

@@ -58,4 +58,4 @@ tags:
 - 'integration'
 substitutions:
   _DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools'
-  _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '0.12.0'
+  _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '0.13'

build/lint.cloudbuild.yaml

@@ -23,4 +23,4 @@ tags:
 - 'lint'
 substitutions:
   _DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools'
-  _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '0.12.0'
+  _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '0.13'

examples/dependency_example/README.md

@@ -3,6 +3,10 @@
 This example illustrates how to control the order of execution for scripts.
 
 <!-- BEGINNING OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
+## Inputs
+
+No input.
+
 ## Outputs
 
 | Name | Description |

examples/kubectl_wrapper_example/README.md

@@ -6,14 +6,14 @@ This example illustrates how to use the kubectl submodule to deploy Kubernetes r
 ## Inputs
 
 | Name | Description | Type | Default | Required |
-|------|-------------|:----:|:-----:|:-----:|
-| cluster\_name | The name for the GKE cluster | string | `"gke-on-vpc-cluster"` | no |
-| ip\_range\_pods\_name | The secondary ip range to use for pods | string | `"ip-range-pods"` | no |
-| ip\_range\_services\_name | The secondary ip range to use for services | string | `"ip-range-scv"` | no |
-| network | The VPC network created to host the cluster in | string | `"gke-network"` | no |
-| project\_id | The project ID to host the cluster in | string | n/a | yes |
-| region | The region to host the cluster in | string | `"us-central1"` | no |
-| subnetwork | The subnetwork created to host the cluster in | string | `"gke-subnet"` | no |
+|------|-------------|------|---------|:--------:|
+| cluster\_name | The name for the GKE cluster | `string` | `"gke-on-vpc-cluster"` | no |
+| ip\_range\_pods\_name | The secondary ip range to use for pods | `string` | `"ip-range-pods"` | no |
+| ip\_range\_services\_name | The secondary ip range to use for services | `string` | `"ip-range-scv"` | no |
+| network | The VPC network created to host the cluster in | `string` | `"gke-network"` | no |
+| project\_id | The project ID to host the cluster in | `any` | n/a | yes |
+| region | The region to host the cluster in | `string` | `"us-central1"` | no |
+| subnetwork | The subnetwork created to host the cluster in | `string` | `"gke-subnet"` | no |
 
 ## Outputs
 

examples/kubectl_wrapper_example/main.tf

@@ -15,7 +15,7 @@
  */
 
 provider "google" {
-  version = "~> 3.16.0"
+  version = "~> 3.53"
 }
 
 locals {
@@ -24,7 +24,7 @@ locals {
 
 module "enabled_google_apis" {
   source  = "terraform-google-modules/project-factory/google//modules/project_services"
-  version = "~> 8.0"
+  version = "~> 10.2"
 
   project_id                  = var.project_id
   disable_services_on_destroy = false
@@ -39,7 +39,7 @@ module "enabled_google_apis" {
 
 module "gcp-network" {
   source       = "terraform-google-modules/network/google"
-  version      = "~> 2.0"
+  version      = "~> 3.0"
   project_id   = module.enabled_google_apis.project_id
   network_name = var.network
 
@@ -67,7 +67,7 @@ module "gcp-network" {
 
 module "gke" {
   source                 = "terraform-google-modules/kubernetes-engine/google"
-  version                = "~> 9.0"
+  version                = "~> 14.0"
   project_id             = module.enabled_google_apis.project_id
   name                   = var.cluster_name
   regional               = true

examples/script_example/README.md

@@ -6,8 +6,12 @@ This example illustrates how to use the `gcloud` module with a script
 ## Inputs
 
 | Name | Description | Type | Default | Required |
-|------|-------------|:----:|:-----:|:-----:|
-| project\_id | The ID of the project in which to provision resources. | string | n/a | yes |
+|------|-------------|------|---------|:--------:|
+| project\_id | The ID of the project in which to provision resources. | `string` | n/a | yes |
+
+## Outputs
+
+No output.
 
 <!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
 

examples/script_example/main.tf

@@ -15,7 +15,7 @@
  */
 
 provider "google" {
-  version = "~> 2.0"
+  version = "~> 3.53"
 }
 
 module "cli" {

examples/simple_example/README.md

@@ -6,8 +6,8 @@ This example illustrates how to use the `gcloud` module.
 ## Inputs
 
 | Name | Description | Type | Default | Required |
-|------|-------------|:----:|:-----:|:-----:|
-| project\_id | The ID of the project in which to provision resources. | string | n/a | yes |
+|------|-------------|------|---------|:--------:|
+| project\_id | The ID of the project in which to provision resources. | `string` | n/a | yes |
 
 ## Outputs