From 2e1217153cb37e43eb692610001f2c17ea8f82bc Mon Sep 17 00:00:00 2001 From: Jacob Weinstock Date: Wed, 14 Sep 2022 22:52:33 +0000 Subject: [PATCH 01/11] Update buf version: Previous version was very old, only a release candidate, and was failing to run the `make check-generated` and `make generated` targets on linux. The changes to the generated files are all formatting based. No actual or functional changes were made. Signed-off-by: Jacob Weinstock --- buf.lock | 5 +- go.mod | 111 +++++----- go.sum | 314 +++++++++++++++++++++------- protos/hardware/hardware.pb.go | 54 +---- protos/hardware/mock.go | 154 +++++++------- protos/packet/packet.pb.go | 4 +- protos/template/mock.go | 136 ++++++------ protos/template/template.pb.go | 20 +- protos/template/template_grpc.pb.go | 10 - protos/workflow/mock.go | 217 ++++++++++--------- protos/workflow/workflow.pb.go | 68 +----- protos/workflow/workflow_grpc.pb.go | 12 -- rules.mk | 1 + 13 files changed, 595 insertions(+), 511 deletions(-) diff --git a/buf.lock b/buf.lock index 3c6b30a0b..2e09afb0d 100644 --- a/buf.lock +++ b/buf.lock @@ -4,7 +4,4 @@ deps: - remote: buf.build owner: googleapis repository: googleapis - branch: main - commit: 389e82394fcc4e18b2463c26674170b3 - digest: b1-j-IWUPcGJWMkqbee6hR7IJCXlLF9Y5P4ARue8gLwLP0= - create_time: 2021-10-01T15:05:49.20888Z + commit: 8d7204855ec14631a499bd7393ce1970 diff --git a/go.mod b/go.mod index 2eec02a14..ab70ffcc3 100644 --- a/go.mod +++ b/go.mod @@ -3,13 +3,13 @@ module github.com/tinkerbell/tink go 1.17 require ( - github.com/bufbuild/buf v1.0.0-rc2 + github.com/bufbuild/buf v1.8.0 github.com/docker/distribution v2.8.1+incompatible - github.com/docker/docker v20.10.7+incompatible + github.com/docker/docker v20.10.17+incompatible github.com/equinix-labs/otel-init-go v0.0.1 github.com/go-logr/zapr v1.2.0 github.com/golang/protobuf v1.5.2 - github.com/google/go-cmp v0.5.6 + github.com/google/go-cmp v0.5.8 github.com/google/uuid v1.3.0 github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 @@ -19,24 +19,24 @@ require ( github.com/matryer/moq v0.2.3 github.com/onsi/ginkgo/v2 v2.1.3 github.com/onsi/gomega v1.18.1 - github.com/opencontainers/image-spec v1.0.2 + github.com/opencontainers/image-spec v1.0.3-0.20211202183452-c5a74bcca799 github.com/packethost/pkg v0.0.0-20200903155310-0433e0605550 github.com/pkg/errors v0.9.1 - github.com/prometheus/client_golang v1.11.0 + github.com/prometheus/client_golang v1.12.1 github.com/rubenv/sql-migrate v0.0.0-20200616145509-8d140a17f351 - github.com/spf13/cobra v1.4.0 + github.com/spf13/cobra v1.5.0 github.com/spf13/pflag v1.0.5 github.com/spf13/viper v1.8.1 - github.com/stretchr/testify v1.7.0 + github.com/stretchr/testify v1.8.0 github.com/testcontainers/testcontainers-go v0.11.1 github.com/tinkerbell/lint-install v0.0.0-20220502172532-2fdfa62596af go.mongodb.org/mongo-driver v1.1.2 // indirect - go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.22.0 - go.uber.org/multierr v1.7.0 - google.golang.org/genproto v0.0.0-20211021150943-2b146023228c - google.golang.org/grpc v1.42.0 + go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.34.0 + go.uber.org/multierr v1.8.0 + google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa + google.golang.org/grpc v1.48.0 google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0 - google.golang.org/protobuf v1.27.1 + google.golang.org/protobuf v1.28.1 gopkg.in/yaml.v2 v2.4.0 k8s.io/api v0.23.0 k8s.io/apimachinery v0.23.0 @@ -50,30 +50,35 @@ require ( sigs.k8s.io/yaml v1.3.0 ) +require github.com/go-logr/logr v1.2.3 + require ( github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect - github.com/Microsoft/go-winio v0.4.17-0.20210211115548-6eac466e5fa3 // indirect - github.com/Microsoft/hcsshim v0.8.16 // indirect + github.com/Microsoft/go-winio v0.5.2 // indirect + github.com/Microsoft/hcsshim v0.9.4 // indirect github.com/PuerkitoBio/purell v1.1.1 // indirect github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a // indirect + github.com/benbjohnson/clock v1.3.0 // indirect github.com/beorn7/perks v1.0.1 // indirect - github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d // indirect github.com/blendle/zapdriver v1.3.1 // indirect + github.com/bufbuild/connect-go v0.4.0 // indirect github.com/cenkalti/backoff v2.2.1+incompatible // indirect - github.com/cenkalti/backoff/v4 v4.1.1 // indirect - github.com/cespare/xxhash/v2 v2.1.1 // indirect - github.com/containerd/cgroups v0.0.0-20210114181951-8a68de567b68 // indirect - github.com/containerd/containerd v1.5.0-beta.4 // indirect - github.com/cpuguy83/go-md2man/v2 v2.0.1 // indirect + github.com/cenkalti/backoff/v4 v4.1.2 // indirect + github.com/cespare/xxhash/v2 v2.1.2 // indirect + github.com/containerd/cgroups v1.0.3 // indirect + github.com/containerd/containerd v1.6.8 // indirect + github.com/containerd/typeurl v1.0.2 // indirect + github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/docker/go-connections v0.4.0 // indirect github.com/docker/go-units v0.4.0 // indirect github.com/evanphx/json-patch v4.12.0+incompatible // indirect github.com/fatih/color v1.12.0 // indirect github.com/fsnotify/fsnotify v1.5.1 // indirect + github.com/go-chi/chi/v5 v5.0.7 // indirect github.com/go-errors/errors v1.0.1 // indirect - github.com/go-logr/logr v1.2.3 // indirect + github.com/go-logr/stdr v1.2.2 // indirect github.com/go-openapi/errors v0.19.2 // indirect github.com/go-openapi/jsonpointer v0.19.5 // indirect github.com/go-openapi/jsonreference v0.19.5 // indirect @@ -82,7 +87,7 @@ require ( github.com/go-stack/stack v1.8.0 // indirect github.com/gobuffalo/flect v0.2.4 // indirect github.com/gofrs/flock v0.8.1 // indirect - github.com/gofrs/uuid v4.0.0+incompatible // indirect + github.com/gofrs/uuid v4.2.0+incompatible // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect github.com/google/gofuzz v1.2.0 // indirect @@ -90,17 +95,19 @@ require ( github.com/googleapis/gnostic v0.5.5 // indirect github.com/gorilla/websocket v1.4.2 // indirect github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect - github.com/hashicorp/errwrap v1.0.0 // indirect + github.com/hashicorp/errwrap v1.1.0 // indirect github.com/hashicorp/go-multierror v1.1.1 // indirect github.com/hashicorp/hcl v1.0.0 // indirect github.com/hexops/gotextdiff v1.0.3 // indirect github.com/imdario/mergo v0.3.12 // indirect - github.com/inconshreveable/mousetrap v1.0.0 // indirect - github.com/jhump/protoreflect v1.9.1-0.20210817181203-db1a327a393e // indirect + github.com/inconshreveable/mousetrap v1.0.1 // indirect + github.com/jdxcode/netrc v0.0.0-20210204082910-926c7f70242a // indirect + github.com/jhump/protocompile v0.0.0-20220812162104-d108583e055d // indirect + github.com/jhump/protoreflect v1.12.1-0.20220721211354-060cc04fc18b // indirect github.com/josharian/intern v1.0.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/karrick/godirwalk v1.17.0 // indirect - github.com/klauspost/compress v1.13.6 // indirect + github.com/klauspost/compress v1.15.9 // indirect github.com/klauspost/pgzip v1.2.5 // indirect github.com/ktr0731/grpc-web-go-client v0.2.7 // indirect github.com/magiconair/properties v1.8.5 // indirect @@ -110,57 +117,59 @@ require ( github.com/mattn/go-runewidth v0.0.9 // indirect github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect github.com/mitchellh/mapstructure v1.4.1 // indirect - github.com/moby/sys/mount v0.2.0 // indirect - github.com/moby/sys/mountinfo v0.4.1 // indirect - github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6 // indirect + github.com/moby/buildkit v0.10.3 // indirect + github.com/moby/sys/mount v0.3.0 // indirect + github.com/moby/sys/mountinfo v0.6.0 // indirect + github.com/moby/term v0.0.0-20220808134915-39b0c02b01ae // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect - github.com/morikuni/aec v0.0.0-20170113033406-39771216ff4c // indirect + github.com/morikuni/aec v1.0.0 // indirect github.com/olekukonko/tablewriter v0.0.5 // indirect github.com/opencontainers/go-digest v1.0.0 // indirect - github.com/opencontainers/runc v1.0.0-rc93 // indirect - github.com/pelletier/go-toml v1.9.3 // indirect + github.com/opencontainers/runc v1.1.2 // indirect + github.com/pelletier/go-toml v1.9.4 // indirect + github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8 // indirect github.com/pkg/profile v1.6.0 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/prometheus/client_model v0.2.0 // indirect github.com/prometheus/common v0.32.1 // indirect - github.com/prometheus/procfs v0.6.0 // indirect + github.com/prometheus/procfs v0.7.3 // indirect github.com/rollbar/rollbar-go v1.0.2 // indirect + github.com/rs/cors v1.8.2 // indirect github.com/russross/blackfriday/v2 v2.1.0 // indirect - github.com/sirupsen/logrus v1.8.1 // indirect + github.com/sirupsen/logrus v1.9.0 // indirect github.com/spf13/afero v1.6.0 // indirect github.com/spf13/cast v1.3.1 // indirect github.com/spf13/jwalterweatherman v1.1.0 // indirect github.com/subosito/gotenv v1.2.0 // indirect github.com/xlab/treeprint v0.0.0-20181112141820-a009c3971eca // indirect go.opencensus.io v0.23.0 // indirect - go.opentelemetry.io/contrib v0.22.0 // indirect - go.opentelemetry.io/otel v1.0.0-RC2 // indirect - go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.0.0-RC2 // indirect - go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.0.0-RC2 // indirect - go.opentelemetry.io/otel/sdk v1.0.0-RC2 // indirect - go.opentelemetry.io/otel/trace v1.0.0-RC2 // indirect - go.opentelemetry.io/proto/otlp v0.9.0 // indirect + go.opentelemetry.io/otel v1.9.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.4.1 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.4.1 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.4.1 // indirect + go.opentelemetry.io/otel/sdk v1.4.1 // indirect + go.opentelemetry.io/otel/trace v1.9.0 // indirect + go.opentelemetry.io/proto/otlp v0.12.0 // indirect go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5 // indirect - go.uber.org/atomic v1.9.0 // indirect - go.uber.org/zap v1.19.1 // indirect - golang.org/x/mod v0.4.2 // indirect - golang.org/x/net v0.0.0-20211101193420-4a448f8816b3 // indirect + go.uber.org/atomic v1.10.0 // indirect + go.uber.org/zap v1.22.0 // indirect + golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect + golang.org/x/net v0.0.0-20220812174116-3211cb980234 // indirect golang.org/x/oauth2 v0.0.0-20211028175245-ba495a64dcb5 // indirect - golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect - golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e // indirect - golang.org/x/term v0.0.0-20210916214954-140adaaadfaf // indirect + golang.org/x/sync v0.0.0-20220819030929-7fc1605a5dde // indirect + golang.org/x/sys v0.0.0-20220818161305-2296e01440c6 // indirect + golang.org/x/term v0.0.0-20220722155259-a9ba230a4035 // indirect golang.org/x/text v0.3.7 // indirect golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect - golang.org/x/tools v0.1.7 // indirect - golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect + golang.org/x/tools v0.1.12 // indirect gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect google.golang.org/appengine v1.6.7 // indirect gopkg.in/gorp.v1 v1.7.2 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/ini.v1 v1.62.0 // indirect - gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect + gopkg.in/yaml.v3 v3.0.1 // indirect k8s.io/apiextensions-apiserver v0.23.0 // indirect k8s.io/component-base v0.23.0 // indirect k8s.io/klog/v2 v2.60.1 // indirect diff --git a/go.sum b/go.sum index 66fe6b114..d6c691004 100644 --- a/go.sum +++ b/go.sum @@ -122,16 +122,21 @@ github.com/Microsoft/go-winio v0.4.15-0.20190919025122-fc70bd9a86b5/go.mod h1:tT github.com/Microsoft/go-winio v0.4.15/go.mod h1:tTuCMEN+UleMWgg9dVx4Hu52b1bJo+59jBh3ajtinzw= github.com/Microsoft/go-winio v0.4.16-0.20201130162521-d1ffc52c7331/go.mod h1:XB6nPKklQyQ7GC9LdcBEcBl8PF76WugXOPRXwdLnMv0= github.com/Microsoft/go-winio v0.4.16/go.mod h1:XB6nPKklQyQ7GC9LdcBEcBl8PF76WugXOPRXwdLnMv0= -github.com/Microsoft/go-winio v0.4.17-0.20210211115548-6eac466e5fa3 h1:mw6pDQqv38/WGF1cO/jF5t/jyAJ2yi7CmtFLLO5tGFI= github.com/Microsoft/go-winio v0.4.17-0.20210211115548-6eac466e5fa3/go.mod h1:JPGBdM1cNvN/6ISo+n8V5iA4v8pBzdOpzfwIujj1a84= +github.com/Microsoft/go-winio v0.4.17-0.20210324224401-5516f17a5958/go.mod h1:JPGBdM1cNvN/6ISo+n8V5iA4v8pBzdOpzfwIujj1a84= +github.com/Microsoft/go-winio v0.4.17/go.mod h1:JPGBdM1cNvN/6ISo+n8V5iA4v8pBzdOpzfwIujj1a84= +github.com/Microsoft/go-winio v0.5.2 h1:a9IhgEQBCUEk6QCdml9CiJGhAws+YwffDHEMp1VMrpA= +github.com/Microsoft/go-winio v0.5.2/go.mod h1:WpS1mjBmmwHBEWmogvA2mj8546UReBk4v8QkMxJ6pZY= github.com/Microsoft/hcsshim v0.8.6/go.mod h1:Op3hHsoHPAvb6lceZHDtd9OkTew38wNoXnJs8iY7rUg= github.com/Microsoft/hcsshim v0.8.7-0.20190325164909-8abdbb8205e4/go.mod h1:Op3hHsoHPAvb6lceZHDtd9OkTew38wNoXnJs8iY7rUg= github.com/Microsoft/hcsshim v0.8.7/go.mod h1:OHd7sQqRFrYd3RmSgbgji+ctCwkbq2wbEYNSzOYtcBQ= github.com/Microsoft/hcsshim v0.8.9/go.mod h1:5692vkUqntj1idxauYlpoINNKeqCiG6Sg38RRsjT5y8= github.com/Microsoft/hcsshim v0.8.14/go.mod h1:NtVKoYxQuTLx6gEq0L96c9Ju4JbRJ4nY2ow3VK6a9Lg= github.com/Microsoft/hcsshim v0.8.15/go.mod h1:x38A4YbHbdxJtc0sF6oIz+RG0npwSCAvn69iY6URG00= -github.com/Microsoft/hcsshim v0.8.16 h1:8/auA4LFIZFTGrqfKhGBSXwM6/4X1fHa/xniyEHu8ac= github.com/Microsoft/hcsshim v0.8.16/go.mod h1:o5/SZqmR7x9JNKsW3pu+nqHm0MF8vbA+VxGOoXdC600= +github.com/Microsoft/hcsshim v0.8.21/go.mod h1:+w2gRZ5ReXQhFOrvSQeNfhrYB/dg3oDwTOcER2fw4I4= +github.com/Microsoft/hcsshim v0.9.4 h1:mnUj0ivWy6UzbB1uLFqKR6F+ZyiDc7j4iGgHTpO+5+I= +github.com/Microsoft/hcsshim v0.9.4/go.mod h1:7pLA8lDk46WKDWlVsENo92gC0XFa8rbKfyFRBqxEbCc= github.com/Microsoft/hcsshim/test v0.0.0-20201218223536-d3e5debf77da/go.mod h1:5hlzMzRKMLyo42nCZ9oml8AdTlq/0cvIaBv6tK1RehU= github.com/Microsoft/hcsshim/test v0.0.0-20210227013316-43a75bb4edd3/go.mod h1:mw7qgWloBUl75W/gVH3cQszUg1+gUITj7D6NY7ywVnY= github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb06e3pkSAbeQ52E9H9iFoQsEEwGN64994WTCIhntQ= @@ -142,8 +147,10 @@ github.com/ProtonMail/go-crypto v0.0.0-20210329181949-3900d675f39b/go.mod h1:HTM github.com/ProtonMail/go-crypto v0.0.0-20210408094314-bf0c5240ed99/go.mod h1:HTM9X7e9oLwn7RiqLG0UVwVRJenLs3wN+tQ0NPAfwMQ= github.com/ProtonMail/go-mime v0.0.0-20190923161245-9b5a4261663a/go.mod h1:NYt+V3/4rEeDuaev/zw1zCq8uqVEuPHzDPo3OZrlGJ4= github.com/ProtonMail/gopenpgp/v2 v2.1.8/go.mod h1:mjMvRMlOlBhNuaa3z0xOmEgAkba/Mu1Z8uWwYj4/6Ws= +github.com/PuerkitoBio/purell v1.0.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0= github.com/PuerkitoBio/purell v1.1.1 h1:WEQqlqaGbrPkxLJWfBwQmfEAE1Z7ONdDLqrN38tNFfI= github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0= +github.com/PuerkitoBio/urlesc v0.0.0-20160726150825-5bd2802263f2/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE= github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 h1:d+Bc7a5rLufV/sSk/8dngufqelfh6jnri85riMAaF/M= github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE= github.com/Shopify/logrus-bugsnag v0.0.0-20171204204709-577dee27f20d/go.mod h1:HI8ITrYtUY+O+ZhtlqUnD8+KwNPOyugEhfP9fdUIaEQ= @@ -198,17 +205,17 @@ github.com/aws/aws-sdk-go v1.38.35/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2z github.com/aws/aws-sdk-go-v2 v0.18.0/go.mod h1:JWVYvqSMppoMJC0x5wdwiImzgXTI9FuZwxzkQq9wy+g= github.com/aybabtme/rgbterm v0.0.0-20170906152045-cc83f3b3ce59/go.mod h1:q/89r3U2H7sSsE2t6Kca0lfwTK8JdoNGS/yzM/4iH5I= github.com/benbjohnson/clock v1.0.3/go.mod h1:bGMdMPoPVvcYyt1gHDf4J2KE153Yf9BuiUKYMaxlTDM= -github.com/benbjohnson/clock v1.1.0 h1:Q92kusRqC1XV2MjkWETPvjJVqKetz1OzxZB7mHJLju8= github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= +github.com/benbjohnson/clock v1.3.0 h1:ip6w0uFQkncKQ979AypyG0ER7mqUSBdKLOgAle/AT8A= +github.com/benbjohnson/clock v1.3.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= github.com/beorn7/perks v0.0.0-20160804104726-4c0e84591b9a/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= -github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d h1:xDfNPAt8lFiC1UJrqV3uuy861HCTo708pDMbjHHdCas= -github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d/go.mod h1:6QX/PXZ00z/TKoufEY6K/a0k6AhaJrQKdFe6OfVXsa4= github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= github.com/bitly/go-simplejson v0.5.0/go.mod h1:cXHtHw4XUPsvGaxgjIAn8PhEWG9NfngEKAMDJEczWVA= +github.com/bits-and-blooms/bitset v1.2.0/go.mod h1:gIdJ4wp64HaoK2YrL1Q5/N7Y16edYb8uY+O0FJTyyDA= github.com/bketelsen/crypt v0.0.3-0.20200106085610-5cbc8cc4026c/go.mod h1:MKsuJmJgSg28kpZDP6UIiPt0e0Oz0kqKNGyRaWEPv84= github.com/bketelsen/crypt v0.0.4/go.mod h1:aI6NrJ0pMGgvZKL1iVgXLnfIFJtfV+bKCoqOes/6LfM= github.com/bkielbasa/cyclop v1.2.0/go.mod h1:qOI0yy6A7dYC4Zgsa72Ppm9kONl0RoIlPbzot9mhmeI= @@ -222,8 +229,10 @@ github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869/go.mod h1:Ekp36dR github.com/bmizerany/perks v0.0.0-20141205001514-d9a9656a3a4b/go.mod h1:ac9efd0D1fsDb3EJvhqgXRbFx7bs2wqZ10HQPeU8U/Q= github.com/bombsimon/wsl/v3 v3.3.0/go.mod h1:st10JtZYLE4D5sC7b8xV4zTKZwAQjCH/Hy2Pm1FNZIc= github.com/bshuster-repo/logrus-logstash-hook v0.4.1/go.mod h1:zsTqEiSzDgAa/8GZR7E1qaXrhYNDKBYy5/dWPTIflbk= -github.com/bufbuild/buf v1.0.0-rc2 h1:OXo9Qm/g4nnY+HGS7llFT+QwUIn43ExFMz0Rb5QgSpo= -github.com/bufbuild/buf v1.0.0-rc2/go.mod h1:uBkf/fZGaHixTTo+qSj4zDkq6UGFH3LdF3+QsO4tZik= +github.com/bufbuild/buf v1.8.0 h1:53qJ3QY/KOHwSjWgCQYkQaR3jGWst7aOfTXnFe8e+VQ= +github.com/bufbuild/buf v1.8.0/go.mod h1:tBzKkd1fzCcBV6KKSO7zo3rlhk3o1YQ0F2tQKSC2aNU= +github.com/bufbuild/connect-go v0.4.0 h1:fIMyUYG8mXSTH+nnlOx9KmRUf3mBF0R2uKK+BQBoOHE= +github.com/bufbuild/connect-go v0.4.0/go.mod h1:ZEtBnQ7J/m7bvWOW+H8T/+hKQCzPVfhhhICuvtcnjlI= github.com/buger/jsonparser v0.0.0-20180808090653-f4dd9f5a6b44/go.mod h1:bbYlZJ7hK1yFx9hf58LP0zeX7UjIGs20ufpu3evjr+s= github.com/bugsnag/bugsnag-go v0.0.0-20141110184014-b1d153021fcd/go.mod h1:2oa8nejYd4cQ/b0hMIopN0lCRxU0bueqREvZLWFrtK8= github.com/bugsnag/osext v0.0.0-20130617224835-0dd3f918b21b/go.mod h1:obH5gd0BsqsP2LwDJ9aOkm/6J86V6lyAXCoQWGw3K50= @@ -239,25 +248,31 @@ github.com/cavaliercoder/go-cpio v0.0.0-20180626203310-925f9528c45e/go.mod h1:oD github.com/cenkalti/backoff v2.1.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM= github.com/cenkalti/backoff v2.2.1+incompatible h1:tNowT99t7UNflLxfYYSlKYsBpXdEet03Pg2g16Swow4= github.com/cenkalti/backoff v2.2.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM= -github.com/cenkalti/backoff/v4 v4.1.1 h1:G2HAfAmvm/GcKan2oOQpBXOd2tT2G57ZnZGWa1PxPBQ= github.com/cenkalti/backoff/v4 v4.1.1/go.mod h1:scbssz8iZGpm3xbr14ovlUdkxfGXNInqkPWOWmG2CLw= +github.com/cenkalti/backoff/v4 v4.1.2 h1:6Yo7N8UP2K6LWZnW94DLVSSrbobcWdVzAYOisuDPIFo= +github.com/cenkalti/backoff/v4 v4.1.2/go.mod h1:scbssz8iZGpm3xbr14ovlUdkxfGXNInqkPWOWmG2CLw= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/census-instrumentation/opencensus-proto v0.3.0/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/certifi/gocertifi v0.0.0-20191021191039-0944d244cd40/go.mod h1:sGbDF6GwGcLpkNXPUTkMRoywsNa/ol15pxFe6ERfguA= github.com/certifi/gocertifi v0.0.0-20200922220541-2c3bb06c6054/go.mod h1:sGbDF6GwGcLpkNXPUTkMRoywsNa/ol15pxFe6ERfguA= -github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko= github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= -github.com/cespare/xxhash/v2 v2.1.1 h1:6MnRN8NT7+YBpUIWxHtefFZOKTAPgGjpQSxqLNn0+qY= github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= +github.com/cespare/xxhash/v2 v2.1.2 h1:YRXhKfTDauu4ajMg1TPgFO5jnlC2HCbmLXMcTG5cbYE= +github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/charithe/durationcheck v0.0.8/go.mod h1:SSbRIBVfMjCi/kEB6K65XEA83D6prSM8ap1UCpNKtgg= github.com/chavacava/garif v0.0.0-20210405164556-e8a0a408d6af/go.mod h1:Qjyv4H3//PWVzTeCezG2b9IRn6myJxJSr4TD/xo6ojU= github.com/checkpoint-restore/go-criu/v4 v4.1.0/go.mod h1:xUQBLp4RLc5zJtWY++yjOoMoB5lihDt7fai+75m+rGw= +github.com/checkpoint-restore/go-criu/v5 v5.0.0/go.mod h1:cfwC0EG7HMUenopBsUf9d89JlCLQIfgVcNsNN0t6T2M= +github.com/checkpoint-restore/go-criu/v5 v5.3.0/go.mod h1:E/eQpaFtUKGOOSEBZgmKAcn+zUUwWxqcaKZlF54wK8E= github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/cilium/ebpf v0.0.0-20200110133405-4032b1d8aae3/go.mod h1:MA5e5Lr8slmEg9bt0VpxxWqJlO4iwu3FBdHUzV7wQVg= github.com/cilium/ebpf v0.0.0-20200702112145-1c8d4c9ef775/go.mod h1:7cR51M8ViRLIdUjrmSXlK9pkrsDlLHbO8jiB8X8JnOc= github.com/cilium/ebpf v0.2.0/go.mod h1:To2CFviqOWL/M0gIMsvSMlqe7em/l1ALkX1PyjrX2Qs= +github.com/cilium/ebpf v0.4.0/go.mod h1:4tRaxcgiL706VnOzHOdBlY8IEAIdxINsQBcU4xJJXRs= +github.com/cilium/ebpf v0.6.2/go.mod h1:4tRaxcgiL706VnOzHOdBlY8IEAIdxINsQBcU4xJJXRs= +github.com/cilium/ebpf v0.7.0/go.mod h1:/oI2+1shJiTGAMgl6/RgJr36Eo1jzrRcAWbcXO2usCA= github.com/clbanning/x2j v0.0.0-20191024224557-825249438eec/go.mod h1:jMjuTZXRI4dUb/I5gc9Hdhagfvm9+RyrPryS/auMzxE= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= @@ -267,6 +282,7 @@ github.com/cncf/udpa/go v0.0.0-20210930031921-04548b0d99d4/go.mod h1:6pvJx4me5XP github.com/cncf/xds/go v0.0.0-20210312221358-fbca930ec8ed/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/cncf/xds/go v0.0.0-20210805033703-aa0b78936158/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/cncf/xds/go v0.0.0-20210922020428-25de7278fc84/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= +github.com/cncf/xds/go v0.0.0-20211001041855-01bcc9b48dfe/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8= github.com/cockroachdb/datadriven v0.0.0-20200714090401-bf6692d28da5/go.mod h1:h6jFvWxBdQXxjopDMZyH2UVceIRfR84bdzbkoKrsWNo= @@ -276,19 +292,25 @@ github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE github.com/containerd/aufs v0.0.0-20200908144142-dab0cbea06f4/go.mod h1:nukgQABAEopAHvB6j7cnP5zJ+/3aVcE7hCYqvIwAHyE= github.com/containerd/aufs v0.0.0-20201003224125-76a6863f2989/go.mod h1:AkGGQs9NM2vtYHaUen+NljV0/baGCAPELGm2q9ZXpWU= github.com/containerd/aufs v0.0.0-20210316121734-20793ff83c97/go.mod h1:kL5kd6KM5TzQjR79jljyi4olc1Vrx6XBlcyj3gNv2PU= +github.com/containerd/aufs v1.0.0/go.mod h1:kL5kd6KM5TzQjR79jljyi4olc1Vrx6XBlcyj3gNv2PU= github.com/containerd/btrfs v0.0.0-20201111183144-404b9149801e/go.mod h1:jg2QkJcsabfHugurUvvPhS3E08Oxiuh5W/g1ybB4e0E= github.com/containerd/btrfs v0.0.0-20210316141732-918d888fb676/go.mod h1:zMcX3qkXTAi9GI50+0HOeuV8LU2ryCE/V2vG/ZBiTss= +github.com/containerd/btrfs v1.0.0/go.mod h1:zMcX3qkXTAi9GI50+0HOeuV8LU2ryCE/V2vG/ZBiTss= github.com/containerd/cgroups v0.0.0-20190717030353-c4b9ac5c7601/go.mod h1:X9rLEHIqSf/wfK8NsPqxJmeZgW4pcfzdXITDrUSJ6uI= github.com/containerd/cgroups v0.0.0-20190919134610-bf292b21730f/go.mod h1:OApqhQ4XNSNC13gXIwDjhOQxjWa/NxkwZXJ1EvqT0ko= github.com/containerd/cgroups v0.0.0-20200531161412-0dbf7f05ba59/go.mod h1:pA0z1pT8KYB3TCXK/ocprsh7MAkoW8bZVzPdih9snmM= github.com/containerd/cgroups v0.0.0-20200710171044-318312a37340/go.mod h1:s5q4SojHctfxANBDvMeIaIovkq29IP48TKAxnhYRxvo= github.com/containerd/cgroups v0.0.0-20200824123100-0b889c03f102/go.mod h1:s5q4SojHctfxANBDvMeIaIovkq29IP48TKAxnhYRxvo= -github.com/containerd/cgroups v0.0.0-20210114181951-8a68de567b68 h1:hkGVFjz+plgr5UfxZUTPFbUFIF/Km6/s+RVRIRHLrrY= github.com/containerd/cgroups v0.0.0-20210114181951-8a68de567b68/go.mod h1:ZJeTFisyysqgcCdecO57Dj79RfL0LNeGiFUqLYQRYLE= +github.com/containerd/cgroups v1.0.1/go.mod h1:0SJrPIenamHDcZhEcJMNBB85rHcUsw4f25ZfBiPYRkU= +github.com/containerd/cgroups v1.0.3 h1:ADZftAkglvCiD44c77s5YmMqaP2pzVCFZvBmAlBdAP4= +github.com/containerd/cgroups v1.0.3/go.mod h1:/ofk34relqNjSGyqPrmEULrO4Sc8LJhvJmWbUCUKqj8= github.com/containerd/console v0.0.0-20180822173158-c12b1e7919c1/go.mod h1:Tj/on1eG8kiEhd0+fhSDzsPAFESxzBBvdyEgyryXffw= github.com/containerd/console v0.0.0-20181022165439-0650fd9eeb50/go.mod h1:Tj/on1eG8kiEhd0+fhSDzsPAFESxzBBvdyEgyryXffw= github.com/containerd/console v0.0.0-20191206165004-02ecf6a7291e/go.mod h1:8Pf4gM6VEbTNRIT26AyyU7hxdQU3MvAvxVI0sc00XBE= github.com/containerd/console v1.0.1/go.mod h1:XUsP6YE/mKtz6bxc+I8UiKKTP04qjQL4qcS3XoQ5xkw= +github.com/containerd/console v1.0.2/go.mod h1:ytZPjGgY2oeTkAONYafi2kSj0aYggsf8acV1PGKCbzQ= +github.com/containerd/console v1.0.3/go.mod h1:7LqA/THxQ86k76b8c/EMSiaJ3h1eZkMkXar0TQ1gf3U= github.com/containerd/containerd v1.2.10/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA= github.com/containerd/containerd v1.3.0-beta.2.0.20190828155532-0293cbd26c69/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA= github.com/containerd/containerd v1.3.0/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA= @@ -299,51 +321,71 @@ github.com/containerd/containerd v1.4.1/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMX github.com/containerd/containerd v1.4.3/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA= github.com/containerd/containerd v1.5.0-beta.1/go.mod h1:5HfvG1V2FsKesEGQ17k5/T7V960Tmcumvqn8Mc+pCYQ= github.com/containerd/containerd v1.5.0-beta.3/go.mod h1:/wr9AVtEM7x9c+n0+stptlo/uBBoBORwEx6ardVcmKU= -github.com/containerd/containerd v1.5.0-beta.4 h1:zjz4MOAOFgdBlwid2nNUlJ3YLpVi/97L36lfMYJex60= github.com/containerd/containerd v1.5.0-beta.4/go.mod h1:GmdgZd2zA2GYIBZ0w09ZvgqEq8EfBp/m3lcVZIvPHhI= +github.com/containerd/containerd v1.5.0-rc.0/go.mod h1:V/IXoMqNGgBlabz3tHD2TWDoTJseu1FGOKuoA4nNb2s= +github.com/containerd/containerd v1.5.1/go.mod h1:0DOxVqwDy2iZvrZp2JUx/E+hS0UNTVn7dJnIOwtYR4g= +github.com/containerd/containerd v1.5.7/go.mod h1:gyvv6+ugqY25TiXxcZC3L5yOeYgEw0QMhscqVp1AR9c= +github.com/containerd/containerd v1.6.8 h1:h4dOFDwzHmqFEP754PgfgTeVXFnLiRc6kiqC7tplDJs= +github.com/containerd/containerd v1.6.8/go.mod h1:By6p5KqPK0/7/CgO/A6t/Gz+CUYUu2zf1hUaaymVXB0= github.com/containerd/continuity v0.0.0-20190426062206-aaeac12a7ffc/go.mod h1:GL3xCUCBDV3CZiTSEKksMWbLE66hEyuu9qyDOOqM47Y= github.com/containerd/continuity v0.0.0-20190815185530-f2a389ac0a02/go.mod h1:GL3xCUCBDV3CZiTSEKksMWbLE66hEyuu9qyDOOqM47Y= github.com/containerd/continuity v0.0.0-20191127005431-f65d91d395eb/go.mod h1:GL3xCUCBDV3CZiTSEKksMWbLE66hEyuu9qyDOOqM47Y= github.com/containerd/continuity v0.0.0-20200710164510-efbc4488d8fe/go.mod h1:cECdGN1O8G9bgKTlLhuPJimka6Xb/Gg7vYzCTNVxhvo= github.com/containerd/continuity v0.0.0-20201208142359-180525291bb7/go.mod h1:kR3BEg7bDFaEddKm54WSmrol1fKWDU1nKYkgrcgZT7Y= -github.com/containerd/continuity v0.0.0-20210208174643-50096c924a4e h1:6JKvHHt396/qabvMhnhUZvWaHZzfVfldxE60TK8YLhg= github.com/containerd/continuity v0.0.0-20210208174643-50096c924a4e/go.mod h1:EXlVlkqNba9rJe3j7w3Xa924itAMLgZH4UD/Q4PExuQ= +github.com/containerd/continuity v0.1.0/go.mod h1:ICJu0PwR54nI0yPEnJ6jcS+J7CZAUXrLh8lPo2knzsM= +github.com/containerd/continuity v0.2.3-0.20220330195504-d132b287edc8 h1:yGFEcFNMhze29DxAAB33v/1OMRYF/cM9iwwgV2P0ZrE= github.com/containerd/fifo v0.0.0-20180307165137-3d5202aec260/go.mod h1:ODA38xgv3Kuk8dQz2ZQXpnv/UZZUHUCL7pnLehbXgQI= github.com/containerd/fifo v0.0.0-20190226154929-a9fb20d87448/go.mod h1:ODA38xgv3Kuk8dQz2ZQXpnv/UZZUHUCL7pnLehbXgQI= github.com/containerd/fifo v0.0.0-20200410184934-f15a3290365b/go.mod h1:jPQ2IAeZRCYxpS/Cm1495vGFww6ecHmMk1YJH2Q5ln0= github.com/containerd/fifo v0.0.0-20201026212402-0724c46b320c/go.mod h1:jPQ2IAeZRCYxpS/Cm1495vGFww6ecHmMk1YJH2Q5ln0= github.com/containerd/fifo v0.0.0-20210316144830-115abcc95a1d/go.mod h1:ocF/ME1SX5b1AOlWi9r677YJmCPSwwWnQ9O123vzpE4= +github.com/containerd/fifo v1.0.0/go.mod h1:ocF/ME1SX5b1AOlWi9r677YJmCPSwwWnQ9O123vzpE4= github.com/containerd/go-cni v1.0.1/go.mod h1:+vUpYxKvAF72G9i1WoDOiPGRtQpqsNW/ZHtSlv++smU= +github.com/containerd/go-cni v1.0.2/go.mod h1:nrNABBHzu0ZwCug9Ije8hL2xBCYh/pjfMb1aZGrrohk= github.com/containerd/go-runc v0.0.0-20180907222934-5a6d9f37cfa3/go.mod h1:IV7qH3hrUgRmyYrtgEeGWJfWbgcHL9CSRruz2Vqcph0= github.com/containerd/go-runc v0.0.0-20190911050354-e029b79d8cda/go.mod h1:IV7qH3hrUgRmyYrtgEeGWJfWbgcHL9CSRruz2Vqcph0= github.com/containerd/go-runc v0.0.0-20200220073739-7016d3ce2328/go.mod h1:PpyHrqVs8FTi9vpyHwPwiNEGaACDxT/N/pLcvMSRA9g= github.com/containerd/go-runc v0.0.0-20201020171139-16b287bc67d0/go.mod h1:cNU0ZbCgCQVZK4lgG3P+9tn9/PaJNmoDXPpoJhDR+Ok= +github.com/containerd/go-runc v1.0.0/go.mod h1:cNU0ZbCgCQVZK4lgG3P+9tn9/PaJNmoDXPpoJhDR+Ok= github.com/containerd/imgcrypt v1.0.1/go.mod h1:mdd8cEPW7TPgNG4FpuP3sGBiQ7Yi/zak9TYCG3juvb0= github.com/containerd/imgcrypt v1.0.4-0.20210301171431-0ae5c75f59ba/go.mod h1:6TNsg0ctmizkrOgXRNQjAPFWpMYRWuiB6dSF4Pfa5SA= github.com/containerd/imgcrypt v1.1.1-0.20210312161619-7ed62a527887/go.mod h1:5AZJNI6sLHJljKuI9IHnw1pWqo/F0nGDOuR9zgTs7ow= +github.com/containerd/imgcrypt v1.1.1/go.mod h1:xpLnwiQmEUJPvQoAapeb2SNCxz7Xr6PJrXQb0Dpc4ms= github.com/containerd/nri v0.0.0-20201007170849-eb1350a75164/go.mod h1:+2wGSDGFYfE5+So4M5syatU0N0f0LbWpuqyMi4/BE8c= github.com/containerd/nri v0.0.0-20210316161719-dbaa18c31c14/go.mod h1:lmxnXF6oMkbqs39FiCt1s0R2HSMhcLel9vNL3m4AaeY= +github.com/containerd/nri v0.1.0/go.mod h1:lmxnXF6oMkbqs39FiCt1s0R2HSMhcLel9vNL3m4AaeY= +github.com/containerd/stargz-snapshotter/estargz v0.4.1/go.mod h1:x7Q9dg9QYb4+ELgxmo4gBUeJB0tl5dqH1Sdz0nJU1QM= github.com/containerd/ttrpc v0.0.0-20190828154514-0e0f228740de/go.mod h1:PvCDdDGpgqzQIzDW1TphrGLssLDZp2GuS+X5DkEJB8o= github.com/containerd/ttrpc v0.0.0-20190828172938-92c8520ef9f8/go.mod h1:PvCDdDGpgqzQIzDW1TphrGLssLDZp2GuS+X5DkEJB8o= github.com/containerd/ttrpc v0.0.0-20191028202541-4f1b8fe65a5c/go.mod h1:LPm1u0xBw8r8NOKoOdNMeVHSawSsltak+Ihv+etqsE8= github.com/containerd/ttrpc v1.0.1/go.mod h1:UAxOpgT9ziI0gJrmKvgcZivgxOp8iFPSk8httJEt98Y= github.com/containerd/ttrpc v1.0.2/go.mod h1:UAxOpgT9ziI0gJrmKvgcZivgxOp8iFPSk8httJEt98Y= +github.com/containerd/ttrpc v1.1.0/go.mod h1:XX4ZTnoOId4HklF4edwc4DcqskFZuvXB1Evzy5KFQpQ= github.com/containerd/typeurl v0.0.0-20180627222232-a93fcdb778cd/go.mod h1:Cm3kwCdlkCfMSHURc+r6fwoGH6/F1hH3S4sg0rLFWPc= github.com/containerd/typeurl v0.0.0-20190911142611-5eb25027c9fd/go.mod h1:GeKYzf2pQcqv7tJ0AoCuuhtnqhva5LNU3U+OyKxxJpk= github.com/containerd/typeurl v1.0.1/go.mod h1:TB1hUtrpaiO88KEK56ijojHS1+NeF0izUACaJW2mdXg= +github.com/containerd/typeurl v1.0.2 h1:Chlt8zIieDbzQFzXzAeBEF92KhExuE4p9p92/QmY7aY= +github.com/containerd/typeurl v1.0.2/go.mod h1:9trJWW2sRlGub4wZJRTW83VtbOLS6hwcDZXTn6oPz9s= github.com/containerd/zfs v0.0.0-20200918131355-0a33824f23a2/go.mod h1:8IgZOBdv8fAgXddBT4dBXJPtxyRsejFIpXoklgxgEjw= github.com/containerd/zfs v0.0.0-20210301145711-11e8f1707f62/go.mod h1:A9zfAbMlQwE+/is6hi0Xw8ktpL+6glmqZYtevJgaB8Y= github.com/containerd/zfs v0.0.0-20210315114300-dde8f0fda960/go.mod h1:m+m51S1DvAP6r3FcmYCp54bQ34pyOwTieQDNRIRHsFY= +github.com/containerd/zfs v0.0.0-20210324211415-d5c4544f0433/go.mod h1:m+m51S1DvAP6r3FcmYCp54bQ34pyOwTieQDNRIRHsFY= +github.com/containerd/zfs v1.0.0/go.mod h1:m+m51S1DvAP6r3FcmYCp54bQ34pyOwTieQDNRIRHsFY= github.com/containernetworking/cni v0.7.1/go.mod h1:LGwApLUm2FpoOfxTDEeq8T9ipbpZ61X79hmU3w8FmsY= github.com/containernetworking/cni v0.8.0/go.mod h1:LGwApLUm2FpoOfxTDEeq8T9ipbpZ61X79hmU3w8FmsY= +github.com/containernetworking/cni v0.8.1/go.mod h1:LGwApLUm2FpoOfxTDEeq8T9ipbpZ61X79hmU3w8FmsY= github.com/containernetworking/plugins v0.8.6/go.mod h1:qnw5mN19D8fIwkqW7oHHYDHVlzhJpcY6TQxn/fUyDDM= +github.com/containernetworking/plugins v0.9.1/go.mod h1:xP/idU2ldlzN6m4p5LmGiwRDjeJr6FLK6vuiUwoH7P8= github.com/containers/ocicrypt v1.0.1/go.mod h1:MeJDzk1RJHv89LjsH0Sp5KTY3ZYkjXO/C+bKAeWFIrc= github.com/containers/ocicrypt v1.1.0/go.mod h1:b8AOe0YR67uU8OqfVNcznfFpAzu3rdgUV4GP9qXPfu4= +github.com/containers/ocicrypt v1.1.1/go.mod h1:Dm55fwWm1YZAjYRaJ94z2mfZikIyIN4B0oB3dj3jFxY= github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk= github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= github.com/coreos/etcd v3.3.13+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk= github.com/coreos/go-iptables v0.4.5/go.mod h1:/mVI274lEDI2ns62jHCDnCyBF9Iwsmekav8Dbxlm1MU= +github.com/coreos/go-iptables v0.5.0/go.mod h1:/mVI274lEDI2ns62jHCDnCyBF9Iwsmekav8Dbxlm1MU= github.com/coreos/go-oidc v2.1.0+incompatible/go.mod h1:CgnwVTmzoESiwO9qyAFEMiHoZ1nMCKZlZ9V6mm3/LKc= github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= @@ -357,17 +399,18 @@ github.com/coreos/go-systemd/v22 v22.3.1/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSV github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= -github.com/cpuguy83/go-md2man v1.0.10 h1:BSKMNlYxDvnunlTymqtgONjNnaRV1sTpcovwwjF22jk= github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE= github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= -github.com/cpuguy83/go-md2man/v2 v2.0.1 h1:r/myEWzV9lfsM1tFLgDyu0atFtJ1fXn261LKYj/3DxU= github.com/cpuguy83/go-md2man/v2 v2.0.1/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= +github.com/cpuguy83/go-md2man/v2 v2.0.2 h1:p1EgwI/C7NhT0JmVkwCD2ZBK8j4aeHQX2pMHHBfMQ6w= +github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/creack/pty v1.1.11 h1:07n33Z8lZxZ2qwegKbObQohDhXDQxiMMz1NOUGYlesw= github.com/creack/pty v1.1.11/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/cyphar/filepath-securejoin v0.2.2/go.mod h1:FpkQEhXnPnOthhzymB7CGsFk2G9VLXONKD9G7QGMM+4= +github.com/cyphar/filepath-securejoin v0.2.3/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxGGx79pTxQpKOJNYHHl4= github.com/d2g/dhcp4 v0.0.0-20170904100407-a1d1b6c41b1c/go.mod h1:Ct2BUK8SB0YC1SMSibvLzxjeJLnrYEVLULFNiHY9YfQ= github.com/d2g/dhcp4client v1.0.0/go.mod h1:j0hNfjhrt2SxUOw55nL0ATM/z4Yt3t2Kd1mW34z5W5s= github.com/d2g/dhcp4server v0.0.0-20181031114812-7d4a0a7f59a5/go.mod h1:Eo87+Kg/IX2hfWJfwxMzLyuSZyxSoAug2nGa1G2QAi8= @@ -395,13 +438,17 @@ github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8 github.com/dimchansky/utfbom v1.1.0/go.mod h1:rO41eb7gLfo8SF1jd9F8HplJm1Fewwi4mQvIirEdv+8= github.com/dimchansky/utfbom v1.1.1/go.mod h1:SxdoEBH5qIqFocHMyGOXVAybYJdr71b1Q/j0mACtrfE= github.com/dnaeon/go-vcr v1.0.1/go.mod h1:aBB1+wY4s93YsC3HHjMBMrwTj2R9FHDzUr9KyGc8n1E= +github.com/docker/cli v0.0.0-20191017083524-a8ff7f821017/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= github.com/docker/distribution v0.0.0-20190905152932-14b96e55d84c/go.mod h1:0+TTO4EOBfRPhZXAeF1Vu+W3hHZ8eLp8PgKVZlcvtFY= github.com/docker/distribution v2.7.1-0.20190205005809-0d3efadf0154+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= github.com/docker/distribution v2.7.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= github.com/docker/distribution v2.8.1+incompatible h1:Q50tZOPR6T/hjNsyc9g8/syEs6bk8XXApsHjKukMl68= github.com/docker/distribution v2.8.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= -github.com/docker/docker v20.10.7+incompatible h1:Z6O9Nhsjv+ayUEeI1IojKbYcsGdgYSNqxe1s2MYzUhQ= +github.com/docker/docker v1.4.2-0.20190924003213-a8608b5b67c7/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/docker v20.10.7+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= +github.com/docker/docker v20.10.17+incompatible h1:JYCuMrWaVNophQTOrMMoSwudOVEfcegoZZrleKc1xwE= +github.com/docker/docker v20.10.17+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= +github.com/docker/docker-credential-helpers v0.6.3/go.mod h1:WRaJzqw3CTB9bk10avuGsjVBZsD05qeibJ1/TYlvc0Y= github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ= github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec= github.com/docker/go-events v0.0.0-20170721190031-9461782956ad/go.mod h1:Uw6UezgYA44ePAFQYUehOuCzmy5zmg/+nl2ZfMWGkpA= @@ -433,6 +480,7 @@ github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.m github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= github.com/envoyproxy/go-control-plane v0.9.9-0.20210512163311-63b5d3c536b0/go.mod h1:hliV/p42l8fGbc6Y9bQ70uLwIvmJyVE5k4iMKlh8wCQ= github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go.mod h1:AFq3mo9L8Lqqiid3OhADV3RfLJnjiw63cSpi+fDTRC0= +github.com/envoyproxy/go-control-plane v0.10.2-0.20220325020618-49ff273808a1/go.mod h1:KJwIaB5Mv44NWtYuAOFCVOjcI94vtpEz2JU/D2v6IjE= github.com/envoyproxy/protoc-gen-validate v0.0.14/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/equinix-labs/otel-init-go v0.0.1 h1:v+XdagFMmmZHsOF6TLQArOt6CkuxiwXsIQnn3A/sCYQ= @@ -474,6 +522,8 @@ github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeME github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI= github.com/gin-gonic/gin v1.6.3/go.mod h1:75u5sXoLsGZoRN5Sgbi1eraJ4GU3++wFwWzhwvtwp4M= github.com/gliderlabs/ssh v0.2.2/go.mod h1:U7qILu1NlMHj9FlMhZLlkCdDnU1DBEAqr0aevW3Awn0= +github.com/go-chi/chi/v5 v5.0.7 h1:rDTPXLDHGATaeHvVlLcR4Qe0zftYethFucbjVQ1PxU8= +github.com/go-chi/chi/v5 v5.0.7/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8= github.com/go-critic/go-critic v0.5.6/go.mod h1:cVjj0DfqewQVIlIAGexPCaGaZDAqGE29PYDDADIVNEo= github.com/go-errors/errors v1.0.1 h1:LUHzmkK3GUKUrL/1gfBUxAHzcev3apQlezX/+O7ma6w= github.com/go-errors/errors v1.0.1/go.mod h1:f4zRHt4oKfwPJE5k8C9vpYG+aDHdBFUsgrm6/TyX73Q= @@ -498,25 +548,32 @@ github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7 github.com/go-logr/logr v0.2.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU= github.com/go-logr/logr v0.4.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU= github.com/go-logr/logr v1.2.0/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= +github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= github.com/go-logr/logr v1.2.3 h1:2DntVwHkVopvECVRSlL5PSo9eG+cAkDCuckLubN+rq0= github.com/go-logr/logr v1.2.3/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= +github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= +github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= github.com/go-logr/zapr v1.2.0 h1:n4JnPI1T3Qq1SFEi/F8rwLrZERp2bso19PJZDB9dayk= github.com/go-logr/zapr v1.2.0/go.mod h1:Qa4Bsj2Vb+FAVeAKsLD8RLQ+YRJB8YDmOAKxaBQf7Ro= github.com/go-ole/go-ole v1.2.4/go.mod h1:XCwSNxSkXRo4vlyPy93sltvi/qJq0jqQhjqQNIwKuxM= github.com/go-openapi/errors v0.19.2 h1:a2kIyV3w+OS3S97zxUndRVD46+FhGOUBDFY7nmu4CsY= github.com/go-openapi/errors v0.19.2/go.mod h1:qX0BLWsyaKfvhluLejVpVNwNRdXZhEbTA4kxxpKBC94= +github.com/go-openapi/jsonpointer v0.0.0-20160704185906-46af16f9f7b1/go.mod h1:+35s3my2LFTysnkMfxsJBAMHj/DoqoB9knIWoYG/Vk0= github.com/go-openapi/jsonpointer v0.19.2/go.mod h1:3akKfEdA7DF1sugOqz1dVQHBcuDBPKZGEoHC/NkiQRg= github.com/go-openapi/jsonpointer v0.19.3/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg= github.com/go-openapi/jsonpointer v0.19.5 h1:gZr+CIYByUqjcgeLXnQu2gHYQC9o73G2XUeOFYEICuY= github.com/go-openapi/jsonpointer v0.19.5/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg= +github.com/go-openapi/jsonreference v0.0.0-20160704190145-13c6e3589ad9/go.mod h1:W3Z9FmVs9qj+KR4zFKmDPGiLdk1D9Rlm7cyMvf57TTg= github.com/go-openapi/jsonreference v0.19.2/go.mod h1:jMjeRr2HHw6nAVajTXJ4eiUwohSTlpa0o73RUL1owJc= github.com/go-openapi/jsonreference v0.19.3/go.mod h1:rjx6GuL8TTa9VaixXglHmQmIL98+wF9xc8zWvFonSJ8= github.com/go-openapi/jsonreference v0.19.5 h1:1WJP/wi4OjB4iV8KVbH73rQaoialJrqv8gitZLxGLtM= github.com/go-openapi/jsonreference v0.19.5/go.mod h1:RdybgQwPxbL4UEjuAruzK1x3nE69AqPYEJeo/TWfEeg= +github.com/go-openapi/spec v0.0.0-20160808142527-6aced65f8501/go.mod h1:J8+jY1nAiCcj+friV/PDoE1/3eeccG9LYBs0tYvLOWc= github.com/go-openapi/spec v0.19.3/go.mod h1:FpwSN1ksY1eteniUU7X0N/BgJ7a4WvBFVA8Lj9mJglo= github.com/go-openapi/spec v0.19.5/go.mod h1:Hm2Jr4jv8G1ciIAo+frC/Ft+rR2kQDh8JHKHb3gWUSk= github.com/go-openapi/strfmt v0.19.3 h1:eRfyY5SkaNJCAwmmMcADjY31ow9+N7MCLW7oRkbsINA= github.com/go-openapi/strfmt v0.19.3/go.mod h1:0yX7dbo8mKIvc3XSKp7MNfxw4JytCfCD6+bY1AVL9LU= +github.com/go-openapi/swag v0.0.0-20160704191624-1d0bd113de87/go.mod h1:DXUve3Dpr1UfpPtxFw+EFuQ41HhCWZfha5jSVRG7C7I= github.com/go-openapi/swag v0.19.2/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk= github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk= github.com/go-openapi/swag v0.19.14/go.mod h1:QYRuS/SOXUCsnplDa677K7+DxSOj6IPNl/eQntq43wQ= @@ -551,7 +608,6 @@ github.com/go-xmlfmt/xmlfmt v0.0.0-20191208150333-d5b6f63a941b/go.mod h1:aUCEOzz github.com/gobuffalo/envy v1.7.0/go.mod h1:n7DRkBerg/aorDM8kbduw5dN3oXGswK5liaSCx4T5NI= github.com/gobuffalo/envy v1.7.1 h1:OQl5ys5MBea7OGCdvPbBJWRgnhC/fGona6QKfvFeau8= github.com/gobuffalo/envy v1.7.1/go.mod h1:FurDp9+EDPE4aIUS3ZLyD+7/9fpx7YRt/ukY6jIHf0w= -github.com/gobuffalo/flect v0.2.3/go.mod h1:vmkQwuZYhN5Pc4ljYQZzP+1sq+NEkK+lh20jmEmX3jc= github.com/gobuffalo/flect v0.2.4 h1:BSYA8+T60cdyq+vynaSUjqSVI9mDEg9ZfQUXKmfjo4I= github.com/gobuffalo/flect v0.2.4/go.mod h1:1ZyCLIbg0YD7sDkzvFdPoOydPtD8y9JQnrOROolUcM8= github.com/gobuffalo/logger v1.0.1 h1:ZEgyRGgAm4ZAhAO45YXMs5Fp+bzGLESFewzAVBMKuTg= @@ -569,12 +625,13 @@ github.com/godbus/dbus v0.0.0-20180201030542-885f9cc04c9c/go.mod h1:/YcGZj5zSblf github.com/godbus/dbus v0.0.0-20190422162347-ade71ed3457e/go.mod h1:bBOAhwG1umN6/6ZUMtDFBMQR8jRg9O75tm9K00oMsK4= github.com/godbus/dbus/v5 v5.0.3/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= +github.com/godbus/dbus/v5 v5.0.6/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= github.com/godror/godror v0.13.3/go.mod h1:2ouUT4kdhUBk7TAkHWD4SN0CdI0pgEQbo8FVHhbSKWg= github.com/gofrs/flock v0.8.0/go.mod h1:F1TvTiK9OcQqauNUHlbJvyl9Qa1QvF/gOUDKA14jxHU= github.com/gofrs/flock v0.8.1 h1:+gYjHKf32LDeiEEFhQaotPbLuUXjY5ZqxKgXy7n59aw= github.com/gofrs/flock v0.8.1/go.mod h1:F1TvTiK9OcQqauNUHlbJvyl9Qa1QvF/gOUDKA14jxHU= -github.com/gofrs/uuid v4.0.0+incompatible h1:1SD/1F5pU8p29ybwgQSwpQk+mwdRrXCYuPhW6m+TnJw= -github.com/gofrs/uuid v4.0.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= +github.com/gofrs/uuid v4.2.0+incompatible h1:yyYWMnhkhrKwwr8gAOcOCYxOOscHgDS9yZgBrnJfGa0= +github.com/gofrs/uuid v4.2.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= github.com/gogo/googleapis v1.1.0/go.mod h1:gf4bu3Q80BeJ6H1S1vYPm8/ELATdvryBaNFGgqEef3s= github.com/gogo/googleapis v1.2.0/go.mod h1:Njal3psf3qN6dwBtQfUmBZh2ybovJ0tlu3o/AC7HYjU= github.com/gogo/googleapis v1.4.0/go.mod h1:5YRNX2z1oM5gXdAkurHa942MDgEJyk02w4OecKY87+c= @@ -666,8 +723,11 @@ github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.6 h1:BKbKCqvP6I+rmFHt06ZmyQtvB8xAkWdhFyr0ZUNZcxQ= github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE= +github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= +github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= +github.com/google/go-containerregistry v0.5.1/go.mod h1:Ct15B4yir3PLOP5jsy0GNeYVaIZs/MK/Jz5any1wFW0= github.com/google/go-github v17.0.0+incompatible/go.mod h1:zLgOLi98H3fifZn+44m+umXrS52loVEgC2AApnigrVQ= github.com/google/go-github/v27 v27.0.6/go.mod h1:/0Gr8pJ55COkmv+S/yPKCczSkUPIM/LnFyubufRNIS0= github.com/google/go-github/v35 v35.3.0/go.mod h1:yWB7uCcVWaUbUP74Aq3whuMySRMatyRmq5U9FTNlbio= @@ -738,11 +798,11 @@ github.com/gorilla/handlers v0.0.0-20150720190736-60c7bfde3e33/go.mod h1:Qkdc/uu github.com/gorilla/mux v1.6.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= github.com/gorilla/mux v1.7.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= github.com/gorilla/mux v1.7.3/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= -github.com/gorilla/mux v1.8.0 h1:i40aqfkR1h2SlN9hojwV5ZA91wcXFOvkdNIeFDP5koI= github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So= github.com/gorilla/securecookie v1.1.1/go.mod h1:ra0sb63/xPlUeL+yeDciTfxMRAA+MP+HVt/4epWDjd4= github.com/gorilla/sessions v1.2.1/go.mod h1:dk2InVEVJ0sfLlnXv9EAgkf6ecYs/i80K/zI+bUmuGM= github.com/gorilla/websocket v0.0.0-20170926233335-4201258b820c/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= +github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= github.com/gorilla/websocket v1.4.1/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc= github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= @@ -774,8 +834,9 @@ github.com/hashicorp/consul/api v1.3.0/go.mod h1:MmDNSzIMUjNpY/mQ398R4bk2FnqQLoP github.com/hashicorp/consul/sdk v0.1.1/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8= github.com/hashicorp/consul/sdk v0.3.0/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8= github.com/hashicorp/errwrap v0.0.0-20141028054710-7554cd9344ce/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= -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/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I= +github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= github.com/hashicorp/go-hclog v0.9.2/go.mod h1:5CU+agLiy3J7N7QjHK5d05KxGsuXiQLrjA0H7acj2lQ= github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= @@ -825,8 +886,9 @@ github.com/imdario/mergo v0.3.12 h1:b6R2BslTbIEToALKP7LxUvijTsNI9TAe80pLWN2g/HU= github.com/imdario/mergo v0.3.12/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA= github.com/improbable-eng/grpc-web v0.12.0/go.mod h1:6hRR09jOEG81ADP5wCQju1z71g6OL4eEvELdran/3cs= github.com/inconshreveable/go-update v0.0.0-20160112193335-8152e7eb6ccf/go.mod h1:hyb9oH7vZsitZCiBt0ZvifOrB+qc8PS5IiilCIb87rg= -github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= +github.com/inconshreveable/mousetrap v1.0.1 h1:U3uMjPSQEBMNp1lFxmllqCPM6P5u/Xq7Pgzkat/bFNc= +github.com/inconshreveable/mousetrap v1.0.1/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= github.com/influxdata/influxdb1-client v0.0.0-20191209144304-8bf82d3c094d/go.mod h1:qj24IKcXYK6Iy9ceXlo3Tc+vtHo9lIhSX5JddghvEPo= github.com/influxdata/tdigest v0.0.0-20180711151920-a7d76c6f093a/go.mod h1:9GkyshztGufsdPQWjH+ifgnIr3xNUL5syI70g2dzU1o= github.com/influxdata/tdigest v0.0.0-20181121200506-bf2b5ad3c0a9/go.mod h1:Js0mqiSBE6Ffsg94weZZ2c+v/ciT8QRHFOap7EKDrR0= @@ -839,15 +901,23 @@ github.com/jcmturner/gofork v1.0.0/go.mod h1:MK8+TM0La+2rjBD4jE12Kj1pCCxK7d2LK/U github.com/jcmturner/goidentity/v6 v6.0.1/go.mod h1:X1YW3bgtvwAXju7V3LCIMpY0Gbxyjn/mY9zx4tFonSg= github.com/jcmturner/gokrb5/v8 v8.4.2/go.mod h1:sb+Xq/fTY5yktf/VxLsE3wlfPqQjp0aWNYyvBVK62bc= github.com/jcmturner/rpc/v2 v2.0.3/go.mod h1:VUJYCIDm3PVOEHw8sgt091/20OJjskO/YJki3ELg/Hc= +github.com/jdxcode/netrc v0.0.0-20210204082910-926c7f70242a h1:d4+I1YEKVmWZrgkt6jpXBnLgV2ZjO0YxEtLDdfIZfH4= +github.com/jdxcode/netrc v0.0.0-20210204082910-926c7f70242a/go.mod h1:Zi/ZFkEqFHTm7qkjyNJjaWH4LQA9LQhGJyF0lTYGpxw= github.com/jedib0t/go-pretty v4.3.0+incompatible h1:CGs8AVhEKg/n9YbUenWmNStRW2PHJzaeDodcfvRAbIo= github.com/jedib0t/go-pretty v4.3.0+incompatible/go.mod h1:XemHduiw8R651AF9Pt4FwCTKeG3oo7hrHJAoznj9nag= github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI= github.com/jessevdk/go-flags v1.5.0/go.mod h1:Fw0T6WPc1dYxT4mKEZRfG5kJhaTDP9pj1c2EWnYs/m4= github.com/jgautheron/goconst v1.5.1/go.mod h1:aAosetZ5zaeC/2EfMeRswtxUFBpe2Hr7HzkgX4fanO4= +github.com/jhump/gopoet v0.0.0-20190322174617-17282ff210b3/go.mod h1:me9yfT6IJSlOL3FCfrg+L6yzUEZ+5jW6WHt4Sk+UPUI= +github.com/jhump/gopoet v0.1.0/go.mod h1:me9yfT6IJSlOL3FCfrg+L6yzUEZ+5jW6WHt4Sk+UPUI= +github.com/jhump/goprotoc v0.5.0/go.mod h1:VrbvcYrQOrTi3i0Vf+m+oqQWk9l72mjkJCYo7UvLHRQ= +github.com/jhump/protocompile v0.0.0-20220812162104-d108583e055d h1:1BLWxsvcb5w9/vGjtyEo//r3dwEPNg7z73nbQ/XV4/s= +github.com/jhump/protocompile v0.0.0-20220812162104-d108583e055d/go.mod h1:qr2b5kx4HbFS7/g4uYO5qv9ei8303JMsC7ESbYiqr2Q= github.com/jhump/protoreflect v1.6.1/go.mod h1:RZQ/lnuN+zqeRVpQigTwO6o0AJUkxbnSnpuG7toUTG4= github.com/jhump/protoreflect v1.8.2/go.mod h1:7GcYQDdMU/O/BBrl/cX6PNHpXh6cenjd8pneu5yW7Tg= -github.com/jhump/protoreflect v1.9.1-0.20210817181203-db1a327a393e h1:Yb4fEGk+GtBSNuvy5rs0ZJt/jtopc/z9azQaj3xbies= -github.com/jhump/protoreflect v1.9.1-0.20210817181203-db1a327a393e/go.mod h1:7GcYQDdMU/O/BBrl/cX6PNHpXh6cenjd8pneu5yW7Tg= +github.com/jhump/protoreflect v1.11.0/go.mod h1:U7aMIjN0NWq9swDP7xDdoMfRHb35uiuTd3Z9nFXJf5E= +github.com/jhump/protoreflect v1.12.1-0.20220721211354-060cc04fc18b h1:izTof8BKh/nE1wrKOrloNA5q4odOarjf+Xpe+4qow98= +github.com/jhump/protoreflect v1.12.1-0.20220721211354-060cc04fc18b/go.mod h1:JytZfP5d0r8pVNLZvai7U/MCuTWITgrI4tTg7puQFKI= github.com/jingyugao/rowserrcheck v1.1.0/go.mod h1:TOQpc2SLx6huPfoFGK3UOnEG+u02D3C1GeosjupAKCA= github.com/jirfag/go-printf-func-name v0.0.0-20200119135958-7558a9eaa5af/go.mod h1:HEWGJkRDzjJY2sqdDwxccsGicWEf9BQOZsq2tV+xzM0= github.com/jmespath/go-jmespath v0.0.0-20160202185014-0b12d6b521d8/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= @@ -856,6 +926,7 @@ github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U= github.com/jmoiron/sqlx v1.2.0/go.mod h1:1FEQNm3xlJgrMD+FBdI9+xvCksHtbpVBBw5dYhBSsks= +github.com/joefitzgerald/rainbow-reporter v0.1.0/go.mod h1:481CNgqmVHQZzdIbN52CupLJyoVwB10FQ/IQlF1pdL8= github.com/joho/godotenv v1.3.0 h1:Zjp+RcGpHhGlrMbJzXTrZZPrWj+1vfm90La1wgB6Bhc= github.com/joho/godotenv v1.3.0/go.mod h1:7hK45KPybAkOC6peb+G5yklZfMxEjkZhHbwpqxOKXbg= github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo= @@ -884,7 +955,6 @@ github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8 github.com/julz/importas v0.0.0-20210419104244-841f0c0fe66d/go.mod h1:oSFU2R4XK/P7kNBrnL/FEQlDGN1/6WoxXEjSSXO0DV0= github.com/k0kubun/colorstring v0.0.0-20150214042306-9440f1994b88/go.mod h1:3w7q1U84EfirKl04SVQ/s7nPm1ZPhiXd34z40TNz36k= github.com/k0kubun/pp v3.0.1+incompatible/go.mod h1:GWse8YhT0p8pT4ir3ZgBbfZild3tgzSScAn6HmfYukg= -github.com/karrick/godirwalk v1.16.1/go.mod h1:j4mkqPuvaLI8mp1DroR3P6ad7cyYd4c1qeJ3RV7ULlk= github.com/karrick/godirwalk v1.17.0 h1:b4kY7nqDdioR/6qnbHQyDvmA17u5G1cZ6J+CZXwSWoI= github.com/karrick/godirwalk v1.17.0/go.mod h1:j4mkqPuvaLI8mp1DroR3P6ad7cyYd4c1qeJ3RV7ULlk= github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51/go.mod h1:CzGEWj7cYgsdH8dAjBGEr58BoE7ScuLd+fwFZ44+/x8= @@ -902,9 +972,11 @@ github.com/klauspost/compress v1.10.3/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYs github.com/klauspost/compress v1.10.7/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= github.com/klauspost/compress v1.11.0/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= github.com/klauspost/compress v1.11.3/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= +github.com/klauspost/compress v1.11.13/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= github.com/klauspost/compress v1.12.2/go.mod h1:8dP1Hq4DHOhN9w426knH3Rhby4rFm6D8eO+e+Dq5Gzg= -github.com/klauspost/compress v1.13.6 h1:P76CopJELS0TiO2mebmnzgWaajssP/EszplttgQxcgc= github.com/klauspost/compress v1.13.6/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk= +github.com/klauspost/compress v1.15.9 h1:wKRjX6JRtDdrE9qwa4b/Cip7ACOshUI4smpCQanqjSY= +github.com/klauspost/compress v1.15.9/go.mod h1:PhcZ0MbTNciWF3rruxRgKxI5NkcHHrHUDtV4Yw2GlzU= github.com/klauspost/pgzip v1.2.5 h1:qnWYvvKqedOF2ulHpMG72XQol4ILEJ8k2wwRl/Km8oE= github.com/klauspost/pgzip v1.2.5/go.mod h1:Ch1tH69qFZu15pkjo5kYi6mth2Zzwzt50oCQKQE9RUs= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= @@ -954,6 +1026,7 @@ github.com/lib/pq v1.10.1 h1:6VXZrLU0jHBYyAqrSPa+MgPfnSvTPuMgK+k0o5kVFWo= github.com/lib/pq v1.10.1/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= github.com/lightstep/lightstep-tracer-common/golang/gogo v0.0.0-20190605223551-bc2310a04743/go.mod h1:qklhhLq1aX+mtWk9cPHPzaBjWImj5ULL6C7HFJtXQMM= github.com/lightstep/lightstep-tracer-go v0.18.1/go.mod h1:jlF1pusYV4pidLvZ+XD0UBX0ZE6WURAspgAczcDHrL4= +github.com/linuxkit/virtsock v0.0.0-20201010232012-f8cee7dfc7a3/go.mod h1:3r6x7q95whyfWQpmGZTu3gk3v2YkMi05HEzl7Tf7YEo= github.com/logrusorgru/aurora v0.0.0-20181002194514-a7b3b318ed4e/go.mod h1:7rIyQOR62GCctdiQpZ/zOJlFyk6y+94wXzv6RNZgaR4= github.com/lunixbochs/vtclean v0.0.0-20180621232353-2d01aacdc34a/go.mod h1:pHhQNgMf3btfWnGBVipUOjRYhoOsdGqdm/+2c2E2WMI= github.com/lunixbochs/vtclean v1.0.0/go.mod h1:pHhQNgMf3btfWnGBVipUOjRYhoOsdGqdm/+2c2E2WMI= @@ -963,6 +1036,7 @@ github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czP github.com/magiconair/properties v1.8.4/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60= github.com/magiconair/properties v1.8.5 h1:b6kJs+EmPFMYGkow9GiUyCyOvIwYetYJ3fSaWak/Gls= github.com/magiconair/properties v1.8.5/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60= +github.com/mailru/easyjson v0.0.0-20160728113105-d5b7844b561a/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= github.com/mailru/easyjson v0.7.0/go.mod h1:KAzv3t3aY1NaHWoQz1+4F1ccyAH66Jk7yos7ldAVICs= @@ -1003,6 +1077,7 @@ github.com/mattn/go-runewidth v0.0.7/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m github.com/mattn/go-runewidth v0.0.9 h1:Lm995f3rfxdpd6TSmuVCHVb/QhupuXlYr8sCI/QdE+0= github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI= github.com/mattn/go-shellwords v1.0.3/go.mod h1:3xCvwCdWdlDJUrvuMn7Wuy9eWs4pE8vqg+NOMyg4B2o= +github.com/mattn/go-shellwords v1.0.6/go.mod h1:3xCvwCdWdlDJUrvuMn7Wuy9eWs4pE8vqg+NOMyg4B2o= github.com/mattn/go-sqlite3 v1.9.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc= github.com/mattn/go-sqlite3 v1.12.0 h1:u/x3mp++qUxvYfulZ4HKOvVO0JWhk7HtE8lWhbGz/Do= github.com/mattn/go-sqlite3 v1.12.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc= @@ -1012,6 +1087,7 @@ github.com/mattn/goveralls v0.0.2/go.mod h1:8d1ZMHsd7fW6IRPKQh46F2WRpyib5/X4FOpe github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 h1:I0XW9+e1XWDxdcEniV4rQAIOPUGDq67JSCiRCgGCZLI= github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4= +github.com/maxbrunsfeld/counterfeiter/v6 v6.2.2/go.mod h1:eD9eIE7cdwcMi9rYluz88Jz2VyhSmden33/aXg4oVIY= github.com/mbilski/exhaustivestruct v1.2.0/go.mod h1:OeTBVxQWoEmB2J2JCHmXWPJ0aksxSUOUy+nvtVEfzXc= github.com/mgechev/dots v0.0.0-20190921121421-c36f7dcfbb81/go.mod h1:KQ7+USdGKfpPjXk4Ga+5XxQM4Lm4e3gAogrreFAYpOg= github.com/mgechev/revive v1.0.7/go.mod h1:vuE5ox/4L/HDd63MCcCk3H6wTLQ6XXezRphJ8cJJOxY= @@ -1039,18 +1115,24 @@ github.com/mitchellh/mapstructure v1.4.1/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RR github.com/mitchellh/osext v0.0.0-20151018003038-5e2d6d41470f/go.mod h1:OkQIRizQZAeMln+1tSwduZz7+Af5oFlKirV/MSYes2A= github.com/mitchellh/reflectwalk v1.0.0/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= github.com/mitchellh/reflectwalk v1.0.1/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= +github.com/moby/buildkit v0.10.3 h1:/dGykD8FW+H4p++q5+KqKEo6gAkYKyBQHdawdjVwVAU= +github.com/moby/buildkit v0.10.3/go.mod h1:jxeOuly98l9gWHai0Ojrbnczrk/rf+o9/JqNhY+UCSo= +github.com/moby/locker v1.0.1/go.mod h1:S7SDdo5zpBK84bzzVlKr2V0hz+7x9hWbYC/kq7oQppc= github.com/moby/spdystream v0.2.0/go.mod h1:f7i0iNDQJ059oMTcWxx8MA/zKFIuD/lY+0GqbN2Wy8c= -github.com/moby/sys/mount v0.2.0 h1:WhCW5B355jtxndN5ovugJlMFJawbUODuW8fSnEH6SSM= github.com/moby/sys/mount v0.2.0/go.mod h1:aAivFE2LB3W4bACsUXChRHQ0qKWsetY4Y9V7sxOougM= +github.com/moby/sys/mount v0.3.0 h1:bXZYMmq7DBQPwHRxH/MG+u9+XF90ZOwoXpHTOznMGp0= +github.com/moby/sys/mount v0.3.0/go.mod h1:U2Z3ur2rXPFrFmy4q6WMwWrBOAQGYtYTRVM8BIvzbwk= github.com/moby/sys/mountinfo v0.4.0/go.mod h1:rEr8tzG/lsIZHBtN/JjGG+LMYx9eXgW2JI+6q0qou+A= -github.com/moby/sys/mountinfo v0.4.1 h1:1O+1cHA1aujwEwwVMa2Xm2l+gIpUHyd3+D+d7LZh1kM= github.com/moby/sys/mountinfo v0.4.1/go.mod h1:rEr8tzG/lsIZHBtN/JjGG+LMYx9eXgW2JI+6q0qou+A= +github.com/moby/sys/mountinfo v0.5.0/go.mod h1:3bMD3Rg+zkqx8MRYPi7Pyb0Ie97QEBmdxbhnCLlSvSU= +github.com/moby/sys/mountinfo v0.6.0 h1:gUDhXQx58YNrpHlK4nSL+7y2pxFZkUcXqzFDKWdC0Oo= +github.com/moby/sys/mountinfo v0.6.0/go.mod h1:3bMD3Rg+zkqx8MRYPi7Pyb0Ie97QEBmdxbhnCLlSvSU= github.com/moby/sys/symlink v0.1.0/go.mod h1:GGDODQmbFOjFsXvfLVn3+ZRxkch54RkSiGqsZeMYowQ= github.com/moby/term v0.0.0-20200312100748-672ec06f55cd/go.mod h1:DdlQx2hp0Ss5/fLikoLlEeIYiATotOjgB//nb973jeo= github.com/moby/term v0.0.0-20201216013528-df9cb8a40635/go.mod h1:FBS0z0QWA44HXygs7VXDUOGoN/1TV3RuWkLO04am3wc= github.com/moby/term v0.0.0-20210610120745-9d4ed1856297/go.mod h1:vgPCkQMyxTZ7IDy8SXRufE172gr8+K/JE/7hHFxHW3A= -github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6 h1:dcztxKSvZ4Id8iPpHERQBbIJfabdt4wUm5qy3wOL2Zc= -github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6/go.mod h1:E2VnQOmVuvZB6UYnnDB0qG5Nq/1tD9acaOpo6xmt0Kw= +github.com/moby/term v0.0.0-20220808134915-39b0c02b01ae h1:O4SWKdcHVCvYqyDV+9CJA1fcDN2L11Bule0iFy3YlAI= +github.com/moby/term v0.0.0-20220808134915-39b0c02b01ae/go.mod h1:E2VnQOmVuvZB6UYnnDB0qG5Nq/1tD9acaOpo6xmt0Kw= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= @@ -1062,8 +1144,9 @@ github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826/go.mod h1:TaXosZuwd github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 h1:n6/2gBQ3RWajuToeY6ZtZTIKv2v7ThUy5KKusIT0yc0= github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00/go.mod h1:Pm3mSP3c5uWn86xMLZ5Sa7JB9GsEZySvHYXCTK4E9q4= github.com/moricho/tparallel v0.2.1/go.mod h1:fXEIZxG2vdfl0ZF8b42f5a78EhjjD5mX8qUplsoSU4k= -github.com/morikuni/aec v0.0.0-20170113033406-39771216ff4c h1:nXxl5PrvVm2L/wCy8dQu6DMTwH4oIuGN8GJDAlqDdVE= github.com/morikuni/aec v0.0.0-20170113033406-39771216ff4c/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc= +github.com/morikuni/aec v1.0.0 h1:nP9CBfwrvYnBRgY6qfDQkygYDmYwOilePFkwzv4dU8A= +github.com/morikuni/aec v1.0.0/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc= github.com/mozilla/scribe v0.0.0-20180711195314-fb71baf557c1/go.mod h1:FIczTrinKo8VaLxe6PWTPEXRXDIHz2QAwiaBaP5/4a8= github.com/mozilla/tls-observatory v0.0.0-20210209181001-cf43108d6880/go.mod h1:FUqVoUPHSEdDR0MnFM3Dh8AU0pZHLXUD127SAJGER/s= github.com/mrunalp/fileutils v0.5.0/go.mod h1:M1WthSahJixYnrXQl/DFQuteStB1weuxD2QJNHXfbSQ= @@ -1105,9 +1188,11 @@ github.com/onsi/ginkgo v0.0.0-20151202141238-7f8ab55aaf3b/go.mod h1:lLunBs/Ym6LB github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= +github.com/onsi/ginkgo v1.8.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.10.1/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.10.3/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.11.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= +github.com/onsi/ginkgo v1.12.0/go.mod h1:oUhWkIvk5aDxtKvDDuw8gItl8pKl42LzjC9KZE0HfGg= github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk= github.com/onsi/ginkgo v1.14.0/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY= github.com/onsi/ginkgo v1.16.1/go.mod h1:CObGmKUOKaSC0RjmoAK7tKyn4Azo5P2IWuoMnvwxz1E= @@ -1123,7 +1208,9 @@ github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1Cpa github.com/onsi/gomega v1.5.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= +github.com/onsi/gomega v1.9.0/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoTdcA= github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= +github.com/onsi/gomega v1.10.3/go.mod h1:V9xEwhxec5O8UDM77eCW8vLymOMltsqPVYWrpDsH8xc= github.com/onsi/gomega v1.11.0/go.mod h1:azGKhqFUon9Vuj0YmTfLSmx0FUwqXYSTl5re8lQLTUg= github.com/onsi/gomega v1.16.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY= github.com/onsi/gomega v1.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY= @@ -1138,22 +1225,27 @@ github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8 github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM= github.com/opencontainers/image-spec v1.0.0/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0= github.com/opencontainers/image-spec v1.0.1/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0= -github.com/opencontainers/image-spec v1.0.2 h1:9yCKha/T5XdGtO0q9Q9a6T5NUCsTn/DrBg0D7ufOcFM= -github.com/opencontainers/image-spec v1.0.2/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0= +github.com/opencontainers/image-spec v1.0.3-0.20211202183452-c5a74bcca799 h1:rc3tiVYb5z54aKaDfakKn0dDjIyPpTtszkjuMzyt7ec= +github.com/opencontainers/image-spec v1.0.3-0.20211202183452-c5a74bcca799/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0= github.com/opencontainers/runc v0.0.0-20190115041553-12f6a991201f/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U= github.com/opencontainers/runc v0.1.1/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U= github.com/opencontainers/runc v1.0.0-rc8.0.20190926000215-3e425f80a8c9/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U= github.com/opencontainers/runc v1.0.0-rc9/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U= -github.com/opencontainers/runc v1.0.0-rc93 h1:x2UMpOOVf3kQ8arv/EsDGwim8PTNqzL1/EYDr/+scOM= github.com/opencontainers/runc v1.0.0-rc93/go.mod h1:3NOsor4w32B2tC0Zbl8Knk4Wg84SM2ImC1fxBuqJ/H0= +github.com/opencontainers/runc v1.0.2/go.mod h1:aTaHFFwQXuA71CiyxOdFFIorAoemI04suvGRQFzWTD0= +github.com/opencontainers/runc v1.1.2 h1:2VSZwLx5k/BfsBxMMipG/LYUnmqOD/BPkIVgQUcTlLw= +github.com/opencontainers/runc v1.1.2/go.mod h1:Tj1hFw6eFWp/o33uxGf5yF2BX5yz2Z6iptFpuvbbKqc= github.com/opencontainers/runtime-spec v0.1.2-0.20190507144316-5b71a03e2700/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= github.com/opencontainers/runtime-spec v1.0.1/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= github.com/opencontainers/runtime-spec v1.0.2-0.20190207185410-29686dbc5559/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= github.com/opencontainers/runtime-spec v1.0.2/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= github.com/opencontainers/runtime-spec v1.0.3-0.20200929063507-e6143ca7d51d/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= +github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= github.com/opencontainers/runtime-tools v0.0.0-20181011054405-1d69bd0f9c39/go.mod h1:r3f7wjNzSs2extwzU3Y+6pKfobzPh+kKFJ3ofN+3nfs= github.com/opencontainers/selinux v1.6.0/go.mod h1:VVGKuOLlE7v4PJyT6h7mNWvq1rzqiriPsEqVhc+svHE= github.com/opencontainers/selinux v1.8.0/go.mod h1:RScLhm78qiWa2gbVCcGkC7tCGdgk3ogry1nUQF8Evvo= +github.com/opencontainers/selinux v1.8.2/go.mod h1:MUIHuUEvKB1wtJjQdOyYRgOnLD2xAPP8dBsCoU0KuF8= +github.com/opencontainers/selinux v1.10.0/go.mod h1:2i0OySw99QjzBBQByd1Gr9gSjvuho1lHsJxIJ3gGbJI= github.com/opentracing-contrib/go-observer v0.0.0-20170622124052-a52f23424492/go.mod h1:Ngi6UdF0k5OKD5t5wlmGhe/EDKPoUM3BXZSSfIuJbis= github.com/opentracing/basictracer-go v1.0.0/go.mod h1:QfBfYuafItcjQuMwinw9GhYKwFXS9KnPs5lxoYwgW74= github.com/opentracing/opentracing-go v1.0.2/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= @@ -1170,8 +1262,9 @@ github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FI github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k= github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= github.com/pelletier/go-toml v1.8.1/go.mod h1:T2/BmBdy8dvIRq1a/8aqjN41wvWlN4lrapLU/GW4pbc= -github.com/pelletier/go-toml v1.9.3 h1:zeC5b1GviRUyKYd6OJPvBU/mcVDVoL1OhT17FCt5dSQ= github.com/pelletier/go-toml v1.9.3/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= +github.com/pelletier/go-toml v1.9.4 h1:tjENF6MfZAg8e4ZmZTeWaWiT2vXtsoO6+iuOjFhECwM= +github.com/pelletier/go-toml v1.9.4/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= github.com/performancecopilot/speed v3.0.0+incompatible/go.mod h1:/CLtqpZ5gBg1M9iaPbIdPPGyKcA8hKdoy6hAWba7Yac= github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU= github.com/phayes/checkstyle v0.0.0-20170904204023-bfd46e6a821d/go.mod h1:3OzsM7FXDQlpCiw2j81fOmAwQLnZnLGXVKUzeKQXIAw= @@ -1179,6 +1272,8 @@ github.com/phayes/freeport v0.0.0-20180830031419-95f893ade6f2/go.mod h1:iIss55rK github.com/pierrec/lz4 v1.0.2-0.20190131084431-473cd7ce01a1/go.mod h1:3/3N9NVKO0jef7pBehbT1qWhCMrIgbYNnFAZCqQ5LRc= github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= github.com/pierrec/lz4 v2.6.1+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= +github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8 h1:KoWmjvw+nsYOo29YJK9vDA65RGE3NrOnUtO7a+RF9HU= +github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8/go.mod h1:HKlIX3XHQyzLZPlr7++PzdhaXEj94dEiJgZDTsxEqUI= github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.8.1-0.20171018195549-f15c970de5b7/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= @@ -1204,8 +1299,9 @@ github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5Fsn github.com/prometheus/client_golang v1.1.0/go.mod h1:I1FGZT9+L76gKKOs5djB6ezCbFQP1xR9D75/vuwEF3g= github.com/prometheus/client_golang v1.3.0/go.mod h1:hJaj2vgQTGQmVCsAACORcieXFeDPbaTKGT+JTgUa3og= github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= -github.com/prometheus/client_golang v1.11.0 h1:HNkLOAEQMIDv/K+04rukrLx6ch7msSRwf3/SASFAGtQ= github.com/prometheus/client_golang v1.11.0/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= +github.com/prometheus/client_golang v1.12.1 h1:ZiaPsmm9uiBeaSMRznKsCDNtPCS0T3JVDGF+06gjBzk= +github.com/prometheus/client_golang v1.12.1/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY= github.com/prometheus/client_model v0.0.0-20171117100541-99fa1f4be8e5/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190115171406-56726106282f/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= @@ -1237,8 +1333,9 @@ github.com/prometheus/procfs v0.0.5/go.mod h1:4A/X28fw3Fc593LaREMrKMqOKvUAntwMDa github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A= github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= github.com/prometheus/procfs v0.2.0/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= -github.com/prometheus/procfs v0.6.0 h1:mxy4L2jP6qMonqmq+aTtOx1ifVWUgG/TAmntgbh3xv4= github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= +github.com/prometheus/procfs v0.7.3 h1:4jVXhlkAyzOScmCkXBTOLRLTz8EeU+eyjrwB/EPq0VU= +github.com/prometheus/procfs v0.7.3/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= github.com/prometheus/statsd_exporter v0.21.0/go.mod h1:rbT83sZq2V+p73lHhPZfMc3MLCHmSHelCh9hSGYNLTQ= github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU= github.com/pseudomuto/protoc-gen-doc v1.3.2/go.mod h1:y5+P6n3iGrbKG+9O04V5ld71in3v/bX88wUwgt+U8EA= @@ -1268,9 +1365,10 @@ github.com/rogpeppe/go-internal v1.6.2/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTE github.com/rollbar/rollbar-go v1.0.2 h1:uA3+z0jq6ka9WUUt9VX/xuiQZXZyWRoeKvkhVvLO9Jc= github.com/rollbar/rollbar-go v1.0.2/go.mod h1:AcFs5f0I+c71bpHlXNNDbOWJiKwjFDtISeXco0L5PKQ= github.com/rs/cors v1.7.0/go.mod h1:gFx+x8UowdsKA9AchylcLynDq+nNFfI8FkUZdN/jGCU= +github.com/rs/cors v1.8.2 h1:KCooALfAYGs415Cwu5ABvv9n9509fSiG5SQJn/AQo4U= +github.com/rs/cors v1.8.2/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU= github.com/rubenv/sql-migrate v0.0.0-20200616145509-8d140a17f351 h1:HXr/qUllAWv9riaI4zh2eXWKmCSDqVS/XH1MRHLKRwk= github.com/rubenv/sql-migrate v0.0.0-20200616145509-8d140a17f351/go.mod h1:DCgfY80j8GYL7MLEfvcpSFvjD0L5yZq/aZUJmhZklyg= -github.com/russross/blackfriday v1.5.2 h1:HyvC0ARfnZBqnXwABFeSZHpKvJHJJfPz81GNueLj0oo= github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g= github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk= @@ -1283,8 +1381,10 @@ github.com/samuel/go-zookeeper v0.0.0-20190923202752-2cc03de413da/go.mod h1:gi+0 github.com/sanposhiho/wastedassign/v2 v2.0.6/go.mod h1:KyZ0MWTwxxBmfwn33zh3k1dmsbF2ud9pAAGfoLfjhtI= github.com/sassoftware/go-rpmutils v0.0.0-20190420191620-a8f1baeba37b/go.mod h1:am+Fp8Bt506lA3Rk3QCmSqmYmLMnPDhdDUcosQCAx+I= github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0= +github.com/sclevine/spec v1.2.0/go.mod h1:W4J29eT/Kzv7/b9IWLB055Z+qvVC9vt0Arko24q7p+U= github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= github.com/seccomp/libseccomp-golang v0.9.1/go.mod h1:GbW5+tmTXfcxTToHLXlScSlAvWlF4P2Ca7zGrPiEpWo= +github.com/seccomp/libseccomp-golang v0.9.2-0.20210429002308-3879420cc921/go.mod h1:JA8cRccbGaA1s33RQf7Y1+q9gHmZX1yB/z9WDN1C6fg= github.com/securego/gosec/v2 v2.8.0/go.mod h1:hJZ6NT5TqoY+jmOsaxAV4cXoEdrMRLVaNPnSpUCvCZs= github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo= github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM= @@ -1302,8 +1402,9 @@ github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMB github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88= github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= -github.com/sirupsen/logrus v1.8.1 h1:dJKuHgqk1NNQlqoA6BTlM1Wf9DOH3NBjQyu0h9+AZZE= github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= +github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0= +github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= github.com/smartystreets/assertions v1.0.0 h1:UVQPSSmc3qtTi+zPPkCXvZX9VvW/xT/NsRvKfwY81a8= github.com/smartystreets/assertions v1.0.0/go.mod h1:kHHU4qYBaI3q23Pp3VPrmWhuIUrLW/7eUrw0BU5VaoM= @@ -1329,11 +1430,13 @@ github.com/spf13/cast v1.3.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkU github.com/spf13/cobra v0.0.2-0.20171109065643-2da4a54c5cee/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ= github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ= github.com/spf13/cobra v0.0.5/go.mod h1:3K3wKZymM7VvHMDS9+Akkh4K60UwM26emMESw8tLCHU= +github.com/spf13/cobra v1.0.0/go.mod h1:/6GTrnGXV9HjY+aR4k0oJ5tcvakLuG6EuKReYlHNrgE= github.com/spf13/cobra v1.1.1/go.mod h1:WnodtKOvamDL/PwE2M4iKs8aMDBZ5Q5klgD3qfVJQMI= github.com/spf13/cobra v1.1.3/go.mod h1:pGADOWyqRD/YMrPZigI/zbliZ2wVD/23d+is3pSWzOo= github.com/spf13/cobra v1.2.1/go.mod h1:ExllRjgxM/piMAM+3tAZvg8fsklGAf3tPfi+i8t68Nk= -github.com/spf13/cobra v1.4.0 h1:y+wJpx64xcgO1V+RcnwW0LEHxTKRi2ZDPSBjWnrg88Q= github.com/spf13/cobra v1.4.0/go.mod h1:Wo4iy3BUC+X2Fybo0PDqwJIv3dNRiZLHQymsfxlB84g= +github.com/spf13/cobra v1.5.0 h1:X+jTBEBqF0bHN+9cSMgmfuvv2VHJ9ezmFNf9Y/XstYU= +github.com/spf13/cobra v1.5.0/go.mod h1:dWXEIy2H428czQCjInthrTRUg7yKbok+2Qi/yBIJoUM= github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo= github.com/spf13/jwalterweatherman v1.1.0 h1:ue6voC5bR5F8YxI5S67j9i582FU4Qvo2bmqnqMYADFk= github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo= @@ -1344,6 +1447,7 @@ github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnIn github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s= +github.com/spf13/viper v1.4.0/go.mod h1:PTJ7Z/lr49W6bUbkmS1V3by4uWynFiR9p7+dSq/yZzE= github.com/spf13/viper v1.7.0/go.mod h1:8WkrPz2fc9jxqZNCJI/76HCieCp4Q8HaLFoCha5qpdg= github.com/spf13/viper v1.7.1/go.mod h1:8WkrPz2fc9jxqZNCJI/76HCieCp4Q8HaLFoCha5qpdg= github.com/spf13/viper v1.8.1 h1:Kq1fyeebqsBfbjZj4EL7gj2IO0mMaiyjYUWcUsl2O44= @@ -1358,8 +1462,9 @@ github.com/streadway/quantile v0.0.0-20150917103942-b0c588724d25/go.mod h1:lbP8t github.com/stretchr/objx v0.0.0-20180129172003-8a3f7159479f/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/objx v0.2.0 h1:Hbg2NidpLE8veEBkEZTL3CvlkUIVzuU9jDplZO54c48= github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE= +github.com/stretchr/objx v0.4.0 h1:M2gUjqZET1qApGOWNSnZ49BAIMX4F/1plDv3+l31EJ4= +github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= github.com/stretchr/testify v0.0.0-20170130113145-4d4bfba8f1d1/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v0.0.0-20180303142811-b89eecf5ca5d/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.1.4/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= @@ -1368,8 +1473,10 @@ github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UV github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk= +github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/subosito/gotenv v1.2.0 h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s= github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= github.com/syndtr/gocapability v0.0.0-20170704070218-db04d3cc01c8/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww= @@ -1402,6 +1509,7 @@ github.com/tomasen/realip v0.0.0-20180522021738-f0c99a92ddce/go.mod h1:o8v6yHRoi github.com/tommy-muehle/go-mnd/v2 v2.4.0/go.mod h1:WsUAkMJMYww6l/ufffCD3m+P7LEvr8TnZn9lwVDlgzw= github.com/tsenart/go-tsz v0.0.0-20180814232043-cdeb9e1e981e/go.mod h1:SWZznP1z5Ki7hDT2ioqiFKEse8K9tU2OUvaRI0NeGQo= github.com/tsenart/vegeta/v12 v12.8.4/go.mod h1:ZiJtwLn/9M4fTPdMY7bdbIeyNeFVE8/AHbWFqCsUuho= +github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc= github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVMw= github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0= github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY= @@ -1423,8 +1531,10 @@ github.com/valyala/tcplisten v0.0.0-20161114210144-ceec8f93295a/go.mod h1:v3UYOV github.com/viki-org/dnscache v0.0.0-20130720023526-c70c1f23c5d8/go.mod h1:dniwbG03GafCjFohMDmz6Zc6oCuiqgH6tGNyXTkHzXE= github.com/vishvananda/netlink v0.0.0-20181108222139-023a6dafdcdf/go.mod h1:+SR5DhBJrl6ZM7CoCKvpw5BKroDKQ+PJqOg65H/2ktk= github.com/vishvananda/netlink v1.1.0/go.mod h1:cTgwzPIzzgDAYoQrMm0EdrjRUBkTqKYppBueQtXaqoE= +github.com/vishvananda/netlink v1.1.1-0.20201029203352-d40f9887b852/go.mod h1:twkDnbuQxJYemMlGd4JFIcuhgX83tXhKS2B/PRMpOho= github.com/vishvananda/netns v0.0.0-20180720170159-13995c7128cc/go.mod h1:ZjcWmFBXmLKZu9Nxj3WKYEafiSqer2rnvPr0en9UNpI= github.com/vishvananda/netns v0.0.0-20191106174202-0a2b9b5464df/go.mod h1:JP3t17pCcGlemwknint6hfoeCVQrEMVwxRLRjXpq+BU= +github.com/vishvananda/netns v0.0.0-20200728191858-db3c7e526aae/go.mod h1:DD4vA1DwXk04H54A1oHXtwZmA0grkVMdPxx/VGLCah0= github.com/willf/bitset v1.1.11-0.20200630133818-d5bec3311243/go.mod h1:RjeCKbqT1RxIR/KWY6phxZiaY1IyutSBfGjNPySAYV4= github.com/willf/bitset v1.1.11/go.mod h1:83CECat5yLh5zVOf4P1ErAgKA5UDvKtgyUABdr3+MjI= github.com/xanzy/go-gitlab v0.50.0/go.mod h1:Q+hQhV508bDPoBijv7YjK/Lvlb4PhVhJdKqXVQrUoAE= @@ -1490,36 +1600,41 @@ go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= go.opentelemetry.io/contrib v0.20.0/go.mod h1:G/EtFaa6qaN7+LxqfIAT3GiZa7Wv5DTBUzl5H4LY0Kc= -go.opentelemetry.io/contrib v0.22.0 h1:0F7gDEjgb1WGn4ODIjaCAg75hmqF+UN0LiVgwxsCodc= -go.opentelemetry.io/contrib v0.22.0/go.mod h1:EH4yDYeNoaTqn/8yCWQmfNB78VHfGX2Jt2bvnvzBlGM= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.20.0/go.mod h1:oVGt1LRbBOBq1A5BQLlUg9UaU/54aiHw8cgjV3aWZ/E= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.22.0 h1:TjqELdtCtlOJQrTnXd2y+RP6wXKZUnnJer0HR0CSo18= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.22.0/go.mod h1:KjqwX4uJNaj479ZjFpADOMJKOM4rBXq4kN7nbeuGKrY= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.34.0 h1:PNEMW4EvpNQ7SuoPFNkvbZqi1STkTPKq+8vfoMl/6AE= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.34.0/go.mod h1:fk1+icoN47ytLSgkoWHLJrtVTSQ+HgmkNgPTKrk/Nsc= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.20.0/go.mod h1:2AboqHi0CiIZU0qwhtUfCYD1GeUzvvIXWNkhDt7ZMG4= go.opentelemetry.io/otel v0.20.0/go.mod h1:Y3ugLH2oa81t5QO+Lty+zXf8zC9L26ax4Nzoxm/dooo= -go.opentelemetry.io/otel v1.0.0-RC2 h1:SHhxSjB+omnGZPgGlKe+QMp3MyazcOHdQ8qwo89oKbg= go.opentelemetry.io/otel v1.0.0-RC2/go.mod h1:w1thVQ7qbAy8MHb0IFj8a5Q2QU0l2ksf8u/CN8m3NOM= -go.opentelemetry.io/otel/exporters/otlp v0.20.0 h1:PTNgq9MRmQqqJY0REVbZFvwkYOA85vbdQU/nVfxDyqg= +go.opentelemetry.io/otel v1.4.1/go.mod h1:StM6F/0fSwpd8dKWDCdRr7uRvEPYdW0hBSlbdTiUde4= +go.opentelemetry.io/otel v1.9.0 h1:8WZNQFIB2a71LnANS9JeyidJKKGOOremcUtb/OtHISw= +go.opentelemetry.io/otel v1.9.0/go.mod h1:np4EoPGzoPs3O67xUVNoPPcmSvsfOxNlNA4F4AC+0Eo= go.opentelemetry.io/otel/exporters/otlp v0.20.0/go.mod h1:YIieizyaN77rtLJra0buKiNBOm9XQfkPEKBeuhoMwAM= -go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.0.0-RC2 h1:Z/91DSYkOqnVuECrd+hxCU9lzeo5Fihjp28uq0Izfpw= +go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.4.1 h1:imIM3vRDMyZK1ypQlQlO+brE22I9lRhJsBDXpDWjlz8= +go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.4.1/go.mod h1:VpP4/RMn8bv8gNo9uK7/IMY4mtWLELsS+JIP0inH0h4= go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.0.0-RC2/go.mod h1:T+s8GKi1OqMwPuZ+ouDtZW4vWYpJuzIzh2Matq4Jo9k= -go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.0.0-RC2 h1:PaSlrCE+hRbamroLGGgFDmzDamCxp7ID+hBvPmOhcSc= +go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.4.1 h1:WPpPsAAs8I2rA47v5u0558meKmmwm1Dj99ZbqCV8sZ8= +go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.4.1/go.mod h1:o5RW5o2pKpJLD5dNTCmjF1DorYwMeFJmb/rKr5sLaa8= go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.0.0-RC2/go.mod h1:3shayJIFcDqHi9/GT2fAHyMI/bRgc6FO0CAkhaDkhi0= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.4.1 h1:AxqDiGk8CorEXStMDZF5Hz9vo9Z7ZZ+I5m8JRl/ko40= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.4.1/go.mod h1:c6E4V3/U+miqjs/8l950wggHGL1qzlp0Ypj9xoGrPqo= go.opentelemetry.io/otel/metric v0.20.0/go.mod h1:598I5tYlH1vzBjn+BTuhzTCSb/9debfNp6R3s7Pr1eU= go.opentelemetry.io/otel/oteltest v0.20.0/go.mod h1:L7bgKf9ZB7qCwT9Up7i9/pn0PWIa9FqQ2IQ8LoxiGnw= -go.opentelemetry.io/otel/oteltest v1.0.0-RC2 h1:xNKqMhlZYkASSyvF4JwObZFMq0jhFN3c3SP+2rCzVPk= -go.opentelemetry.io/otel/oteltest v1.0.0-RC2/go.mod h1:kiQ4tw5tAL4JLTbcOYwK1CWI1HkT5aiLzHovgOVnz/A= go.opentelemetry.io/otel/sdk v0.20.0/go.mod h1:g/IcepuwNsoiX5Byy2nNV0ySUF1em498m7hBWC279Yc= -go.opentelemetry.io/otel/sdk v1.0.0-RC2 h1:ROuteeSCBaZNjiT9JcFzZepmInDvLktR28Y6qKo8bCs= go.opentelemetry.io/otel/sdk v1.0.0-RC2/go.mod h1:fgwHyiDn4e5k40TD9VX243rOxXR+jzsWBZYA2P5jpEw= +go.opentelemetry.io/otel/sdk v1.4.1 h1:J7EaW71E0v87qflB4cDolaqq3AcujGrtyIPGQoZOB0Y= +go.opentelemetry.io/otel/sdk v1.4.1/go.mod h1:NBwHDgDIBYjwK2WNu1OPgsIc2IJzmBXNnvIJxJc8BpE= go.opentelemetry.io/otel/sdk/export/metric v0.20.0/go.mod h1:h7RBNMsDJ5pmI1zExLi+bJK+Dr8NQCh0qGhm1KDnNlE= go.opentelemetry.io/otel/sdk/metric v0.20.0/go.mod h1:knxiS8Xd4E/N+ZqKmUPf3gTTZ4/0TjTXukfxjzSTpHE= go.opentelemetry.io/otel/trace v0.20.0/go.mod h1:6GjCW8zgDjwGHGa6GkyeB8+/5vjT16gUEi0Nf1iBdgw= -go.opentelemetry.io/otel/trace v1.0.0-RC2 h1:dunAP0qDULMIT82atj34m5RgvsIK6LcsXf1c/MsYg1w= go.opentelemetry.io/otel/trace v1.0.0-RC2/go.mod h1:JPQ+z6nNw9mqEGT8o3eoPTdnNI+Aj5JcxEsVGREIAy4= +go.opentelemetry.io/otel/trace v1.4.1/go.mod h1:iYEVbroFCNut9QkwEczV9vMRPHNKSSwYZjulEtsmhFc= +go.opentelemetry.io/otel/trace v1.9.0 h1:oZaCNJUjWcg60VXWee8lJKlqhPbXAPB51URuR47pQYc= +go.opentelemetry.io/otel/trace v1.9.0/go.mod h1:2737Q0MuG8q1uILYm2YYVkAyLtOofiTNGg6VODnOiPo= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= -go.opentelemetry.io/proto/otlp v0.9.0 h1:C0g6TWmQYvjKRnljRULLWUVJGy8Uvu0NEL/5frY2/t4= go.opentelemetry.io/proto/otlp v0.9.0/go.mod h1:1vKfU9rv61e9EVGthD1zNvUbiwPcimSsOPU9brfSHJg= +go.opentelemetry.io/proto/otlp v0.12.0 h1:CMJ/3Wp7iOWES+CYLfnBv+DVmPbB+kmy9PJ92XvlR6c= +go.opentelemetry.io/proto/otlp v0.12.0/go.mod h1:TsIjwGWIx5VFYv9KGVlOpxoBl5Dy+63SUguV7GGvlSQ= go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5 h1:+FNtrFTmVw0YZGpBGX56XDee331t6JAXeK2bcyhLOOc= go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5/go.mod h1:nmDLcffg48OtT/PSW0Hg7FvpRQsQh5OSqIylirxKC7o= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= @@ -1527,8 +1642,9 @@ go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= go.uber.org/atomic v1.6.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= -go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE= go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= +go.uber.org/atomic v1.10.0 h1:9qC72Qh0+3MqyJbAn8YU5xVq1frD8bn3JtD2oXtafVQ= +go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= go.uber.org/automaxprocs v1.4.0/go.mod h1:/mTEdr7LvHhs0v7mjdxDreTz1OG5zdZGqgOnhWiR/+Q= go.uber.org/goleak v0.10.0/go.mod h1:VCZuO8V8mFPlL0F5J5GK1rtHV3DrFcQ1R8ryq7FK0aI= go.uber.org/goleak v1.1.10/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A= @@ -1540,16 +1656,17 @@ go.uber.org/multierr v1.3.0/go.mod h1:VgVr7evmIr6uPjLBxg28wmKNXyqE9akIJ5XnfpiKl+ go.uber.org/multierr v1.4.0/go.mod h1:VgVr7evmIr6uPjLBxg28wmKNXyqE9akIJ5XnfpiKl+4= go.uber.org/multierr v1.5.0/go.mod h1:FeouvMocqHpRaaGuG9EjoKcStLC43Zu/fmqdUMPcKYU= go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= -go.uber.org/multierr v1.7.0 h1:zaiO/rmgFjbmCXdSYJWQcdvOCsthmdaHfr3Gm2Kx4Ec= -go.uber.org/multierr v1.7.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= +go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= +go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9Ejo0C68/HhF8uaILCdgjnY+goOA= go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= go.uber.org/zap v1.13.0/go.mod h1:zwrFLgMcdUuIBviXEYEH1YKNaOBnKXsx2IPda5bBwHM= go.uber.org/zap v1.16.0/go.mod h1:MA8QOfq0BHJwdXa996Y4dYkAqRKB8/1K1QMMZVaNZjQ= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= go.uber.org/zap v1.19.0/go.mod h1:xg/QME4nWcxGxrpdeYfq7UvYrLh66cuVKdrbD1XF/NI= -go.uber.org/zap v1.19.1 h1:ue41HOKd1vGURxrmeKIgELGb3jPW9DMUDGtsinblHwI= go.uber.org/zap v1.19.1/go.mod h1:j3DNczoxDZroyBnOT1L/Q79cfUMGZxlv/9dzN7SM1rI= +go.uber.org/zap v1.22.0 h1:Zcye5DUgBloQ9BaT4qc9BnjOFog5TvBSAGkJ3Nf70c0= +go.uber.org/zap v1.22.0/go.mod h1:H4siCOZOrAolnUPJEkfaSjDqyP+BDS0DdDWzwcgt3+U= gocloud.dev v0.23.0/go.mod h1:zklCCIIo1N9ELkU2S2E7tW8P8eeMU7oGLeQCXdDwx9Q= golang.org/x/crypto v0.0.0-20171113213409-9f005a07e0d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20180501155221-613d6eafa307/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= @@ -1580,8 +1697,8 @@ golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83/go.mod h1:jdWPYTVW3xRLrWP golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= golang.org/x/crypto v0.0.0-20210506145944-38f3c27a63bf/go.mod h1:P+XmwS30IXTQdn5tA2iutPOUgjI07+tq3H3K9MVA1s8= golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.0.0-20210920023735-84f357641f63 h1:kETrAMYZq6WVGPa8IIixL0CaEcIUNi+1WX7grUoi3y8= golang.org/x/crypto v0.0.0-20210920023735-84f357641f63/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= +golang.org/x/crypto v0.0.0-20211202192323-5770296d904e h1:MUP6MR3rJ7Gk9LEia0LP2ytiH6MuCfs7qYz+47jGdD8= golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= @@ -1622,8 +1739,9 @@ golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.1-0.20200828183125-ce943fd02449/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.4.2 h1:Gz96sIWK3OalVv/I/qNygP42zyoKp3xptRVCWRFEBvo= golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 h1:6zppjxzCulZykYSLyVDYbneBfbaBIQPYMevg0bEwv2s= +golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -1669,6 +1787,7 @@ golang.org/x/net v0.0.0-20200602114024-627f9648deb9/go.mod h1:qpuaurCH72eLCgpAm/ golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= +golang.org/x/net v0.0.0-20201006153459-a7d1128ccaa0/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201031054903-ff519b6c9102/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= @@ -1690,8 +1809,9 @@ golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qx golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210825183410-e898025ed96a/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210917221730-978cfadd31cf/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20211101193420-4a448f8816b3 h1:VrJZAjbekhoRn7n5FBujY31gboH+iB3pdLxn3gE9FjU= golang.org/x/net v0.0.0-20211101193420-4a448f8816b3/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20220812174116-3211cb980234 h1:RDqmgfe7SvlMWoqC3xwQ2blLO3fcWcxMa3eBLRdRW7E= +golang.org/x/net v0.0.0-20220812174116-3211cb980234/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20181106182150-f42d05182288/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -1725,8 +1845,9 @@ golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20210220032951-036812b2e83c h1:5KslGYwFpkhGh+Q16bwMP3cOontH8FOep7tGV86Y7SQ= golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20220819030929-7fc1605a5dde h1:ejfdSekXMDxDLbRrJMwUk6KnSLZ2McaUCVcIKM+N6jc= +golang.org/x/sync v0.0.0-20220819030929-7fc1605a5dde/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20180620133508-ad87a3a340fa/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -1754,6 +1875,7 @@ golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20190606203320-7fc4e5ec1444/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190616124812-15dcb6c0061f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190626221950-04f50cda93cb/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190712062909-fae7ac547cb7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190801041406-cbf593c0f2f3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -1783,6 +1905,7 @@ golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200124204421-9fbb57f87de9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200217220822-9197077df867/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -1810,6 +1933,7 @@ golang.org/x/sys v0.0.0-20200923182605-d9f96fdee20d/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201109165425-215b40eba54c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201112073958-5cba982894dd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20201117170446-d9b008d0a637/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201202213521-69691e467435/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -1839,25 +1963,29 @@ golang.org/x/sys v0.0.0-20210514084401-e8d321eab015/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210603125802-9665404d3644/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210616045830-e2b7044e8c71/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210823070655-63515b42dcdf/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210831042530-f4d43177bf5e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210906170528-6f6e22806c34/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210908233432-aa78b53d3365/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210917161153-d61c044b1678/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210921065528-437939a70204/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211025201205-69cdffdb9359/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20211029165221-6e7872819dc8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e h1:fLOSk5Q00efkSvAm+4xcoXD+RRmLmmulPn5I3Y9F2EM= +golang.org/x/sys v0.0.0-20211116061358-0a5406a5449c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220818161305-2296e01440c6 h1:Sx/u41w+OwrInGdEckYmEuU5gHoGSL4QbDz3S9s6j4U= +golang.org/x/sys v0.0.0-20220818161305-2296e01440c6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= -golang.org/x/term v0.0.0-20210916214954-140adaaadfaf h1:Ihq/mm/suC88gF8WFcVwk+OV6Tq+wyA1O0E5UEvDglI= -golang.org/x/term v0.0.0-20210916214954-140adaaadfaf/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= +golang.org/x/term v0.0.0-20220722155259-a9ba230a4035 h1:Q5284mrmYTpACcm+eAKjKJH48BBwSyfJqmmGDTtT8Vc= +golang.org/x/term v0.0.0-20220722155259-a9ba230a4035/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -1881,6 +2009,7 @@ golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGm golang.org/x/tools v0.0.0-20180525024113-a5b4c53f6e8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20181011042414-1f849cf54d09/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190110163146-51295c7ec13a/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= @@ -1902,6 +2031,7 @@ golang.org/x/tools v0.0.0-20190614205625-5aca471b1d59/go.mod h1:/rFqwRUd4F7ZHNgw golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/tools v0.0.0-20190624222133-a101b041ded4/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= +golang.org/x/tools v0.0.0-20190706070813-72ffa07ba3db/go.mod h1:jcCCGcm9btYwXyDqrUWc6MKQKKGJCWEQ3AfLSRIbEuI= golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20190907020128-2ca718005c18/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20190910044552-dd2b5c81c578/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= @@ -1946,6 +2076,7 @@ golang.org/x/tools v0.0.0-20200505023115-26f46d2f7ef8/go.mod h1:EkVYQZoAsY45+roY golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200522201501-cb1345f3a375/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200616133436-c1934b75d054/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200622203043-20e05c1c8ffa/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= @@ -1964,6 +2095,7 @@ golang.org/x/tools v0.0.0-20200820010801-b793a1359eac/go.mod h1:njjCfa9FT2d7l9Bc golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/tools v0.0.0-20200831203904-5a2aa26beb65/go.mod h1:Cj7w3i3Rnn0Xh82ur9kSqwfTHTeVxaDqrfMjpcNT6bE= golang.org/x/tools v0.0.0-20200904185747-39188db58858/go.mod h1:Cj7w3i3Rnn0Xh82ur9kSqwfTHTeVxaDqrfMjpcNT6bE= +golang.org/x/tools v0.0.0-20200916195026-c9a70fc28ce3/go.mod h1:z6u4i615ZeAfBE4XtMziQW1fSVJXACjjbWkB/mvPzlU= golang.org/x/tools v0.0.0-20201001104356-43ebab892c4c/go.mod h1:z6u4i615ZeAfBE4XtMziQW1fSVJXACjjbWkB/mvPzlU= golang.org/x/tools v0.0.0-20201002184944-ecd9fd270d5d/go.mod h1:z6u4i615ZeAfBE4XtMziQW1fSVJXACjjbWkB/mvPzlU= golang.org/x/tools v0.0.0-20201011145850-ed2f50202694/go.mod h1:z6u4i615ZeAfBE4XtMziQW1fSVJXACjjbWkB/mvPzlU= @@ -1988,13 +2120,12 @@ golang.org/x/tools v0.1.3/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.4/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.6-0.20210820212750-d4cc65f0b2ff/go.mod h1:YD9qOF0M9xpSpdWTBbzEl5e/RnCefISl8E5Noe10jFM= -golang.org/x/tools v0.1.6/go.mod h1:LGqMHiF4EqQNHR1JncWGqT5BVaXmza+X+BDGol+dOxo= -golang.org/x/tools v0.1.7 h1:6j8CgantCy3yc8JGBqkDLMKWqZ0RDU2g1HVgacojGWQ= golang.org/x/tools v0.1.7/go.mod h1:LGqMHiF4EqQNHR1JncWGqT5BVaXmza+X+BDGol+dOxo= +golang.org/x/tools v0.1.12 h1:VveCTK38A2rkS8ZqFY25HIDFscX5X9OoEhJd3quQmXU= +golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= gomodules.xyz/jsonpatch/v2 v2.2.0 h1:4pT439QV83L+G9FkcCriY6EkpcK6r6bK+A5FBUMI7qY= gomodules.xyz/jsonpatch/v2 v2.2.0/go.mod h1:WXp+iVDkoLQqPudfQ9GBlwB2eZ5DKOnjQZCYdOS8GPY= @@ -2129,11 +2260,11 @@ google.golang.org/genproto v0.0.0-20210831024726-fe130286e0e2/go.mod h1:eFjDcFEc google.golang.org/genproto v0.0.0-20210903162649-d08c68adba83/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= google.golang.org/genproto v0.0.0-20210909211513-a8c4777a87af/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= google.golang.org/genproto v0.0.0-20210917145530-b395a37504d4/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= -google.golang.org/genproto v0.0.0-20210921142501-181ce0d877f6/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/genproto v0.0.0-20210924002016-3dee208752a0/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/genproto v0.0.0-20211016002631-37fc39342514/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= -google.golang.org/genproto v0.0.0-20211021150943-2b146023228c h1:FqrtZMB5Wr+/RecOM3uPJNPfWR8Upb5hAPnt7PU6i4k= google.golang.org/genproto v0.0.0-20211021150943-2b146023228c/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= +google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa h1:I0YcKz0I7OAhddo7ya8kMnvprhcWM045PmkBdMO9zN0= +google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/grpc v0.0.0-20160317175043-d3ddb4469d5a/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= google.golang.org/grpc v1.8.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs= @@ -2169,10 +2300,12 @@ google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQ google.golang.org/grpc v1.39.0/go.mod h1:PImNr+rS9TWYb2O4/emRugxiyHZ5JyHW5F+RPnDzfrE= google.golang.org/grpc v1.39.1/go.mod h1:PImNr+rS9TWYb2O4/emRugxiyHZ5JyHW5F+RPnDzfrE= google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34= -google.golang.org/grpc v1.41.0-dev.0.20210907181116-2f3355d2244e/go.mod h1:U3l9uK9J0sini8mHphKoXyaqDA/8VyGnDee1zzIUK6k= google.golang.org/grpc v1.41.0/go.mod h1:U3l9uK9J0sini8mHphKoXyaqDA/8VyGnDee1zzIUK6k= -google.golang.org/grpc v1.42.0 h1:XT2/MFpuPFsEX2fWh3YQtHkZ+WYZFQRfaUgLZYj/p6A= google.golang.org/grpc v1.42.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU= +google.golang.org/grpc v1.43.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU= +google.golang.org/grpc v1.44.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU= +google.golang.org/grpc v1.48.0 h1:rQOsyJ/8+ufEDJd/Gdsz7HG220Mh9HAhFHRGnIjda0w= +google.golang.org/grpc v1.48.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk= google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0 h1:M1YKkFIboKNieVO5DLUEVzQfGwJD30Nv2jfUgzb5UcE= google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= @@ -2188,8 +2321,10 @@ google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlba google.golang.org/protobuf v1.25.1-0.20200805231151-a709e31e5d12/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -google.golang.org/protobuf v1.27.1 h1:SnqbnDw1V7RiZcXPx5MEeqPv2s79L9i7BJUlG/+RurQ= +google.golang.org/protobuf v1.27.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= +google.golang.org/protobuf v1.28.1 h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175w= +google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= gopkg.in/airbrake/gobrake.v2 v2.0.9/go.mod h1:/h5ZAUhDkGaJfjzjKLSjv6zCL6O0LLBxU4K+aSYdM/U= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= @@ -2197,6 +2332,7 @@ gopkg.in/check.v1 v1.0.0-20141024133853-64131543e789/go.mod h1:Co6ibVJAznAaIkqp8 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20200902074654-038fdea0a05b/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= gopkg.in/cheggaaa/pb.v1 v1.0.25/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qStrOgw= @@ -2235,8 +2371,9 @@ gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.0-20200605160147-a5ece683394c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo= gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= +gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo= gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw= gotest.tools/v3 v3.0.2/go.mod h1:3SzNCllyD9/Y+b5r9JIKQ474KzkZyqLqEfYqMsX94Bk= @@ -2252,6 +2389,8 @@ honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9 honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= honnef.co/go/tools v0.2.0/go.mod h1:lPVVZ2BS5TfnjLyizF7o7hv7j9/L+8cZY2hLyjP9cGY= k8s.io/api v0.20.1/go.mod h1:KqwcCVogGxQY3nBlRpwt+wpAMF/KjaCc7RpywacvqUo= +k8s.io/api v0.20.4/go.mod h1:++lNL1AJMkDymriNniQsWRkMDzRaX2Y/POTUi8yvqYQ= +k8s.io/api v0.20.6/go.mod h1:X9e8Qag6JV/bL5G6bU8sdVRltWKmdHsFUGS3eVndqE8= k8s.io/api v0.21.4/go.mod h1:fTVGP+M4D8+00FN2cMnJqk/eb/GH53bvmNs2SVTmpFk= k8s.io/api v0.23.0 h1:WrL1gb73VSC8obi8cuYETJGXEoFNEh3LU0Pt+Sokgro= k8s.io/api v0.23.0/go.mod h1:8wmDdLBHBNxtOIytwLstXt5E9PddnZb0GaMcqsvDBpg= @@ -2259,38 +2398,50 @@ k8s.io/apiextensions-apiserver v0.21.4/go.mod h1:OoC8LhI9LnV+wKjZkXIBbLUwtnOGJiT k8s.io/apiextensions-apiserver v0.23.0 h1:uii8BYmHYiT2ZTAJxmvc3X8UhNYMxl2A0z0Xq3Pm+WY= k8s.io/apiextensions-apiserver v0.23.0/go.mod h1:xIFAEEDlAZgpVBl/1VSjGDmLoXAWRG40+GsWhKhAxY4= k8s.io/apimachinery v0.20.1/go.mod h1:WlLqWAHZGg07AeltaI0MV5uk1Omp8xaN0JGLY6gkRpU= +k8s.io/apimachinery v0.20.4/go.mod h1:WlLqWAHZGg07AeltaI0MV5uk1Omp8xaN0JGLY6gkRpU= +k8s.io/apimachinery v0.20.6/go.mod h1:ejZXtW1Ra6V1O5H8xPBGz+T3+4gfkTCeExAHKU57MAc= k8s.io/apimachinery v0.21.4/go.mod h1:H/IM+5vH9kZRNJ4l3x/fXP/5bOPJaVP/guptnZPeCFI= k8s.io/apimachinery v0.23.0 h1:mIfWRMjBuMdolAWJ3Fd+aPTMv3X9z+waiARMpvvb0HQ= k8s.io/apimachinery v0.23.0/go.mod h1:fFCTTBKvKcwTPFzjlcxp91uPFZr+JA0FubU4fLzzFYc= k8s.io/apiserver v0.20.1/go.mod h1:ro5QHeQkgMS7ZGpvf4tSMx6bBOgPfE+f52KwvXfScaU= +k8s.io/apiserver v0.20.4/go.mod h1:Mc80thBKOyy7tbvFtB4kJv1kbdD0eIH8k8vianJcbFM= +k8s.io/apiserver v0.20.6/go.mod h1:QIJXNt6i6JB+0YQRNcS0hdRHJlMhflFmsBDeSgT1r8Q= k8s.io/apiserver v0.21.4/go.mod h1:SErUuFBBPZUcD2nsUU8hItxoYheqyYr2o/pCINEPW8g= k8s.io/apiserver v0.23.0/go.mod h1:Cec35u/9zAepDPPFyT+UMrgqOCjgJ5qtfVJDxjZYmt4= k8s.io/client-go v0.20.1/go.mod h1:/zcHdt1TeWSd5HoUe6elJmHSQ6uLLgp4bIJHVEuy+/Y= +k8s.io/client-go v0.20.4/go.mod h1:LiMv25ND1gLUdBeYxBIwKpkSC5IsozMMmOOeSJboP+k= +k8s.io/client-go v0.20.6/go.mod h1:nNQMnOvEUEsOzRRFIIkdmYOjAZrC8bgq0ExboWSU1I0= k8s.io/client-go v0.21.4/go.mod h1:t0/eMKyUAq/DoQ7vW8NVVA00/nomlwC+eInsS8PxSew= k8s.io/client-go v0.23.0 h1:vcsOqyPq7XV3QmQRCBH/t9BICJM9Q1M18qahjv+rebY= k8s.io/client-go v0.23.0/go.mod h1:hrDnpnK1mSr65lHHcUuIZIXDgEbzc7/683c6hyG4jTA= +k8s.io/code-generator v0.19.7/go.mod h1:lwEq3YnLYb/7uVXLorOJfxg+cUu2oihFhHZ0n9NIla0= k8s.io/code-generator v0.21.4/go.mod h1:K3y0Bv9Cz2cOW2vXUrNZlFbflhuPvuadW6JdnN6gGKo= k8s.io/code-generator v0.23.0/go.mod h1:vQvOhDXhuzqiVfM/YHp+dmg10WDZCchJVObc9MvowsE= k8s.io/component-base v0.20.1/go.mod h1:guxkoJnNoh8LNrbtiQOlyp2Y2XFCZQmrcg2n/DeYNLk= +k8s.io/component-base v0.20.4/go.mod h1:t4p9EdiagbVCJKrQ1RsA5/V4rFQNDfRlevJajlGwgjI= +k8s.io/component-base v0.20.6/go.mod h1:6f1MPBAeI+mvuts3sIdtpjljHWBQ2cIy38oBIWMYnrM= k8s.io/component-base v0.21.4/go.mod h1:ZKG0eHVX+tUDcaoIGpU3Vtk4TIjMddN9uhEWDmW6Nyg= k8s.io/component-base v0.23.0 h1:UAnyzjvVZ2ZR1lF35YwtNY6VMN94WtOnArcXBu34es8= k8s.io/component-base v0.23.0/go.mod h1:DHH5uiFvLC1edCpvcTDV++NKULdYYU6pR9Tt3HIKMKI= k8s.io/cri-api v0.17.3/go.mod h1:X1sbHmuXhwaHs9xxYffLqJogVsnI+f6cPRcgPel7ywM= k8s.io/cri-api v0.20.1/go.mod h1:2JRbKt+BFLTjtrILYVqQK5jqhI+XNdF6UiGMgczeBCI= +k8s.io/cri-api v0.20.4/go.mod h1:2JRbKt+BFLTjtrILYVqQK5jqhI+XNdF6UiGMgczeBCI= +k8s.io/cri-api v0.20.6/go.mod h1:ew44AjNXwyn1s0U4xCKGodU7J1HzBeZ1MpGrpa5r8Yc= k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= +k8s.io/gengo v0.0.0-20200428234225-8167cfdcfc14/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= +k8s.io/gengo v0.0.0-20201113003025-83324d819ded/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= k8s.io/gengo v0.0.0-20201214224949-b6c5ce23f027/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= k8s.io/gengo v0.0.0-20210813121822-485abfe95c7c/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= k8s.io/gengo v0.0.0-20210915205010-39e73c8a59cd/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= -k8s.io/klog v1.0.0 h1:Pt+yjF5aB1xDSVbau4VsWe+dQNzA0qv1LlXdC2dF6Q8= k8s.io/klog v1.0.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I= k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE= k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y= k8s.io/klog/v2 v2.4.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y= k8s.io/klog/v2 v2.8.0/go.mod h1:hy9LJ/NvuK+iVyP4Ehqva4HxZG/oXyIS3n3Jmire4Ec= -k8s.io/klog/v2 v2.10.0/go.mod h1:hy9LJ/NvuK+iVyP4Ehqva4HxZG/oXyIS3n3Jmire4Ec= k8s.io/klog/v2 v2.30.0/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= k8s.io/klog/v2 v2.60.1 h1:VW25q3bZx9uE3vvdL6M8ezOX79vA2Aq1nEWLqNQclHc= k8s.io/klog/v2 v2.60.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= +k8s.io/kube-openapi v0.0.0-20200805222855-6aeccd4b50c6/go.mod h1:UuqjUnNftUyPE5H64/qeyjQoUZhGpeFDVdxjTeEVN2o= k8s.io/kube-openapi v0.0.0-20201113171705-d219536bb9fd/go.mod h1:WOJ3KddDSol4tAGcJo0Tvi+dK12EcqSLqcWsryKMpfM= k8s.io/kube-openapi v0.0.0-20210305001622-591a79e4bda7/go.mod h1:wXW5VT87nVfh/iLV8FpR2uDvrFyomxbtb1KivDbvPTE= k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e/go.mod h1:vHXdDvt9+2spS2Rx9ql3I8tycm3H9FDfdUoIuKCefvw= @@ -2316,6 +2467,7 @@ rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8 rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.14/go.mod h1:LEScyzhFmoF5pso/YSeBstl57mOzx9xlU9n85RGrDQg= +sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.15/go.mod h1:LEScyzhFmoF5pso/YSeBstl57mOzx9xlU9n85RGrDQg= sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.22/go.mod h1:LEScyzhFmoF5pso/YSeBstl57mOzx9xlU9n85RGrDQg= sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.25/go.mod h1:Mlj9PNLmG9bZ6BHFwFKDo5afkpWyUISkb9Me0GnK66I= sigs.k8s.io/controller-runtime v0.11.1 h1:7YIHT2QnHJArj/dk9aUkYhfqfK5cIxPOX5gPECfdZLU= @@ -2334,7 +2486,9 @@ sigs.k8s.io/kustomize/kustomize/v4 v4.5.4 h1:rzGrL+DA4k8bT6SMz7/U+2z3iiZf1t2RaYJ sigs.k8s.io/kustomize/kustomize/v4 v4.5.4/go.mod h1:Zo/Xc5FKD6sHl0lilbrieeGeZHVYCA4BzxeAaLI05Bg= sigs.k8s.io/kustomize/kyaml v0.13.6 h1:eF+wsn4J7GOAXlvajv6OknSunxpcOBQQqsnPxObtkGs= sigs.k8s.io/kustomize/kyaml v0.13.6/go.mod h1:yHP031rn1QX1lr/Xd934Ri/xdVNG8BE2ECa78Ht/kEg= +sigs.k8s.io/structured-merge-diff/v4 v4.0.1/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw= sigs.k8s.io/structured-merge-diff/v4 v4.0.2/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw= +sigs.k8s.io/structured-merge-diff/v4 v4.0.3/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw= sigs.k8s.io/structured-merge-diff/v4 v4.1.2/go.mod h1:j/nl6xW8vLS49O8YvXW1ocPhZawJtm+Yrr7PPRQ0Vg4= sigs.k8s.io/structured-merge-diff/v4 v4.2.0 h1:kDvPBbnPk+qYmkHmSo8vKGp438IASWofnbbUKDE/bv0= sigs.k8s.io/structured-merge-diff/v4 v4.2.0/go.mod h1:j/nl6xW8vLS49O8YvXW1ocPhZawJtm+Yrr7PPRQ0Vg4= diff --git a/protos/hardware/hardware.pb.go b/protos/hardware/hardware.pb.go index a5a8be435..8deba1646 100644 --- a/protos/hardware/hardware.pb.go +++ b/protos/hardware/hardware.pb.go @@ -4,8 +4,8 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.27.1 -// protoc v3.18.0 +// protoc-gen-go v1.28.1 +// protoc (unknown) // source: protos/hardware/hardware.proto package hardware @@ -26,7 +26,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// // PushRequest is the body for the Push method. It contains information about // a piece of hardware. type PushRequest struct { @@ -34,7 +33,6 @@ type PushRequest struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - // // Hardware describes the hardware you want to register to Tinkerbell and // what it looks like. // Hostname, MAC address, DHCP, network interfaces, metadata and so on. @@ -80,7 +78,6 @@ func (x *PushRequest) GetData() *Hardware { return nil } -// // Empty represents an empty response type Empty struct { state protoimpl.MessageState @@ -120,7 +117,6 @@ func (*Empty) Descriptor() ([]byte, []int) { return file_protos_hardware_hardware_proto_rawDescGZIP(), []int{1} } -// // GetRequest is the request used by the Get various get methods exposed by the // hardware service. type GetRequest struct { @@ -186,21 +182,17 @@ func (x *GetRequest) GetId() string { return "" } -// // Hardware describes a specific device managed by Tinkerbell type Hardware struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - // // Describe network layout for your hardware Network *Hardware_Network `protobuf:"bytes,6,opt,name=network,proto3" json:"network,omitempty"` - // // A UUID representing a unique identifier for your hardware Id string `protobuf:"bytes,7,opt,name=id,proto3" json:"id,omitempty"` Version int64 `protobuf:"varint,8,opt,name=version,proto3" json:"version,omitempty"` - // // Metadata served by Hegel and that are accessible from the server itself To // know more about what Hegel is have a look at the documentation // https://docs.tinkerbell.org/services/hegel/ @@ -271,7 +263,6 @@ func (x *Hardware) GetMetadata() string { return "" } -// // DeleteRequest gets used when you want to delete an hardware by its identifier. // Usually it is a UUID. type DeleteRequest struct { @@ -321,36 +312,27 @@ func (x *DeleteRequest) GetId() string { return "" } -// // DHCP represents type Hardware_DHCP struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - // // The MAC address for your hardware. It is important to get it // right because it is used from Tinkerbell to dispatch workflows to the // right destination. Mac string `protobuf:"bytes,1,opt,name=mac,proto3" json:"mac,omitempty"` - // // Hostname represents the hostname of your server - Hostname string `protobuf:"bytes,3,opt,name=hostname,proto3" json:"hostname,omitempty"` - LeaseTime int64 `protobuf:"varint,4,opt,name=lease_time,json=leaseTime,proto3" json:"lease_time,omitempty"` - // + Hostname string `protobuf:"bytes,3,opt,name=hostname,proto3" json:"hostname,omitempty"` + LeaseTime int64 `protobuf:"varint,4,opt,name=lease_time,json=leaseTime,proto3" json:"lease_time,omitempty"` NameServers []string `protobuf:"bytes,5,rep,name=name_servers,json=nameServers,proto3" json:"name_servers,omitempty"` - // TimeServers []string `protobuf:"bytes,6,rep,name=time_servers,json=timeServers,proto3" json:"time_servers,omitempty"` - // // The CPU architecture like arm64, amd64, x86_64 and so on. Arch string `protobuf:"bytes,8,opt,name=arch,proto3" json:"arch,omitempty"` Uefi bool `protobuf:"varint,9,opt,name=uefi,proto3" json:"uefi,omitempty"` - // // The name of the interface in your hardware like eth0, en1 and so on. - IfaceName string `protobuf:"bytes,10,opt,name=iface_name,json=ifaceName,proto3" json:"iface_name,omitempty"` - // - // - Ip *Hardware_DHCP_IP `protobuf:"bytes,11,opt,name=ip,proto3" json:"ip,omitempty"` + IfaceName string `protobuf:"bytes,10,opt,name=iface_name,json=ifaceName,proto3" json:"iface_name,omitempty"` + Ip *Hardware_DHCP_IP `protobuf:"bytes,11,opt,name=ip,proto3" json:"ip,omitempty"` } func (x *Hardware_DHCP) Reset() { @@ -448,7 +430,6 @@ func (x *Hardware_DHCP) GetIp() *Hardware_DHCP_IP { return nil } -// // Netboot is the model used to represent and configure the netbooting // behavior From there you can customise the IPXE chained during boot, the in // memory operating system tand so on. @@ -457,25 +438,19 @@ type Hardware_Netboot struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - // // This is a boolean value that tells to Tinkerbell if the hardware has PXE // enabled. If set to false Tinkerbell won't attempt a provisioning at the // moment. AllowPxe bool `protobuf:"varint,1,opt,name=allow_pxe,json=allowPxe,proto3" json:"allow_pxe,omitempty"` - // // When set to true Osie will lookup and execute the workflows assigned to // a particular hardware. // // When set to false Osie will be executed but no workflows will be // applied. This is useful if you don't want to execute any workflows but // you simply need an operating system running in memory - AllowWorkflow bool `protobuf:"varint,2,opt,name=allow_workflow,json=allowWorkflow,proto3" json:"allow_workflow,omitempty"` - // - // - Ipxe *Hardware_Netboot_IPXE `protobuf:"bytes,3,opt,name=ipxe,proto3" json:"ipxe,omitempty"` - // - // - Osie *Hardware_Netboot_Osie `protobuf:"bytes,5,opt,name=osie,proto3" json:"osie,omitempty"` + AllowWorkflow bool `protobuf:"varint,2,opt,name=allow_workflow,json=allowWorkflow,proto3" json:"allow_workflow,omitempty"` + Ipxe *Hardware_Netboot_IPXE `protobuf:"bytes,3,opt,name=ipxe,proto3" json:"ipxe,omitempty"` + Osie *Hardware_Netboot_Osie `protobuf:"bytes,5,opt,name=osie,proto3" json:"osie,omitempty"` } func (x *Hardware_Netboot) Reset() { @@ -538,7 +513,6 @@ func (x *Hardware_Netboot) GetOsie() *Hardware_Netboot_Osie { return nil } -// // Network describes the networking you expect in your hardware. // The number of interfaces, their name, gateway and IP. type Hardware_Network struct { @@ -546,7 +520,6 @@ type Hardware_Network struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - // // Configure the network interfaces you have in your hardware and defines their // behavior. Interfaces []*Hardware_Network_Interface `protobuf:"bytes,3,rep,name=interfaces,proto3" json:"interfaces,omitempty"` @@ -662,7 +635,6 @@ func (x *Hardware_DHCP_IP) GetFamily() int64 { return 0 } -// // IPXE is the network boot firmware Tinkerbell uses to start the // provisioning in the hardware type Hardware_Netboot_IPXE struct { @@ -670,10 +642,8 @@ type Hardware_Netboot_IPXE struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - // // This is the location of the IPXE script - Url string `protobuf:"bytes,1,opt,name=url,proto3" json:"url,omitempty"` - // + Url string `protobuf:"bytes,1,opt,name=url,proto3" json:"url,omitempty"` Contents string `protobuf:"bytes,2,opt,name=contents,proto3" json:"contents,omitempty"` } @@ -723,7 +693,6 @@ func (x *Hardware_Netboot_IPXE) GetContents() string { return "" } -// // Osie is the in memory operating system type Hardware_Netboot_Osie struct { state protoimpl.MessageState @@ -788,18 +757,15 @@ func (x *Hardware_Netboot_Osie) GetInitrd() string { return "" } -// // Interface represents a single network interface in your hardware type Hardware_Network_Interface struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - // // DHCP configures the behavior of DHCP connection for your hardware. // IP you expect, gateway and netmask. Dhcp *Hardware_DHCP `protobuf:"bytes,1,opt,name=dhcp,proto3" json:"dhcp,omitempty"` - // // Netboot pilots netbooting. You can select Osie, the in memory // operating system used during netbooting. Netboot *Hardware_Netboot `protobuf:"bytes,2,opt,name=netboot,proto3" json:"netboot,omitempty"` diff --git a/protos/hardware/mock.go b/protos/hardware/mock.go index c7c147baa..7d85d2ddc 100644 --- a/protos/hardware/mock.go +++ b/protos/hardware/mock.go @@ -17,37 +17,37 @@ var _ HardwareServiceClient = &HardwareServiceClientMock{} // HardwareServiceClientMock is a mock implementation of HardwareServiceClient. // -// func TestSomethingThatUsesHardwareServiceClient(t *testing.T) { +// func TestSomethingThatUsesHardwareServiceClient(t *testing.T) { // -// // make and configure a mocked HardwareServiceClient -// mockedHardwareServiceClient := &HardwareServiceClientMock{ -// AllFunc: func(ctx context.Context, in *Empty, opts ...grpc.CallOption) (HardwareService_AllClient, error) { -// panic("mock out the All method") -// }, -// ByIDFunc: func(ctx context.Context, in *GetRequest, opts ...grpc.CallOption) (*Hardware, error) { -// panic("mock out the ByID method") -// }, -// ByIPFunc: func(ctx context.Context, in *GetRequest, opts ...grpc.CallOption) (*Hardware, error) { -// panic("mock out the ByIP method") -// }, -// ByMACFunc: func(ctx context.Context, in *GetRequest, opts ...grpc.CallOption) (*Hardware, error) { -// panic("mock out the ByMAC method") -// }, -// DeleteFunc: func(ctx context.Context, in *DeleteRequest, opts ...grpc.CallOption) (*Empty, error) { -// panic("mock out the Delete method") -// }, -// DeprecatedWatchFunc: func(ctx context.Context, in *GetRequest, opts ...grpc.CallOption) (HardwareService_DeprecatedWatchClient, error) { -// panic("mock out the DeprecatedWatch method") -// }, -// PushFunc: func(ctx context.Context, in *PushRequest, opts ...grpc.CallOption) (*Empty, error) { -// panic("mock out the Push method") -// }, -// } +// // make and configure a mocked HardwareServiceClient +// mockedHardwareServiceClient := &HardwareServiceClientMock{ +// AllFunc: func(ctx context.Context, in *Empty, opts ...grpc.CallOption) (HardwareService_AllClient, error) { +// panic("mock out the All method") +// }, +// ByIDFunc: func(ctx context.Context, in *GetRequest, opts ...grpc.CallOption) (*Hardware, error) { +// panic("mock out the ByID method") +// }, +// ByIPFunc: func(ctx context.Context, in *GetRequest, opts ...grpc.CallOption) (*Hardware, error) { +// panic("mock out the ByIP method") +// }, +// ByMACFunc: func(ctx context.Context, in *GetRequest, opts ...grpc.CallOption) (*Hardware, error) { +// panic("mock out the ByMAC method") +// }, +// DeleteFunc: func(ctx context.Context, in *DeleteRequest, opts ...grpc.CallOption) (*Empty, error) { +// panic("mock out the Delete method") +// }, +// DeprecatedWatchFunc: func(ctx context.Context, in *GetRequest, opts ...grpc.CallOption) (HardwareService_DeprecatedWatchClient, error) { +// panic("mock out the DeprecatedWatch method") +// }, +// PushFunc: func(ctx context.Context, in *PushRequest, opts ...grpc.CallOption) (*Empty, error) { +// panic("mock out the Push method") +// }, +// } // -// // use mockedHardwareServiceClient in code that requires HardwareServiceClient -// // and then make assertions. +// // use mockedHardwareServiceClient in code that requires HardwareServiceClient +// // and then make assertions. // -// } +// } type HardwareServiceClientMock struct { // AllFunc mocks the All method. AllFunc func(ctx context.Context, in *Empty, opts ...grpc.CallOption) (HardwareService_AllClient, error) @@ -167,7 +167,8 @@ func (mock *HardwareServiceClientMock) All(ctx context.Context, in *Empty, opts // AllCalls gets all the calls that were made to All. // Check the length with: -// len(mockedHardwareServiceClient.AllCalls()) +// +// len(mockedHardwareServiceClient.AllCalls()) func (mock *HardwareServiceClientMock) AllCalls() []struct { Ctx context.Context In *Empty @@ -206,7 +207,8 @@ func (mock *HardwareServiceClientMock) ByID(ctx context.Context, in *GetRequest, // ByIDCalls gets all the calls that were made to ByID. // Check the length with: -// len(mockedHardwareServiceClient.ByIDCalls()) +// +// len(mockedHardwareServiceClient.ByIDCalls()) func (mock *HardwareServiceClientMock) ByIDCalls() []struct { Ctx context.Context In *GetRequest @@ -245,7 +247,8 @@ func (mock *HardwareServiceClientMock) ByIP(ctx context.Context, in *GetRequest, // ByIPCalls gets all the calls that were made to ByIP. // Check the length with: -// len(mockedHardwareServiceClient.ByIPCalls()) +// +// len(mockedHardwareServiceClient.ByIPCalls()) func (mock *HardwareServiceClientMock) ByIPCalls() []struct { Ctx context.Context In *GetRequest @@ -284,7 +287,8 @@ func (mock *HardwareServiceClientMock) ByMAC(ctx context.Context, in *GetRequest // ByMACCalls gets all the calls that were made to ByMAC. // Check the length with: -// len(mockedHardwareServiceClient.ByMACCalls()) +// +// len(mockedHardwareServiceClient.ByMACCalls()) func (mock *HardwareServiceClientMock) ByMACCalls() []struct { Ctx context.Context In *GetRequest @@ -323,7 +327,8 @@ func (mock *HardwareServiceClientMock) Delete(ctx context.Context, in *DeleteReq // DeleteCalls gets all the calls that were made to Delete. // Check the length with: -// len(mockedHardwareServiceClient.DeleteCalls()) +// +// len(mockedHardwareServiceClient.DeleteCalls()) func (mock *HardwareServiceClientMock) DeleteCalls() []struct { Ctx context.Context In *DeleteRequest @@ -362,7 +367,8 @@ func (mock *HardwareServiceClientMock) DeprecatedWatch(ctx context.Context, in * // DeprecatedWatchCalls gets all the calls that were made to DeprecatedWatch. // Check the length with: -// len(mockedHardwareServiceClient.DeprecatedWatchCalls()) +// +// len(mockedHardwareServiceClient.DeprecatedWatchCalls()) func (mock *HardwareServiceClientMock) DeprecatedWatchCalls() []struct { Ctx context.Context In *GetRequest @@ -401,7 +407,8 @@ func (mock *HardwareServiceClientMock) Push(ctx context.Context, in *PushRequest // PushCalls gets all the calls that were made to Push. // Check the length with: -// len(mockedHardwareServiceClient.PushCalls()) +// +// len(mockedHardwareServiceClient.PushCalls()) func (mock *HardwareServiceClientMock) PushCalls() []struct { Ctx context.Context In *PushRequest @@ -424,37 +431,37 @@ var _ HardwareService_AllClient = &HardwareService_AllClientMock{} // HardwareService_AllClientMock is a mock implementation of HardwareService_AllClient. // -// func TestSomethingThatUsesHardwareService_AllClient(t *testing.T) { +// func TestSomethingThatUsesHardwareService_AllClient(t *testing.T) { // -// // make and configure a mocked HardwareService_AllClient -// mockedHardwareService_AllClient := &HardwareService_AllClientMock{ -// CloseSendFunc: func() error { -// panic("mock out the CloseSend method") -// }, -// ContextFunc: func() context.Context { -// panic("mock out the Context method") -// }, -// HeaderFunc: func() (metadata.MD, error) { -// panic("mock out the Header method") -// }, -// RecvFunc: func() (*Hardware, error) { -// panic("mock out the Recv method") -// }, -// RecvMsgFunc: func(m interface{}) error { -// panic("mock out the RecvMsg method") -// }, -// SendMsgFunc: func(m interface{}) error { -// panic("mock out the SendMsg method") -// }, -// TrailerFunc: func() metadata.MD { -// panic("mock out the Trailer method") -// }, -// } +// // make and configure a mocked HardwareService_AllClient +// mockedHardwareService_AllClient := &HardwareService_AllClientMock{ +// CloseSendFunc: func() error { +// panic("mock out the CloseSend method") +// }, +// ContextFunc: func() context.Context { +// panic("mock out the Context method") +// }, +// HeaderFunc: func() (metadata.MD, error) { +// panic("mock out the Header method") +// }, +// RecvFunc: func() (*Hardware, error) { +// panic("mock out the Recv method") +// }, +// RecvMsgFunc: func(m interface{}) error { +// panic("mock out the RecvMsg method") +// }, +// SendMsgFunc: func(m interface{}) error { +// panic("mock out the SendMsg method") +// }, +// TrailerFunc: func() metadata.MD { +// panic("mock out the Trailer method") +// }, +// } // -// // use mockedHardwareService_AllClient in code that requires HardwareService_AllClient -// // and then make assertions. +// // use mockedHardwareService_AllClient in code that requires HardwareService_AllClient +// // and then make assertions. // -// } +// } type HardwareService_AllClientMock struct { // CloseSendFunc mocks the CloseSend method. CloseSendFunc func() error @@ -523,7 +530,8 @@ func (mock *HardwareService_AllClientMock) CloseSend() error { // CloseSendCalls gets all the calls that were made to CloseSend. // Check the length with: -// len(mockedHardwareService_AllClient.CloseSendCalls()) +// +// len(mockedHardwareService_AllClient.CloseSendCalls()) func (mock *HardwareService_AllClientMock) CloseSendCalls() []struct{} { var calls []struct{} mock.lockCloseSend.RLock() @@ -546,7 +554,8 @@ func (mock *HardwareService_AllClientMock) Context() context.Context { // ContextCalls gets all the calls that were made to Context. // Check the length with: -// len(mockedHardwareService_AllClient.ContextCalls()) +// +// len(mockedHardwareService_AllClient.ContextCalls()) func (mock *HardwareService_AllClientMock) ContextCalls() []struct{} { var calls []struct{} mock.lockContext.RLock() @@ -569,7 +578,8 @@ func (mock *HardwareService_AllClientMock) Header() (metadata.MD, error) { // HeaderCalls gets all the calls that were made to Header. // Check the length with: -// len(mockedHardwareService_AllClient.HeaderCalls()) +// +// len(mockedHardwareService_AllClient.HeaderCalls()) func (mock *HardwareService_AllClientMock) HeaderCalls() []struct{} { var calls []struct{} mock.lockHeader.RLock() @@ -592,7 +602,8 @@ func (mock *HardwareService_AllClientMock) Recv() (*Hardware, error) { // RecvCalls gets all the calls that were made to Recv. // Check the length with: -// len(mockedHardwareService_AllClient.RecvCalls()) +// +// len(mockedHardwareService_AllClient.RecvCalls()) func (mock *HardwareService_AllClientMock) RecvCalls() []struct{} { var calls []struct{} mock.lockRecv.RLock() @@ -619,7 +630,8 @@ func (mock *HardwareService_AllClientMock) RecvMsg(m interface{}) error { // RecvMsgCalls gets all the calls that were made to RecvMsg. // Check the length with: -// len(mockedHardwareService_AllClient.RecvMsgCalls()) +// +// len(mockedHardwareService_AllClient.RecvMsgCalls()) func (mock *HardwareService_AllClientMock) RecvMsgCalls() []struct { M interface{} } { @@ -650,7 +662,8 @@ func (mock *HardwareService_AllClientMock) SendMsg(m interface{}) error { // SendMsgCalls gets all the calls that were made to SendMsg. // Check the length with: -// len(mockedHardwareService_AllClient.SendMsgCalls()) +// +// len(mockedHardwareService_AllClient.SendMsgCalls()) func (mock *HardwareService_AllClientMock) SendMsgCalls() []struct { M interface{} } { @@ -677,7 +690,8 @@ func (mock *HardwareService_AllClientMock) Trailer() metadata.MD { // TrailerCalls gets all the calls that were made to Trailer. // Check the length with: -// len(mockedHardwareService_AllClient.TrailerCalls()) +// +// len(mockedHardwareService_AllClient.TrailerCalls()) func (mock *HardwareService_AllClientMock) TrailerCalls() []struct{} { var calls []struct{} mock.lockTrailer.RLock() diff --git a/protos/packet/packet.pb.go b/protos/packet/packet.pb.go index d7da3143b..e5c914450 100644 --- a/protos/packet/packet.pb.go +++ b/protos/packet/packet.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.27.1 -// protoc v3.18.0 +// protoc-gen-go v1.28.1 +// protoc (unknown) // source: protos/packet/packet.proto package packet diff --git a/protos/template/mock.go b/protos/template/mock.go index 80d88b338..62ceee35c 100644 --- a/protos/template/mock.go +++ b/protos/template/mock.go @@ -17,31 +17,31 @@ var _ TemplateServiceClient = &TemplateServiceClientMock{} // TemplateServiceClientMock is a mock implementation of TemplateServiceClient. // -// func TestSomethingThatUsesTemplateServiceClient(t *testing.T) { +// func TestSomethingThatUsesTemplateServiceClient(t *testing.T) { // -// // make and configure a mocked TemplateServiceClient -// mockedTemplateServiceClient := &TemplateServiceClientMock{ -// CreateTemplateFunc: func(ctx context.Context, in *WorkflowTemplate, opts ...grpc.CallOption) (*CreateResponse, error) { -// panic("mock out the CreateTemplate method") -// }, -// DeleteTemplateFunc: func(ctx context.Context, in *GetRequest, opts ...grpc.CallOption) (*Empty, error) { -// panic("mock out the DeleteTemplate method") -// }, -// GetTemplateFunc: func(ctx context.Context, in *GetRequest, opts ...grpc.CallOption) (*WorkflowTemplate, error) { -// panic("mock out the GetTemplate method") -// }, -// ListTemplatesFunc: func(ctx context.Context, in *ListRequest, opts ...grpc.CallOption) (TemplateService_ListTemplatesClient, error) { -// panic("mock out the ListTemplates method") -// }, -// UpdateTemplateFunc: func(ctx context.Context, in *WorkflowTemplate, opts ...grpc.CallOption) (*Empty, error) { -// panic("mock out the UpdateTemplate method") -// }, -// } +// // make and configure a mocked TemplateServiceClient +// mockedTemplateServiceClient := &TemplateServiceClientMock{ +// CreateTemplateFunc: func(ctx context.Context, in *WorkflowTemplate, opts ...grpc.CallOption) (*CreateResponse, error) { +// panic("mock out the CreateTemplate method") +// }, +// DeleteTemplateFunc: func(ctx context.Context, in *GetRequest, opts ...grpc.CallOption) (*Empty, error) { +// panic("mock out the DeleteTemplate method") +// }, +// GetTemplateFunc: func(ctx context.Context, in *GetRequest, opts ...grpc.CallOption) (*WorkflowTemplate, error) { +// panic("mock out the GetTemplate method") +// }, +// ListTemplatesFunc: func(ctx context.Context, in *ListRequest, opts ...grpc.CallOption) (TemplateService_ListTemplatesClient, error) { +// panic("mock out the ListTemplates method") +// }, +// UpdateTemplateFunc: func(ctx context.Context, in *WorkflowTemplate, opts ...grpc.CallOption) (*Empty, error) { +// panic("mock out the UpdateTemplate method") +// }, +// } // -// // use mockedTemplateServiceClient in code that requires TemplateServiceClient -// // and then make assertions. +// // use mockedTemplateServiceClient in code that requires TemplateServiceClient +// // and then make assertions. // -// } +// } type TemplateServiceClientMock struct { // CreateTemplateFunc mocks the CreateTemplate method. CreateTemplateFunc func(ctx context.Context, in *WorkflowTemplate, opts ...grpc.CallOption) (*CreateResponse, error) @@ -135,7 +135,8 @@ func (mock *TemplateServiceClientMock) CreateTemplate(ctx context.Context, in *W // CreateTemplateCalls gets all the calls that were made to CreateTemplate. // Check the length with: -// len(mockedTemplateServiceClient.CreateTemplateCalls()) +// +// len(mockedTemplateServiceClient.CreateTemplateCalls()) func (mock *TemplateServiceClientMock) CreateTemplateCalls() []struct { Ctx context.Context In *WorkflowTemplate @@ -174,7 +175,8 @@ func (mock *TemplateServiceClientMock) DeleteTemplate(ctx context.Context, in *G // DeleteTemplateCalls gets all the calls that were made to DeleteTemplate. // Check the length with: -// len(mockedTemplateServiceClient.DeleteTemplateCalls()) +// +// len(mockedTemplateServiceClient.DeleteTemplateCalls()) func (mock *TemplateServiceClientMock) DeleteTemplateCalls() []struct { Ctx context.Context In *GetRequest @@ -213,7 +215,8 @@ func (mock *TemplateServiceClientMock) GetTemplate(ctx context.Context, in *GetR // GetTemplateCalls gets all the calls that were made to GetTemplate. // Check the length with: -// len(mockedTemplateServiceClient.GetTemplateCalls()) +// +// len(mockedTemplateServiceClient.GetTemplateCalls()) func (mock *TemplateServiceClientMock) GetTemplateCalls() []struct { Ctx context.Context In *GetRequest @@ -252,7 +255,8 @@ func (mock *TemplateServiceClientMock) ListTemplates(ctx context.Context, in *Li // ListTemplatesCalls gets all the calls that were made to ListTemplates. // Check the length with: -// len(mockedTemplateServiceClient.ListTemplatesCalls()) +// +// len(mockedTemplateServiceClient.ListTemplatesCalls()) func (mock *TemplateServiceClientMock) ListTemplatesCalls() []struct { Ctx context.Context In *ListRequest @@ -291,7 +295,8 @@ func (mock *TemplateServiceClientMock) UpdateTemplate(ctx context.Context, in *W // UpdateTemplateCalls gets all the calls that were made to UpdateTemplate. // Check the length with: -// len(mockedTemplateServiceClient.UpdateTemplateCalls()) +// +// len(mockedTemplateServiceClient.UpdateTemplateCalls()) func (mock *TemplateServiceClientMock) UpdateTemplateCalls() []struct { Ctx context.Context In *WorkflowTemplate @@ -314,37 +319,37 @@ var _ TemplateService_ListTemplatesClient = &TemplateService_ListTemplatesClient // TemplateService_ListTemplatesClientMock is a mock implementation of TemplateService_ListTemplatesClient. // -// func TestSomethingThatUsesTemplateService_ListTemplatesClient(t *testing.T) { +// func TestSomethingThatUsesTemplateService_ListTemplatesClient(t *testing.T) { // -// // make and configure a mocked TemplateService_ListTemplatesClient -// mockedTemplateService_ListTemplatesClient := &TemplateService_ListTemplatesClientMock{ -// CloseSendFunc: func() error { -// panic("mock out the CloseSend method") -// }, -// ContextFunc: func() context.Context { -// panic("mock out the Context method") -// }, -// HeaderFunc: func() (metadata.MD, error) { -// panic("mock out the Header method") -// }, -// RecvFunc: func() (*WorkflowTemplate, error) { -// panic("mock out the Recv method") -// }, -// RecvMsgFunc: func(m interface{}) error { -// panic("mock out the RecvMsg method") -// }, -// SendMsgFunc: func(m interface{}) error { -// panic("mock out the SendMsg method") -// }, -// TrailerFunc: func() metadata.MD { -// panic("mock out the Trailer method") -// }, -// } +// // make and configure a mocked TemplateService_ListTemplatesClient +// mockedTemplateService_ListTemplatesClient := &TemplateService_ListTemplatesClientMock{ +// CloseSendFunc: func() error { +// panic("mock out the CloseSend method") +// }, +// ContextFunc: func() context.Context { +// panic("mock out the Context method") +// }, +// HeaderFunc: func() (metadata.MD, error) { +// panic("mock out the Header method") +// }, +// RecvFunc: func() (*WorkflowTemplate, error) { +// panic("mock out the Recv method") +// }, +// RecvMsgFunc: func(m interface{}) error { +// panic("mock out the RecvMsg method") +// }, +// SendMsgFunc: func(m interface{}) error { +// panic("mock out the SendMsg method") +// }, +// TrailerFunc: func() metadata.MD { +// panic("mock out the Trailer method") +// }, +// } // -// // use mockedTemplateService_ListTemplatesClient in code that requires TemplateService_ListTemplatesClient -// // and then make assertions. +// // use mockedTemplateService_ListTemplatesClient in code that requires TemplateService_ListTemplatesClient +// // and then make assertions. // -// } +// } type TemplateService_ListTemplatesClientMock struct { // CloseSendFunc mocks the CloseSend method. CloseSendFunc func() error @@ -413,7 +418,8 @@ func (mock *TemplateService_ListTemplatesClientMock) CloseSend() error { // CloseSendCalls gets all the calls that were made to CloseSend. // Check the length with: -// len(mockedTemplateService_ListTemplatesClient.CloseSendCalls()) +// +// len(mockedTemplateService_ListTemplatesClient.CloseSendCalls()) func (mock *TemplateService_ListTemplatesClientMock) CloseSendCalls() []struct{} { var calls []struct{} mock.lockCloseSend.RLock() @@ -436,7 +442,8 @@ func (mock *TemplateService_ListTemplatesClientMock) Context() context.Context { // ContextCalls gets all the calls that were made to Context. // Check the length with: -// len(mockedTemplateService_ListTemplatesClient.ContextCalls()) +// +// len(mockedTemplateService_ListTemplatesClient.ContextCalls()) func (mock *TemplateService_ListTemplatesClientMock) ContextCalls() []struct{} { var calls []struct{} mock.lockContext.RLock() @@ -459,7 +466,8 @@ func (mock *TemplateService_ListTemplatesClientMock) Header() (metadata.MD, erro // HeaderCalls gets all the calls that were made to Header. // Check the length with: -// len(mockedTemplateService_ListTemplatesClient.HeaderCalls()) +// +// len(mockedTemplateService_ListTemplatesClient.HeaderCalls()) func (mock *TemplateService_ListTemplatesClientMock) HeaderCalls() []struct{} { var calls []struct{} mock.lockHeader.RLock() @@ -482,7 +490,8 @@ func (mock *TemplateService_ListTemplatesClientMock) Recv() (*WorkflowTemplate, // RecvCalls gets all the calls that were made to Recv. // Check the length with: -// len(mockedTemplateService_ListTemplatesClient.RecvCalls()) +// +// len(mockedTemplateService_ListTemplatesClient.RecvCalls()) func (mock *TemplateService_ListTemplatesClientMock) RecvCalls() []struct{} { var calls []struct{} mock.lockRecv.RLock() @@ -509,7 +518,8 @@ func (mock *TemplateService_ListTemplatesClientMock) RecvMsg(m interface{}) erro // RecvMsgCalls gets all the calls that were made to RecvMsg. // Check the length with: -// len(mockedTemplateService_ListTemplatesClient.RecvMsgCalls()) +// +// len(mockedTemplateService_ListTemplatesClient.RecvMsgCalls()) func (mock *TemplateService_ListTemplatesClientMock) RecvMsgCalls() []struct { M interface{} } { @@ -540,7 +550,8 @@ func (mock *TemplateService_ListTemplatesClientMock) SendMsg(m interface{}) erro // SendMsgCalls gets all the calls that were made to SendMsg. // Check the length with: -// len(mockedTemplateService_ListTemplatesClient.SendMsgCalls()) +// +// len(mockedTemplateService_ListTemplatesClient.SendMsgCalls()) func (mock *TemplateService_ListTemplatesClientMock) SendMsgCalls() []struct { M interface{} } { @@ -567,7 +578,8 @@ func (mock *TemplateService_ListTemplatesClientMock) Trailer() metadata.MD { // TrailerCalls gets all the calls that were made to Trailer. // Check the length with: -// len(mockedTemplateService_ListTemplatesClient.TrailerCalls()) +// +// len(mockedTemplateService_ListTemplatesClient.TrailerCalls()) func (mock *TemplateService_ListTemplatesClientMock) TrailerCalls() []struct{} { var calls []struct{} mock.lockTrailer.RLock() diff --git a/protos/template/template.pb.go b/protos/template/template.pb.go index d299242af..2f8a25a43 100644 --- a/protos/template/template.pb.go +++ b/protos/template/template.pb.go @@ -8,8 +8,8 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.27.1 -// protoc v3.18.0 +// protoc-gen-go v1.28.1 +// protoc (unknown) // source: protos/template/template.proto package template @@ -31,7 +31,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// // Empty represents an empty response type Empty struct { state protoimpl.MessageState @@ -71,31 +70,24 @@ func (*Empty) Descriptor() ([]byte, []int) { return file_protos_template_template_proto_rawDescGZIP(), []int{0} } -// // WorkflowTemplate describes the template itself. type WorkflowTemplate struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - // // The template identifier Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` - // // The name of the template. You can see it as a friendly way to remember a // template Name string `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty"` - // // When a template got created CreatedAt *timestamppb.Timestamp `protobuf:"bytes,4,opt,name=created_at,json=createdAt,proto3" json:"created_at,omitempty"` - // // The last time a template was modified UpdatedAt *timestamppb.Timestamp `protobuf:"bytes,5,opt,name=updated_at,json=updatedAt,proto3" json:"updated_at,omitempty"` - // // When a template got deleted. This is the value used to identify a deleted // template as well. If empty the template can be used to generate workflows. DeletedAt *timestamppb.Timestamp `protobuf:"bytes,6,opt,name=deleted_at,json=deletedAt,proto3" json:"deleted_at,omitempty"` - // // The content of the template in its YAML representation Data string `protobuf:"bytes,7,opt,name=data,proto3" json:"data,omitempty"` } @@ -174,7 +166,6 @@ func (x *WorkflowTemplate) GetData() string { return "" } -// // CreateResponse returns the ID of the created template type CreateResponse struct { state protoimpl.MessageState @@ -223,7 +214,6 @@ func (x *CreateResponse) GetId() string { return "" } -// // GetRequest enables you to filter templates by name or id. type GetRequest struct { state protoimpl.MessageState @@ -231,6 +221,7 @@ type GetRequest struct { unknownFields protoimpl.UnknownFields // Types that are assignable to GetBy: + // // *GetRequest_Id // *GetRequest_Name GetBy isGetRequest_GetBy `protobuf_oneof:"get_by"` @@ -294,13 +285,11 @@ type isGetRequest_GetBy interface { } type GetRequest_Id struct { - // // Filter by the template id Id string `protobuf:"bytes,1,opt,name=id,proto3,oneof"` } type GetRequest_Name struct { - // // Filter by the template name Name string `protobuf:"bytes,2,opt,name=name,proto3,oneof"` } @@ -309,7 +298,6 @@ func (*GetRequest_Id) isGetRequest_GetBy() {} func (*GetRequest_Name) isGetRequest_GetBy() {} -// // The request to use during a List template request type ListRequest struct { state protoimpl.MessageState @@ -317,6 +305,7 @@ type ListRequest struct { unknownFields protoimpl.UnknownFields // Types that are assignable to FilterBy: + // // *ListRequest_Name FilterBy isListRequest_FilterBy `protobuf_oneof:"filter_by"` } @@ -372,7 +361,6 @@ type isListRequest_FilterBy interface { } type ListRequest_Name struct { - // // Filter by the template name Name string `protobuf:"bytes,1,opt,name=name,proto3,oneof"` } diff --git a/protos/template/template_grpc.pb.go b/protos/template/template_grpc.pb.go index f39fe3fab..d1e23af9e 100644 --- a/protos/template/template_grpc.pb.go +++ b/protos/template/template_grpc.pb.go @@ -19,19 +19,14 @@ const _ = grpc.SupportPackageIsVersion7 // // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. type TemplateServiceClient interface { - // // CreateTemplate stores a template in the Tinkerbell server. CreateTemplate(ctx context.Context, in *WorkflowTemplate, opts ...grpc.CallOption) (*CreateResponse, error) - // // GetTemplate returns a specific template via its identifier. GetTemplate(ctx context.Context, in *GetRequest, opts ...grpc.CallOption) (*WorkflowTemplate, error) - // // DeleteTemplate deletes a template via its identifier. DeleteTemplate(ctx context.Context, in *GetRequest, opts ...grpc.CallOption) (*Empty, error) - // // ListTemplates returns all the template stored in Tinkerbell server ListTemplates(ctx context.Context, in *ListRequest, opts ...grpc.CallOption) (TemplateService_ListTemplatesClient, error) - // // UpdateTemplate updates a template // TODO: Read the code and figure out how an update work UpdateTemplate(ctx context.Context, in *WorkflowTemplate, opts ...grpc.CallOption) (*Empty, error) @@ -117,19 +112,14 @@ func (c *templateServiceClient) UpdateTemplate(ctx context.Context, in *Workflow // All implementations should embed UnimplementedTemplateServiceServer // for forward compatibility type TemplateServiceServer interface { - // // CreateTemplate stores a template in the Tinkerbell server. CreateTemplate(context.Context, *WorkflowTemplate) (*CreateResponse, error) - // // GetTemplate returns a specific template via its identifier. GetTemplate(context.Context, *GetRequest) (*WorkflowTemplate, error) - // // DeleteTemplate deletes a template via its identifier. DeleteTemplate(context.Context, *GetRequest) (*Empty, error) - // // ListTemplates returns all the template stored in Tinkerbell server ListTemplates(*ListRequest, TemplateService_ListTemplatesServer) error - // // UpdateTemplate updates a template // TODO: Read the code and figure out how an update work UpdateTemplate(context.Context, *WorkflowTemplate) (*Empty, error) diff --git a/protos/workflow/mock.go b/protos/workflow/mock.go index 2c0ac3820..a6a4fc0c5 100644 --- a/protos/workflow/mock.go +++ b/protos/workflow/mock.go @@ -17,58 +17,58 @@ var _ WorkflowServiceClient = &WorkflowServiceClientMock{} // WorkflowServiceClientMock is a mock implementation of WorkflowServiceClient. // -// func TestSomethingThatUsesWorkflowServiceClient(t *testing.T) { +// func TestSomethingThatUsesWorkflowServiceClient(t *testing.T) { // -// // make and configure a mocked WorkflowServiceClient -// mockedWorkflowServiceClient := &WorkflowServiceClientMock{ -// CreateWorkflowFunc: func(ctx context.Context, in *CreateRequest, opts ...grpc.CallOption) (*CreateResponse, error) { -// panic("mock out the CreateWorkflow method") -// }, -// DeleteWorkflowFunc: func(ctx context.Context, in *GetRequest, opts ...grpc.CallOption) (*Empty, error) { -// panic("mock out the DeleteWorkflow method") -// }, -// GetWorkflowFunc: func(ctx context.Context, in *GetRequest, opts ...grpc.CallOption) (*Workflow, error) { -// panic("mock out the GetWorkflow method") -// }, -// GetWorkflowActionsFunc: func(ctx context.Context, in *WorkflowActionsRequest, opts ...grpc.CallOption) (*WorkflowActionList, error) { -// panic("mock out the GetWorkflowActions method") -// }, -// GetWorkflowContextFunc: func(ctx context.Context, in *GetRequest, opts ...grpc.CallOption) (*WorkflowContext, error) { -// panic("mock out the GetWorkflowContext method") -// }, -// GetWorkflowContextListFunc: func(ctx context.Context, in *WorkflowContextRequest, opts ...grpc.CallOption) (*WorkflowContextList, error) { -// panic("mock out the GetWorkflowContextList method") -// }, -// GetWorkflowContextsFunc: func(ctx context.Context, in *WorkflowContextRequest, opts ...grpc.CallOption) (WorkflowService_GetWorkflowContextsClient, error) { -// panic("mock out the GetWorkflowContexts method") -// }, -// GetWorkflowDataFunc: func(ctx context.Context, in *GetWorkflowDataRequest, opts ...grpc.CallOption) (*GetWorkflowDataResponse, error) { -// panic("mock out the GetWorkflowData method") -// }, -// GetWorkflowDataVersionFunc: func(ctx context.Context, in *GetWorkflowDataRequest, opts ...grpc.CallOption) (*GetWorkflowDataResponse, error) { -// panic("mock out the GetWorkflowDataVersion method") -// }, -// GetWorkflowMetadataFunc: func(ctx context.Context, in *GetWorkflowDataRequest, opts ...grpc.CallOption) (*GetWorkflowDataResponse, error) { -// panic("mock out the GetWorkflowMetadata method") -// }, -// ListWorkflowsFunc: func(ctx context.Context, in *Empty, opts ...grpc.CallOption) (WorkflowService_ListWorkflowsClient, error) { -// panic("mock out the ListWorkflows method") -// }, -// ReportActionStatusFunc: func(ctx context.Context, in *WorkflowActionStatus, opts ...grpc.CallOption) (*Empty, error) { -// panic("mock out the ReportActionStatus method") -// }, -// ShowWorkflowEventsFunc: func(ctx context.Context, in *GetRequest, opts ...grpc.CallOption) (WorkflowService_ShowWorkflowEventsClient, error) { -// panic("mock out the ShowWorkflowEvents method") -// }, -// UpdateWorkflowDataFunc: func(ctx context.Context, in *UpdateWorkflowDataRequest, opts ...grpc.CallOption) (*Empty, error) { -// panic("mock out the UpdateWorkflowData method") -// }, -// } +// // make and configure a mocked WorkflowServiceClient +// mockedWorkflowServiceClient := &WorkflowServiceClientMock{ +// CreateWorkflowFunc: func(ctx context.Context, in *CreateRequest, opts ...grpc.CallOption) (*CreateResponse, error) { +// panic("mock out the CreateWorkflow method") +// }, +// DeleteWorkflowFunc: func(ctx context.Context, in *GetRequest, opts ...grpc.CallOption) (*Empty, error) { +// panic("mock out the DeleteWorkflow method") +// }, +// GetWorkflowFunc: func(ctx context.Context, in *GetRequest, opts ...grpc.CallOption) (*Workflow, error) { +// panic("mock out the GetWorkflow method") +// }, +// GetWorkflowActionsFunc: func(ctx context.Context, in *WorkflowActionsRequest, opts ...grpc.CallOption) (*WorkflowActionList, error) { +// panic("mock out the GetWorkflowActions method") +// }, +// GetWorkflowContextFunc: func(ctx context.Context, in *GetRequest, opts ...grpc.CallOption) (*WorkflowContext, error) { +// panic("mock out the GetWorkflowContext method") +// }, +// GetWorkflowContextListFunc: func(ctx context.Context, in *WorkflowContextRequest, opts ...grpc.CallOption) (*WorkflowContextList, error) { +// panic("mock out the GetWorkflowContextList method") +// }, +// GetWorkflowContextsFunc: func(ctx context.Context, in *WorkflowContextRequest, opts ...grpc.CallOption) (WorkflowService_GetWorkflowContextsClient, error) { +// panic("mock out the GetWorkflowContexts method") +// }, +// GetWorkflowDataFunc: func(ctx context.Context, in *GetWorkflowDataRequest, opts ...grpc.CallOption) (*GetWorkflowDataResponse, error) { +// panic("mock out the GetWorkflowData method") +// }, +// GetWorkflowDataVersionFunc: func(ctx context.Context, in *GetWorkflowDataRequest, opts ...grpc.CallOption) (*GetWorkflowDataResponse, error) { +// panic("mock out the GetWorkflowDataVersion method") +// }, +// GetWorkflowMetadataFunc: func(ctx context.Context, in *GetWorkflowDataRequest, opts ...grpc.CallOption) (*GetWorkflowDataResponse, error) { +// panic("mock out the GetWorkflowMetadata method") +// }, +// ListWorkflowsFunc: func(ctx context.Context, in *Empty, opts ...grpc.CallOption) (WorkflowService_ListWorkflowsClient, error) { +// panic("mock out the ListWorkflows method") +// }, +// ReportActionStatusFunc: func(ctx context.Context, in *WorkflowActionStatus, opts ...grpc.CallOption) (*Empty, error) { +// panic("mock out the ReportActionStatus method") +// }, +// ShowWorkflowEventsFunc: func(ctx context.Context, in *GetRequest, opts ...grpc.CallOption) (WorkflowService_ShowWorkflowEventsClient, error) { +// panic("mock out the ShowWorkflowEvents method") +// }, +// UpdateWorkflowDataFunc: func(ctx context.Context, in *UpdateWorkflowDataRequest, opts ...grpc.CallOption) (*Empty, error) { +// panic("mock out the UpdateWorkflowData method") +// }, +// } // -// // use mockedWorkflowServiceClient in code that requires WorkflowServiceClient -// // and then make assertions. +// // use mockedWorkflowServiceClient in code that requires WorkflowServiceClient +// // and then make assertions. // -// } +// } type WorkflowServiceClientMock struct { // CreateWorkflowFunc mocks the CreateWorkflow method. CreateWorkflowFunc func(ctx context.Context, in *CreateRequest, opts ...grpc.CallOption) (*CreateResponse, error) @@ -279,7 +279,8 @@ func (mock *WorkflowServiceClientMock) CreateWorkflow(ctx context.Context, in *C // CreateWorkflowCalls gets all the calls that were made to CreateWorkflow. // Check the length with: -// len(mockedWorkflowServiceClient.CreateWorkflowCalls()) +// +// len(mockedWorkflowServiceClient.CreateWorkflowCalls()) func (mock *WorkflowServiceClientMock) CreateWorkflowCalls() []struct { Ctx context.Context In *CreateRequest @@ -318,7 +319,8 @@ func (mock *WorkflowServiceClientMock) DeleteWorkflow(ctx context.Context, in *G // DeleteWorkflowCalls gets all the calls that were made to DeleteWorkflow. // Check the length with: -// len(mockedWorkflowServiceClient.DeleteWorkflowCalls()) +// +// len(mockedWorkflowServiceClient.DeleteWorkflowCalls()) func (mock *WorkflowServiceClientMock) DeleteWorkflowCalls() []struct { Ctx context.Context In *GetRequest @@ -357,7 +359,8 @@ func (mock *WorkflowServiceClientMock) GetWorkflow(ctx context.Context, in *GetR // GetWorkflowCalls gets all the calls that were made to GetWorkflow. // Check the length with: -// len(mockedWorkflowServiceClient.GetWorkflowCalls()) +// +// len(mockedWorkflowServiceClient.GetWorkflowCalls()) func (mock *WorkflowServiceClientMock) GetWorkflowCalls() []struct { Ctx context.Context In *GetRequest @@ -396,7 +399,8 @@ func (mock *WorkflowServiceClientMock) GetWorkflowActions(ctx context.Context, i // GetWorkflowActionsCalls gets all the calls that were made to GetWorkflowActions. // Check the length with: -// len(mockedWorkflowServiceClient.GetWorkflowActionsCalls()) +// +// len(mockedWorkflowServiceClient.GetWorkflowActionsCalls()) func (mock *WorkflowServiceClientMock) GetWorkflowActionsCalls() []struct { Ctx context.Context In *WorkflowActionsRequest @@ -435,7 +439,8 @@ func (mock *WorkflowServiceClientMock) GetWorkflowContext(ctx context.Context, i // GetWorkflowContextCalls gets all the calls that were made to GetWorkflowContext. // Check the length with: -// len(mockedWorkflowServiceClient.GetWorkflowContextCalls()) +// +// len(mockedWorkflowServiceClient.GetWorkflowContextCalls()) func (mock *WorkflowServiceClientMock) GetWorkflowContextCalls() []struct { Ctx context.Context In *GetRequest @@ -474,7 +479,8 @@ func (mock *WorkflowServiceClientMock) GetWorkflowContextList(ctx context.Contex // GetWorkflowContextListCalls gets all the calls that were made to GetWorkflowContextList. // Check the length with: -// len(mockedWorkflowServiceClient.GetWorkflowContextListCalls()) +// +// len(mockedWorkflowServiceClient.GetWorkflowContextListCalls()) func (mock *WorkflowServiceClientMock) GetWorkflowContextListCalls() []struct { Ctx context.Context In *WorkflowContextRequest @@ -513,7 +519,8 @@ func (mock *WorkflowServiceClientMock) GetWorkflowContexts(ctx context.Context, // GetWorkflowContextsCalls gets all the calls that were made to GetWorkflowContexts. // Check the length with: -// len(mockedWorkflowServiceClient.GetWorkflowContextsCalls()) +// +// len(mockedWorkflowServiceClient.GetWorkflowContextsCalls()) func (mock *WorkflowServiceClientMock) GetWorkflowContextsCalls() []struct { Ctx context.Context In *WorkflowContextRequest @@ -552,7 +559,8 @@ func (mock *WorkflowServiceClientMock) GetWorkflowData(ctx context.Context, in * // GetWorkflowDataCalls gets all the calls that were made to GetWorkflowData. // Check the length with: -// len(mockedWorkflowServiceClient.GetWorkflowDataCalls()) +// +// len(mockedWorkflowServiceClient.GetWorkflowDataCalls()) func (mock *WorkflowServiceClientMock) GetWorkflowDataCalls() []struct { Ctx context.Context In *GetWorkflowDataRequest @@ -591,7 +599,8 @@ func (mock *WorkflowServiceClientMock) GetWorkflowDataVersion(ctx context.Contex // GetWorkflowDataVersionCalls gets all the calls that were made to GetWorkflowDataVersion. // Check the length with: -// len(mockedWorkflowServiceClient.GetWorkflowDataVersionCalls()) +// +// len(mockedWorkflowServiceClient.GetWorkflowDataVersionCalls()) func (mock *WorkflowServiceClientMock) GetWorkflowDataVersionCalls() []struct { Ctx context.Context In *GetWorkflowDataRequest @@ -630,7 +639,8 @@ func (mock *WorkflowServiceClientMock) GetWorkflowMetadata(ctx context.Context, // GetWorkflowMetadataCalls gets all the calls that were made to GetWorkflowMetadata. // Check the length with: -// len(mockedWorkflowServiceClient.GetWorkflowMetadataCalls()) +// +// len(mockedWorkflowServiceClient.GetWorkflowMetadataCalls()) func (mock *WorkflowServiceClientMock) GetWorkflowMetadataCalls() []struct { Ctx context.Context In *GetWorkflowDataRequest @@ -669,7 +679,8 @@ func (mock *WorkflowServiceClientMock) ListWorkflows(ctx context.Context, in *Em // ListWorkflowsCalls gets all the calls that were made to ListWorkflows. // Check the length with: -// len(mockedWorkflowServiceClient.ListWorkflowsCalls()) +// +// len(mockedWorkflowServiceClient.ListWorkflowsCalls()) func (mock *WorkflowServiceClientMock) ListWorkflowsCalls() []struct { Ctx context.Context In *Empty @@ -708,7 +719,8 @@ func (mock *WorkflowServiceClientMock) ReportActionStatus(ctx context.Context, i // ReportActionStatusCalls gets all the calls that were made to ReportActionStatus. // Check the length with: -// len(mockedWorkflowServiceClient.ReportActionStatusCalls()) +// +// len(mockedWorkflowServiceClient.ReportActionStatusCalls()) func (mock *WorkflowServiceClientMock) ReportActionStatusCalls() []struct { Ctx context.Context In *WorkflowActionStatus @@ -747,7 +759,8 @@ func (mock *WorkflowServiceClientMock) ShowWorkflowEvents(ctx context.Context, i // ShowWorkflowEventsCalls gets all the calls that were made to ShowWorkflowEvents. // Check the length with: -// len(mockedWorkflowServiceClient.ShowWorkflowEventsCalls()) +// +// len(mockedWorkflowServiceClient.ShowWorkflowEventsCalls()) func (mock *WorkflowServiceClientMock) ShowWorkflowEventsCalls() []struct { Ctx context.Context In *GetRequest @@ -786,7 +799,8 @@ func (mock *WorkflowServiceClientMock) UpdateWorkflowData(ctx context.Context, i // UpdateWorkflowDataCalls gets all the calls that were made to UpdateWorkflowData. // Check the length with: -// len(mockedWorkflowServiceClient.UpdateWorkflowDataCalls()) +// +// len(mockedWorkflowServiceClient.UpdateWorkflowDataCalls()) func (mock *WorkflowServiceClientMock) UpdateWorkflowDataCalls() []struct { Ctx context.Context In *UpdateWorkflowDataRequest @@ -809,37 +823,37 @@ var _ WorkflowService_ListWorkflowsClient = &WorkflowService_ListWorkflowsClient // WorkflowService_ListWorkflowsClientMock is a mock implementation of WorkflowService_ListWorkflowsClient. // -// func TestSomethingThatUsesWorkflowService_ListWorkflowsClient(t *testing.T) { +// func TestSomethingThatUsesWorkflowService_ListWorkflowsClient(t *testing.T) { // -// // make and configure a mocked WorkflowService_ListWorkflowsClient -// mockedWorkflowService_ListWorkflowsClient := &WorkflowService_ListWorkflowsClientMock{ -// CloseSendFunc: func() error { -// panic("mock out the CloseSend method") -// }, -// ContextFunc: func() context.Context { -// panic("mock out the Context method") -// }, -// HeaderFunc: func() (metadata.MD, error) { -// panic("mock out the Header method") -// }, -// RecvFunc: func() (*Workflow, error) { -// panic("mock out the Recv method") -// }, -// RecvMsgFunc: func(m interface{}) error { -// panic("mock out the RecvMsg method") -// }, -// SendMsgFunc: func(m interface{}) error { -// panic("mock out the SendMsg method") -// }, -// TrailerFunc: func() metadata.MD { -// panic("mock out the Trailer method") -// }, -// } +// // make and configure a mocked WorkflowService_ListWorkflowsClient +// mockedWorkflowService_ListWorkflowsClient := &WorkflowService_ListWorkflowsClientMock{ +// CloseSendFunc: func() error { +// panic("mock out the CloseSend method") +// }, +// ContextFunc: func() context.Context { +// panic("mock out the Context method") +// }, +// HeaderFunc: func() (metadata.MD, error) { +// panic("mock out the Header method") +// }, +// RecvFunc: func() (*Workflow, error) { +// panic("mock out the Recv method") +// }, +// RecvMsgFunc: func(m interface{}) error { +// panic("mock out the RecvMsg method") +// }, +// SendMsgFunc: func(m interface{}) error { +// panic("mock out the SendMsg method") +// }, +// TrailerFunc: func() metadata.MD { +// panic("mock out the Trailer method") +// }, +// } // -// // use mockedWorkflowService_ListWorkflowsClient in code that requires WorkflowService_ListWorkflowsClient -// // and then make assertions. +// // use mockedWorkflowService_ListWorkflowsClient in code that requires WorkflowService_ListWorkflowsClient +// // and then make assertions. // -// } +// } type WorkflowService_ListWorkflowsClientMock struct { // CloseSendFunc mocks the CloseSend method. CloseSendFunc func() error @@ -908,7 +922,8 @@ func (mock *WorkflowService_ListWorkflowsClientMock) CloseSend() error { // CloseSendCalls gets all the calls that were made to CloseSend. // Check the length with: -// len(mockedWorkflowService_ListWorkflowsClient.CloseSendCalls()) +// +// len(mockedWorkflowService_ListWorkflowsClient.CloseSendCalls()) func (mock *WorkflowService_ListWorkflowsClientMock) CloseSendCalls() []struct{} { var calls []struct{} mock.lockCloseSend.RLock() @@ -931,7 +946,8 @@ func (mock *WorkflowService_ListWorkflowsClientMock) Context() context.Context { // ContextCalls gets all the calls that were made to Context. // Check the length with: -// len(mockedWorkflowService_ListWorkflowsClient.ContextCalls()) +// +// len(mockedWorkflowService_ListWorkflowsClient.ContextCalls()) func (mock *WorkflowService_ListWorkflowsClientMock) ContextCalls() []struct{} { var calls []struct{} mock.lockContext.RLock() @@ -954,7 +970,8 @@ func (mock *WorkflowService_ListWorkflowsClientMock) Header() (metadata.MD, erro // HeaderCalls gets all the calls that were made to Header. // Check the length with: -// len(mockedWorkflowService_ListWorkflowsClient.HeaderCalls()) +// +// len(mockedWorkflowService_ListWorkflowsClient.HeaderCalls()) func (mock *WorkflowService_ListWorkflowsClientMock) HeaderCalls() []struct{} { var calls []struct{} mock.lockHeader.RLock() @@ -977,7 +994,8 @@ func (mock *WorkflowService_ListWorkflowsClientMock) Recv() (*Workflow, error) { // RecvCalls gets all the calls that were made to Recv. // Check the length with: -// len(mockedWorkflowService_ListWorkflowsClient.RecvCalls()) +// +// len(mockedWorkflowService_ListWorkflowsClient.RecvCalls()) func (mock *WorkflowService_ListWorkflowsClientMock) RecvCalls() []struct{} { var calls []struct{} mock.lockRecv.RLock() @@ -1004,7 +1022,8 @@ func (mock *WorkflowService_ListWorkflowsClientMock) RecvMsg(m interface{}) erro // RecvMsgCalls gets all the calls that were made to RecvMsg. // Check the length with: -// len(mockedWorkflowService_ListWorkflowsClient.RecvMsgCalls()) +// +// len(mockedWorkflowService_ListWorkflowsClient.RecvMsgCalls()) func (mock *WorkflowService_ListWorkflowsClientMock) RecvMsgCalls() []struct { M interface{} } { @@ -1035,7 +1054,8 @@ func (mock *WorkflowService_ListWorkflowsClientMock) SendMsg(m interface{}) erro // SendMsgCalls gets all the calls that were made to SendMsg. // Check the length with: -// len(mockedWorkflowService_ListWorkflowsClient.SendMsgCalls()) +// +// len(mockedWorkflowService_ListWorkflowsClient.SendMsgCalls()) func (mock *WorkflowService_ListWorkflowsClientMock) SendMsgCalls() []struct { M interface{} } { @@ -1062,7 +1082,8 @@ func (mock *WorkflowService_ListWorkflowsClientMock) Trailer() metadata.MD { // TrailerCalls gets all the calls that were made to Trailer. // Check the length with: -// len(mockedWorkflowService_ListWorkflowsClient.TrailerCalls()) +// +// len(mockedWorkflowService_ListWorkflowsClient.TrailerCalls()) func (mock *WorkflowService_ListWorkflowsClientMock) TrailerCalls() []struct{} { var calls []struct{} mock.lockTrailer.RLock() diff --git a/protos/workflow/workflow.pb.go b/protos/workflow/workflow.pb.go index 8f48b3073..67aca0504 100644 --- a/protos/workflow/workflow.pb.go +++ b/protos/workflow/workflow.pb.go @@ -4,8 +4,8 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.27.1 -// protoc v3.18.0 +// protoc-gen-go v1.28.1 +// protoc (unknown) // source: protos/workflow/workflow.proto package workflow @@ -27,30 +27,24 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// // The various state a workflow can be type State int32 const ( - // // A workflow is in pending state when it is waiting for the hardware to pick // it up and start the execution. State_STATE_PENDING State = 0 - // // A workflow is in a running state when the tink-worker started the // exeuction of it, and it is currently in execution inside the device // itself. State_STATE_RUNNING State = 1 - // // Failed is a final state. Something wrong happened during the execution of // the workflow inside the target. Have a look at the logs to see if you can // spot what is going on. State_STATE_FAILED State = 2 - // // Timeout is final state, almost like FAILED but it communicate to you that // an action or the overall workflow reached the specified timeout. State_STATE_TIMEOUT State = 3 - // // This is the state we all deserve. The execution of the workflow is over // and everything is just fine. Sit down, and enjoy your great work. State_STATE_SUCCESS State = 4 @@ -101,7 +95,6 @@ func (State) EnumDescriptor() ([]byte, []int) { return file_protos_workflow_workflow_proto_rawDescGZIP(), []int{0} } -// // Empty represents an empty response type Empty struct { state protoimpl.MessageState @@ -141,32 +134,24 @@ func (*Empty) Descriptor() ([]byte, []int) { return file_protos_workflow_workflow_proto_rawDescGZIP(), []int{0} } -// // Workflow represent a single workflow type Workflow struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - // // The unique identifier for a workflow Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` - // // The template this workflows starts from Template string `protobuf:"bytes,2,opt,name=template,proto3" json:"template,omitempty"` - // // The hardware assigned to a workflow Hardware string `protobuf:"bytes,3,opt,name=hardware,proto3" json:"hardware,omitempty"` - // // Current state of the workflow. Pending, success, failed, running. State State `protobuf:"varint,4,opt,name=state,proto3,enum=jackfan.us.kg.tinkerbell.tink.protos.workflow.State" json:"state,omitempty"` - // // When the workflow was created CreatedAt *timestamppb.Timestamp `protobuf:"bytes,5,opt,name=created_at,json=createdAt,proto3" json:"created_at,omitempty"` - // // The last time the workflow was modified UpdatedAt *timestamppb.Timestamp `protobuf:"bytes,6,opt,name=updated_at,json=updatedAt,proto3" json:"updated_at,omitempty"` - // // When the workflow was deleted DeletedAt *timestamppb.Timestamp `protobuf:"bytes,7,opt,name=deleted_at,json=deletedAt,proto3" json:"deleted_at,omitempty"` Data string `protobuf:"bytes,8,opt,name=data,proto3" json:"data,omitempty"` @@ -260,7 +245,6 @@ func (x *Workflow) GetData() string { return "" } -// // CreateRequest registers a workflow in the Tinkerbell server. From this point // in time it is in pending state, waiting to be executed from the tink-worker // inside the selected hardware @@ -269,10 +253,8 @@ type CreateRequest struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - // // The idenfier of the template the workflow starts from. Template string `protobuf:"bytes,1,opt,name=template,proto3" json:"template,omitempty"` - // // The target hardware for this workflow. Hardware string `protobuf:"bytes,2,opt,name=hardware,proto3" json:"hardware,omitempty"` } @@ -323,7 +305,6 @@ func (x *CreateRequest) GetHardware() string { return "" } -// // This is the response returned after a successful workflow creation. It // contains the workflow id. type CreateResponse struct { @@ -373,7 +354,6 @@ func (x *CreateResponse) GetId() string { return "" } -// // GetRequest contains the workflow idenfier you want to get back from the // Tinkerbell server. type GetRequest struct { @@ -423,7 +403,6 @@ func (x *GetRequest) GetId() string { return "" } -// // WorkflowContext represents the state of the execution of this workflow in detail. // How many tasks are currently executed, the number of actions and their state. type WorkflowContext struct { @@ -431,23 +410,16 @@ type WorkflowContext struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - // // The workflow ID - WorkflowId string `protobuf:"bytes,1,opt,name=workflow_id,json=workflowId,proto3" json:"workflow_id,omitempty"` - // + WorkflowId string `protobuf:"bytes,1,opt,name=workflow_id,json=workflowId,proto3" json:"workflow_id,omitempty"` CurrentWorker string `protobuf:"bytes,2,opt,name=current_worker,json=currentWorker,proto3" json:"current_worker,omitempty"` - // - CurrentTask string `protobuf:"bytes,3,opt,name=current_task,json=currentTask,proto3" json:"current_task,omitempty"` - // + CurrentTask string `protobuf:"bytes,3,opt,name=current_task,json=currentTask,proto3" json:"current_task,omitempty"` // the name of the current action CurrentAction string `protobuf:"bytes,4,opt,name=current_action,json=currentAction,proto3" json:"current_action,omitempty"` - // // The index of the current action CurrentActionIndex int64 `protobuf:"varint,5,opt,name=current_action_index,json=currentActionIndex,proto3" json:"current_action_index,omitempty"` - // // The state of the current action - CurrentActionState State `protobuf:"varint,6,opt,name=current_action_state,json=currentActionState,proto3,enum=jackfan.us.kg.tinkerbell.tink.protos.workflow.State" json:"current_action_state,omitempty"` - // + CurrentActionState State `protobuf:"varint,6,opt,name=current_action_state,json=currentActionState,proto3,enum=jackfan.us.kg.tinkerbell.tink.protos.workflow.State" json:"current_action_state,omitempty"` TotalNumberOfActions int64 `protobuf:"varint,7,opt,name=total_number_of_actions,json=totalNumberOfActions,proto3" json:"total_number_of_actions,omitempty"` } @@ -532,7 +504,6 @@ func (x *WorkflowContext) GetTotalNumberOfActions() int64 { return 0 } -// // WorkflowActionStatus represents the state of all the action part of a // workflow type WorkflowActionStatus struct { @@ -540,31 +511,23 @@ type WorkflowActionStatus struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - // // The workflow id WorkflowId string `protobuf:"bytes,1,opt,name=workflow_id,json=workflowId,proto3" json:"workflow_id,omitempty"` - // // The name of the task this action is part of TaskName string `protobuf:"bytes,2,opt,name=task_name,json=taskName,proto3" json:"task_name,omitempty"` - // // The name of the action ActionName string `protobuf:"bytes,3,opt,name=action_name,json=actionName,proto3" json:"action_name,omitempty"` - // // The state of the action. Those are the same described for workflow as // well. pending, running, successful and so on. ActionStatus State `protobuf:"varint,4,opt,name=action_status,json=actionStatus,proto3,enum=jackfan.us.kg.tinkerbell.tink.protos.workflow.State" json:"action_status,omitempty"` - // // The execution time for the action Seconds int64 `protobuf:"varint,5,opt,name=seconds,proto3" json:"seconds,omitempty"` - // // The message returned from the action. Message string `protobuf:"bytes,6,opt,name=message,proto3" json:"message,omitempty"` - // // When the status got created for this aciton. You can see it as the time // when the action started its execution inside the hardware itself. CreatedAt *timestamppb.Timestamp `protobuf:"bytes,7,opt,name=created_at,json=createdAt,proto3" json:"created_at,omitempty"` - // - WorkerId string `protobuf:"bytes,8,opt,name=worker_id,json=workerId,proto3" json:"worker_id,omitempty"` + WorkerId string `protobuf:"bytes,8,opt,name=worker_id,json=workerId,proto3" json:"worker_id,omitempty"` } func (x *WorkflowActionStatus) Reset() { @@ -655,13 +618,11 @@ func (x *WorkflowActionStatus) GetWorkerId() string { return "" } -// type WorkflowContextRequest struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - // WorkerId string `protobuf:"bytes,1,opt,name=worker_id,json=workerId,proto3" json:"worker_id,omitempty"` } @@ -704,7 +665,6 @@ func (x *WorkflowContextRequest) GetWorkerId() string { return "" } -// type WorkflowContextList struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -752,7 +712,6 @@ func (x *WorkflowContextList) GetWorkflowContexts() []*WorkflowContext { return nil } -// // WorkflowActionsRequest is used to get actions for a particular workflow type WorkflowActionsRequest struct { state protoimpl.MessageState @@ -801,46 +760,35 @@ func (x *WorkflowActionsRequest) GetWorkflowId() string { return "" } -// // WorkflowAction represents a single aciton part of a workflow type WorkflowAction struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - // // The name of the task the action belong to. TaskName string `protobuf:"bytes,1,opt,name=task_name,json=taskName,proto3" json:"task_name,omitempty"` - // // The name of the action Name string `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty"` - // // The docker/oci image the action starts from Image string `protobuf:"bytes,3,opt,name=image,proto3" json:"image,omitempty"` - // // Every action has a timeout, after that the execution stops and the action // gets in a timeout state. Timeout int64 `protobuf:"varint,4,opt,name=timeout,proto3" json:"timeout,omitempty"` - // // You can override the command executed for the container Command []string `protobuf:"bytes,5,rep,name=command,proto3" json:"command,omitempty"` - // // On timeout used to be a way to execute an action if the current one times out // but with the event system in place this is not needed anymore OnTimeout []string `protobuf:"bytes,6,rep,name=on_timeout,json=onTimeout,proto3" json:"on_timeout,omitempty"` - // // On failure used to be a way to execute an action if the current one fails // but with the event system in place this is not needed anymore OnFailure []string `protobuf:"bytes,7,rep,name=on_failure,json=onFailure,proto3" json:"on_failure,omitempty"` WorkerId string `protobuf:"bytes,8,opt,name=worker_id,json=workerId,proto3" json:"worker_id,omitempty"` - // // You can mount directory from your host to the running action, mainly to // share files, or state Volumes []string `protobuf:"bytes,9,rep,name=volumes,proto3" json:"volumes,omitempty"` - // // Set environment variables usable from the action itself. Environment []string `protobuf:"bytes,10,rep,name=environment,proto3" json:"environment,omitempty"` - // // Set the namespace that the process IDs will be in. Pid string `protobuf:"bytes,11,opt,name=pid,proto3" json:"pid,omitempty"` } @@ -954,7 +902,6 @@ func (x *WorkflowAction) GetPid() string { return "" } -// // A list of actions type WorkflowActionList struct { state protoimpl.MessageState @@ -1003,7 +950,6 @@ func (x *WorkflowActionList) GetActionList() []*WorkflowAction { return nil } -// // When a workflow gets created we have the ability to replace variables // declared in the template with concrete variables. This is the request you // can use to visualize those data. @@ -1062,7 +1008,6 @@ func (x *GetWorkflowDataRequest) GetVersion() int32 { return 0 } -// // List of data passed during workflow creation. type GetWorkflowDataResponse struct { state protoimpl.MessageState @@ -1119,7 +1064,6 @@ func (x *GetWorkflowDataResponse) GetVersion() int32 { return 0 } -// // You can change data passed to a workflow type UpdateWorkflowDataRequest struct { state protoimpl.MessageState diff --git a/protos/workflow/workflow_grpc.pb.go b/protos/workflow/workflow_grpc.pb.go index 3de1976b2..9e28dd60b 100644 --- a/protos/workflow/workflow_grpc.pb.go +++ b/protos/workflow/workflow_grpc.pb.go @@ -19,27 +19,21 @@ const _ = grpc.SupportPackageIsVersion7 // // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. type WorkflowServiceClient interface { - // // CreateWorkflow targets a specific hardware and it starts from a particular // template. The selected hardware is capable of picking the // workflow up for execution. CreateWorkflow(ctx context.Context, in *CreateRequest, opts ...grpc.CallOption) (*CreateResponse, error) - // // GetWorkflow returns a specific workflow by its identifier. GetWorkflow(ctx context.Context, in *GetRequest, opts ...grpc.CallOption) (*Workflow, error) - // // DeleteWorkflow deletes a workflow. This is a logical deletion. Workflow // will stay available for inspection DeleteWorkflow(ctx context.Context, in *GetRequest, opts ...grpc.CallOption) (*Empty, error) - // // ListWorkflows returns a list of workflows ListWorkflows(ctx context.Context, in *Empty, opts ...grpc.CallOption) (WorkflowService_ListWorkflowsClient, error) - // // GetWorkflowContext returns specific information about where it is running, // its state and so on. Useful to debug a workflow and to understand its // current state. GetWorkflowContext(ctx context.Context, in *GetRequest, opts ...grpc.CallOption) (*WorkflowContext, error) - // // ShowWorkflowEvents returns a list of events for a specific workflows ShowWorkflowEvents(ctx context.Context, in *GetRequest, opts ...grpc.CallOption) (WorkflowService_ShowWorkflowEventsClient, error) GetWorkflowContextList(ctx context.Context, in *WorkflowContextRequest, opts ...grpc.CallOption) (*WorkflowContextList, error) @@ -259,27 +253,21 @@ func (c *workflowServiceClient) UpdateWorkflowData(ctx context.Context, in *Upda // All implementations should embed UnimplementedWorkflowServiceServer // for forward compatibility type WorkflowServiceServer interface { - // // CreateWorkflow targets a specific hardware and it starts from a particular // template. The selected hardware is capable of picking the // workflow up for execution. CreateWorkflow(context.Context, *CreateRequest) (*CreateResponse, error) - // // GetWorkflow returns a specific workflow by its identifier. GetWorkflow(context.Context, *GetRequest) (*Workflow, error) - // // DeleteWorkflow deletes a workflow. This is a logical deletion. Workflow // will stay available for inspection DeleteWorkflow(context.Context, *GetRequest) (*Empty, error) - // // ListWorkflows returns a list of workflows ListWorkflows(*Empty, WorkflowService_ListWorkflowsServer) error - // // GetWorkflowContext returns specific information about where it is running, // its state and so on. Useful to debug a workflow and to understand its // current state. GetWorkflowContext(context.Context, *GetRequest) (*WorkflowContext, error) - // // ShowWorkflowEvents returns a list of events for a specific workflows ShowWorkflowEvents(*GetRequest, WorkflowService_ShowWorkflowEventsServer) error GetWorkflowContextList(context.Context, *WorkflowContextRequest) (*WorkflowContextList, error) diff --git a/rules.mk b/rules.mk index 0bdcffb74..e2f0f4037 100644 --- a/rules.mk +++ b/rules.mk @@ -81,6 +81,7 @@ check-protomocks: .PHONY: pbfiles pbfiles: buf.gen.yaml buf.lock $(shell git ls-files 'protos/*/*.proto') $(toolsBins) + buf mod update buf generate gofumpt -w protos/*/*.pb.* From c49e48a92d4e99d4415e4cc83671243ee2e6a39f Mon Sep 17 00:00:00 2001 From: Jacob Weinstock Date: Wed, 14 Sep 2022 23:39:01 +0000 Subject: [PATCH 02/11] Add VLANID to hardware.spec.Interfaces: This will help in enabling trunk vlan support in across the Tinkerbell stack. See proposal 0030 in https://github.com/tinkerbell/proposals Signed-off-by: Jacob Weinstock --- config/crd/bases/tinkerbell.org_hardware.yaml | 2 ++ pkg/apis/core/v1alpha1/hardware_types.go | 1 + 2 files changed, 3 insertions(+) diff --git a/config/crd/bases/tinkerbell.org_hardware.yaml b/config/crd/bases/tinkerbell.org_hardware.yaml index 444444f15..11f17c416 100644 --- a/config/crd/bases/tinkerbell.org_hardware.yaml +++ b/config/crd/bases/tinkerbell.org_hardware.yaml @@ -120,6 +120,8 @@ spec: type: array uefi: type: boolean + vlan_id: + type: integer type: object netboot: description: Netboot configuration. diff --git a/pkg/apis/core/v1alpha1/hardware_types.go b/pkg/apis/core/v1alpha1/hardware_types.go index 4dc7ec770..4658d578f 100644 --- a/pkg/apis/core/v1alpha1/hardware_types.go +++ b/pkg/apis/core/v1alpha1/hardware_types.go @@ -130,6 +130,7 @@ type DHCP struct { UEFI bool `json:"uefi,omitempty"` IfaceName string `json:"iface_name,omitempty"` IP *IP `json:"ip,omitempty"` + VLANID uint `json:"vlan_id,omitempty"` } // IP configuration. From 1c8f702900462e35d0f51c7ee1a6456fa6b13191 Mon Sep 17 00:00:00 2001 From: Jacob Weinstock Date: Thu, 15 Sep 2022 00:20:37 +0000 Subject: [PATCH 03/11] Update golangci-lint version and fixing linting errors: The version was a bit out dated and was having issues with Go 1.19. Updated and fixed all linting errors. Signed-off-by: Jacob Weinstock --- client/main.go | 3 ++- cmd/tink-cli/cmd/delete/delete.go | 2 +- cmd/tink-cli/cmd/delete/delete_test.go | 6 +++--- cmd/tink-cli/cmd/delete/doc.go | 2 +- cmd/tink-cli/cmd/docs_test.go | 5 ++--- cmd/tink-cli/cmd/get/get_test.go | 3 +-- cmd/tink-cli/cmd/hardware/get_test.go | 3 +-- cmd/tink-cli/cmd/hardware/push.go | 6 +++--- cmd/tink-cli/cmd/template/create.go | 3 +-- cmd/tink-cli/cmd/template/get_test.go | 3 +-- cmd/tink-cli/cmd/template/update.go | 3 +-- cmd/tink-worker/worker/container_manager.go | 6 ++++-- cmd/tink-worker/worker/container_manager_test.go | 3 ++- cmd/tink-worker/worker/log_capturer.go | 4 +++- cmd/tink-worker/worker/worker.go | 13 ++++++++----- db/db_test.go | 2 +- db/hardware_test.go | 13 +++++-------- db/workflow.go | 10 +++++----- grpc-server/grpc_server_test.go | 6 +++--- http-server/http_server.go | 2 +- lint.mk | 2 +- pkg/apis/core/v1alpha1/hardware_types.go | 1 - pkg/apis/core/v1alpha1/workflow_data_types.go | 1 - pkg/convert/workflow_test.go | 1 - server/dbserver_hardware.go | 2 +- server/dbserver_template.go | 2 +- server/dbserver_workflow.go | 4 ++-- tests/e2e_test.go | 4 ++-- workflow/funcs.go | 5 +++-- workflow/template_validator.go | 4 ++-- workflow/template_validator_test.go | 5 ++--- 31 files changed, 63 insertions(+), 66 deletions(-) diff --git a/client/main.go b/client/main.go index 9c8d27da6..d917bbac2 100644 --- a/client/main.go +++ b/client/main.go @@ -9,6 +9,7 @@ import ( "go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc" "google.golang.org/grpc" "google.golang.org/grpc/credentials" + "google.golang.org/grpc/credentials/insecure" ) // gRPC clients. @@ -40,7 +41,7 @@ func NewClientConn(authority string, tls bool) (*grpc.ClientConn, error) { if tls { creds = grpc.WithTransportCredentials(credentials.NewTLS(nil)) } else { - creds = grpc.WithInsecure() + creds = grpc.WithTransportCredentials(insecure.NewCredentials()) } conn, err := grpc.Dial(authority, diff --git a/cmd/tink-cli/cmd/delete/delete.go b/cmd/tink-cli/cmd/delete/delete.go index 9013edc7a..aea616bab 100644 --- a/cmd/tink-cli/cmd/delete/delete.go +++ b/cmd/tink-cli/cmd/delete/delete.go @@ -1,4 +1,4 @@ -package delete // nolint:predeclared // package name delete has same name as predeclared identifier +package delete //nolint:predeclared // package name delete has same name as predeclared identifier import ( "context" diff --git a/cmd/tink-cli/cmd/delete/delete_test.go b/cmd/tink-cli/cmd/delete/delete_test.go index 6c14dbc11..ce11bbe2c 100644 --- a/cmd/tink-cli/cmd/delete/delete_test.go +++ b/cmd/tink-cli/cmd/delete/delete_test.go @@ -1,9 +1,9 @@ -package delete // nolint:predeclared // package name delete has same name as predeclared identifier +package delete //nolint:predeclared // package name delete has same name as predeclared identifier import ( "bytes" "context" - "io/ioutil" + "io" "testing" "github.com/google/go-cmp/cmp" @@ -86,7 +86,7 @@ func TestNewDeleteCommand(t *testing.T) { if err != nil { t.Error(err) } - out, err := ioutil.ReadAll(stdout) + out, err := io.ReadAll(stdout) if err != nil { t.Error(err) } diff --git a/cmd/tink-cli/cmd/delete/doc.go b/cmd/tink-cli/cmd/delete/doc.go index 0469f5a7d..8a9006466 100644 --- a/cmd/tink-cli/cmd/delete/doc.go +++ b/cmd/tink-cli/cmd/delete/doc.go @@ -1,4 +1,4 @@ // Package delete provides a reusable implementation of the Delete command // for the tink cli. The Delete command deletes resources. It is designed // to be extendible and usable across resources. -package delete // nolint:predeclared // package name delete has same name as predeclared identifier +package delete //nolint:predeclared // package name delete has same name as predeclared identifier diff --git a/cmd/tink-cli/cmd/docs_test.go b/cmd/tink-cli/cmd/docs_test.go index c3f68809e..c1ab826ed 100644 --- a/cmd/tink-cli/cmd/docs_test.go +++ b/cmd/tink-cli/cmd/docs_test.go @@ -3,7 +3,6 @@ package cmd import ( "bytes" - "io/ioutil" "os" "path" "strings" @@ -63,7 +62,7 @@ func Test_docsCmd(t *testing.T) { cmdFunc: func(t *testing.T, c *cobra.Command) { t.Helper() - dir, err := ioutil.TempDir("", "tink-test-*") + dir, err := os.MkdirTemp("", "tink-test-*") if err != nil { t.Fatal(err) } @@ -95,7 +94,7 @@ func Test_docsCmd(t *testing.T) { cmdFunc: func(t *testing.T, c *cobra.Command) { t.Helper() - dir, err := ioutil.TempDir("", "tink-test-*") + dir, err := os.MkdirTemp("", "tink-test-*") if err != nil { t.Fatal(err) } diff --git a/cmd/tink-cli/cmd/get/get_test.go b/cmd/tink-cli/cmd/get/get_test.go index d9aa3ecfc..6448a8991 100644 --- a/cmd/tink-cli/cmd/get/get_test.go +++ b/cmd/tink-cli/cmd/get/get_test.go @@ -5,7 +5,6 @@ import ( "context" "fmt" "io" - "io/ioutil" "testing" "github.com/google/go-cmp/cmp" @@ -234,7 +233,7 @@ func TestNewGetCommand(t *testing.T) { if fmt.Sprint(err) != fmt.Sprint(s.ExpectError) { t.Errorf("unexpected error: want=%v, got=%v", s.ExpectError, err) } - out, err := ioutil.ReadAll(stdout) + out, err := io.ReadAll(stdout) if err != nil { t.Error(err) } diff --git a/cmd/tink-cli/cmd/hardware/get_test.go b/cmd/tink-cli/cmd/hardware/get_test.go index 65f4daf1b..3947eb425 100644 --- a/cmd/tink-cli/cmd/hardware/get_test.go +++ b/cmd/tink-cli/cmd/hardware/get_test.go @@ -4,7 +4,6 @@ import ( "bytes" "context" "io" - "io/ioutil" "testing" "github.com/google/go-cmp/cmp" @@ -101,7 +100,7 @@ func TestGetHardware(t *testing.T) { if err != nil { t.Error(err) } - out, err := ioutil.ReadAll(stdout) + out, err := io.ReadAll(stdout) if err != nil { t.Error(err) } diff --git a/cmd/tink-cli/cmd/hardware/push.go b/cmd/tink-cli/cmd/hardware/push.go index f1abf5206..bb94ebefb 100644 --- a/cmd/tink-cli/cmd/hardware/push.go +++ b/cmd/tink-cli/cmd/hardware/push.go @@ -6,7 +6,7 @@ import ( "context" "encoding/json" "fmt" - "io/ioutil" + "io" "log" "os" "path/filepath" @@ -82,7 +82,7 @@ func isInputFromPipe() bool { } func readDataFromStdin() string { - data, err := ioutil.ReadAll(os.Stdin) + data, err := io.ReadAll(os.Stdin) if err != nil { return "" } @@ -96,7 +96,7 @@ func readDataFromFile() (string, error) { } defer f.Close() - data, err := ioutil.ReadAll(f) + data, err := io.ReadAll(f) if err != nil { return "", err } diff --git a/cmd/tink-cli/cmd/template/create.go b/cmd/tink-cli/cmd/template/create.go index 2c4273479..91a4ce177 100644 --- a/cmd/tink-cli/cmd/template/create.go +++ b/cmd/tink-cli/cmd/template/create.go @@ -5,7 +5,6 @@ import ( "context" "fmt" "io" - "io/ioutil" "log" "os" "path/filepath" @@ -64,7 +63,7 @@ $ tink template create --file /tmp/example.tmpl } func readAll(reader io.Reader) []byte { - data, err := ioutil.ReadAll(reader) + data, err := io.ReadAll(reader) if err != nil { log.Fatal(err) } diff --git a/cmd/tink-cli/cmd/template/get_test.go b/cmd/tink-cli/cmd/template/get_test.go index 69a89583a..b3ccf0a8f 100644 --- a/cmd/tink-cli/cmd/template/get_test.go +++ b/cmd/tink-cli/cmd/template/get_test.go @@ -4,7 +4,6 @@ import ( "bytes" "context" "io" - "io/ioutil" "testing" "time" @@ -76,7 +75,7 @@ func TestGetTemplate(t *testing.T) { if err != nil { t.Error(err) } - out, err := ioutil.ReadAll(stdout) + out, err := io.ReadAll(stdout) if err != nil { t.Error(err) } diff --git a/cmd/tink-cli/cmd/template/update.go b/cmd/tink-cli/cmd/template/update.go index feb98f763..7249e288b 100644 --- a/cmd/tink-cli/cmd/template/update.go +++ b/cmd/tink-cli/cmd/template/update.go @@ -4,7 +4,6 @@ import ( "context" "fmt" "io" - "io/ioutil" "log" "os" "path/filepath" @@ -94,7 +93,7 @@ func readTemplateData() (string, error) { reader = f } - data, err := ioutil.ReadAll(reader) + data, err := io.ReadAll(reader) if err != nil { return "", err } diff --git a/cmd/tink-worker/worker/container_manager.go b/cmd/tink-worker/worker/container_manager.go index d5464d011..6dd70e8e6 100644 --- a/cmd/tink-worker/worker/container_manager.go +++ b/cmd/tink-worker/worker/container_manager.go @@ -38,7 +38,9 @@ func (m *containerManager) getLogger(ctx context.Context) *log.Logger { if loggerIface == nil { return &m.logger } - return loggerIface.(*log.Logger) + l, _ := loggerIface.(*log.Logger) + + return l } // NewContainerManager returns a new container manager. @@ -89,7 +91,7 @@ func (m *containerManager) StartContainer(ctx context.Context, id string) error func (m *containerManager) WaitForContainer(ctx context.Context, id string) (pb.State, error) { // Inspect whether the container is in running state if _, err := m.cli.ContainerInspect(ctx, id); err != nil { - return pb.State_STATE_FAILED, nil // nolint:nilerr // error is not nil, but it returns nil + return pb.State_STATE_FAILED, nil //nolint:nilerr // error is not nil, but it returns nil } // send API call to wait for the container completion diff --git a/cmd/tink-worker/worker/container_manager_test.go b/cmd/tink-worker/worker/container_manager_test.go index 4cba909e4..330524c57 100644 --- a/cmd/tink-worker/worker/container_manager_test.go +++ b/cmd/tink-worker/worker/container_manager_test.go @@ -39,7 +39,8 @@ func newFakeDockerClient(containerID, imagePullContent string, delay time.Durati } func (c *fakeDockerClient) ContainerCreate( - context.Context, *containertypes.Config, *containertypes.HostConfig, *networktypes.NetworkingConfig, *specs.Platform, string) (containertypes.ContainerCreateCreatedBody, error) { + context.Context, *containertypes.Config, *containertypes.HostConfig, *networktypes.NetworkingConfig, *specs.Platform, string, +) (containertypes.ContainerCreateCreatedBody, error) { if c.err != nil { return containertypes.ContainerCreateCreatedBody{}, c.err } diff --git a/cmd/tink-worker/worker/log_capturer.go b/cmd/tink-worker/worker/log_capturer.go index b6a1ba60d..6431d8d03 100644 --- a/cmd/tink-worker/worker/log_capturer.go +++ b/cmd/tink-worker/worker/log_capturer.go @@ -24,7 +24,9 @@ func (l *DockerLogCapturer) getLogger(ctx context.Context) *log.Logger { if loggerIface == nil { return &l.logger } - return loggerIface.(*log.Logger) + lg, _ := loggerIface.(*log.Logger) + + return lg } // NewDockerLogCapturer returns a LogCapturer that can stream container logs to a given writer. diff --git a/cmd/tink-worker/worker/worker.go b/cmd/tink-worker/worker/worker.go index f7452aba1..baf3792ca 100644 --- a/cmd/tink-worker/worker/worker.go +++ b/cmd/tink-worker/worker/worker.go @@ -6,7 +6,7 @@ import ( "encoding/base64" "encoding/json" "fmt" - "io/ioutil" + "io" "os" "path/filepath" "strconv" @@ -127,7 +127,8 @@ func NewWorker( containerManager ContainerManager, logCapturer LogCapturer, logger log.Logger, - opts ...Option) *Worker { + opts ...Option, +) *Worker { w := &Worker{ workerID: workerID, dataDir: defaultDataDir, @@ -154,7 +155,9 @@ func (w Worker) getLogger(ctx context.Context) *log.Logger { if loggerIface == nil { return &w.logger } - return loggerIface.(*log.Logger) + l, _ := loggerIface.(*log.Logger) + + return l } // execute executes a workflow action, optionally capturing logs. @@ -400,7 +403,7 @@ func (w *Worker) ProcessWorkflowActions(ctx context.Context) error { if len(actions.GetActionList()) == actionIndex+1 { l.Info("reached to end of workflow") delete(workflowcontexts, wfID) - turn = false // nolint:wastedassign // assigned to turn, but reassigned without using the value + turn = false //nolint:wastedassign // assigned to turn, but reassigned without using the value break } @@ -494,7 +497,7 @@ func (w *Worker) updateWorkflowData(ctx context.Context, actionStatus *pb.Workfl } }() - data, err := ioutil.ReadAll(f) + data, err := io.ReadAll(f) if err != nil { l.Error(err) } diff --git a/db/db_test.go b/db/db_test.go index 4d1309495..5eda4c1df 100644 --- a/db/db_test.go +++ b/db/db_test.go @@ -76,7 +76,7 @@ func NewPostgresDatabaseClient(ctx context.Context, t *testing.T, req NewPostgre if err != nil { t.Error(err) } - t.Log(fmt.Sprintf("applied %d migrations", n)) + t.Logf("applied %d migrations", n) } return dbCon, tinkDB, func() error { return postgresC.Terminate(ctx) diff --git a/db/hardware_test.go b/db/hardware_test.go index f85d155bf..abde1c501 100644 --- a/db/hardware_test.go +++ b/db/hardware_test.go @@ -5,7 +5,7 @@ import ( "context" "encoding/json" "fmt" - "io/ioutil" + "os" "strings" "sync" "testing" @@ -364,10 +364,8 @@ func TestGetByIP(t *testing.T) { for ii := 0; ii < 10; ii++ { hw := readHardwareData("./testdata/hardware.json") hw.Id = uuid.New().String() - hw.Network.Interfaces[0].Dhcp.Ip.Address = - strings.Replace(hw.Network.Interfaces[0].Dhcp.Ip.Address, "1", fmt.Sprintf("%d", ii), 1) - hw.Network.Interfaces[0].Dhcp.Mac = - strings.Replace(hw.Network.Interfaces[0].Dhcp.Mac, "00", fmt.Sprintf("0%d", ii), 1) + hw.Network.Interfaces[0].Dhcp.Ip.Address = strings.Replace(hw.Network.Interfaces[0].Dhcp.Ip.Address, "1", fmt.Sprintf("%d", ii), 1) + hw.Network.Interfaces[0].Dhcp.Mac = strings.Replace(hw.Network.Interfaces[0].Dhcp.Mac, "00", fmt.Sprintf("0%d", ii), 1) } return input }(), @@ -477,8 +475,7 @@ func TestGetByMAC(t *testing.T) { for ii := 0; ii < 10; ii++ { hw := readHardwareData("./testdata/hardware.json") hw.Id = uuid.New().String() - hw.Network.Interfaces[0].Dhcp.Mac = - strings.Replace(hw.Network.Interfaces[0].Dhcp.Mac, "00", fmt.Sprintf("0%d", ii), 1) + hw.Network.Interfaces[0].Dhcp.Mac = strings.Replace(hw.Network.Interfaces[0].Dhcp.Mac, "00", fmt.Sprintf("0%d", ii), 1) } return input }(), @@ -549,7 +546,7 @@ func TestGetByMAC_WithNonExistingMAC(t *testing.T) { } func readHardwareData(file string) *hardware.Hardware { - data, err := ioutil.ReadFile(file) + data, err := os.ReadFile(file) if err != nil { panic(err) } diff --git a/db/workflow.go b/db/workflow.go index 42d926568..70824d468 100644 --- a/db/workflow.go +++ b/db/workflow.go @@ -257,7 +257,7 @@ func (d TinkDB) GetfromWfDataTable(ctx context.Context, req *pb.GetWorkflowDataR return buf, nil } - if err != sql.ErrNoRows { + if err != sql.ErrNoRows { //nolint:errorlint // there's no wrapping going on here err = errors.Wrap(err, "SELECT") d.logger.Error(err) } @@ -288,7 +288,7 @@ func (d TinkDB) GetWorkflowMetadata(ctx context.Context, req *pb.GetWorkflowData return buf, nil } - if err != sql.ErrNoRows { + if err != sql.ErrNoRows { //nolint:errorlint // there's no wrapping going on here err = errors.Wrap(err, "SELECT from workflow_data") d.logger.Error(err) } @@ -359,7 +359,7 @@ func (d TinkDB) GetWorkflow(ctx context.Context, id string) (Workflow, error) { UpdatedAt: updatedAt, }, nil } - if err != sql.ErrNoRows { + if err != sql.ErrNoRows { //nolint:errorlint // there's no wrapping going on here err = errors.Wrap(err, "SELECT") d.logger.Error(err) return Workflow{}, err @@ -538,7 +538,7 @@ func (d TinkDB) GetWorkflowContexts(ctx context.Context, wfID string) (*pb.Workf TotalNumberOfActions: tact, }, nil } - if err != sql.ErrNoRows { + if err != sql.ErrNoRows { //nolint:errorlint // there's no wrapping going on here err = errors.Wrap(err, "SELECT from worflow_state") d.logger.Error(err) return &pb.WorkflowContext{}, err @@ -566,7 +566,7 @@ func (d TinkDB) GetWorkflowActions(ctx context.Context, wfID string) (*pb.Workfl ActionList: actions, }, nil } - if err != sql.ErrNoRows { + if err != sql.ErrNoRows { //nolint:errorlint // there's no wrapping going on here err = errors.Wrap(err, "SELECT from worflow_state") d.logger.Error(err) } diff --git a/grpc-server/grpc_server_test.go b/grpc-server/grpc_server_test.go index 94ca25b67..02ee48636 100644 --- a/grpc-server/grpc_server_test.go +++ b/grpc-server/grpc_server_test.go @@ -3,7 +3,7 @@ package grpcserver import ( "context" "fmt" - "io/ioutil" + "os" "path/filepath" "testing" "time" @@ -127,11 +127,11 @@ func TestGetCerts(t *testing.T) { func(t *testing.T) (string, error) { t.Helper() tdir := t.TempDir() - err := ioutil.WriteFile(filepath.Join(tdir, "bundle.pem"), []byte{}, 0o644) + err := os.WriteFile(filepath.Join(tdir, "bundle.pem"), []byte{}, 0o644) if err != nil { return "", err } - err = ioutil.WriteFile(filepath.Join(tdir, "server-key.pem"), []byte{}, 0o644) + err = os.WriteFile(filepath.Join(tdir, "server-key.pem"), []byte{}, 0o644) if err != nil { return "", err } diff --git a/http-server/http_server.go b/http-server/http_server.go index 992cb4bc9..2677986bf 100644 --- a/http-server/http_server.go +++ b/http-server/http_server.go @@ -24,7 +24,7 @@ func SetupHTTP(ctx context.Context, logger log.Logger, authority string, errCh c http.HandleFunc("/version", getGitRevJSONHandler()) http.HandleFunc("/healthz", healthCheckHandler) - srv := &http.Server{ + srv := &http.Server{ //nolint:gosec // TODO: fix Potential Slowloris Attack because ReadHeaderTimeout is not configured Addr: authority, } go func() { diff --git a/lint.mk b/lint.mk index e2a6b5a03..f52563958 100644 --- a/lint.mk +++ b/lint.mk @@ -54,7 +54,7 @@ hadolint-lint: $(HADOLINT_BIN) $(HADOLINT_BIN) --no-fail $(shell find . -name "*Dockerfile") GOLANGCI_LINT_CONFIG := $(LINT_ROOT)/.golangci.yml -GOLANGCI_LINT_VERSION ?= v1.43.0 +GOLANGCI_LINT_VERSION ?= v1.49.0 GOLANGCI_LINT_BIN := out/linters/golangci-lint-$(GOLANGCI_LINT_VERSION)-$(LINT_ARCH) $(GOLANGCI_LINT_BIN): mkdir -p out/linters diff --git a/pkg/apis/core/v1alpha1/hardware_types.go b/pkg/apis/core/v1alpha1/hardware_types.go index 4658d578f..98084feac 100644 --- a/pkg/apis/core/v1alpha1/hardware_types.go +++ b/pkg/apis/core/v1alpha1/hardware_types.go @@ -43,7 +43,6 @@ type Hardware struct { // HardwareSpec defines the desired state of Hardware. type HardwareSpec struct { - // BMCRef contains a relation to a BMC state management type in the same // namespace as the Hardware. This may be used for BMC management by // orchestrators. diff --git a/pkg/apis/core/v1alpha1/workflow_data_types.go b/pkg/apis/core/v1alpha1/workflow_data_types.go index 01045daed..f026af0cb 100644 --- a/pkg/apis/core/v1alpha1/workflow_data_types.go +++ b/pkg/apis/core/v1alpha1/workflow_data_types.go @@ -12,7 +12,6 @@ type WorkflowDataSpec struct { // WorkflowStatus defines the observed state of Workflow. type WorkflowDataStatus struct { - // Data is the populated Workflow Data in Tinkerbell. Data string `json:"data,omitempty"` diff --git a/pkg/convert/workflow_test.go b/pkg/convert/workflow_test.go index be781b010..30e745e2f 100644 --- a/pkg/convert/workflow_test.go +++ b/pkg/convert/workflow_test.go @@ -357,7 +357,6 @@ func TestWorkflowProtoToCRD(t *testing.T) { APIVersion: "tinkerbell.org/v1alpha1", }, ObjectMeta: metav1.ObjectMeta{ - Annotations: map[string]string{ "workflow.tinkerbell.org/id": "7d9031ee-18d4-4ba4-b934-c3a78a1330f6", }, diff --git a/server/dbserver_hardware.go b/server/dbserver_hardware.go index bcc1909f3..011b0a484 100644 --- a/server/dbserver_hardware.go +++ b/server/dbserver_hardware.go @@ -155,7 +155,7 @@ func (s *DBServer) All(_ *hardware.Empty, stream hardware.HardwareService_AllSer defer metrics.CacheInFlight.With(labels).Dec() s.dbLock.RLock() - ready := s.dbReady + ready := s.dbReady //nolint:ifshort // needed for locking s.dbLock.RUnlock() if !ready { metrics.CacheStalls.With(labels).Inc() diff --git a/server/dbserver_template.go b/server/dbserver_template.go index 3858f7d53..baf55ff8d 100644 --- a/server/dbserver_template.go +++ b/server/dbserver_template.go @@ -117,7 +117,7 @@ func (s *DBServer) ListTemplates(in *template.ListRequest, stream template.Templ } s.dbLock.RLock() - ready := s.dbReady + ready := s.dbReady //nolint:ifshort // needed for locking s.dbLock.RUnlock() if !ready { metrics.CacheStalls.With(labels).Inc() diff --git a/server/dbserver_workflow.go b/server/dbserver_workflow.go index c02761b6a..db33ed91a 100644 --- a/server/dbserver_workflow.go +++ b/server/dbserver_workflow.go @@ -160,7 +160,7 @@ func (s *DBServer) ListWorkflows(_ *workflow.Empty, stream workflow.WorkflowServ defer metrics.CacheInFlight.With(labels).Dec() s.dbLock.RLock() - ready := s.dbReady + ready := s.dbReady //nolint:ifshort // needed for locking s.dbLock.RUnlock() if !ready { metrics.CacheStalls.With(labels).Inc() @@ -244,7 +244,7 @@ func (s *DBServer) ShowWorkflowEvents(req *workflow.GetRequest, stream workflow. defer metrics.CacheInFlight.With(labels).Dec() s.dbLock.RLock() - ready := s.dbReady + ready := s.dbReady //nolint:ifshort // needed for locking s.dbLock.RUnlock() if !ready { metrics.CacheStalls.With(labels).Inc() diff --git a/tests/e2e_test.go b/tests/e2e_test.go index 9594430df..ed96a3b52 100644 --- a/tests/e2e_test.go +++ b/tests/e2e_test.go @@ -3,7 +3,7 @@ package tests_test import ( "context" "fmt" - "io/ioutil" + "os" "path/filepath" "time" @@ -22,7 +22,7 @@ import ( ) func parseFile(filename string, obj interface{}) error { - data, err := ioutil.ReadFile(filename) + data, err := os.ReadFile(filename) if err != nil { return err } diff --git a/workflow/funcs.go b/workflow/funcs.go index 2b4f1f456..c6af8e5d8 100644 --- a/workflow/funcs.go +++ b/workflow/funcs.go @@ -17,8 +17,9 @@ var templateFuncs = map[string]interface{}{ // unidentifiable device path it returns the dev. // // Examples -// formatPartition("/dev/nvme0n1", 0) -> /dev/nvme0n1p1 -// formatPartition("/dev/sda", 1) -> /dev/sda1 +// +// formatPartition("/dev/nvme0n1", 0) -> /dev/nvme0n1p1 +// formatPartition("/dev/sda", 1) -> /dev/sda1 func formatPartition(dev string, partition int) string { switch { case strings.HasPrefix(dev, "/dev/nvme"): diff --git a/workflow/template_validator.go b/workflow/template_validator.go index aa0f3c561..2c8e98271 100644 --- a/workflow/template_validator.go +++ b/workflow/template_validator.go @@ -4,7 +4,7 @@ import ( "bytes" "encoding/json" "fmt" - "io/ioutil" + "os" "path/filepath" "text/template" @@ -53,7 +53,7 @@ func MustParse(yamlContent []byte) *Workflow { // MustParseFromFile parse a template from a file and it panics if any error is // detected. Ideal to be used in testing. func MustParseFromFile(path string) *Workflow { - content, err := ioutil.ReadFile(filepath.Clean(path)) + content, err := os.ReadFile(filepath.Clean(path)) if err != nil { panic(err) } diff --git a/workflow/template_validator_test.go b/workflow/template_validator_test.go index 63b9c6948..ead342a79 100644 --- a/workflow/template_validator_test.go +++ b/workflow/template_validator_test.go @@ -1,7 +1,6 @@ package workflow import ( - "io/ioutil" "os" "strings" "testing" @@ -101,13 +100,13 @@ func TestMustParseFromFile(t *testing.T) { } }() - file, err := ioutil.TempFile(os.TempDir(), "tinktest") + file, err := os.CreateTemp(os.TempDir(), "tinktest") if err != nil { t.Error(err) } defer os.Remove(file.Name()) - err = ioutil.WriteFile(file.Name(), []byte(s.Input), os.ModeAppend) + err = os.WriteFile(file.Name(), []byte(s.Input), os.ModeAppend) if err != nil { t.Error(err) } From 0720af066fc8dd6cd9e46782f1b7c7560112c81b Mon Sep 17 00:00:00 2001 From: Jacob Weinstock Date: Thu, 15 Sep 2022 00:28:00 +0000 Subject: [PATCH 04/11] Fix gofumpt error Signed-off-by: Jacob Weinstock --- tests/e2e_test.go | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/e2e_test.go b/tests/e2e_test.go index ed96a3b52..cbc6c0fd3 100644 --- a/tests/e2e_test.go +++ b/tests/e2e_test.go @@ -15,7 +15,6 @@ import ( "github.com/tinkerbell/tink/pkg/apis/core/v1alpha1" pb "github.com/tinkerbell/tink/protos/workflow" "google.golang.org/protobuf/proto" - "k8s.io/apimachinery/pkg/types" "sigs.k8s.io/yaml" From 6efdc01ca990c668c47d0f849449f8fdf2baa3d1 Mon Sep 17 00:00:00 2001 From: Jacob Weinstock Date: Thu, 15 Sep 2022 00:35:31 +0000 Subject: [PATCH 05/11] Move to Go 1.18 to fix make verify Signed-off-by: Jacob Weinstock --- .github/workflows/ci.yaml | 6 +++--- .golangci.yml | 4 ++-- cmd/tink-worker/worker/worker.go | 2 +- go.mod | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 4c235e3a7..a53009155 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -19,7 +19,7 @@ jobs: - name: Install Go uses: actions/setup-go@v2 with: - go-version: "1.17" + go-version: "1.18" - name: make verify run: make verify @@ -32,7 +32,7 @@ jobs: - name: Install Go uses: actions/setup-go@v2 with: - go-version: "1.17" + go-version: "1.18" - name: Install nix uses: cachix/install-nix-action@v16 @@ -83,7 +83,7 @@ jobs: - name: Install Go uses: actions/setup-go@v2 with: - go-version: "1.17" + go-version: "1.18" - run: make crosscompile -j$(nproc) diff --git a/.golangci.yml b/.golangci.yml index 98b473eb5..b5b058b21 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -92,10 +92,10 @@ linters-settings: - name: waitgroup-by-value staticcheck: - go: "1.17" + go: "1.18" unused: - go: "1.17" + go: "1.18" output: sort-results: true diff --git a/cmd/tink-worker/worker/worker.go b/cmd/tink-worker/worker/worker.go index baf3792ca..5fc039962 100644 --- a/cmd/tink-worker/worker/worker.go +++ b/cmd/tink-worker/worker/worker.go @@ -403,7 +403,7 @@ func (w *Worker) ProcessWorkflowActions(ctx context.Context) error { if len(actions.GetActionList()) == actionIndex+1 { l.Info("reached to end of workflow") delete(workflowcontexts, wfID) - turn = false //nolint:wastedassign // assigned to turn, but reassigned without using the value + turn = false break } diff --git a/go.mod b/go.mod index ab70ffcc3..4481bee55 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/tinkerbell/tink -go 1.17 +go 1.18 require ( github.com/bufbuild/buf v1.8.0 From 35f9c488ae392ff70ccc5e7436ca78573fc323ee Mon Sep 17 00:00:00 2001 From: Jacob Weinstock Date: Thu, 15 Sep 2022 01:25:26 +0000 Subject: [PATCH 06/11] Add Go 1.18 to nix shell Signed-off-by: Jacob Weinstock --- shell.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/shell.nix b/shell.nix index 4ad4fdc8c..24820d238 100644 --- a/shell.nix +++ b/shell.nix @@ -2,9 +2,9 @@ let _pkgs = import { }; in { pkgs ? import (_pkgs.fetchFromGitHub { owner = "NixOS"; repo = "nixpkgs"; - #branch@date: 21.11@2021-12-02 - rev = "21.11"; - sha256 = "sha256-AjhmbT4UBlJWqxY0ea8a6GU2C2HdKUREkG43oRr3TZg="; + #branch@date: nixos-unstable-small@2022-04-18 + rev = "e33fe968df5a2503290682278399b1198f7ba56f"; + sha256 = "0kr30yj9825jx4zzcyn43c398mx3l63ndgfrg1y9v3d739mfgyw3"; }) { } }: with pkgs; @@ -15,6 +15,7 @@ mkShell { git gnumake gnused + go_1_18 jq nixfmt nodePackages.prettier @@ -24,6 +25,5 @@ mkShell { python3Packages.setuptools shellcheck shfmt - vagrant ]; } From 0e1c11357e3e522aa08c062abc96c6b1755ad79a Mon Sep 17 00:00:00 2001 From: Jacob Weinstock Date: Thu, 15 Sep 2022 01:30:51 +0000 Subject: [PATCH 07/11] Use Go 1.18.6 in CI to fix build Signed-off-by: Jacob Weinstock --- .github/workflows/ci.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index a53009155..144943758 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -19,7 +19,7 @@ jobs: - name: Install Go uses: actions/setup-go@v2 with: - go-version: "1.18" + go-version: "1.18.6" - name: make verify run: make verify @@ -32,7 +32,7 @@ jobs: - name: Install Go uses: actions/setup-go@v2 with: - go-version: "1.18" + go-version: "1.18.6" - name: Install nix uses: cachix/install-nix-action@v16 @@ -83,7 +83,7 @@ jobs: - name: Install Go uses: actions/setup-go@v2 with: - go-version: "1.18" + go-version: "1.18.6" - run: make crosscompile -j$(nproc) From 6d4399453523929e6fde78d792220bab2940c381 Mon Sep 17 00:00:00 2001 From: Jacob Weinstock Date: Thu, 15 Sep 2022 01:54:43 +0000 Subject: [PATCH 08/11] Use Go 1.18.5 to fix CI builds Signed-off-by: Jacob Weinstock --- .github/workflows/ci.yaml | 6 +++--- shell.nix | 22 +++++++++++++++++----- 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 144943758..1665fa9cc 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -19,7 +19,7 @@ jobs: - name: Install Go uses: actions/setup-go@v2 with: - go-version: "1.18.6" + go-version: "1.18.5" - name: make verify run: make verify @@ -32,7 +32,7 @@ jobs: - name: Install Go uses: actions/setup-go@v2 with: - go-version: "1.18.6" + go-version: "1.18.5" - name: Install nix uses: cachix/install-nix-action@v16 @@ -83,7 +83,7 @@ jobs: - name: Install Go uses: actions/setup-go@v2 with: - go-version: "1.18.6" + go-version: "1.18.5" - run: make crosscompile -j$(nproc) diff --git a/shell.nix b/shell.nix index 24820d238..bf97972fa 100644 --- a/shell.nix +++ b/shell.nix @@ -2,20 +2,32 @@ let _pkgs = import { }; in { pkgs ? import (_pkgs.fetchFromGitHub { owner = "NixOS"; repo = "nixpkgs"; - #branch@date: nixos-unstable-small@2022-04-18 - rev = "e33fe968df5a2503290682278399b1198f7ba56f"; - sha256 = "0kr30yj9825jx4zzcyn43c398mx3l63ndgfrg1y9v3d739mfgyw3"; + #branch@date: 21.11@2021-12-02 + rev = "21.11"; + sha256 = "sha256-AjhmbT4UBlJWqxY0ea8a6GU2C2HdKUREkG43oRr3TZg="; }) { } }: with pkgs; -mkShell { +let + pkgs = import (_pkgs.fetchFromGitHub { + # go 1.18.5 + owner = "NixOS"; + repo = "nixpkgs"; + #branch@date: nixpkgs-unstable@2022-09-02 + rev = "ee01de29d2f58d56b1be4ae24c24bd91c5380cea"; + sha256 = "0829fqp43cp2ck56jympn5kk8ssjsyy993nsp0fjrnhi265hqps7"; + }) { }; + + go_1_18_5 = pkgs.go; + +in mkShell { buildInputs = [ docker-compose git gnumake gnused - go_1_18 + go_1_18_5 jq nixfmt nodePackages.prettier From bfeb112bc7dfa7703ba6f209541d952dd976768f Mon Sep 17 00:00:00 2001 From: Jacob Weinstock Date: Thu, 15 Sep 2022 01:57:07 +0000 Subject: [PATCH 09/11] Update generated files, just formatting changes Signed-off-by: Jacob Weinstock --- protos/hardware/hardware.pb.go | 50 ++++++++++++++++++---- protos/template/template.pb.go | 16 +++++++- protos/template/template_grpc.pb.go | 10 +++++ protos/workflow/workflow.pb.go | 64 +++++++++++++++++++++++++++-- protos/workflow/workflow_grpc.pb.go | 12 ++++++ 5 files changed, 138 insertions(+), 14 deletions(-) diff --git a/protos/hardware/hardware.pb.go b/protos/hardware/hardware.pb.go index 8deba1646..06e1e2c5b 100644 --- a/protos/hardware/hardware.pb.go +++ b/protos/hardware/hardware.pb.go @@ -26,6 +26,7 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) +// // PushRequest is the body for the Push method. It contains information about // a piece of hardware. type PushRequest struct { @@ -33,6 +34,7 @@ type PushRequest struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields + // // Hardware describes the hardware you want to register to Tinkerbell and // what it looks like. // Hostname, MAC address, DHCP, network interfaces, metadata and so on. @@ -78,6 +80,7 @@ func (x *PushRequest) GetData() *Hardware { return nil } +// // Empty represents an empty response type Empty struct { state protoimpl.MessageState @@ -117,6 +120,7 @@ func (*Empty) Descriptor() ([]byte, []int) { return file_protos_hardware_hardware_proto_rawDescGZIP(), []int{1} } +// // GetRequest is the request used by the Get various get methods exposed by the // hardware service. type GetRequest struct { @@ -182,17 +186,21 @@ func (x *GetRequest) GetId() string { return "" } +// // Hardware describes a specific device managed by Tinkerbell type Hardware struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields + // // Describe network layout for your hardware Network *Hardware_Network `protobuf:"bytes,6,opt,name=network,proto3" json:"network,omitempty"` + // // A UUID representing a unique identifier for your hardware Id string `protobuf:"bytes,7,opt,name=id,proto3" json:"id,omitempty"` Version int64 `protobuf:"varint,8,opt,name=version,proto3" json:"version,omitempty"` + // // Metadata served by Hegel and that are accessible from the server itself To // know more about what Hegel is have a look at the documentation // https://docs.tinkerbell.org/services/hegel/ @@ -263,6 +271,7 @@ func (x *Hardware) GetMetadata() string { return "" } +// // DeleteRequest gets used when you want to delete an hardware by its identifier. // Usually it is a UUID. type DeleteRequest struct { @@ -312,27 +321,36 @@ func (x *DeleteRequest) GetId() string { return "" } +// // DHCP represents type Hardware_DHCP struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields + // // The MAC address for your hardware. It is important to get it // right because it is used from Tinkerbell to dispatch workflows to the // right destination. Mac string `protobuf:"bytes,1,opt,name=mac,proto3" json:"mac,omitempty"` + // // Hostname represents the hostname of your server - Hostname string `protobuf:"bytes,3,opt,name=hostname,proto3" json:"hostname,omitempty"` - LeaseTime int64 `protobuf:"varint,4,opt,name=lease_time,json=leaseTime,proto3" json:"lease_time,omitempty"` + Hostname string `protobuf:"bytes,3,opt,name=hostname,proto3" json:"hostname,omitempty"` + LeaseTime int64 `protobuf:"varint,4,opt,name=lease_time,json=leaseTime,proto3" json:"lease_time,omitempty"` + // NameServers []string `protobuf:"bytes,5,rep,name=name_servers,json=nameServers,proto3" json:"name_servers,omitempty"` + // TimeServers []string `protobuf:"bytes,6,rep,name=time_servers,json=timeServers,proto3" json:"time_servers,omitempty"` + // // The CPU architecture like arm64, amd64, x86_64 and so on. Arch string `protobuf:"bytes,8,opt,name=arch,proto3" json:"arch,omitempty"` Uefi bool `protobuf:"varint,9,opt,name=uefi,proto3" json:"uefi,omitempty"` + // // The name of the interface in your hardware like eth0, en1 and so on. - IfaceName string `protobuf:"bytes,10,opt,name=iface_name,json=ifaceName,proto3" json:"iface_name,omitempty"` - Ip *Hardware_DHCP_IP `protobuf:"bytes,11,opt,name=ip,proto3" json:"ip,omitempty"` + IfaceName string `protobuf:"bytes,10,opt,name=iface_name,json=ifaceName,proto3" json:"iface_name,omitempty"` + // + // + Ip *Hardware_DHCP_IP `protobuf:"bytes,11,opt,name=ip,proto3" json:"ip,omitempty"` } func (x *Hardware_DHCP) Reset() { @@ -430,6 +448,7 @@ func (x *Hardware_DHCP) GetIp() *Hardware_DHCP_IP { return nil } +// // Netboot is the model used to represent and configure the netbooting // behavior From there you can customise the IPXE chained during boot, the in // memory operating system tand so on. @@ -438,19 +457,25 @@ type Hardware_Netboot struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields + // // This is a boolean value that tells to Tinkerbell if the hardware has PXE // enabled. If set to false Tinkerbell won't attempt a provisioning at the // moment. AllowPxe bool `protobuf:"varint,1,opt,name=allow_pxe,json=allowPxe,proto3" json:"allow_pxe,omitempty"` + // // When set to true Osie will lookup and execute the workflows assigned to // a particular hardware. // // When set to false Osie will be executed but no workflows will be // applied. This is useful if you don't want to execute any workflows but // you simply need an operating system running in memory - AllowWorkflow bool `protobuf:"varint,2,opt,name=allow_workflow,json=allowWorkflow,proto3" json:"allow_workflow,omitempty"` - Ipxe *Hardware_Netboot_IPXE `protobuf:"bytes,3,opt,name=ipxe,proto3" json:"ipxe,omitempty"` - Osie *Hardware_Netboot_Osie `protobuf:"bytes,5,opt,name=osie,proto3" json:"osie,omitempty"` + AllowWorkflow bool `protobuf:"varint,2,opt,name=allow_workflow,json=allowWorkflow,proto3" json:"allow_workflow,omitempty"` + // + // + Ipxe *Hardware_Netboot_IPXE `protobuf:"bytes,3,opt,name=ipxe,proto3" json:"ipxe,omitempty"` + // + // + Osie *Hardware_Netboot_Osie `protobuf:"bytes,5,opt,name=osie,proto3" json:"osie,omitempty"` } func (x *Hardware_Netboot) Reset() { @@ -513,6 +538,7 @@ func (x *Hardware_Netboot) GetOsie() *Hardware_Netboot_Osie { return nil } +// // Network describes the networking you expect in your hardware. // The number of interfaces, their name, gateway and IP. type Hardware_Network struct { @@ -520,6 +546,7 @@ type Hardware_Network struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields + // // Configure the network interfaces you have in your hardware and defines their // behavior. Interfaces []*Hardware_Network_Interface `protobuf:"bytes,3,rep,name=interfaces,proto3" json:"interfaces,omitempty"` @@ -635,6 +662,7 @@ func (x *Hardware_DHCP_IP) GetFamily() int64 { return 0 } +// // IPXE is the network boot firmware Tinkerbell uses to start the // provisioning in the hardware type Hardware_Netboot_IPXE struct { @@ -642,8 +670,10 @@ type Hardware_Netboot_IPXE struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields + // // This is the location of the IPXE script - Url string `protobuf:"bytes,1,opt,name=url,proto3" json:"url,omitempty"` + Url string `protobuf:"bytes,1,opt,name=url,proto3" json:"url,omitempty"` + // Contents string `protobuf:"bytes,2,opt,name=contents,proto3" json:"contents,omitempty"` } @@ -693,6 +723,7 @@ func (x *Hardware_Netboot_IPXE) GetContents() string { return "" } +// // Osie is the in memory operating system type Hardware_Netboot_Osie struct { state protoimpl.MessageState @@ -757,15 +788,18 @@ func (x *Hardware_Netboot_Osie) GetInitrd() string { return "" } +// // Interface represents a single network interface in your hardware type Hardware_Network_Interface struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields + // // DHCP configures the behavior of DHCP connection for your hardware. // IP you expect, gateway and netmask. Dhcp *Hardware_DHCP `protobuf:"bytes,1,opt,name=dhcp,proto3" json:"dhcp,omitempty"` + // // Netboot pilots netbooting. You can select Osie, the in memory // operating system used during netbooting. Netboot *Hardware_Netboot `protobuf:"bytes,2,opt,name=netboot,proto3" json:"netboot,omitempty"` diff --git a/protos/template/template.pb.go b/protos/template/template.pb.go index 2f8a25a43..dcd4ca331 100644 --- a/protos/template/template.pb.go +++ b/protos/template/template.pb.go @@ -31,6 +31,7 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) +// // Empty represents an empty response type Empty struct { state protoimpl.MessageState @@ -70,24 +71,31 @@ func (*Empty) Descriptor() ([]byte, []int) { return file_protos_template_template_proto_rawDescGZIP(), []int{0} } +// // WorkflowTemplate describes the template itself. type WorkflowTemplate struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields + // // The template identifier Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` + // // The name of the template. You can see it as a friendly way to remember a // template Name string `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty"` + // // When a template got created CreatedAt *timestamppb.Timestamp `protobuf:"bytes,4,opt,name=created_at,json=createdAt,proto3" json:"created_at,omitempty"` + // // The last time a template was modified UpdatedAt *timestamppb.Timestamp `protobuf:"bytes,5,opt,name=updated_at,json=updatedAt,proto3" json:"updated_at,omitempty"` + // // When a template got deleted. This is the value used to identify a deleted // template as well. If empty the template can be used to generate workflows. DeletedAt *timestamppb.Timestamp `protobuf:"bytes,6,opt,name=deleted_at,json=deletedAt,proto3" json:"deleted_at,omitempty"` + // // The content of the template in its YAML representation Data string `protobuf:"bytes,7,opt,name=data,proto3" json:"data,omitempty"` } @@ -166,6 +174,7 @@ func (x *WorkflowTemplate) GetData() string { return "" } +// // CreateResponse returns the ID of the created template type CreateResponse struct { state protoimpl.MessageState @@ -214,6 +223,7 @@ func (x *CreateResponse) GetId() string { return "" } +// // GetRequest enables you to filter templates by name or id. type GetRequest struct { state protoimpl.MessageState @@ -221,7 +231,6 @@ type GetRequest struct { unknownFields protoimpl.UnknownFields // Types that are assignable to GetBy: - // // *GetRequest_Id // *GetRequest_Name GetBy isGetRequest_GetBy `protobuf_oneof:"get_by"` @@ -285,11 +294,13 @@ type isGetRequest_GetBy interface { } type GetRequest_Id struct { + // // Filter by the template id Id string `protobuf:"bytes,1,opt,name=id,proto3,oneof"` } type GetRequest_Name struct { + // // Filter by the template name Name string `protobuf:"bytes,2,opt,name=name,proto3,oneof"` } @@ -298,6 +309,7 @@ func (*GetRequest_Id) isGetRequest_GetBy() {} func (*GetRequest_Name) isGetRequest_GetBy() {} +// // The request to use during a List template request type ListRequest struct { state protoimpl.MessageState @@ -305,7 +317,6 @@ type ListRequest struct { unknownFields protoimpl.UnknownFields // Types that are assignable to FilterBy: - // // *ListRequest_Name FilterBy isListRequest_FilterBy `protobuf_oneof:"filter_by"` } @@ -361,6 +372,7 @@ type isListRequest_FilterBy interface { } type ListRequest_Name struct { + // // Filter by the template name Name string `protobuf:"bytes,1,opt,name=name,proto3,oneof"` } diff --git a/protos/template/template_grpc.pb.go b/protos/template/template_grpc.pb.go index d1e23af9e..f39fe3fab 100644 --- a/protos/template/template_grpc.pb.go +++ b/protos/template/template_grpc.pb.go @@ -19,14 +19,19 @@ const _ = grpc.SupportPackageIsVersion7 // // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. type TemplateServiceClient interface { + // // CreateTemplate stores a template in the Tinkerbell server. CreateTemplate(ctx context.Context, in *WorkflowTemplate, opts ...grpc.CallOption) (*CreateResponse, error) + // // GetTemplate returns a specific template via its identifier. GetTemplate(ctx context.Context, in *GetRequest, opts ...grpc.CallOption) (*WorkflowTemplate, error) + // // DeleteTemplate deletes a template via its identifier. DeleteTemplate(ctx context.Context, in *GetRequest, opts ...grpc.CallOption) (*Empty, error) + // // ListTemplates returns all the template stored in Tinkerbell server ListTemplates(ctx context.Context, in *ListRequest, opts ...grpc.CallOption) (TemplateService_ListTemplatesClient, error) + // // UpdateTemplate updates a template // TODO: Read the code and figure out how an update work UpdateTemplate(ctx context.Context, in *WorkflowTemplate, opts ...grpc.CallOption) (*Empty, error) @@ -112,14 +117,19 @@ func (c *templateServiceClient) UpdateTemplate(ctx context.Context, in *Workflow // All implementations should embed UnimplementedTemplateServiceServer // for forward compatibility type TemplateServiceServer interface { + // // CreateTemplate stores a template in the Tinkerbell server. CreateTemplate(context.Context, *WorkflowTemplate) (*CreateResponse, error) + // // GetTemplate returns a specific template via its identifier. GetTemplate(context.Context, *GetRequest) (*WorkflowTemplate, error) + // // DeleteTemplate deletes a template via its identifier. DeleteTemplate(context.Context, *GetRequest) (*Empty, error) + // // ListTemplates returns all the template stored in Tinkerbell server ListTemplates(*ListRequest, TemplateService_ListTemplatesServer) error + // // UpdateTemplate updates a template // TODO: Read the code and figure out how an update work UpdateTemplate(context.Context, *WorkflowTemplate) (*Empty, error) diff --git a/protos/workflow/workflow.pb.go b/protos/workflow/workflow.pb.go index 67aca0504..1f4ebfbcd 100644 --- a/protos/workflow/workflow.pb.go +++ b/protos/workflow/workflow.pb.go @@ -27,24 +27,30 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) +// // The various state a workflow can be type State int32 const ( + // // A workflow is in pending state when it is waiting for the hardware to pick // it up and start the execution. State_STATE_PENDING State = 0 + // // A workflow is in a running state when the tink-worker started the // exeuction of it, and it is currently in execution inside the device // itself. State_STATE_RUNNING State = 1 + // // Failed is a final state. Something wrong happened during the execution of // the workflow inside the target. Have a look at the logs to see if you can // spot what is going on. State_STATE_FAILED State = 2 + // // Timeout is final state, almost like FAILED but it communicate to you that // an action or the overall workflow reached the specified timeout. State_STATE_TIMEOUT State = 3 + // // This is the state we all deserve. The execution of the workflow is over // and everything is just fine. Sit down, and enjoy your great work. State_STATE_SUCCESS State = 4 @@ -95,6 +101,7 @@ func (State) EnumDescriptor() ([]byte, []int) { return file_protos_workflow_workflow_proto_rawDescGZIP(), []int{0} } +// // Empty represents an empty response type Empty struct { state protoimpl.MessageState @@ -134,24 +141,32 @@ func (*Empty) Descriptor() ([]byte, []int) { return file_protos_workflow_workflow_proto_rawDescGZIP(), []int{0} } +// // Workflow represent a single workflow type Workflow struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields + // // The unique identifier for a workflow Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` + // // The template this workflows starts from Template string `protobuf:"bytes,2,opt,name=template,proto3" json:"template,omitempty"` + // // The hardware assigned to a workflow Hardware string `protobuf:"bytes,3,opt,name=hardware,proto3" json:"hardware,omitempty"` + // // Current state of the workflow. Pending, success, failed, running. State State `protobuf:"varint,4,opt,name=state,proto3,enum=jackfan.us.kg.tinkerbell.tink.protos.workflow.State" json:"state,omitempty"` + // // When the workflow was created CreatedAt *timestamppb.Timestamp `protobuf:"bytes,5,opt,name=created_at,json=createdAt,proto3" json:"created_at,omitempty"` + // // The last time the workflow was modified UpdatedAt *timestamppb.Timestamp `protobuf:"bytes,6,opt,name=updated_at,json=updatedAt,proto3" json:"updated_at,omitempty"` + // // When the workflow was deleted DeletedAt *timestamppb.Timestamp `protobuf:"bytes,7,opt,name=deleted_at,json=deletedAt,proto3" json:"deleted_at,omitempty"` Data string `protobuf:"bytes,8,opt,name=data,proto3" json:"data,omitempty"` @@ -245,6 +260,7 @@ func (x *Workflow) GetData() string { return "" } +// // CreateRequest registers a workflow in the Tinkerbell server. From this point // in time it is in pending state, waiting to be executed from the tink-worker // inside the selected hardware @@ -253,8 +269,10 @@ type CreateRequest struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields + // // The idenfier of the template the workflow starts from. Template string `protobuf:"bytes,1,opt,name=template,proto3" json:"template,omitempty"` + // // The target hardware for this workflow. Hardware string `protobuf:"bytes,2,opt,name=hardware,proto3" json:"hardware,omitempty"` } @@ -305,6 +323,7 @@ func (x *CreateRequest) GetHardware() string { return "" } +// // This is the response returned after a successful workflow creation. It // contains the workflow id. type CreateResponse struct { @@ -354,6 +373,7 @@ func (x *CreateResponse) GetId() string { return "" } +// // GetRequest contains the workflow idenfier you want to get back from the // Tinkerbell server. type GetRequest struct { @@ -403,6 +423,7 @@ func (x *GetRequest) GetId() string { return "" } +// // WorkflowContext represents the state of the execution of this workflow in detail. // How many tasks are currently executed, the number of actions and their state. type WorkflowContext struct { @@ -410,16 +431,23 @@ type WorkflowContext struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields + // // The workflow ID - WorkflowId string `protobuf:"bytes,1,opt,name=workflow_id,json=workflowId,proto3" json:"workflow_id,omitempty"` + WorkflowId string `protobuf:"bytes,1,opt,name=workflow_id,json=workflowId,proto3" json:"workflow_id,omitempty"` + // CurrentWorker string `protobuf:"bytes,2,opt,name=current_worker,json=currentWorker,proto3" json:"current_worker,omitempty"` - CurrentTask string `protobuf:"bytes,3,opt,name=current_task,json=currentTask,proto3" json:"current_task,omitempty"` + // + CurrentTask string `protobuf:"bytes,3,opt,name=current_task,json=currentTask,proto3" json:"current_task,omitempty"` + // // the name of the current action CurrentAction string `protobuf:"bytes,4,opt,name=current_action,json=currentAction,proto3" json:"current_action,omitempty"` + // // The index of the current action CurrentActionIndex int64 `protobuf:"varint,5,opt,name=current_action_index,json=currentActionIndex,proto3" json:"current_action_index,omitempty"` + // // The state of the current action - CurrentActionState State `protobuf:"varint,6,opt,name=current_action_state,json=currentActionState,proto3,enum=jackfan.us.kg.tinkerbell.tink.protos.workflow.State" json:"current_action_state,omitempty"` + CurrentActionState State `protobuf:"varint,6,opt,name=current_action_state,json=currentActionState,proto3,enum=jackfan.us.kg.tinkerbell.tink.protos.workflow.State" json:"current_action_state,omitempty"` + // TotalNumberOfActions int64 `protobuf:"varint,7,opt,name=total_number_of_actions,json=totalNumberOfActions,proto3" json:"total_number_of_actions,omitempty"` } @@ -504,6 +532,7 @@ func (x *WorkflowContext) GetTotalNumberOfActions() int64 { return 0 } +// // WorkflowActionStatus represents the state of all the action part of a // workflow type WorkflowActionStatus struct { @@ -511,23 +540,31 @@ type WorkflowActionStatus struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields + // // The workflow id WorkflowId string `protobuf:"bytes,1,opt,name=workflow_id,json=workflowId,proto3" json:"workflow_id,omitempty"` + // // The name of the task this action is part of TaskName string `protobuf:"bytes,2,opt,name=task_name,json=taskName,proto3" json:"task_name,omitempty"` + // // The name of the action ActionName string `protobuf:"bytes,3,opt,name=action_name,json=actionName,proto3" json:"action_name,omitempty"` + // // The state of the action. Those are the same described for workflow as // well. pending, running, successful and so on. ActionStatus State `protobuf:"varint,4,opt,name=action_status,json=actionStatus,proto3,enum=jackfan.us.kg.tinkerbell.tink.protos.workflow.State" json:"action_status,omitempty"` + // // The execution time for the action Seconds int64 `protobuf:"varint,5,opt,name=seconds,proto3" json:"seconds,omitempty"` + // // The message returned from the action. Message string `protobuf:"bytes,6,opt,name=message,proto3" json:"message,omitempty"` + // // When the status got created for this aciton. You can see it as the time // when the action started its execution inside the hardware itself. CreatedAt *timestamppb.Timestamp `protobuf:"bytes,7,opt,name=created_at,json=createdAt,proto3" json:"created_at,omitempty"` - WorkerId string `protobuf:"bytes,8,opt,name=worker_id,json=workerId,proto3" json:"worker_id,omitempty"` + // + WorkerId string `protobuf:"bytes,8,opt,name=worker_id,json=workerId,proto3" json:"worker_id,omitempty"` } func (x *WorkflowActionStatus) Reset() { @@ -618,11 +655,13 @@ func (x *WorkflowActionStatus) GetWorkerId() string { return "" } +// type WorkflowContextRequest struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields + // WorkerId string `protobuf:"bytes,1,opt,name=worker_id,json=workerId,proto3" json:"worker_id,omitempty"` } @@ -665,6 +704,7 @@ func (x *WorkflowContextRequest) GetWorkerId() string { return "" } +// type WorkflowContextList struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -712,6 +752,7 @@ func (x *WorkflowContextList) GetWorkflowContexts() []*WorkflowContext { return nil } +// // WorkflowActionsRequest is used to get actions for a particular workflow type WorkflowActionsRequest struct { state protoimpl.MessageState @@ -760,35 +801,46 @@ func (x *WorkflowActionsRequest) GetWorkflowId() string { return "" } +// // WorkflowAction represents a single aciton part of a workflow type WorkflowAction struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields + // // The name of the task the action belong to. TaskName string `protobuf:"bytes,1,opt,name=task_name,json=taskName,proto3" json:"task_name,omitempty"` + // // The name of the action Name string `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty"` + // // The docker/oci image the action starts from Image string `protobuf:"bytes,3,opt,name=image,proto3" json:"image,omitempty"` + // // Every action has a timeout, after that the execution stops and the action // gets in a timeout state. Timeout int64 `protobuf:"varint,4,opt,name=timeout,proto3" json:"timeout,omitempty"` + // // You can override the command executed for the container Command []string `protobuf:"bytes,5,rep,name=command,proto3" json:"command,omitempty"` + // // On timeout used to be a way to execute an action if the current one times out // but with the event system in place this is not needed anymore OnTimeout []string `protobuf:"bytes,6,rep,name=on_timeout,json=onTimeout,proto3" json:"on_timeout,omitempty"` + // // On failure used to be a way to execute an action if the current one fails // but with the event system in place this is not needed anymore OnFailure []string `protobuf:"bytes,7,rep,name=on_failure,json=onFailure,proto3" json:"on_failure,omitempty"` WorkerId string `protobuf:"bytes,8,opt,name=worker_id,json=workerId,proto3" json:"worker_id,omitempty"` + // // You can mount directory from your host to the running action, mainly to // share files, or state Volumes []string `protobuf:"bytes,9,rep,name=volumes,proto3" json:"volumes,omitempty"` + // // Set environment variables usable from the action itself. Environment []string `protobuf:"bytes,10,rep,name=environment,proto3" json:"environment,omitempty"` + // // Set the namespace that the process IDs will be in. Pid string `protobuf:"bytes,11,opt,name=pid,proto3" json:"pid,omitempty"` } @@ -902,6 +954,7 @@ func (x *WorkflowAction) GetPid() string { return "" } +// // A list of actions type WorkflowActionList struct { state protoimpl.MessageState @@ -950,6 +1003,7 @@ func (x *WorkflowActionList) GetActionList() []*WorkflowAction { return nil } +// // When a workflow gets created we have the ability to replace variables // declared in the template with concrete variables. This is the request you // can use to visualize those data. @@ -1008,6 +1062,7 @@ func (x *GetWorkflowDataRequest) GetVersion() int32 { return 0 } +// // List of data passed during workflow creation. type GetWorkflowDataResponse struct { state protoimpl.MessageState @@ -1064,6 +1119,7 @@ func (x *GetWorkflowDataResponse) GetVersion() int32 { return 0 } +// // You can change data passed to a workflow type UpdateWorkflowDataRequest struct { state protoimpl.MessageState diff --git a/protos/workflow/workflow_grpc.pb.go b/protos/workflow/workflow_grpc.pb.go index 9e28dd60b..3de1976b2 100644 --- a/protos/workflow/workflow_grpc.pb.go +++ b/protos/workflow/workflow_grpc.pb.go @@ -19,21 +19,27 @@ const _ = grpc.SupportPackageIsVersion7 // // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. type WorkflowServiceClient interface { + // // CreateWorkflow targets a specific hardware and it starts from a particular // template. The selected hardware is capable of picking the // workflow up for execution. CreateWorkflow(ctx context.Context, in *CreateRequest, opts ...grpc.CallOption) (*CreateResponse, error) + // // GetWorkflow returns a specific workflow by its identifier. GetWorkflow(ctx context.Context, in *GetRequest, opts ...grpc.CallOption) (*Workflow, error) + // // DeleteWorkflow deletes a workflow. This is a logical deletion. Workflow // will stay available for inspection DeleteWorkflow(ctx context.Context, in *GetRequest, opts ...grpc.CallOption) (*Empty, error) + // // ListWorkflows returns a list of workflows ListWorkflows(ctx context.Context, in *Empty, opts ...grpc.CallOption) (WorkflowService_ListWorkflowsClient, error) + // // GetWorkflowContext returns specific information about where it is running, // its state and so on. Useful to debug a workflow and to understand its // current state. GetWorkflowContext(ctx context.Context, in *GetRequest, opts ...grpc.CallOption) (*WorkflowContext, error) + // // ShowWorkflowEvents returns a list of events for a specific workflows ShowWorkflowEvents(ctx context.Context, in *GetRequest, opts ...grpc.CallOption) (WorkflowService_ShowWorkflowEventsClient, error) GetWorkflowContextList(ctx context.Context, in *WorkflowContextRequest, opts ...grpc.CallOption) (*WorkflowContextList, error) @@ -253,21 +259,27 @@ func (c *workflowServiceClient) UpdateWorkflowData(ctx context.Context, in *Upda // All implementations should embed UnimplementedWorkflowServiceServer // for forward compatibility type WorkflowServiceServer interface { + // // CreateWorkflow targets a specific hardware and it starts from a particular // template. The selected hardware is capable of picking the // workflow up for execution. CreateWorkflow(context.Context, *CreateRequest) (*CreateResponse, error) + // // GetWorkflow returns a specific workflow by its identifier. GetWorkflow(context.Context, *GetRequest) (*Workflow, error) + // // DeleteWorkflow deletes a workflow. This is a logical deletion. Workflow // will stay available for inspection DeleteWorkflow(context.Context, *GetRequest) (*Empty, error) + // // ListWorkflows returns a list of workflows ListWorkflows(*Empty, WorkflowService_ListWorkflowsServer) error + // // GetWorkflowContext returns specific information about where it is running, // its state and so on. Useful to debug a workflow and to understand its // current state. GetWorkflowContext(context.Context, *GetRequest) (*WorkflowContext, error) + // // ShowWorkflowEvents returns a list of events for a specific workflows ShowWorkflowEvents(*GetRequest, WorkflowService_ShowWorkflowEventsServer) error GetWorkflowContextList(context.Context, *WorkflowContextRequest) (*WorkflowContextList, error) From f83c72744bd9197a711cad29fd2be6234aa0f98d Mon Sep 17 00:00:00 2001 From: Jacob Weinstock Date: Thu, 15 Sep 2022 01:57:20 +0000 Subject: [PATCH 10/11] Update generated files, just formatting changes Signed-off-by: Jacob Weinstock --- protos/hardware/mock.go | 154 +++++++++++++--------------- protos/template/mock.go | 136 ++++++++++++------------- protos/workflow/mock.go | 217 ++++++++++++++++++---------------------- 3 files changed, 230 insertions(+), 277 deletions(-) diff --git a/protos/hardware/mock.go b/protos/hardware/mock.go index 7d85d2ddc..c7c147baa 100644 --- a/protos/hardware/mock.go +++ b/protos/hardware/mock.go @@ -17,37 +17,37 @@ var _ HardwareServiceClient = &HardwareServiceClientMock{} // HardwareServiceClientMock is a mock implementation of HardwareServiceClient. // -// func TestSomethingThatUsesHardwareServiceClient(t *testing.T) { +// func TestSomethingThatUsesHardwareServiceClient(t *testing.T) { // -// // make and configure a mocked HardwareServiceClient -// mockedHardwareServiceClient := &HardwareServiceClientMock{ -// AllFunc: func(ctx context.Context, in *Empty, opts ...grpc.CallOption) (HardwareService_AllClient, error) { -// panic("mock out the All method") -// }, -// ByIDFunc: func(ctx context.Context, in *GetRequest, opts ...grpc.CallOption) (*Hardware, error) { -// panic("mock out the ByID method") -// }, -// ByIPFunc: func(ctx context.Context, in *GetRequest, opts ...grpc.CallOption) (*Hardware, error) { -// panic("mock out the ByIP method") -// }, -// ByMACFunc: func(ctx context.Context, in *GetRequest, opts ...grpc.CallOption) (*Hardware, error) { -// panic("mock out the ByMAC method") -// }, -// DeleteFunc: func(ctx context.Context, in *DeleteRequest, opts ...grpc.CallOption) (*Empty, error) { -// panic("mock out the Delete method") -// }, -// DeprecatedWatchFunc: func(ctx context.Context, in *GetRequest, opts ...grpc.CallOption) (HardwareService_DeprecatedWatchClient, error) { -// panic("mock out the DeprecatedWatch method") -// }, -// PushFunc: func(ctx context.Context, in *PushRequest, opts ...grpc.CallOption) (*Empty, error) { -// panic("mock out the Push method") -// }, -// } +// // make and configure a mocked HardwareServiceClient +// mockedHardwareServiceClient := &HardwareServiceClientMock{ +// AllFunc: func(ctx context.Context, in *Empty, opts ...grpc.CallOption) (HardwareService_AllClient, error) { +// panic("mock out the All method") +// }, +// ByIDFunc: func(ctx context.Context, in *GetRequest, opts ...grpc.CallOption) (*Hardware, error) { +// panic("mock out the ByID method") +// }, +// ByIPFunc: func(ctx context.Context, in *GetRequest, opts ...grpc.CallOption) (*Hardware, error) { +// panic("mock out the ByIP method") +// }, +// ByMACFunc: func(ctx context.Context, in *GetRequest, opts ...grpc.CallOption) (*Hardware, error) { +// panic("mock out the ByMAC method") +// }, +// DeleteFunc: func(ctx context.Context, in *DeleteRequest, opts ...grpc.CallOption) (*Empty, error) { +// panic("mock out the Delete method") +// }, +// DeprecatedWatchFunc: func(ctx context.Context, in *GetRequest, opts ...grpc.CallOption) (HardwareService_DeprecatedWatchClient, error) { +// panic("mock out the DeprecatedWatch method") +// }, +// PushFunc: func(ctx context.Context, in *PushRequest, opts ...grpc.CallOption) (*Empty, error) { +// panic("mock out the Push method") +// }, +// } // -// // use mockedHardwareServiceClient in code that requires HardwareServiceClient -// // and then make assertions. +// // use mockedHardwareServiceClient in code that requires HardwareServiceClient +// // and then make assertions. // -// } +// } type HardwareServiceClientMock struct { // AllFunc mocks the All method. AllFunc func(ctx context.Context, in *Empty, opts ...grpc.CallOption) (HardwareService_AllClient, error) @@ -167,8 +167,7 @@ func (mock *HardwareServiceClientMock) All(ctx context.Context, in *Empty, opts // AllCalls gets all the calls that were made to All. // Check the length with: -// -// len(mockedHardwareServiceClient.AllCalls()) +// len(mockedHardwareServiceClient.AllCalls()) func (mock *HardwareServiceClientMock) AllCalls() []struct { Ctx context.Context In *Empty @@ -207,8 +206,7 @@ func (mock *HardwareServiceClientMock) ByID(ctx context.Context, in *GetRequest, // ByIDCalls gets all the calls that were made to ByID. // Check the length with: -// -// len(mockedHardwareServiceClient.ByIDCalls()) +// len(mockedHardwareServiceClient.ByIDCalls()) func (mock *HardwareServiceClientMock) ByIDCalls() []struct { Ctx context.Context In *GetRequest @@ -247,8 +245,7 @@ func (mock *HardwareServiceClientMock) ByIP(ctx context.Context, in *GetRequest, // ByIPCalls gets all the calls that were made to ByIP. // Check the length with: -// -// len(mockedHardwareServiceClient.ByIPCalls()) +// len(mockedHardwareServiceClient.ByIPCalls()) func (mock *HardwareServiceClientMock) ByIPCalls() []struct { Ctx context.Context In *GetRequest @@ -287,8 +284,7 @@ func (mock *HardwareServiceClientMock) ByMAC(ctx context.Context, in *GetRequest // ByMACCalls gets all the calls that were made to ByMAC. // Check the length with: -// -// len(mockedHardwareServiceClient.ByMACCalls()) +// len(mockedHardwareServiceClient.ByMACCalls()) func (mock *HardwareServiceClientMock) ByMACCalls() []struct { Ctx context.Context In *GetRequest @@ -327,8 +323,7 @@ func (mock *HardwareServiceClientMock) Delete(ctx context.Context, in *DeleteReq // DeleteCalls gets all the calls that were made to Delete. // Check the length with: -// -// len(mockedHardwareServiceClient.DeleteCalls()) +// len(mockedHardwareServiceClient.DeleteCalls()) func (mock *HardwareServiceClientMock) DeleteCalls() []struct { Ctx context.Context In *DeleteRequest @@ -367,8 +362,7 @@ func (mock *HardwareServiceClientMock) DeprecatedWatch(ctx context.Context, in * // DeprecatedWatchCalls gets all the calls that were made to DeprecatedWatch. // Check the length with: -// -// len(mockedHardwareServiceClient.DeprecatedWatchCalls()) +// len(mockedHardwareServiceClient.DeprecatedWatchCalls()) func (mock *HardwareServiceClientMock) DeprecatedWatchCalls() []struct { Ctx context.Context In *GetRequest @@ -407,8 +401,7 @@ func (mock *HardwareServiceClientMock) Push(ctx context.Context, in *PushRequest // PushCalls gets all the calls that were made to Push. // Check the length with: -// -// len(mockedHardwareServiceClient.PushCalls()) +// len(mockedHardwareServiceClient.PushCalls()) func (mock *HardwareServiceClientMock) PushCalls() []struct { Ctx context.Context In *PushRequest @@ -431,37 +424,37 @@ var _ HardwareService_AllClient = &HardwareService_AllClientMock{} // HardwareService_AllClientMock is a mock implementation of HardwareService_AllClient. // -// func TestSomethingThatUsesHardwareService_AllClient(t *testing.T) { +// func TestSomethingThatUsesHardwareService_AllClient(t *testing.T) { // -// // make and configure a mocked HardwareService_AllClient -// mockedHardwareService_AllClient := &HardwareService_AllClientMock{ -// CloseSendFunc: func() error { -// panic("mock out the CloseSend method") -// }, -// ContextFunc: func() context.Context { -// panic("mock out the Context method") -// }, -// HeaderFunc: func() (metadata.MD, error) { -// panic("mock out the Header method") -// }, -// RecvFunc: func() (*Hardware, error) { -// panic("mock out the Recv method") -// }, -// RecvMsgFunc: func(m interface{}) error { -// panic("mock out the RecvMsg method") -// }, -// SendMsgFunc: func(m interface{}) error { -// panic("mock out the SendMsg method") -// }, -// TrailerFunc: func() metadata.MD { -// panic("mock out the Trailer method") -// }, -// } +// // make and configure a mocked HardwareService_AllClient +// mockedHardwareService_AllClient := &HardwareService_AllClientMock{ +// CloseSendFunc: func() error { +// panic("mock out the CloseSend method") +// }, +// ContextFunc: func() context.Context { +// panic("mock out the Context method") +// }, +// HeaderFunc: func() (metadata.MD, error) { +// panic("mock out the Header method") +// }, +// RecvFunc: func() (*Hardware, error) { +// panic("mock out the Recv method") +// }, +// RecvMsgFunc: func(m interface{}) error { +// panic("mock out the RecvMsg method") +// }, +// SendMsgFunc: func(m interface{}) error { +// panic("mock out the SendMsg method") +// }, +// TrailerFunc: func() metadata.MD { +// panic("mock out the Trailer method") +// }, +// } // -// // use mockedHardwareService_AllClient in code that requires HardwareService_AllClient -// // and then make assertions. +// // use mockedHardwareService_AllClient in code that requires HardwareService_AllClient +// // and then make assertions. // -// } +// } type HardwareService_AllClientMock struct { // CloseSendFunc mocks the CloseSend method. CloseSendFunc func() error @@ -530,8 +523,7 @@ func (mock *HardwareService_AllClientMock) CloseSend() error { // CloseSendCalls gets all the calls that were made to CloseSend. // Check the length with: -// -// len(mockedHardwareService_AllClient.CloseSendCalls()) +// len(mockedHardwareService_AllClient.CloseSendCalls()) func (mock *HardwareService_AllClientMock) CloseSendCalls() []struct{} { var calls []struct{} mock.lockCloseSend.RLock() @@ -554,8 +546,7 @@ func (mock *HardwareService_AllClientMock) Context() context.Context { // ContextCalls gets all the calls that were made to Context. // Check the length with: -// -// len(mockedHardwareService_AllClient.ContextCalls()) +// len(mockedHardwareService_AllClient.ContextCalls()) func (mock *HardwareService_AllClientMock) ContextCalls() []struct{} { var calls []struct{} mock.lockContext.RLock() @@ -578,8 +569,7 @@ func (mock *HardwareService_AllClientMock) Header() (metadata.MD, error) { // HeaderCalls gets all the calls that were made to Header. // Check the length with: -// -// len(mockedHardwareService_AllClient.HeaderCalls()) +// len(mockedHardwareService_AllClient.HeaderCalls()) func (mock *HardwareService_AllClientMock) HeaderCalls() []struct{} { var calls []struct{} mock.lockHeader.RLock() @@ -602,8 +592,7 @@ func (mock *HardwareService_AllClientMock) Recv() (*Hardware, error) { // RecvCalls gets all the calls that were made to Recv. // Check the length with: -// -// len(mockedHardwareService_AllClient.RecvCalls()) +// len(mockedHardwareService_AllClient.RecvCalls()) func (mock *HardwareService_AllClientMock) RecvCalls() []struct{} { var calls []struct{} mock.lockRecv.RLock() @@ -630,8 +619,7 @@ func (mock *HardwareService_AllClientMock) RecvMsg(m interface{}) error { // RecvMsgCalls gets all the calls that were made to RecvMsg. // Check the length with: -// -// len(mockedHardwareService_AllClient.RecvMsgCalls()) +// len(mockedHardwareService_AllClient.RecvMsgCalls()) func (mock *HardwareService_AllClientMock) RecvMsgCalls() []struct { M interface{} } { @@ -662,8 +650,7 @@ func (mock *HardwareService_AllClientMock) SendMsg(m interface{}) error { // SendMsgCalls gets all the calls that were made to SendMsg. // Check the length with: -// -// len(mockedHardwareService_AllClient.SendMsgCalls()) +// len(mockedHardwareService_AllClient.SendMsgCalls()) func (mock *HardwareService_AllClientMock) SendMsgCalls() []struct { M interface{} } { @@ -690,8 +677,7 @@ func (mock *HardwareService_AllClientMock) Trailer() metadata.MD { // TrailerCalls gets all the calls that were made to Trailer. // Check the length with: -// -// len(mockedHardwareService_AllClient.TrailerCalls()) +// len(mockedHardwareService_AllClient.TrailerCalls()) func (mock *HardwareService_AllClientMock) TrailerCalls() []struct{} { var calls []struct{} mock.lockTrailer.RLock() diff --git a/protos/template/mock.go b/protos/template/mock.go index 62ceee35c..80d88b338 100644 --- a/protos/template/mock.go +++ b/protos/template/mock.go @@ -17,31 +17,31 @@ var _ TemplateServiceClient = &TemplateServiceClientMock{} // TemplateServiceClientMock is a mock implementation of TemplateServiceClient. // -// func TestSomethingThatUsesTemplateServiceClient(t *testing.T) { +// func TestSomethingThatUsesTemplateServiceClient(t *testing.T) { // -// // make and configure a mocked TemplateServiceClient -// mockedTemplateServiceClient := &TemplateServiceClientMock{ -// CreateTemplateFunc: func(ctx context.Context, in *WorkflowTemplate, opts ...grpc.CallOption) (*CreateResponse, error) { -// panic("mock out the CreateTemplate method") -// }, -// DeleteTemplateFunc: func(ctx context.Context, in *GetRequest, opts ...grpc.CallOption) (*Empty, error) { -// panic("mock out the DeleteTemplate method") -// }, -// GetTemplateFunc: func(ctx context.Context, in *GetRequest, opts ...grpc.CallOption) (*WorkflowTemplate, error) { -// panic("mock out the GetTemplate method") -// }, -// ListTemplatesFunc: func(ctx context.Context, in *ListRequest, opts ...grpc.CallOption) (TemplateService_ListTemplatesClient, error) { -// panic("mock out the ListTemplates method") -// }, -// UpdateTemplateFunc: func(ctx context.Context, in *WorkflowTemplate, opts ...grpc.CallOption) (*Empty, error) { -// panic("mock out the UpdateTemplate method") -// }, -// } +// // make and configure a mocked TemplateServiceClient +// mockedTemplateServiceClient := &TemplateServiceClientMock{ +// CreateTemplateFunc: func(ctx context.Context, in *WorkflowTemplate, opts ...grpc.CallOption) (*CreateResponse, error) { +// panic("mock out the CreateTemplate method") +// }, +// DeleteTemplateFunc: func(ctx context.Context, in *GetRequest, opts ...grpc.CallOption) (*Empty, error) { +// panic("mock out the DeleteTemplate method") +// }, +// GetTemplateFunc: func(ctx context.Context, in *GetRequest, opts ...grpc.CallOption) (*WorkflowTemplate, error) { +// panic("mock out the GetTemplate method") +// }, +// ListTemplatesFunc: func(ctx context.Context, in *ListRequest, opts ...grpc.CallOption) (TemplateService_ListTemplatesClient, error) { +// panic("mock out the ListTemplates method") +// }, +// UpdateTemplateFunc: func(ctx context.Context, in *WorkflowTemplate, opts ...grpc.CallOption) (*Empty, error) { +// panic("mock out the UpdateTemplate method") +// }, +// } // -// // use mockedTemplateServiceClient in code that requires TemplateServiceClient -// // and then make assertions. +// // use mockedTemplateServiceClient in code that requires TemplateServiceClient +// // and then make assertions. // -// } +// } type TemplateServiceClientMock struct { // CreateTemplateFunc mocks the CreateTemplate method. CreateTemplateFunc func(ctx context.Context, in *WorkflowTemplate, opts ...grpc.CallOption) (*CreateResponse, error) @@ -135,8 +135,7 @@ func (mock *TemplateServiceClientMock) CreateTemplate(ctx context.Context, in *W // CreateTemplateCalls gets all the calls that were made to CreateTemplate. // Check the length with: -// -// len(mockedTemplateServiceClient.CreateTemplateCalls()) +// len(mockedTemplateServiceClient.CreateTemplateCalls()) func (mock *TemplateServiceClientMock) CreateTemplateCalls() []struct { Ctx context.Context In *WorkflowTemplate @@ -175,8 +174,7 @@ func (mock *TemplateServiceClientMock) DeleteTemplate(ctx context.Context, in *G // DeleteTemplateCalls gets all the calls that were made to DeleteTemplate. // Check the length with: -// -// len(mockedTemplateServiceClient.DeleteTemplateCalls()) +// len(mockedTemplateServiceClient.DeleteTemplateCalls()) func (mock *TemplateServiceClientMock) DeleteTemplateCalls() []struct { Ctx context.Context In *GetRequest @@ -215,8 +213,7 @@ func (mock *TemplateServiceClientMock) GetTemplate(ctx context.Context, in *GetR // GetTemplateCalls gets all the calls that were made to GetTemplate. // Check the length with: -// -// len(mockedTemplateServiceClient.GetTemplateCalls()) +// len(mockedTemplateServiceClient.GetTemplateCalls()) func (mock *TemplateServiceClientMock) GetTemplateCalls() []struct { Ctx context.Context In *GetRequest @@ -255,8 +252,7 @@ func (mock *TemplateServiceClientMock) ListTemplates(ctx context.Context, in *Li // ListTemplatesCalls gets all the calls that were made to ListTemplates. // Check the length with: -// -// len(mockedTemplateServiceClient.ListTemplatesCalls()) +// len(mockedTemplateServiceClient.ListTemplatesCalls()) func (mock *TemplateServiceClientMock) ListTemplatesCalls() []struct { Ctx context.Context In *ListRequest @@ -295,8 +291,7 @@ func (mock *TemplateServiceClientMock) UpdateTemplate(ctx context.Context, in *W // UpdateTemplateCalls gets all the calls that were made to UpdateTemplate. // Check the length with: -// -// len(mockedTemplateServiceClient.UpdateTemplateCalls()) +// len(mockedTemplateServiceClient.UpdateTemplateCalls()) func (mock *TemplateServiceClientMock) UpdateTemplateCalls() []struct { Ctx context.Context In *WorkflowTemplate @@ -319,37 +314,37 @@ var _ TemplateService_ListTemplatesClient = &TemplateService_ListTemplatesClient // TemplateService_ListTemplatesClientMock is a mock implementation of TemplateService_ListTemplatesClient. // -// func TestSomethingThatUsesTemplateService_ListTemplatesClient(t *testing.T) { +// func TestSomethingThatUsesTemplateService_ListTemplatesClient(t *testing.T) { // -// // make and configure a mocked TemplateService_ListTemplatesClient -// mockedTemplateService_ListTemplatesClient := &TemplateService_ListTemplatesClientMock{ -// CloseSendFunc: func() error { -// panic("mock out the CloseSend method") -// }, -// ContextFunc: func() context.Context { -// panic("mock out the Context method") -// }, -// HeaderFunc: func() (metadata.MD, error) { -// panic("mock out the Header method") -// }, -// RecvFunc: func() (*WorkflowTemplate, error) { -// panic("mock out the Recv method") -// }, -// RecvMsgFunc: func(m interface{}) error { -// panic("mock out the RecvMsg method") -// }, -// SendMsgFunc: func(m interface{}) error { -// panic("mock out the SendMsg method") -// }, -// TrailerFunc: func() metadata.MD { -// panic("mock out the Trailer method") -// }, -// } +// // make and configure a mocked TemplateService_ListTemplatesClient +// mockedTemplateService_ListTemplatesClient := &TemplateService_ListTemplatesClientMock{ +// CloseSendFunc: func() error { +// panic("mock out the CloseSend method") +// }, +// ContextFunc: func() context.Context { +// panic("mock out the Context method") +// }, +// HeaderFunc: func() (metadata.MD, error) { +// panic("mock out the Header method") +// }, +// RecvFunc: func() (*WorkflowTemplate, error) { +// panic("mock out the Recv method") +// }, +// RecvMsgFunc: func(m interface{}) error { +// panic("mock out the RecvMsg method") +// }, +// SendMsgFunc: func(m interface{}) error { +// panic("mock out the SendMsg method") +// }, +// TrailerFunc: func() metadata.MD { +// panic("mock out the Trailer method") +// }, +// } // -// // use mockedTemplateService_ListTemplatesClient in code that requires TemplateService_ListTemplatesClient -// // and then make assertions. +// // use mockedTemplateService_ListTemplatesClient in code that requires TemplateService_ListTemplatesClient +// // and then make assertions. // -// } +// } type TemplateService_ListTemplatesClientMock struct { // CloseSendFunc mocks the CloseSend method. CloseSendFunc func() error @@ -418,8 +413,7 @@ func (mock *TemplateService_ListTemplatesClientMock) CloseSend() error { // CloseSendCalls gets all the calls that were made to CloseSend. // Check the length with: -// -// len(mockedTemplateService_ListTemplatesClient.CloseSendCalls()) +// len(mockedTemplateService_ListTemplatesClient.CloseSendCalls()) func (mock *TemplateService_ListTemplatesClientMock) CloseSendCalls() []struct{} { var calls []struct{} mock.lockCloseSend.RLock() @@ -442,8 +436,7 @@ func (mock *TemplateService_ListTemplatesClientMock) Context() context.Context { // ContextCalls gets all the calls that were made to Context. // Check the length with: -// -// len(mockedTemplateService_ListTemplatesClient.ContextCalls()) +// len(mockedTemplateService_ListTemplatesClient.ContextCalls()) func (mock *TemplateService_ListTemplatesClientMock) ContextCalls() []struct{} { var calls []struct{} mock.lockContext.RLock() @@ -466,8 +459,7 @@ func (mock *TemplateService_ListTemplatesClientMock) Header() (metadata.MD, erro // HeaderCalls gets all the calls that were made to Header. // Check the length with: -// -// len(mockedTemplateService_ListTemplatesClient.HeaderCalls()) +// len(mockedTemplateService_ListTemplatesClient.HeaderCalls()) func (mock *TemplateService_ListTemplatesClientMock) HeaderCalls() []struct{} { var calls []struct{} mock.lockHeader.RLock() @@ -490,8 +482,7 @@ func (mock *TemplateService_ListTemplatesClientMock) Recv() (*WorkflowTemplate, // RecvCalls gets all the calls that were made to Recv. // Check the length with: -// -// len(mockedTemplateService_ListTemplatesClient.RecvCalls()) +// len(mockedTemplateService_ListTemplatesClient.RecvCalls()) func (mock *TemplateService_ListTemplatesClientMock) RecvCalls() []struct{} { var calls []struct{} mock.lockRecv.RLock() @@ -518,8 +509,7 @@ func (mock *TemplateService_ListTemplatesClientMock) RecvMsg(m interface{}) erro // RecvMsgCalls gets all the calls that were made to RecvMsg. // Check the length with: -// -// len(mockedTemplateService_ListTemplatesClient.RecvMsgCalls()) +// len(mockedTemplateService_ListTemplatesClient.RecvMsgCalls()) func (mock *TemplateService_ListTemplatesClientMock) RecvMsgCalls() []struct { M interface{} } { @@ -550,8 +540,7 @@ func (mock *TemplateService_ListTemplatesClientMock) SendMsg(m interface{}) erro // SendMsgCalls gets all the calls that were made to SendMsg. // Check the length with: -// -// len(mockedTemplateService_ListTemplatesClient.SendMsgCalls()) +// len(mockedTemplateService_ListTemplatesClient.SendMsgCalls()) func (mock *TemplateService_ListTemplatesClientMock) SendMsgCalls() []struct { M interface{} } { @@ -578,8 +567,7 @@ func (mock *TemplateService_ListTemplatesClientMock) Trailer() metadata.MD { // TrailerCalls gets all the calls that were made to Trailer. // Check the length with: -// -// len(mockedTemplateService_ListTemplatesClient.TrailerCalls()) +// len(mockedTemplateService_ListTemplatesClient.TrailerCalls()) func (mock *TemplateService_ListTemplatesClientMock) TrailerCalls() []struct{} { var calls []struct{} mock.lockTrailer.RLock() diff --git a/protos/workflow/mock.go b/protos/workflow/mock.go index a6a4fc0c5..2c0ac3820 100644 --- a/protos/workflow/mock.go +++ b/protos/workflow/mock.go @@ -17,58 +17,58 @@ var _ WorkflowServiceClient = &WorkflowServiceClientMock{} // WorkflowServiceClientMock is a mock implementation of WorkflowServiceClient. // -// func TestSomethingThatUsesWorkflowServiceClient(t *testing.T) { +// func TestSomethingThatUsesWorkflowServiceClient(t *testing.T) { // -// // make and configure a mocked WorkflowServiceClient -// mockedWorkflowServiceClient := &WorkflowServiceClientMock{ -// CreateWorkflowFunc: func(ctx context.Context, in *CreateRequest, opts ...grpc.CallOption) (*CreateResponse, error) { -// panic("mock out the CreateWorkflow method") -// }, -// DeleteWorkflowFunc: func(ctx context.Context, in *GetRequest, opts ...grpc.CallOption) (*Empty, error) { -// panic("mock out the DeleteWorkflow method") -// }, -// GetWorkflowFunc: func(ctx context.Context, in *GetRequest, opts ...grpc.CallOption) (*Workflow, error) { -// panic("mock out the GetWorkflow method") -// }, -// GetWorkflowActionsFunc: func(ctx context.Context, in *WorkflowActionsRequest, opts ...grpc.CallOption) (*WorkflowActionList, error) { -// panic("mock out the GetWorkflowActions method") -// }, -// GetWorkflowContextFunc: func(ctx context.Context, in *GetRequest, opts ...grpc.CallOption) (*WorkflowContext, error) { -// panic("mock out the GetWorkflowContext method") -// }, -// GetWorkflowContextListFunc: func(ctx context.Context, in *WorkflowContextRequest, opts ...grpc.CallOption) (*WorkflowContextList, error) { -// panic("mock out the GetWorkflowContextList method") -// }, -// GetWorkflowContextsFunc: func(ctx context.Context, in *WorkflowContextRequest, opts ...grpc.CallOption) (WorkflowService_GetWorkflowContextsClient, error) { -// panic("mock out the GetWorkflowContexts method") -// }, -// GetWorkflowDataFunc: func(ctx context.Context, in *GetWorkflowDataRequest, opts ...grpc.CallOption) (*GetWorkflowDataResponse, error) { -// panic("mock out the GetWorkflowData method") -// }, -// GetWorkflowDataVersionFunc: func(ctx context.Context, in *GetWorkflowDataRequest, opts ...grpc.CallOption) (*GetWorkflowDataResponse, error) { -// panic("mock out the GetWorkflowDataVersion method") -// }, -// GetWorkflowMetadataFunc: func(ctx context.Context, in *GetWorkflowDataRequest, opts ...grpc.CallOption) (*GetWorkflowDataResponse, error) { -// panic("mock out the GetWorkflowMetadata method") -// }, -// ListWorkflowsFunc: func(ctx context.Context, in *Empty, opts ...grpc.CallOption) (WorkflowService_ListWorkflowsClient, error) { -// panic("mock out the ListWorkflows method") -// }, -// ReportActionStatusFunc: func(ctx context.Context, in *WorkflowActionStatus, opts ...grpc.CallOption) (*Empty, error) { -// panic("mock out the ReportActionStatus method") -// }, -// ShowWorkflowEventsFunc: func(ctx context.Context, in *GetRequest, opts ...grpc.CallOption) (WorkflowService_ShowWorkflowEventsClient, error) { -// panic("mock out the ShowWorkflowEvents method") -// }, -// UpdateWorkflowDataFunc: func(ctx context.Context, in *UpdateWorkflowDataRequest, opts ...grpc.CallOption) (*Empty, error) { -// panic("mock out the UpdateWorkflowData method") -// }, -// } +// // make and configure a mocked WorkflowServiceClient +// mockedWorkflowServiceClient := &WorkflowServiceClientMock{ +// CreateWorkflowFunc: func(ctx context.Context, in *CreateRequest, opts ...grpc.CallOption) (*CreateResponse, error) { +// panic("mock out the CreateWorkflow method") +// }, +// DeleteWorkflowFunc: func(ctx context.Context, in *GetRequest, opts ...grpc.CallOption) (*Empty, error) { +// panic("mock out the DeleteWorkflow method") +// }, +// GetWorkflowFunc: func(ctx context.Context, in *GetRequest, opts ...grpc.CallOption) (*Workflow, error) { +// panic("mock out the GetWorkflow method") +// }, +// GetWorkflowActionsFunc: func(ctx context.Context, in *WorkflowActionsRequest, opts ...grpc.CallOption) (*WorkflowActionList, error) { +// panic("mock out the GetWorkflowActions method") +// }, +// GetWorkflowContextFunc: func(ctx context.Context, in *GetRequest, opts ...grpc.CallOption) (*WorkflowContext, error) { +// panic("mock out the GetWorkflowContext method") +// }, +// GetWorkflowContextListFunc: func(ctx context.Context, in *WorkflowContextRequest, opts ...grpc.CallOption) (*WorkflowContextList, error) { +// panic("mock out the GetWorkflowContextList method") +// }, +// GetWorkflowContextsFunc: func(ctx context.Context, in *WorkflowContextRequest, opts ...grpc.CallOption) (WorkflowService_GetWorkflowContextsClient, error) { +// panic("mock out the GetWorkflowContexts method") +// }, +// GetWorkflowDataFunc: func(ctx context.Context, in *GetWorkflowDataRequest, opts ...grpc.CallOption) (*GetWorkflowDataResponse, error) { +// panic("mock out the GetWorkflowData method") +// }, +// GetWorkflowDataVersionFunc: func(ctx context.Context, in *GetWorkflowDataRequest, opts ...grpc.CallOption) (*GetWorkflowDataResponse, error) { +// panic("mock out the GetWorkflowDataVersion method") +// }, +// GetWorkflowMetadataFunc: func(ctx context.Context, in *GetWorkflowDataRequest, opts ...grpc.CallOption) (*GetWorkflowDataResponse, error) { +// panic("mock out the GetWorkflowMetadata method") +// }, +// ListWorkflowsFunc: func(ctx context.Context, in *Empty, opts ...grpc.CallOption) (WorkflowService_ListWorkflowsClient, error) { +// panic("mock out the ListWorkflows method") +// }, +// ReportActionStatusFunc: func(ctx context.Context, in *WorkflowActionStatus, opts ...grpc.CallOption) (*Empty, error) { +// panic("mock out the ReportActionStatus method") +// }, +// ShowWorkflowEventsFunc: func(ctx context.Context, in *GetRequest, opts ...grpc.CallOption) (WorkflowService_ShowWorkflowEventsClient, error) { +// panic("mock out the ShowWorkflowEvents method") +// }, +// UpdateWorkflowDataFunc: func(ctx context.Context, in *UpdateWorkflowDataRequest, opts ...grpc.CallOption) (*Empty, error) { +// panic("mock out the UpdateWorkflowData method") +// }, +// } // -// // use mockedWorkflowServiceClient in code that requires WorkflowServiceClient -// // and then make assertions. +// // use mockedWorkflowServiceClient in code that requires WorkflowServiceClient +// // and then make assertions. // -// } +// } type WorkflowServiceClientMock struct { // CreateWorkflowFunc mocks the CreateWorkflow method. CreateWorkflowFunc func(ctx context.Context, in *CreateRequest, opts ...grpc.CallOption) (*CreateResponse, error) @@ -279,8 +279,7 @@ func (mock *WorkflowServiceClientMock) CreateWorkflow(ctx context.Context, in *C // CreateWorkflowCalls gets all the calls that were made to CreateWorkflow. // Check the length with: -// -// len(mockedWorkflowServiceClient.CreateWorkflowCalls()) +// len(mockedWorkflowServiceClient.CreateWorkflowCalls()) func (mock *WorkflowServiceClientMock) CreateWorkflowCalls() []struct { Ctx context.Context In *CreateRequest @@ -319,8 +318,7 @@ func (mock *WorkflowServiceClientMock) DeleteWorkflow(ctx context.Context, in *G // DeleteWorkflowCalls gets all the calls that were made to DeleteWorkflow. // Check the length with: -// -// len(mockedWorkflowServiceClient.DeleteWorkflowCalls()) +// len(mockedWorkflowServiceClient.DeleteWorkflowCalls()) func (mock *WorkflowServiceClientMock) DeleteWorkflowCalls() []struct { Ctx context.Context In *GetRequest @@ -359,8 +357,7 @@ func (mock *WorkflowServiceClientMock) GetWorkflow(ctx context.Context, in *GetR // GetWorkflowCalls gets all the calls that were made to GetWorkflow. // Check the length with: -// -// len(mockedWorkflowServiceClient.GetWorkflowCalls()) +// len(mockedWorkflowServiceClient.GetWorkflowCalls()) func (mock *WorkflowServiceClientMock) GetWorkflowCalls() []struct { Ctx context.Context In *GetRequest @@ -399,8 +396,7 @@ func (mock *WorkflowServiceClientMock) GetWorkflowActions(ctx context.Context, i // GetWorkflowActionsCalls gets all the calls that were made to GetWorkflowActions. // Check the length with: -// -// len(mockedWorkflowServiceClient.GetWorkflowActionsCalls()) +// len(mockedWorkflowServiceClient.GetWorkflowActionsCalls()) func (mock *WorkflowServiceClientMock) GetWorkflowActionsCalls() []struct { Ctx context.Context In *WorkflowActionsRequest @@ -439,8 +435,7 @@ func (mock *WorkflowServiceClientMock) GetWorkflowContext(ctx context.Context, i // GetWorkflowContextCalls gets all the calls that were made to GetWorkflowContext. // Check the length with: -// -// len(mockedWorkflowServiceClient.GetWorkflowContextCalls()) +// len(mockedWorkflowServiceClient.GetWorkflowContextCalls()) func (mock *WorkflowServiceClientMock) GetWorkflowContextCalls() []struct { Ctx context.Context In *GetRequest @@ -479,8 +474,7 @@ func (mock *WorkflowServiceClientMock) GetWorkflowContextList(ctx context.Contex // GetWorkflowContextListCalls gets all the calls that were made to GetWorkflowContextList. // Check the length with: -// -// len(mockedWorkflowServiceClient.GetWorkflowContextListCalls()) +// len(mockedWorkflowServiceClient.GetWorkflowContextListCalls()) func (mock *WorkflowServiceClientMock) GetWorkflowContextListCalls() []struct { Ctx context.Context In *WorkflowContextRequest @@ -519,8 +513,7 @@ func (mock *WorkflowServiceClientMock) GetWorkflowContexts(ctx context.Context, // GetWorkflowContextsCalls gets all the calls that were made to GetWorkflowContexts. // Check the length with: -// -// len(mockedWorkflowServiceClient.GetWorkflowContextsCalls()) +// len(mockedWorkflowServiceClient.GetWorkflowContextsCalls()) func (mock *WorkflowServiceClientMock) GetWorkflowContextsCalls() []struct { Ctx context.Context In *WorkflowContextRequest @@ -559,8 +552,7 @@ func (mock *WorkflowServiceClientMock) GetWorkflowData(ctx context.Context, in * // GetWorkflowDataCalls gets all the calls that were made to GetWorkflowData. // Check the length with: -// -// len(mockedWorkflowServiceClient.GetWorkflowDataCalls()) +// len(mockedWorkflowServiceClient.GetWorkflowDataCalls()) func (mock *WorkflowServiceClientMock) GetWorkflowDataCalls() []struct { Ctx context.Context In *GetWorkflowDataRequest @@ -599,8 +591,7 @@ func (mock *WorkflowServiceClientMock) GetWorkflowDataVersion(ctx context.Contex // GetWorkflowDataVersionCalls gets all the calls that were made to GetWorkflowDataVersion. // Check the length with: -// -// len(mockedWorkflowServiceClient.GetWorkflowDataVersionCalls()) +// len(mockedWorkflowServiceClient.GetWorkflowDataVersionCalls()) func (mock *WorkflowServiceClientMock) GetWorkflowDataVersionCalls() []struct { Ctx context.Context In *GetWorkflowDataRequest @@ -639,8 +630,7 @@ func (mock *WorkflowServiceClientMock) GetWorkflowMetadata(ctx context.Context, // GetWorkflowMetadataCalls gets all the calls that were made to GetWorkflowMetadata. // Check the length with: -// -// len(mockedWorkflowServiceClient.GetWorkflowMetadataCalls()) +// len(mockedWorkflowServiceClient.GetWorkflowMetadataCalls()) func (mock *WorkflowServiceClientMock) GetWorkflowMetadataCalls() []struct { Ctx context.Context In *GetWorkflowDataRequest @@ -679,8 +669,7 @@ func (mock *WorkflowServiceClientMock) ListWorkflows(ctx context.Context, in *Em // ListWorkflowsCalls gets all the calls that were made to ListWorkflows. // Check the length with: -// -// len(mockedWorkflowServiceClient.ListWorkflowsCalls()) +// len(mockedWorkflowServiceClient.ListWorkflowsCalls()) func (mock *WorkflowServiceClientMock) ListWorkflowsCalls() []struct { Ctx context.Context In *Empty @@ -719,8 +708,7 @@ func (mock *WorkflowServiceClientMock) ReportActionStatus(ctx context.Context, i // ReportActionStatusCalls gets all the calls that were made to ReportActionStatus. // Check the length with: -// -// len(mockedWorkflowServiceClient.ReportActionStatusCalls()) +// len(mockedWorkflowServiceClient.ReportActionStatusCalls()) func (mock *WorkflowServiceClientMock) ReportActionStatusCalls() []struct { Ctx context.Context In *WorkflowActionStatus @@ -759,8 +747,7 @@ func (mock *WorkflowServiceClientMock) ShowWorkflowEvents(ctx context.Context, i // ShowWorkflowEventsCalls gets all the calls that were made to ShowWorkflowEvents. // Check the length with: -// -// len(mockedWorkflowServiceClient.ShowWorkflowEventsCalls()) +// len(mockedWorkflowServiceClient.ShowWorkflowEventsCalls()) func (mock *WorkflowServiceClientMock) ShowWorkflowEventsCalls() []struct { Ctx context.Context In *GetRequest @@ -799,8 +786,7 @@ func (mock *WorkflowServiceClientMock) UpdateWorkflowData(ctx context.Context, i // UpdateWorkflowDataCalls gets all the calls that were made to UpdateWorkflowData. // Check the length with: -// -// len(mockedWorkflowServiceClient.UpdateWorkflowDataCalls()) +// len(mockedWorkflowServiceClient.UpdateWorkflowDataCalls()) func (mock *WorkflowServiceClientMock) UpdateWorkflowDataCalls() []struct { Ctx context.Context In *UpdateWorkflowDataRequest @@ -823,37 +809,37 @@ var _ WorkflowService_ListWorkflowsClient = &WorkflowService_ListWorkflowsClient // WorkflowService_ListWorkflowsClientMock is a mock implementation of WorkflowService_ListWorkflowsClient. // -// func TestSomethingThatUsesWorkflowService_ListWorkflowsClient(t *testing.T) { +// func TestSomethingThatUsesWorkflowService_ListWorkflowsClient(t *testing.T) { // -// // make and configure a mocked WorkflowService_ListWorkflowsClient -// mockedWorkflowService_ListWorkflowsClient := &WorkflowService_ListWorkflowsClientMock{ -// CloseSendFunc: func() error { -// panic("mock out the CloseSend method") -// }, -// ContextFunc: func() context.Context { -// panic("mock out the Context method") -// }, -// HeaderFunc: func() (metadata.MD, error) { -// panic("mock out the Header method") -// }, -// RecvFunc: func() (*Workflow, error) { -// panic("mock out the Recv method") -// }, -// RecvMsgFunc: func(m interface{}) error { -// panic("mock out the RecvMsg method") -// }, -// SendMsgFunc: func(m interface{}) error { -// panic("mock out the SendMsg method") -// }, -// TrailerFunc: func() metadata.MD { -// panic("mock out the Trailer method") -// }, -// } +// // make and configure a mocked WorkflowService_ListWorkflowsClient +// mockedWorkflowService_ListWorkflowsClient := &WorkflowService_ListWorkflowsClientMock{ +// CloseSendFunc: func() error { +// panic("mock out the CloseSend method") +// }, +// ContextFunc: func() context.Context { +// panic("mock out the Context method") +// }, +// HeaderFunc: func() (metadata.MD, error) { +// panic("mock out the Header method") +// }, +// RecvFunc: func() (*Workflow, error) { +// panic("mock out the Recv method") +// }, +// RecvMsgFunc: func(m interface{}) error { +// panic("mock out the RecvMsg method") +// }, +// SendMsgFunc: func(m interface{}) error { +// panic("mock out the SendMsg method") +// }, +// TrailerFunc: func() metadata.MD { +// panic("mock out the Trailer method") +// }, +// } // -// // use mockedWorkflowService_ListWorkflowsClient in code that requires WorkflowService_ListWorkflowsClient -// // and then make assertions. +// // use mockedWorkflowService_ListWorkflowsClient in code that requires WorkflowService_ListWorkflowsClient +// // and then make assertions. // -// } +// } type WorkflowService_ListWorkflowsClientMock struct { // CloseSendFunc mocks the CloseSend method. CloseSendFunc func() error @@ -922,8 +908,7 @@ func (mock *WorkflowService_ListWorkflowsClientMock) CloseSend() error { // CloseSendCalls gets all the calls that were made to CloseSend. // Check the length with: -// -// len(mockedWorkflowService_ListWorkflowsClient.CloseSendCalls()) +// len(mockedWorkflowService_ListWorkflowsClient.CloseSendCalls()) func (mock *WorkflowService_ListWorkflowsClientMock) CloseSendCalls() []struct{} { var calls []struct{} mock.lockCloseSend.RLock() @@ -946,8 +931,7 @@ func (mock *WorkflowService_ListWorkflowsClientMock) Context() context.Context { // ContextCalls gets all the calls that were made to Context. // Check the length with: -// -// len(mockedWorkflowService_ListWorkflowsClient.ContextCalls()) +// len(mockedWorkflowService_ListWorkflowsClient.ContextCalls()) func (mock *WorkflowService_ListWorkflowsClientMock) ContextCalls() []struct{} { var calls []struct{} mock.lockContext.RLock() @@ -970,8 +954,7 @@ func (mock *WorkflowService_ListWorkflowsClientMock) Header() (metadata.MD, erro // HeaderCalls gets all the calls that were made to Header. // Check the length with: -// -// len(mockedWorkflowService_ListWorkflowsClient.HeaderCalls()) +// len(mockedWorkflowService_ListWorkflowsClient.HeaderCalls()) func (mock *WorkflowService_ListWorkflowsClientMock) HeaderCalls() []struct{} { var calls []struct{} mock.lockHeader.RLock() @@ -994,8 +977,7 @@ func (mock *WorkflowService_ListWorkflowsClientMock) Recv() (*Workflow, error) { // RecvCalls gets all the calls that were made to Recv. // Check the length with: -// -// len(mockedWorkflowService_ListWorkflowsClient.RecvCalls()) +// len(mockedWorkflowService_ListWorkflowsClient.RecvCalls()) func (mock *WorkflowService_ListWorkflowsClientMock) RecvCalls() []struct{} { var calls []struct{} mock.lockRecv.RLock() @@ -1022,8 +1004,7 @@ func (mock *WorkflowService_ListWorkflowsClientMock) RecvMsg(m interface{}) erro // RecvMsgCalls gets all the calls that were made to RecvMsg. // Check the length with: -// -// len(mockedWorkflowService_ListWorkflowsClient.RecvMsgCalls()) +// len(mockedWorkflowService_ListWorkflowsClient.RecvMsgCalls()) func (mock *WorkflowService_ListWorkflowsClientMock) RecvMsgCalls() []struct { M interface{} } { @@ -1054,8 +1035,7 @@ func (mock *WorkflowService_ListWorkflowsClientMock) SendMsg(m interface{}) erro // SendMsgCalls gets all the calls that were made to SendMsg. // Check the length with: -// -// len(mockedWorkflowService_ListWorkflowsClient.SendMsgCalls()) +// len(mockedWorkflowService_ListWorkflowsClient.SendMsgCalls()) func (mock *WorkflowService_ListWorkflowsClientMock) SendMsgCalls() []struct { M interface{} } { @@ -1082,8 +1062,7 @@ func (mock *WorkflowService_ListWorkflowsClientMock) Trailer() metadata.MD { // TrailerCalls gets all the calls that were made to Trailer. // Check the length with: -// -// len(mockedWorkflowService_ListWorkflowsClient.TrailerCalls()) +// len(mockedWorkflowService_ListWorkflowsClient.TrailerCalls()) func (mock *WorkflowService_ListWorkflowsClientMock) TrailerCalls() []struct{} { var calls []struct{} mock.lockTrailer.RLock() From 8effbb87d1325e7e934771907878abdb5dc2314b Mon Sep 17 00:00:00 2001 From: Jacob Weinstock Date: Fri, 16 Sep 2022 16:10:39 +0000 Subject: [PATCH 11/11] Use string type for VLANID: This allows a default value of "" to be used instead of 0 when the VLANID type is int. As 0 is a valid vlan id, we dont want that to be the default as it would make it impossible for the VLANID to be "unset" and therefore not added to DHCP requests, etc. Signed-off-by: Jacob Weinstock --- config/crd/bases/tinkerbell.org_hardware.yaml | 6 +++++- pkg/apis/core/v1alpha1/hardware_types.go | 4 +++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/config/crd/bases/tinkerbell.org_hardware.yaml b/config/crd/bases/tinkerbell.org_hardware.yaml index 11f17c416..3cf890ee9 100644 --- a/config/crd/bases/tinkerbell.org_hardware.yaml +++ b/config/crd/bases/tinkerbell.org_hardware.yaml @@ -121,7 +121,11 @@ spec: uefi: type: boolean vlan_id: - type: integer + description: + validation pattern for VLANDID is a string + number between 0-4096 + pattern: ^(([0-9][0-9]{0,2}|[1-3][0-9][0-9][0-9]|40([0-8][0-9]|9[0-6]))(,[1-9][0-9]{0,2}|[1-3][0-9][0-9][0-9]|40([0-8][0-9]|9[0-6]))*)$ + type: string type: object netboot: description: Netboot configuration. diff --git a/pkg/apis/core/v1alpha1/hardware_types.go b/pkg/apis/core/v1alpha1/hardware_types.go index 98084feac..5f4cf0b92 100644 --- a/pkg/apis/core/v1alpha1/hardware_types.go +++ b/pkg/apis/core/v1alpha1/hardware_types.go @@ -129,7 +129,9 @@ type DHCP struct { UEFI bool `json:"uefi,omitempty"` IfaceName string `json:"iface_name,omitempty"` IP *IP `json:"ip,omitempty"` - VLANID uint `json:"vlan_id,omitempty"` + // validation pattern for VLANDID is a string number between 0-4096 + // +kubebuilder:validation:Pattern="^(([0-9][0-9]{0,2}|[1-3][0-9][0-9][0-9]|40([0-8][0-9]|9[0-6]))(,[1-9][0-9]{0,2}|[1-3][0-9][0-9][0-9]|40([0-8][0-9]|9[0-6]))*)$" + VLANID string `json:"vlan_id,omitempty"` } // IP configuration.