From c0335e04290bea30f06601c14969420cb208dec3 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 19 Sep 2023 20:50:35 +0000
Subject: [PATCH] Update all dependencies

| datasource      | package                                             | from        | to          |
| --------------- | --------------------------------------------------- | ----------- | ----------- |
| github-tags     | actions/checkout                                    | v3          | v4          |
| github-tags     | aws-actions/configure-aws-credentials               | v2          | v4          |
| gitlab-tags     | big-bang/product/community/confluence               | 1.10.0-bb.3 | 1.15.0-bb.5 |
| github-tags     | defenseunicorns/zarf                                | v0.28.4     | v0.29.2     |
| github-tags     | docker/login-action                                 | v2          | v3          |
| helm            | flux-app                                            | 1.0.5       | 1.0.7       |
| docker          | ghcr.io/defenseunicorns/build-harness/build-harness | 1.10.2      | 1.11.2      |
| docker          | ghcr.io/defenseunicorns/packages/dubbd-k3d          | 0.6.1       | 0.9.1       |
| go              | github.com/gruntwork-io/terratest                   | v0.43.11    | v0.44.0     |
| github-tags     | golang/go                                           | 1.20.4      | 1.21.1      |
| github-tags     | golangci/golangci-lint                              | 1.52.2      | 1.54.2      |
| github-tags     | golangci/golangci-lint                              | v1.52.2     | v1.54.2     |
| github-tags     | pre-commit/pre-commit                               | 3.3.2       | 3.4.0       |
| github-tags     | python-jsonschema/check-jsonschema                  | 0.23.0      | 0.26.3      |
| docker          | rancher/k3s                                         | v1.26.5     | v1.28.1     |
| github-tags     | renovatebot/pre-commit-hooks                        | 35.105.1    | 36.97.3     |
| github-releases | mozilla/sops                                        | 3.7.3       | 3.8.0       |
| github-releases | hashicorp/terraform                                 | 1.4.6       | 1.5.7       |
| github-tags     | terraform-linters/tflint                            | 0.46.1      | 0.48.0      |
| github-tags     | aquasecurity/tfsec                                  | 1.28.1      | 1.28.4      |
---
 .github/actions/e2e/action.yml     |  2 +-
 .github/workflows/publish.yml      | 10 +++++-----
 .github/workflows/test-command.yml |  8 ++++----
 .pre-commit-config.yaml            |  6 +++---
 .tool-versions                     | 14 +++++++-------
 Makefile                           |  6 +++---
 confluence-flux-values.yaml        |  2 +-
 go.mod                             |  4 ++--
 go.sum                             |  2 ++
 utils/k3d/k3d-config.yaml          |  2 +-
 zarf.yaml                          |  2 +-
 11 files changed, 30 insertions(+), 28 deletions(-)

diff --git a/.github/actions/e2e/action.yml b/.github/actions/e2e/action.yml
index 2528188..428443e 100644
--- a/.github/actions/e2e/action.yml
+++ b/.github/actions/e2e/action.yml
@@ -92,7 +92,7 @@ runs:
       run: echo "tf_version=$(grep 'terraform ' .tool-versions)" >> $GITHUB_OUTPUT
 
     - name: Configure AWS Credentials for Commercial
-      uses: aws-actions/configure-aws-credentials@v2
+      uses: aws-actions/configure-aws-credentials@v4
       with:
         role-to-assume: ${{ inputs.role-to-assume }}
         role-session-name: ${{ github.event.client_payload.pull_request.head.sha || github.sha }}
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 872f7fa..7b1eb04 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Init zarf cache
         uses: actions/cache@v3
@@ -28,20 +28,20 @@ jobs:
         uses: supplypike/setup-bin@v3
         with:
           # renovate: zarf-uri datasource=github-tags depName=defenseunicorns/zarf
-          uri: 'https://github.com/defenseunicorns/zarf/releases/download/v0.28.4/zarf_v0.28.4_Linux_amd64'
+          uri: 'https://github.com/defenseunicorns/zarf/releases/download/v0.29.2/zarf_v0.29.2_Linux_amd64'
           name: 'zarf'
           # renovate: datasource=github-tags depName=defenseunicorns/zarf versioning=semver
-          version: 'v0.28.4'
+          version: 'v0.29.2'
 
       - name: Login to GHCR
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Login to registry1
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           registry: registry1.dso.mil
           username: ${{ secrets.REGISTRY1_USERNAME }}
diff --git a/.github/workflows/test-command.yml b/.github/workflows/test-command.yml
index e7561df..a54a493 100644
--- a/.github/workflows/test-command.yml
+++ b/.github/workflows/test-command.yml
@@ -28,7 +28,7 @@ jobs:
       run-e2e: ${{ steps.parse.outputs.run-e2e }}
     steps:
       - name: Checkout Repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           token: ${{ secrets.PAT }}
           repository: ${{ github.event.client_payload.pull_request.head.repo.full_name || github.repository }}
@@ -43,7 +43,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           token: ${{ secrets.PAT }}
           repository: ${{ github.event.client_payload.pull_request.head.repo.full_name || github.repository }}
@@ -60,7 +60,7 @@ jobs:
     if: needs.parse.outputs.run-ping == 'true'
     steps:
       - name: Checkout Repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           token: ${{ secrets.PAT }}
           repository: ${{ github.event.client_payload.pull_request.head.repo.full_name || github.repository }}
@@ -77,7 +77,7 @@ jobs:
     if: needs.parse.outputs.run-e2e == 'true'
     steps:
       - name: Checkout Repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           token: ${{ secrets.PAT }}
           repository: ${{ github.event.client_payload.pull_request.head.repo.full_name || github.repository }}
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 6f82e01..cd07d2d 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -31,7 +31,7 @@ repos:
     hooks:
       - id: fix-smartquotes
   - repo: https://github.com/python-jsonschema/check-jsonschema
-    rev: 0.23.0
+    rev: 0.26.3
     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.54.2
     hooks:
       - id: golangci-lint
   - repo: https://github.com/renovatebot/pre-commit-hooks
-    rev: 35.105.1
+    rev: 36.97.3
     hooks:
       - id: renovate-config-validator
diff --git a/.tool-versions b/.tool-versions
index 4892760..596d205 100644
--- 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.21.1
+golangci-lint 1.54.2
+pre-commit 3.4.0
+terraform 1.5.7
+tflint 0.48.0
+tfsec 1.28.4
+sops 3.8.0
diff --git a/Makefile b/Makefile
index 9660aa4..ea2b133 100755
--- 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.28.4
+ZARF_VERSION := v0.29.2
 
 # 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.10.2
+BUILD_HARNESS_VERSION := 1.11.2
 # renovate: datasource=docker depName=ghcr.io/defenseunicorns/packages/dubbd-k3d extractVersion=^(?<version>\d+\.\d+\.\d+)
-DUBBD_K3D_VERSION := 0.6.1
+DUBBD_K3D_VERSION := 0.9.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
index 9894fc5..9c5257e 100644
--- 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.10.0-bb.3
+    tag: 1.15.0-bb.5
   values: |
     ###ZARF_VAR_CONFLUENCE_VALUES###
   dependsOn:
diff --git a/go.mod b/go.mod
index 92a12d4..a1005b3 100644
--- a/go.mod
+++ b/go.mod
@@ -1,9 +1,9 @@
 module github.com/defenseunicorns/uds-capability-confluence
 
-go 1.20
+go 1.21.1
 
 require (
-	github.com/gruntwork-io/terratest v0.43.11
+	github.com/gruntwork-io/terratest v0.44.0
 	github.com/stretchr/testify v1.8.4
 )
 
diff --git a/go.sum b/go.sum
index b7f64c1..fce41b2 100644
--- a/go.sum
+++ b/go.sum
@@ -373,6 +373,8 @@ github.com/gruntwork-io/go-commons v0.8.0 h1:k/yypwrPqSeYHevLlEDmvmgQzcyTwrlZGRa
 github.com/gruntwork-io/go-commons v0.8.0/go.mod h1:gtp0yTtIBExIZp7vyIV9I0XQkVwiQZze678hvDXof78=
 github.com/gruntwork-io/terratest v0.43.11 h1:k3U5lZjiNa38rqcTx/dus8cCaJY7qxShGIuGLeLfj/s=
 github.com/gruntwork-io/terratest v0.43.11/go.mod h1:Tw+6/fcJFiBPpsx9NNSkLG5oHKIeaqiJHVLpQ+ORIfQ=
+github.com/gruntwork-io/terratest v0.44.0 h1:3k7lglJFAtw77p2HnR5vaZBCBnlHmu3DuLjVyuCZXJ0=
+github.com/gruntwork-io/terratest v0.44.0/go.mod h1:EAEuzSjvxAzQoJCEQ06bJPTmdC9HikzgvhmxnAYuExM=
 github.com/hashicorp/errwrap v1.0.0 h1:hLrqtEDnRye3+sgx6z4qVLNuviH3MR5aQ0ykNJa/UYA=
 github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
 github.com/hashicorp/go-cleanhttp v0.5.2 h1:035FKYIWjmULyFRBKPs8TBQoi0x6d9G4xc9neXJWAZQ=
diff --git a/utils/k3d/k3d-config.yaml b/utils/k3d/k3d-config.yaml
index 8c45eba..b30d283 100644
--- a/utils/k3d/k3d-config.yaml
+++ b/utils/k3d/k3d-config.yaml
@@ -3,7 +3,7 @@ kind: Simple
 metadata:
   name: ci
 servers: 1
-image: rancher/k3s:v1.26.5-k3s1
+image: rancher/k3s:v1.28.1-k3s1
 options:
   k3s:
     extraArgs:
diff --git a/zarf.yaml b/zarf.yaml
index e08f03b..2df2314 100644
--- a/zarf.yaml
+++ b/zarf.yaml
@@ -35,7 +35,7 @@ components:
     # renovate: datasource=helm
       - name: flux-app
         url: https://defenseunicorns.github.io/uds-support-charts/
-        version: 1.0.5
+        version: 1.0.7
         namespace: confluence
         valuesFiles:
           - confluence-flux-values.yaml