From d36829e75ad28a347203434ec042502341a545f4 Mon Sep 17 00:00:00 2001 From: Dan Ramich Date: Wed, 10 Apr 2019 15:56:49 -0700 Subject: [PATCH] Vendor changes --- vendor.conf | 2 +- vendor/github.com/rancher/norman/generator/generator.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/vendor.conf b/vendor.conf index ada5a27e..ad8bf133 100644 --- a/vendor.conf +++ b/vendor.conf @@ -2,5 +2,5 @@ github.com/rancher/types github.com/pkg/errors v0.8.0 -github.com/rancher/norman 03b89d4fb7143786491cee420102775a803fbed1 +github.com/rancher/norman 01a9966237719f0ccad07194cb4ee161d7431495 github.com/coreos/prometheus-operator v0.25.0 diff --git a/vendor/github.com/rancher/norman/generator/generator.go b/vendor/github.com/rancher/norman/generator/generator.go index 84c4273b..d395c18c 100644 --- a/vendor/github.com/rancher/norman/generator/generator.go +++ b/vendor/github.com/rancher/norman/generator/generator.go @@ -468,7 +468,7 @@ func prepareDirs(dirs ...string) error { } for _, file := range files { - if strings.HasPrefix(file.Name(), "zz_generated") || strings.HasSuffix(file.Name(), "_mock_test.go") { + if strings.HasPrefix(file.Name(), "zz_generated") { if err := os.Remove(path.Join(dir, file.Name())); err != nil { return errors.Wrapf(err, "failed to delete %s", path.Join(dir, file.Name())) } @@ -566,7 +566,7 @@ func generateFakes(k8sDir string, controllers []*types.Schema) error { return err } // create the file - filePath := path.Join(k8sDir, "fakes", "zz_generated_"+addUnderscore(controller.ID)+"_mock_test.go") + filePath := path.Join(k8sDir, "fakes", "zz_generated_"+addUnderscore(controller.ID)+"_mock.go") err = ioutil.WriteFile(filePath, out.Bytes(), 0644) if err != nil { return err