mirror of
https://github.com/regclient/regclient.git
synced 2025-07-29 09:01:11 +03:00
Removing external imports of image schemas
Signed-off-by: Brandon Mitchell <git@bmitch.net>
This commit is contained in:
Brandon Mitchell
@ -6,11 +6,11 @@ import (
|
||||
"os"
|
||||
"time"
|
||||
|
||||
ociv1 "github.com/opencontainers/image-spec/specs-go/v1"
|
||||
"github.com/regclient/regclient"
|
||||
"github.com/regclient/regclient/cmd/regbot/internal/go2lua"
|
||||
"github.com/regclient/regclient/types/blob"
|
||||
"github.com/regclient/regclient/types/manifest"
|
||||
v1 "github.com/regclient/regclient/types/oci/v1"
|
||||
"github.com/regclient/regclient/types/ref"
|
||||
"github.com/sirupsen/logrus"
|
||||
lua "github.com/yuin/gopher-lua"
|
||||
@ -125,7 +125,7 @@ func (s *Sandbox) configExport(ls *lua.LState) int {
|
||||
// get the original config object, used to set fields that can be extracted from lua table
|
||||
origOCIConf := origC.conf.GetConfig()
|
||||
// build a new oci image from the lua table
|
||||
var ociImage ociv1.Image
|
||||
var ociImage v1.Image
|
||||
err = go2lua.Import(ls, utab, &ociImage, &origOCIConf)
|
||||
if err != nil {
|
||||
ls.RaiseError("Failed exporting config (go2lua): %v", err)
|
||||
|
||||
@ -4,10 +4,9 @@ import (
|
||||
"encoding/json"
|
||||
"reflect"
|
||||
|
||||
"github.com/containerd/containerd/platforms"
|
||||
ociv1 "github.com/opencontainers/image-spec/specs-go/v1"
|
||||
"github.com/regclient/regclient/cmd/regbot/internal/go2lua"
|
||||
"github.com/regclient/regclient/types/manifest"
|
||||
"github.com/regclient/regclient/types/platform"
|
||||
"github.com/regclient/regclient/types/ref"
|
||||
"github.com/sirupsen/logrus"
|
||||
lua "github.com/yuin/gopher-lua"
|
||||
@ -271,25 +270,25 @@ func (s *Sandbox) manifestPut(ls *lua.LState) int {
|
||||
return 0
|
||||
}
|
||||
|
||||
func (s *Sandbox) rcManifestGet(r ref.Ref, list bool, platform string) (manifest.Manifest, error) {
|
||||
func (s *Sandbox) rcManifestGet(r ref.Ref, list bool, pStr string) (manifest.Manifest, error) {
|
||||
m, err := s.rc.ManifestGet(s.ctx, r)
|
||||
if err != nil {
|
||||
return m, err
|
||||
}
|
||||
|
||||
if m.IsList() && !list {
|
||||
var plat ociv1.Platform
|
||||
if platform != "" {
|
||||
plat, err = platforms.Parse(platform)
|
||||
var plat platform.Platform
|
||||
if pStr != "" {
|
||||
plat, err = platform.Parse(pStr)
|
||||
if err != nil {
|
||||
s.log.WithFields(logrus.Fields{
|
||||
"platform": platform,
|
||||
"platform": pStr,
|
||||
"err": err,
|
||||
}).Warn("Could not parse platform")
|
||||
}
|
||||
}
|
||||
if plat.OS == "" {
|
||||
plat = platforms.DefaultSpec()
|
||||
plat = platform.Local()
|
||||
}
|
||||
desc, err := manifest.GetPlatformDesc(m, &plat)
|
||||
if err != nil {
|
||||
|
||||
@ -10,9 +10,10 @@ import (
|
||||
"strings"
|
||||
|
||||
"github.com/opencontainers/go-digest"
|
||||
ociv1 "github.com/opencontainers/image-spec/specs-go/v1"
|
||||
"github.com/regclient/regclient/pkg/archive"
|
||||
"github.com/regclient/regclient/types"
|
||||
"github.com/regclient/regclient/types/manifest"
|
||||
v1 "github.com/regclient/regclient/types/oci/v1"
|
||||
"github.com/regclient/regclient/types/ref"
|
||||
"github.com/spf13/cobra"
|
||||
)
|
||||
@ -295,8 +296,8 @@ func runArtifactPut(cmd *cobra.Command, args []string) error {
|
||||
}
|
||||
|
||||
// init empty manifest
|
||||
m := ociv1.Manifest{
|
||||
Layers: []ociv1.Descriptor{},
|
||||
m := v1.Manifest{
|
||||
Layers: []types.Descriptor{},
|
||||
Annotations: map[string]string{},
|
||||
}
|
||||
m.SchemaVersion = 2 // OCI bumped to match docker schema
|
||||
@ -330,7 +331,7 @@ func runArtifactPut(cmd *cobra.Command, args []string) error {
|
||||
return err
|
||||
}
|
||||
// save config descriptor to manifest
|
||||
m.Config = ociv1.Descriptor{
|
||||
m.Config = types.Descriptor{
|
||||
MediaType: artifactOpts.configMT,
|
||||
Digest: configDigest,
|
||||
Size: int64(len(configBytes)),
|
||||
@ -388,7 +389,7 @@ func runArtifactPut(cmd *cobra.Command, args []string) error {
|
||||
af = fSplit[len(fSplit)-2] + "/"
|
||||
}
|
||||
}
|
||||
m.Layers = append(m.Layers, ociv1.Descriptor{
|
||||
m.Layers = append(m.Layers, types.Descriptor{
|
||||
MediaType: mt,
|
||||
Digest: d,
|
||||
Size: l,
|
||||
@ -427,7 +428,7 @@ func runArtifactPut(cmd *cobra.Command, args []string) error {
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
m.Layers = append(m.Layers, ociv1.Descriptor{
|
||||
m.Layers = append(m.Layers, types.Descriptor{
|
||||
MediaType: mt,
|
||||
Digest: d,
|
||||
Size: l,
|
||||
|
||||
@ -7,11 +7,11 @@ import (
|
||||
"os"
|
||||
"strings"
|
||||
|
||||
"github.com/containerd/containerd/platforms"
|
||||
ociv1 "github.com/opencontainers/image-spec/specs-go/v1"
|
||||
"github.com/regclient/regclient"
|
||||
"github.com/regclient/regclient/pkg/template"
|
||||
"github.com/regclient/regclient/types"
|
||||
"github.com/regclient/regclient/types/manifest"
|
||||
"github.com/regclient/regclient/types/platform"
|
||||
"github.com/regclient/regclient/types/ref"
|
||||
"github.com/sirupsen/logrus"
|
||||
"github.com/spf13/cobra"
|
||||
@ -129,8 +129,8 @@ func getManifest(rc *regclient.RegClient, r ref.Ref) (manifest.Manifest, error)
|
||||
return m, nil
|
||||
}
|
||||
|
||||
func getPlatformDesc(rc *regclient.RegClient, m manifest.Manifest) (*ociv1.Descriptor, error) {
|
||||
var desc *ociv1.Descriptor
|
||||
func getPlatformDesc(rc *regclient.RegClient, m manifest.Manifest) (*types.Descriptor, error) {
|
||||
var desc *types.Descriptor
|
||||
var err error
|
||||
if !m.IsList() {
|
||||
return desc, fmt.Errorf("%w: manifest is not a list", ErrInvalidInput)
|
||||
@ -142,9 +142,9 @@ func getPlatformDesc(rc *regclient.RegClient, m manifest.Manifest) (*ociv1.Descr
|
||||
}
|
||||
}
|
||||
|
||||
var plat ociv1.Platform
|
||||
var plat platform.Platform
|
||||
if manifestOpts.platform != "" {
|
||||
plat, err = platforms.Parse(manifestOpts.platform)
|
||||
plat, err = platform.Parse(manifestOpts.platform)
|
||||
if err != nil {
|
||||
log.WithFields(logrus.Fields{
|
||||
"platform": manifestOpts.platform,
|
||||
@ -153,24 +153,24 @@ func getPlatformDesc(rc *regclient.RegClient, m manifest.Manifest) (*ociv1.Descr
|
||||
}
|
||||
}
|
||||
if plat.OS == "" {
|
||||
plat = platforms.DefaultSpec()
|
||||
plat = platform.Local()
|
||||
}
|
||||
desc, err = manifest.GetPlatformDesc(m, &plat)
|
||||
if err != nil {
|
||||
pl, _ := manifest.GetPlatformList(m)
|
||||
var ps []string
|
||||
for _, p := range pl {
|
||||
ps = append(ps, platforms.Format(*p))
|
||||
ps = append(ps, p.String())
|
||||
}
|
||||
log.WithFields(logrus.Fields{
|
||||
"platform": platforms.Format(plat),
|
||||
"platform": plat,
|
||||
"err": err,
|
||||
"platforms": strings.Join(ps, ", "),
|
||||
}).Warn("Platform could not be found in manifest list")
|
||||
return desc, ErrNotFound
|
||||
}
|
||||
log.WithFields(logrus.Fields{
|
||||
"platform": platforms.Format(plat),
|
||||
"platform": plat,
|
||||
"digest": desc.Digest.String(),
|
||||
}).Debug("Found platform specific digest in manifest list")
|
||||
return desc, nil
|
||||
@ -296,7 +296,7 @@ func runManifestPut(cmd *cobra.Command, args []string) error {
|
||||
rcM, err := manifest.New(
|
||||
manifest.WithRef(r),
|
||||
manifest.WithRaw(raw),
|
||||
manifest.WithDesc(ociv1.Descriptor{
|
||||
manifest.WithDesc(types.Descriptor{
|
||||
MediaType: manifestOpts.contentType,
|
||||
}),
|
||||
)
|
||||
|
||||
@ -15,13 +15,13 @@ import (
|
||||
"syscall"
|
||||
"time"
|
||||
|
||||
"github.com/containerd/containerd/platforms"
|
||||
"github.com/opencontainers/go-digest"
|
||||
"github.com/regclient/regclient"
|
||||
"github.com/regclient/regclient/config"
|
||||
"github.com/regclient/regclient/pkg/template"
|
||||
"github.com/regclient/regclient/types"
|
||||
"github.com/regclient/regclient/types/manifest"
|
||||
"github.com/regclient/regclient/types/platform"
|
||||
"github.com/regclient/regclient/types/ref"
|
||||
"github.com/robfig/cron/v3"
|
||||
"github.com/sirupsen/logrus"
|
||||
@ -832,7 +832,7 @@ func init() {
|
||||
// getPlatformDigest resolves a manifest list to a specific platform's digest
|
||||
// This uses the above cache to only call ManifestGet when a new manifest list digest is seen
|
||||
func getPlatformDigest(ctx context.Context, r ref.Ref, platStr string, origMan manifest.Manifest) (digest.Digest, error) {
|
||||
plat, err := platforms.Parse(platStr)
|
||||
plat, err := platform.Parse(platStr)
|
||||
if err != nil {
|
||||
log.WithFields(logrus.Fields{
|
||||
"platform": platStr,
|
||||
@ -861,10 +861,10 @@ func getPlatformDigest(ctx context.Context, r ref.Ref, platStr string, origMan m
|
||||
pl, _ := manifest.GetPlatformList(getMan)
|
||||
var ps []string
|
||||
for _, p := range pl {
|
||||
ps = append(ps, platforms.Format(*p))
|
||||
ps = append(ps, p.String())
|
||||
}
|
||||
log.WithFields(logrus.Fields{
|
||||
"platform": platforms.Format(plat),
|
||||
"platform": plat,
|
||||
"err": err,
|
||||
"platforms": strings.Join(ps, ", "),
|
||||
}).Warn("Platform could not be found in source manifest list")
|
||||
|
||||
14
go.mod
14
go.mod
@ -3,26 +3,22 @@ module github.com/regclient/regclient
|
||||
go 1.16
|
||||
|
||||
require (
|
||||
github.com/containerd/containerd v1.5.8
|
||||
github.com/docker/cli v20.10.12+incompatible
|
||||
github.com/docker/distribution v2.7.1+incompatible
|
||||
github.com/docker/docker v20.10.12+incompatible // indirect
|
||||
github.com/docker/docker-credential-helpers v0.6.4 // indirect
|
||||
github.com/docker/libtrust v0.0.0-20160708172513-aabc10ec26b7 // indirect
|
||||
github.com/docker/libtrust v0.0.0-20160708172513-aabc10ec26b7
|
||||
github.com/google/uuid v1.2.0
|
||||
github.com/gorilla/mux v1.8.0 // indirect
|
||||
github.com/klauspost/compress v1.13.6 // indirect
|
||||
github.com/kr/pretty v0.2.1 // indirect
|
||||
github.com/opencontainers/go-digest v1.0.0
|
||||
github.com/opencontainers/image-spec v1.0.2
|
||||
github.com/pkg/errors v0.9.1 // indirect
|
||||
github.com/robfig/cron/v3 v3.0.1
|
||||
github.com/sirupsen/logrus v1.8.1
|
||||
github.com/spf13/cobra v1.3.0
|
||||
github.com/yuin/gopher-lua v0.0.0-20210529063254-f4c35e4016d9
|
||||
golang.org/x/net v0.0.0-20211216030914-fe4d6282115f // indirect
|
||||
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
|
||||
golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e // indirect
|
||||
golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e
|
||||
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211
|
||||
google.golang.org/genproto v0.0.0-20211223182754-3ac035c7e7cb // indirect
|
||||
google.golang.org/grpc v1.43.0 // indirect
|
||||
gopkg.in/yaml.v2 v2.4.0
|
||||
gotest.tools/v3 v3.0.3 // indirect
|
||||
)
|
||||
|
||||
530
go.sum
530
go.sum
@ -1,4 +1,3 @@
|
||||
bazil.org/fuse v0.0.0-20160811212531-371fbbdaa898/go.mod h1:Xbm+BRKSBEpa4q4hTSxohYNQpsxXPbPry4JJWOB3LB8=
|
||||
cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
|
||||
cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
|
||||
cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU=
|
||||
@ -47,89 +46,32 @@ cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohl
|
||||
cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs=
|
||||
cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0=
|
||||
dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
|
||||
github.com/Azure/azure-sdk-for-go v16.2.1+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc=
|
||||
github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8=
|
||||
github.com/Azure/go-autorest v10.8.1+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24=
|
||||
github.com/Azure/go-autorest v14.2.0+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24=
|
||||
github.com/Azure/go-autorest/autorest v0.11.1/go.mod h1:JFgpikqFJ/MleTTxwepExTKnFUKKszPS8UavbQYUMuw=
|
||||
github.com/Azure/go-autorest/autorest/adal v0.9.0/go.mod h1:/c022QCutn2P7uY+/oQWWNcK9YU+MH96NgK+jErpbcg=
|
||||
github.com/Azure/go-autorest/autorest/adal v0.9.5/go.mod h1:B7KF7jKIeC9Mct5spmyCB/A8CG/sEz1vwIRGv/bbw7A=
|
||||
github.com/Azure/go-autorest/autorest/date v0.3.0/go.mod h1:BI0uouVdmngYNUzGWeSYnokU+TrmwEsOqdt8Y6sso74=
|
||||
github.com/Azure/go-autorest/autorest/mocks v0.4.0/go.mod h1:LTp+uSrOhSkaKrUy935gNZuuIPPVsHlr9DSOxSayd+k=
|
||||
github.com/Azure/go-autorest/autorest/mocks v0.4.1/go.mod h1:LTp+uSrOhSkaKrUy935gNZuuIPPVsHlr9DSOxSayd+k=
|
||||
github.com/Azure/go-autorest/logger v0.2.0/go.mod h1:T9E3cAhj2VqvPOtCYAvby9aBXkZmbF5NWuPV8+WeEW8=
|
||||
github.com/Azure/go-autorest/tracing v0.6.0/go.mod h1:+vhtPC754Xsa23ID7GlGsrdKBpUA79WCAKPPZVC2DeU=
|
||||
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
|
||||
github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
|
||||
github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ=
|
||||
github.com/Microsoft/go-winio v0.4.11/go.mod h1:VhR8bwka0BXejwEJY73c50VrPtXAaKcyvVC4A4RozmA=
|
||||
github.com/Microsoft/go-winio v0.4.14/go.mod h1:qXqCSQ3Xa7+6tgxaGTIe4Kpcdsi+P8jBhyzoq1bpyYA=
|
||||
github.com/Microsoft/go-winio v0.4.15-0.20190919025122-fc70bd9a86b5/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/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/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/go.mod h1:o5/SZqmR7x9JNKsW3pu+nqHm0MF8vbA+VxGOoXdC600=
|
||||
github.com/Microsoft/hcsshim v0.8.23/go.mod h1:4zegtUJth7lAvFyc6cH2gGQ5B3OFQim01nnU2M8jKDg=
|
||||
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=
|
||||
github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
|
||||
github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
|
||||
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=
|
||||
github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
|
||||
github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
|
||||
github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
|
||||
github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
|
||||
github.com/alexflint/go-filemutex v0.0.0-20171022225611-72bdc8eae2ae/go.mod h1:CgnQgUtFrFz9mxFNtED3jI5tLDjKlOM+oUF/sTk6ps0=
|
||||
github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
|
||||
github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o=
|
||||
github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8=
|
||||
github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY=
|
||||
github.com/armon/go-metrics v0.3.10/go.mod h1:4O98XIr/9W0sxpJ8UaYkvjk10Iff7SnFrb4QAOwNTFc=
|
||||
github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=
|
||||
github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=
|
||||
github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY=
|
||||
github.com/aws/aws-sdk-go v1.15.11/go.mod h1:mFuSZ37Z9YOHbQEwBWztmVzqXrEkub65tZoCYDt7FT0=
|
||||
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/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
|
||||
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/blang/semver v3.1.0+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk=
|
||||
github.com/blang/semver v3.5.1+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk=
|
||||
github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869/go.mod h1:Ekp36dRnpXw/yCqJaO+ZrUyxD+3VXMFFr56k5XYrpB4=
|
||||
github.com/bshuster-repo/logrus-logstash-hook v0.4.1/go.mod h1:zsTqEiSzDgAa/8GZR7E1qaXrhYNDKBYy5/dWPTIflbk=
|
||||
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=
|
||||
github.com/bugsnag/panicwrap v0.0.0-20151223152923-e2c28503fcd0/go.mod h1:D/8v3kj0zr8ZAKg1AQ6crr+5VwKN5eIywRkfhyM/+dE=
|
||||
github.com/cenkalti/backoff/v4 v4.1.1/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/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
|
||||
github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
|
||||
github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
|
||||
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/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/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod h1:nmEj6Dob7S7YxXgwXpfOuvO54S+tGdZdw9fuRZt25Ag=
|
||||
github.com/circonus-labs/circonusllhist v0.1.3/go.mod h1:kMXHVDlOchFAehlya5ePtbp5jckzBHf4XRpQvBOLI+I=
|
||||
github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
|
||||
@ -143,149 +85,23 @@ github.com/cncf/xds/go v0.0.0-20210922020428-25de7278fc84/go.mod h1:eXthEFrGJvWH
|
||||
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/cncf/xds/go v0.0.0-20211130200136-a8f946100490/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
|
||||
github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8=
|
||||
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/go.mod h1:ZJeTFisyysqgcCdecO57Dj79RfL0LNeGiFUqLYQRYLE=
|
||||
github.com/containerd/cgroups v1.0.1/go.mod h1:0SJrPIenamHDcZhEcJMNBB85rHcUsw4f25ZfBiPYRkU=
|
||||
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/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=
|
||||
github.com/containerd/containerd v1.3.1-0.20191213020239-082f7e3aed57/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA=
|
||||
github.com/containerd/containerd v1.3.2/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA=
|
||||
github.com/containerd/containerd v1.4.0-beta.2.0.20200729163537-40b22ef07410/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA=
|
||||
github.com/containerd/containerd v1.4.1/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA=
|
||||
github.com/containerd/containerd v1.4.3/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA=
|
||||
github.com/containerd/containerd v1.4.9/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/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.8 h1:NmkCC1/QxyZFBny8JogwLpOy2f+VEbO/f6bV2Mqtwuw=
|
||||
github.com/containerd/containerd v1.5.8/go.mod h1:YdFSv5bTFLpG2HIYmfqDpSYYTDX+mc5qtSuYx1YUb/s=
|
||||
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/go.mod h1:EXlVlkqNba9rJe3j7w3Xa924itAMLgZH4UD/Q4PExuQ=
|
||||
github.com/containerd/continuity v0.1.0/go.mod h1:ICJu0PwR54nI0yPEnJ6jcS+J7CZAUXrLh8lPo2knzsM=
|
||||
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/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/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/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=
|
||||
github.com/coreos/go-systemd v0.0.0-20161114122254-48702e0da86b/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
|
||||
github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
|
||||
github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
|
||||
github.com/coreos/go-systemd/v22 v22.0.0/go.mod h1:xO0FLkIi5MaZafQlIrOotqXZ90ih+1atmu1JpKERPPk=
|
||||
github.com/coreos/go-systemd/v22 v22.1.0/go.mod h1:xO0FLkIi5MaZafQlIrOotqXZ90ih+1atmu1JpKERPPk=
|
||||
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/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/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
|
||||
github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY=
|
||||
github.com/cyphar/filepath-securejoin v0.2.2/go.mod h1:FpkQEhXnPnOthhzymB7CGsFk2G9VLXONKD9G7QGMM+4=
|
||||
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=
|
||||
github.com/d2g/hardwareaddr v0.0.0-20190221164911-e7d9fbe030e4/go.mod h1:bMl4RjIciD2oAxI7DmWRx6gbeqrkoLqv3MV0vzNad+I=
|
||||
github.com/danieljoos/wincred v1.1.0/go.mod h1:XYlo+eRTsVA9aHGp7NGjFkPla4m+DCL7hqDjlFjiygg=
|
||||
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
||||
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
|
||||
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
||||
github.com/denverdino/aliyungo v0.0.0-20190125010748-a747050bb1ba/go.mod h1:dV8lFg6daOBZbT6/BDGIz6Y3WFGn8juu6G+CQ6LHtl0=
|
||||
github.com/dgrijalva/jwt-go v0.0.0-20170104182250-a601269ab70c/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
|
||||
github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
|
||||
github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no=
|
||||
github.com/dnaeon/go-vcr v1.0.1/go.mod h1:aBB1+wY4s93YsC3HHjMBMrwTj2R9FHDzUr9KyGc8n1E=
|
||||
github.com/docker/cli v20.10.12+incompatible h1:lZlz0uzG+GH+c0plStMUdF/qk3ppmgnswpR5EbqzVGA=
|
||||
github.com/docker/cli v20.10.12+incompatible/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 h1:a5mlkVzth6W5A4fOsS3D2EO5BUmsJpcB+cRlLU7cSug=
|
||||
github.com/docker/distribution v2.7.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
|
||||
github.com/docker/docker v20.10.12+incompatible h1:CEeNmFM0QZIsJCZKMkZx0ZcahTiewkrgiwfYD+dfl1U=
|
||||
github.com/docker/docker v20.10.12+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
|
||||
github.com/docker/docker-credential-helpers v0.6.4 h1:axCks+yV+2MR3/kZhAmy07yC56WZ2Pwu/fKWtKuZB0o=
|
||||
github.com/docker/docker-credential-helpers v0.6.4/go.mod h1:ofX3UI0Gz1TteYBjtgs07O36Pyasyp66D2uKT7H8W1c=
|
||||
github.com/docker/go-events v0.0.0-20170721190031-9461782956ad/go.mod h1:Uw6UezgYA44ePAFQYUehOuCzmy5zmg/+nl2ZfMWGkpA=
|
||||
github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c/go.mod h1:Uw6UezgYA44ePAFQYUehOuCzmy5zmg/+nl2ZfMWGkpA=
|
||||
github.com/docker/go-metrics v0.0.0-20180209012529-399ea8c73916/go.mod h1:/u0gXw0Gay3ceNrsHubL3BtdOL2fHf93USgMTe0W5dI=
|
||||
github.com/docker/go-metrics v0.0.1/go.mod h1:cG1hvH2utMXtqgqqYE9plW6lDxS3/5ayHzueweSI3Vw=
|
||||
github.com/docker/go-units v0.4.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
|
||||
github.com/docker/libtrust v0.0.0-20150114040149-fa567046d9b1/go.mod h1:cyGadeNEkKy96OOhEzfZl+yxihPEzKnqJwvfuSUqbZE=
|
||||
github.com/docker/libtrust v0.0.0-20160708172513-aabc10ec26b7 h1:UhxFibDNY/bfvqU5CAUmr9zpesgbU6SWc8/B4mflAE4=
|
||||
github.com/docker/libtrust v0.0.0-20160708172513-aabc10ec26b7/go.mod h1:cyGadeNEkKy96OOhEzfZl+yxihPEzKnqJwvfuSUqbZE=
|
||||
github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96/go.mod h1:Qh8CwZgvJUkLughtfhJv5dyTYa91l1fOUCrgjqmcifM=
|
||||
github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod h1:WwZ+bS3ebgob9U8Nd0kOddGdZWjyMGR8Wziv+TBNwSE=
|
||||
github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
|
||||
github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
|
||||
github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153/go.mod h1:/Zj4wYkgs4iZTTu3o/KG3Itv/qCCa8VVMlb3i9OVuzc=
|
||||
github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs=
|
||||
github.com/emicklei/go-restful v2.9.5+incompatible/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs=
|
||||
github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
|
||||
github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
|
||||
github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
|
||||
@ -297,53 +113,23 @@ github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go.
|
||||
github.com/envoyproxy/go-control-plane v0.10.1/go.mod h1:AY7fTTXNdv/aJ2O5jwpxAPOWUZ7hQAEvzN5Pf27BkQQ=
|
||||
github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
|
||||
github.com/envoyproxy/protoc-gen-validate v0.6.2/go.mod h1:2t7qjJNvHPx8IjnBOzl9E9/baC+qXE/TeeyBRzgJDws=
|
||||
github.com/evanphx/json-patch v4.9.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
|
||||
github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
|
||||
github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU=
|
||||
github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk=
|
||||
github.com/form3tech-oss/jwt-go v3.2.2+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k=
|
||||
github.com/frankban/quicktest v1.11.3/go.mod h1:wRf/ReqHper53s+kmmSZizM8NamnL3IM0I9ntUbOk+k=
|
||||
github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
|
||||
github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
|
||||
github.com/fsnotify/fsnotify v1.5.1/go.mod h1:T3375wBYaZdLLcVNkcVbzGHY7f1l/uK5T5Ai1i3InKU=
|
||||
github.com/fullsailor/pkcs7 v0.0.0-20190404230743-d7302db945fa/go.mod h1:KnogPXtdwXqoenmZCw6S+25EAm2MkxbG0deNDu4cbSA=
|
||||
github.com/garyburd/redigo v0.0.0-20150301180006-535138d7bcd7/go.mod h1:NR3MbYisc3/PwhQ00EMzDiPmrwpPxAn5GI05/YaO1SY=
|
||||
github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
|
||||
github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
|
||||
github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
|
||||
github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
|
||||
github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
|
||||
github.com/go-ini/ini v1.25.4/go.mod h1:ByCAeIL28uOIIG0E3PJtZPDL8WnHpFKFOtgjp+3Ies8=
|
||||
github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
|
||||
github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
|
||||
github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
|
||||
github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
|
||||
github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7sIas=
|
||||
github.com/go-logr/logr v0.2.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU=
|
||||
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/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/spec v0.19.3/go.mod h1:FpwSN1ksY1eteniUU7X0N/BgJ7a4WvBFVA8Lj9mJglo=
|
||||
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-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
|
||||
github.com/godbus/dbus v0.0.0-20151105175453-c7fdd8b5cd55/go.mod h1:/YcGZj5zSblfDWMMoOzV4fas9FZnQYTkDnsGvmh2Grw=
|
||||
github.com/godbus/dbus v0.0.0-20180201030542-885f9cc04c9c/go.mod h1:/YcGZj5zSblfDWMMoOzV4fas9FZnQYTkDnsGvmh2Grw=
|
||||
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/gogo/googleapis v1.2.0/go.mod h1:Njal3psf3qN6dwBtQfUmBZh2ybovJ0tlu3o/AC7HYjU=
|
||||
github.com/gogo/googleapis v1.4.0/go.mod h1:5YRNX2z1oM5gXdAkurHa942MDgEJyk02w4OecKY87+c=
|
||||
github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
|
||||
github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4=
|
||||
github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o=
|
||||
github.com/gogo/protobuf v1.3.0/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o=
|
||||
github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o=
|
||||
github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
|
||||
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
|
||||
github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
|
||||
github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
|
||||
github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
|
||||
github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
|
||||
github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
|
||||
@ -373,7 +159,6 @@ github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw
|
||||
github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
|
||||
github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
|
||||
github.com/golang/protobuf v1.5.1/go.mod h1:DopwsBzvsk0Fs44TXzsVbJyPhcCPeIwnvohx4u74HPM=
|
||||
github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw=
|
||||
github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
|
||||
github.com/golang/snappy v0.0.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
|
||||
github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
|
||||
@ -392,7 +177,6 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
|
||||
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/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
|
||||
github.com/google/gofuzz v1.1.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
|
||||
github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
|
||||
github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0=
|
||||
github.com/google/martian/v3 v3.1.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0=
|
||||
@ -412,8 +196,6 @@ github.com/google/pprof v0.0.0-20210601050228-01bbb1931b22/go.mod h1:kpwsk12EmLe
|
||||
github.com/google/pprof v0.0.0-20210609004039-a478d1d731e9/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
|
||||
github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
|
||||
github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
|
||||
github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
|
||||
github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
|
||||
github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
|
||||
github.com/google/uuid v1.2.0 h1:qJYtXnJRWmpe7m/3XlyhrsLrEURqHRM2kxzoxXqyUDs=
|
||||
github.com/google/uuid v1.2.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
|
||||
@ -421,25 +203,9 @@ github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+
|
||||
github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk=
|
||||
github.com/googleapis/gax-go/v2 v2.1.0/go.mod h1:Q3nei7sK6ybPYH7twZdmQpAd1MKb7pfu6SK+H1/DsU0=
|
||||
github.com/googleapis/gax-go/v2 v2.1.1/go.mod h1:hddJymUZASv3XPyGkUpKj8pPO47Rmb0eJc8R6ouapiM=
|
||||
github.com/googleapis/gnostic v0.4.1/go.mod h1:LRhVm6pbyptWbWbuZ38d1eyptfvIytN3ir6b65WBswg=
|
||||
github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
|
||||
github.com/gorilla/handlers v0.0.0-20150720190736-60c7bfde3e33/go.mod h1:Qkdc/uu4tH4g6mTK6auzZ766c4CA0Ng8+o/OAirnOIQ=
|
||||
github.com/gorilla/mux v1.7.2/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/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.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
|
||||
github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA=
|
||||
github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs=
|
||||
github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de4/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs=
|
||||
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk=
|
||||
github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY=
|
||||
github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY=
|
||||
github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=
|
||||
github.com/hashicorp/consul/api v1.11.0/go.mod h1:XjsvQN+RJGWI2TWy1/kqaE16HrR2J/FWgkYjdZQsX9M=
|
||||
github.com/hashicorp/consul/sdk v0.8.0/go.mod h1:GBvyrGALthsZObzUGsfgHZQDXjg4lOjagTIwIR1vPms=
|
||||
github.com/hashicorp/errwrap v0.0.0-20141028054710-7554cd9344ce/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
|
||||
github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
|
||||
github.com/hashicorp/go-cleanhttp v0.5.0/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80=
|
||||
github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80=
|
||||
@ -449,7 +215,6 @@ github.com/hashicorp/go-hclog v1.0.0/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39E
|
||||
github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60=
|
||||
github.com/hashicorp/go-immutable-radix v1.3.1/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60=
|
||||
github.com/hashicorp/go-msgpack v0.5.3/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM=
|
||||
github.com/hashicorp/go-multierror v0.0.0-20161216184304-ed905158d874/go.mod h1:JMRHfdO9jKNzS/+BTlxCjKNQHg/jZAft8U7LloJvN7I=
|
||||
github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk=
|
||||
github.com/hashicorp/go-multierror v1.1.0/go.mod h1:spPvp8C1qA32ftKqdAHm4hHTbPw+vmowP0z+KUhOZdA=
|
||||
github.com/hashicorp/go-retryablehttp v0.5.3/go.mod h1:9B5zBasrRhHXnJnui7y6sL7es7NDiJgTc6Er0maI1Xs=
|
||||
@ -469,42 +234,21 @@ github.com/hashicorp/memberlist v0.2.2/go.mod h1:MS2lj3INKhZjWNqd3N0m3J+Jxf3DAOn
|
||||
github.com/hashicorp/memberlist v0.3.0/go.mod h1:MS2lj3INKhZjWNqd3N0m3J+Jxf3DAOnAH9VT3Sh9MUE=
|
||||
github.com/hashicorp/serf v0.9.5/go.mod h1:UWDWwZeL5cuWDJdl0C6wrvrUwEqtQ4ZKBKKENpqIUyk=
|
||||
github.com/hashicorp/serf v0.9.6/go.mod h1:TXZNMjZQijwlDvp+r0b63xZ45H7JmCmgg4gpTwn9UV4=
|
||||
github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
|
||||
github.com/iancoleman/strcase v0.2.0/go.mod h1:iwCmte+B7n89clKwxIoIXy/HfoL7AsD47ZCWhYzw7ho=
|
||||
github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
|
||||
github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
|
||||
github.com/imdario/mergo v0.3.5/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
|
||||
github.com/imdario/mergo v0.3.8/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
|
||||
github.com/imdario/mergo v0.3.10/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA=
|
||||
github.com/imdario/mergo v0.3.11/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA=
|
||||
github.com/imdario/mergo v0.3.12/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA=
|
||||
github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM=
|
||||
github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
|
||||
github.com/j-keck/arping v0.0.0-20160618110441-2cf9dc699c56/go.mod h1:ymszkNOg6tORTn+6F6j+Jc8TOr5osrynvN6ivFWZ2GA=
|
||||
github.com/jmespath/go-jmespath v0.0.0-20160202185014-0b12d6b521d8/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k=
|
||||
github.com/jmespath/go-jmespath v0.0.0-20160803190731-bd40a432e4c7/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k=
|
||||
github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo=
|
||||
github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
|
||||
github.com/json-iterator/go v1.1.7/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
|
||||
github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
|
||||
github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
|
||||
github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
|
||||
github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
|
||||
github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
|
||||
github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk=
|
||||
github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
|
||||
github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
|
||||
github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q=
|
||||
github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00=
|
||||
github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
|
||||
github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
|
||||
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.13.6 h1:P76CopJELS0TiO2mebmnzgWaajssP/EszplttgQxcgc=
|
||||
github.com/klauspost/compress v1.13.6/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk=
|
||||
github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
|
||||
github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
|
||||
github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
|
||||
github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg=
|
||||
github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
|
||||
github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
|
||||
@ -512,110 +256,43 @@ github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfn
|
||||
github.com/kr/pretty v0.2.1 h1:Fmg33tUaq4/8ym9TJN1x7sLJnHVwhP33CNkpYV/7rwI=
|
||||
github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
|
||||
github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
|
||||
github.com/kr/pty v1.1.5/go.mod h1:9r2w37qlBe7rQ6e1fg1S/9xpWHSnaqNdHD3WcMdbPDA=
|
||||
github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
|
||||
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
|
||||
github.com/lyft/protoc-gen-star v0.5.3/go.mod h1:V0xaHgaf5oCCqmcxYcWiDfTiKsZsRc87/1qhoTACD8w=
|
||||
github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
|
||||
github.com/magiconair/properties v1.8.5/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60=
|
||||
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=
|
||||
github.com/marstr/guid v1.1.0/go.mod h1:74gB1z2wpxxInTG6yaqA7KrtM0NZ+RbrcqDvYHefzho=
|
||||
github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
|
||||
github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
|
||||
github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
|
||||
github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
|
||||
github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4=
|
||||
github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
|
||||
github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
|
||||
github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
|
||||
github.com/mattn/go-isatty v0.0.10/go.mod h1:qgIWMr58cqv1PHHyhnkY9lrL7etaEgOFcMEpPG5Rm84=
|
||||
github.com/mattn/go-isatty v0.0.11/go.mod h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOAqxQCu2WE=
|
||||
github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
|
||||
github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
|
||||
github.com/mattn/go-runewidth v0.0.2/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU=
|
||||
github.com/mattn/go-shellwords v1.0.3/go.mod h1:3xCvwCdWdlDJUrvuMn7Wuy9eWs4pE8vqg+NOMyg4B2o=
|
||||
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/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4=
|
||||
github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=
|
||||
github.com/miekg/dns v1.1.26/go.mod h1:bPDLeHnStXmXAq1m/Ch/hvfNHr14JKNPMBo3VZKjuso=
|
||||
github.com/miekg/dns v1.1.41/go.mod h1:p6aan82bvRIyn+zDIv9xYNUpwa73JcSh9BKwknJysuI=
|
||||
github.com/miekg/pkcs11 v1.0.3/go.mod h1:XsNlhZGX73bx86s2hdc/FuaLm2CPZJemRLMA+WTFxgs=
|
||||
github.com/mistifyio/go-zfs v2.1.2-0.20190413222219-f784269be439+incompatible/go.mod h1:8AuVvqP/mXw1px98n46wfvcGfQ4ci2FwoAjKYxuo3Z4=
|
||||
github.com/mitchellh/cli v1.1.0/go.mod h1:xcISNoH86gajksDmfB23e/pu+B+GeFRMYmoHXxx3xhI=
|
||||
github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
|
||||
github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI=
|
||||
github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
|
||||
github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
|
||||
github.com/mitchellh/mapstructure v1.4.3/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
|
||||
github.com/mitchellh/osext v0.0.0-20151018003038-5e2d6d41470f/go.mod h1:OkQIRizQZAeMln+1tSwduZz7+Af5oFlKirV/MSYes2A=
|
||||
github.com/moby/locker v1.0.1 h1:fOXqR41zeveg4fFODix+1Ch4mj/gT0NE1XJbp/epuBg=
|
||||
github.com/moby/locker v1.0.1/go.mod h1:S7SDdo5zpBK84bzzVlKr2V0hz+7x9hWbYC/kq7oQppc=
|
||||
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/go.mod h1:rEr8tzG/lsIZHBtN/JjGG+LMYx9eXgW2JI+6q0qou+A=
|
||||
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/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
|
||||
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
|
||||
github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
|
||||
github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
|
||||
github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
|
||||
github.com/mrunalp/fileutils v0.5.0/go.mod h1:M1WthSahJixYnrXQl/DFQuteStB1weuxD2QJNHXfbSQ=
|
||||
github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
|
||||
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
|
||||
github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
|
||||
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw=
|
||||
github.com/ncw/swift v1.0.47/go.mod h1:23YIA4yWVnGwv2dQlN4bB7egfYX6YLn0Yo/S6zZO/ZM=
|
||||
github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=
|
||||
github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U=
|
||||
github.com/olekukonko/tablewriter v0.0.0-20170122224234-a0225b3f23b5/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo=
|
||||
github.com/onsi/ginkgo v0.0.0-20151202141238-7f8ab55aaf3b/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
|
||||
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.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.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk=
|
||||
github.com/onsi/gomega v0.0.0-20151007035656-2152b45fa28a/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA=
|
||||
github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA=
|
||||
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.10.3/go.mod h1:V9xEwhxec5O8UDM77eCW8vLymOMltsqPVYWrpDsH8xc=
|
||||
github.com/opencontainers/go-digest v0.0.0-20170106003457-a6d0ee40d420/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s=
|
||||
github.com/opencontainers/go-digest v0.0.0-20180430190053-c9281466c8b2/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s=
|
||||
github.com/opencontainers/go-digest v1.0.0-rc1/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s=
|
||||
github.com/opencontainers/go-digest v1.0.0-rc1.0.20180430190053-c9281466c8b2/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s=
|
||||
github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U=
|
||||
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/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/go.mod h1:3NOsor4w32B2tC0Zbl8Knk4Wg84SM2ImC1fxBuqJ/H0=
|
||||
github.com/opencontainers/runc v1.0.2/go.mod h1:aTaHFFwQXuA71CiyxOdFFIorAoemI04suvGRQFzWTD0=
|
||||
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/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
|
||||
github.com/pascaldekloe/goe v0.1.0/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
|
||||
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.4/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c=
|
||||
github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU=
|
||||
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=
|
||||
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
|
||||
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
|
||||
@ -624,92 +301,43 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb
|
||||
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
|
||||
github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI=
|
||||
github.com/posener/complete v1.2.3/go.mod h1:WZIdtGGp+qx0sLrYKtIRAruyNpv6hFCicSgv7Sy7s/s=
|
||||
github.com/pquerna/cachecontrol v0.0.0-20171018203845-0dec1b30a021/go.mod h1:prYjPmNq4d1NPVmpShWobRqXY3q7Vp+80DqgxxUrUIA=
|
||||
github.com/prometheus/client_golang v0.0.0-20180209125602-c332b6f63c06/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
|
||||
github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
|
||||
github.com/prometheus/client_golang v0.9.3/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDft0ttaMvbicHlPoso=
|
||||
github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo=
|
||||
github.com/prometheus/client_golang v1.1.0/go.mod h1:I1FGZT9+L76gKKOs5djB6ezCbFQP1xR9D75/vuwEF3g=
|
||||
github.com/prometheus/client_golang v1.4.0/go.mod h1:e9GMxYsXl05ICDXkRhurwBS4Q3OK1iX/F2sw+iXX5zU=
|
||||
github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M=
|
||||
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-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
|
||||
github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
|
||||
github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
|
||||
github.com/prometheus/common v0.0.0-20180110214958-89604d197083/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro=
|
||||
github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro=
|
||||
github.com/prometheus/common v0.4.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
|
||||
github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
|
||||
github.com/prometheus/common v0.6.0/go.mod h1:eBmuwkDJBwy6iBfxCBob6t6dR6ENT/y+J+Zk0j9GMYc=
|
||||
github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4=
|
||||
github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo=
|
||||
github.com/prometheus/procfs v0.0.0-20180125133057-cb4147076ac7/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
|
||||
github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
|
||||
github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
|
||||
github.com/prometheus/procfs v0.0.0-20190522114515-bc1a522cf7b1/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
|
||||
github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
|
||||
github.com/prometheus/procfs v0.0.3/go.mod h1:4A/X28fw3Fc593LaREMrKMqOKvUAntwMDaekg4FpcdQ=
|
||||
github.com/prometheus/procfs v0.0.5/go.mod h1:4A/X28fw3Fc593LaREMrKMqOKvUAntwMDaekg4FpcdQ=
|
||||
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/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA=
|
||||
github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU=
|
||||
github.com/robfig/cron/v3 v3.0.1 h1:WdRxkvbJztn8LMz/QEvLN5sBU+xKpSqwwUO1Pjr4qDs=
|
||||
github.com/robfig/cron/v3 v3.0.1/go.mod h1:eQICP3HwyT7UooqI/z+Ov+PtYAWygg1TEWWzGIFLtro=
|
||||
github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg=
|
||||
github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
|
||||
github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
|
||||
github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
|
||||
github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
|
||||
github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts=
|
||||
github.com/safchain/ethtool v0.0.0-20190326074333-42ed695e3de8/go.mod h1:Z0q5wiBQGYcxhMZ6gUqHn6pYNLypFAvaL3UvgZLR0U4=
|
||||
github.com/sagikazarmark/crypt v0.3.0/go.mod h1:uD/D+6UF4SrIR1uGEv7bBNkNqLGqUr43MRiaGWX1Nig=
|
||||
github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0=
|
||||
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/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
|
||||
github.com/sirupsen/logrus v1.0.4-0.20170822132746-89742aefa4b2/go.mod h1:pMByvHTf9Beacp5x1UXfOR9xyW/9antXMhjMPG0dEzc=
|
||||
github.com/sirupsen/logrus v1.0.6/go.mod h1:pMByvHTf9Beacp5x1UXfOR9xyW/9antXMhjMPG0dEzc=
|
||||
github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
|
||||
github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q=
|
||||
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/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
|
||||
github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
|
||||
github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM=
|
||||
github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
|
||||
github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ=
|
||||
github.com/spf13/afero v1.2.2/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk=
|
||||
github.com/spf13/afero v1.3.3/go.mod h1:5KUK8ByomD5Ti5Artl0RtHeI5pTF7MIDuXL3yY520V4=
|
||||
github.com/spf13/afero v1.6.0/go.mod h1:Ai8FlHk4v/PARR026UzYexafAt9roJ7LcLMAmO6Z93I=
|
||||
github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
|
||||
github.com/spf13/cast v1.4.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
|
||||
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 v1.0.0/go.mod h1:/6GTrnGXV9HjY+aR4k0oJ5tcvakLuG6EuKReYlHNrgE=
|
||||
github.com/spf13/cobra v1.3.0 h1:R7cSvGu+Vv+qX0gW5R/85dx2kmmJT5z5NM8ifdYjdn0=
|
||||
github.com/spf13/cobra v1.3.0/go.mod h1:BrRVncBjOJa/eUcVVm9CE+oC6as8k+VYr4NY7WCi9V4=
|
||||
github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo=
|
||||
github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo=
|
||||
github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
|
||||
github.com/spf13/pflag v1.0.1-0.20171106142849-4c012f6dcd95/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
|
||||
github.com/spf13/pflag v1.0.1/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
|
||||
github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
|
||||
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.4.0/go.mod h1:PTJ7Z/lr49W6bUbkmS1V3by4uWynFiR9p7+dSq/yZzE=
|
||||
github.com/spf13/viper v1.10.0/go.mod h1:SoyBPwAtKDzypXNDFKN5kzH7ppppbGZtls1UpIy5AsM=
|
||||
github.com/stefanberger/go-pkcs11uri v0.0.0-20201008174630-78d3cae3a980/go.mod h1:AO3tvPzVZ/ayst6UlUKUv6rcPQInYe3IknH3jYhAKu8=
|
||||
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/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE=
|
||||
github.com/stretchr/testify v0.0.0-20180303142811-b89eecf5ca5d/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
|
||||
github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
|
||||
github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
|
||||
github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
|
||||
@ -718,31 +346,7 @@ github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/
|
||||
github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
|
||||
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
|
||||
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=
|
||||
github.com/syndtr/gocapability v0.0.0-20180916011248-d98352740cb2/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww=
|
||||
github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww=
|
||||
github.com/tchap/go-patricia v2.2.6+incompatible/go.mod h1:bmLyhP68RS6kStMGxByiQ23RP/odRBOTVjwp2cDyi6I=
|
||||
github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
|
||||
github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
|
||||
github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM=
|
||||
github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc=
|
||||
github.com/urfave/cli v0.0.0-20171014202726-7bc6a0acffa5/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA=
|
||||
github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA=
|
||||
github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0=
|
||||
github.com/urfave/cli v1.22.2/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0=
|
||||
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/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU=
|
||||
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod h1:GwrjFmJcFw6At/Gs6z4yjiIwzuJ1/+UwLxMQDVQXShQ=
|
||||
github.com/xeipuuv/gojsonschema v0.0.0-20180618132009-1d523034197f/go.mod h1:5yf86TLmAcydyeJq5YvxkGPE2fm/u4myDekKRoLuqhs=
|
||||
github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU=
|
||||
github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q=
|
||||
github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
|
||||
github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
|
||||
github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
|
||||
@ -750,17 +354,9 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec
|
||||
github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
|
||||
github.com/yuin/gopher-lua v0.0.0-20210529063254-f4c35e4016d9 h1:k/gmLsJDWwWqbLCur2yWnJzwQEKRcAHXo6seXGuSwWw=
|
||||
github.com/yuin/gopher-lua v0.0.0-20210529063254-f4c35e4016d9/go.mod h1:E1AXubJBdNmFERAOucpDIxNzeGfLzg0mYh+UfMWdChA=
|
||||
github.com/yvasiyarov/go-metrics v0.0.0-20140926110328-57bccd1ccd43/go.mod h1:aX5oPXxHm3bOH+xeAttToC8pqch2ScQN/JoXYupl6xs=
|
||||
github.com/yvasiyarov/gorelic v0.0.0-20141212073537-a9bba5b9ab50/go.mod h1:NUSPSUX/bi6SeDMUh6brw0nXpxHnc96TguQh0+r/ssA=
|
||||
github.com/yvasiyarov/newrelic_platform_go v0.0.0-20140908184405-b21fdbd4370f/go.mod h1:GlGEuHIJweS1mbCqG+7vt2nvWLzLLnRHbXz5JKd/Qbg=
|
||||
go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
|
||||
go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
|
||||
go.etcd.io/bbolt v1.3.5/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ=
|
||||
go.etcd.io/etcd v0.5.0-alpha.5.0.20200910180754-dd1b699fc489/go.mod h1:yVHk9ub3CSBatqGNg7GRmsnfLWtoW60w4eDYfh7vHDg=
|
||||
go.etcd.io/etcd/api/v3 v3.5.1/go.mod h1:cbVKeC6lCfl7j/8jBhAK6aIYO9XOjdptoxU/nLQcPvs=
|
||||
go.etcd.io/etcd/client/pkg/v3 v3.5.1/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g=
|
||||
go.etcd.io/etcd/client/v2 v2.305.1/go.mod h1:pMEacxZW7o8pg4CrFE7pquyCJJzZvkvdD2RibOCCCGs=
|
||||
go.mozilla.org/pkcs7 v0.0.0-20200128120323-432b2356ecb1/go.mod h1:SNgMg+EgDFwmvSmLRTNKC5fegJjB7v23qTQ0XLGUNHk=
|
||||
go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
|
||||
go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8=
|
||||
go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
|
||||
@ -769,29 +365,18 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
|
||||
go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk=
|
||||
go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E=
|
||||
go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI=
|
||||
go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
|
||||
go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
|
||||
go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
|
||||
go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0=
|
||||
go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU=
|
||||
go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=
|
||||
go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo=
|
||||
golang.org/x/crypto v0.0.0-20171113213409-9f005a07e0d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
|
||||
golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
|
||||
golang.org/x/crypto v0.0.0-20181009213950-7c1a557ab941/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
|
||||
golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
|
||||
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
|
||||
golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
|
||||
golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
|
||||
golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
|
||||
golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
|
||||
golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
|
||||
golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY=
|
||||
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
|
||||
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
|
||||
golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
|
||||
golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
|
||||
golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4=
|
||||
golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
|
||||
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=
|
||||
@ -831,28 +416,20 @@ golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
|
||||
golang.org/x/mod v0.5.0/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro=
|
||||
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=
|
||||
golang.org/x/net v0.0.0-20181011144130-49bb7cea24b1/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
|
||||
golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
|
||||
golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
|
||||
golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
|
||||
golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
|
||||
golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
|
||||
golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
|
||||
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
|
||||
golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
|
||||
golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
|
||||
golang.org/x/net v0.0.0-20190522155817-f3200d17e092/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
|
||||
golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
|
||||
golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
|
||||
golang.org/x/net v0.0.0-20190619014844-b5b0513f8c1b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
|
||||
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
|
||||
golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
|
||||
golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
|
||||
golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
|
||||
golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
|
||||
golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
|
||||
golang.org/x/net v0.0.0-20191004110552-13f9640d40b9/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
|
||||
golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
|
||||
golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
|
||||
golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
|
||||
@ -867,12 +444,10 @@ golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/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=
|
||||
golang.org/x/net v0.0.0-20201209123823-ac852fbbde11/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
|
||||
golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
|
||||
golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
|
||||
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
|
||||
golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod h1:RBQZq4jEuRlivfhVLdyRGr576XBO4/greRjx4P4O3yc=
|
||||
@ -880,8 +455,6 @@ golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96b
|
||||
golang.org/x/net v0.0.0-20210410081132-afb366fc7cd1/go.mod h1:9tjilg8BloeKEkVJvy7fQ90B1CfIiPueXVOjqfkSzI8=
|
||||
golang.org/x/net v0.0.0-20210503060351-7fd8e65b6420/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
|
||||
golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
|
||||
golang.org/x/net v0.0.0-20211216030914-fe4d6282115f h1:hEYJvxw1lSnWIl8X9ofsYMklzaDs90JI2az5YMd4fPM=
|
||||
golang.org/x/net v0.0.0-20211216030914-fe4d6282115f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
|
||||
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
|
||||
golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
|
||||
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
|
||||
@ -914,9 +487,7 @@ golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJ
|
||||
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=
|
||||
golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
|
||||
golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
|
||||
golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
|
||||
golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
|
||||
golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
|
||||
golang.org/x/sys v0.0.0-20190204203706-41f3e6584952/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
|
||||
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
|
||||
@ -926,40 +497,22 @@ golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7w
|
||||
golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/sys v0.0.0-20190514135907-3a4b5fb9f71f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/sys v0.0.0-20190522044717-8097e1b27ff5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/sys v0.0.0-20190602015325-4c4f7f33c9ed/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
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-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/sys v0.0.0-20190801041406-cbf593c0f2f3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/sys v0.0.0-20190812073006-9eafafc0a87e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/sys v0.0.0-20190922100055-0a153f010e69/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/sys v0.0.0-20191022100944-742c48ecaeb7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/sys v0.0.0-20191115151921-52ab43148777/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/sys v0.0.0-20191210023423-ac6580df4449/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/sys v0.0.0-20200120151820-655fe14d7479/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
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=
|
||||
@ -968,34 +521,21 @@ golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod h1:h1NjWce9XRLGQEsW7w
|
||||
golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/sys v0.0.0-20200622214017-ed371f2e16b4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/sys v0.0.0-20200728102440-3e129f6d46b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/sys v0.0.0-20200817155316-9781c653f443/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/sys v0.0.0-20200905004654-be1d3432aa8f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/sys v0.0.0-20200909081042-eff7692f9009/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/sys v0.0.0-20200916030750-2334cc1a136f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/sys v0.0.0-20200922070232-aee5d888a860/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/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=
|
||||
golang.org/x/sys v0.0.0-20210104204734-6f8348627aad/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/sys v0.0.0-20210220050731-9a76102bfb43/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/sys v0.0.0-20210303074136-134d130e1a04/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/sys v0.0.0-20210305230114-8fe3ee5dd75b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/sys v0.0.0-20210315160823-c6e025ad8005/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/sys v0.0.0-20210324051608-47abb6519492/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/sys v0.0.0-20210426230700-d19ff857e887/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||
golang.org/x/sys v0.0.0-20210514084401-e8d321eab015/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||
golang.org/x/sys v0.0.0-20210603125802-9665404d3644/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||
@ -1023,27 +563,20 @@ golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
|
||||
golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
|
||||
golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
|
||||
golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
|
||||
golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
|
||||
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
|
||||
golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
|
||||
golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
|
||||
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
|
||||
golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
|
||||
golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
|
||||
golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/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-20181030221726-6c7e314b6563/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
|
||||
golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
|
||||
golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
|
||||
golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
|
||||
golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
|
||||
golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
|
||||
golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
|
||||
golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
|
||||
golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
|
||||
golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
|
||||
golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
|
||||
golang.org/x/tools v0.0.0-20190614205625-5aca471b1d59/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
|
||||
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=
|
||||
@ -1092,9 +625,7 @@ golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
|
||||
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=
|
||||
google.golang.org/api v0.0.0-20160322025152-9bf6e6e569ff/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0=
|
||||
google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE=
|
||||
google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M=
|
||||
google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg=
|
||||
@ -1134,13 +665,11 @@ google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww
|
||||
google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
|
||||
google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
|
||||
google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
|
||||
google.golang.org/cloud v0.0.0-20151119220103-975617b05ea8/go.mod h1:0H1ncTHf11KCFhTc/+EFRbzSCOZx+VUbRMk55Yv5MYk=
|
||||
google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
|
||||
google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
|
||||
google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
|
||||
google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
|
||||
google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
|
||||
google.golang.org/genproto v0.0.0-20190522204451-c2c4e71fbf69/go.mod h1:z3L6/3dTEVtUr6QSP8miRzeRqwQOioJ9I66odjN4I7s=
|
||||
google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
|
||||
google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
|
||||
google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8=
|
||||
@ -1149,7 +678,6 @@ google.golang.org/genproto v0.0.0-20191115194625-c23dd37a84c9/go.mod h1:n3cpQtvx
|
||||
google.golang.org/genproto v0.0.0-20191216164720-4f79533eabd1/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
|
||||
google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
|
||||
google.golang.org/genproto v0.0.0-20200115191322-ca5a22157cba/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
|
||||
google.golang.org/genproto v0.0.0-20200117163144-32f20d992d24/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
|
||||
google.golang.org/genproto v0.0.0-20200122232147-0452cf42e150/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
|
||||
google.golang.org/genproto v0.0.0-20200204135345-fa8e72b47b90/go.mod h1:GmwEX6Z4W5gMy59cAlVYjN9JhxgbQH6Gn+gFDQe2lzA=
|
||||
google.golang.org/genproto v0.0.0-20200212174721-66ed5ce911ce/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
|
||||
@ -1169,7 +697,6 @@ google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod h1:FWY/as6D
|
||||
google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
|
||||
google.golang.org/genproto v0.0.0-20200904004341-0bd0a958aa1d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
|
||||
google.golang.org/genproto v0.0.0-20201109203340-2640f1f9cdfb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
|
||||
google.golang.org/genproto v0.0.0-20201110150050-8816d57aaa9a/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
|
||||
google.golang.org/genproto v0.0.0-20201201144952-b05cb90ed32e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
|
||||
google.golang.org/genproto v0.0.0-20201210142538-e3217bee35cc/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
|
||||
google.golang.org/genproto v0.0.0-20201214200347-8c77b98c765d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
|
||||
@ -1201,16 +728,10 @@ google.golang.org/genproto v0.0.0-20211129164237-f09f9a12af12/go.mod h1:5CzLGKJ6
|
||||
google.golang.org/genproto v0.0.0-20211203200212-54befc351ae9/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
|
||||
google.golang.org/genproto v0.0.0-20211206160659-862468c7d6e0/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
|
||||
google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
|
||||
google.golang.org/genproto v0.0.0-20211223182754-3ac035c7e7cb h1:ZrsicilzPCS/Xr8qtBZZLpy4P9TYXAfl49ctG1/5tgw=
|
||||
google.golang.org/genproto v0.0.0-20211223182754-3ac035c7e7cb/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
|
||||
google.golang.org/grpc v0.0.0-20160317175043-d3ddb4469d5a/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw=
|
||||
google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
|
||||
google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
|
||||
google.golang.org/grpc v1.21.0/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=
|
||||
google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=
|
||||
google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
|
||||
google.golang.org/grpc v1.23.1/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
|
||||
google.golang.org/grpc v1.24.0/go.mod h1:XDChyiUovWa60DnaeDeZmSW86xtLtjtZbwvSiRnRtcA=
|
||||
google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
|
||||
google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
|
||||
google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
|
||||
@ -1234,8 +755,6 @@ google.golang.org/grpc v1.39.1/go.mod h1:PImNr+rS9TWYb2O4/emRugxiyHZ5JyHW5F+RPnD
|
||||
google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34=
|
||||
google.golang.org/grpc v1.40.1/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34=
|
||||
google.golang.org/grpc v1.42.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU=
|
||||
google.golang.org/grpc v1.43.0 h1:Eeu7bZtDZ2DpRCsLhUlcrLnvYaMK1Gz86a+hMVvELmM=
|
||||
google.golang.org/grpc v1.43.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU=
|
||||
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=
|
||||
google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
|
||||
@ -1249,43 +768,25 @@ google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGj
|
||||
google.golang.org/protobuf v1.25.0/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.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
|
||||
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=
|
||||
gopkg.in/check.v1 v1.0.0-20141024133853-64131543e789/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
||||
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
||||
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo=
|
||||
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
||||
gopkg.in/cheggaaa/pb.v1 v1.0.25/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qStrOgw=
|
||||
gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
|
||||
gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
|
||||
gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2/go.mod h1:Xk6kEKp8OKb+X14hQBKWaSkCsqBpgog8nAV2xsGOxlo=
|
||||
gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
|
||||
gopkg.in/ini.v1 v1.66.2/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
|
||||
gopkg.in/natefinch/lumberjack.v2 v2.0.0/go.mod h1:l0ndWWf7gzL7RNwBG7wST/UCcT4T24xpD6X8LsfU/+k=
|
||||
gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo=
|
||||
gopkg.in/square/go-jose.v2 v2.2.2/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI=
|
||||
gopkg.in/square/go-jose.v2 v2.3.1/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI=
|
||||
gopkg.in/square/go-jose.v2 v2.5.1/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI=
|
||||
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
|
||||
gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74=
|
||||
gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
|
||||
gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
|
||||
gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
|
||||
gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
|
||||
gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
|
||||
gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
|
||||
gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
|
||||
gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
|
||||
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-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo=
|
||||
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/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=
|
||||
gotest.tools/v3 v3.0.3 h1:4AuOwCGf4lLR9u3YOe2awrHygurzhO/HeQ6laiA6Sx0=
|
||||
gotest.tools/v3 v3.0.3/go.mod h1:Z7Lb0S5l+klDB31fvDQX8ss/FlKDxtlFlw3Oa8Ymbl8=
|
||||
honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
|
||||
@ -1295,37 +796,6 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh
|
||||
honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
|
||||
honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
|
||||
honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
|
||||
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/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/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/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/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/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/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE=
|
||||
k8s.io/klog/v2 v2.4.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y=
|
||||
k8s.io/kube-openapi v0.0.0-20201113171705-d219536bb9fd/go.mod h1:WOJ3KddDSol4tAGcJo0Tvi+dK12EcqSLqcWsryKMpfM=
|
||||
k8s.io/kubernetes v1.13.0/go.mod h1:ocZa8+6APFNC2tX1DZASIbocyYT5jHzqFVsY5aoB7Jk=
|
||||
k8s.io/utils v0.0.0-20201110183641-67b214c5f920/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
|
||||
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/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/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o=
|
||||
sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc=
|
||||
|
||||
71
image.go
71
image.go
@ -12,16 +12,14 @@ import (
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
// "github.com/docker/docker/pkg/archive"
|
||||
"github.com/containerd/containerd/platforms"
|
||||
"github.com/docker/distribution"
|
||||
dockerSchema2 "github.com/docker/distribution/manifest/schema2"
|
||||
digest "github.com/opencontainers/go-digest"
|
||||
ociv1 "github.com/opencontainers/image-spec/specs-go/v1"
|
||||
"github.com/regclient/regclient/pkg/archive"
|
||||
"github.com/regclient/regclient/scheme"
|
||||
"github.com/regclient/regclient/types"
|
||||
"github.com/regclient/regclient/types/docker/schema2"
|
||||
"github.com/regclient/regclient/types/manifest"
|
||||
v1 "github.com/regclient/regclient/types/oci/v1"
|
||||
"github.com/regclient/regclient/types/platform"
|
||||
"github.com/regclient/regclient/types/ref"
|
||||
"github.com/sirupsen/logrus"
|
||||
)
|
||||
@ -30,6 +28,7 @@ const (
|
||||
dockerManifestFilename = "manifest.json"
|
||||
ociLayoutVersion = "1.0.0"
|
||||
ociIndexFilename = "index.json"
|
||||
ociLayoutFilename = "oci-layout"
|
||||
annotationRefName = "org.opencontainers.image.ref.name"
|
||||
annotationImageName = "io.containerd.image.name"
|
||||
)
|
||||
@ -40,7 +39,7 @@ type dockerTarManifest struct {
|
||||
RepoTags []string
|
||||
Layers []string
|
||||
Parent digest.Digest `json:",omitempty"`
|
||||
LayerSources map[digest.Digest]ociv1.Descriptor `json:",omitempty"`
|
||||
LayerSources map[digest.Digest]types.Descriptor `json:",omitempty"`
|
||||
}
|
||||
|
||||
type tarFileHandler func(header *tar.Header, trd *tarReadData) error
|
||||
@ -52,11 +51,11 @@ type tarReadData struct {
|
||||
finish []func() error
|
||||
// data processed from various handlers
|
||||
manifests map[digest.Digest]manifest.Manifest
|
||||
ociIndex ociv1.Index
|
||||
ociIndex v1.Index
|
||||
ociManifest manifest.Manifest
|
||||
dockerManifestFound bool
|
||||
dockerManifestList []dockerTarManifest
|
||||
dockerManifest dockerSchema2.Manifest
|
||||
dockerManifest schema2.Manifest
|
||||
}
|
||||
type tarWriteData struct {
|
||||
tw *tar.Writer
|
||||
@ -361,7 +360,7 @@ func (rc *RegClient) imageCopyOpt(ctx context.Context, refSrc ref.Ref, refTgt re
|
||||
// manifest.json: created at top level, based on every layer added, only works for a single arch image
|
||||
// blobs/$algo/$hash: each content addressable object (manifest, config, or layer), created recursively
|
||||
func (rc *RegClient) ImageExport(ctx context.Context, ref ref.Ref, outStream io.Writer) error {
|
||||
var ociIndex ociv1.Index
|
||||
var ociIndex v1.Index
|
||||
|
||||
// create tar writer object
|
||||
tw := tar.NewWriter(outStream)
|
||||
@ -384,8 +383,8 @@ func (rc *RegClient) ImageExport(ctx context.Context, ref ref.Ref, outStream io.
|
||||
}
|
||||
|
||||
// build/write oci-layout
|
||||
ociLayout := ociv1.ImageLayout{Version: ociLayoutVersion}
|
||||
err = twd.tarWriteFileJSON(ociv1.ImageLayoutFile, ociLayout)
|
||||
ociLayout := v1.ImageLayout{Version: ociLayoutVersion}
|
||||
err = twd.tarWriteFileJSON(ociLayoutFilename, ociLayout)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
@ -417,7 +416,7 @@ func (rc *RegClient) ImageExport(ctx context.Context, ref ref.Ref, outStream io.
|
||||
RepoTags: []string{refTag.CommonName()},
|
||||
Config: tarOCILayoutDescPath(conf),
|
||||
Layers: []string{},
|
||||
LayerSources: map[digest.Digest]ociv1.Descriptor{},
|
||||
LayerSources: map[digest.Digest]types.Descriptor{},
|
||||
}
|
||||
dl, err := m.GetLayers()
|
||||
if err != nil {
|
||||
@ -445,7 +444,7 @@ func (rc *RegClient) ImageExport(ctx context.Context, ref ref.Ref, outStream io.
|
||||
}
|
||||
|
||||
// imageExportDescriptor pulls a manifest or blob, outputs to a tar file, and recursively processes any nested manifests or blobs
|
||||
func (rc *RegClient) imageExportDescriptor(ctx context.Context, ref ref.Ref, desc ociv1.Descriptor, twd *tarWriteData) error {
|
||||
func (rc *RegClient) imageExportDescriptor(ctx context.Context, ref ref.Ref, desc types.Descriptor, twd *tarWriteData) error {
|
||||
tarFilename := tarOCILayoutDescPath(desc)
|
||||
if twd.files[tarFilename] {
|
||||
// blob has already been imported into tar, skip
|
||||
@ -608,7 +607,7 @@ func (rc *RegClient) ImageImport(ctx context.Context, ref ref.Ref, rs io.ReadSee
|
||||
return nil
|
||||
}
|
||||
|
||||
func (rc *RegClient) imageImportBlob(ctx context.Context, ref ref.Ref, desc ociv1.Descriptor, trd *tarReadData) error {
|
||||
func (rc *RegClient) imageImportBlob(ctx context.Context, ref ref.Ref, desc types.Descriptor, trd *tarReadData) error {
|
||||
// skip if blob already exists
|
||||
_, err := rc.BlobHead(ctx, ref, desc.Digest)
|
||||
if err == nil {
|
||||
@ -637,13 +636,13 @@ func (rc *RegClient) imageImportDockerAddHandler(trd *tarReadData) {
|
||||
// imageImportDockerAddLayerHandlers imports the docker layers when OCI import fails and docker manifest found
|
||||
func (rc *RegClient) imageImportDockerAddLayerHandlers(ctx context.Context, ref ref.Ref, trd *tarReadData) {
|
||||
// remove handlers for OCI
|
||||
delete(trd.handlers, ociv1.ImageLayoutFile)
|
||||
delete(trd.handlers, ociLayoutFilename)
|
||||
delete(trd.handlers, ociIndexFilename)
|
||||
|
||||
// make a docker v2 manifest from first json array entry (can only tag one image)
|
||||
trd.dockerManifest.SchemaVersion = 2
|
||||
trd.dockerManifest.MediaType = types.MediaTypeDocker2Manifest
|
||||
trd.dockerManifest.Layers = make([]distribution.Descriptor, len(trd.dockerManifestList[0].Layers))
|
||||
trd.dockerManifest.Layers = make([]types.Descriptor, len(trd.dockerManifestList[0].Layers))
|
||||
|
||||
// add handler for config
|
||||
trd.handlers[trd.dockerManifestList[0].Config] = func(header *tar.Header, trd *tarReadData) error {
|
||||
@ -654,9 +653,9 @@ func (rc *RegClient) imageImportDockerAddLayerHandlers(ctx context.Context, ref
|
||||
}
|
||||
// save the resulting descriptor to the manifest
|
||||
if od, ok := trd.dockerManifestList[0].LayerSources[d]; ok {
|
||||
trd.dockerManifest.Config = oci2DDesc(od)
|
||||
trd.dockerManifest.Config = od
|
||||
} else {
|
||||
trd.dockerManifest.Config = distribution.Descriptor{
|
||||
trd.dockerManifest.Config = types.Descriptor{
|
||||
Digest: d,
|
||||
Size: size,
|
||||
MediaType: types.MediaTypeDocker2ImageConfig,
|
||||
@ -680,9 +679,9 @@ func (rc *RegClient) imageImportDockerAddLayerHandlers(ctx context.Context, ref
|
||||
}
|
||||
// save the resulting descriptor in the appropriate layer
|
||||
if od, ok := trd.dockerManifestList[0].LayerSources[d]; ok {
|
||||
trd.dockerManifest.Layers[i] = oci2DDesc(od)
|
||||
trd.dockerManifest.Layers[i] = od
|
||||
} else {
|
||||
trd.dockerManifest.Layers[i] = distribution.Descriptor{
|
||||
trd.dockerManifest.Layers[i] = types.Descriptor{
|
||||
MediaType: types.MediaTypeDocker2Layer,
|
||||
Size: size,
|
||||
Digest: d,
|
||||
@ -718,8 +717,8 @@ func (rc *RegClient) imageImportOCIAddHandler(ctx context.Context, ref ref.Ref,
|
||||
}
|
||||
return nil
|
||||
}
|
||||
trd.handlers[ociv1.ImageLayoutFile] = func(header *tar.Header, trd *tarReadData) error {
|
||||
var ociLayout ociv1.ImageLayout
|
||||
trd.handlers[ociLayoutFilename] = func(header *tar.Header, trd *tarReadData) error {
|
||||
var ociLayout v1.ImageLayout
|
||||
err := trd.tarReadFileJSON(&ociLayout)
|
||||
if err != nil {
|
||||
return err
|
||||
@ -761,7 +760,7 @@ func (rc *RegClient) imageImportOCIHandleManifest(ctx context.Context, ref ref.R
|
||||
// cache the manifest to avoid needing to pull again later, this is used if index.json is a wrapper around some other manifest
|
||||
trd.manifests[m.GetDescriptor().Digest] = m
|
||||
|
||||
handleManifest := func(d ociv1.Descriptor) {
|
||||
handleManifest := func(d types.Descriptor) {
|
||||
filename := tarOCILayoutDescPath(d)
|
||||
if !trd.processed[filename] && trd.handlers[filename] == nil {
|
||||
trd.handlers[filename] = func(header *tar.Header, trd *tarReadData) error {
|
||||
@ -803,7 +802,7 @@ func (rc *RegClient) imageImportOCIHandleManifest(ctx context.Context, ref ref.R
|
||||
return err
|
||||
}
|
||||
// locate the digest in the index
|
||||
var d ociv1.Descriptor
|
||||
var d types.Descriptor
|
||||
if len(dl) == 1 {
|
||||
d = dl[0]
|
||||
} else {
|
||||
@ -843,7 +842,7 @@ func (rc *RegClient) imageImportOCIHandleManifest(ctx context.Context, ref ref.R
|
||||
if err == nil {
|
||||
filename := tarOCILayoutDescPath(cd)
|
||||
if !trd.processed[filename] && trd.handlers[filename] == nil {
|
||||
func(cd ociv1.Descriptor) {
|
||||
func(cd types.Descriptor) {
|
||||
trd.handlers[filename] = func(header *tar.Header, trd *tarReadData) error {
|
||||
return rc.imageImportBlob(ctx, ref, cd, trd)
|
||||
}
|
||||
@ -858,7 +857,7 @@ func (rc *RegClient) imageImportOCIHandleManifest(ctx context.Context, ref ref.R
|
||||
for _, d := range layers {
|
||||
filename := tarOCILayoutDescPath(d)
|
||||
if !trd.processed[filename] && trd.handlers[filename] == nil {
|
||||
func(d ociv1.Descriptor) {
|
||||
func(d types.Descriptor) {
|
||||
trd.handlers[filename] = func(header *tar.Header, trd *tarReadData) error {
|
||||
return rc.imageImportBlob(ctx, ref, d, trd)
|
||||
}
|
||||
@ -894,7 +893,7 @@ func (rc *RegClient) imageImportOCIPushManifests(ctx context.Context, ref ref.Re
|
||||
return nil
|
||||
}
|
||||
|
||||
func imagePlatformInList(target *ociv1.Platform, list []string) (bool, error) {
|
||||
func imagePlatformInList(target *platform.Platform, list []string) (bool, error) {
|
||||
// special case for an unset platform
|
||||
if target == nil || target.OS == "" {
|
||||
for _, entry := range list {
|
||||
@ -904,33 +903,21 @@ func imagePlatformInList(target *ociv1.Platform, list []string) (bool, error) {
|
||||
}
|
||||
return false, nil
|
||||
}
|
||||
matcher := platforms.NewMatcher(*target)
|
||||
for _, entry := range list {
|
||||
if entry == "" {
|
||||
continue
|
||||
}
|
||||
plat, err := platforms.Parse(entry)
|
||||
plat, err := platform.Parse(entry)
|
||||
if err != nil {
|
||||
return false, err
|
||||
}
|
||||
if matcher.Match(plat) {
|
||||
if platform.Match(*target, plat) {
|
||||
return true, nil
|
||||
}
|
||||
}
|
||||
return false, nil
|
||||
}
|
||||
|
||||
func oci2DDesc(od ociv1.Descriptor) distribution.Descriptor {
|
||||
return distribution.Descriptor{
|
||||
MediaType: od.MediaType,
|
||||
Digest: od.Digest,
|
||||
Size: od.Size,
|
||||
URLs: od.URLs,
|
||||
Annotations: od.Annotations,
|
||||
Platform: od.Platform,
|
||||
}
|
||||
}
|
||||
|
||||
// tarReadAll processes the tar file in a loop looking for matching filenames in the list of handlers
|
||||
// handlers for filenames are added at the top level, and by manifest imports
|
||||
func (trd *tarReadData) tarReadAll(rs io.ReadSeeker) error {
|
||||
@ -1042,6 +1029,6 @@ func (td *tarWriteData) tarWriteFileJSON(filename string, data interface{}) erro
|
||||
return nil
|
||||
}
|
||||
|
||||
func tarOCILayoutDescPath(d ociv1.Descriptor) string {
|
||||
func tarOCILayoutDescPath(d types.Descriptor) string {
|
||||
return fmt.Sprintf("blobs/%s/%s", d.Digest.Algorithm(), d.Digest.Encoded())
|
||||
}
|
||||
|
||||
@ -12,12 +12,11 @@ import (
|
||||
"testing"
|
||||
"time"
|
||||
|
||||
"github.com/docker/distribution"
|
||||
dockerSchema2 "github.com/docker/distribution/manifest/schema2"
|
||||
"github.com/opencontainers/go-digest"
|
||||
"github.com/regclient/regclient/config"
|
||||
"github.com/regclient/regclient/internal/reqresp"
|
||||
"github.com/regclient/regclient/types"
|
||||
"github.com/regclient/regclient/types/docker/schema2"
|
||||
"github.com/regclient/regclient/types/manifest"
|
||||
"github.com/regclient/regclient/types/ref"
|
||||
"github.com/sirupsen/logrus"
|
||||
@ -31,13 +30,13 @@ func TestManifest(t *testing.T) {
|
||||
missingTag := "missing"
|
||||
digest1 := digest.FromString("example1")
|
||||
digest2 := digest.FromString("example2")
|
||||
m := dockerSchema2.Manifest{
|
||||
Config: distribution.Descriptor{
|
||||
m := schema2.Manifest{
|
||||
Config: types.Descriptor{
|
||||
MediaType: types.MediaTypeDocker2ImageConfig,
|
||||
Size: 8,
|
||||
Digest: digest1,
|
||||
},
|
||||
Layers: []distribution.Descriptor{
|
||||
Layers: []types.Descriptor{
|
||||
{
|
||||
MediaType: types.MediaTypeDocker2Layer,
|
||||
Size: 8,
|
||||
|
||||
@ -7,7 +7,6 @@ package manifest
|
||||
import (
|
||||
"net/http"
|
||||
|
||||
ociv1 "github.com/opencontainers/image-spec/specs-go/v1"
|
||||
topTypes "github.com/regclient/regclient/types"
|
||||
topManifest "github.com/regclient/regclient/types/manifest"
|
||||
"github.com/regclient/regclient/types/ref"
|
||||
@ -39,7 +38,7 @@ var (
|
||||
|
||||
func New(mediaType string, raw []byte, r ref.Ref, header http.Header) (Manifest, error) {
|
||||
return topManifest.New(
|
||||
topManifest.WithDesc(ociv1.Descriptor{
|
||||
topManifest.WithDesc(topTypes.Descriptor{
|
||||
MediaType: mediaType,
|
||||
}),
|
||||
topManifest.WithRef(r),
|
||||
@ -48,7 +47,7 @@ func New(mediaType string, raw []byte, r ref.Ref, header http.Header) (Manifest,
|
||||
)
|
||||
}
|
||||
|
||||
func FromDescriptor(desc ociv1.Descriptor, mBytes []byte) (Manifest, error) {
|
||||
func FromDescriptor(desc topTypes.Descriptor, mBytes []byte) (Manifest, error) {
|
||||
return topManifest.New(
|
||||
topManifest.WithDesc(desc),
|
||||
topManifest.WithRaw(mBytes),
|
||||
|
||||
@ -10,7 +10,6 @@ import (
|
||||
"path"
|
||||
|
||||
"github.com/opencontainers/go-digest"
|
||||
ociv1 "github.com/opencontainers/image-spec/specs-go/v1"
|
||||
"github.com/regclient/regclient/internal/rwfs"
|
||||
"github.com/regclient/regclient/types"
|
||||
"github.com/regclient/regclient/types/blob"
|
||||
@ -38,7 +37,7 @@ func (o *OCIDir) BlobGet(ctx context.Context, r ref.Ref, d digest.Digest) (blob.
|
||||
br := blob.NewReader(
|
||||
blob.WithRef(r),
|
||||
blob.WithReader(fd),
|
||||
blob.WithDesc(ociv1.Descriptor{
|
||||
blob.WithDesc(types.Descriptor{
|
||||
Digest: d,
|
||||
Size: fi.Size(),
|
||||
}),
|
||||
@ -64,7 +63,7 @@ func (o *OCIDir) BlobHead(ctx context.Context, r ref.Ref, d digest.Digest) (blob
|
||||
}
|
||||
br := blob.NewReader(
|
||||
blob.WithRef(r),
|
||||
blob.WithDesc(ociv1.Descriptor{
|
||||
blob.WithDesc(types.Descriptor{
|
||||
Digest: d,
|
||||
Size: fi.Size(),
|
||||
}),
|
||||
|
||||
@ -9,7 +9,6 @@ import (
|
||||
"path"
|
||||
|
||||
"github.com/opencontainers/go-digest"
|
||||
ociv1 "github.com/opencontainers/image-spec/specs-go/v1"
|
||||
"github.com/regclient/regclient/internal/rwfs"
|
||||
"github.com/regclient/regclient/internal/wraperr"
|
||||
"github.com/regclient/regclient/scheme"
|
||||
@ -62,7 +61,7 @@ func (o *OCIDir) ManifestGet(ctx context.Context, r ref.Ref) (manifest.Manifest,
|
||||
if r.Digest == "" && r.Tag == "" {
|
||||
r.Tag = "latest"
|
||||
}
|
||||
desc := ociv1.Descriptor{}
|
||||
desc := types.Descriptor{}
|
||||
if r.Digest != "" {
|
||||
desc.Digest = digest.Digest(r.Digest)
|
||||
} else {
|
||||
@ -105,7 +104,7 @@ func (o *OCIDir) ManifestHead(ctx context.Context, r ref.Ref) (manifest.Manifest
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
var desc ociv1.Descriptor
|
||||
var desc types.Descriptor
|
||||
if r.Digest == "" && r.Tag == "" {
|
||||
r.Tag = "latest"
|
||||
}
|
||||
|
||||
@ -7,11 +7,10 @@ import (
|
||||
"io"
|
||||
"testing"
|
||||
|
||||
ociv1 "github.com/opencontainers/image-spec/specs-go/v1"
|
||||
|
||||
"github.com/regclient/regclient/internal/rwfs"
|
||||
"github.com/regclient/regclient/types"
|
||||
"github.com/regclient/regclient/types/manifest"
|
||||
v1 "github.com/regclient/regclient/types/oci/v1"
|
||||
"github.com/regclient/regclient/types/ref"
|
||||
)
|
||||
|
||||
@ -71,7 +70,7 @@ func TestManifest(t *testing.T) {
|
||||
if err != nil {
|
||||
t.Errorf("manifest put: %v", err)
|
||||
}
|
||||
fh, err := fm.Open("testdata/regctl/" + ociv1.ImageLayoutFile)
|
||||
fh, err := fm.Open("testdata/regctl/" + imageLayoutFile)
|
||||
if err != nil {
|
||||
t.Errorf("open oci-layout: %v", err)
|
||||
return
|
||||
@ -80,7 +79,7 @@ func TestManifest(t *testing.T) {
|
||||
if err != nil {
|
||||
t.Errorf("readall oci-layout: %v", err)
|
||||
}
|
||||
l := ociv1.ImageLayout{}
|
||||
l := v1.ImageLayout{}
|
||||
err = json.Unmarshal(lb, &l)
|
||||
if err != nil {
|
||||
t.Errorf("json unmarshal oci-layout: %v", err)
|
||||
|
||||
@ -9,16 +9,16 @@ import (
|
||||
"path"
|
||||
"sync"
|
||||
|
||||
ociSpecs "github.com/opencontainers/image-spec/specs-go"
|
||||
ociv1 "github.com/opencontainers/image-spec/specs-go/v1"
|
||||
"github.com/regclient/regclient/internal/rwfs"
|
||||
"github.com/regclient/regclient/scheme"
|
||||
"github.com/regclient/regclient/types"
|
||||
v1 "github.com/regclient/regclient/types/oci/v1"
|
||||
"github.com/regclient/regclient/types/ref"
|
||||
"github.com/sirupsen/logrus"
|
||||
)
|
||||
|
||||
const (
|
||||
imageLayoutFile = "oci-layout"
|
||||
aRefName = "org.opencontainers.image.ref.name"
|
||||
)
|
||||
|
||||
@ -87,9 +87,9 @@ func (o *OCIDir) Info() scheme.Info {
|
||||
return scheme.Info{ManifestPushFirst: true}
|
||||
}
|
||||
|
||||
func (o *OCIDir) readIndex(r ref.Ref) (ociv1.Index, error) {
|
||||
func (o *OCIDir) readIndex(r ref.Ref) (v1.Index, error) {
|
||||
// validate dir
|
||||
index := ociv1.Index{}
|
||||
index := v1.Index{}
|
||||
err := o.valid(r.Path)
|
||||
if err != nil {
|
||||
return index, err
|
||||
@ -111,23 +111,23 @@ func (o *OCIDir) readIndex(r ref.Ref) (ociv1.Index, error) {
|
||||
return index, nil
|
||||
}
|
||||
|
||||
func (o *OCIDir) writeIndex(r ref.Ref, i ociv1.Index) error {
|
||||
func (o *OCIDir) writeIndex(r ref.Ref, i v1.Index) error {
|
||||
// create/replace oci-layout file
|
||||
layout := ociv1.ImageLayout{
|
||||
layout := v1.ImageLayout{
|
||||
Version: "1.0.0",
|
||||
}
|
||||
lb, err := json.Marshal(layout)
|
||||
if err != nil {
|
||||
return fmt.Errorf("cannot marshal layout: %w", err)
|
||||
}
|
||||
lfh, err := o.fs.Create(path.Join(r.Path, ociv1.ImageLayoutFile))
|
||||
lfh, err := o.fs.Create(path.Join(r.Path, imageLayoutFile))
|
||||
if err != nil {
|
||||
return fmt.Errorf("cannot create %s: %w", ociv1.ImageLayoutFile, err)
|
||||
return fmt.Errorf("cannot create %s: %w", imageLayoutFile, err)
|
||||
}
|
||||
defer lfh.Close()
|
||||
_, err = lfh.Write(lb)
|
||||
if err != nil {
|
||||
return fmt.Errorf("cannot write %s: %w", ociv1.ImageLayoutFile, err)
|
||||
return fmt.Errorf("cannot write %s: %w", imageLayoutFile, err)
|
||||
}
|
||||
// create/replace index.json file
|
||||
indexFile := path.Join(r.Path, "index.json")
|
||||
@ -149,20 +149,20 @@ func (o *OCIDir) writeIndex(r ref.Ref, i ociv1.Index) error {
|
||||
|
||||
// func valid (dir) (error) // check for `oci-layout` file and `index.json` for read
|
||||
func (o *OCIDir) valid(dir string) error {
|
||||
layout := ociv1.ImageLayout{}
|
||||
layout := v1.ImageLayout{}
|
||||
reqVer := "1.0.0"
|
||||
fh, err := o.fs.Open(path.Join(dir, ociv1.ImageLayoutFile))
|
||||
fh, err := o.fs.Open(path.Join(dir, imageLayoutFile))
|
||||
if err != nil {
|
||||
return fmt.Errorf("%s cannot be open: %w", ociv1.ImageLayoutFile, err)
|
||||
return fmt.Errorf("%s cannot be open: %w", imageLayoutFile, err)
|
||||
}
|
||||
defer fh.Close()
|
||||
lb, err := io.ReadAll(fh)
|
||||
if err != nil {
|
||||
return fmt.Errorf("%s cannot be read: %w", ociv1.ImageLayoutFile, err)
|
||||
return fmt.Errorf("%s cannot be read: %w", imageLayoutFile, err)
|
||||
}
|
||||
err = json.Unmarshal(lb, &layout)
|
||||
if err != nil {
|
||||
return fmt.Errorf("%s cannot be parsed: %w", ociv1.ImageLayoutFile, err)
|
||||
return fmt.Errorf("%s cannot be parsed: %w", imageLayoutFile, err)
|
||||
}
|
||||
if layout.Version != reqVer {
|
||||
return fmt.Errorf("unsupported oci layout version, expected %s, received %s", reqVer, layout.Version)
|
||||
@ -176,19 +176,17 @@ func (o *OCIDir) refMod(r ref.Ref) {
|
||||
o.modRefs[r.Path] = r
|
||||
}
|
||||
|
||||
func indexCreate() ociv1.Index {
|
||||
i := ociv1.Index{
|
||||
Versioned: ociSpecs.Versioned{
|
||||
SchemaVersion: 2,
|
||||
},
|
||||
func indexCreate() v1.Index {
|
||||
i := v1.Index{
|
||||
Versioned: v1.IndexSchemaVersion,
|
||||
MediaType: types.MediaTypeOCI1ManifestList,
|
||||
Manifests: []ociv1.Descriptor{},
|
||||
Manifests: []types.Descriptor{},
|
||||
Annotations: map[string]string{},
|
||||
}
|
||||
return i
|
||||
}
|
||||
|
||||
func indexRefLookup(index ociv1.Index, r ref.Ref) (int, error) {
|
||||
func indexRefLookup(index v1.Index, r ref.Ref) (int, error) {
|
||||
// make 2 passes, first for the tag, and second for the digest without a tag
|
||||
// one digest could be tagged multiple times in the index
|
||||
if r.Tag != "" {
|
||||
|
||||
@ -10,7 +10,6 @@ import (
|
||||
"net/url"
|
||||
|
||||
"github.com/opencontainers/go-digest"
|
||||
ociv1 "github.com/opencontainers/image-spec/specs-go/v1"
|
||||
"github.com/regclient/regclient/internal/reghttp"
|
||||
"github.com/regclient/regclient/types"
|
||||
"github.com/regclient/regclient/types/blob"
|
||||
@ -64,7 +63,7 @@ func (reg *Reg) BlobGet(ctx context.Context, r ref.Ref, d digest.Digest) (blob.R
|
||||
b := blob.NewReader(
|
||||
blob.WithRef(r),
|
||||
blob.WithReader(resp),
|
||||
blob.WithDesc(ociv1.Descriptor{
|
||||
blob.WithDesc(types.Descriptor{
|
||||
Digest: d,
|
||||
}),
|
||||
blob.WithResp(resp.HTTPResponse()),
|
||||
@ -96,7 +95,7 @@ func (reg *Reg) BlobHead(ctx context.Context, r ref.Ref, d digest.Digest) (blob.
|
||||
|
||||
b := blob.NewReader(
|
||||
blob.WithRef(r),
|
||||
blob.WithDesc(ociv1.Descriptor{
|
||||
blob.WithDesc(types.Descriptor{
|
||||
Digest: d,
|
||||
}),
|
||||
blob.WithResp(resp.HTTPResponse()),
|
||||
|
||||
@ -12,12 +12,11 @@ import (
|
||||
"testing"
|
||||
"time"
|
||||
|
||||
"github.com/docker/distribution"
|
||||
dockerSchema2 "github.com/docker/distribution/manifest/schema2"
|
||||
"github.com/opencontainers/go-digest"
|
||||
"github.com/regclient/regclient/config"
|
||||
"github.com/regclient/regclient/internal/reqresp"
|
||||
"github.com/regclient/regclient/types"
|
||||
"github.com/regclient/regclient/types/docker/schema2"
|
||||
"github.com/regclient/regclient/types/manifest"
|
||||
"github.com/regclient/regclient/types/ref"
|
||||
"github.com/sirupsen/logrus"
|
||||
@ -31,13 +30,13 @@ func TestManifest(t *testing.T) {
|
||||
missingTag := "missing"
|
||||
digest1 := digest.FromString("example1")
|
||||
digest2 := digest.FromString("example2")
|
||||
m := dockerSchema2.Manifest{
|
||||
Config: distribution.Descriptor{
|
||||
m := schema2.Manifest{
|
||||
Config: types.Descriptor{
|
||||
MediaType: types.MediaTypeDocker2ImageConfig,
|
||||
Size: 8,
|
||||
Digest: digest1,
|
||||
},
|
||||
Layers: []distribution.Descriptor{
|
||||
Layers: []types.Descriptor{
|
||||
{
|
||||
MediaType: types.MediaTypeDocker2Layer,
|
||||
Size: 8,
|
||||
|
||||
@ -12,16 +12,13 @@ import (
|
||||
"strconv"
|
||||
"time"
|
||||
|
||||
dockerDistribution "github.com/docker/distribution"
|
||||
dockerManifest "github.com/docker/distribution/manifest"
|
||||
dockerSchema2 "github.com/docker/distribution/manifest/schema2"
|
||||
"github.com/opencontainers/go-digest"
|
||||
ociv1Specs "github.com/opencontainers/image-spec/specs-go"
|
||||
ociv1 "github.com/opencontainers/image-spec/specs-go/v1"
|
||||
"github.com/regclient/regclient/internal/reghttp"
|
||||
"github.com/regclient/regclient/scheme"
|
||||
"github.com/regclient/regclient/types"
|
||||
"github.com/regclient/regclient/types/docker/schema2"
|
||||
"github.com/regclient/regclient/types/manifest"
|
||||
v1 "github.com/regclient/regclient/types/oci/v1"
|
||||
"github.com/regclient/regclient/types/ref"
|
||||
"github.com/regclient/regclient/types/tag"
|
||||
"github.com/sirupsen/logrus"
|
||||
@ -76,9 +73,9 @@ func (reg *Reg) TagDelete(ctx context.Context, r ref.Ref) error {
|
||||
// create empty image config with single label
|
||||
// Note, this should be MediaType specific, but it appears that docker uses OCI for the config
|
||||
now := time.Now()
|
||||
conf := ociv1.Image{
|
||||
conf := v1.Image{
|
||||
Created: &now,
|
||||
Config: ociv1.ImageConfig{
|
||||
Config: v1.ImageConfig{
|
||||
Labels: map[string]string{
|
||||
"delete-tag": r.Tag,
|
||||
"delete-date": now.String(),
|
||||
@ -86,7 +83,7 @@ func (reg *Reg) TagDelete(ctx context.Context, r ref.Ref) error {
|
||||
},
|
||||
OS: "linux",
|
||||
Architecture: "amd64",
|
||||
RootFS: ociv1.RootFS{
|
||||
RootFS: v1.RootFS{
|
||||
Type: "layers",
|
||||
DiffIDs: []digest.Digest{},
|
||||
},
|
||||
@ -106,33 +103,28 @@ func (reg *Reg) TagDelete(ctx context.Context, r ref.Ref) error {
|
||||
// create manifest with config, matching the original tag manifest type
|
||||
switch manifest.GetMediaType(curManifest) {
|
||||
case types.MediaTypeOCI1Manifest, types.MediaTypeOCI1ManifestList:
|
||||
tempManifest, err = manifest.New(manifest.WithOrig(ociv1.Manifest{
|
||||
Versioned: ociv1Specs.Versioned{
|
||||
SchemaVersion: 2,
|
||||
},
|
||||
tempManifest, err = manifest.New(manifest.WithOrig(v1.Manifest{
|
||||
Versioned: v1.ManifestSchemaVersion,
|
||||
MediaType: types.MediaTypeOCI1Manifest,
|
||||
Config: ociv1.Descriptor{
|
||||
Config: types.Descriptor{
|
||||
MediaType: types.MediaTypeOCI1ImageConfig,
|
||||
Digest: confDigest,
|
||||
Size: int64(len(confB)),
|
||||
},
|
||||
Layers: []ociv1.Descriptor{},
|
||||
Layers: []types.Descriptor{},
|
||||
}))
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
default: // default to the docker v2 schema
|
||||
tempManifest, err = manifest.New(manifest.WithOrig(dockerSchema2.Manifest{
|
||||
Versioned: dockerManifest.Versioned{
|
||||
SchemaVersion: 2,
|
||||
MediaType: types.MediaTypeDocker2Manifest,
|
||||
},
|
||||
Config: dockerDistribution.Descriptor{
|
||||
tempManifest, err = manifest.New(manifest.WithOrig(schema2.Manifest{
|
||||
Versioned: schema2.ManifestSchemaVersion,
|
||||
Config: types.Descriptor{
|
||||
MediaType: types.MediaTypeDocker2ImageConfig,
|
||||
Digest: confDigest,
|
||||
Size: int64(len(confB)),
|
||||
},
|
||||
Layers: []dockerDistribution.Descriptor{},
|
||||
Layers: []types.Descriptor{},
|
||||
}))
|
||||
if err != nil {
|
||||
return err
|
||||
|
||||
@ -5,7 +5,8 @@ import (
|
||||
"io"
|
||||
"net/http"
|
||||
|
||||
ociv1 "github.com/opencontainers/image-spec/specs-go/v1"
|
||||
"github.com/regclient/regclient/types"
|
||||
v1 "github.com/regclient/regclient/types/oci/v1"
|
||||
"github.com/regclient/regclient/types/ref"
|
||||
)
|
||||
|
||||
@ -16,9 +17,9 @@ type Blob interface {
|
||||
}
|
||||
|
||||
type blobConfig struct {
|
||||
desc ociv1.Descriptor
|
||||
desc types.Descriptor
|
||||
header http.Header
|
||||
image *ociv1.Image
|
||||
image *v1.Image
|
||||
r ref.Ref
|
||||
rdr io.Reader
|
||||
resp *http.Response
|
||||
@ -28,7 +29,7 @@ type blobConfig struct {
|
||||
type Opts func(*blobConfig)
|
||||
|
||||
// WithDesc specifies the descriptor associated with the blob
|
||||
func WithDesc(d ociv1.Descriptor) Opts {
|
||||
func WithDesc(d types.Descriptor) Opts {
|
||||
return func(bc *blobConfig) {
|
||||
bc.desc = d
|
||||
}
|
||||
@ -42,7 +43,7 @@ func WithHeader(header http.Header) Opts {
|
||||
}
|
||||
|
||||
// WithImage provides the OCI Image config needed for config blobs
|
||||
func WithImage(image ociv1.Image) Opts {
|
||||
func WithImage(image v1.Image) Opts {
|
||||
return func(bc *blobConfig) {
|
||||
bc.image = &image
|
||||
}
|
||||
|
||||
@ -10,8 +10,8 @@ import (
|
||||
"testing"
|
||||
|
||||
"github.com/opencontainers/go-digest"
|
||||
ociv1 "github.com/opencontainers/image-spec/specs-go/v1"
|
||||
"github.com/regclient/regclient/types"
|
||||
v1 "github.com/regclient/regclient/types/oci/v1"
|
||||
"github.com/regclient/regclient/types/ref"
|
||||
)
|
||||
|
||||
@ -64,7 +64,7 @@ var (
|
||||
ContentLength: exLen,
|
||||
Body: io.NopCloser(bytes.NewReader(exBlob)),
|
||||
}
|
||||
exDesc = ociv1.Descriptor{
|
||||
exDesc = types.Descriptor{
|
||||
MediaType: exMT,
|
||||
Digest: exDigest,
|
||||
Size: exLen,
|
||||
@ -96,7 +96,7 @@ func TestCommon(t *testing.T) {
|
||||
name: "descriptor",
|
||||
opts: []Opts{
|
||||
WithReader(bytes.NewReader(exBlob)),
|
||||
WithDesc(ociv1.Descriptor{
|
||||
WithDesc(types.Descriptor{
|
||||
MediaType: exMT,
|
||||
Digest: exDigest,
|
||||
Size: exLen,
|
||||
@ -240,7 +240,7 @@ func TestReader(t *testing.T) {
|
||||
// create blob
|
||||
b := NewReader(
|
||||
WithReader(bytes.NewReader(exBlob)),
|
||||
WithDesc(ociv1.Descriptor{
|
||||
WithDesc(types.Descriptor{
|
||||
MediaType: exMT,
|
||||
Digest: exDigest,
|
||||
Size: exLen,
|
||||
@ -284,7 +284,7 @@ func TestReader(t *testing.T) {
|
||||
}
|
||||
|
||||
func TestOCI(t *testing.T) {
|
||||
ociConfig := ociv1.Image{}
|
||||
ociConfig := v1.Image{}
|
||||
err := json.Unmarshal(exBlob, &ociConfig)
|
||||
if err != nil {
|
||||
t.Errorf("failed to unmarshal exBlob: %v", err)
|
||||
@ -294,7 +294,7 @@ func TestOCI(t *testing.T) {
|
||||
name string
|
||||
opts []Opts
|
||||
wantRaw []byte
|
||||
wantDesc ociv1.Descriptor
|
||||
wantDesc types.Descriptor
|
||||
}{
|
||||
{
|
||||
name: "RawBody",
|
||||
@ -310,7 +310,7 @@ func TestOCI(t *testing.T) {
|
||||
opts: []Opts{
|
||||
WithImage(ociConfig),
|
||||
},
|
||||
wantDesc: ociv1.Descriptor{MediaType: types.MediaTypeOCI1ImageConfig},
|
||||
wantDesc: types.Descriptor{MediaType: types.MediaTypeOCI1ImageConfig},
|
||||
},
|
||||
{
|
||||
name: "Config with Docker Desc",
|
||||
@ -318,7 +318,7 @@ func TestOCI(t *testing.T) {
|
||||
WithImage(ociConfig),
|
||||
WithDesc(exDesc),
|
||||
},
|
||||
wantDesc: ociv1.Descriptor{MediaType: exMT},
|
||||
wantDesc: types.Descriptor{MediaType: exMT},
|
||||
},
|
||||
}
|
||||
|
||||
@ -351,7 +351,7 @@ func TestOCI(t *testing.T) {
|
||||
// create blob
|
||||
oc := NewOCIConfig(
|
||||
WithRawBody(exBlob),
|
||||
WithDesc(ociv1.Descriptor{
|
||||
WithDesc(types.Descriptor{
|
||||
MediaType: exMT,
|
||||
Digest: exDigest,
|
||||
Size: exLen,
|
||||
@ -359,7 +359,7 @@ func TestOCI(t *testing.T) {
|
||||
WithRef(exRef),
|
||||
)
|
||||
ociC := oc.GetConfig()
|
||||
ociC.History = append(ociC.History, ociv1.History{Comment: "test", EmptyLayer: true})
|
||||
ociC.History = append(ociC.History, v1.History{Comment: "test", EmptyLayer: true})
|
||||
oc.SetConfig(ociC)
|
||||
// ensure digest and raw body change
|
||||
if exDigest == oc.GetDescriptor().Digest {
|
||||
|
||||
@ -4,13 +4,13 @@ import (
|
||||
"net/http"
|
||||
|
||||
"github.com/opencontainers/go-digest"
|
||||
ociv1 "github.com/opencontainers/image-spec/specs-go/v1"
|
||||
"github.com/regclient/regclient/types"
|
||||
"github.com/regclient/regclient/types/ref"
|
||||
)
|
||||
|
||||
// Common interface is provided by all Blob implementations
|
||||
type Common interface {
|
||||
GetDescriptor() ociv1.Descriptor
|
||||
GetDescriptor() types.Descriptor
|
||||
Response() *http.Response
|
||||
RawHeaders() http.Header
|
||||
|
||||
@ -21,14 +21,14 @@ type Common interface {
|
||||
|
||||
type common struct {
|
||||
r ref.Ref
|
||||
desc ociv1.Descriptor
|
||||
desc types.Descriptor
|
||||
blobSet bool
|
||||
rawHeader http.Header
|
||||
resp *http.Response
|
||||
}
|
||||
|
||||
// GetDescriptor returns the descriptor associated with the blob
|
||||
func (b *common) GetDescriptor() ociv1.Descriptor {
|
||||
func (b *common) GetDescriptor() types.Descriptor {
|
||||
return b.desc
|
||||
}
|
||||
|
||||
|
||||
@ -5,15 +5,15 @@ import (
|
||||
"fmt"
|
||||
|
||||
"github.com/opencontainers/go-digest"
|
||||
ociv1 "github.com/opencontainers/image-spec/specs-go/v1"
|
||||
"github.com/regclient/regclient/types"
|
||||
v1 "github.com/regclient/regclient/types/oci/v1"
|
||||
)
|
||||
|
||||
// OCIConfig wraps an OCI Config struct extracted from a Blob
|
||||
type OCIConfig interface {
|
||||
Blob
|
||||
GetConfig() ociv1.Image
|
||||
SetConfig(ociv1.Image)
|
||||
GetConfig() v1.Image
|
||||
SetConfig(v1.Image)
|
||||
}
|
||||
|
||||
// ociConfig includes an OCI Config struct extracted from a Blob
|
||||
@ -21,7 +21,7 @@ type OCIConfig interface {
|
||||
type ociConfig struct {
|
||||
common
|
||||
rawBody []byte
|
||||
ociv1.Image
|
||||
v1.Image
|
||||
}
|
||||
|
||||
// NewOCIConfig creates a new BlobOCIConfig from an OCI Image
|
||||
@ -39,7 +39,7 @@ func NewOCIConfig(opts ...Opts) OCIConfig {
|
||||
}
|
||||
if len(bc.rawBody) > 0 {
|
||||
if bc.image == nil {
|
||||
bc.image = &ociv1.Image{}
|
||||
bc.image = &v1.Image{}
|
||||
err := json.Unmarshal(bc.rawBody, bc.image)
|
||||
if err != nil {
|
||||
bc.image = nil
|
||||
@ -71,7 +71,7 @@ func NewOCIConfig(opts ...Opts) OCIConfig {
|
||||
}
|
||||
|
||||
// GetConfig returns OCI config
|
||||
func (b *ociConfig) GetConfig() ociv1.Image {
|
||||
func (b *ociConfig) GetConfig() v1.Image {
|
||||
return b.Image
|
||||
}
|
||||
|
||||
@ -88,7 +88,7 @@ func (b *ociConfig) RawBody() ([]byte, error) {
|
||||
}
|
||||
|
||||
// SetConfig updates the config, including raw body and descriptor
|
||||
func (b *ociConfig) SetConfig(c ociv1.Image) {
|
||||
func (b *ociConfig) SetConfig(c v1.Image) {
|
||||
b.Image = c
|
||||
b.rawBody, _ = json.Marshal(b.Image)
|
||||
if b.desc.MediaType == "" {
|
||||
|
||||
28
types/descriptor.go
Normal file
28
types/descriptor.go
Normal file
@ -0,0 +1,28 @@
|
||||
package types
|
||||
|
||||
import (
|
||||
"github.com/opencontainers/go-digest"
|
||||
"github.com/regclient/regclient/types/platform"
|
||||
)
|
||||
|
||||
// Descriptor is used in manifests to refer to content by media type, size, and digest.
|
||||
type Descriptor struct {
|
||||
// MediaType describe the type of the content.
|
||||
MediaType string `json:"mediaType,omitempty"`
|
||||
|
||||
// Size in bytes of content.
|
||||
Size int64 `json:"size,omitempty"`
|
||||
|
||||
// Digest uniquely identifies the content.
|
||||
Digest digest.Digest `json:"digest,omitempty"`
|
||||
|
||||
// URLs contains the source URLs of this content.
|
||||
URLs []string `json:"urls,omitempty"`
|
||||
|
||||
// Annotations contains arbitrary metadata relating to the targeted content.
|
||||
Annotations map[string]string `json:"annotations,omitempty"`
|
||||
|
||||
// Platform describes the platform which the image in the manifest runs on.
|
||||
// This should only be used when referring to a manifest.
|
||||
Platform *platform.Platform `json:"platform,omitempty"`
|
||||
}
|
||||
131
types/docker/schema1/manifest.go
Normal file
131
types/docker/schema1/manifest.go
Normal file
@ -0,0 +1,131 @@
|
||||
// Package schema1 defines the manifest and json marshal/unmarshal for docker schema1
|
||||
package schema1
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
|
||||
"github.com/docker/libtrust"
|
||||
"github.com/opencontainers/go-digest"
|
||||
"github.com/regclient/regclient/types"
|
||||
"github.com/regclient/regclient/types/docker"
|
||||
)
|
||||
|
||||
var (
|
||||
// ManifestSchemaVersion provides a pre-initialized version structure schema1 manifests.
|
||||
ManifestSchemaVersion = docker.Versioned{
|
||||
SchemaVersion: 1,
|
||||
MediaType: types.MediaTypeDocker1Manifest,
|
||||
}
|
||||
// ManifestSignedSchemaVersion provides a pre-initialized version structure schema1 signed manifests.
|
||||
ManifestSignedSchemaVersion = docker.Versioned{
|
||||
SchemaVersion: 1,
|
||||
MediaType: types.MediaTypeDocker1ManifestSigned,
|
||||
}
|
||||
)
|
||||
|
||||
// FSLayer is a container struct for BlobSums defined in an image manifest
|
||||
type FSLayer struct {
|
||||
// BlobSum is the tarsum of the referenced filesystem image layer
|
||||
BlobSum digest.Digest `json:"blobSum"`
|
||||
}
|
||||
|
||||
// History stores unstructured v1 compatibility information
|
||||
type History struct {
|
||||
// V1Compatibility is the raw v1 compatibility information
|
||||
V1Compatibility string `json:"v1Compatibility"`
|
||||
}
|
||||
|
||||
// Manifest defines the schema v1 docker manifest
|
||||
type Manifest struct {
|
||||
docker.Versioned
|
||||
|
||||
// Name is the name of the image's repository
|
||||
Name string `json:"name"`
|
||||
|
||||
// Tag is the tag of the image specified by this manifest
|
||||
Tag string `json:"tag"`
|
||||
|
||||
// Architecture is the host architecture on which this image is intended to run
|
||||
Architecture string `json:"architecture"`
|
||||
|
||||
// FSLayers is a list of filesystem layer blobSums contained in this image
|
||||
FSLayers []FSLayer `json:"fsLayers"`
|
||||
|
||||
// History is a list of unstructured historical data for v1 compatibility
|
||||
History []History `json:"history"`
|
||||
}
|
||||
|
||||
// SignedManifest provides an envelope for a signed image manifest, including the format sensitive raw bytes.
|
||||
type SignedManifest struct {
|
||||
Manifest
|
||||
|
||||
// Canonical is the canonical byte representation of the ImageManifest, without any attached signatures.
|
||||
// The manifest byte representation cannot change or it will have to be re-signed.
|
||||
Canonical []byte `json:"-"`
|
||||
|
||||
// all contains the byte representation of the Manifest including signatures and is returned by Payload()
|
||||
all []byte
|
||||
}
|
||||
|
||||
// UnmarshalJSON populates a new SignedManifest struct from JSON data.
|
||||
func (sm *SignedManifest) UnmarshalJSON(b []byte) error {
|
||||
sm.all = make([]byte, len(b))
|
||||
// store manifest and signatures in all
|
||||
copy(sm.all, b)
|
||||
|
||||
jsig, err := libtrust.ParsePrettySignature(b, "signatures")
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
// Resolve the payload in the manifest.
|
||||
bytes, err := jsig.Payload()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
// sm.Canonical stores the canonical manifest JSON
|
||||
sm.Canonical = make([]byte, len(bytes))
|
||||
copy(sm.Canonical, bytes)
|
||||
|
||||
// Unmarshal canonical JSON into Manifest object
|
||||
var manifest Manifest
|
||||
if err := json.Unmarshal(sm.Canonical, &manifest); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
sm.Manifest = manifest
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
// MarshalJSON returns the contents of raw.
|
||||
// If Raw is nil, marshals the inner contents.
|
||||
// Applications requiring a marshaled signed manifest should simply use Raw directly, since the the content produced by json.Marshal will be compacted and will fail signature checks.
|
||||
func (sm *SignedManifest) MarshalJSON() ([]byte, error) {
|
||||
if len(sm.all) > 0 {
|
||||
return sm.all, nil
|
||||
}
|
||||
|
||||
// If the raw data is not available, just dump the inner content.
|
||||
return json.Marshal(&sm.Manifest)
|
||||
}
|
||||
|
||||
// TODO: verify Payload and Signatures methods are required
|
||||
|
||||
// Payload returns the signed content of the signed manifest.
|
||||
func (sm SignedManifest) Payload() (string, []byte, error) {
|
||||
return types.MediaTypeDocker1ManifestSigned, sm.all, nil
|
||||
}
|
||||
|
||||
// Signatures returns the signatures as provided by (*libtrust.JSONSignature).Signatures.
|
||||
// The byte slices are opaque jws signatures.
|
||||
func (sm *SignedManifest) Signatures() ([][]byte, error) {
|
||||
jsig, err := libtrust.ParsePrettySignature(sm.all, "signatures")
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
// Resolve the payload in the manifest.
|
||||
return jsig.Signatures()
|
||||
}
|
||||
2
types/docker/schema2/doc.go
Normal file
2
types/docker/schema2/doc.go
Normal file
@ -0,0 +1,2 @@
|
||||
// Package schema2 contains structs for Docker schema v2 manifests.
|
||||
package schema2
|
||||
24
types/docker/schema2/manifest.go
Normal file
24
types/docker/schema2/manifest.go
Normal file
@ -0,0 +1,24 @@
|
||||
package schema2
|
||||
|
||||
import (
|
||||
"github.com/regclient/regclient/types"
|
||||
"github.com/regclient/regclient/types/docker"
|
||||
)
|
||||
|
||||
// ManifestSchemaVersion is a pre-configured versioned field for manifests
|
||||
var ManifestSchemaVersion = docker.Versioned{
|
||||
SchemaVersion: 2,
|
||||
MediaType: types.MediaTypeDocker2Manifest,
|
||||
}
|
||||
|
||||
// Manifest defines a schema2 manifest.
|
||||
type Manifest struct {
|
||||
docker.Versioned
|
||||
|
||||
// Config references the image configuration as a blob.
|
||||
Config types.Descriptor `json:"config"`
|
||||
|
||||
// Layers lists descriptors for the layers referenced by the
|
||||
// configuration.
|
||||
Layers []types.Descriptor `json:"layers"`
|
||||
}
|
||||
20
types/docker/schema2/manifestlist.go
Normal file
20
types/docker/schema2/manifestlist.go
Normal file
@ -0,0 +1,20 @@
|
||||
package schema2
|
||||
|
||||
import (
|
||||
"github.com/regclient/regclient/types"
|
||||
"github.com/regclient/regclient/types/docker"
|
||||
)
|
||||
|
||||
// ManifestListSchemaVersion is a pre-configured versioned field for manifest lists
|
||||
var ManifestListSchemaVersion = docker.Versioned{
|
||||
SchemaVersion: 2,
|
||||
MediaType: types.MediaTypeDocker2ManifestList,
|
||||
}
|
||||
|
||||
// ManifestList references manifests for various platforms.
|
||||
type ManifestList struct {
|
||||
docker.Versioned
|
||||
|
||||
// Config references the image configuration as a blob.
|
||||
Manifests []types.Descriptor `json:"manifests"`
|
||||
}
|
||||
10
types/docker/versioned.go
Normal file
10
types/docker/versioned.go
Normal file
@ -0,0 +1,10 @@
|
||||
// Package docker defines the common types for all docker schemas
|
||||
package docker
|
||||
|
||||
type Versioned struct {
|
||||
// SchemaVersion is the image manifest schema that this image follows
|
||||
SchemaVersion int `json:"schemaVersion"`
|
||||
|
||||
// MediaType is the media type of this schema.
|
||||
MediaType string `json:"mediaType,omitempty"`
|
||||
}
|
||||
@ -6,14 +6,13 @@ import (
|
||||
"strings"
|
||||
|
||||
digest "github.com/opencontainers/go-digest"
|
||||
ociv1 "github.com/opencontainers/image-spec/specs-go/v1"
|
||||
"github.com/regclient/regclient/types"
|
||||
"github.com/regclient/regclient/types/ref"
|
||||
)
|
||||
|
||||
type common struct {
|
||||
r ref.Ref
|
||||
desc ociv1.Descriptor
|
||||
desc types.Descriptor
|
||||
manifSet bool
|
||||
ratelimit types.RateLimit
|
||||
rawHeader http.Header
|
||||
@ -26,7 +25,7 @@ func (m *common) GetDigest() digest.Digest {
|
||||
}
|
||||
|
||||
// GetDescriptor returns the descriptor
|
||||
func (m *common) GetDescriptor() ociv1.Descriptor {
|
||||
func (m *common) GetDescriptor() types.Descriptor {
|
||||
return m.desc
|
||||
}
|
||||
|
||||
|
||||
@ -5,11 +5,11 @@ import (
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
|
||||
dockerSchema1 "github.com/docker/distribution/manifest/schema1"
|
||||
digest "github.com/opencontainers/go-digest"
|
||||
ociv1 "github.com/opencontainers/image-spec/specs-go/v1"
|
||||
"github.com/regclient/regclient/internal/wraperr"
|
||||
"github.com/regclient/regclient/types"
|
||||
"github.com/regclient/regclient/types/docker/schema1"
|
||||
"github.com/regclient/regclient/types/platform"
|
||||
)
|
||||
|
||||
const (
|
||||
@ -21,46 +21,46 @@ const (
|
||||
|
||||
type docker1Manifest struct {
|
||||
common
|
||||
dockerSchema1.Manifest
|
||||
schema1.Manifest
|
||||
}
|
||||
type docker1SignedManifest struct {
|
||||
common
|
||||
dockerSchema1.SignedManifest
|
||||
schema1.SignedManifest
|
||||
}
|
||||
|
||||
func (m *docker1Manifest) GetConfig() (ociv1.Descriptor, error) {
|
||||
return ociv1.Descriptor{}, wraperr.New(fmt.Errorf("config digest not available for media type %s", m.desc.MediaType), types.ErrUnsupportedMediaType)
|
||||
func (m *docker1Manifest) GetConfig() (types.Descriptor, error) {
|
||||
return types.Descriptor{}, wraperr.New(fmt.Errorf("config digest not available for media type %s", m.desc.MediaType), types.ErrUnsupportedMediaType)
|
||||
}
|
||||
func (m *docker1Manifest) GetConfigDigest() (digest.Digest, error) {
|
||||
return "", wraperr.New(fmt.Errorf("config digest not available for media type %s", m.desc.MediaType), types.ErrUnsupportedMediaType)
|
||||
}
|
||||
func (m *docker1SignedManifest) GetConfig() (ociv1.Descriptor, error) {
|
||||
return ociv1.Descriptor{}, wraperr.New(fmt.Errorf("config digest not available for media type %s", m.desc.MediaType), types.ErrUnsupportedMediaType)
|
||||
func (m *docker1SignedManifest) GetConfig() (types.Descriptor, error) {
|
||||
return types.Descriptor{}, wraperr.New(fmt.Errorf("config digest not available for media type %s", m.desc.MediaType), types.ErrUnsupportedMediaType)
|
||||
}
|
||||
func (m *docker1SignedManifest) GetConfigDigest() (digest.Digest, error) {
|
||||
return "", wraperr.New(fmt.Errorf("config digest not available for media type %s", m.desc.MediaType), types.ErrUnsupportedMediaType)
|
||||
}
|
||||
|
||||
func (m *docker1Manifest) GetManifestList() ([]ociv1.Descriptor, error) {
|
||||
return []ociv1.Descriptor{}, wraperr.New(fmt.Errorf("platform descriptor list not available for media type %s", m.desc.MediaType), types.ErrUnsupportedMediaType)
|
||||
func (m *docker1Manifest) GetManifestList() ([]types.Descriptor, error) {
|
||||
return []types.Descriptor{}, wraperr.New(fmt.Errorf("platform descriptor list not available for media type %s", m.desc.MediaType), types.ErrUnsupportedMediaType)
|
||||
}
|
||||
func (m *docker1SignedManifest) GetManifestList() ([]ociv1.Descriptor, error) {
|
||||
return []ociv1.Descriptor{}, wraperr.New(fmt.Errorf("platform descriptor list not available for media type %s", m.desc.MediaType), types.ErrUnsupportedMediaType)
|
||||
func (m *docker1SignedManifest) GetManifestList() ([]types.Descriptor, error) {
|
||||
return []types.Descriptor{}, wraperr.New(fmt.Errorf("platform descriptor list not available for media type %s", m.desc.MediaType), types.ErrUnsupportedMediaType)
|
||||
}
|
||||
|
||||
func (m *docker1Manifest) GetLayers() ([]ociv1.Descriptor, error) {
|
||||
var dl []ociv1.Descriptor
|
||||
func (m *docker1Manifest) GetLayers() ([]types.Descriptor, error) {
|
||||
var dl []types.Descriptor
|
||||
for _, sd := range m.FSLayers {
|
||||
dl = append(dl, ociv1.Descriptor{
|
||||
dl = append(dl, types.Descriptor{
|
||||
Digest: sd.BlobSum,
|
||||
})
|
||||
}
|
||||
return dl, nil
|
||||
}
|
||||
func (m *docker1SignedManifest) GetLayers() ([]ociv1.Descriptor, error) {
|
||||
var dl []ociv1.Descriptor
|
||||
func (m *docker1SignedManifest) GetLayers() ([]types.Descriptor, error) {
|
||||
var dl []types.Descriptor
|
||||
for _, sd := range m.FSLayers {
|
||||
dl = append(dl, ociv1.Descriptor{
|
||||
dl = append(dl, types.Descriptor{
|
||||
Digest: sd.BlobSum,
|
||||
})
|
||||
}
|
||||
@ -74,17 +74,17 @@ func (m *docker1SignedManifest) GetOrig() interface{} {
|
||||
return m.SignedManifest
|
||||
}
|
||||
|
||||
func (m *docker1Manifest) GetPlatformDesc(p *ociv1.Platform) (*ociv1.Descriptor, error) {
|
||||
func (m *docker1Manifest) GetPlatformDesc(p *platform.Platform) (*types.Descriptor, error) {
|
||||
return nil, wraperr.New(fmt.Errorf("platform lookup not available for media type %s", m.desc.MediaType), types.ErrUnsupportedMediaType)
|
||||
}
|
||||
func (m *docker1SignedManifest) GetPlatformDesc(p *ociv1.Platform) (*ociv1.Descriptor, error) {
|
||||
func (m *docker1SignedManifest) GetPlatformDesc(p *platform.Platform) (*types.Descriptor, error) {
|
||||
return nil, wraperr.New(fmt.Errorf("platform lookup not available for media type %s", m.desc.MediaType), types.ErrUnsupportedMediaType)
|
||||
}
|
||||
|
||||
func (m *docker1Manifest) GetPlatformList() ([]*ociv1.Platform, error) {
|
||||
func (m *docker1Manifest) GetPlatformList() ([]*platform.Platform, error) {
|
||||
return nil, wraperr.New(fmt.Errorf("platform list not available for media type %s", m.desc.MediaType), types.ErrUnsupportedMediaType)
|
||||
}
|
||||
func (m *docker1SignedManifest) GetPlatformList() ([]*ociv1.Platform, error) {
|
||||
func (m *docker1SignedManifest) GetPlatformList() ([]*platform.Platform, error) {
|
||||
return nil, wraperr.New(fmt.Errorf("platform list not available for media type %s", m.desc.MediaType), types.ErrUnsupportedMediaType)
|
||||
}
|
||||
|
||||
@ -122,7 +122,7 @@ func (m *docker1SignedManifest) MarshalPretty() ([]byte, error) {
|
||||
}
|
||||
|
||||
func (m *docker1Manifest) SetOrig(origIn interface{}) error {
|
||||
orig, ok := origIn.(dockerSchema1.Manifest)
|
||||
orig, ok := origIn.(schema1.Manifest)
|
||||
if !ok {
|
||||
return types.ErrUnsupportedMediaType
|
||||
}
|
||||
@ -136,7 +136,7 @@ func (m *docker1Manifest) SetOrig(origIn interface{}) error {
|
||||
}
|
||||
m.manifSet = true
|
||||
m.rawBody = mj
|
||||
m.desc = ociv1.Descriptor{
|
||||
m.desc = types.Descriptor{
|
||||
MediaType: types.MediaTypeDocker1Manifest,
|
||||
Digest: digest.FromBytes(mj),
|
||||
Size: int64(len(mj)),
|
||||
@ -147,7 +147,7 @@ func (m *docker1Manifest) SetOrig(origIn interface{}) error {
|
||||
}
|
||||
|
||||
func (m *docker1SignedManifest) SetOrig(origIn interface{}) error {
|
||||
orig, ok := origIn.(dockerSchema1.SignedManifest)
|
||||
orig, ok := origIn.(schema1.SignedManifest)
|
||||
if !ok {
|
||||
return types.ErrUnsupportedMediaType
|
||||
}
|
||||
@ -161,7 +161,7 @@ func (m *docker1SignedManifest) SetOrig(origIn interface{}) error {
|
||||
}
|
||||
m.manifSet = true
|
||||
m.rawBody = mj
|
||||
m.desc = ociv1.Descriptor{
|
||||
m.desc = types.Descriptor{
|
||||
MediaType: types.MediaTypeDocker1ManifestSigned,
|
||||
Digest: digest.FromBytes(mj),
|
||||
Size: int64(len(mj)),
|
||||
|
||||
@ -7,71 +7,54 @@ import (
|
||||
"strings"
|
||||
"text/tabwriter"
|
||||
|
||||
"github.com/containerd/containerd/platforms"
|
||||
dockerManifestList "github.com/docker/distribution/manifest/manifestlist"
|
||||
dockerSchema2 "github.com/docker/distribution/manifest/schema2"
|
||||
digest "github.com/opencontainers/go-digest"
|
||||
ociv1 "github.com/opencontainers/image-spec/specs-go/v1"
|
||||
"github.com/regclient/regclient/internal/wraperr"
|
||||
"github.com/regclient/regclient/types"
|
||||
"github.com/regclient/regclient/types/docker/schema2"
|
||||
"github.com/regclient/regclient/types/platform"
|
||||
)
|
||||
|
||||
const (
|
||||
// MediaTypeDocker2Manifest is the media type when pulling manifests from a v2 registry
|
||||
MediaTypeDocker2Manifest = dockerSchema2.MediaTypeManifest
|
||||
MediaTypeDocker2Manifest = types.MediaTypeDocker2Manifest
|
||||
// MediaTypeDocker2ManifestList is the media type when pulling a manifest list from a v2 registry
|
||||
MediaTypeDocker2ManifestList = dockerManifestList.MediaTypeManifestList
|
||||
MediaTypeDocker2ManifestList = types.MediaTypeDocker2ManifestList
|
||||
)
|
||||
|
||||
type docker2Manifest struct {
|
||||
common
|
||||
dockerSchema2.Manifest
|
||||
schema2.Manifest
|
||||
}
|
||||
type docker2ManifestList struct {
|
||||
common
|
||||
dockerManifestList.ManifestList
|
||||
schema2.ManifestList
|
||||
}
|
||||
|
||||
func (m *docker2Manifest) GetConfig() (ociv1.Descriptor, error) {
|
||||
return ociv1.Descriptor{
|
||||
MediaType: m.Config.MediaType,
|
||||
Digest: m.Config.Digest,
|
||||
Size: m.Config.Size,
|
||||
URLs: m.Config.URLs,
|
||||
Annotations: m.Config.Annotations,
|
||||
Platform: m.Config.Platform,
|
||||
}, nil
|
||||
func (m *docker2Manifest) GetConfig() (types.Descriptor, error) {
|
||||
return m.Config, nil
|
||||
}
|
||||
func (m *docker2Manifest) GetConfigDigest() (digest.Digest, error) {
|
||||
return m.Config.Digest, nil
|
||||
}
|
||||
func (m *docker2ManifestList) GetConfig() (ociv1.Descriptor, error) {
|
||||
return ociv1.Descriptor{}, wraperr.New(fmt.Errorf("config digest not available for media type %s", m.desc.MediaType), types.ErrUnsupportedMediaType)
|
||||
func (m *docker2ManifestList) GetConfig() (types.Descriptor, error) {
|
||||
return types.Descriptor{}, wraperr.New(fmt.Errorf("config digest not available for media type %s", m.desc.MediaType), types.ErrUnsupportedMediaType)
|
||||
}
|
||||
func (m *docker2ManifestList) GetConfigDigest() (digest.Digest, error) {
|
||||
return "", wraperr.New(fmt.Errorf("config digest not available for media type %s", m.desc.MediaType), types.ErrUnsupportedMediaType)
|
||||
}
|
||||
|
||||
func (m *docker2Manifest) GetManifestList() ([]ociv1.Descriptor, error) {
|
||||
return []ociv1.Descriptor{}, wraperr.New(fmt.Errorf("platform descriptor list not available for media type %s", m.desc.MediaType), types.ErrUnsupportedMediaType)
|
||||
func (m *docker2Manifest) GetManifestList() ([]types.Descriptor, error) {
|
||||
return []types.Descriptor{}, wraperr.New(fmt.Errorf("platform descriptor list not available for media type %s", m.desc.MediaType), types.ErrUnsupportedMediaType)
|
||||
}
|
||||
func (m *docker2ManifestList) GetManifestList() ([]ociv1.Descriptor, error) {
|
||||
dl := []ociv1.Descriptor{}
|
||||
for _, d := range m.Manifests {
|
||||
dl = append(dl, *dl2oDescriptor(d))
|
||||
}
|
||||
return dl, nil
|
||||
func (m *docker2ManifestList) GetManifestList() ([]types.Descriptor, error) {
|
||||
return m.Manifests, nil
|
||||
}
|
||||
|
||||
func (m *docker2Manifest) GetLayers() ([]ociv1.Descriptor, error) {
|
||||
var dl []ociv1.Descriptor
|
||||
for _, sd := range m.Layers {
|
||||
dl = append(dl, *d2oDescriptor(sd))
|
||||
}
|
||||
return dl, nil
|
||||
func (m *docker2Manifest) GetLayers() ([]types.Descriptor, error) {
|
||||
return m.Layers, nil
|
||||
}
|
||||
func (m *docker2ManifestList) GetLayers() ([]ociv1.Descriptor, error) {
|
||||
return []ociv1.Descriptor{}, wraperr.New(fmt.Errorf("layers are not available for media type %s", m.desc.MediaType), types.ErrUnsupportedMediaType)
|
||||
func (m *docker2ManifestList) GetLayers() ([]types.Descriptor, error) {
|
||||
return []types.Descriptor{}, wraperr.New(fmt.Errorf("layers are not available for media type %s", m.desc.MediaType), types.ErrUnsupportedMediaType)
|
||||
}
|
||||
|
||||
func (m *docker2Manifest) GetOrig() interface{} {
|
||||
@ -81,21 +64,17 @@ func (m *docker2ManifestList) GetOrig() interface{} {
|
||||
return m.ManifestList
|
||||
}
|
||||
|
||||
func (m *docker2Manifest) GetPlatformDesc(p *ociv1.Platform) (*ociv1.Descriptor, error) {
|
||||
func (m *docker2Manifest) GetPlatformDesc(p *platform.Platform) (*types.Descriptor, error) {
|
||||
return nil, wraperr.New(fmt.Errorf("platform lookup not available for media type %s", m.desc.MediaType), types.ErrUnsupportedMediaType)
|
||||
}
|
||||
func (m *docker2ManifestList) GetPlatformDesc(p *ociv1.Platform) (*ociv1.Descriptor, error) {
|
||||
dl, err := m.GetManifestList()
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return getPlatformDesc(p, dl)
|
||||
func (m *docker2ManifestList) GetPlatformDesc(p *platform.Platform) (*types.Descriptor, error) {
|
||||
return getPlatformDesc(p, m.Manifests)
|
||||
}
|
||||
|
||||
func (m *docker2Manifest) GetPlatformList() ([]*ociv1.Platform, error) {
|
||||
func (m *docker2Manifest) GetPlatformList() ([]*platform.Platform, error) {
|
||||
return nil, wraperr.New(fmt.Errorf("platform list not available for media type %s", m.desc.MediaType), types.ErrUnsupportedMediaType)
|
||||
}
|
||||
func (m *docker2ManifestList) GetPlatformList() ([]*ociv1.Platform, error) {
|
||||
func (m *docker2ManifestList) GetPlatformList() ([]*platform.Platform, error) {
|
||||
dl, err := m.GetManifestList()
|
||||
if err != nil {
|
||||
return nil, err
|
||||
@ -158,7 +137,7 @@ func (m *docker2ManifestList) MarshalPretty() ([]byte, error) {
|
||||
}
|
||||
fmt.Fprintf(tw, " MediaType:\t%s\n", d.MediaType)
|
||||
if p := d.Platform; p.OS != "" {
|
||||
fmt.Fprintf(tw, " Platform:\t%s\n", platforms.Format(*dlp2Platform(p)))
|
||||
fmt.Fprintf(tw, " Platform:\t%s\n", p.String())
|
||||
if p.OSVersion != "" {
|
||||
fmt.Fprintf(tw, " OSVersion:\t%s\n", p.OSVersion)
|
||||
}
|
||||
@ -181,7 +160,7 @@ func (m *docker2ManifestList) MarshalPretty() ([]byte, error) {
|
||||
}
|
||||
|
||||
func (m *docker2Manifest) SetOrig(origIn interface{}) error {
|
||||
orig, ok := origIn.(dockerSchema2.Manifest)
|
||||
orig, ok := origIn.(schema2.Manifest)
|
||||
if !ok {
|
||||
return types.ErrUnsupportedMediaType
|
||||
}
|
||||
@ -195,7 +174,7 @@ func (m *docker2Manifest) SetOrig(origIn interface{}) error {
|
||||
}
|
||||
m.manifSet = true
|
||||
m.rawBody = mj
|
||||
m.desc = ociv1.Descriptor{
|
||||
m.desc = types.Descriptor{
|
||||
MediaType: types.MediaTypeDocker2Manifest,
|
||||
Digest: digest.FromBytes(mj),
|
||||
Size: int64(len(mj)),
|
||||
@ -206,7 +185,7 @@ func (m *docker2Manifest) SetOrig(origIn interface{}) error {
|
||||
}
|
||||
|
||||
func (m *docker2ManifestList) SetOrig(origIn interface{}) error {
|
||||
orig, ok := origIn.(dockerManifestList.ManifestList)
|
||||
orig, ok := origIn.(schema2.ManifestList)
|
||||
if !ok {
|
||||
return types.ErrUnsupportedMediaType
|
||||
}
|
||||
@ -220,7 +199,7 @@ func (m *docker2ManifestList) SetOrig(origIn interface{}) error {
|
||||
}
|
||||
m.manifSet = true
|
||||
m.rawBody = mj
|
||||
m.desc = ociv1.Descriptor{
|
||||
m.desc = types.Descriptor{
|
||||
MediaType: types.MediaTypeDocker2ManifestList,
|
||||
Digest: digest.FromBytes(mj),
|
||||
Size: int64(len(mj)),
|
||||
|
||||
@ -10,27 +10,23 @@ import (
|
||||
"strconv"
|
||||
"strings"
|
||||
|
||||
"github.com/containerd/containerd/platforms"
|
||||
dockerDistribution "github.com/docker/distribution"
|
||||
"github.com/docker/distribution/manifest"
|
||||
dockerManifestList "github.com/docker/distribution/manifest/manifestlist"
|
||||
dockerSchema1 "github.com/docker/distribution/manifest/schema1"
|
||||
dockerSchema2 "github.com/docker/distribution/manifest/schema2"
|
||||
digest "github.com/opencontainers/go-digest"
|
||||
"github.com/opencontainers/image-spec/specs-go"
|
||||
ociv1 "github.com/opencontainers/image-spec/specs-go/v1"
|
||||
"github.com/regclient/regclient/internal/wraperr"
|
||||
"github.com/regclient/regclient/types"
|
||||
"github.com/regclient/regclient/types/docker/schema1"
|
||||
"github.com/regclient/regclient/types/docker/schema2"
|
||||
v1 "github.com/regclient/regclient/types/oci/v1"
|
||||
"github.com/regclient/regclient/types/platform"
|
||||
"github.com/regclient/regclient/types/ref"
|
||||
)
|
||||
|
||||
// Manifest interface is implemented by all supported manifests but
|
||||
// many calls are only supported by certain underlying media types.
|
||||
type Manifest interface {
|
||||
GetConfig() (ociv1.Descriptor, error)
|
||||
GetDescriptor() ociv1.Descriptor
|
||||
GetLayers() ([]ociv1.Descriptor, error)
|
||||
GetManifestList() ([]ociv1.Descriptor, error)
|
||||
GetConfig() (types.Descriptor, error)
|
||||
GetDescriptor() types.Descriptor
|
||||
GetLayers() ([]types.Descriptor, error)
|
||||
GetManifestList() ([]types.Descriptor, error)
|
||||
GetOrig() interface{}
|
||||
GetRef() ref.Ref
|
||||
IsList() bool
|
||||
@ -43,15 +39,15 @@ type Manifest interface {
|
||||
GetConfigDigest() (digest.Digest, error) // TODO: deprecate
|
||||
GetDigest() digest.Digest // TODO: deprecate
|
||||
GetMediaType() string // TODO: deprecate
|
||||
GetPlatformDesc(p *ociv1.Platform) (*ociv1.Descriptor, error) // TODO: deprecate
|
||||
GetPlatformList() ([]*ociv1.Platform, error) // TODO: deprecate
|
||||
GetPlatformDesc(p *platform.Platform) (*types.Descriptor, error) // TODO: deprecate
|
||||
GetPlatformList() ([]*platform.Platform, error) // TODO: deprecate
|
||||
GetRateLimit() types.RateLimit // TODO: deprecate
|
||||
HasRateLimit() bool // TODO: deprecate
|
||||
}
|
||||
|
||||
type manifestConfig struct {
|
||||
r ref.Ref
|
||||
desc ociv1.Descriptor
|
||||
desc types.Descriptor
|
||||
raw []byte
|
||||
orig interface{}
|
||||
header http.Header
|
||||
@ -91,7 +87,7 @@ func New(opts ...Opts) (Manifest, error) {
|
||||
}
|
||||
|
||||
// WithDesc specifies the descriptor for the manifest
|
||||
func WithDesc(desc ociv1.Descriptor) Opts {
|
||||
func WithDesc(desc types.Descriptor) Opts {
|
||||
return func(mc *manifestConfig) {
|
||||
mc.desc = desc
|
||||
}
|
||||
@ -138,27 +134,21 @@ func GetMediaType(m Manifest) string {
|
||||
}
|
||||
|
||||
// GetPlatformDesc returns the descriptor for a specific platform from an index
|
||||
func GetPlatformDesc(m Manifest, p *ociv1.Platform) (*ociv1.Descriptor, error) {
|
||||
func GetPlatformDesc(m Manifest, p *platform.Platform) (*types.Descriptor, error) {
|
||||
dl, err := m.GetManifestList()
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
platformCmp := platforms.NewMatcher(*p)
|
||||
for _, d := range dl {
|
||||
if d.Platform != nil && platformCmp.Match(*d.Platform) {
|
||||
return &d, nil
|
||||
}
|
||||
}
|
||||
return nil, wraperr.New(fmt.Errorf("platform not found: %s", platforms.Format(*p)), types.ErrNotFound)
|
||||
return getPlatformDesc(p, dl)
|
||||
}
|
||||
|
||||
// GetPlatformList returns the list of platforms from an index
|
||||
func GetPlatformList(m Manifest) ([]*ociv1.Platform, error) {
|
||||
func GetPlatformList(m Manifest) ([]*platform.Platform, error) {
|
||||
dl, err := m.GetManifestList()
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
var l []*ociv1.Platform
|
||||
var l []*platform.Platform
|
||||
for _, d := range dl {
|
||||
if d.Platform != nil {
|
||||
l = append(l, d.Platform)
|
||||
@ -220,19 +210,15 @@ func HasRateLimit(m Manifest) bool {
|
||||
return rl.Set
|
||||
}
|
||||
|
||||
func OCIIndexFromAny(orig interface{}) (ociv1.Index, error) {
|
||||
ociI := ociv1.Index{
|
||||
Versioned: specs.Versioned{SchemaVersion: 2},
|
||||
func OCIIndexFromAny(orig interface{}) (v1.Index, error) {
|
||||
ociI := v1.Index{
|
||||
Versioned: v1.IndexSchemaVersion,
|
||||
MediaType: types.MediaTypeOCI1ManifestList,
|
||||
}
|
||||
switch orig := orig.(type) {
|
||||
case dockerManifestList.ManifestList:
|
||||
ml := make([]ociv1.Descriptor, len(orig.Manifests))
|
||||
for i, d := range orig.Manifests {
|
||||
ml[i] = *dl2oDescriptor(d)
|
||||
}
|
||||
ociI.Manifests = ml
|
||||
case ociv1.Index:
|
||||
case schema2.ManifestList:
|
||||
ociI.Manifests = orig.Manifests
|
||||
case v1.Index:
|
||||
ociI = orig
|
||||
default:
|
||||
return ociI, fmt.Errorf("unable to convert %T to OCI index", orig)
|
||||
@ -240,7 +226,7 @@ func OCIIndexFromAny(orig interface{}) (ociv1.Index, error) {
|
||||
return ociI, nil
|
||||
}
|
||||
|
||||
func OCIIndexToAny(ociI ociv1.Index, origP interface{}) error {
|
||||
func OCIIndexToAny(ociI v1.Index, origP interface{}) error {
|
||||
// reflect is used to handle both *interface{} and *Manifest
|
||||
rv := reflect.ValueOf(origP)
|
||||
for rv.IsValid() && rv.Type().Kind() == reflect.Ptr {
|
||||
@ -254,36 +240,11 @@ func OCIIndexToAny(ociI ociv1.Index, origP interface{}) error {
|
||||
}
|
||||
origR := rv.Interface()
|
||||
switch orig := (origR).(type) {
|
||||
case dockerManifestList.ManifestList:
|
||||
ml := make([]dockerManifestList.ManifestDescriptor, len(ociI.Manifests))
|
||||
for i, d := range ociI.Manifests {
|
||||
ml[i] = dockerManifestList.ManifestDescriptor{
|
||||
Descriptor: dockerDistribution.Descriptor{
|
||||
MediaType: d.MediaType,
|
||||
Size: d.Size,
|
||||
Digest: d.Digest,
|
||||
URLs: d.URLs,
|
||||
Annotations: d.Annotations,
|
||||
Platform: d.Platform,
|
||||
},
|
||||
}
|
||||
if d.Platform != nil {
|
||||
ml[i].Platform = dockerManifestList.PlatformSpec{
|
||||
Architecture: d.Platform.Architecture,
|
||||
OS: d.Platform.OS,
|
||||
OSVersion: d.Platform.OSVersion,
|
||||
OSFeatures: d.Platform.OSFeatures,
|
||||
Variant: d.Platform.Variant,
|
||||
}
|
||||
}
|
||||
}
|
||||
orig.Manifests = ml
|
||||
orig.Versioned = manifest.Versioned{
|
||||
SchemaVersion: 2,
|
||||
MediaType: types.MediaTypeDocker2ManifestList,
|
||||
}
|
||||
case schema2.ManifestList:
|
||||
orig.Versioned = schema2.ManifestListSchemaVersion
|
||||
orig.Manifests = ociI.Manifests
|
||||
rv.Set(reflect.ValueOf(orig))
|
||||
case ociv1.Index:
|
||||
case v1.Index:
|
||||
rv.Set(reflect.ValueOf(ociI))
|
||||
default:
|
||||
return fmt.Errorf("unable to convert OCI index to %T", origR)
|
||||
@ -291,20 +252,16 @@ func OCIIndexToAny(ociI ociv1.Index, origP interface{}) error {
|
||||
return nil
|
||||
}
|
||||
|
||||
func OCIManifestFromAny(orig interface{}) (ociv1.Manifest, error) {
|
||||
ociM := ociv1.Manifest{
|
||||
Versioned: specs.Versioned{SchemaVersion: 2},
|
||||
func OCIManifestFromAny(orig interface{}) (v1.Manifest, error) {
|
||||
ociM := v1.Manifest{
|
||||
Versioned: v1.ManifestSchemaVersion,
|
||||
MediaType: types.MediaTypeOCI1Manifest,
|
||||
}
|
||||
switch orig := orig.(type) {
|
||||
case dockerSchema2.Manifest:
|
||||
ll := make([]ociv1.Descriptor, len(orig.Layers))
|
||||
for i, l := range orig.Layers {
|
||||
ll[i] = *d2oDescriptor(l)
|
||||
}
|
||||
ociM.Config = *d2oDescriptor(orig.Config)
|
||||
ociM.Layers = ll
|
||||
case ociv1.Manifest:
|
||||
case schema2.Manifest:
|
||||
ociM.Config = orig.Config
|
||||
ociM.Layers = orig.Layers
|
||||
case v1.Manifest:
|
||||
ociM = orig
|
||||
default:
|
||||
// TODO: consider supporting Docker schema v1 media types
|
||||
@ -313,7 +270,7 @@ func OCIManifestFromAny(orig interface{}) (ociv1.Manifest, error) {
|
||||
return ociM, nil
|
||||
}
|
||||
|
||||
func OCIManifestToAny(ociM ociv1.Manifest, origP interface{}) error {
|
||||
func OCIManifestToAny(ociM v1.Manifest, origP interface{}) error {
|
||||
// reflect is used to handle both *interface{} and *Manifest
|
||||
rv := reflect.ValueOf(origP)
|
||||
for rv.IsValid() && rv.Type().Kind() == reflect.Ptr {
|
||||
@ -327,31 +284,12 @@ func OCIManifestToAny(ociM ociv1.Manifest, origP interface{}) error {
|
||||
}
|
||||
origR := rv.Interface()
|
||||
switch orig := (origR).(type) {
|
||||
case dockerSchema2.Manifest:
|
||||
ll := make([]dockerDistribution.Descriptor, len(ociM.Layers))
|
||||
for i, l := range ociM.Layers {
|
||||
ll[i] = dockerDistribution.Descriptor{
|
||||
MediaType: l.MediaType,
|
||||
Size: l.Size,
|
||||
Digest: l.Digest,
|
||||
URLs: l.URLs,
|
||||
Annotations: l.Annotations,
|
||||
Platform: l.Platform,
|
||||
}
|
||||
}
|
||||
orig.Layers = ll
|
||||
orig.Config = dockerDistribution.Descriptor{
|
||||
MediaType: ociM.Config.MediaType,
|
||||
Size: ociM.Config.Size,
|
||||
Digest: ociM.Config.Digest,
|
||||
URLs: ociM.Config.URLs,
|
||||
Annotations: ociM.Config.Annotations,
|
||||
Platform: ociM.Config.Platform,
|
||||
}
|
||||
orig.Versioned.MediaType = types.MediaTypeDocker2Manifest
|
||||
orig.Versioned.SchemaVersion = 2
|
||||
case schema2.Manifest:
|
||||
orig.Versioned = schema2.ManifestSchemaVersion
|
||||
orig.Config = ociM.Config
|
||||
orig.Layers = ociM.Layers
|
||||
rv.Set(reflect.ValueOf(orig))
|
||||
case ociv1.Manifest:
|
||||
case v1.Manifest:
|
||||
rv.Set(reflect.ValueOf(ociM))
|
||||
default:
|
||||
// Docker schema v1 will not be supported, can't resign, and no need for unsigned
|
||||
@ -375,7 +313,7 @@ func fromOrig(c common, orig interface{}) (Manifest, error) {
|
||||
if len(c.rawBody) == 0 {
|
||||
c.rawBody = mj
|
||||
}
|
||||
if _, ok := orig.(dockerSchema1.SignedManifest); !ok {
|
||||
if _, ok := orig.(schema1.SignedManifest); !ok {
|
||||
c.desc.Digest = digest.FromBytes(mj)
|
||||
}
|
||||
if c.desc.Size == 0 {
|
||||
@ -383,14 +321,14 @@ func fromOrig(c common, orig interface{}) (Manifest, error) {
|
||||
}
|
||||
// create manifest based on type
|
||||
switch mOrig := orig.(type) {
|
||||
case dockerSchema1.Manifest:
|
||||
case schema1.Manifest:
|
||||
mt = mOrig.MediaType
|
||||
c.desc.MediaType = types.MediaTypeDocker1Manifest
|
||||
m = &docker1Manifest{
|
||||
common: c,
|
||||
Manifest: mOrig,
|
||||
}
|
||||
case dockerSchema1.SignedManifest:
|
||||
case schema1.SignedManifest:
|
||||
mt = mOrig.MediaType
|
||||
c.desc.MediaType = types.MediaTypeDocker1ManifestSigned
|
||||
// recompute digest on the canonical data
|
||||
@ -399,33 +337,33 @@ func fromOrig(c common, orig interface{}) (Manifest, error) {
|
||||
common: c,
|
||||
SignedManifest: mOrig,
|
||||
}
|
||||
case dockerSchema2.Manifest:
|
||||
case schema2.Manifest:
|
||||
mt = mOrig.MediaType
|
||||
c.desc.MediaType = types.MediaTypeDocker2Manifest
|
||||
m = &docker2Manifest{
|
||||
common: c,
|
||||
Manifest: mOrig,
|
||||
}
|
||||
case dockerManifestList.ManifestList:
|
||||
case schema2.ManifestList:
|
||||
mt = mOrig.MediaType
|
||||
c.desc.MediaType = types.MediaTypeDocker2ManifestList
|
||||
m = &docker2ManifestList{
|
||||
common: c,
|
||||
ManifestList: mOrig,
|
||||
}
|
||||
case ociv1.Manifest:
|
||||
case v1.Manifest:
|
||||
mt = mOrig.MediaType
|
||||
c.desc.MediaType = types.MediaTypeOCI1Manifest
|
||||
m = &oci1Manifest{
|
||||
common: c,
|
||||
Manifest: mOrig,
|
||||
}
|
||||
case ociv1.Index:
|
||||
case v1.Index:
|
||||
mt = mOrig.MediaType
|
||||
c.desc.MediaType = types.MediaTypeOCI1ManifestList
|
||||
m = &oci1Index{
|
||||
common: c,
|
||||
Index: orig.(ociv1.Index),
|
||||
Index: orig.(v1.Index),
|
||||
}
|
||||
default:
|
||||
return nil, fmt.Errorf("unsupported type to convert to a manifest: %T", orig)
|
||||
@ -450,7 +388,7 @@ func fromCommon(c common) (Manifest, error) {
|
||||
// compute/verify digest
|
||||
if len(c.rawBody) > 0 {
|
||||
c.manifSet = true
|
||||
if c.desc.MediaType != MediaTypeDocker1ManifestSigned {
|
||||
if c.desc.MediaType != types.MediaTypeDocker1ManifestSigned {
|
||||
d := digest.FromBytes(c.rawBody)
|
||||
c.desc.Digest = d
|
||||
c.desc.Size = int64(len(c.rawBody))
|
||||
@ -473,15 +411,15 @@ func fromCommon(c common) (Manifest, error) {
|
||||
}
|
||||
}
|
||||
switch c.desc.MediaType {
|
||||
case MediaTypeDocker1Manifest:
|
||||
var mOrig dockerSchema1.Manifest
|
||||
case types.MediaTypeDocker1Manifest:
|
||||
var mOrig schema1.Manifest
|
||||
if len(c.rawBody) > 0 {
|
||||
err = json.Unmarshal(c.rawBody, &mOrig)
|
||||
mt = mOrig.MediaType
|
||||
}
|
||||
m = &docker1Manifest{common: c, Manifest: mOrig}
|
||||
case MediaTypeDocker1ManifestSigned:
|
||||
var mOrig dockerSchema1.SignedManifest
|
||||
case types.MediaTypeDocker1ManifestSigned:
|
||||
var mOrig schema1.SignedManifest
|
||||
if len(c.rawBody) > 0 {
|
||||
err = json.Unmarshal(c.rawBody, &mOrig)
|
||||
mt = mOrig.MediaType
|
||||
@ -490,29 +428,29 @@ func fromCommon(c common) (Manifest, error) {
|
||||
c.desc.Size = int64(len(mOrig.Canonical))
|
||||
}
|
||||
m = &docker1SignedManifest{common: c, SignedManifest: mOrig}
|
||||
case MediaTypeDocker2Manifest:
|
||||
var mOrig dockerSchema2.Manifest
|
||||
case types.MediaTypeDocker2Manifest:
|
||||
var mOrig schema2.Manifest
|
||||
if len(c.rawBody) > 0 {
|
||||
err = json.Unmarshal(c.rawBody, &mOrig)
|
||||
mt = mOrig.MediaType
|
||||
}
|
||||
m = &docker2Manifest{common: c, Manifest: mOrig}
|
||||
case MediaTypeDocker2ManifestList:
|
||||
var mOrig dockerManifestList.ManifestList
|
||||
case types.MediaTypeDocker2ManifestList:
|
||||
var mOrig schema2.ManifestList
|
||||
if len(c.rawBody) > 0 {
|
||||
err = json.Unmarshal(c.rawBody, &mOrig)
|
||||
mt = mOrig.MediaType
|
||||
}
|
||||
m = &docker2ManifestList{common: c, ManifestList: mOrig}
|
||||
case MediaTypeOCI1Manifest:
|
||||
var mOrig ociv1.Manifest
|
||||
case types.MediaTypeOCI1Manifest:
|
||||
var mOrig v1.Manifest
|
||||
if len(c.rawBody) > 0 {
|
||||
err = json.Unmarshal(c.rawBody, &mOrig)
|
||||
mt = mOrig.MediaType
|
||||
}
|
||||
m = &oci1Manifest{common: c, Manifest: mOrig}
|
||||
case MediaTypeOCI1ManifestList:
|
||||
var mOrig ociv1.Index
|
||||
case types.MediaTypeOCI1ManifestList:
|
||||
var mOrig v1.Index
|
||||
if len(c.rawBody) > 0 {
|
||||
err = json.Unmarshal(c.rawBody, &mOrig)
|
||||
mt = mOrig.MediaType
|
||||
@ -543,18 +481,20 @@ func verifyMT(expected, received string) error {
|
||||
return nil
|
||||
}
|
||||
|
||||
func getPlatformDesc(p *ociv1.Platform, dl []ociv1.Descriptor) (*ociv1.Descriptor, error) {
|
||||
platformCmp := platforms.NewMatcher(*p)
|
||||
func getPlatformDesc(p *platform.Platform, dl []types.Descriptor) (*types.Descriptor, error) {
|
||||
if p == nil {
|
||||
return nil, wraperr.New(fmt.Errorf("invalid input, platform is nil"), types.ErrNotFound)
|
||||
}
|
||||
for _, d := range dl {
|
||||
if d.Platform != nil && platformCmp.Match(*d.Platform) {
|
||||
if d.Platform != nil && platform.Match(*p, *d.Platform) {
|
||||
return &d, nil
|
||||
}
|
||||
}
|
||||
return nil, wraperr.New(fmt.Errorf("platform not found: %s", platforms.Format(*p)), types.ErrNotFound)
|
||||
return nil, wraperr.New(fmt.Errorf("platform not found: %s", *p), types.ErrNotFound)
|
||||
}
|
||||
|
||||
func getPlatformList(dl []ociv1.Descriptor) ([]*ociv1.Platform, error) {
|
||||
var l []*ociv1.Platform
|
||||
func getPlatformList(dl []types.Descriptor) ([]*platform.Platform, error) {
|
||||
var l []*platform.Platform
|
||||
for _, d := range dl {
|
||||
if d.Platform != nil {
|
||||
l = append(l, d.Platform)
|
||||
@ -562,35 +502,3 @@ func getPlatformList(dl []ociv1.Descriptor) ([]*ociv1.Platform, error) {
|
||||
}
|
||||
return l, nil
|
||||
}
|
||||
|
||||
func d2oDescriptor(sd dockerDistribution.Descriptor) *ociv1.Descriptor {
|
||||
return &ociv1.Descriptor{
|
||||
MediaType: sd.MediaType,
|
||||
Digest: sd.Digest,
|
||||
Size: sd.Size,
|
||||
URLs: sd.URLs,
|
||||
Annotations: sd.Annotations,
|
||||
Platform: sd.Platform,
|
||||
}
|
||||
}
|
||||
|
||||
func dl2oDescriptor(sd dockerManifestList.ManifestDescriptor) *ociv1.Descriptor {
|
||||
return &ociv1.Descriptor{
|
||||
MediaType: sd.MediaType,
|
||||
Digest: sd.Digest,
|
||||
Size: sd.Size,
|
||||
URLs: sd.URLs,
|
||||
Annotations: sd.Annotations,
|
||||
Platform: dlp2Platform(sd.Platform),
|
||||
}
|
||||
}
|
||||
|
||||
func dlp2Platform(sp dockerManifestList.PlatformSpec) *ociv1.Platform {
|
||||
return &ociv1.Platform{
|
||||
Architecture: sp.Architecture,
|
||||
OS: sp.OS,
|
||||
Variant: sp.Variant,
|
||||
OSVersion: sp.OSVersion,
|
||||
OSFeatures: sp.OSFeatures,
|
||||
}
|
||||
}
|
||||
|
||||
@ -7,12 +7,11 @@ import (
|
||||
"net/http"
|
||||
"testing"
|
||||
|
||||
dockerManifestList "github.com/docker/distribution/manifest/manifestlist"
|
||||
dockerSchema1 "github.com/docker/distribution/manifest/schema1"
|
||||
dockerSchema2 "github.com/docker/distribution/manifest/schema2"
|
||||
"github.com/opencontainers/go-digest"
|
||||
ociv1 "github.com/opencontainers/image-spec/specs-go/v1"
|
||||
"github.com/regclient/regclient/types"
|
||||
"github.com/regclient/regclient/types/docker/schema1"
|
||||
"github.com/regclient/regclient/types/docker/schema2"
|
||||
v1 "github.com/regclient/regclient/types/oci/v1"
|
||||
"github.com/regclient/regclient/types/ref"
|
||||
)
|
||||
|
||||
@ -293,8 +292,8 @@ var (
|
||||
|
||||
func TestNew(t *testing.T) {
|
||||
r, _ := ref.New("localhost:5000/test:latest")
|
||||
var manifestDockerSchema2, manifestInvalid dockerSchema2.Manifest
|
||||
var manifestDockerSchema1Signed dockerSchema1.SignedManifest
|
||||
var manifestDockerSchema2, manifestInvalid schema2.Manifest
|
||||
var manifestDockerSchema1Signed schema1.SignedManifest
|
||||
err := json.Unmarshal(rawDockerSchema2, &manifestDockerSchema2)
|
||||
if err != nil {
|
||||
t.Fatalf("failed to unmarshal docker schema2 json: %v", err)
|
||||
@ -312,7 +311,7 @@ func TestNew(t *testing.T) {
|
||||
name string
|
||||
opts []Opts
|
||||
wantR ref.Ref
|
||||
wantDesc ociv1.Descriptor
|
||||
wantDesc types.Descriptor
|
||||
wantE error
|
||||
}{
|
||||
{
|
||||
@ -323,13 +322,13 @@ func TestNew(t *testing.T) {
|
||||
name: "Docker Schema 2 Manifest",
|
||||
opts: []Opts{
|
||||
WithRef(r),
|
||||
WithDesc(ociv1.Descriptor{
|
||||
WithDesc(types.Descriptor{
|
||||
MediaType: types.MediaTypeDocker2Manifest,
|
||||
}),
|
||||
WithRaw(rawDockerSchema2),
|
||||
},
|
||||
wantR: r,
|
||||
wantDesc: ociv1.Descriptor{
|
||||
wantDesc: types.Descriptor{
|
||||
MediaType: types.MediaTypeDocker2Manifest,
|
||||
Size: int64(len(rawDockerSchema2)),
|
||||
Digest: digestDockerSchema2,
|
||||
@ -339,14 +338,14 @@ func TestNew(t *testing.T) {
|
||||
{
|
||||
name: "Docker Schema 2 Manifest full desc",
|
||||
opts: []Opts{
|
||||
WithDesc(ociv1.Descriptor{
|
||||
WithDesc(types.Descriptor{
|
||||
MediaType: types.MediaTypeDocker2Manifest,
|
||||
Digest: digestDockerSchema2,
|
||||
Size: int64(len(rawDockerSchema2)),
|
||||
}),
|
||||
WithRaw(rawDockerSchema2),
|
||||
},
|
||||
wantDesc: ociv1.Descriptor{
|
||||
wantDesc: types.Descriptor{
|
||||
MediaType: types.MediaTypeDocker2Manifest,
|
||||
Size: int64(len(rawDockerSchema2)),
|
||||
Digest: digestDockerSchema2,
|
||||
@ -370,7 +369,7 @@ func TestNew(t *testing.T) {
|
||||
opts: []Opts{
|
||||
WithRef(r),
|
||||
WithRaw(rawDockerSchema1Signed),
|
||||
WithDesc(ociv1.Descriptor{
|
||||
WithDesc(types.Descriptor{
|
||||
MediaType: types.MediaTypeDocker1ManifestSigned,
|
||||
}),
|
||||
},
|
||||
@ -380,7 +379,7 @@ func TestNew(t *testing.T) {
|
||||
name: "Docker Schema 1 Signed Manifest",
|
||||
opts: []Opts{
|
||||
WithRaw(rawDockerSchema1Signed),
|
||||
WithDesc(ociv1.Descriptor{
|
||||
WithDesc(types.Descriptor{
|
||||
MediaType: types.MediaTypeDocker1ManifestSigned,
|
||||
Digest: digestDockerSchema1Signed,
|
||||
Size: int64(len(rawDockerSchema1Signed)),
|
||||
@ -405,7 +404,7 @@ func TestNew(t *testing.T) {
|
||||
opts: []Opts{
|
||||
WithRef(r),
|
||||
WithRaw(rawAmbiguousOCI),
|
||||
WithDesc(ociv1.Descriptor{
|
||||
WithDesc(types.Descriptor{
|
||||
MediaType: types.MediaTypeOCI1Manifest,
|
||||
}),
|
||||
},
|
||||
@ -416,7 +415,7 @@ func TestNew(t *testing.T) {
|
||||
opts: []Opts{
|
||||
WithRef(r),
|
||||
WithRaw(rawAmbiguousOCI),
|
||||
WithDesc(ociv1.Descriptor{
|
||||
WithDesc(types.Descriptor{
|
||||
MediaType: types.MediaTypeOCI1ManifestList,
|
||||
}),
|
||||
},
|
||||
@ -427,7 +426,7 @@ func TestNew(t *testing.T) {
|
||||
opts: []Opts{
|
||||
WithRef(r),
|
||||
WithRaw(rawOCIImage),
|
||||
WithDesc(ociv1.Descriptor{
|
||||
WithDesc(types.Descriptor{
|
||||
MediaType: types.MediaTypeOCI1ManifestList,
|
||||
}),
|
||||
},
|
||||
@ -438,7 +437,7 @@ func TestNew(t *testing.T) {
|
||||
opts: []Opts{
|
||||
WithRef(r),
|
||||
WithRaw(rawOCIIndex),
|
||||
WithDesc(ociv1.Descriptor{
|
||||
WithDesc(types.Descriptor{
|
||||
MediaType: types.MediaTypeOCI1Manifest,
|
||||
}),
|
||||
},
|
||||
@ -449,7 +448,7 @@ func TestNew(t *testing.T) {
|
||||
opts: []Opts{
|
||||
WithRef(r),
|
||||
WithRaw(rawDockerSchema2),
|
||||
WithDesc(ociv1.Descriptor{
|
||||
WithDesc(types.Descriptor{
|
||||
MediaType: types.MediaTypeDocker2Manifest,
|
||||
Digest: digestInvalid,
|
||||
Size: int64(len(rawDockerSchema2)),
|
||||
@ -462,7 +461,7 @@ func TestNew(t *testing.T) {
|
||||
opts: []Opts{
|
||||
WithRef(r),
|
||||
WithRaw(rawOCIImage),
|
||||
WithDesc(ociv1.Descriptor{
|
||||
WithDesc(types.Descriptor{
|
||||
MediaType: types.MediaTypeOCI1ManifestList,
|
||||
Digest: digestOCIImage,
|
||||
Size: int64(len(rawOCIImage)),
|
||||
@ -531,7 +530,7 @@ func TestNew(t *testing.T) {
|
||||
|
||||
func TestModify(t *testing.T) {
|
||||
addDigest := digest.FromString("new layer digest")
|
||||
addDesc := ociv1.Descriptor{
|
||||
addDesc := types.Descriptor{
|
||||
Digest: addDigest,
|
||||
Size: 42,
|
||||
Annotations: map[string]string{
|
||||
@ -543,13 +542,13 @@ func TestModify(t *testing.T) {
|
||||
tests := []struct {
|
||||
name string
|
||||
opts []Opts
|
||||
addDesc ociv1.Descriptor
|
||||
origDesc ociv1.Descriptor
|
||||
addDesc types.Descriptor
|
||||
origDesc types.Descriptor
|
||||
}{
|
||||
{
|
||||
name: "Docker Schema 2 Manifest",
|
||||
opts: []Opts{
|
||||
WithDesc(ociv1.Descriptor{
|
||||
WithDesc(types.Descriptor{
|
||||
MediaType: types.MediaTypeDocker2Manifest,
|
||||
Digest: digestDockerSchema2,
|
||||
Size: int64(len(rawDockerSchema2)),
|
||||
@ -557,7 +556,7 @@ func TestModify(t *testing.T) {
|
||||
WithRaw(rawDockerSchema2),
|
||||
},
|
||||
addDesc: addDesc,
|
||||
origDesc: ociv1.Descriptor{
|
||||
origDesc: types.Descriptor{
|
||||
MediaType: types.MediaTypeDocker2Manifest,
|
||||
Digest: digestDockerSchema2,
|
||||
Size: int64(len(rawDockerSchema2)),
|
||||
@ -566,7 +565,7 @@ func TestModify(t *testing.T) {
|
||||
{
|
||||
name: "Docker Schema 2 List",
|
||||
opts: []Opts{
|
||||
WithDesc(ociv1.Descriptor{
|
||||
WithDesc(types.Descriptor{
|
||||
MediaType: types.MediaTypeDocker2ManifestList,
|
||||
Digest: digestDockerSchema2List,
|
||||
Size: int64(len(rawDockerSchema2List)),
|
||||
@ -574,7 +573,7 @@ func TestModify(t *testing.T) {
|
||||
WithRaw(rawDockerSchema2List),
|
||||
},
|
||||
addDesc: addDesc,
|
||||
origDesc: ociv1.Descriptor{
|
||||
origDesc: types.Descriptor{
|
||||
MediaType: types.MediaTypeDocker2ManifestList,
|
||||
Digest: digestDockerSchema2List,
|
||||
Size: int64(len(rawDockerSchema2List)),
|
||||
@ -584,14 +583,14 @@ func TestModify(t *testing.T) {
|
||||
name: "OCI Image",
|
||||
opts: []Opts{
|
||||
WithRaw(rawOCIImage),
|
||||
WithDesc(ociv1.Descriptor{
|
||||
WithDesc(types.Descriptor{
|
||||
MediaType: types.MediaTypeOCI1Manifest,
|
||||
Digest: digestOCIImage,
|
||||
Size: int64(len(rawOCIImage)),
|
||||
}),
|
||||
},
|
||||
addDesc: addDesc,
|
||||
origDesc: ociv1.Descriptor{
|
||||
origDesc: types.Descriptor{
|
||||
MediaType: types.MediaTypeOCI1Manifest,
|
||||
Digest: digestOCIImage,
|
||||
Size: int64(len(rawOCIImage)),
|
||||
@ -601,14 +600,14 @@ func TestModify(t *testing.T) {
|
||||
name: "OCI Index",
|
||||
opts: []Opts{
|
||||
WithRaw(rawOCIIndex),
|
||||
WithDesc(ociv1.Descriptor{
|
||||
WithDesc(types.Descriptor{
|
||||
MediaType: types.MediaTypeOCI1ManifestList,
|
||||
Digest: digestOCIIndex,
|
||||
Size: int64(len(rawOCIIndex)),
|
||||
}),
|
||||
},
|
||||
addDesc: addDesc,
|
||||
origDesc: ociv1.Descriptor{
|
||||
origDesc: types.Descriptor{
|
||||
MediaType: types.MediaTypeOCI1ManifestList,
|
||||
Digest: digestOCIIndex,
|
||||
Size: int64(len(rawOCIIndex)),
|
||||
@ -670,10 +669,10 @@ func TestModify(t *testing.T) {
|
||||
}
|
||||
|
||||
// Other test cases for error conditions
|
||||
var manifestDockerSchema2 dockerSchema2.Manifest
|
||||
var manifestDockerSchema2List dockerManifestList.ManifestList
|
||||
var manifestOCIImage ociv1.Manifest
|
||||
var manifestOCIIndex ociv1.Index
|
||||
var manifestDockerSchema2 schema2.Manifest
|
||||
var manifestDockerSchema2List schema2.ManifestList
|
||||
var manifestOCIImage v1.Manifest
|
||||
var manifestOCIIndex v1.Index
|
||||
err := json.Unmarshal(rawDockerSchema2, &manifestDockerSchema2)
|
||||
if err != nil {
|
||||
t.Errorf("failed to unmarshal docker schema2 json: %v", err)
|
||||
|
||||
@ -7,54 +7,54 @@ import (
|
||||
"strings"
|
||||
"text/tabwriter"
|
||||
|
||||
"github.com/containerd/containerd/platforms"
|
||||
digest "github.com/opencontainers/go-digest"
|
||||
ociv1 "github.com/opencontainers/image-spec/specs-go/v1"
|
||||
"github.com/regclient/regclient/internal/wraperr"
|
||||
"github.com/regclient/regclient/types"
|
||||
v1 "github.com/regclient/regclient/types/oci/v1"
|
||||
"github.com/regclient/regclient/types/platform"
|
||||
)
|
||||
|
||||
const (
|
||||
// MediaTypeOCI1Manifest OCI v1 manifest media type
|
||||
MediaTypeOCI1Manifest = ociv1.MediaTypeImageManifest
|
||||
MediaTypeOCI1Manifest = types.MediaTypeOCI1Manifest
|
||||
// MediaTypeOCI1ManifestList OCI v1 manifest list media type
|
||||
MediaTypeOCI1ManifestList = ociv1.MediaTypeImageIndex
|
||||
MediaTypeOCI1ManifestList = types.MediaTypeOCI1ManifestList
|
||||
)
|
||||
|
||||
type oci1Manifest struct {
|
||||
common
|
||||
ociv1.Manifest
|
||||
v1.Manifest
|
||||
}
|
||||
type oci1Index struct {
|
||||
common
|
||||
ociv1.Index
|
||||
v1.Index
|
||||
}
|
||||
|
||||
func (m *oci1Manifest) GetConfig() (ociv1.Descriptor, error) {
|
||||
func (m *oci1Manifest) GetConfig() (types.Descriptor, error) {
|
||||
return m.Config, nil
|
||||
}
|
||||
func (m *oci1Manifest) GetConfigDigest() (digest.Digest, error) {
|
||||
return m.Config.Digest, nil
|
||||
}
|
||||
func (m *oci1Index) GetConfig() (ociv1.Descriptor, error) {
|
||||
return ociv1.Descriptor{}, wraperr.New(fmt.Errorf("config digest not available for media type %s", m.desc.MediaType), types.ErrUnsupportedMediaType)
|
||||
func (m *oci1Index) GetConfig() (types.Descriptor, error) {
|
||||
return types.Descriptor{}, wraperr.New(fmt.Errorf("config digest not available for media type %s", m.desc.MediaType), types.ErrUnsupportedMediaType)
|
||||
}
|
||||
func (m *oci1Index) GetConfigDigest() (digest.Digest, error) {
|
||||
return "", wraperr.New(fmt.Errorf("config digest not available for media type %s", m.desc.MediaType), types.ErrUnsupportedMediaType)
|
||||
}
|
||||
|
||||
func (m *oci1Manifest) GetManifestList() ([]ociv1.Descriptor, error) {
|
||||
return []ociv1.Descriptor{}, wraperr.New(fmt.Errorf("platform descriptor list not available for media type %s", m.desc.MediaType), types.ErrUnsupportedMediaType)
|
||||
func (m *oci1Manifest) GetManifestList() ([]types.Descriptor, error) {
|
||||
return []types.Descriptor{}, wraperr.New(fmt.Errorf("platform descriptor list not available for media type %s", m.desc.MediaType), types.ErrUnsupportedMediaType)
|
||||
}
|
||||
func (m *oci1Index) GetManifestList() ([]ociv1.Descriptor, error) {
|
||||
func (m *oci1Index) GetManifestList() ([]types.Descriptor, error) {
|
||||
return m.Manifests, nil
|
||||
}
|
||||
|
||||
func (m *oci1Manifest) GetLayers() ([]ociv1.Descriptor, error) {
|
||||
func (m *oci1Manifest) GetLayers() ([]types.Descriptor, error) {
|
||||
return m.Layers, nil
|
||||
}
|
||||
func (m *oci1Index) GetLayers() ([]ociv1.Descriptor, error) {
|
||||
return []ociv1.Descriptor{}, wraperr.New(fmt.Errorf("layers are not available for media type %s", m.desc.MediaType), types.ErrUnsupportedMediaType)
|
||||
func (m *oci1Index) GetLayers() ([]types.Descriptor, error) {
|
||||
return []types.Descriptor{}, wraperr.New(fmt.Errorf("layers are not available for media type %s", m.desc.MediaType), types.ErrUnsupportedMediaType)
|
||||
}
|
||||
|
||||
func (m *oci1Manifest) GetOrig() interface{} {
|
||||
@ -64,10 +64,10 @@ func (m *oci1Index) GetOrig() interface{} {
|
||||
return m.Index
|
||||
}
|
||||
|
||||
func (m *oci1Manifest) GetPlatformDesc(p *ociv1.Platform) (*ociv1.Descriptor, error) {
|
||||
func (m *oci1Manifest) GetPlatformDesc(p *platform.Platform) (*types.Descriptor, error) {
|
||||
return nil, wraperr.New(fmt.Errorf("platform lookup not available for media type %s", m.desc.MediaType), types.ErrUnsupportedMediaType)
|
||||
}
|
||||
func (m *oci1Index) GetPlatformDesc(p *ociv1.Platform) (*ociv1.Descriptor, error) {
|
||||
func (m *oci1Index) GetPlatformDesc(p *platform.Platform) (*types.Descriptor, error) {
|
||||
dl, err := m.GetManifestList()
|
||||
if err != nil {
|
||||
return nil, err
|
||||
@ -75,10 +75,10 @@ func (m *oci1Index) GetPlatformDesc(p *ociv1.Platform) (*ociv1.Descriptor, error
|
||||
return getPlatformDesc(p, dl)
|
||||
}
|
||||
|
||||
func (m *oci1Manifest) GetPlatformList() ([]*ociv1.Platform, error) {
|
||||
func (m *oci1Manifest) GetPlatformList() ([]*platform.Platform, error) {
|
||||
return nil, wraperr.New(fmt.Errorf("platform list not available for media type %s", m.desc.MediaType), types.ErrUnsupportedMediaType)
|
||||
}
|
||||
func (m *oci1Index) GetPlatformList() ([]*ociv1.Platform, error) {
|
||||
func (m *oci1Index) GetPlatformList() ([]*platform.Platform, error) {
|
||||
dl, err := m.GetManifestList()
|
||||
if err != nil {
|
||||
return nil, err
|
||||
@ -148,7 +148,7 @@ func (m *oci1Index) MarshalPretty() ([]byte, error) {
|
||||
fmt.Fprintf(tw, " MediaType:\t%s\n", d.MediaType)
|
||||
if d.Platform != nil {
|
||||
if p := d.Platform; p.OS != "" {
|
||||
fmt.Fprintf(tw, " Platform:\t%s\n", platforms.Format(*p))
|
||||
fmt.Fprintf(tw, " Platform:\t%s\n", *p)
|
||||
if p.OSVersion != "" {
|
||||
fmt.Fprintf(tw, " OSVersion:\t%s\n", p.OSVersion)
|
||||
}
|
||||
@ -172,7 +172,7 @@ func (m *oci1Index) MarshalPretty() ([]byte, error) {
|
||||
}
|
||||
|
||||
func (m *oci1Manifest) SetOrig(origIn interface{}) error {
|
||||
orig, ok := origIn.(ociv1.Manifest)
|
||||
orig, ok := origIn.(v1.Manifest)
|
||||
if !ok {
|
||||
return types.ErrUnsupportedMediaType
|
||||
}
|
||||
@ -186,7 +186,7 @@ func (m *oci1Manifest) SetOrig(origIn interface{}) error {
|
||||
}
|
||||
m.manifSet = true
|
||||
m.rawBody = mj
|
||||
m.desc = ociv1.Descriptor{
|
||||
m.desc = types.Descriptor{
|
||||
MediaType: types.MediaTypeOCI1Manifest,
|
||||
Digest: digest.FromBytes(mj),
|
||||
Size: int64(len(mj)),
|
||||
@ -197,7 +197,7 @@ func (m *oci1Manifest) SetOrig(origIn interface{}) error {
|
||||
}
|
||||
|
||||
func (m *oci1Index) SetOrig(origIn interface{}) error {
|
||||
orig, ok := origIn.(ociv1.Index)
|
||||
orig, ok := origIn.(v1.Index)
|
||||
if !ok {
|
||||
return types.ErrUnsupportedMediaType
|
||||
}
|
||||
@ -211,7 +211,7 @@ func (m *oci1Index) SetOrig(origIn interface{}) error {
|
||||
}
|
||||
m.manifSet = true
|
||||
m.rawBody = mj
|
||||
m.desc = ociv1.Descriptor{
|
||||
m.desc = types.Descriptor{
|
||||
MediaType: types.MediaTypeOCI1ManifestList,
|
||||
Digest: digest.FromBytes(mj),
|
||||
Size: int64(len(mj)),
|
||||
|
||||
18
types/oci/doc.go
Normal file
18
types/oci/doc.go
Normal file
@ -0,0 +1,18 @@
|
||||
// Package oci defiles OCI image-spec types
|
||||
package oci
|
||||
|
||||
// Contents of this folder refer to types defined at <https://github.com/opencontainers/image-spec> with the following license:
|
||||
|
||||
// Copyright 2016 The Linux Foundation
|
||||
//
|
||||
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||
// you may not use this file except in compliance with the License.
|
||||
// You may obtain a copy of the License at
|
||||
//
|
||||
// http://www.apache.org/licenses/LICENSE-2.0
|
||||
//
|
||||
// Unless required by applicable law or agreed to in writing, software
|
||||
// distributed under the License is distributed on an "AS IS" BASIS,
|
||||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
18
types/oci/v1/doc.go
Normal file
18
types/oci/v1/doc.go
Normal file
@ -0,0 +1,18 @@
|
||||
// Package v1 defiles version 1 of OCI image-spec types
|
||||
package v1
|
||||
|
||||
// Contents of this folder refer to types defined at <https://github.com/opencontainers/image-spec> with the following license:
|
||||
|
||||
// Copyright 2016 The Linux Foundation
|
||||
//
|
||||
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||
// you may not use this file except in compliance with the License.
|
||||
// You may obtain a copy of the License at
|
||||
//
|
||||
// http://www.apache.org/licenses/LICENSE-2.0
|
||||
//
|
||||
// Unless required by applicable law or agreed to in writing, software
|
||||
// distributed under the License is distributed on an "AS IS" BASIS,
|
||||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
100
types/oci/v1/image.go
Normal file
100
types/oci/v1/image.go
Normal file
@ -0,0 +1,100 @@
|
||||
package v1
|
||||
|
||||
import (
|
||||
"time"
|
||||
|
||||
digest "github.com/opencontainers/go-digest"
|
||||
)
|
||||
|
||||
// ImageConfig defines the execution parameters which should be used as a base when running a container using an image.
|
||||
type ImageConfig struct {
|
||||
// User defines the username or UID which the process in the container should run as.
|
||||
User string `json:"User,omitempty"`
|
||||
|
||||
// ExposedPorts a set of ports to expose from a container running this image.
|
||||
ExposedPorts map[string]struct{} `json:"ExposedPorts,omitempty"`
|
||||
|
||||
// Env is a list of environment variables to be used in a container.
|
||||
Env []string `json:"Env,omitempty"`
|
||||
|
||||
// Entrypoint defines a list of arguments to use as the command to execute when the container starts.
|
||||
Entrypoint []string `json:"Entrypoint,omitempty"`
|
||||
|
||||
// Cmd defines the default arguments to the entrypoint of the container.
|
||||
Cmd []string `json:"Cmd,omitempty"`
|
||||
|
||||
// Volumes is a set of directories describing where the process is likely write data specific to a container instance.
|
||||
Volumes map[string]struct{} `json:"Volumes,omitempty"`
|
||||
|
||||
// WorkingDir sets the current working directory of the entrypoint process in the container.
|
||||
WorkingDir string `json:"WorkingDir,omitempty"`
|
||||
|
||||
// Labels contains arbitrary metadata for the container.
|
||||
Labels map[string]string `json:"Labels,omitempty"`
|
||||
|
||||
// StopSignal contains the system call signal that will be sent to the container to exit.
|
||||
StopSignal string `json:"StopSignal,omitempty"`
|
||||
}
|
||||
|
||||
// RootFS describes a layer content addresses
|
||||
type RootFS struct {
|
||||
// Type is the type of the rootfs.
|
||||
Type string `json:"type"`
|
||||
|
||||
// DiffIDs is an array of layer content hashes (DiffIDs), in order from bottom-most to top-most.
|
||||
DiffIDs []digest.Digest `json:"diff_ids"`
|
||||
}
|
||||
|
||||
// History describes the history of a layer.
|
||||
type History struct {
|
||||
// Created is the combined date and time at which the layer was created, formatted as defined by RFC 3339, section 5.6.
|
||||
Created *time.Time `json:"created,omitempty"`
|
||||
|
||||
// CreatedBy is the command which created the layer.
|
||||
CreatedBy string `json:"created_by,omitempty"`
|
||||
|
||||
// Author is the author of the build point.
|
||||
Author string `json:"author,omitempty"`
|
||||
|
||||
// Comment is a custom message set when creating the layer.
|
||||
Comment string `json:"comment,omitempty"`
|
||||
|
||||
// EmptyLayer is used to mark if the history item created a filesystem diff.
|
||||
EmptyLayer bool `json:"empty_layer,omitempty"`
|
||||
}
|
||||
|
||||
// Image is the JSON structure which describes some basic information about the image.
|
||||
// This provides the `application/vnd.oci.image.config.v1+json` mediatype when marshalled to JSON.
|
||||
type Image struct {
|
||||
// Created is the combined date and time at which the image was created, formatted as defined by RFC 3339, section 5.6.
|
||||
Created *time.Time `json:"created,omitempty"`
|
||||
|
||||
// Author defines the name and/or email address of the person or entity which created and is responsible for maintaining the image.
|
||||
Author string `json:"author,omitempty"`
|
||||
|
||||
// Architecture is the CPU architecture which the binaries in this image are built to run on.
|
||||
Architecture string `json:"architecture"`
|
||||
|
||||
// Variant is the variant of the specified CPU architecture which image binaries are intended to run on.
|
||||
Variant string `json:"variant,omitempty"`
|
||||
|
||||
// OS is the name of the operating system which the image is built to run on.
|
||||
OS string `json:"os"`
|
||||
|
||||
// OSVersion is an optional field specifying the operating system
|
||||
// version, for example on Windows `10.0.14393.1066`.
|
||||
OSVersion string `json:"os.version,omitempty"`
|
||||
|
||||
// OSFeatures is an optional field specifying an array of strings,
|
||||
// each listing a required OS feature (for example on Windows `win32k`).
|
||||
OSFeatures []string `json:"os.features,omitempty"`
|
||||
|
||||
// Config defines the execution parameters which should be used as a base when running a container using the image.
|
||||
Config ImageConfig `json:"config,omitempty"`
|
||||
|
||||
// RootFS references the layer content addresses used by the image.
|
||||
RootFS RootFS `json:"rootfs"`
|
||||
|
||||
// History describes the history of each layer.
|
||||
History []History `json:"history,omitempty"`
|
||||
}
|
||||
26
types/oci/v1/index.go
Normal file
26
types/oci/v1/index.go
Normal file
@ -0,0 +1,26 @@
|
||||
package v1
|
||||
|
||||
import (
|
||||
"github.com/regclient/regclient/types"
|
||||
"github.com/regclient/regclient/types/oci"
|
||||
)
|
||||
|
||||
// IndexSchemaVersion is a pre-configured versioned field for manifests
|
||||
var IndexSchemaVersion = oci.Versioned{
|
||||
SchemaVersion: 2,
|
||||
}
|
||||
|
||||
// Index references manifests for various platforms.
|
||||
// This structure provides `application/vnd.oci.image.index.v1+json` mediatype when marshalled to JSON.
|
||||
type Index struct {
|
||||
oci.Versioned
|
||||
|
||||
// MediaType specifies the type of this document data structure e.g. `application/vnd.oci.image.index.v1+json`
|
||||
MediaType string `json:"mediaType,omitempty"`
|
||||
|
||||
// Manifests references platform specific manifests.
|
||||
Manifests []types.Descriptor `json:"manifests"`
|
||||
|
||||
// Annotations contains arbitrary metadata for the image index.
|
||||
Annotations map[string]string `json:"annotations,omitempty"`
|
||||
}
|
||||
6
types/oci/v1/layout.go
Normal file
6
types/oci/v1/layout.go
Normal file
@ -0,0 +1,6 @@
|
||||
package v1
|
||||
|
||||
// ImageLayout is the structure in the "oci-layout" file, found in the root of an OCI Image-layout directory.
|
||||
type ImageLayout struct {
|
||||
Version string `json:"imageLayoutVersion"`
|
||||
}
|
||||
29
types/oci/v1/manifest.go
Normal file
29
types/oci/v1/manifest.go
Normal file
@ -0,0 +1,29 @@
|
||||
package v1
|
||||
|
||||
import (
|
||||
"github.com/regclient/regclient/types"
|
||||
"github.com/regclient/regclient/types/oci"
|
||||
)
|
||||
|
||||
// ManifestSchemaVersion is a pre-configured versioned field for manifests
|
||||
var ManifestSchemaVersion = oci.Versioned{
|
||||
SchemaVersion: 2,
|
||||
}
|
||||
|
||||
// Manifest defines an OCI image
|
||||
type Manifest struct {
|
||||
oci.Versioned
|
||||
|
||||
// MediaType specifies the type of this document data structure e.g. `application/vnd.oci.image.manifest.v1+json`
|
||||
MediaType string `json:"mediaType,omitempty"`
|
||||
|
||||
// Config references a configuration object for a container, by digest.
|
||||
// The referenced configuration object is a JSON blob that the runtime uses to set up the container.
|
||||
Config types.Descriptor `json:"config"`
|
||||
|
||||
// Layers is an indexed list of layers referenced by the manifest.
|
||||
Layers []types.Descriptor `json:"layers"`
|
||||
|
||||
// Annotations contains arbitrary metadata for the image manifest.
|
||||
Annotations map[string]string `json:"annotations,omitempty"`
|
||||
}
|
||||
8
types/oci/version.go
Normal file
8
types/oci/version.go
Normal file
@ -0,0 +1,8 @@
|
||||
// Package oci defines common settings for all OCI types
|
||||
package oci
|
||||
|
||||
// Versioned provides a struct with the manifest schemaVersion and mediaType.
|
||||
type Versioned struct {
|
||||
// SchemaVersion is the image manifest schema that this image follows
|
||||
SchemaVersion int `json:"schemaVersion"`
|
||||
}
|
||||
111
types/platform/cpuinfo.go
Normal file
111
types/platform/cpuinfo.go
Normal file
@ -0,0 +1,111 @@
|
||||
// base on: <https://github.com/containerd/containerd/blob/main/platforms/cpuinfo.go>
|
||||
/*
|
||||
Copyright The containerd Authors.
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
*/
|
||||
|
||||
package platform
|
||||
|
||||
import (
|
||||
"bufio"
|
||||
"os"
|
||||
"runtime"
|
||||
"strings"
|
||||
"sync"
|
||||
)
|
||||
|
||||
// Present the ARM instruction set architecture, eg: v7, v8
|
||||
// Don't use this value directly; call cpuVariant() instead.
|
||||
var cpuVariantValue string
|
||||
|
||||
var cpuVariantOnce sync.Once
|
||||
|
||||
func cpuVariant() string {
|
||||
cpuVariantOnce.Do(func() {
|
||||
switch runtime.GOARCH {
|
||||
case "arm", "arm64":
|
||||
cpuVariantValue = getCPUVariant()
|
||||
}
|
||||
})
|
||||
return cpuVariantValue
|
||||
}
|
||||
|
||||
// For Linux, the kernel has already detected the ABI, ISA and Features.
|
||||
// So we don't need to access the ARM registers to detect platform information
|
||||
// by ourselves. We can just parse these information from /proc/cpuinfo
|
||||
func getCPUInfo(pattern string) (info string) {
|
||||
if runtime.GOOS != "linux" {
|
||||
return ""
|
||||
}
|
||||
|
||||
cpuinfo, err := os.Open("/proc/cpuinfo")
|
||||
if err != nil {
|
||||
return ""
|
||||
}
|
||||
defer cpuinfo.Close()
|
||||
|
||||
// Start to Parse the Cpuinfo line by line. For SMP SoC, we parse
|
||||
// the first core is enough.
|
||||
scanner := bufio.NewScanner(cpuinfo)
|
||||
for scanner.Scan() {
|
||||
newline := scanner.Text()
|
||||
list := strings.Split(newline, ":")
|
||||
|
||||
if len(list) > 1 && strings.EqualFold(strings.TrimSpace(list[0]), pattern) {
|
||||
return strings.TrimSpace(list[1])
|
||||
}
|
||||
}
|
||||
return ""
|
||||
}
|
||||
|
||||
func getCPUVariant() string {
|
||||
if runtime.GOOS == "windows" || runtime.GOOS == "darwin" {
|
||||
// Windows/Darwin only supports v7 for ARM32 and v8 for ARM64 and so we can use
|
||||
// runtime.GOARCH to determine the variants
|
||||
switch runtime.GOARCH {
|
||||
case "arm64":
|
||||
return "v8"
|
||||
case "arm":
|
||||
return "v7"
|
||||
}
|
||||
return ""
|
||||
}
|
||||
|
||||
variant := getCPUInfo("Cpu architecture")
|
||||
|
||||
// handle edge case for Raspberry Pi ARMv6 devices (which due to a kernel quirk, report "CPU architecture: 7")
|
||||
// https://www.raspberrypi.org/forums/viewtopic.php?t=12614
|
||||
if runtime.GOARCH == "arm" && variant == "7" {
|
||||
model := getCPUInfo("model name")
|
||||
if strings.HasPrefix(strings.ToLower(model), "armv6-compatible") {
|
||||
variant = "6"
|
||||
}
|
||||
}
|
||||
|
||||
switch strings.ToLower(variant) {
|
||||
case "8", "aarch64":
|
||||
variant = "v8"
|
||||
case "7", "7m", "?(12)", "?(13)", "?(14)", "?(15)", "?(16)", "?(17)":
|
||||
variant = "v7"
|
||||
case "6", "6tej":
|
||||
variant = "v6"
|
||||
case "5", "5t", "5te", "5tej":
|
||||
variant = "v5"
|
||||
case "4", "4t":
|
||||
variant = "v4"
|
||||
case "3":
|
||||
variant = "v3"
|
||||
default:
|
||||
variant = ""
|
||||
}
|
||||
|
||||
return variant
|
||||
}
|
||||
190
types/platform/platform.go
Normal file
190
types/platform/platform.go
Normal file
@ -0,0 +1,190 @@
|
||||
// Package platform handles the parsing and comparing of the image platform (e.g. linux/amd64)
|
||||
package platform
|
||||
|
||||
// Some of the code in the package and all of the inspiration for this comes from <https://github.com/containerd/containerd>.
|
||||
// Their license is included here:
|
||||
/*
|
||||
Copyright The containerd Authors.
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
*/
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"path"
|
||||
"regexp"
|
||||
"runtime"
|
||||
"strings"
|
||||
)
|
||||
|
||||
var (
|
||||
partRE = regexp.MustCompile(`^[A-Za-z0-9_-]+$`)
|
||||
verRE = regexp.MustCompile(`^[A-Za-z0-9\._-]+$`)
|
||||
)
|
||||
|
||||
// Platform specifies a platform where a particular image manifest is applicable.
|
||||
type Platform struct {
|
||||
// Architecture field specifies the CPU architecture, for example `amd64` or `ppc64`.
|
||||
Architecture string `json:"architecture"`
|
||||
|
||||
// OS specifies the operating system, for example `linux` or `windows`.
|
||||
OS string `json:"os"`
|
||||
|
||||
// OSVersion is an optional field specifying the operating system version, for example `10.0.10586`.
|
||||
OSVersion string `json:"os.version,omitempty"`
|
||||
|
||||
// OSFeatures is an optional field specifying an array of strings, each listing a required OS feature (for example on Windows `win32k`).
|
||||
OSFeatures []string `json:"os.features,omitempty"`
|
||||
|
||||
// Variant is an optional field specifying a variant of the CPU, for example `ppc64le` to specify a little-endian version of a PowerPC CPU.
|
||||
Variant string `json:"variant,omitempty"`
|
||||
|
||||
// Features is an optional field specifying an array of strings, each listing a required CPU feature (for example `sse4` or `aes`).
|
||||
Features []string `json:"features,omitempty"`
|
||||
}
|
||||
|
||||
// String outputs the platform in the <os>/<arch>/<variant> notation
|
||||
func (p Platform) String() string {
|
||||
(&p).normalize()
|
||||
if p.OS == "" {
|
||||
return "unknown"
|
||||
} else if p.OS == "windows" {
|
||||
return path.Join(p.OS, p.Architecture, p.OSVersion)
|
||||
} else {
|
||||
return path.Join(p.OS, p.Architecture, p.Variant)
|
||||
}
|
||||
}
|
||||
|
||||
// Match indicates if two platforms are the same
|
||||
func Match(a, b Platform) bool {
|
||||
(&a).normalize()
|
||||
(&b).normalize()
|
||||
if a.OS != b.OS {
|
||||
return false
|
||||
}
|
||||
if a.OS == "linux" {
|
||||
return a.Architecture == b.Architecture && a.Variant == b.Variant
|
||||
} else if a.OS == "windows" {
|
||||
return a.Architecture == b.Architecture &&
|
||||
prefix(a.OSVersion) == prefix(b.OSVersion)
|
||||
} else {
|
||||
return a.Architecture == b.Architecture &&
|
||||
a.OSVersion == b.OSVersion &&
|
||||
strSliceEq(a.OSFeatures, b.OSFeatures) &&
|
||||
a.Variant == b.Variant &&
|
||||
strSliceEq(a.Features, b.Features)
|
||||
}
|
||||
}
|
||||
|
||||
// Parse converts a platform string into a struct
|
||||
func Parse(platStr string) (Platform, error) {
|
||||
// split on slash, validate each component
|
||||
platSplit := strings.Split(platStr, "/")
|
||||
for i, part := range platSplit {
|
||||
if i == 2 && platSplit[0] == "windows" {
|
||||
// TODO: (bmitch) this may not be officially allowed, but I can't find a decent reference for what it should be
|
||||
if !verRE.MatchString(part) {
|
||||
return Platform{}, fmt.Errorf("invalid platform component %s in %s", part, platStr)
|
||||
}
|
||||
} else if !partRE.MatchString(part) {
|
||||
return Platform{}, fmt.Errorf("invalid platform component %s in %s", part, platStr)
|
||||
}
|
||||
platSplit[i] = strings.ToLower(part)
|
||||
}
|
||||
plat := &Platform{}
|
||||
if len(platSplit) >= 1 {
|
||||
plat.OS = platSplit[0]
|
||||
}
|
||||
if len(platSplit) >= 2 {
|
||||
plat.Architecture = platSplit[1]
|
||||
}
|
||||
if len(platSplit) >= 3 {
|
||||
if plat.OS == "windows" {
|
||||
plat.OSVersion = platSplit[2]
|
||||
} else {
|
||||
plat.Variant = platSplit[2]
|
||||
}
|
||||
}
|
||||
// extrapolate missing fields and normalize
|
||||
platLocal := Local()
|
||||
if plat.OS == "" {
|
||||
// assume local OS
|
||||
plat.OS = platLocal.OS
|
||||
}
|
||||
switch plat.OS {
|
||||
case "macos":
|
||||
plat.OS = "darwin"
|
||||
}
|
||||
if len(platSplit) < 2 && plat.OS == runtime.GOOS {
|
||||
switch plat.OS {
|
||||
case "linux", "darwin":
|
||||
// automatically expand local architecture with recognized OS
|
||||
plat.Architecture = platLocal.Architecture
|
||||
case "windows":
|
||||
plat.Architecture = platLocal.Architecture
|
||||
plat.OSVersion = platLocal.OSVersion
|
||||
}
|
||||
}
|
||||
plat.normalize()
|
||||
|
||||
return *plat, nil
|
||||
}
|
||||
|
||||
func (p *Platform) normalize() {
|
||||
switch p.Architecture {
|
||||
case "i386":
|
||||
p.Architecture = "386"
|
||||
p.Variant = ""
|
||||
case "x86_64", "x86-64", "amd64":
|
||||
p.Architecture = "amd64"
|
||||
if p.Variant == "v1" {
|
||||
p.Variant = ""
|
||||
}
|
||||
case "aarch64", "arm64":
|
||||
p.Architecture = "arm64"
|
||||
switch p.Variant {
|
||||
case "8", "v8":
|
||||
p.Variant = ""
|
||||
}
|
||||
case "armhf":
|
||||
p.Architecture = "arm"
|
||||
p.Variant = "v7"
|
||||
case "armel":
|
||||
p.Architecture = "arm"
|
||||
p.Variant = "v6"
|
||||
case "arm":
|
||||
switch p.Variant {
|
||||
case "", "7":
|
||||
p.Variant = "v7"
|
||||
case "5", "6", "8":
|
||||
p.Variant = "v" + p.Variant
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func prefix(platVer string) string {
|
||||
verParts := strings.Split(platVer, ".")
|
||||
if len(verParts) < 4 {
|
||||
return platVer
|
||||
}
|
||||
return strings.Join(verParts[0:3], ".")
|
||||
}
|
||||
|
||||
func strSliceEq(a, b []string) bool {
|
||||
if len(a) != len(b) {
|
||||
return false
|
||||
}
|
||||
for i := range a {
|
||||
if a[i] != b[i] {
|
||||
return false
|
||||
}
|
||||
}
|
||||
return true
|
||||
}
|
||||
15
types/platform/platform_other.go
Normal file
15
types/platform/platform_other.go
Normal file
@ -0,0 +1,15 @@
|
||||
//go:build !windows
|
||||
// +build !windows
|
||||
|
||||
package platform
|
||||
|
||||
import "runtime"
|
||||
|
||||
// Local retrieves the local platform details
|
||||
func Local() Platform {
|
||||
return Platform{
|
||||
OS: runtime.GOOS,
|
||||
Architecture: runtime.GOARCH,
|
||||
Variant: cpuVariant(),
|
||||
}
|
||||
}
|
||||
177
types/platform/platform_test.go
Normal file
177
types/platform/platform_test.go
Normal file
@ -0,0 +1,177 @@
|
||||
package platform
|
||||
|
||||
import (
|
||||
"errors"
|
||||
"testing"
|
||||
)
|
||||
|
||||
func TestMatch(t *testing.T) {
|
||||
tests := []struct {
|
||||
name string
|
||||
a, b Platform
|
||||
expect bool
|
||||
}{
|
||||
{
|
||||
name: "linux match",
|
||||
a: Platform{OS: "linux", Architecture: "amd64"},
|
||||
b: Platform{OS: "linux", Architecture: "amd64"},
|
||||
expect: true,
|
||||
},
|
||||
{
|
||||
name: "linux arch",
|
||||
a: Platform{OS: "linux", Architecture: "amd64"},
|
||||
b: Platform{OS: "linux", Architecture: "arm64"},
|
||||
expect: false,
|
||||
},
|
||||
{
|
||||
name: "linux normalized",
|
||||
a: Platform{OS: "linux", Architecture: "arm64"},
|
||||
b: Platform{OS: "linux", Architecture: "arm64", Variant: "v8"},
|
||||
expect: true,
|
||||
},
|
||||
{
|
||||
name: "linux variant",
|
||||
a: Platform{OS: "linux", Architecture: "arm", Variant: "v6"},
|
||||
b: Platform{OS: "linux", Architecture: "arm", Variant: "v7"},
|
||||
expect: false,
|
||||
},
|
||||
{
|
||||
name: "windows match",
|
||||
a: Platform{OS: "windows", Architecture: "amd64", OSVersion: "10.0.17763.2114"},
|
||||
b: Platform{OS: "windows", Architecture: "amd64", OSVersion: "10.0.17763.2114"},
|
||||
expect: true,
|
||||
},
|
||||
{
|
||||
name: "windows patch",
|
||||
a: Platform{OS: "windows", Architecture: "amd64", OSVersion: "10.0.17763.2014"},
|
||||
b: Platform{OS: "windows", Architecture: "amd64", OSVersion: "10.0.17763.2114"},
|
||||
expect: true,
|
||||
},
|
||||
{
|
||||
name: "windows minor",
|
||||
a: Platform{OS: "windows", Architecture: "amd64", OSVersion: "10.0.14393.4583"},
|
||||
b: Platform{OS: "windows", Architecture: "amd64", OSVersion: "10.0.17763.2114"},
|
||||
expect: false,
|
||||
},
|
||||
{
|
||||
name: "other",
|
||||
a: Platform{OS: "other", Architecture: "amd64", Variant: "42"},
|
||||
b: Platform{OS: "other", Architecture: "amd64", Variant: "42"},
|
||||
expect: true,
|
||||
},
|
||||
{
|
||||
name: "other variant",
|
||||
a: Platform{OS: "other", Architecture: "amd64", Variant: "42"},
|
||||
b: Platform{OS: "other", Architecture: "amd64", Variant: "45"},
|
||||
expect: false,
|
||||
},
|
||||
}
|
||||
for _, tt := range tests {
|
||||
t.Run(tt.name, func(t *testing.T) {
|
||||
result := Match(tt.a, tt.b)
|
||||
if result != tt.expect {
|
||||
t.Errorf("unexpected match, result: %v, a: %v, b: %v", result, tt.a, tt.b)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func TestPlatformParse(t *testing.T) {
|
||||
tests := []struct {
|
||||
name string
|
||||
parse string
|
||||
goal Platform
|
||||
wantErr error
|
||||
}{
|
||||
{
|
||||
name: "linux amd64",
|
||||
parse: "linux/amd64",
|
||||
goal: Platform{OS: "linux", Architecture: "amd64"},
|
||||
},
|
||||
{
|
||||
name: "linux arm/v5",
|
||||
parse: "linux/arm/v5",
|
||||
goal: Platform{OS: "linux", Architecture: "arm", Variant: "v5"},
|
||||
},
|
||||
{
|
||||
name: "linux arm/v6",
|
||||
parse: "linux/arm/v6",
|
||||
goal: Platform{OS: "linux", Architecture: "arm", Variant: "v6"},
|
||||
},
|
||||
{
|
||||
name: "linux arm/v7",
|
||||
parse: "linux/arm/v7",
|
||||
goal: Platform{OS: "linux", Architecture: "arm", Variant: "v7"},
|
||||
},
|
||||
{
|
||||
name: "linux arm64/v8",
|
||||
parse: "linux/arm64",
|
||||
goal: Platform{OS: "linux", Architecture: "arm64", Variant: "v8"},
|
||||
},
|
||||
{
|
||||
name: "windows amd64/10.0.14393",
|
||||
parse: "windows/amd64/10.0.14393.4583",
|
||||
goal: Platform{OS: "windows", Architecture: "amd64", OSVersion: "10.0.14393.4583"},
|
||||
},
|
||||
}
|
||||
for _, tt := range tests {
|
||||
t.Run(tt.name, func(t *testing.T) {
|
||||
p, err := Parse(tt.parse)
|
||||
if tt.wantErr != nil {
|
||||
if !errors.Is(err, tt.wantErr) && err.Error() != tt.wantErr.Error() {
|
||||
t.Errorf("unexpected error, want %v, received %v", tt.wantErr, err)
|
||||
}
|
||||
return
|
||||
}
|
||||
if err != nil {
|
||||
t.Errorf("unexpected error: %v", err)
|
||||
return
|
||||
}
|
||||
if !Match(p, tt.goal) {
|
||||
t.Errorf("platform did not match, want %v, received %v", tt.goal, p)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func TestPlatformString(t *testing.T) {
|
||||
tests := []struct {
|
||||
name string
|
||||
goal string
|
||||
p Platform
|
||||
}{
|
||||
{
|
||||
name: "linux/amd64",
|
||||
p: Platform{OS: "linux", Architecture: "amd64"},
|
||||
goal: "linux/amd64",
|
||||
},
|
||||
{
|
||||
name: "linux/arm64",
|
||||
p: Platform{OS: "linux", Architecture: "arm64"},
|
||||
goal: "linux/arm64",
|
||||
},
|
||||
{
|
||||
name: "linux/arm64/v8",
|
||||
p: Platform{OS: "linux", Architecture: "arm64", Variant: "v8"},
|
||||
goal: "linux/arm64",
|
||||
},
|
||||
{
|
||||
name: "linux/arm/v7",
|
||||
p: Platform{OS: "linux", Architecture: "arm", Variant: "v7"},
|
||||
goal: "linux/arm/v7",
|
||||
},
|
||||
{
|
||||
name: "windows/amd64/10.0.17763.2114",
|
||||
p: Platform{OS: "windows", Architecture: "amd64", OSVersion: "10.0.17763.2114"},
|
||||
goal: "windows/amd64/10.0.17763.2114",
|
||||
},
|
||||
}
|
||||
for _, tt := range tests {
|
||||
t.Run(tt.name, func(t *testing.T) {
|
||||
result := tt.p.String()
|
||||
if result != tt.goal {
|
||||
t.Errorf("string did not match, expected %s, received %s", tt.goal, result)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
22
types/platform/platform_windows.go
Normal file
22
types/platform/platform_windows.go
Normal file
@ -0,0 +1,22 @@
|
||||
//go:build windows
|
||||
// +build windows
|
||||
|
||||
package platform
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"runtime"
|
||||
|
||||
"golang.org/x/sys/windows"
|
||||
)
|
||||
|
||||
// Local retrieves the local platform details
|
||||
func Local() Platform {
|
||||
major, minor, build := windows.RtlGetNtVersionNumbers()
|
||||
return Platform{
|
||||
OS: runtime.GOOS,
|
||||
Architecture: runtime.GOARCH,
|
||||
Variant: cpuVariant(),
|
||||
OSVersion: fmt.Sprintf("%d.%d.%d", major, minor, build),
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user