chore(deps): update all dependencies

| datasource | package | from | to | | --------------- | --------------------------------------------------- | ----------- | ---------- | | github-tags | actions/cache | v3 | v4 | | github-tags | actions/checkout | v4.1.1 | v4.1.7 | | gitlab-tags | big-bang/product/community/confluence | 1.17.2-bb.0 | 9.0.2-bb.1 | | github-tags | defenseunicorns/zarf | v0.32.2 | v0.40.1 | | docker | docker.io/calico/cni | v3.26.1 | v3.28.2 | | docker | docker.io/calico/kube-controllers | v3.26.1 | v3.28.2 | | docker | docker.io/calico/node | v3.26.1 | v3.28.2 | | github-tags | docker/login-action | v2 | v3 | | docker | ghcr.io/defenseunicorns/build-harness/build-harness | 1.14.8 | 2.0.40 | | docker | ghcr.io/defenseunicorns/packages/dubbd-k3d | 0.17.0 | 0.30.1 | | go | github.com/gruntwork-io/terratest | v0.43.11 | v0.47.1 | | go | github.com/stretchr/testify | v1.8.4 | v1.9.0 | | github-tags | golang/go | 1.20.4 | 1.23.1 | | github-tags | golangci/golangci-lint | 1.52.2 | 1.61.0 | | github-tags | golangci/golangci-lint | v1.52.2 | v1.61.0 | | github-tags | google-github-actions/release-please-action | v3 | v4 | | github-tags | peter-evans/create-or-update-comment | v3 | v4 | | github-tags | peter-evans/slash-command-dispatch | v3 | v4 | | github-tags | pre-commit/pre-commit | 3.3.2 | 3.8.0 | | github-tags | pre-commit/pre-commit-hooks | v4.4.0 | v4.6.0 | | github-tags | python-jsonschema/check-jsonschema | 0.23.0 | 0.29.2 | | docker | rancher/k3s | v1.26.5 | v1.31.1 | | github-tags | renovatebot/pre-commit-hooks | 35.105.1 | 38.93.2 | | github-releases | mozilla/sops | 3.7.3 | 3.9.0 | | github-tags | supplypike/setup-bin | v3 | v4 | | github-releases | hashicorp/terraform | 1.4.6 | 1.9.6 | | github-tags | terraform-linters/tflint | 0.46.1 | 0.53.0 | | github-tags | aquasecurity/tfsec | 1.28.1 | 1.28.10 |
defenseunicorns · Sep 23, 2024 · f3fb322 · f3fb322
1 parent 464b1b7
commit f3fb322
Show file tree

Hide file tree

Showing 14 changed files with 132 additions and 67 deletions.
diff --git a/.github/actions/comment/action.yml b/.github/actions/comment/action.yml
@@ -18,7 +18,7 @@ runs:
     # Will update the comment that triggered the /test comment and add the run-url
     - name: Update comment
       if: github.event_name == 'repository_dispatch'
-      uses: peter-evans/create-or-update-comment@v3
+      uses: peter-evans/create-or-update-comment@v4
       with:
         token: ${{ inputs.token }}
         repository: ${{ github.event.client_payload.github.payload.repository.full_name }}

diff --git a/.github/actions/e2e/action.yml b/.github/actions/e2e/action.yml
@@ -45,26 +45,26 @@ runs:
         GITHUB_OWNER: ${{ github.event.client_payload.github.payload.repository.owner.login || github.repository_owner }}
 
     - name: Init gopath cache
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       with:
         path: "${{ github.workspace }}/.cache/go"
         key: "gopath|${{ hashFiles('.tool-versions') }}|${{ hashFiles('go.sum') }}"
 
     - name: Init gobuild cache
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       with:
         path: "${{ github.workspace }}/.cache/go-build"
         key: "gobuild|${{ hashFiles('.tool-versions') }}|${{ hashFiles('go.sum') }}"
 
     - name: Init zarf cache
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       with:
         path: "${{ github.workspace }}/.cache/.zarf-cache"
         key: "zarf|${{ hashFiles('.tool-versions') }}"
 
     - name: Init docker cache
       id: init-docker-cache
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       with:
         path: "${{ github.workspace }}/.cache/docker"
         key: "docker|${{ hashFiles('.env') }}"

diff --git a/.github/workflows/lula-lint.yaml b/.github/workflows/lula-lint.yaml
@@ -21,14 +21,14 @@ jobs:
     steps:
       # Checkout the repo and setup the tooling for this job
       - name: Checkout
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
         with:
           ref: ${{ github.head_ref }}
 
       - name: Lula Setup
-        uses: defenseunicorns/lula-action/setup@095636b7880051e11b05f10a582fdd911526161c
+        uses: defenseunicorns/lula-action/setup@696a9c6e4071dfa281185ca937de330effb85fca
 
       - name: Lula Lint
-        uses: defenseunicorns/lula-action/lint@095636b7880051e11b05f10a582fdd911526161c
+        uses: defenseunicorns/lula-action/lint@696a9c6e4071dfa281185ca937de330effb85fca
         with:
           oscal-target: "oscal-component.yaml"
diff --git a/.github/workflows/publish-package.yml b/.github/workflows/publish-package.yml
@@ -28,7 +28,7 @@ jobs:
           password: ${{ secrets.REGISTRY1_PASSWORD }}
 
       - name: Init zarf cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: "~/.zarf-cache"
           key: zarf-cache
@@ -44,13 +44,13 @@ jobs:
           df -h
 
       - name: Install zarf
-        uses: supplypike/setup-bin@v3
+        uses: supplypike/setup-bin@v4
         with:
           # renovate: zarf-uri datasource=github-tags depName=defenseunicorns/zarf
-          uri: 'https://github.com/defenseunicorns/zarf/releases/download/v0.32.2/zarf_v0.32.2_Linux_amd64'
+          uri: 'https://github.com/defenseunicorns/zarf/releases/download/v0.40.1/zarf_v0.40.1_Linux_amd64'
           name: 'zarf'
           # renovate: datasource=github-tags depName=defenseunicorns/zarf versioning=semver
-          version: 'v0.32.2'
+          version: 'v0.40.1'
 
       - name: Build confluence package
         run: zarf package create --confirm --no-progress
@@ -67,7 +67,7 @@ jobs:
           registry1-password: ${{ secrets.REGISTRY1_PASSWORD }}
 
       - name: Login to GHCR
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           registry: ghcr.io
           username: ${{ github.actor }}

diff --git a/.github/workflows/slash-command-dispatch.yml b/.github/workflows/slash-command-dispatch.yml
@@ -8,7 +8,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Slash Command Dispatch
-        uses: peter-evans/slash-command-dispatch@v3
+        uses: peter-evans/slash-command-dispatch@v4
         with:
           token: ${{ secrets.PAT }}
           commands: test

diff --git a/.github/workflows/tag-test-and-release.yml b/.github/workflows/tag-test-and-release.yml
@@ -19,7 +19,7 @@ jobs:
     steps:
       - name: Create Release Tag
         id: tag
-        uses: google-github-actions/release-please-action@v3
+        uses: google-github-actions/release-please-action@v4
         with:
           command: manifest # use configs in release-please-config.json
       - id: release-flag

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -1,6 +1,6 @@
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.4.0
+    rev: v4.6.0
     hooks:
       - id: check-added-large-files
         args: ["--maxkb=1024"]
@@ -31,7 +31,7 @@ repos:
     hooks:
       - id: fix-smartquotes
   - repo: https://github.com/python-jsonschema/check-jsonschema
-    rev: 0.23.0
+    rev: 0.29.2
     hooks:
       - id: check-jsonschema
         name: "Validate Zarf Configs Against Schema"
@@ -44,10 +44,10 @@ repos:
             "--no-cache"
           ]
   - repo: https://github.com/golangci/golangci-lint
-    rev: v1.52.2
+    rev: v1.61.0
     hooks:
       - id: golangci-lint
   - repo: https://github.com/renovatebot/pre-commit-hooks
-    rev: 35.105.1
+    rev: 38.93.2
     hooks:
       - id: renovate-config-validator
diff --git a/.tool-versions b/.tool-versions
@@ -1,7 +1,7 @@
-golang 1.20.4
-golangci-lint 1.52.2
-pre-commit 3.3.2
-terraform 1.4.6
-tflint 0.46.1
-tfsec 1.28.1
-sops 3.7.3
+golang 1.23.1
+golangci-lint 1.61.0
+pre-commit 3.8.0
+terraform 1.9.6
+tflint 0.53.0
+tfsec 1.28.10
+sops 3.9.0
diff --git a/Makefile b/Makefile
@@ -1,14 +1,14 @@
 # The version of Zarf to use. To keep this repo as portable as possible the Zarf binary will be downloaded and added to
 # the build folder.
 # renovate: datasource=github-tags depName=defenseunicorns/zarf
-ZARF_VERSION := v0.32.2
+ZARF_VERSION := v0.40.1
 
 # The version of the build harness container to use
 BUILD_HARNESS_REPO := ghcr.io/defenseunicorns/build-harness/build-harness
 # renovate: datasource=docker depName=ghcr.io/defenseunicorns/build-harness/build-harness
-BUILD_HARNESS_VERSION := 1.14.8
+BUILD_HARNESS_VERSION := 2.0.40
 # renovate: datasource=docker depName=ghcr.io/defenseunicorns/packages/dubbd-k3d extractVersion=^(?<version>\d+\.\d+\.\d+)
-DUBBD_K3D_VERSION := 0.17.0
+DUBBD_K3D_VERSION := 0.30.1
 
 # Figure out which Zarf binary we should use based on the operating system we are on
 ZARF_BIN := zarf

diff --git a/confluence-flux-values.yaml b/confluence-flux-values.yaml
@@ -6,7 +6,7 @@ application:
   repository: https://repo1.dso.mil/big-bang/product/community/confluence.git
   ref:
     # renovate: datasource=gitlab-tags depName=big-bang/product/community/confluence versioning=loose registryUrl=https://repo1.dso.mil
-    tag: 1.17.2-bb.0
+    tag: 9.0.2-bb.1
   values: |
     ###ZARF_VAR_CONFLUENCE_VALUES###
   dependsOn:

diff --git a/go.mod b/go.mod
@@ -1,18 +1,20 @@
 module github.com/defenseunicorns/uds-capability-confluence
 
-go 1.20
+go 1.21
+
+toolchain go1.23.1
 
 require (
-	github.com/gruntwork-io/terratest v0.43.11
-	github.com/stretchr/testify v1.8.4
+	github.com/gruntwork-io/terratest v0.47.1
+	github.com/stretchr/testify v1.9.0
 )
 
 require (
-	cloud.google.com/go v0.105.0 // indirect
-	cloud.google.com/go/compute v1.12.1 // indirect
-	cloud.google.com/go/compute/metadata v0.2.1 // indirect
-	cloud.google.com/go/iam v0.7.0 // indirect
-	cloud.google.com/go/storage v1.27.0 // indirect
+	cloud.google.com/go v0.110.0 // indirect
+	cloud.google.com/go/compute v1.19.1 // indirect
+	cloud.google.com/go/compute/metadata v0.2.3 // indirect
+	cloud.google.com/go/iam v0.13.0 // indirect
+	cloud.google.com/go/storage v1.28.1 // indirect
 	github.com/agext/levenshtein v1.2.3 // indirect
 	github.com/apparentlymart/go-textseg/v13 v13.0.0 // indirect
 	github.com/aws/aws-sdk-go v1.44.122 // indirect
@@ -22,24 +24,25 @@ require (
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/emicklei/go-restful/v3 v3.9.0 // indirect
 	github.com/go-errors/errors v1.0.2-0.20180813162953-d98b870cc4e0 // indirect
-	github.com/go-logr/logr v1.2.3 // indirect
+	github.com/go-logr/logr v1.2.4 // indirect
 	github.com/go-openapi/jsonpointer v0.19.6 // indirect
-	github.com/go-openapi/jsonreference v0.20.1 // indirect
+	github.com/go-openapi/jsonreference v0.20.2 // indirect
 	github.com/go-openapi/swag v0.22.3 // indirect
 	github.com/go-sql-driver/mysql v1.4.1 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
 	github.com/golang/protobuf v1.5.3 // indirect
 	github.com/google/gnostic v0.5.7-v3refs // indirect
+	github.com/google/gnostic-models v0.6.8 // indirect
 	github.com/google/go-cmp v0.5.9 // indirect
-	github.com/google/gofuzz v1.1.0 // indirect
+	github.com/google/gofuzz v1.2.0 // indirect
 	github.com/google/uuid v1.3.0 // indirect
-	github.com/googleapis/enterprise-certificate-proxy v0.2.0 // indirect
-	github.com/googleapis/gax-go/v2 v2.7.0 // indirect
+	github.com/googleapis/enterprise-certificate-proxy v0.2.3 // indirect
+	github.com/googleapis/gax-go/v2 v2.7.1 // indirect
 	github.com/gruntwork-io/go-commons v0.8.0 // indirect
 	github.com/hashicorp/errwrap v1.0.0 // indirect
 	github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
-	github.com/hashicorp/go-getter v1.7.1 // indirect
+	github.com/hashicorp/go-getter v1.7.6 // indirect
 	github.com/hashicorp/go-multierror v1.1.0 // indirect
 	github.com/hashicorp/go-safetemp v1.0.0 // indirect
 	github.com/hashicorp/go-version v1.6.0 // indirect
@@ -69,28 +72,28 @@ require (
 	github.com/urfave/cli v1.22.2 // indirect
 	github.com/zclconf/go-cty v1.9.1 // indirect
 	go.opencensus.io v0.24.0 // indirect
-	golang.org/x/crypto v0.1.0 // indirect
-	golang.org/x/net v0.8.0 // indirect
-	golang.org/x/oauth2 v0.1.0 // indirect
-	golang.org/x/sys v0.6.0 // indirect
-	golang.org/x/term v0.6.0 // indirect
-	golang.org/x/text v0.8.0 // indirect
-	golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect
+	golang.org/x/crypto v0.21.0 // indirect
+	golang.org/x/net v0.23.0 // indirect
+	golang.org/x/oauth2 v0.8.0 // indirect
+	golang.org/x/sys v0.18.0 // indirect
+	golang.org/x/term v0.18.0 // indirect
+	golang.org/x/text v0.14.0 // indirect
+	golang.org/x/time v0.3.0 // indirect
 	golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
-	google.golang.org/api v0.103.0 // indirect
+	google.golang.org/api v0.114.0 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
-	google.golang.org/genproto v0.0.0-20221201164419-0e50fba7f41c // indirect
-	google.golang.org/grpc v1.51.0 // indirect
-	google.golang.org/protobuf v1.31.0 // indirect
+	google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 // indirect
+	google.golang.org/grpc v1.56.3 // indirect
+	google.golang.org/protobuf v1.33.0 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
-	k8s.io/api v0.27.2 // indirect
-	k8s.io/apimachinery v0.27.2 // indirect
-	k8s.io/client-go v0.27.2 // indirect
-	k8s.io/klog/v2 v2.90.1 // indirect
-	k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f // indirect
-	k8s.io/utils v0.0.0-20230209194617-a36077c30491 // indirect
+	k8s.io/api v0.28.4 // indirect
+	k8s.io/apimachinery v0.28.4 // indirect
+	k8s.io/client-go v0.28.4 // indirect
+	k8s.io/klog/v2 v2.100.1 // indirect
+	k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect
+	k8s.io/utils v0.0.0-20230406110748-d93618cff8a2 // indirect
 	sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
 	sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
 	sigs.k8s.io/yaml v1.3.0 // indirect