From 471f7971f224d3d31a7817c9d9946ffcced8d28f Mon Sep 17 00:00:00 2001
From: Ismail Ahmad <ismailahmad@ismailscbookpro.lan>
Date: Sat, 16 Jan 2021 00:38:53 -0500
Subject: [PATCH] refactor: tf fmt
---
.../networking/aws/dependencies/terraform/env/ci/ci.tf | 2 +-
.../aws/dependencies/terraform/env/ci/variables.tf | 2 +-
.../networking/aws/dependencies/terraform/main/main.tf | 8 ++++----
.../dependencies/terraform/env/ci-airgap/ci-airgap.tf | 8 ++++----
.../dependencies/terraform/env/ci-airgap/variables.tf | 2 +-
.gitlab-ci/jobs/rke2/dependencies/terraform/env/ci/ci.tf | 2 +-
.../jobs/rke2/dependencies/terraform/env/ci/variables.tf | 2 +-
.gitlab-ci/jobs/rke2/dependencies/terraform/main/main.tf | 8 ++++----
8 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/.gitlab-ci/jobs/networking/aws/dependencies/terraform/env/ci/ci.tf b/.gitlab-ci/jobs/networking/aws/dependencies/terraform/env/ci/ci.tf
index 292d16415c..3b8ab4d9ba 100644
--- a/.gitlab-ci/jobs/networking/aws/dependencies/terraform/env/ci/ci.tf
+++ b/.gitlab-ci/jobs/networking/aws/dependencies/terraform/env/ci/ci.tf
@@ -14,7 +14,7 @@ module "ci" {
# Set by CI - "TF_VAR_env=$(echo $CI_COMMIT_REF_SLUG | cut -c 1-7)-$(echo $CI_COMMIT_SHA | cut -c 1-7)"
env = var.env
# Set by CI - "TF_VAR_ci_pipeline_url=$ci_pipeline_url"
- ci_pipeline_url = var.ci_pipeline_url
+ ci_pipeline_url = var.ci_pipeline_url
# Calculated in CI
vpc_cidr = var.vpc_cidr
diff --git a/.gitlab-ci/jobs/networking/aws/dependencies/terraform/env/ci/variables.tf b/.gitlab-ci/jobs/networking/aws/dependencies/terraform/env/ci/variables.tf
index ceff7b2a47..4290856609 100644
--- a/.gitlab-ci/jobs/networking/aws/dependencies/terraform/env/ci/variables.tf
+++ b/.gitlab-ci/jobs/networking/aws/dependencies/terraform/env/ci/variables.tf
@@ -1,3 +1,3 @@
variable "vpc_cidr" {}
variable "env" {}
-variable "ci_pipeline_url" {}
\ No newline at end of file
+variable "ci_pipeline_url" {}
\ No newline at end of file
diff --git a/.gitlab-ci/jobs/networking/aws/dependencies/terraform/main/main.tf b/.gitlab-ci/jobs/networking/aws/dependencies/terraform/main/main.tf
index e2599d7bb0..d576adf874 100644
--- a/.gitlab-ci/jobs/networking/aws/dependencies/terraform/main/main.tf
+++ b/.gitlab-ci/jobs/networking/aws/dependencies/terraform/main/main.tf
@@ -27,10 +27,10 @@ locals {
name = "umbrella-${var.env}"
tags = {
- "terraform" = "true",
- "env" = var.env,
- "project" = "umbrella",
- "ci_pipeline_url" = var.ci_pipeline_url
+ "terraform" = "true",
+ "env" = var.env,
+ "project" = "umbrella",
+ "ci_pipeline_url" = var.ci_pipeline_url
}
}
diff --git a/.gitlab-ci/jobs/rke2/dependencies/terraform/env/ci-airgap/ci-airgap.tf b/.gitlab-ci/jobs/rke2/dependencies/terraform/env/ci-airgap/ci-airgap.tf
index d2cfd0022a..88e812d4e1 100644
--- a/.gitlab-ci/jobs/rke2/dependencies/terraform/env/ci-airgap/ci-airgap.tf
+++ b/.gitlab-ci/jobs/rke2/dependencies/terraform/env/ci-airgap/ci-airgap.tf
@@ -22,10 +22,10 @@ data "terraform_remote_state" "networking" {
module "ci" {
source = "../../main"
- env = var.env
- ci_pipeline_url = var.ci_pipeline_url
- vpc_id = data.terraform_remote_state.networking.outputs.vpc_id
- subnets = data.terraform_remote_state.networking.outputs.intra_subnets
+ env = var.env
+ ci_pipeline_url = var.ci_pipeline_url
+ vpc_id = data.terraform_remote_state.networking.outputs.vpc_id
+ subnets = data.terraform_remote_state.networking.outputs.intra_subnets
download = false
server_ami = "ami-00aab2121681e4a31"
diff --git a/.gitlab-ci/jobs/rke2/dependencies/terraform/env/ci-airgap/variables.tf b/.gitlab-ci/jobs/rke2/dependencies/terraform/env/ci-airgap/variables.tf
index a08cca4124..2ae56f77d5 100644
--- a/.gitlab-ci/jobs/rke2/dependencies/terraform/env/ci-airgap/variables.tf
+++ b/.gitlab-ci/jobs/rke2/dependencies/terraform/env/ci-airgap/variables.tf
@@ -3,4 +3,4 @@ variable "aws_region" {
}
variable "env" {}
-variable "ci_pipeline_url" {}
\ No newline at end of file
+variable "ci_pipeline_url" {}
\ No newline at end of file
diff --git a/.gitlab-ci/jobs/rke2/dependencies/terraform/env/ci/ci.tf b/.gitlab-ci/jobs/rke2/dependencies/terraform/env/ci/ci.tf
index bc3d092afe..fed3a12ec8 100644
--- a/.gitlab-ci/jobs/rke2/dependencies/terraform/env/ci/ci.tf
+++ b/.gitlab-ci/jobs/rke2/dependencies/terraform/env/ci/ci.tf
@@ -23,7 +23,7 @@ module "ci" {
source = "../../main"
env = var.env
- ci_pipeline_url = var.ci_pipeline_url
+ ci_pipeline_url = var.ci_pipeline_url
vpc_id = data.terraform_remote_state.networking.outputs.vpc_id
private_subnets = data.terraform_remote_state.networking.outputs.private_subnets
public_subnets = data.terraform_remote_state.networking.outputs.public_subnets
diff --git a/.gitlab-ci/jobs/rke2/dependencies/terraform/env/ci/variables.tf b/.gitlab-ci/jobs/rke2/dependencies/terraform/env/ci/variables.tf
index a08cca4124..2ae56f77d5 100644
--- a/.gitlab-ci/jobs/rke2/dependencies/terraform/env/ci/variables.tf
+++ b/.gitlab-ci/jobs/rke2/dependencies/terraform/env/ci/variables.tf
@@ -3,4 +3,4 @@ variable "aws_region" {
}
variable "env" {}
-variable "ci_pipeline_url" {}
\ No newline at end of file
+variable "ci_pipeline_url" {}
\ No newline at end of file
diff --git a/.gitlab-ci/jobs/rke2/dependencies/terraform/main/main.tf b/.gitlab-ci/jobs/rke2/dependencies/terraform/main/main.tf
index 755d581682..ba780e665d 100644
--- a/.gitlab-ci/jobs/rke2/dependencies/terraform/main/main.tf
+++ b/.gitlab-ci/jobs/rke2/dependencies/terraform/main/main.tf
@@ -2,10 +2,10 @@ locals {
name = "umbrella-${var.env}"
tags = {
- "project" = "umbrella"
- "env" = var.env
- "terraform" = "true",
- "ci_pipeline_url" = var.ci_pipeline_url
+ "project" = "umbrella"
+ "env" = var.env
+ "terraform" = "true",
+ "ci_pipeline_url" = var.ci_pipeline_url
}
}
--
GitLab