Merge pull request #3 from ValidUSA/feature/INF-2073_sync-with-upstream

INF-2073 - Sync with upstream
ValidUSA · Feb 8, 2022 · f1b8472 · f1b8472
2 parents 5f14180 + 2ca8f86
commit f1b8472
Show file tree

Hide file tree

Showing 108 changed files with 17,740 additions and 475 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -14,15 +14,20 @@ jobs:
     steps:
       - name: Install pre-requisites (1)
         run: |
-          apk add --no-cache make jq zip curl git npm
+          apk add --no-cache make jq zip curl git npm libc6-compat
       - name: Install pre-requisites (2)
         run: |
           curl -sSLO https://github.com/sgreben/subst/releases/download/1.1.1/subst_1.1.1_linux_x86_64.zip
           unzip subst_1.1.1_linux_x86_64.zip
           mv subst /usr/local/bin
       - name: Install pre-requisites (3)
         run: |
-          go get github.com/github/hub
+          curl -sL "https://github.com/github/hub/releases/download/v2.14.2/hub-linux-amd64-2.14.2.tgz" | tar xz hub-linux-amd64-2.14.2/bin/hub;
+          mv hub-linux-amd64-2.14.2/bin/hub /usr/local/bin
+      - name: Check pre-requisites
+        run: |
+          which subst;
+          hub --help;
       - name: Checkout
         uses: actions/checkout@master
       - run: git config user.name "GitHub Actions" && git config user.email "actions@users.noreply.github.com"

diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml
@@ -0,0 +1,17 @@
+# Valid USA ID SRE version: v1
+---
+name: "Pull Request Checks"
+
+# yamllint disable-line rule:truthy
+on:
+  pull_request:
+    types: ['opened', 'edited', 'reopened', 'synchronize']
+jobs:
+  pull_reqest_check:
+    name: "Pull Request title begins with a JIRA story ID"
+    runs-on: ubuntu-20.04
+    steps:
+      - uses: ValidUSA/pr-lint-action@v1.1.2
+        with:
+          title-regex: '^[A-Z0-9]*-\d*'
+          title-regex-flags: 'g'
diff --git a/README.md b/README.md
diff --git a/README.template.md b/README.template.md
@@ -1,6 +1,6 @@
 # ${APP}
 
-Checks for updates of external terraform modules referenced in given Terraform (0.10.x - 0.12.x) modules. Outputs Markdown tables by default, as well as JSONL (`-o jsonl`, one JSON object per line), JSON (`-o json`), and JUnit XML (`-o junit`).
+Checks for updates of external terraform modules referenced in given Terraform source. Outputs Markdown tables by default, as well as JSONL (`-o jsonl`, one JSON object per line), JSON (`-o json`), and JUnit XML (`-o junit`).
 
 Supported module sources:
 
@@ -24,14 +24,18 @@ ${EXAMPLE_PRETTY}
 
 ## Contents
 
-- [Examples](#examples)
-  - [List modules with their current versions](#list-modules-with-their-current-versions)
-  - [Check for module updates](#check-for-module-updates)
-  - [Check for updates of specific modules](#check-for-updates-of-specific-modules)
-- [Get it](#get-it)
-- [Usage](#usage)
-  - [`list`](#list)
-  - [`check`](#check)
+- [${APP}](#app)
+  - [Example](#example)
+  - [Contents](#contents)
+  - [Examples](#examples)
+    - [List modules with their current versions](#list-modules-with-their-current-versions)
+    - [Check for module updates](#check-for-module-updates)
+    - [Check for module updates using Github Token authentication](#check-for-module-updates-using-github-token-authentication)
+    - [Check for updates of specific modules](#check-for-updates-of-specific-modules)
+  - [Get it](#get-it)
+  - [Usage](#usage)
+    - [`list`](#list)
+    - [`check`](#check)
 
 ## Examples
 
@@ -80,6 +84,13 @@ $ ${APP} check -all examples
 
 ${EXAMPLE_UPDATES_ALL_PRETTY}
 
+### Check for module updates using Github Token authentication
+
+```sh
+$ export GITHUB_TOKEN="<your Github PAT>"
+$ ${APP} check examples
+```
+
 ### Check for updates of specific modules
 
 ```sh

diff --git a/examples/main.tf b/examples/main.tf
@@ -31,6 +31,24 @@ module "example_git_scp" {
   version = "~> 0.12"
 }
 
+module "example_with_prerelease_versions" {
+  source = "git@github.com:kubernetes/api.git?ref=v0.22.2"
+}
+
 module "local" {
   source = "./local"
 }
+
+variable "_0_15_sensitive_example" {
+  type      = string
+  sensitive = true
+}
+
+output "0_15_sensitive_example" {
+  value = "foo-${var._0_15_sensitive_example}"
+  sensitive = true
+}
+
+output "0_15_nonsensitive_example" {
+  value = nonsensitive(var._0_15_sensitive_example)
+}
diff --git a/go.mod b/go.mod
@@ -8,19 +8,24 @@ require (
 	github.com/Masterminds/semver/v3 v3.1.1
 	github.com/agext/levenshtein v1.2.3 // indirect
 	github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be // indirect
+	github.com/aws/aws-sdk-go v1.37.0 // indirect
 	github.com/gliderlabs/ssh v0.3.1 // indirect
 	github.com/go-git/go-git/v5 v5.4.2
 	github.com/go-test/deep v1.0.7 // indirect
-	github.com/hashicorp/go-getter v1.5.1
+	github.com/hashicorp/go-getter v1.5.11
+	github.com/hashicorp/go-version v1.2.1 // indirect
 	github.com/hashicorp/hcl v1.0.0 // indirect
-	github.com/hashicorp/terraform v0.15.3
-	github.com/hashicorp/terraform-config-inspect v0.0.0-20210511202847-ad33d83d7650
+	github.com/hashicorp/hcl/v2 v2.10.0 // indirect
+	github.com/hashicorp/terraform-config-inspect v0.0.0-20211115214459-90acf1ca460f
+	github.com/hashicorp/terraform-svchost v0.0.0-20200729002733-f050f53b9734
 	github.com/jstemmer/go-junit-report v0.9.1
 	github.com/mitchellh/go-testing-interface v1.14.1 // indirect
 	github.com/mitchellh/go-wordwrap v1.0.1 // indirect
 	github.com/olekukonko/tablewriter v0.0.5
-	github.com/peterbourgon/ff/v3 v3.0.0
+	github.com/peterbourgon/ff/v3 v3.1.2
 	github.com/sgreben/flagvar v1.10.1
+	github.com/zclconf/go-cty v1.8.3 // indirect
+	golang.org/x/term v0.0.0-20201210144234-2321bbc49cbf // indirect
 	golang.org/x/tools v0.0.0-20201211025543-abf6a1d87e11 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776 // indirect