From 9d1bc800983d3088b97e5996f3b70668ad79935e Mon Sep 17 00:00:00 2001 From: Camila Macedo Date: Sat, 25 Jul 2020 12:23:02 +0100 Subject: [PATCH 1/4] removal: lgeacy support --- .../operator-sdk/generate/internal/genutil.go | 34 ------------------- .../clusterserviceversion_test.go | 3 +- internal/util/projutil/project_util.go | 11 +++--- 3 files changed, 5 insertions(+), 43 deletions(-) diff --git a/internal/cmd/operator-sdk/generate/internal/genutil.go b/internal/cmd/operator-sdk/generate/internal/genutil.go index 7fb154dd0c..8e5554f64a 100644 --- a/internal/cmd/operator-sdk/generate/internal/genutil.go +++ b/internal/cmd/operator-sdk/generate/internal/genutil.go @@ -99,40 +99,6 @@ func makeCRDFileName(group, resource string) string { return fmt.Sprintf("%s_%s.yaml", group, resource) } -// WriteObjectsToFilesLegacy creates dir then writes each object in objs to a -// file in legacy format in dir. -func WriteObjectsToFilesLegacy(dir string, objs ...interface{}) error { - if err := os.MkdirAll(dir, 0755); err != nil { - return err - } - - seenFiles := make(map[string]struct{}) - for _, obj := range objs { - var fileName string - switch t := obj.(type) { - case apiextv1.CustomResourceDefinition: - fileName = makeCRDFileNameLegacy(t.Spec.Group, t.Spec.Names.Plural) - case apiextv1beta1.CustomResourceDefinition: - fileName = makeCRDFileNameLegacy(t.Spec.Group, t.Spec.Names.Plural) - default: - return fmt.Errorf("unknown object type: %T", t) - } - - if _, hasFile := seenFiles[fileName]; hasFile { - return fmt.Errorf("duplicate file cannot be written: %s", fileName) - } - if err := writeObjectToFile(dir, obj, fileName); err != nil { - return err - } - seenFiles[fileName] = struct{}{} - } - return nil -} - -func makeCRDFileNameLegacy(group, resource string) string { - return fmt.Sprintf("%s_%s_crd.yaml", group, resource) -} - // writeObjectToFile marshals crd to bytes and writes them to dir in file. func writeObjectToFile(dir string, obj interface{}, fileName string) error { f, err := os.Create(filepath.Join(dir, fileName)) diff --git a/internal/generate/clusterserviceversion/clusterserviceversion_test.go b/internal/generate/clusterserviceversion/clusterserviceversion_test.go index f6ab7ddefe..5f7744d19f 100644 --- a/internal/generate/clusterserviceversion/clusterserviceversion_test.go +++ b/internal/generate/clusterserviceversion/clusterserviceversion_test.go @@ -23,11 +23,10 @@ import ( "path/filepath" "regexp" + "github.com/blang/semver" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" "github.com/onsi/gomega/format" - - "github.com/blang/semver" operatorversion "github.com/operator-framework/api/pkg/lib/version" "github.com/operator-framework/api/pkg/operators/v1alpha1" "github.com/operator-framework/operator-registry/pkg/lib/bundle" diff --git a/internal/util/projutil/project_util.go b/internal/util/projutil/project_util.go index 39a7220c7f..e3280a13e8 100644 --- a/internal/util/projutil/project_util.go +++ b/internal/util/projutil/project_util.go @@ -26,10 +26,7 @@ import ( ) const ( - // Useful file modes. - DirMode = 0755 - FileMode = 0644 - ExecFileMode = 0755 + FileMode = 0644 ) const ( @@ -38,6 +35,9 @@ const ( GoModEnv = "GO111MODULE" ) +// Default config file path. +const configFile = "PROJECT" + // OperatorType - the type of operator type OperatorType = string @@ -76,9 +76,6 @@ func HasProjectFile() bool { return true } -// Default config file path. -const configFile = "PROJECT" - // ReadConfig returns a configuration if a file containing one exists at the // default path (project root). func ReadConfig() (*config.Config, error) { From 99634d7397f208672fa0c94ba4dd9b8db6e8268e Mon Sep 17 00:00:00 2001 From: Camila Macedo Date: Sat, 25 Jul 2020 13:21:02 +0100 Subject: [PATCH 2/4] commenting molecule test because it needs to be port for the new layout --- .travis.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index e31098fccc..8df68f2301 100644 --- a/.travis.yml +++ b/.travis.yml @@ -125,7 +125,9 @@ jobs: - pip install --user ansible script: - make test-e2e-ansible - - make test-e2e-ansible-molecule + # todo: the following test needs to be port for the new layout + # More info: https://github.com/operator-framework/operator-sdk/issues/3540 + # - make test-e2e-ansible-molecule # Test subcommands - <<: *test From d27c93234ab8ec7e2a3bf0ca556859ffbfae72fb Mon Sep 17 00:00:00 2001 From: Camila Macedo Date: Mon, 27 Jul 2020 16:52:44 +0100 Subject: [PATCH 3/4] rebase changes --- .travis.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8df68f2301..e31098fccc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -125,9 +125,7 @@ jobs: - pip install --user ansible script: - make test-e2e-ansible - # todo: the following test needs to be port for the new layout - # More info: https://github.com/operator-framework/operator-sdk/issues/3540 - # - make test-e2e-ansible-molecule + - make test-e2e-ansible-molecule # Test subcommands - <<: *test From 71690c83e5c44f3eee23f28370df733b290b2e51 Mon Sep 17 00:00:00 2001 From: Camila Macedo Date: Mon, 27 Jul 2020 17:16:51 +0100 Subject: [PATCH 4/4] add useful modes back --- internal/util/projutil/project_util.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/internal/util/projutil/project_util.go b/internal/util/projutil/project_util.go index e3280a13e8..b7a75744f9 100644 --- a/internal/util/projutil/project_util.go +++ b/internal/util/projutil/project_util.go @@ -26,7 +26,10 @@ import ( ) const ( - FileMode = 0644 + // Useful file modes. + DirMode = 0755 + FileMode = 0644 + ExecFileMode = 0755 ) const (