Skip to content
This repository has been archived by the owner on Oct 8, 2024. It is now read-only.

chore(deps): update all dependencies #4

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/actions/comment/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
8 changes: 4 additions & 4 deletions .github/actions/e2e/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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') }}"
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/lula-lint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
with:
ref: ${{ github.head_ref }}

- name: Lula Setup
uses: defenseunicorns/lula-action/setup@095636b7880051e11b05f10a582fdd911526161c
uses: defenseunicorns/lula-action/setup@9cf0c7fa5cdd40b55ccab87fe389bb631f32f03b

- name: Lula Lint
uses: defenseunicorns/lula-action/lint@095636b7880051e11b05f10a582fdd911526161c
uses: defenseunicorns/lula-action/lint@9cf0c7fa5cdd40b55ccab87fe389bb631f32f03b
with:
oscal-target: "oscal-component.yaml"
10 changes: 5 additions & 5 deletions .github/workflows/publish-package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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.41.0/zarf_v0.41.0_Linux_amd64'
name: 'zarf'
# renovate: datasource=github-tags depName=defenseunicorns/zarf versioning=semver
version: 'v0.32.2'
version: 'v0.41.0'

- name: Build confluence package
run: zarf package create --confirm --no-progress
Expand All @@ -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 }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/slash-command-dispatch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tag-test-and-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.4.0
rev: v5.0.0
hooks:
- id: check-added-large-files
args: ["--maxkb=1024"]
Expand Down Expand Up @@ -31,7 +31,7 @@ repos:
hooks:
- id: fix-smartquotes
- repo: https://github.com/python-jsonschema/check-jsonschema
rev: 0.23.0
rev: 0.29.3
hooks:
- id: check-jsonschema
name: "Validate Zarf Configs Against Schema"
Expand All @@ -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.110.5
hooks:
- id: renovate-config-validator
14 changes: 7 additions & 7 deletions .tool-versions
Original file line number Diff line number Diff line change
@@ -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.2
golangci-lint 1.61.0
pre-commit 4.0.0
terraform 1.9.7
tflint 0.53.0
tfsec 1.28.11
sops 3.9.1
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
@@ -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.41.0

# 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.42
# 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
Expand Down
2 changes: 1 addition & 1 deletion confluence-flux-values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
65 changes: 34 additions & 31 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,18 +1,20 @@
module github.com/defenseunicorns/uds-capability-confluence

go 1.20
go 1.21

toolchain go1.23.2

require (
github.com/gruntwork-io/terratest v0.43.11
github.com/stretchr/testify v1.8.4
github.com/gruntwork-io/terratest v0.47.2
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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down
Loading