From 7f16e368c656332799e57854065866ae4b5b6aeb Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 1 Oct 2024 16:35:40 -0500 Subject: [PATCH] fix(deps): update zarf to v0.40.1 (#936) Signed-off-by: catsby Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: catsby Co-authored-by: UncleGedd <42304551+UncleGedd@users.noreply.github.com> --- go.mod | 2 +- go.sum | 4 ++-- hack/generate-schema.sh | 2 +- src/cmd/common.go | 11 +++++++++++ src/test/bundles/04-init/uds-bundle.yaml | 4 ++-- .../bundles/14-optional-components/uds-bundle.yaml | 2 +- 6 files changed, 18 insertions(+), 7 deletions(-) diff --git a/go.mod b/go.mod index d3c9e7d7..16963287 100644 --- a/go.mod +++ b/go.mod @@ -21,7 +21,7 @@ require ( github.com/spf13/cobra v1.8.1 github.com/spf13/viper v1.19.0 github.com/stretchr/testify v1.9.0 - github.com/zarf-dev/zarf v0.39.0 + github.com/zarf-dev/zarf v0.40.1 golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 golang.org/x/mod v0.21.0 golang.org/x/sync v0.8.0 diff --git a/go.sum b/go.sum index 9e5e254a..5c4f0dfa 100644 --- a/go.sum +++ b/go.sum @@ -1733,8 +1733,8 @@ github.com/yuin/gopher-lua v1.1.1 h1:kYKnWBjvbNP4XLT3+bPEwAXJx262OhaHDWDVOPjL46M github.com/yuin/gopher-lua v1.1.1/go.mod h1:GBR0iDaNXjAgGg9zfCvksxSRnQx76gclCIb7kdAd1Pw= github.com/zalando/go-keyring v0.2.2 h1:f0xmpYiSrHtSNAVgwip93Cg8tuF45HJM6rHq/A5RI/4= github.com/zalando/go-keyring v0.2.2/go.mod h1:sI3evg9Wvpw3+n4SqplGSJUMwtDeROfD4nsFz4z9PG0= -github.com/zarf-dev/zarf v0.39.0 h1:pWcYHITUtKDdRoNKZCSpOtQMj5g32XgQmq2x2kqmgWI= -github.com/zarf-dev/zarf v0.39.0/go.mod h1:heZFZKR4G+ap+B5fLBVRitQ516rMH5zHWoO4Eh2KcEk= +github.com/zarf-dev/zarf v0.40.1 h1:4PH5sTg0AI8RZptkRZc7kc73SQdjTvHktgKU0gk3ZJU= +github.com/zarf-dev/zarf v0.40.1/go.mod h1:heZFZKR4G+ap+B5fLBVRitQ516rMH5zHWoO4Eh2KcEk= github.com/zclconf/go-cty v1.14.0 h1:/Xrd39K7DXbHzlisFP9c4pHao4yyf+/Ug9LEz+Y/yhc= github.com/zclconf/go-cty v1.14.0/go.mod h1:VvMs5i0vgZdhYawQNq5kePSpLAoz8u1xvZgrPIxfnZE= github.com/zeebo/errs v1.3.0 h1:hmiaKqgYZzcVgRL1Vkc1Mn2914BbzB0IBxs+ebeutGs= diff --git a/hack/generate-schema.sh b/hack/generate-schema.sh index bd080b59..e95374ea 100755 --- a/hack/generate-schema.sh +++ b/hack/generate-schema.sh @@ -30,4 +30,4 @@ awk '{gsub(/\[github\.com\/defenseunicorns\/maru-runner\/src\/pkg\/variables\.Ex mv temp_tasks.schema.json tasks.schema.json # Download the Zarf schema -curl -O https://raw.githubusercontent.com/zarf-dev/zarf/v0.39.0/zarf.schema.json +curl -O https://raw.githubusercontent.com/zarf-dev/zarf/v0.40.1/zarf.schema.json diff --git a/src/cmd/common.go b/src/cmd/common.go index bf33d244..12dddd13 100644 --- a/src/cmd/common.go +++ b/src/cmd/common.go @@ -79,6 +79,17 @@ func configureZarf() { Confirm: config.CommonOptions.Confirm, CachePath: config.CommonOptions.CachePath, // use uds-cache instead of zarf-cache } + + // Zarf split it's "insecure" in to two flags, PlainHTTP and + // InsecureSkipTLSVerify, with Insecure is converted to both being set to true. + // UDS does not currently expose those flags and effectively shares the + // --insecure flag with zarf, so when we set the common options we need to + // set those additional flags here as well. + // See https://github.com/zarf-dev/zarf/pull/2936 for more information. + if config.CommonOptions.Insecure { + zarfConfig.CommonOptions.PlainHTTP = true + zarfConfig.CommonOptions.InsecureSkipTLSVerify = true + } } func setBundleFile(args []string) error { diff --git a/src/test/bundles/04-init/uds-bundle.yaml b/src/test/bundles/04-init/uds-bundle.yaml index c099dd35..c7bf5852 100644 --- a/src/test/bundles/04-init/uds-bundle.yaml +++ b/src/test/bundles/04-init/uds-bundle.yaml @@ -10,12 +10,12 @@ packages: - name: init path: "../../packages" # renovate: datasource=github-tags depName=zarf-dev/zarf - ref: v0.39.0 + ref: v0.40.1 optionalComponents: - git-server - name: init repository: ghcr.io/zarf-dev/packages/init # renovate: datasource=github-tags depName=zarf-dev/zarf - ref: v0.39.0 + ref: v0.40.1 optionalComponents: - git-server diff --git a/src/test/bundles/14-optional-components/uds-bundle.yaml b/src/test/bundles/14-optional-components/uds-bundle.yaml index ef7c860d..34e53f28 100644 --- a/src/test/bundles/14-optional-components/uds-bundle.yaml +++ b/src/test/bundles/14-optional-components/uds-bundle.yaml @@ -8,7 +8,7 @@ packages: - name: init repository: ghcr.io/zarf-dev/packages/init # renovate: datasource=github-tags depName=zarf-dev/zarf - ref: v0.39.0 + ref: v0.40.1 # deploys prometheus as a required component and upload-image as an optional component (with noOptionalComponents key) - name: prometheus