diff --git a/api/go.sum b/api/go.sum index f1e7b630a..9c0474872 100644 --- a/api/go.sum +++ b/api/go.sum @@ -141,6 +141,8 @@ golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20191002063906-3421d5a6bb1c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/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-20210510120138-977fb7262007 h1:gG67DSER+11cZvqIMb8S8bt0vZtiN6xWYARwirrOSfE= golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= diff --git a/api/internal/target/kusttarget.go b/api/internal/target/kusttarget.go index c3d4ecc6f..4bbf7e98a 100644 --- a/api/internal/target/kusttarget.go +++ b/api/internal/target/kusttarget.go @@ -407,7 +407,7 @@ func (kt *KustTarget) accumulateResources( // try loading resource as file then as base (directory or git repository) if errF := kt.accumulateFile(ra, path); errF != nil { // not much we can do if the error is an HTTP error so we bail out - if errors.Is(errF, load.ErrorHTTP) { + if errors.Is(errF, load.ErrHTTP) { return nil, errF } ldr, err := kt.ldr.New(path) diff --git a/api/krusty/component_test.go b/api/krusty/component_test.go index 8d83b56ab..f88ec4592 100644 --- a/api/krusty/component_test.go +++ b/api/krusty/component_test.go @@ -9,6 +9,7 @@ import ( "testing" "sigs.k8s.io/kustomize/api/konfig" + "sigs.k8s.io/kustomize/api/loader" kusttest_test "sigs.k8s.io/kustomize/api/testutils/kusttest" ) @@ -551,7 +552,7 @@ components: `), }, runPath: "filesincomponents", - expectedError: "'/filesincomponents/stub.yaml' must be a directory so that it can used as a build root", + expectedError: fmt.Sprintf("%s: '%s'", loader.ErrRtNotDir.Error(), "/filesincomponents/stub.yaml"), }, "invalid-component-api-version": { input: []FileGen{writeTestBase, writeOverlayProd, diff --git a/api/krusty/remoteload_test.go b/api/krusty/remoteload_test.go index fb033bfd1..376e972d7 100644 --- a/api/krusty/remoteload_test.go +++ b/api/krusty/remoteload_test.go @@ -323,7 +323,7 @@ func TestRemoteResourceWithHttpError(t *testing.T) { _, err := b.Run(fSys, tmpDir.String()) - httpErr := fmt.Errorf("%w: status code %d (%s)", loader.ErrorHTTP, 404, http.StatusText(404)) + httpErr := fmt.Errorf("%w: status code %d (%s)", loader.ErrHTTP, 404, http.StatusText(404)) accuFromErr := fmt.Errorf("accumulating resources from '%s': %w", url404, httpErr) expectedErr := fmt.Errorf("accumulating resources: %w", accuFromErr) req.EqualErrorf(err, expectedErr.Error(), url404) diff --git a/api/krusty/testdata/localize/remote/hpa.yaml b/api/krusty/testdata/localize/remote/hpa.yaml new file mode 100644 index 000000000..7b429802e --- /dev/null +++ b/api/krusty/testdata/localize/remote/hpa.yaml @@ -0,0 +1,11 @@ +apiVersion: autoscaling/v2 +kind: HorizontalPodAutoscaler +metadata: + name: hpa-deployment +spec: + scaleTargetRef: + apiVersion: apps/v1 + kind: Deployment + name: localize-test-deployment-simple + minReplicas: 1 + maxReplicas: 10 \ No newline at end of file diff --git a/api/krusty/testdata/localize/remote/kustomization.yaml b/api/krusty/testdata/localize/remote/kustomization.yaml new file mode 100644 index 000000000..58807f0a2 --- /dev/null +++ b/api/krusty/testdata/localize/remote/kustomization.yaml @@ -0,0 +1,9 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization + +resources: + - https://github.com/kubernetes-sigs/kustomize//api/krusty/testdata/localize/simple?ref=kustomize/v4.5.5 + - hpa.yaml + +commonLabels: + purpose: remoteReference \ No newline at end of file diff --git a/api/loader/errors.go b/api/loader/errors.go index 1942091e4..2463debdb 100644 --- a/api/loader/errors.go +++ b/api/loader/errors.go @@ -3,6 +3,9 @@ package loader -import "fmt" +import "sigs.k8s.io/kustomize/kyaml/errors" -var ErrorHTTP = fmt.Errorf("HTTP Error") +var ( + ErrHTTP = errors.Errorf("HTTP Error") + ErrRtNotDir = errors.Errorf("must build at directory") +) diff --git a/api/loader/fileloader.go b/api/loader/fileloader.go index 793b82c82..3201e8509 100644 --- a/api/loader/fileloader.go +++ b/api/loader/fileloader.go @@ -4,7 +4,6 @@ package loader import ( - "errors" "fmt" "io/ioutil" "log" @@ -15,6 +14,7 @@ import ( "sigs.k8s.io/kustomize/api/ifc" "sigs.k8s.io/kustomize/api/internal/git" + "sigs.k8s.io/kustomize/kyaml/errors" "sigs.k8s.io/kustomize/kyaml/filesys" ) @@ -123,7 +123,7 @@ func (fl *fileLoader) Root() string { func newLoaderOrDie( lr LoadRestrictorFunc, fSys filesys.FileSystem, path string) *fileLoader { - root, err := demandDirectoryRoot(fSys, path) + root, err := filesys.ConfirmDir(fSys, path) if err != nil { log.Fatalf("unable to make loader at '%s'; %v", path, err) } @@ -146,30 +146,11 @@ func newLoaderAtConfirmedDir( } } -// Assure that the given path is in fact a directory. -func demandDirectoryRoot( - fSys filesys.FileSystem, path string) (filesys.ConfirmedDir, error) { - if path == "" { - return "", fmt.Errorf( - "loader root cannot be empty") - } - d, f, err := fSys.CleanedAbs(path) - if err != nil { - return "", err - } - if f != "" { - return "", fmt.Errorf( - "'%s' must be a directory so that it can used as a build root", - path) - } - return d, nil -} - // New returns a new Loader, rooted relative to current loader, // or rooted in a temp directory holding a git repo clone. func (fl *fileLoader) New(path string) (ifc.Loader, error) { if path == "" { - return nil, fmt.Errorf("new root cannot be empty") + return nil, errors.Errorf("new root cannot be empty") } repoSpec, err := git.NewRepoSpecFromURL(path) @@ -185,9 +166,9 @@ func (fl *fileLoader) New(path string) (ifc.Loader, error) { if filepath.IsAbs(path) { return nil, fmt.Errorf("new root '%s' cannot be absolute", path) } - root, err := demandDirectoryRoot(fl.fSys, fl.root.Join(path)) + root, err := filesys.ConfirmDir(fl.fSys, fl.root.Join(path)) if err != nil { - return nil, err + return nil, errors.WrapPrefixf(err, ErrRtNotDir.Error()) } if err = fl.errIfGitContainmentViolation(root); err != nil { return nil, err @@ -317,9 +298,9 @@ func (fl *fileLoader) Load(path string) ([]byte, error) { if resp.StatusCode < 200 || resp.StatusCode > 299 { _, err := git.NewRepoSpecFromURL(path) if err == nil { - return nil, errors.New("URL is a git repository") + return nil, errors.Errorf("URL is a git repository") } - return nil, fmt.Errorf("%w: status code %d (%s)", ErrorHTTP, resp.StatusCode, http.StatusText(resp.StatusCode)) + return nil, fmt.Errorf("%w: status code %d (%s)", ErrHTTP, resp.StatusCode, http.StatusText(resp.StatusCode)) } body, err := ioutil.ReadAll(resp.Body) if err != nil { diff --git a/api/loader/fileloader_test.go b/api/loader/fileloader_test.go index c83dc816c..84a589d19 100644 --- a/api/loader/fileloader_test.go +++ b/api/loader/fileloader_test.go @@ -15,7 +15,6 @@ import ( "testing" "github.com/stretchr/testify/require" - "sigs.k8s.io/kustomize/api/ifc" "sigs.k8s.io/kustomize/api/internal/git" "sigs.k8s.io/kustomize/api/konfig" @@ -408,11 +407,8 @@ func TestLocalLoaderReferencingGitBase(t *testing.T) { fSys.MkdirAll(topDir) fSys.MkdirAll(cloneRoot + "/foo/base") - root, err := demandDirectoryRoot(fSys, topDir) - require.NoError(err) - l1 := newLoaderAtConfirmedDir( - RestrictionRootOnly, root, fSys, nil, + RestrictionRootOnly, filesys.ConfirmedDir(topDir), fSys, nil, git.DoNothingCloner(filesys.ConfirmedDir(cloneRoot))) require.Equal(topDir, l1.Root()) @@ -430,11 +426,8 @@ func TestRepoDirectCycleDetection(t *testing.T) { fSys.MkdirAll(topDir) fSys.MkdirAll(cloneRoot) - root, err := demandDirectoryRoot(fSys, topDir) - require.NoError(err) - l1 := newLoaderAtConfirmedDir( - RestrictionRootOnly, root, fSys, nil, + RestrictionRootOnly, filesys.ConfirmedDir(topDir), fSys, nil, git.DoNothingCloner(filesys.ConfirmedDir(cloneRoot))) p1 := "github.com/someOrg/someRepo/foo" rs1, err := git.NewRepoSpecFromURL(p1) @@ -455,11 +448,8 @@ func TestRepoIndirectCycleDetection(t *testing.T) { fSys.MkdirAll(topDir) fSys.MkdirAll(cloneRoot) - root, err := demandDirectoryRoot(fSys, topDir) - require.NoError(err) - l0 := newLoaderAtConfirmedDir( - RestrictionRootOnly, root, fSys, nil, + RestrictionRootOnly, filesys.ConfirmedDir(topDir), fSys, nil, git.DoNothingCloner(filesys.ConfirmedDir(cloneRoot))) p1 := "github.com/someOrg/someRepo1" diff --git a/api/loader/loader.go b/api/loader/loader.go index 17dbad897..e10885b9b 100644 --- a/api/loader/loader.go +++ b/api/loader/loader.go @@ -7,6 +7,7 @@ package loader import ( "sigs.k8s.io/kustomize/api/ifc" "sigs.k8s.io/kustomize/api/internal/git" + "sigs.k8s.io/kustomize/kyaml/errors" "sigs.k8s.io/kustomize/kyaml/filesys" ) @@ -25,9 +26,9 @@ func NewLoader( return newLoaderAtGitClone( repoSpec, fSys, nil, git.ClonerUsingGitExec) } - root, err := demandDirectoryRoot(fSys, target) + root, err := filesys.ConfirmDir(fSys, target) if err != nil { - return nil, err + return nil, errors.WrapPrefixf(err, ErrRtNotDir.Error()) } return newLoaderAtConfirmedDir( lr, root, fSys, nil, git.ClonerUsingGitExec), nil diff --git a/cmd/config/go.sum b/cmd/config/go.sum index c02d6e526..edafe215c 100644 --- a/cmd/config/go.sum +++ b/cmd/config/go.sum @@ -448,6 +448,7 @@ golang.org/x/sys v0.0.0-20210315160823-c6e025ad8005/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/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-20210510120138-977fb7262007 h1:gG67DSER+11cZvqIMb8S8bt0vZtiN6xWYARwirrOSfE= golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= diff --git a/cmd/pluginator/go.sum b/cmd/pluginator/go.sum index a1ba36f19..3e498606b 100644 --- a/cmd/pluginator/go.sum +++ b/cmd/pluginator/go.sum @@ -445,6 +445,7 @@ golang.org/x/sys v0.0.0-20210315160823-c6e025ad8005/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/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-20210510120138-977fb7262007 h1:gG67DSER+11cZvqIMb8S8bt0vZtiN6xWYARwirrOSfE= golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= diff --git a/kustomize/go.sum b/kustomize/go.sum index 7e047bd94..0cfcfbde8 100644 --- a/kustomize/go.sum +++ b/kustomize/go.sum @@ -454,6 +454,7 @@ golang.org/x/sys v0.0.0-20210315160823-c6e025ad8005/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/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-20210510120138-977fb7262007 h1:gG67DSER+11cZvqIMb8S8bt0vZtiN6xWYARwirrOSfE= golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= diff --git a/kyaml/filesys/filesystem.go b/kyaml/filesys/filesystem.go index 53e0f1921..79dfc53bf 100644 --- a/kyaml/filesys/filesystem.go +++ b/kyaml/filesys/filesystem.go @@ -4,7 +4,10 @@ package filesys import ( + "fmt" "path/filepath" + + "sigs.k8s.io/kustomize/kyaml/errors" ) const ( @@ -16,40 +19,70 @@ const ( // FileSystem groups basic os filesystem methods. // It's supposed be functional subset of https://golang.org/pkg/os type FileSystem interface { + // Create a file. Create(path string) (File, error) + // MkDir makes a directory. Mkdir(path string) error + // MkDirAll makes a directory path, creating intervening directories. MkdirAll(path string) error + // RemoveAll removes path and any children it contains. RemoveAll(path string) error + // Open opens the named file for reading. Open(path string) (File, error) + // IsDir returns true if the path is a directory. IsDir(path string) bool + // ReadDir returns a list of files and directories within a directory. ReadDir(path string) ([]string, error) + // CleanedAbs converts the given path into a // directory and a file name, where the directory // is represented as a ConfirmedDir and all that implies. // If the entire path is a directory, the file component // is an empty string. CleanedAbs(path string) (ConfirmedDir, string, error) + // Exists is true if the path exists in the file system. Exists(path string) bool + // Glob returns the list of matching files, // emulating https://golang.org/pkg/path/filepath/#Glob Glob(pattern string) ([]string, error) + // ReadFile returns the contents of the file at the given path. ReadFile(path string) ([]byte, error) + // WriteFile writes the data to a file at the given path, // overwriting anything that's already there. WriteFile(path string, data []byte) error + // Walk walks the file system with the given WalkFunc. Walk(path string, walkFn filepath.WalkFunc) error } +// ConfirmDir returns an error if the user-specified path is not an existing directory on fSys. +// Otherwise, ConfirmDir returns path, which can be relative, as a ConfirmedDir and all that implies. +func ConfirmDir(fSys FileSystem, path string) (ConfirmedDir, error) { + if path == "" { + return "", errors.Errorf("directory path cannot be empty") + } + + d, f, err := fSys.CleanedAbs(path) + if err != nil { + return "", errors.WrapPrefixf(err, "not a valid directory") + } + if f != "" { + return "", errors.WrapPrefixf(errors.Errorf("file is not directory"), fmt.Sprintf("'%s'", path)) + } + return d, nil +} + // FileSystemOrOnDisk satisfies the FileSystem interface by forwarding // all of its method calls to the given FileSystem whenever it's not nil. // If it's nil, the call is forwarded to the OS's underlying file system. diff --git a/kyaml/filesys/filesystem_test.go b/kyaml/filesys/filesystem_test.go index a84943c96..418217153 100644 --- a/kyaml/filesys/filesystem_test.go +++ b/kyaml/filesys/filesystem_test.go @@ -5,16 +5,26 @@ package filesys import ( "os" + "path/filepath" "testing" "github.com/pkg/errors" "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" +) + +const ( + disk = "MakeFsOnDisk" + memoryAbs = "MakeFsInMemory" + memoryEmpty = "MakeEmptyDirInMemory" + + existMsg = "expected '%s' to exist" ) var filesysBuilders = map[string]func() FileSystem{ - "MakeFsInMemory": MakeFsInMemory, - "MakeFsOnDisk": MakeFsOnDisk, - "MakeEmptyDirInMemory": func() FileSystem { return MakeEmptyDirInMemory() }, + memoryAbs: MakeFsInMemory, + disk: MakeFsOnDisk, + memoryEmpty: func() FileSystem { return MakeEmptyDirInMemory() }, } func TestNotExistErr(t *testing.T) { @@ -42,3 +52,89 @@ func testNotExistErr(t *testing.T, fs FileSystem) { err = fs.Walk(path, func(_ string, _ os.FileInfo, err error) error { return err }) assert.Truef(t, errors.Is(err, os.ErrNotExist), "Walk should return ErrNotExist, got %v", err) } + +// setupFileSys returns file system, default directory to test in, and working directory +func setupFileSys(t *testing.T, name string) (FileSystem, string, string) { + t.Helper() + + switch name { + case disk: + fSys, testDir := makeTestDir(t) + return fSys, testDir, cleanWd(t) + case memoryAbs: + return filesysBuilders[name](), Separator, Separator + case memoryEmpty: + return filesysBuilders[name](), "", "" + default: + t.Fatalf("unexpected FileSystem implementation '%s'", name) + panic("unreachable point of execution") + } +} + +func TestConfirmDir(t *testing.T) { + for name := range filesysBuilders { + name := name + t.Run(name, func(t *testing.T) { + fSys, prefixPath, wd := setupFileSys(t, name) + + d1Path := filepath.Join(prefixPath, "d1") + d2Path := filepath.Join(d1Path, ".d2") + err := fSys.MkdirAll(d2Path) + require.NoError(t, err) + require.Truef(t, fSys.Exists(d2Path), existMsg, d2Path) + + tests := map[string]*struct { + dir string + expected string + }{ + "Simple": { + d1Path, + d1Path, + }, + "Hidden": { + d2Path, + d2Path, + }, + "Relative": { + SelfDir, + wd, + }, + } + for subName, test := range tests { + test := test + t.Run(subName, func(t *testing.T) { + cleanDir, err := ConfirmDir(fSys, test.dir) + require.NoError(t, err) + require.Equal(t, test.expected, cleanDir.String()) + }) + } + }) + } +} + +func TestConfirmDirErr(t *testing.T) { + for name := range filesysBuilders { + thisName := name + t.Run(thisName, func(t *testing.T) { + fSys, prefixPath, _ := setupFileSys(t, thisName) + + fPath := filepath.Join(prefixPath, "foo") + err := fSys.WriteFile(fPath, []byte(`foo`)) + require.NoError(t, err) + require.Truef(t, fSys.Exists(fPath), existMsg, fPath) + + tests := map[string]string{ + "Empty": "", + "File": fPath, + "Non-existent": filepath.Join(prefixPath, "bar"), + } + for subName, invalidPath := range tests { + invalidPath := invalidPath + t.Run(subName, func(t *testing.T) { + _, err := ConfirmDir(fSys, invalidPath) + require.Error(t, err) + }) + } + }) + } +} diff --git a/kyaml/filesys/fsnode.go b/kyaml/filesys/fsnode.go index 7b84b5118..a5574b561 100644 --- a/kyaml/filesys/fsnode.go +++ b/kyaml/filesys/fsnode.go @@ -14,7 +14,7 @@ import ( "sort" "strings" - "github.com/pkg/errors" + "sigs.k8s.io/kustomize/kyaml/errors" ) var _ File = &fsNode{} @@ -232,7 +232,7 @@ func (n *fsNode) AddDir(path string) (result *fsNode, err error) { func (n *fsNode) CleanedAbs(path string) (ConfirmedDir, string, error) { node, err := n.Find(path) if err != nil { - return "", "", errors.Wrap(err, "unable to clean") + return "", "", errors.WrapPrefixf(err, "unable to clean") } if node == nil { return "", "", notExistError(path) diff --git a/kyaml/filesys/fsnode_test.go b/kyaml/filesys/fsnode_test.go index b880f1bce..917c05beb 100644 --- a/kyaml/filesys/fsnode_test.go +++ b/kyaml/filesys/fsnode_test.go @@ -16,6 +16,8 @@ import ( "sort" "strings" "testing" + + "github.com/stretchr/testify/require" ) const content = ` @@ -840,6 +842,32 @@ func TestCleanedAbs(t *testing.T) { } } +func TestConfirmDirMemRoot(t *testing.T) { + fSys := MakeFsInMemory() + actual, err := ConfirmDir(fSys, Separator) + require.NoError(t, err) + require.Equal(t, Separator, actual.String()) +} + +func TestConfirmDirRelativeNode(t *testing.T) { + req := require.New(t) + fSysEmpty := MakeEmptyDirInMemory() + + fSysRoot, err := fSysEmpty.AddDir("a") + req.NoError(err) + fSysSub, err := fSysRoot.AddDir("b") + req.NoError(err) + err = fSysSub.Mkdir("c") + req.NoError(err) + + expected := filepath.Join("a", "b", "c") + req.Truef(fSysEmpty.Exists(expected), existMsg, expected) + + actual, err := ConfirmDir(fSysSub, "c") + req.NoError(err) + req.Equal(expected, actual.String()) +} + func TestFileOps(t *testing.T) { const path = "foo.txt" content := strings.Repeat("longest content", 100) diff --git a/kyaml/filesys/fsondisk_test.go b/kyaml/filesys/fsondisk_test.go index 6c90e6a00..d349c5063 100644 --- a/kyaml/filesys/fsondisk_test.go +++ b/kyaml/filesys/fsondisk_test.go @@ -1,137 +1,164 @@ // Copyright 2019 The Kubernetes Authors. // SPDX-License-Identifier: Apache-2.0 -//go:build !windows -// +build !windows - package filesys import ( "os" - "path" "path/filepath" "reflect" "sort" "testing" + + "github.com/stretchr/testify/require" ) +const dirMsg = "expected '%s' to be a dir" + func makeTestDir(t *testing.T) (FileSystem, string) { t.Helper() + req := require.New(t) + fSys := MakeFsOnDisk() td := t.TempDir() + testDir, err := filepath.EvalSymlinks(td) - if err != nil { - t.Fatalf("unexpected error %s", err) - } - if !fSys.Exists(testDir) { - t.Fatalf("expected existence") - } - if !fSys.IsDir(testDir) { - t.Fatalf("expected directory") - } + req.NoError(err) + req.Truef(fSys.Exists(testDir), existMsg, testDir) + req.Truef(fSys.IsDir(testDir), dirMsg, testDir) + return fSys, testDir } +func cleanWd(t *testing.T) string { + t.Helper() + + wd, err := os.Getwd() + require.NoError(t, err) + + cleanedWd, err := filepath.EvalSymlinks(wd) + require.NoError(t, err) + + return cleanedWd +} + func TestCleanedAbs_1(t *testing.T) { + req := require.New(t) fSys, _ := makeTestDir(t) d, f, err := fSys.CleanedAbs("") - if err != nil { - t.Fatalf("unexpected err=%v", err) - } - wd, err := os.Getwd() - if err != nil { - t.Fatalf("unexpected err=%v", err) - } - if d.String() != wd { - t.Fatalf("unexpected d=%s", d) - } - if f != "" { - t.Fatalf("unexpected f=%s", f) - } + req.NoError(err) + + wd := cleanWd(t) + req.Equal(wd, d.String()) + req.Empty(f) } func TestCleanedAbs_2(t *testing.T) { + req := require.New(t) fSys, _ := makeTestDir(t) - d, f, err := fSys.CleanedAbs("/") - if err != nil { - t.Fatalf("unexpected err=%v", err) - } - if d != "/" { - t.Fatalf("unexpected d=%s", d) - } - if f != "" { - t.Fatalf("unexpected f=%s", f) - } + root := getOSRoot(t) + d, f, err := fSys.CleanedAbs(root) + req.NoError(err) + req.Equal(root, d.String()) + req.Empty(f) } func TestCleanedAbs_3(t *testing.T) { + req := require.New(t) fSys, testDir := makeTestDir(t) err := fSys.WriteFile( filepath.Join(testDir, "foo"), []byte(`foo`)) - if err != nil { - t.Fatalf("unexpected err=%v", err) - } + req.NoError(err) d, f, err := fSys.CleanedAbs(filepath.Join(testDir, "foo")) - if err != nil { - t.Fatalf("unexpected err=%v", err) - } - if d.String() != testDir { - t.Fatalf("unexpected d=%s", d) - } - if f != "foo" { - t.Fatalf("unexpected f=%s", f) - } + req.NoError(err) + req.Equal(testDir, d.String()) + req.Equal("foo", f) } func TestCleanedAbs_4(t *testing.T) { + req := require.New(t) fSys, testDir := makeTestDir(t) err := fSys.MkdirAll(filepath.Join(testDir, "d1", "d2")) - if err != nil { - t.Fatalf("unexpected err=%v", err) - } + req.NoError(err) + err = fSys.WriteFile( filepath.Join(testDir, "d1", "d2", "bar"), []byte(`bar`)) - if err != nil { - t.Fatalf("unexpected err=%v", err) - } + req.NoError(err) d, f, err := fSys.CleanedAbs( filepath.Join(testDir, "d1", "d2")) - if err != nil { - t.Fatalf("unexpected err=%v", err) - } - if d.String() != filepath.Join(testDir, "d1", "d2") { - t.Fatalf("unexpected d=%s", d) - } - if f != "" { - t.Fatalf("unexpected f=%s", f) - } + req.NoError(err) + req.Equal(filepath.Join(testDir, "d1", "d2"), d.String()) + req.Empty(f) d, f, err = fSys.CleanedAbs( filepath.Join(testDir, "d1", "d2", "bar")) - if err != nil { - t.Fatalf("unexpected err=%v", err) + req.NoError(err) + req.Equal(filepath.Join(testDir, "d1", "d2"), d.String()) + req.Equal("bar", f) +} + +func TestConfirmDirDisk(t *testing.T) { + req := require.New(t) + fSys, testDir := makeTestDir(t) + wd := cleanWd(t) + + relDir := "actual_foo_431432" + err := fSys.Mkdir(relDir) + t.Cleanup(func() { + err := fSys.RemoveAll(relDir) + req.NoError(err) + }) + req.NoError(err) + req.Truef(fSys.Exists(relDir), existMsg, relDir) + + linkDir := filepath.Join(testDir, "pointer") + err = os.Symlink(filepath.Join(wd, relDir), linkDir) + req.NoError(err) + + root := getOSRoot(t) + tests := map[string]*struct { + path string + expected string + }{ + "root": { + root, + root, + }, + "non-selfdir relative path": { + relDir, + filepath.Join(wd, relDir), + }, + "symlink": { + linkDir, + filepath.Join(wd, relDir), + }, } - if d.String() != filepath.Join(testDir, "d1", "d2") { - t.Fatalf("unexpected d=%s", d) - } - if f != "bar" { - t.Fatalf("unexpected f=%s", f) + + for name, test := range tests { + test := test + t.Run(name, func(t *testing.T) { + actualPath, err := ConfirmDir(fSys, test.path) + require.NoError(t, err) + require.Equal(t, test.expected, actualPath.String()) + }) } } func TestReadFilesRealFS(t *testing.T) { + req := require.New(t) + fSys, testDir := makeTestDir(t) - dir := path.Join(testDir, "dir") - nestedDir := path.Join(dir, "nestedDir") - hiddenDir := path.Join(testDir, ".hiddenDir") + dir := filepath.Join(testDir, "dir") + nestedDir := filepath.Join(dir, "nestedDir") + hiddenDir := filepath.Join(testDir, ".hiddenDir") dirs := []string{ testDir, dir, @@ -149,27 +176,19 @@ func TestReadFilesRealFS(t *testing.T) { } err := fSys.MkdirAll(nestedDir) - if err != nil { - t.Fatalf("Unexpected Error %v\n", err) - } + req.NoError(err) + err = fSys.MkdirAll(hiddenDir) - if err != nil { - t.Fatalf("Unexpected Error %v\n", err) - } + req.NoError(err) // adding all files in every directory that we had defined for _, d := range dirs { - if !fSys.IsDir(d) { - t.Fatalf("Expected %s to be a dir\n", d) - } + req.Truef(fSys.IsDir(d), dirMsg, d) for _, f := range files { - err = fSys.WriteFile(path.Join(d, f), []byte(f)) - if err != nil { - t.Fatalf("unexpected error %s", err) - } - if !fSys.Exists(path.Join(d, f)) { - t.Fatalf("expected %s", f) - } + fPath := filepath.Join(d, f) + err = fSys.WriteFile(fPath, []byte(f)) + req.NoError(err) + req.Truef(fSys.Exists(fPath), existMsg, fPath) } } @@ -221,15 +240,14 @@ func TestReadFilesRealFS(t *testing.T) { for _, d := range dirs { var expectedPaths []string for _, f := range c.expectedFiles { - expectedPaths = append(expectedPaths, path.Join(d, f)) + expectedPaths = append(expectedPaths, filepath.Join(d, f)) } if c.expectedDirs != nil { expectedPaths = append(expectedPaths, c.expectedDirs[d]...) } - actualPaths, globErr := fSys.Glob(path.Join(d, c.globPattern)) - if globErr != nil { - t.Fatalf("Unexpected Error : %v\n", globErr) - } + actualPaths, globErr := fSys.Glob(filepath.Join(d, c.globPattern)) + require.NoError(t, globErr) + sort.Strings(actualPaths) sort.Strings(expectedPaths) if !reflect.DeepEqual(actualPaths, expectedPaths) { diff --git a/kyaml/filesys/fsondisk_test_unix.go b/kyaml/filesys/fsondisk_test_unix.go new file mode 100644 index 000000000..6331e4546 --- /dev/null +++ b/kyaml/filesys/fsondisk_test_unix.go @@ -0,0 +1,17 @@ +// Copyright 2022 The Kubernetes Authors. +// SPDX-License-Identifier: Apache-2.0 + +//go:build !windows +// +build !windows + +package filesys + +import ( + "path/filepath" + "testing" +) + +func getOSRoot(t *testing.T) string { + t.Helper() + return string(filepath.Separator) +} diff --git a/kyaml/filesys/fsondisk_test_windows.go b/kyaml/filesys/fsondisk_test_windows.go new file mode 100644 index 000000000..d739664f3 --- /dev/null +++ b/kyaml/filesys/fsondisk_test_windows.go @@ -0,0 +1,20 @@ +// Copyright 2022 The Kubernetes Authors. +// SPDX-License-Identifier: Apache-2.0 + +package filesys + +import ( + "path/filepath" + "testing" + + "github.com/stretchr/testify/require" + "golang.org/x/sys/windows" +) + +func getOSRoot(t *testing.T) string { + t.Helper() + + sysDir, err := windows.GetSystemDirectory() + require.NoError(t, err) + return filepath.VolumeName(sysDir) + `\` +} diff --git a/kyaml/go.mod b/kyaml/go.mod index 9b84238ff..abc245736 100644 --- a/kyaml/go.mod +++ b/kyaml/go.mod @@ -14,6 +14,8 @@ require ( github.com/stretchr/testify v1.7.0 github.com/xlab/treeprint v1.1.0 go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5 + golang.org/x/sys v0.0.0-20210510120138-977fb7262007 + golang.org/x/text v0.3.7 // indirect google.golang.org/protobuf v1.28.0 gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f gopkg.in/yaml.v2 v2.4.0 diff --git a/kyaml/go.sum b/kyaml/go.sum index cc3057ad1..fa3afc305 100644 --- a/kyaml/go.sum +++ b/kyaml/go.sum @@ -144,6 +144,8 @@ golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20191002063906-3421d5a6bb1c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/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-20210510120138-977fb7262007 h1:gG67DSER+11cZvqIMb8S8bt0vZtiN6xWYARwirrOSfE= golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= diff --git a/plugin/builtin/annotationstransformer/go.sum b/plugin/builtin/annotationstransformer/go.sum index a5f6ea574..a0fab5e6d 100644 --- a/plugin/builtin/annotationstransformer/go.sum +++ b/plugin/builtin/annotationstransformer/go.sum @@ -132,6 +132,8 @@ golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20191002063906-3421d5a6bb1c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/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-20210510120138-977fb7262007 h1:gG67DSER+11cZvqIMb8S8bt0vZtiN6xWYARwirrOSfE= golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= diff --git a/plugin/builtin/configmapgenerator/go.sum b/plugin/builtin/configmapgenerator/go.sum index a5f6ea574..a0fab5e6d 100644 --- a/plugin/builtin/configmapgenerator/go.sum +++ b/plugin/builtin/configmapgenerator/go.sum @@ -132,6 +132,8 @@ golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20191002063906-3421d5a6bb1c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/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-20210510120138-977fb7262007 h1:gG67DSER+11cZvqIMb8S8bt0vZtiN6xWYARwirrOSfE= golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= diff --git a/plugin/builtin/hashtransformer/go.sum b/plugin/builtin/hashtransformer/go.sum index a5f6ea574..a0fab5e6d 100644 --- a/plugin/builtin/hashtransformer/go.sum +++ b/plugin/builtin/hashtransformer/go.sum @@ -132,6 +132,8 @@ golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20191002063906-3421d5a6bb1c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/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-20210510120138-977fb7262007 h1:gG67DSER+11cZvqIMb8S8bt0vZtiN6xWYARwirrOSfE= golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= diff --git a/plugin/builtin/helmchartinflationgenerator/go.sum b/plugin/builtin/helmchartinflationgenerator/go.sum index 501c46d3d..9f51ba5f6 100644 --- a/plugin/builtin/helmchartinflationgenerator/go.sum +++ b/plugin/builtin/helmchartinflationgenerator/go.sum @@ -133,6 +133,8 @@ golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20191002063906-3421d5a6bb1c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/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-20210510120138-977fb7262007 h1:gG67DSER+11cZvqIMb8S8bt0vZtiN6xWYARwirrOSfE= golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= diff --git a/plugin/builtin/iampolicygenerator/go.sum b/plugin/builtin/iampolicygenerator/go.sum index d0810e181..38d24d5a3 100644 --- a/plugin/builtin/iampolicygenerator/go.sum +++ b/plugin/builtin/iampolicygenerator/go.sum @@ -124,6 +124,8 @@ golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5h golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/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-20210510120138-977fb7262007 h1:gG67DSER+11cZvqIMb8S8bt0vZtiN6xWYARwirrOSfE= golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= diff --git a/plugin/builtin/imagetagtransformer/go.sum b/plugin/builtin/imagetagtransformer/go.sum index a5f6ea574..a0fab5e6d 100644 --- a/plugin/builtin/imagetagtransformer/go.sum +++ b/plugin/builtin/imagetagtransformer/go.sum @@ -132,6 +132,8 @@ golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20191002063906-3421d5a6bb1c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/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-20210510120138-977fb7262007 h1:gG67DSER+11cZvqIMb8S8bt0vZtiN6xWYARwirrOSfE= golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= diff --git a/plugin/builtin/labeltransformer/go.sum b/plugin/builtin/labeltransformer/go.sum index a5f6ea574..a0fab5e6d 100644 --- a/plugin/builtin/labeltransformer/go.sum +++ b/plugin/builtin/labeltransformer/go.sum @@ -132,6 +132,8 @@ golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20191002063906-3421d5a6bb1c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/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-20210510120138-977fb7262007 h1:gG67DSER+11cZvqIMb8S8bt0vZtiN6xWYARwirrOSfE= golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= diff --git a/plugin/builtin/legacyordertransformer/go.sum b/plugin/builtin/legacyordertransformer/go.sum index a5f6ea574..a0fab5e6d 100644 --- a/plugin/builtin/legacyordertransformer/go.sum +++ b/plugin/builtin/legacyordertransformer/go.sum @@ -132,6 +132,8 @@ golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20191002063906-3421d5a6bb1c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/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-20210510120138-977fb7262007 h1:gG67DSER+11cZvqIMb8S8bt0vZtiN6xWYARwirrOSfE= golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= diff --git a/plugin/builtin/namespacetransformer/go.sum b/plugin/builtin/namespacetransformer/go.sum index a5f6ea574..a0fab5e6d 100644 --- a/plugin/builtin/namespacetransformer/go.sum +++ b/plugin/builtin/namespacetransformer/go.sum @@ -132,6 +132,8 @@ golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20191002063906-3421d5a6bb1c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/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-20210510120138-977fb7262007 h1:gG67DSER+11cZvqIMb8S8bt0vZtiN6xWYARwirrOSfE= golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= diff --git a/plugin/builtin/patchjson6902transformer/go.sum b/plugin/builtin/patchjson6902transformer/go.sum index a5f6ea574..a0fab5e6d 100644 --- a/plugin/builtin/patchjson6902transformer/go.sum +++ b/plugin/builtin/patchjson6902transformer/go.sum @@ -132,6 +132,8 @@ golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20191002063906-3421d5a6bb1c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/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-20210510120138-977fb7262007 h1:gG67DSER+11cZvqIMb8S8bt0vZtiN6xWYARwirrOSfE= golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= diff --git a/plugin/builtin/patchstrategicmergetransformer/go.sum b/plugin/builtin/patchstrategicmergetransformer/go.sum index a5f6ea574..a0fab5e6d 100644 --- a/plugin/builtin/patchstrategicmergetransformer/go.sum +++ b/plugin/builtin/patchstrategicmergetransformer/go.sum @@ -132,6 +132,8 @@ golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20191002063906-3421d5a6bb1c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/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-20210510120138-977fb7262007 h1:gG67DSER+11cZvqIMb8S8bt0vZtiN6xWYARwirrOSfE= golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= diff --git a/plugin/builtin/patchtransformer/go.sum b/plugin/builtin/patchtransformer/go.sum index a5f6ea574..a0fab5e6d 100644 --- a/plugin/builtin/patchtransformer/go.sum +++ b/plugin/builtin/patchtransformer/go.sum @@ -132,6 +132,8 @@ golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20191002063906-3421d5a6bb1c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/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-20210510120138-977fb7262007 h1:gG67DSER+11cZvqIMb8S8bt0vZtiN6xWYARwirrOSfE= golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= diff --git a/plugin/builtin/prefixtransformer/go.sum b/plugin/builtin/prefixtransformer/go.sum index a5f6ea574..a0fab5e6d 100644 --- a/plugin/builtin/prefixtransformer/go.sum +++ b/plugin/builtin/prefixtransformer/go.sum @@ -132,6 +132,8 @@ golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20191002063906-3421d5a6bb1c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/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-20210510120138-977fb7262007 h1:gG67DSER+11cZvqIMb8S8bt0vZtiN6xWYARwirrOSfE= golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= diff --git a/plugin/builtin/replacementtransformer/go.sum b/plugin/builtin/replacementtransformer/go.sum index a5f6ea574..a0fab5e6d 100644 --- a/plugin/builtin/replacementtransformer/go.sum +++ b/plugin/builtin/replacementtransformer/go.sum @@ -132,6 +132,8 @@ golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20191002063906-3421d5a6bb1c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/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-20210510120138-977fb7262007 h1:gG67DSER+11cZvqIMb8S8bt0vZtiN6xWYARwirrOSfE= golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= diff --git a/plugin/builtin/replicacounttransformer/go.sum b/plugin/builtin/replicacounttransformer/go.sum index a5f6ea574..a0fab5e6d 100644 --- a/plugin/builtin/replicacounttransformer/go.sum +++ b/plugin/builtin/replicacounttransformer/go.sum @@ -132,6 +132,8 @@ golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20191002063906-3421d5a6bb1c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/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-20210510120138-977fb7262007 h1:gG67DSER+11cZvqIMb8S8bt0vZtiN6xWYARwirrOSfE= golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= diff --git a/plugin/builtin/secretgenerator/go.sum b/plugin/builtin/secretgenerator/go.sum index a5f6ea574..a0fab5e6d 100644 --- a/plugin/builtin/secretgenerator/go.sum +++ b/plugin/builtin/secretgenerator/go.sum @@ -132,6 +132,8 @@ golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20191002063906-3421d5a6bb1c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/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-20210510120138-977fb7262007 h1:gG67DSER+11cZvqIMb8S8bt0vZtiN6xWYARwirrOSfE= golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= diff --git a/plugin/builtin/suffixtransformer/go.sum b/plugin/builtin/suffixtransformer/go.sum index a5f6ea574..a0fab5e6d 100644 --- a/plugin/builtin/suffixtransformer/go.sum +++ b/plugin/builtin/suffixtransformer/go.sum @@ -132,6 +132,8 @@ golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20191002063906-3421d5a6bb1c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/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-20210510120138-977fb7262007 h1:gG67DSER+11cZvqIMb8S8bt0vZtiN6xWYARwirrOSfE= golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= diff --git a/plugin/builtin/valueaddtransformer/go.sum b/plugin/builtin/valueaddtransformer/go.sum index a5f6ea574..a0fab5e6d 100644 --- a/plugin/builtin/valueaddtransformer/go.sum +++ b/plugin/builtin/valueaddtransformer/go.sum @@ -132,6 +132,8 @@ golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20191002063906-3421d5a6bb1c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/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-20210510120138-977fb7262007 h1:gG67DSER+11cZvqIMb8S8bt0vZtiN6xWYARwirrOSfE= golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= diff --git a/plugin/someteam.example.com/v1/bashedconfigmap/go.sum b/plugin/someteam.example.com/v1/bashedconfigmap/go.sum index a5f6ea574..a0fab5e6d 100644 --- a/plugin/someteam.example.com/v1/bashedconfigmap/go.sum +++ b/plugin/someteam.example.com/v1/bashedconfigmap/go.sum @@ -132,6 +132,8 @@ golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20191002063906-3421d5a6bb1c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/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-20210510120138-977fb7262007 h1:gG67DSER+11cZvqIMb8S8bt0vZtiN6xWYARwirrOSfE= golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= diff --git a/plugin/someteam.example.com/v1/calvinduplicator/go.sum b/plugin/someteam.example.com/v1/calvinduplicator/go.sum index a5f6ea574..a0fab5e6d 100644 --- a/plugin/someteam.example.com/v1/calvinduplicator/go.sum +++ b/plugin/someteam.example.com/v1/calvinduplicator/go.sum @@ -132,6 +132,8 @@ golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20191002063906-3421d5a6bb1c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/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-20210510120138-977fb7262007 h1:gG67DSER+11cZvqIMb8S8bt0vZtiN6xWYARwirrOSfE= golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= diff --git a/plugin/someteam.example.com/v1/dateprefixer/go.sum b/plugin/someteam.example.com/v1/dateprefixer/go.sum index a5f6ea574..a0fab5e6d 100644 --- a/plugin/someteam.example.com/v1/dateprefixer/go.sum +++ b/plugin/someteam.example.com/v1/dateprefixer/go.sum @@ -132,6 +132,8 @@ golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20191002063906-3421d5a6bb1c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/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-20210510120138-977fb7262007 h1:gG67DSER+11cZvqIMb8S8bt0vZtiN6xWYARwirrOSfE= golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= diff --git a/plugin/someteam.example.com/v1/printpluginenv/go.sum b/plugin/someteam.example.com/v1/printpluginenv/go.sum index a5f6ea574..a0fab5e6d 100644 --- a/plugin/someteam.example.com/v1/printpluginenv/go.sum +++ b/plugin/someteam.example.com/v1/printpluginenv/go.sum @@ -132,6 +132,8 @@ golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20191002063906-3421d5a6bb1c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/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-20210510120138-977fb7262007 h1:gG67DSER+11cZvqIMb8S8bt0vZtiN6xWYARwirrOSfE= golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= diff --git a/plugin/someteam.example.com/v1/secretsfromdatabase/go.sum b/plugin/someteam.example.com/v1/secretsfromdatabase/go.sum index a5f6ea574..a0fab5e6d 100644 --- a/plugin/someteam.example.com/v1/secretsfromdatabase/go.sum +++ b/plugin/someteam.example.com/v1/secretsfromdatabase/go.sum @@ -132,6 +132,8 @@ golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20191002063906-3421d5a6bb1c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/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-20210510120138-977fb7262007 h1:gG67DSER+11cZvqIMb8S8bt0vZtiN6xWYARwirrOSfE= golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= diff --git a/plugin/someteam.example.com/v1/sedtransformer/go.sum b/plugin/someteam.example.com/v1/sedtransformer/go.sum index a5f6ea574..a0fab5e6d 100644 --- a/plugin/someteam.example.com/v1/sedtransformer/go.sum +++ b/plugin/someteam.example.com/v1/sedtransformer/go.sum @@ -132,6 +132,8 @@ golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20191002063906-3421d5a6bb1c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/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-20210510120138-977fb7262007 h1:gG67DSER+11cZvqIMb8S8bt0vZtiN6xWYARwirrOSfE= golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= diff --git a/plugin/someteam.example.com/v1/someservicegenerator/go.sum b/plugin/someteam.example.com/v1/someservicegenerator/go.sum index a5f6ea574..a0fab5e6d 100644 --- a/plugin/someteam.example.com/v1/someservicegenerator/go.sum +++ b/plugin/someteam.example.com/v1/someservicegenerator/go.sum @@ -132,6 +132,8 @@ golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20191002063906-3421d5a6bb1c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/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-20210510120138-977fb7262007 h1:gG67DSER+11cZvqIMb8S8bt0vZtiN6xWYARwirrOSfE= golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= diff --git a/plugin/someteam.example.com/v1/starlarkmixer/go.sum b/plugin/someteam.example.com/v1/starlarkmixer/go.sum index a5f6ea574..a0fab5e6d 100644 --- a/plugin/someteam.example.com/v1/starlarkmixer/go.sum +++ b/plugin/someteam.example.com/v1/starlarkmixer/go.sum @@ -132,6 +132,8 @@ golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20191002063906-3421d5a6bb1c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/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-20210510120138-977fb7262007 h1:gG67DSER+11cZvqIMb8S8bt0vZtiN6xWYARwirrOSfE= golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= diff --git a/plugin/someteam.example.com/v1/stringprefixer/go.sum b/plugin/someteam.example.com/v1/stringprefixer/go.sum index a5f6ea574..a0fab5e6d 100644 --- a/plugin/someteam.example.com/v1/stringprefixer/go.sum +++ b/plugin/someteam.example.com/v1/stringprefixer/go.sum @@ -132,6 +132,8 @@ golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20191002063906-3421d5a6bb1c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/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-20210510120138-977fb7262007 h1:gG67DSER+11cZvqIMb8S8bt0vZtiN6xWYARwirrOSfE= golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= diff --git a/plugin/someteam.example.com/v1/validator/go.sum b/plugin/someteam.example.com/v1/validator/go.sum index a5f6ea574..a0fab5e6d 100644 --- a/plugin/someteam.example.com/v1/validator/go.sum +++ b/plugin/someteam.example.com/v1/validator/go.sum @@ -132,6 +132,8 @@ golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20191002063906-3421d5a6bb1c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/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-20210510120138-977fb7262007 h1:gG67DSER+11cZvqIMb8S8bt0vZtiN6xWYARwirrOSfE= golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= diff --git a/plugin/untested/v1/gogetter/go.sum b/plugin/untested/v1/gogetter/go.sum index 077a9e13f..d8162eb99 100644 --- a/plugin/untested/v1/gogetter/go.sum +++ b/plugin/untested/v1/gogetter/go.sum @@ -437,6 +437,7 @@ golang.org/x/sys v0.0.0-20210315160823-c6e025ad8005/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/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-20210510120138-977fb7262007 h1:gG67DSER+11cZvqIMb8S8bt0vZtiN6xWYARwirrOSfE= golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=