chore: update template for 0.13 (terraform-google-modules#49)

bankoncloud · May 15, 2021 · 5a94f26 · 5a94f26
1 parent d6b53b3
commit 5a94f26
Show file tree

Hide file tree

Showing 17 changed files with 32 additions and 22 deletions.
diff --git a/terraform-google-{{cookiecutter.module_name}}/README.md b/terraform-google-{{cookiecutter.module_name}}/README.md
@@ -47,8 +47,8 @@ These sections describe requirements for using this module.
 
 The following dependencies must be available:
 
-- [Terraform][terraform] v0.12
-- [Terraform Provider for GCP][terraform-provider-gcp] plugin v2.0
+- [Terraform][terraform] v0.13
+- [Terraform Provider for GCP][terraform-provider-gcp] plugin v3.0
 
 ### Service Account
 

diff --git a/terraform-google-{{cookiecutter.module_name}}/examples/simple_example/main.tf b/terraform-google-{{cookiecutter.module_name}}/examples/simple_example/main.tf
@@ -1,5 +1,5 @@
 /**
- * Copyright 2018 Google LLC
+ * Copyright 2021 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,7 +15,7 @@
  */
 
 provider "google" {
-  version = "~> 2.0"
+  version = "~> 3.0"
 }
 
 module "{{ cookiecutter.module_name|replace('-', '_') }}" {

diff --git a/terraform-google-{{cookiecutter.module_name}}/examples/simple_example/outputs.tf b/terraform-google-{{cookiecutter.module_name}}/examples/simple_example/outputs.tf
@@ -1,5 +1,5 @@
 /**
- * Copyright 2018 Google LLC
+ * Copyright 2021 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/terraform-google-{{cookiecutter.module_name}}/examples/simple_example/variables.tf b/terraform-google-{{cookiecutter.module_name}}/examples/simple_example/variables.tf
@@ -1,5 +1,5 @@
 /**
- * Copyright 2018 Google LLC
+ * Copyright 2021 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/terraform-google-{{cookiecutter.module_name}}/examples/simple_example/versions.tf b/terraform-google-{{cookiecutter.module_name}}/examples/simple_example/versions.tf
@@ -1,5 +1,5 @@
 /**
- * Copyright 2018 Google LLC
+ * Copyright 2021 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,5 +15,5 @@
  */
 
 terraform {
-  required_version = ">= 0.12"
+  required_version = ">= 0.13"
 }
diff --git a/terraform-google-{{cookiecutter.module_name}}/kitchen.yml b/terraform-google-{{cookiecutter.module_name}}/kitchen.yml
@@ -1,4 +1,4 @@
-# Copyright 2018 Google LLC
+# Copyright 2021 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/terraform-google-{{cookiecutter.module_name}}/main.tf b/terraform-google-{{cookiecutter.module_name}}/main.tf
@@ -1,5 +1,5 @@
 /**
- * Copyright 2018 Google LLC
+ * Copyright 2021 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/terraform-google-{{cookiecutter.module_name}}/outputs.tf b/terraform-google-{{cookiecutter.module_name}}/outputs.tf
@@ -1,5 +1,5 @@
 /**
- * Copyright 2018 Google LLC
+ * Copyright 2021 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/terraform-google-{{cookiecutter.module_name}}/test/fixtures/simple_example/main.tf b/terraform-google-{{cookiecutter.module_name}}/test/fixtures/simple_example/main.tf
@@ -1,5 +1,5 @@
 /**
- * Copyright 2018 Google LLC
+ * Copyright 2021 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/terraform-google-{{cookiecutter.module_name}}/test/fixtures/simple_example/outputs.tf b/terraform-google-{{cookiecutter.module_name}}/test/fixtures/simple_example/outputs.tf
@@ -1,5 +1,5 @@
 /**
- * Copyright 2018 Google LLC
+ * Copyright 2021 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/terraform-google-{{cookiecutter.module_name}}/test/fixtures/simple_example/variables.tf b/terraform-google-{{cookiecutter.module_name}}/test/fixtures/simple_example/variables.tf
@@ -1,5 +1,5 @@
 /**
- * Copyright 2018 Google LLC
+ * Copyright 2021 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/terraform-google-{{cookiecutter.module_name}}/test/fixtures/simple_example/versions.tf b/terraform-google-{{cookiecutter.module_name}}/test/fixtures/simple_example/versions.tf
@@ -1,5 +1,5 @@
 /**
- * Copyright 2018 Google LLC
+ * Copyright 2021 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,5 +15,5 @@
  */
 
 terraform {
-  required_version = ">= 0.12"
+  required_version = ">= 0.13"
 }
diff --git a/...rm-google-{{cookiecutter.module_name}}/test/integration/simple_example/controls/gcloud.rb b/...rm-google-{{cookiecutter.module_name}}/test/integration/simple_example/controls/gcloud.rb
@@ -1,4 +1,4 @@
-# Copyright 2018 Google LLC
+# Copyright 2021 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/...aform-google-{{cookiecutter.module_name}}/test/integration/simple_example/controls/gcp.rb b/...aform-google-{{cookiecutter.module_name}}/test/integration/simple_example/controls/gcp.rb
@@ -1,4 +1,4 @@
-# Copyright 2018 Google LLC
+# Copyright 2021 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/...rm-google-{{cookiecutter.module_name}}/test/integration/simple_example/controls/gsutil.rb b/...rm-google-{{cookiecutter.module_name}}/test/integration/simple_example/controls/gsutil.rb
@@ -1,4 +1,4 @@
-# Copyright 2018 Google LLC
+# Copyright 2021 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/terraform-google-{{cookiecutter.module_name}}/variables.tf b/terraform-google-{{cookiecutter.module_name}}/variables.tf
@@ -1,5 +1,5 @@
 /**
- * Copyright 2018 Google LLC
+ * Copyright 2021 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/terraform-google-{{cookiecutter.module_name}}/versions.tf b/terraform-google-{{cookiecutter.module_name}}/versions.tf
@@ -1,5 +1,5 @@
 /**
- * Copyright 2018 Google LLC
+ * Copyright 2021 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,5 +15,15 @@
  */
 
 terraform {
-  required_version = "~> 0.12.6"
+  required_version = ">= 0.13"
+  required_providers {
+    google = {
+      source  = "hashicorp/google"
+      version = "~> 3.53"
+    }
+  }
+
+  provider_meta "google" {
+    module_name = "blueprints/terraform/{{ cookiecutter.module_name }}/v0.0.1"
+  }
 }