From c12a205ab8e195541acfe0cb654b4888e16ea05c Mon Sep 17 00:00:00 2001
From: Josh Spicer <joshspicer@github.com>
Date: Fri, 3 Jun 2022 10:46:25 -0400
Subject: Pass options via environment variables  (#39)

* up to docker-in-docker converted

* first pass at the rest of the features (and bash linting and updated CLI

* move shell linter to own file

* rename feature.json -> devcontainer-feature.json

* continue on error

* continue on error in right spot

* formatting

* fix AZ_VERSION

* update python

* restore variable name

* update linter actions, fix dind/dfd/desktop scripts, add test-scenaerios

* add tree because I like tree

* glob for shell linter

* fix test-scenarios

* shell linter

* more shell helper
---
 src/terraform/devcontainer-feature.json | 49 +++++++++++++++++++++++++++++++++
 src/terraform/feature.json              | 49 ---------------------------------
 src/terraform/install.sh                | 15 +++++-----
 3 files changed, 56 insertions(+), 57 deletions(-)
 create mode 100644 src/terraform/devcontainer-feature.json
 delete mode 100644 src/terraform/feature.json

(limited to 'src/terraform')

diff --git a/src/terraform/devcontainer-feature.json b/src/terraform/devcontainer-feature.json
new file mode 100644
index 0000000..8af83a7
--- /dev/null
+++ b/src/terraform/devcontainer-feature.json
@@ -0,0 +1,49 @@
+{
+    "id": "terraform",
+    "name": "Terraform, tflint, and TFGrunt",
+    "options": {
+        "version": {
+            "type": "string",
+            "proposals": [
+                "latest",
+                "none",
+                "1.1",
+                "1.0",
+                "0.15"
+            ],
+            "default": "latest",
+            "description": "Terraform version"
+        },
+        "tflint": {
+            "type": "string",
+            "proposals": [
+                "latest"
+            ],
+            "default": "latest",
+            "description": "Tflint version"
+        },
+        "terragrunt": {
+            "type": "string",
+            "proposals": [
+                "latest"
+            ],
+            "default": "latest",
+            "description": "Terragrunt version"
+        }
+    },
+    "extensions": [
+        "HashiCorp.terraform",
+        "ms-azuretools.vscode-azureterraform"
+    ],
+    "settings": {
+        "terraform.languageServer": {
+            "enabled": true,
+            "args": []
+        },
+        "azureTerraform.terminal": "integrated",
+    },
+    "install": {
+        "app": "",
+        "file": "install.sh"
+    }
+}
\ No newline at end of file
diff --git a/src/terraform/feature.json b/src/terraform/feature.json
deleted file mode 100644
index 8af83a7..0000000
--- a/src/terraform/feature.json
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-    "id": "terraform",
-    "name": "Terraform, tflint, and TFGrunt",
-    "options": {
-        "version": {
-            "type": "string",
-            "proposals": [
-                "latest",
-                "none",
-                "1.1",
-                "1.0",
-                "0.15"
-            ],
-            "default": "latest",
-            "description": "Terraform version"
-        },
-        "tflint": {
-            "type": "string",
-            "proposals": [
-                "latest"
-            ],
-            "default": "latest",
-            "description": "Tflint version"
-        },
-        "terragrunt": {
-            "type": "string",
-            "proposals": [
-                "latest"
-            ],
-            "default": "latest",
-            "description": "Terragrunt version"
-        }
-    },
-    "extensions": [
-        "HashiCorp.terraform",
-        "ms-azuretools.vscode-azureterraform"
-    ],
-    "settings": {
-        "terraform.languageServer": {
-            "enabled": true,
-            "args": []
-        },
-        "azureTerraform.terminal": "integrated",
-    },
-    "install": {
-        "app": "",
-        "file": "install.sh"
-    }
-}
\ No newline at end of file
diff --git a/src/terraform/install.sh b/src/terraform/install.sh
index f2614ae..3368374 100644
--- a/src/terraform/install.sh
+++ b/src/terraform/install.sh
@@ -6,17 +6,16 @@
 #
 # Docs: https://github.com/microsoft/vscode-dev-containers/blob/main/script-library/docs/terraform.md
 # Maintainer: The VS Code and Codespaces Teams
-#
-# Syntax: ./terraform-debian.sh [terraform version] [tflint version] [terragrunt version] [terraform SHA] [tflint SHA] [terragrunt SHA]
 
 set -e
 
-TERRAFORM_VERSION="${1:-"latest"}"
-TFLINT_VERSION="${2:-"latest"}"
-TERRAGRUNT_VERSION="${3:-"latest"}"
-TERRAFORM_SHA256="${4:-"automatic"}"
-TFLINT_SHA256="${5:-"automatic"}"
-TERRAGRUNT_SHA256="${6:-"automatic"}"
+TERRAFORM_VERSION="${VERSION:-"latest"}"
+TFLINT_VERSION="${TFLINT:-"latest"}"
+TERRAGRUNT_VERSION="${TERRAGRUNT:-"latest"}"
+
+TERRAFORM_SHA256="${TERRAFORM_SHA256:-"automatic"}"
+TFLINT_SHA256="${TFLINT_SHA256:-"automatic"}"
+TERRAGRUNT_SHA256="${TERRAGRUNT_SHA256:-"automatic"}"
 
 TERRAFORM_GPG_KEY="72D7468F"
 TFLINT_GPG_KEY_URI="https://raw.githubusercontent.com/terraform-linters/tflint/master/8CE69160EB3F2FE9.key"
-- 
cgit v1.2.3