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

Jump to bottom

Chore go121 #364

Merged
merged 3 commits into from
Dec 14, 2023
Merged

Chore go121 #364

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
81bcdc6
chore(de): update all dependencies.
Zenithar Dec 14, 2023
03935b9
chore(nix): update vendor hash.
Zenithar Dec 14, 2023
53b0444
chore(legal): update notice.
Zenithar Dec 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
18,631 changes: 10,526 additions & 8,105 deletions NOTICE.txt
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion build/legal/generate-notice.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ set -euo pipefail
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
PROJECT_DIR=${SCRIPT_DIR}/../..
TEMP_DIR=$(mktemp -d)
LICENCE_DETECTOR="go.elastic.co/go-licence-detector@v0.5.0"
LICENCE_DETECTOR="go.elastic.co/go-licence-detector@v0.6.0"

trap '[[ $TEMP_DIR ]] && rm -rf "$TEMP_DIR"' EXIT

Expand Down
12 changes: 6 additions & 6 deletions default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@ buildGoModule rec {
src = lib.cleanSource ./.;

subPackages = [ "cmd/harp" ];
vendorSha256 = "sha256-nCLwRCpdbcam1OA82fEyfGPTc7yShJC2ug8NPV0vUBQ=";
ldflags = [
vendorHash = "sha256-BpLn0ykQGR2uRoXQwY5tqAo+gm7/Lx8zgh1BHEOFgwQ=";
ldflags = [
"-s" "-w" "-buildid="
"-X zntr.io/harp/v2/build/version.Name=harp"
"-X zntr.io/harp/v2/build/version.AppName=zntr.io/harp/v2/cmd/harp"
"-X zntr.io/harp/v2/build/version.Version=nix-${rev}"
"-X zntr.io/harp/v2/build/version.Version=nix-${rev}"
"-X zntr.io/harp/v2/build/version.Commit=${rev}"
"-X zntr.io/harp/v2/build/version.Branch=main"
"-X zntr.io/harp/v2/build/version.BuildTags=defaults"
"-X zntr.io/harp/v2/build/version.Branch=main"
"-X zntr.io/harp/v2/build/version.BuildTags=defaults"
];

meta = with lib; {
Expand All @@ -23,4 +23,4 @@ buildGoModule rec {
license = licenses.asl20;
platforms = platforms.unix;
};
}
}
229 changes: 125 additions & 104 deletions docs/dependencies.asciidoc
View file
Open in desktop

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions flake.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
sha256 = "sha256-EBklnsZR8VwM89BztligZBDapmgyKuI9Ns8EFFo3ai8=";
};

vendorSha256 = "sha256-g7htGfU6C2rzfu8hAn6SGr0ZRwB8ZzSf9CgHYmdupE8=";
vendorHash = "sha256-g7htGfU6C2rzfu8hAn6SGr0ZRwB8ZzSf9CgHYmdupE8=";

nativeBuildInputs = [ pkgs.installShellFiles ];
};
Expand All @@ -62,7 +62,7 @@
sha256 = "sha256-jppPciJR2A1uKWhr+CB1Aquh33JXag0gjoBvohdt6+k=";
};

vendorSha256 = null;
vendorHash = null;

nativeBuildInputs = [ pkgs.installShellFiles ];
};
Expand All @@ -78,7 +78,7 @@
sha256 = "sha256-BTvvVwompM7Ie4BsRcjT4yxLLJc1qH1514A4uzwgGCc=";
};

vendorSha256 = "sha256-uJgC44JtBSEwR6iKg8nmVmsFdyc3rtKSYxt8dbCABe0=";
vendorHash = "sha256-uJgC44JtBSEwR6iKg8nmVmsFdyc3rtKSYxt8dbCABe0=";
subPackages = [ "cmd/cyclonedx-gomod" ];

nativeBuildInputs = [ pkgs.installShellFiles ];
Expand All @@ -88,7 +88,7 @@
pkgs.mkShell
{
buildInputs = [
pkgs.go_1_20
pkgs.go_1_21
pkgs.gopls
pkgs.gotools
pkgs.go-tools
Expand Down
134 changes: 63 additions & 71 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,35 +1,23 @@
module zntr.io/harp/v2

go 1.20

replace (
github.com/containerd/containerd => github.com/containerd/containerd v1.6.18
github.com/opencontainers/runc => github.com/opencontainers/runc v1.1.5
github.com/satori/go.uuid => github.com/satori/go.uuid v1.2.1-0.20181028125025-b2ce2384e17b
)

// GHSA
require (
github.com/docker/docker v23.0.3+incompatible // indirect
github.com/opencontainers/image-spec v1.1.0-rc4 // indirect
github.com/opencontainers/runc v1.1.5 // indirect
)
go 1.21

require (
dario.cat/mergo v1.0.0
filippo.io/age v1.1.1
filippo.io/edwards25519 v1.0.0
filippo.io/edwards25519 v1.1.0
github.com/MakeNowJust/heredoc/v2 v2.0.1
github.com/Masterminds/semver/v3 v3.2.1
github.com/Masterminds/sprig/v3 v3.2.3
github.com/alessio/shellescape v1.4.2
github.com/awnumar/memguard v0.22.3
github.com/awnumar/memguard v0.22.4
github.com/basgys/goxml2json v1.1.0
github.com/cloudflare/tableflip v1.2.3
github.com/common-nighthawk/go-figure v0.0.0-20210622060536-734e95fb86be
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc
github.com/dchest/uniuri v1.2.0
github.com/essentialkaos/branca v1.3.4
github.com/fatih/color v1.15.0
github.com/fatih/color v1.16.0
github.com/fatih/structs v1.1.0
github.com/fernet/fernet-go v0.0.0-20211208181803-9f70042a33ee
github.com/go-akka/configuration v0.0.0-20200606091224-a002c0330665
Expand All @@ -39,27 +27,26 @@ require (
github.com/golang/mock v1.6.0
github.com/golang/protobuf v1.5.3
github.com/golang/snappy v0.0.4
github.com/google/cel-go v0.18.1
github.com/google/cel-go v0.18.2
github.com/google/go-cmp v0.6.0
github.com/google/go-github/v42 v42.0.0
github.com/google/gofuzz v1.2.0
github.com/google/gops v0.3.28
github.com/gosimple/slug v1.13.1
github.com/hashicorp/consul/api v1.25.1
github.com/hashicorp/consul/api v1.26.1
github.com/hashicorp/go-cleanhttp v0.5.2
github.com/hashicorp/hcl v1.0.0
github.com/hashicorp/hcl/v2 v2.18.0
github.com/hashicorp/hcl/v2 v2.19.1
github.com/hashicorp/vault/api v1.10.0
github.com/iancoleman/strcase v0.3.0
github.com/imdario/mergo v0.3.16
github.com/jmespath/go-jmespath v0.4.0
github.com/klauspost/compress v1.17.0
github.com/klauspost/compress v1.17.4
github.com/lytics/base62 v0.0.0-20180808010106-0ee4de5a5d6d
github.com/magefile/mage v1.15.0
github.com/mcuadros/go-defaults v1.2.0
github.com/miscreant/miscreant.go v0.0.0-20200214223636-26d376326b75
github.com/oklog/run v1.1.0
github.com/open-policy-agent/opa v0.57.0
github.com/open-policy-agent/opa v0.59.0
github.com/ory/dockertest/v3 v3.10.0
github.com/pelletier/go-toml v1.9.5
github.com/pierrec/lz4 v2.6.1+incompatible
Expand All @@ -69,64 +56,65 @@ require (
github.com/sethvargo/go-diceware v0.3.0
github.com/sethvargo/go-password v0.2.0
github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966
github.com/spf13/cobra v1.7.0
github.com/spf13/viper v1.16.0
github.com/spf13/cobra v1.8.0
github.com/spf13/viper v1.18.1
github.com/stretchr/testify v1.8.4
github.com/ulikunitz/xz v0.5.11
github.com/xeipuuv/gojsonschema v1.2.0
github.com/zclconf/go-cty v1.14.0
github.com/zclconf/go-cty v1.14.1
gitlab.com/NebulousLabs/merkletree v0.0.0-20200118113624-07fbf710afc4
go.etcd.io/etcd/client/v3 v3.5.9
go.step.sm/crypto v0.36.0
go.etcd.io/etcd/client/v3 v3.5.11
go.step.sm/crypto v0.40.0
go.uber.org/zap v1.26.0
golang.org/x/crypto v0.14.0
golang.org/x/oauth2 v0.13.0
golang.org/x/sync v0.3.0
golang.org/x/sys v0.13.0
golang.org/x/term v0.13.0
google.golang.org/grpc v1.58.2
golang.org/x/crypto v0.16.0
golang.org/x/oauth2 v0.15.0
golang.org/x/sync v0.5.0
golang.org/x/sys v0.15.0
golang.org/x/term v0.15.0
google.golang.org/grpc v1.60.0
google.golang.org/protobuf v1.31.0
gopkg.in/square/go-jose.v2 v2.6.0
gopkg.in/yaml.v3 v3.0.1
sigs.k8s.io/yaml v1.3.0
sigs.k8s.io/yaml v1.4.0
zntr.io/paseto v1.2.0
)

require (
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78 // indirect
github.com/Masterminds/goutils v1.1.1 // indirect
github.com/Microsoft/go-winio v0.6.0 // indirect
github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5 // indirect
github.com/OneOfOne/xxhash v1.2.8 // indirect
github.com/agext/levenshtein v1.2.1 // indirect
github.com/agnivade/levenshtein v1.1.1 // indirect
github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230305170008-8188dc5388df // indirect
github.com/antlr4-go/antlr/v4 v4.13.0 // indirect
github.com/apparentlymart/go-textseg/v15 v15.0.0 // indirect
github.com/armon/go-metrics v0.4.1 // indirect
github.com/asaskevich/govalidator v0.0.0-20200108200545-475eaeb16496 // indirect
github.com/awnumar/memcall v0.1.2 // indirect
github.com/awnumar/memcall v0.2.0 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/bitly/go-simplejson v0.5.0 // indirect
github.com/bitly/go-simplejson v0.5.1 // indirect
github.com/cenkalti/backoff/v3 v3.0.0 // indirect
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
github.com/cespare/xxhash/v2 v2.2.0 // indirect
github.com/containerd/continuity v0.3.0 // indirect
github.com/coreos/go-semver v0.3.0 // indirect
github.com/coreos/go-systemd/v22 v22.3.2 // indirect
github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
github.com/docker/cli v23.0.3+incompatible // indirect
github.com/cpuguy83/go-md2man/v2 v2.0.3 // indirect
github.com/docker/cli v20.10.17+incompatible // indirect
github.com/docker/docker v20.10.7+incompatible // indirect
github.com/docker/go-connections v0.4.0 // indirect
github.com/docker/go-units v0.5.0 // indirect
github.com/fsnotify/fsnotify v1.6.0 // indirect
github.com/docker/go-units v0.4.0 // indirect
github.com/fsnotify/fsnotify v1.7.0 // indirect
github.com/go-ini/ini v1.67.0 // indirect
github.com/go-jose/go-jose/v3 v3.0.0 // indirect
github.com/go-logr/logr v1.2.4 // indirect
github.com/go-jose/go-jose/v3 v3.0.1 // indirect
github.com/go-logr/logr v1.3.0 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/google/go-querystring v1.1.0 // indirect
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
github.com/google/uuid v1.3.1 // indirect
github.com/gorilla/mux v1.8.0 // indirect
github.com/google/uuid v1.4.0 // indirect
github.com/gorilla/mux v1.8.1 // indirect
github.com/gosimple/unidecode v1.0.1 // indirect
github.com/hashicorp/errwrap v1.1.0 // indirect
github.com/hashicorp/go-hclog v1.5.0 // indirect
Expand All @@ -140,19 +128,22 @@ require (
github.com/hashicorp/golang-lru v0.5.4 // indirect
github.com/hashicorp/serf v0.10.1 // indirect
github.com/huandu/xstrings v1.3.3 // indirect
github.com/imdario/mergo v0.3.12 // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/magiconair/properties v1.8.7 // indirect
github.com/mattn/go-colorable v0.1.13 // indirect
github.com/mattn/go-isatty v0.0.17 // indirect
github.com/mattn/go-isatty v0.0.20 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
github.com/mitchellh/copystructure v1.2.0 // indirect
github.com/mitchellh/go-homedir v1.1.0 // indirect
github.com/mitchellh/go-wordwrap v1.0.0 // indirect
github.com/mitchellh/mapstructure v1.5.0 // indirect
github.com/mitchellh/reflectwalk v1.0.2 // indirect
github.com/moby/term v0.0.0-20221205130635-1aeaba878587 // indirect
github.com/moby/term v0.0.0-20201216013528-df9cb8a40635 // indirect
github.com/opencontainers/go-digest v1.0.0 // indirect
github.com/pelletier/go-toml/v2 v2.0.8 // indirect
github.com/opencontainers/image-spec v1.1.0-rc5 // indirect
github.com/opencontainers/runc v1.1.5 // indirect
github.com/pelletier/go-toml/v2 v2.1.0 // indirect
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
github.com/prometheus/client_golang v1.16.0 // indirect
github.com/prometheus/client_model v0.3.0 // indirect
Expand All @@ -161,36 +152,37 @@ require (
github.com/rcrowley/go-metrics v0.0.0-20200313005456-10cdbea86bc0 // indirect
github.com/russross/blackfriday/v2 v2.1.0 // indirect
github.com/ryanuber/go-glob v1.0.0 // indirect
github.com/sagikazarmark/locafero v0.4.0 // indirect
github.com/sagikazarmark/slog-shim v0.1.0 // indirect
github.com/shopspring/decimal v1.2.0 // indirect
github.com/sirupsen/logrus v1.9.3 // indirect
github.com/spf13/afero v1.9.5 // indirect
github.com/spf13/cast v1.5.1 // indirect
github.com/spf13/jwalterweatherman v1.1.0 // indirect
github.com/sourcegraph/conc v0.3.0 // indirect
github.com/spf13/afero v1.11.0 // indirect
github.com/spf13/cast v1.6.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/stoewer/go-strcase v1.2.0 // indirect
github.com/subosito/gotenv v1.4.2 // indirect
github.com/subosito/gotenv v1.6.0 // indirect
github.com/tchap/go-patricia/v2 v2.3.1 // indirect
github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
github.com/yashtewari/glob-intersection v0.2.0 // indirect
go.etcd.io/etcd/api/v3 v3.5.9 // indirect
go.etcd.io/etcd/client/pkg/v3 v3.5.9 // indirect
go.opentelemetry.io/otel v1.16.0 // indirect
go.opentelemetry.io/otel/metric v1.16.0 // indirect
go.opentelemetry.io/otel/sdk v1.16.0 // indirect
go.opentelemetry.io/otel/trace v1.16.0 // indirect
go.uber.org/goleak v1.2.1 // indirect
go.etcd.io/etcd/api/v3 v3.5.11 // indirect
go.etcd.io/etcd/client/pkg/v3 v3.5.11 // indirect
go.opentelemetry.io/otel v1.21.0 // indirect
go.opentelemetry.io/otel/metric v1.21.0 // indirect
go.opentelemetry.io/otel/sdk v1.21.0 // indirect
go.opentelemetry.io/otel/trace v1.21.0 // indirect
go.uber.org/multierr v1.10.0 // indirect
golang.org/x/exp v0.0.0-20230321023759-10a507213a29 // indirect
golang.org/x/mod v0.9.0 // indirect
golang.org/x/net v0.17.0 // indirect
golang.org/x/text v0.13.0 // indirect
golang.org/x/time v0.3.0 // indirect
golang.org/x/tools v0.7.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/genproto v0.0.0-20230913181813-007df8e322eb // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20230913181813-007df8e322eb // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20230920204549-e6e6cdab5c13 // indirect
golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect
golang.org/x/mod v0.12.0 // indirect
golang.org/x/net v0.19.0 // indirect
golang.org/x/text v0.14.0 // indirect
golang.org/x/time v0.5.0 // indirect
golang.org/x/tools v0.13.0 // indirect
google.golang.org/appengine v1.6.8 // indirect
google.golang.org/genproto v0.0.0-20231106174013-bbf56f31fb17 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20231106174013-bbf56f31fb17 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20231120223509-83a465c0220f // indirect
gopkg.in/ini.v1 v1.67.0 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
)
Loading
Loading