Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix go dependencies #1358

Merged
merged 3 commits into from
Feb 15, 2023
Merged

Fix go dependencies #1358

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
57909e9
Fix go dependencies
Racer159 Feb 14, 2023
ff6bb47
Update docs
Racer159 Feb 14, 2023
75de6ed
Move replace to top
Racer159 Feb 14, 2023
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 docs/4-user-guide/1-the-zarf-cli/100-cli-commands/zarf_tools_sbom.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ zarf tools sbom [flags]
--file string file to write the default report output to (default is STDOUT)
-h, --help help for sbom
--name string set the name of the target being analyzed
-o, --output stringArray report output format, options=[syft-json cyclonedx-xml cyclonedx-json github github-json spdx-tag-value spdx-json table text template] (default [table])
-o, --output stringArray report output format, options=[syft-json cyclonedx-xml cyclonedx-json github-json spdx-tag-value spdx-json syft-table syft-text template] (default [syft-table])
--platform string an optional platform specifier for container image sources (e.g. 'linux/arm64', 'linux/arm64/v8', 'arm64', 'linux')
-q, --quiet suppress all logging output
-s, --scope string selection of layers to catalog, options=[Squashed AllLayers] (default "Squashed")
Expand Down
2 changes: 1 addition & 1 deletion docs/4-user-guide/1-the-zarf-cli/100-cli-commands/zarf_tools_sbom_attest.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ zarf tools sbom attest --output [FORMAT] <IMAGE> [flags]
-h, --help help for attest
-k, --key string the key to use for the attestation
--name string set the name of the target being analyzed
-o, --output stringArray report output format, options=[syft-json cyclonedx-xml cyclonedx-json github github-json spdx-tag-value spdx-json table text template] (default [table])
-o, --output stringArray report output format, options=[syft-json cyclonedx-xml cyclonedx-json github-json spdx-tag-value spdx-json syft-table syft-text template] (default [syft-table])
--platform string an optional platform specifier for container image sources (e.g. 'linux/arm64', 'linux/arm64/v8', 'arm64', 'linux')
-s, --scope string selection of layers to catalog, options=[Squashed AllLayers] (default "Squashed")
-t, --template string specify the path to a Go template file
Expand Down
2 changes: 1 addition & 1 deletion docs/4-user-guide/1-the-zarf-cli/100-cli-commands/zarf_tools_sbom_convert.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ zarf tools sbom convert [SOURCE-SBOM] -o [FORMAT] [flags]
--file string file to write the default report output to (default is STDOUT)
-h, --help help for convert
--name string set the name of the target being analyzed
-o, --output stringArray report output format, options=[syft-json cyclonedx-xml cyclonedx-json github github-json spdx-tag-value spdx-json table text template] (default [table])
-o, --output stringArray report output format, options=[syft-json cyclonedx-xml cyclonedx-json github-json spdx-tag-value spdx-json syft-table syft-text template] (default [syft-table])
--platform string an optional platform specifier for container image sources (e.g. 'linux/arm64', 'linux/arm64/v8', 'arm64', 'linux')
-s, --scope string selection of layers to catalog, options=[Squashed AllLayers] (default "Squashed")
-t, --template string specify the path to a Go template file
Expand Down
2 changes: 1 addition & 1 deletion docs/4-user-guide/1-the-zarf-cli/100-cli-commands/zarf_tools_sbom_packages.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ zarf tools sbom packages [SOURCE] [flags]
--file string file to write the default report output to (default is STDOUT)
-h, --help help for packages
--name string set the name of the target being analyzed
-o, --output stringArray report output format, options=[syft-json cyclonedx-xml cyclonedx-json github github-json spdx-tag-value spdx-json table text template] (default [table])
-o, --output stringArray report output format, options=[syft-json cyclonedx-xml cyclonedx-json github-json spdx-tag-value spdx-json syft-table syft-text template] (default [syft-table])
--platform string an optional platform specifier for container image sources (e.g. 'linux/arm64', 'linux/arm64/v8', 'arm64', 'linux')
-s, --scope string selection of layers to catalog, options=[Squashed AllLayers] (default "Squashed")
-t, --template string specify the path to a Go template file
Expand Down
32 changes: 18 additions & 14 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ replace sigs.k8s.io/kustomize/kyaml => sigs.k8s.io/kustomize/kyaml v0.13.9
require (
github.com/AlecAivazis/survey/v2 v2.3.6
github.com/alecthomas/jsonschema v0.0.0-20220216202328-9eeeec9d044b
github.com/anchore/stereoscope v0.0.0-20230203152723-c49244e4d66f
github.com/anchore/syft v0.69.1
github.com/anchore/stereoscope v0.0.0-20230208154630-5a306f07f2e7
github.com/anchore/syft v0.71.0
github.com/derailed/k9s v0.27.2
github.com/distribution/distribution v2.8.1+incompatible
github.com/fatih/color v1.14.1
Expand All @@ -19,16 +19,16 @@ require (
github.com/goccy/go-yaml v1.9.8
github.com/google/go-containerregistry v0.13.0
github.com/mholt/archiver/v3 v3.5.1
github.com/moby/moby v20.10.23+incompatible
github.com/moby/moby v23.0.1+incompatible
Racer159 marked this conversation as resolved.
Show resolved Hide resolved
github.com/otiai10/copy v1.9.0
github.com/pkg/errors v0.9.1
github.com/pterm/pterm v0.12.54
github.com/sigstore/cosign v1.13.1
github.com/spf13/cobra v1.6.1
github.com/spf13/viper v1.15.0
github.com/stretchr/testify v1.8.1
golang.org/x/crypto v0.5.0
helm.sh/helm/v3 v3.11.0
golang.org/x/crypto v0.6.0
helm.sh/helm/v3 v3.11.1
k8s.io/api v0.26.1
k8s.io/apimachinery v0.26.1
k8s.io/client-go v0.26.1
Expand All @@ -38,6 +38,9 @@ require (
sigs.k8s.io/yaml v1.3.0
)

// TODO (@WSTARR) remove this temporary replacement of oras-go 1.2.2 with defenseunicorns version due to upgraded docker lib
replace oras.land/oras-go v1.2.2 => github.com/defenseunicorns/oras-go v1.2.3
Racer159 marked this conversation as resolved.
Show resolved Hide resolved

require (
atomicgo.dev/cursor v0.1.1 // indirect
atomicgo.dev/keyboard v0.2.9 // indirect
Expand Down Expand Up @@ -104,6 +107,7 @@ require (
github.com/aws/aws-sdk-go-v2/service/sts v1.16.19 // indirect
github.com/aws/smithy-go v1.13.3 // indirect
github.com/awslabs/amazon-ecr-credential-helper/ecr-login v0.0.0-20220517224237-e6f29200ae04 // indirect
github.com/becheran/wildmatch-go v1.0.0 // indirect
github.com/benbjohnson/clock v1.1.0 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/bgentry/speakeasy v0.1.0 // indirect
Expand All @@ -120,7 +124,7 @@ require (
github.com/cncf/xds/go v0.0.0-20211130200136-a8f946100490 // indirect
github.com/common-nighthawk/go-figure v0.0.0-20210622060536-734e95fb86be // indirect
github.com/containerd/console v1.0.3 // indirect
github.com/containerd/containerd v1.6.15 // indirect
github.com/containerd/containerd v1.6.17 // indirect
github.com/containerd/stargz-snapshotter/estargz v0.12.1 // indirect
github.com/coreos/go-oidc/v3 v3.4.0 // indirect
github.com/coreos/go-semver v0.3.0 // indirect
Expand All @@ -133,9 +137,9 @@ require (
github.com/derailed/tcell/v2 v2.3.1-rc.3 // indirect
github.com/derailed/tview v0.8.1 // indirect
github.com/dimchansky/utfbom v1.1.1 // indirect
github.com/docker/cli v20.10.21+incompatible // indirect
github.com/docker/cli v20.10.22+incompatible // indirect
github.com/docker/distribution v2.8.1+incompatible // indirect
github.com/docker/docker v20.10.23+incompatible // indirect
github.com/docker/docker v23.0.1+incompatible // indirect
github.com/docker/docker-credential-helpers v0.7.0 // indirect
github.com/docker/go-connections v0.4.0 // indirect
github.com/docker/go-metrics v0.0.1 // indirect
Expand Down Expand Up @@ -356,14 +360,14 @@ require (
go.uber.org/atomic v1.10.0 // indirect
go.uber.org/multierr v1.8.0 // indirect
go.uber.org/zap v1.23.0 // indirect
golang.org/x/exp v0.0.0-20220823124025-807a23277127 // indirect
golang.org/x/mod v0.7.0 // indirect
golang.org/x/net v0.5.0 // indirect
golang.org/x/exp v0.0.0-20230202163644-54bba9f4231b // indirect
golang.org/x/mod v0.8.0 // indirect
golang.org/x/net v0.6.0 // indirect
golang.org/x/oauth2 v0.1.0 // indirect
golang.org/x/sync v0.1.0 // indirect
golang.org/x/sys v0.4.0 // indirect
golang.org/x/term v0.4.0 // indirect
golang.org/x/text v0.6.0 // indirect
golang.org/x/sys v0.5.0 // indirect
golang.org/x/term v0.5.0 // indirect
golang.org/x/text v0.7.0 // indirect
golang.org/x/time v0.1.0 // indirect
golang.org/x/tools v0.2.0 // indirect
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
Expand Down
Loading