upgrade generators

.kapitan

@@ -1,4 +1,3 @@
-version: 0.33
 compile:
   prune: true
   embed-refs: true

.kapitan.jinja

@@ -0,0 +1,19 @@
+# This file contains default settings for Kapitan
+
+# Use version to fix a specific kapitan version
+# version: {{kapitan_version}}
+compile:
+  prune: true
+  embed-refs: true
+  fetch: true
+  yaml-dump-null-as-empty: true
+  compose-node-name: true
+  refs-path: ./system/refs
+  jinja2-filters: ./system/templates/jinja2_filters.py
+  search-paths:
+    - .
+    - ./system/
+    - ./system/lib
+    - ./system/generators
+refs:
+  refs-path: ./system/refs

compiled/kapicorp-project-123/terraform/gcp_project_id.tf.json

@@ -2,11 +2,11 @@
   "resource": {
     "gcp_project_id": {
       "main": {
+        "auto_create_network": false,
+        "billing_account": "jpzaR_ArxEkpIIljqRpFstsP_yw34RR07D6lAynfwIw",
         "name": "kapicorp-project-123",
         "org_id": "az1oDhA50eU5d2ToHhNFrSaWNqAa1iaosXyZfd6SZQ2",
-        "auto_create_network": false,
-        "project_id": "kapicorp-project-123",
-        "billing_account": "jpzaR_ArxEkpIIljqRpFstsP_yw34RR07D6lAynfwIw"
+        "project_id": "kapicorp-project-123"
       }
     }
   }

compiled/kapicorp-project-123/terraform/provider.tf.json

@@ -1,10 +1,10 @@
 {
   "provider": {
     "google": {
+      "impersonate_service_account": "[email protected]",
       "project": "kapicorp-project-123",
       "region": "europe-west1",
-      "zone": "europe-west1-b",
-      "impersonate_service_account": "[email protected]"
+      "zone": "europe-west1-b"
     }
   }
 }

compiled/kapicorp-terraform-admin/terraform/gcp_project_id.tf.json

@@ -2,11 +2,11 @@
   "resource": {
     "gcp_project_id": {
       "main": {
+        "auto_create_network": false,
+        "billing_account": "jpzaR_ArxEkpIIljqRpFstsP_yw34RR07D6lAynfwIw",
         "name": "kapicorp-terraform-admin",
         "org_id": "az1oDhA50eU5d2ToHhNFrSaWNqAa1iaosXyZfd6SZQ2",
-        "auto_create_network": false,
-        "project_id": "kapicorp-terraform-admin",
-        "billing_account": "jpzaR_ArxEkpIIljqRpFstsP_yw34RR07D6lAynfwIw"
+        "project_id": "kapicorp-terraform-admin"
       }
     }
   }

compiled/kapicorp-terraform-admin/terraform/provider.tf.json

@@ -1,10 +1,10 @@
 {
   "provider": {
     "google": {
+      "impersonate_service_account": "[email protected]",
       "project": "kapicorp-terraform-admin",
       "region": "europe-west1",
-      "zone": "europe-west1-b",
-      "impersonate_service_account": "[email protected]"
+      "zone": "europe-west1-b"
     }
   }
 }