Format terraform related code according to terraform's convention (#100)

Co-authored-by: Samuel Allan <[email protected]>
canonical · Oct 8, 2024 · 7b51e2a · 7b51e2a
1 parent 19c4706
commit 7b51e2a
Show file tree

Hide file tree

Showing 50 changed files with 135 additions and 119 deletions.
diff --git a/.github/workflows/terraform-apply.yaml b/.github/workflows/terraform-apply.yaml
@@ -16,8 +16,24 @@ on:
       - .github/workflows/terraform-apply.yaml
 
 jobs:
+  lint:
+    name: Linters
+    runs-on: ubuntu-22.04
+    steps:
+      - name: Checkout branch
+        uses: actions/checkout@v4
+
+      - name: Install Terraform
+        run: sudo snap install terraform --classic
+
+      - name: Terraform format lint
+        working-directory: ./terraform-plans
+        run: terraform fmt -check -recursive -diff
+
   terraform:
     name: Run Terraform
+    needs:
+      - lint
     runs-on: ubuntu-22.04
     strategy:
         fail-fast: false

diff --git a/terraform-plans/configs/bootstack-actions_main.tfvars b/terraform-plans/configs/bootstack-actions_main.tfvars
@@ -5,7 +5,7 @@ templates = {
   gitignore = {
     source      = "./templates/github/gitignore.tftpl"
     destination = ".gitignore"
-    vars   = {}
+    vars        = {}
   }
   codeowners = {
     source      = "./templates/github/CODEOWNERS.tftpl"

diff --git a/terraform-plans/configs/charm-advanced-routing_main.tfvars b/terraform-plans/configs/charm-advanced-routing_main.tfvars
@@ -5,7 +5,7 @@ templates = {
   gitignore = {
     source      = "./templates/github/gitignore.tftpl"
     destination = ".gitignore"
-    vars   = {}
+    vars        = {}
   }
   codeowners = {
     source      = "./templates/github/CODEOWNERS.tftpl"
@@ -15,8 +15,8 @@ templates = {
   check = {
     source      = "./templates/github/charm_check.yaml.tftpl"
     destination = ".github/workflows/check.yaml"
-    vars        = {
-      runs_on = "[[ubuntu-22.04]]",
+    vars = {
+      runs_on       = "[[ubuntu-22.04]]",
       test_commands = "['tox -e func']",
     }
   }
@@ -28,7 +28,7 @@ templates = {
   release = {
     source      = "./templates/github/charm_release.yaml.tftpl"
     destination = ".github/workflows/release.yaml"
-    vars        = {
+    vars = {
       runs_on = "[[ubuntu-22.04]]",
     }
   }

diff --git a/terraform-plans/configs/charm-apt-mirror_main.tfvars b/terraform-plans/configs/charm-apt-mirror_main.tfvars
@@ -5,7 +5,7 @@ templates = {
   gitignore = {
     source      = "./templates/github/gitignore.tftpl"
     destination = ".gitignore"
-    vars   = {}
+    vars        = {}
   }
   codeowners = {
     source      = "./templates/github/CODEOWNERS.tftpl"
@@ -15,8 +15,8 @@ templates = {
   check = {
     source      = "./templates/github/charm_check.yaml.tftpl"
     destination = ".github/workflows/check.yaml"
-    vars        = {
-      runs_on = "[[ubuntu-22.04]]",
+    vars = {
+      runs_on       = "[[ubuntu-22.04]]",
       test_commands = "['tox -e func -- -v --series focal', 'tox -e func -- -v --series jammy']",
     }
   }
@@ -28,7 +28,7 @@ templates = {
   release = {
     source      = "./templates/github/charm_release.yaml.tftpl"
     destination = ".github/workflows/release.yaml"
-    vars        = {
+    vars = {
       runs_on = "[[ubuntu-22.04]]",
     }
   }

diff --git a/terraform-plans/configs/charm-cloudsupport_main.tfvars b/terraform-plans/configs/charm-cloudsupport_main.tfvars
@@ -5,7 +5,7 @@ templates = {
   gitignore = {
     source      = "./templates/github/gitignore.tftpl"
     destination = ".gitignore"
-    vars   = {}
+    vars        = {}
   }
   codeowners = {
     source      = "./templates/github/CODEOWNERS.tftpl"

diff --git a/terraform-plans/configs/charm-duplicity_main.tfvars b/terraform-plans/configs/charm-duplicity_main.tfvars
@@ -5,7 +5,7 @@ templates = {
   gitignore = {
     source      = "./templates/github/gitignore.tftpl"
     destination = ".gitignore"
-    vars   = {}
+    vars        = {}
   }
   codeowners = {
     source      = "./templates/github/CODEOWNERS.tftpl"

diff --git a/terraform-plans/configs/charm-juju-backup-all_main.tfvars b/terraform-plans/configs/charm-juju-backup-all_main.tfvars
@@ -5,7 +5,7 @@ templates = {
   gitignore = {
     source      = "./templates/github/gitignore.tftpl"
     destination = ".gitignore"
-    vars   = {}
+    vars        = {}
   }
   codeowners = {
     source      = "./templates/github/CODEOWNERS.tftpl"
@@ -15,8 +15,8 @@ templates = {
   check = {
     source      = "./templates/github/charm_check.yaml.tftpl"
     destination = ".github/workflows/check.yaml"
-    vars        = {
-      runs_on = "[[self-hosted, linux, x64, large, jammy]]",
+    vars = {
+      runs_on       = "[[self-hosted, linux, x64, large, jammy]]",
       test_commands = "['tox -e func']",
     }
   }
@@ -28,7 +28,7 @@ templates = {
   release = {
     source      = "./templates/github/charm_release.yaml.tftpl"
     destination = ".github/workflows/release.yaml"
-    vars        = {
+    vars = {
       runs_on = "[[ubuntu-22.04]]",
     }
   }

diff --git a/terraform-plans/configs/charm-juju-local_main.tfvars b/terraform-plans/configs/charm-juju-local_main.tfvars
@@ -5,7 +5,7 @@ templates = {
   gitignore = {
     source      = "./templates/github/gitignore.tftpl"
     destination = ".gitignore"
-    vars   = {}
+    vars        = {}
   }
   codeowners = {
     source      = "./templates/github/CODEOWNERS.tftpl"
@@ -15,8 +15,8 @@ templates = {
   check = {
     source      = "./templates/github/charm_check.yaml.tftpl"
     destination = ".github/workflows/check.yaml"
-    vars        = {
-      runs_on = "[[ubuntu-22.04]]",
+    vars = {
+      runs_on       = "[[ubuntu-22.04]]",
       test_commands = "['tox -e func']",
     }
   }
@@ -28,7 +28,7 @@ templates = {
   release = {
     source      = "./templates/github/charm_release.yaml.tftpl"
     destination = ".github/workflows/release.yaml"
-    vars        = {
+    vars = {
       runs_on = "[[ubuntu-22.04]]",
     }
   }

diff --git a/terraform-plans/configs/charm-local-users_main.tfvars b/terraform-plans/configs/charm-local-users_main.tfvars
@@ -5,7 +5,7 @@ templates = {
   gitignore = {
     source      = "./templates/github/gitignore.tftpl"
     destination = ".gitignore"
-    vars   = {}
+    vars        = {}
   }
   codeowners = {
     source      = "./templates/github/CODEOWNERS.tftpl"
@@ -15,13 +15,13 @@ templates = {
   check = {
     source      = "./templates/github/charm_check.yaml.tftpl"
     destination = ".github/workflows/check.yaml"
-    vars        = {
+    vars = {
       # github hosted runners are amd64
       # Ubuntu_ARM64_4C_16G_01 is the github-hosted arm64 runner we have access to.
       # We prefer the github runners because they are smaller machines and save resources.
       # If we have issues with it, we can switch to the larger and more numerous self-hosted options:
       # - runs-on: [self-hosted, jammy, ARM64]
-      runs_on = "[[ubuntu-22.04], [Ubuntu_ARM64_4C_16G_01]]",
+      runs_on       = "[[ubuntu-22.04], [Ubuntu_ARM64_4C_16G_01]]",
       test_commands = "['tox -e func']",
     }
   }
@@ -33,7 +33,7 @@ templates = {
   release = {
     source      = "./templates/github/charm_release.yaml.tftpl"
     destination = ".github/workflows/release.yaml"
-    vars        = {
+    vars = {
       # github hosted runners are amd64
       # Ubuntu_ARM64_4C_16G_01 is the github-hosted arm64 runner we have access to.
       # We prefer the github runners because they are smaller machines and save resources.

diff --git a/terraform-plans/configs/charm-logrotated_main.tfvars b/terraform-plans/configs/charm-logrotated_main.tfvars
@@ -5,7 +5,7 @@ templates = {
   gitignore = {
     source      = "./templates/github/gitignore.tftpl"
     destination = ".gitignore"
-    vars   = {}
+    vars        = {}
   }
   codeowners = {
     source      = "./templates/github/CODEOWNERS.tftpl"
@@ -15,8 +15,8 @@ templates = {
   check = {
     source      = "./templates/github/charm_check.yaml.tftpl"
     destination = ".github/workflows/check.yaml"
-    vars        = {
-      runs_on = "[[ubuntu-22.04]]",
+    vars = {
+      runs_on       = "[[ubuntu-22.04]]",
       test_commands = "['tox -e func']",
     }
   }
@@ -28,7 +28,7 @@ templates = {
   release = {
     source      = "./templates/github/charm_release.yaml.tftpl"
     destination = ".github/workflows/release.yaml"
-    vars        = {
+    vars = {
       runs_on = "[[ubuntu-22.04]]",
     }
   }

diff --git a/terraform-plans/configs/charm-nginx_main.tfvars b/terraform-plans/configs/charm-nginx_main.tfvars
@@ -5,7 +5,7 @@ templates = {
   gitignore = {
     source      = "./templates/github/gitignore.tftpl"
     destination = ".gitignore"
-    vars   = {}
+    vars        = {}
   }
   codeowners = {
     source      = "./templates/github/CODEOWNERS.tftpl"
@@ -15,8 +15,8 @@ templates = {
   check = {
     source      = "./templates/github/charm_check.yaml.tftpl"
     destination = ".github/workflows/check.yaml"
-    vars        = {
-      runs_on = "[[ubuntu-22.04]]",
+    vars = {
+      runs_on       = "[[ubuntu-22.04]]",
       test_commands = "['tox -e func']",
     }
   }
@@ -28,7 +28,7 @@ templates = {
   release = {
     source      = "./templates/github/charm_release.yaml.tftpl"
     destination = ".github/workflows/release.yaml"
-    vars        = {
+    vars = {
       runs_on = "[[ubuntu-22.04]]",
     }
   }

diff --git a/terraform-plans/configs/charm-nrpe_main.tfvars b/terraform-plans/configs/charm-nrpe_main.tfvars
@@ -5,7 +5,7 @@ templates = {
   gitignore = {
     source      = "./templates/github/gitignore.tftpl"
     destination = ".gitignore"
-    vars   = {}
+    vars        = {}
   }
   codeowners = {
     source      = "./templates/github/CODEOWNERS.tftpl"
@@ -15,13 +15,13 @@ templates = {
   check = {
     source      = "./templates/github/charm_check.yaml.tftpl"
     destination = ".github/workflows/check.yaml"
-    vars        = {
+    vars = {
       # github hosted runners are amd64
       # Ubuntu_ARM64_4C_16G_01 is the github-hosted arm64 runner we have access to.
       # We prefer the github runners because they are smaller machines and save resources.
       # If we have issues with it, we can switch to the larger and more numerous self-hosted options:
       # - runs-on: [self-hosted, jammy, ARM64]
-      runs_on = "[[ubuntu-22.04], [Ubuntu_ARM64_4C_16G_01]]",
+      runs_on       = "[[ubuntu-22.04], [Ubuntu_ARM64_4C_16G_01]]",
       test_commands = "['tox -e func']",
     }
   }
@@ -33,7 +33,7 @@ templates = {
   release = {
     source      = "./templates/github/charm_release.yaml.tftpl"
     destination = ".github/workflows/release.yaml"
-    vars        = {
+    vars = {
       runs_on = "[[ubuntu-22.04]]",
     }
   }

diff --git a/terraform-plans/configs/charm-openstack-service-checks_main.tfvars b/terraform-plans/configs/charm-openstack-service-checks_main.tfvars
@@ -5,7 +5,7 @@ templates = {
   gitignore = {
     source      = "./templates/github/gitignore.tftpl"
     destination = ".gitignore"
-    vars   = {}
+    vars        = {}
   }
   codeowners = {
     source      = "./templates/github/CODEOWNERS.tftpl"
@@ -20,7 +20,7 @@ templates = {
   release = {
     source      = "./templates/github/charm_release.yaml.tftpl"
     destination = ".github/workflows/release.yaml"
-    vars        = {
+    vars = {
       runs_on = "[[ubuntu-22.04]]",
     }
   }

diff --git a/terraform-plans/configs/charm-prometheus-blackbox-exporter_main.tfvars b/terraform-plans/configs/charm-prometheus-blackbox-exporter_main.tfvars
@@ -5,7 +5,7 @@ templates = {
   gitignore = {
     source      = "./templates/github/gitignore.tftpl"
     destination = ".gitignore"
-    vars   = {}
+    vars        = {}
   }
   codeowners = {
     source      = "./templates/github/CODEOWNERS.tftpl"

diff --git a/terraform-plans/configs/charm-prometheus-juju-exporter_main.tfvars b/terraform-plans/configs/charm-prometheus-juju-exporter_main.tfvars
@@ -5,7 +5,7 @@ templates = {
   gitignore = {
     source      = "./templates/github/gitignore.tftpl"
     destination = ".gitignore"
-    vars   = {}
+    vars        = {}
   }
   codeowners = {
     source      = "./templates/github/CODEOWNERS.tftpl"

diff --git a/terraform-plans/configs/charm-prometheus-libvirt-exporter_main.tfvars b/terraform-plans/configs/charm-prometheus-libvirt-exporter_main.tfvars
@@ -5,7 +5,7 @@ templates = {
   gitignore = {
     source      = "./templates/github/gitignore.tftpl"
     destination = ".gitignore"
-    vars   = {}
+    vars        = {}
   }
   codeowners = {
     source      = "./templates/github/CODEOWNERS.tftpl"
@@ -15,13 +15,13 @@ templates = {
   check = {
     source      = "./templates/github/charm_check.yaml.tftpl"
     destination = ".github/workflows/check.yaml"
-    vars        = {
+    vars = {
       # github hosted runners are amd64
       # Ubuntu_ARM64_4C_16G_01 is the github-hosted arm64 runner we have access to.
       # We prefer the github runners because they are smaller machines and save resources.
       # If we have issues with it, we can switch to the larger and more numerous self-hosted options:
       # - runs-on: [self-hosted, jammy, ARM64]
-      runs_on = "[[ubuntu-22.04], [Ubuntu_ARM64_4C_16G_01]]",
+      runs_on       = "[[ubuntu-22.04], [Ubuntu_ARM64_4C_16G_01]]",
       test_commands = "['tox -e func']",
     }
   }
@@ -33,7 +33,7 @@ templates = {
   release = {
     source      = "./templates/github/charm_release.yaml.tftpl"
     destination = ".github/workflows/release.yaml"
-    vars        = {
+    vars = {
       # github hosted runners are amd64
       # Ubuntu_ARM64_4C_16G_01 is the github-hosted arm64 runner we have access to.
       # We prefer the github runners because they are smaller machines and save resources.

diff --git a/terraform-plans/configs/charm-simple-streams_main.tfvars b/terraform-plans/configs/charm-simple-streams_main.tfvars
@@ -5,7 +5,7 @@ templates = {
   gitignore = {
     source      = "./templates/github/gitignore.tftpl"
     destination = ".gitignore"
-    vars   = {}
+    vars        = {}
   }
   codeowners = {
     source      = "./templates/github/CODEOWNERS.tftpl"

diff --git a/terraform-plans/configs/charm-storage-connector_main.tfvars b/terraform-plans/configs/charm-storage-connector_main.tfvars
@@ -5,7 +5,7 @@ templates = {
   gitignore = {
     source      = "./templates/github/gitignore.tftpl"
     destination = ".gitignore"
-    vars   = {}
+    vars        = {}
   }
   codeowners = {
     source      = "./templates/github/CODEOWNERS.tftpl"