Merge pull request #104 from philips-labs/bump-example-vault-terraform

philips-labs · Nov 18, 2022 · c1a2117 · c1a2117
2 parents b9fc99c + da1e295
commit c1a2117
Show file tree

Hide file tree

Showing 8 changed files with 60 additions and 26 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -16,3 +16,10 @@ updates:
     directory: "/"
     schedule:
       interval: "weekly"
+
+  - package-ecosystem: "terraform"
+    # Workflow files stored in the
+    # default location of `.github/workflows`
+    directory: "/example/vault/environments/local"
+    schedule:
+      interval: "monthly"
diff --git a/.github/workflows/golang.yml b/.github/workflows/golang.yml
@@ -102,10 +102,10 @@ jobs:
           make release-vars > /tmp/spiffe-vault-release-vars.env
           source /tmp/spiffe-vault-release-vars.env
           if [[ -n "$LDFLAGS" ]]; then
-            echo "::set-output name=LDFLAGS::$LDFLAGS"
+            echo "ldflags=$LDFLAGS" >> $GITHUB_OUTPUT
           fi
           if [[ -n "$GIT_HASH" ]]; then
-            echo "::set-output name=GIT_HASH::$GIT_HASH"
+            echo "git_hash=$GIT_HASH" >> $GITHUB_OUTPUT
           fi
           rm -f /tmp/spiffe-vault-release-vars.env
 
@@ -119,19 +119,19 @@ jobs:
           version: latest
           args: release --rm-dist ${{ (!startsWith(github.ref, 'refs/tags/') && '--snapshot') || '' }}
         env:
+          LDFLAGS: ${{ steps.release-vars.outputs.ldflags }}
+          GIT_HASH: ${{ steps.release-vars.outputs.git_hash }}
           GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
-          LDFLAGS: ${{ steps.release-vars.outputs.LDFLAGS }}
-          GIT_HASH: ${{ steps.release-vars.outputs.GIT_HASH }}
           COSIGN_PASSWORD: ${{ secrets.COSIGN_PASSWORD }}
 
       - name: Get container info
         id: container_info
         if: startsWith(github.ref, 'refs/tags/')
         run: |
           export CONTAINER_DIGEST=$(make container-digest GITHUB_REF=${{ github.ref_name }})
-          echo "::set-output name=container_digest::$CONTAINER_DIGEST"
-          echo "::set-output name=container_tags::$(make container-tags CONTAINER_DIGEST="${CONTAINER_DIGEST}" | paste -s -d ',' -)"
-          echo "::set-output name=container_repos::$(make container-repos CONTAINER_DIGEST="${CONTAINER_DIGEST}" | jq --raw-input . | jq --slurp -c)"
+          echo "container_digest=$CONTAINER_DIGEST" >> $GITHUB_OUTPUT
+          echo "container_tags=$(make container-tags CONTAINER_DIGEST="${CONTAINER_DIGEST}" | paste -s -d ',' -)" >> $GITHUB_OUTPUT
+          echo "container_repos=$(make container-repos CONTAINER_DIGEST="${CONTAINER_DIGEST}" | jq --raw-input . | jq --slurp -c)" >> $GITHUB_OUTPUT
 
       - name: Logout from container registries
         if: ${{ always() }}

diff --git a/example/vault/.terraform-version b/example/vault/.terraform-version
@@ -1 +1 @@
-1.0.8
+1.3.4
diff --git a/example/vault/environments/local/.terraform.lock.hcl b/example/vault/environments/local/.terraform.lock.hcl
diff --git a/example/vault/environments/local/versions.tf b/example/vault/environments/local/versions.tf
@@ -0,0 +1,10 @@
+terraform {
+  required_version = ">= 1.0.8"
+
+  required_providers {
+    vault = {
+      source = "hashicorp/vault"
+      version = "~> 3.11.0"
+    }
+  }
+}
diff --git a/example/vault/modules/jwt-auth/providers.tf → example/vault/modules/jwt-auth/versions.tf b/example/vault/modules/jwt-auth/providers.tf → example/vault/modules/jwt-auth/versions.tf
@@ -1,9 +1,10 @@
 terraform {
-  required_version = ">= 0.14.5"
+  required_version = ">= 1.0.8"
+
   required_providers {
     vault = {
       source  = "hashicorp/vault"
-      version = ">=2.21.0"
+      version = ">= 3.0.0"
     }
   }
 }
diff --git a/example/vault/modules/secrets/providers.tf → example/vault/modules/secrets/versions.tf b/example/vault/modules/secrets/providers.tf → example/vault/modules/secrets/versions.tf
@@ -1,9 +1,10 @@
 terraform {
-  required_version = ">= 0.14.5"
+  required_version = ">= 1.0.8"
+
   required_providers {
     vault = {
       source  = "hashicorp/vault"
-      version = ">=2.22.1"
+      version = ">= 3.0.0"
     }
   }
 }
diff --git a/example/vault/modules/transit/versions.tf b/example/vault/modules/transit/versions.tf
@@ -0,0 +1,10 @@
+terraform {
+  required_version = ">= 1.0.8"
+
+  required_providers {
+    vault = {
+      source  = "hashicorp/vault"
+      version = ">= 3.0.0"
+    }
+  }
+}