Add note to generated files pointing to ./autogen

auth.tf

@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+// This file was automatically generated from a template in ./autogen
+
 /******************************************
   Retrieve authentication token
  *****************************************/
@@ -27,4 +29,4 @@ provider "kubernetes" {
   host                   = "https://${local.cluster_endpoint}"
   token                  = "${data.google_client_config.default.access_token}"
   cluster_ca_certificate = "${base64decode(local.cluster_ca_certificate)}"
-}
+}

autogen/auth.tf

@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+{{ autogeneration_note }}
+
 /******************************************
   Retrieve authentication token
  *****************************************/

autogen/cluster_regional.tf

@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+{{ autogeneration_note }}
+
 /******************************************
   Create regional cluster
  *****************************************/

autogen/cluster_zonal.tf

@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+{{ autogeneration_note }}
+
 /******************************************
   Create zonal cluster
  *****************************************/

autogen/dns.tf

@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+{{ autogeneration_note }}
+
 /******************************************
   Delete default kube-dns configmap
  *****************************************/

autogen/main.tf

@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+{{ autogeneration_note }}
+
 /******************************************
   Get available zones in region
  *****************************************/

autogen/masq.tf

@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+{{ autogeneration_note }}
+
 /******************************************
   Create ip-masq-agent confimap
  *****************************************/

autogen/networks.tf

@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+{{ autogeneration_note }}
+
 data "google_compute_network" "gke_network" {
   name    = "${var.network}"
   project = "${local.network_project_id}"

autogen/outputs.tf

@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+{{ autogeneration_note }}
+
 output "name" {
   description = "Cluster name"
   value       = "${local.cluster_name}"

autogen/variables.tf

@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+{{ autogeneration_note }}
+
 variable "project_id" {
   description = "The project ID to host the cluster in (required)"
 }

cluster_regional.tf

@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+// This file was automatically generated from a template in ./autogen
+
 /******************************************
   Create regional cluster
  *****************************************/
@@ -151,4 +153,4 @@ resource "null_resource" "wait_for_regional_cluster" {
   }
 
   depends_on = ["google_container_cluster.primary", "google_container_node_pool.pools"]
-}
+}

cluster_zonal.tf

@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+// This file was automatically generated from a template in ./autogen
+
 /******************************************
   Create zonal cluster
  *****************************************/
@@ -151,4 +153,4 @@ resource "null_resource" "wait_for_zonal_cluster" {
   }
 
   depends_on = ["google_container_cluster.zonal_primary", "google_container_node_pool.zonal_pools"]
-}
+}

dns.tf

@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+// This file was automatically generated from a template in ./autogen
+
 /******************************************
   Delete default kube-dns configmap
  *****************************************/
@@ -49,4 +51,4 @@ EOF
   }
 
   depends_on = ["null_resource.delete_default_kube_dns_configmap", "data.google_client_config.default", "google_container_cluster.primary", "google_container_node_pool.pools", "google_container_cluster.zonal_primary", "google_container_node_pool.zonal_pools"]
-}
+}

helpers/generate_modules/generate_modules.py

@@ -20,20 +20,31 @@
 
 from jinja2 import Environment, FileSystemLoader
 
+TEMPLATE_FOLDER = "./autogen"
+
 
 def main(argv):
     env = Environment(
-        loader=FileSystemLoader('./autogen'),
+        loader=FileSystemLoader(TEMPLATE_FOLDER),
     )
-    template_options = {}
+    template_options = {
+        'autogeneration_note': '// This file was automatically generated ' +
+                               'from a template in {folder}'.format(
+                                   folder=TEMPLATE_FOLDER
+                               ),
+    }
     templates = env.list_templates()
     for template_file in templates:
         template = env.get_template(template_file)
         rendered = template.render(template_options)
         with open(os.path.join("./", template_file), "w") as f:
             f.write(rendered)
+            subprocess.call([
+                "terraform",
+                "fmt",
+                os.path.join("./", template_file)
+            ])
 
-    subprocess.call(["terraform", "fmt"])
 
 if __name__ == "__main__":
     main(sys.argv)

main.tf

@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+// This file was automatically generated from a template in ./autogen
+
 /******************************************
   Get available zones in region
  *****************************************/
@@ -148,4 +150,4 @@ locals {
 data "google_container_engine_versions" "region" {
   zone    = "${data.google_compute_zones.available.names[0]}"
   project = "${var.project_id}"
-}
+}

masq.tf

@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+// This file was automatically generated from a template in ./autogen
+
 /******************************************
   Create ip-masq-agent confimap
  *****************************************/
@@ -39,4 +41,4 @@ EOF
   }
 
   depends_on = ["data.google_client_config.default", "google_container_cluster.primary", "google_container_node_pool.pools", "google_container_cluster.zonal_primary", "google_container_node_pool.zonal_pools"]
-}
+}

networks.tf

@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+// This file was automatically generated from a template in ./autogen
+
 data "google_compute_network" "gke_network" {
   name    = "${var.network}"
   project = "${local.network_project_id}"
@@ -23,4 +25,4 @@ data "google_compute_subnetwork" "gke_subnetwork" {
   name    = "${var.subnetwork}"
   region  = "${var.region}"
   project = "${local.network_project_id}"
-}
+}

outputs.tf

@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+// This file was automatically generated from a template in ./autogen
+
 output "name" {
   description = "Cluster name"
   value       = "${local.cluster_name}"
@@ -104,4 +106,4 @@ output "node_pools_names" {
 output "node_pools_versions" {
   description = "List of node pools versions"
   value       = "${local.cluster_node_pools_versions}"
-}
+}

test/make.sh

@@ -48,9 +48,10 @@ function docker() {
 function check_terraform() {
   echo "Running terraform validate"
   #shellcheck disable=SC2156
-  find . -name "*.tf" -not -path "./test/fixtures/shared/*" -not -path "./test/fixtures/all_examples/*" -exec bash -c 'terraform validate --check-variables=false $(dirname "{}")' \;
+  find . -name "*.tf" -not -path "./autogen/*" -not -path "./test/fixtures/shared/*" -not -path "./test/fixtures/all_examples/*" -exec bash -c 'terraform validate --check-variables=false $(dirname "{}")' \;
   echo "Running terraform fmt"
-  terraform fmt -check=true -write=false
+  #shellcheck disable=SC2156
+  find . -name "*.tf" -not -path "./autogen/*" -not -path "./test/fixtures/shared/*" -not -path "./test/fixtures/all_examples/*" -exec bash -c 'terraform fmt -check=true -write=false "{}"' \;
 }
 
 # This function runs 'go fmt' and 'go vet' on every file

variables.tf

@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+// This file was automatically generated from a template in ./autogen
+
 variable "project_id" {
   description = "The project ID to host the cluster in (required)"
 }
@@ -208,4 +210,4 @@ variable "monitoring_service" {
 variable "service_account" {
   description = "The service account to default running nodes as if not overridden in `node_pools`. Defaults to the compute engine default service account"
   default     = ""
-}
+}