From ab438547e82a4863bbc128d6d7bcebaf2e38e179 Mon Sep 17 00:00:00 2001 From: Bryce Palmer Date: Mon, 31 Jul 2023 16:50:53 -0400 Subject: [PATCH] (feat): Externalize the `plugins` package (#3) Signed-off-by: Bryce Palmer --- .github/workflows/unit.yml | 3 - Makefile | 30 ++++-- go.mod | 1 - go.sum | 2 - internal/plugins/util/legacy_keys.go | 93 ------------------- internal/testutils/utils.go | 2 +- {internal => pkg}/plugins/ansible/v1/api.go | 4 +- .../plugins/ansible/v1/constants/constants.go | 0 {internal => pkg}/plugins/ansible/v1/init.go | 4 +- .../plugins/ansible/v1/plugin.go | 2 +- .../plugins/ansible/v1/scaffolds/api.go | 14 +-- .../plugins/ansible/v1/scaffolds/init.go | 16 ++-- .../internal/templates/config/crd/crd.go | 0 .../templates/config/crd/kustomization.go | 0 .../internal/templates/config/rbac/role.go | 0 .../config/testing/debug_logs_patch.go | 0 .../templates/config/testing/kustomization.go | 0 .../templates/config/testing/manager_image.go | 0 .../testing/pullpolicy/always_pull_patch.go | 0 .../pullpolicy/ifnotpresent_pull_patch.go | 0 .../testing/pullpolicy/never_pull_patch.go | 0 .../internal/templates/dockerfile.go | 2 +- .../scaffolds/internal/templates/gitignore.go | 0 .../scaffolds/internal/templates/makefile.go | 0 .../templates/molecule/mdefault/converge.go | 0 .../templates/molecule/mdefault/create.go | 0 .../templates/molecule/mdefault/destroy.go | 0 .../templates/molecule/mdefault/kustomize.go | 0 .../templates/molecule/mdefault/molecule.go | 0 .../templates/molecule/mdefault/prepare.go | 0 .../molecule/mdefault/tasks_test_resource.go | 0 .../templates/molecule/mdefault/verify.go | 0 .../templates/molecule/mkind/converge.go | 0 .../templates/molecule/mkind/create.go | 0 .../templates/molecule/mkind/destroy.go | 0 .../templates/molecule/mkind/molecule.go | 0 .../templates/playbooks/placeholder.go | 0 .../internal/templates/playbooks/playbook.go | 0 .../internal/templates/requirements.go | 0 .../internal/templates/roles/defaults_main.go | 2 +- .../internal/templates/roles/files_dir.go | 2 +- .../internal/templates/roles/handlers_main.go | 2 +- .../internal/templates/roles/meta_main.go | 2 +- .../internal/templates/roles/placeholder.go | 0 .../internal/templates/roles/readme.go | 2 +- .../internal/templates/roles/tasks_main.go | 2 +- .../internal/templates/roles/templates_dir.go | 2 +- .../internal/templates/roles/vars_main.go | 2 +- .../scaffolds/internal/templates/watches.go | 0 {internal => pkg}/plugins/plugins.go | 0 {internal => pkg}/plugins/util/cleanup.go | 0 {internal => pkg}/plugins/util/message.go | 0 test/e2e/ansible/scorecard_test.go | 11 +-- test/e2e/ansible/suite_test.go | 13 +-- .../ansible/memcached-operator/Dockerfile | 2 +- testdata/ansible/memcached-operator/Makefile | 4 +- .../bundle/tests/scorecard/config.yaml | 12 +-- .../scorecard/patches/basic.config.yaml | 2 +- .../config/scorecard/patches/olm.config.yaml | 10 +- .../molecule/default/molecule.yml | 9 -- .../memcached-operator/requirements.yml | 2 +- 61 files changed, 79 insertions(+), 175 deletions(-) delete mode 100644 internal/plugins/util/legacy_keys.go rename {internal => pkg}/plugins/ansible/v1/api.go (96%) rename {internal => pkg}/plugins/ansible/v1/constants/constants.go (100%) rename {internal => pkg}/plugins/ansible/v1/init.go (98%) rename {internal => pkg}/plugins/ansible/v1/plugin.go (95%) rename {internal => pkg}/plugins/ansible/v1/scaffolds/api.go (78%) rename {internal => pkg}/plugins/ansible/v1/scaffolds/init.go (73%) rename {internal => pkg}/plugins/ansible/v1/scaffolds/internal/templates/config/crd/crd.go (100%) rename {internal => pkg}/plugins/ansible/v1/scaffolds/internal/templates/config/crd/kustomization.go (100%) rename {internal => pkg}/plugins/ansible/v1/scaffolds/internal/templates/config/rbac/role.go (100%) rename {internal => pkg}/plugins/ansible/v1/scaffolds/internal/templates/config/testing/debug_logs_patch.go (100%) rename {internal => pkg}/plugins/ansible/v1/scaffolds/internal/templates/config/testing/kustomization.go (100%) rename {internal => pkg}/plugins/ansible/v1/scaffolds/internal/templates/config/testing/manager_image.go (100%) rename {internal => pkg}/plugins/ansible/v1/scaffolds/internal/templates/config/testing/pullpolicy/always_pull_patch.go (100%) rename {internal => pkg}/plugins/ansible/v1/scaffolds/internal/templates/config/testing/pullpolicy/ifnotpresent_pull_patch.go (100%) rename {internal => pkg}/plugins/ansible/v1/scaffolds/internal/templates/config/testing/pullpolicy/never_pull_patch.go (100%) rename {internal => pkg}/plugins/ansible/v1/scaffolds/internal/templates/dockerfile.go (95%) rename {internal => pkg}/plugins/ansible/v1/scaffolds/internal/templates/gitignore.go (100%) rename {internal => pkg}/plugins/ansible/v1/scaffolds/internal/templates/makefile.go (100%) rename {internal => pkg}/plugins/ansible/v1/scaffolds/internal/templates/molecule/mdefault/converge.go (100%) rename {internal => pkg}/plugins/ansible/v1/scaffolds/internal/templates/molecule/mdefault/create.go (100%) rename {internal => pkg}/plugins/ansible/v1/scaffolds/internal/templates/molecule/mdefault/destroy.go (100%) rename {internal => pkg}/plugins/ansible/v1/scaffolds/internal/templates/molecule/mdefault/kustomize.go (100%) rename {internal => pkg}/plugins/ansible/v1/scaffolds/internal/templates/molecule/mdefault/molecule.go (100%) rename {internal => pkg}/plugins/ansible/v1/scaffolds/internal/templates/molecule/mdefault/prepare.go (100%) rename {internal => pkg}/plugins/ansible/v1/scaffolds/internal/templates/molecule/mdefault/tasks_test_resource.go (100%) rename {internal => pkg}/plugins/ansible/v1/scaffolds/internal/templates/molecule/mdefault/verify.go (100%) rename {internal => pkg}/plugins/ansible/v1/scaffolds/internal/templates/molecule/mkind/converge.go (100%) rename {internal => pkg}/plugins/ansible/v1/scaffolds/internal/templates/molecule/mkind/create.go (100%) rename {internal => pkg}/plugins/ansible/v1/scaffolds/internal/templates/molecule/mkind/destroy.go (100%) rename {internal => pkg}/plugins/ansible/v1/scaffolds/internal/templates/molecule/mkind/molecule.go (100%) rename {internal => pkg}/plugins/ansible/v1/scaffolds/internal/templates/playbooks/placeholder.go (100%) rename {internal => pkg}/plugins/ansible/v1/scaffolds/internal/templates/playbooks/playbook.go (100%) rename {internal => pkg}/plugins/ansible/v1/scaffolds/internal/templates/requirements.go (100%) rename {internal => pkg}/plugins/ansible/v1/scaffolds/internal/templates/roles/defaults_main.go (92%) rename {internal => pkg}/plugins/ansible/v1/scaffolds/internal/templates/roles/files_dir.go (92%) rename {internal => pkg}/plugins/ansible/v1/scaffolds/internal/templates/roles/handlers_main.go (92%) rename {internal => pkg}/plugins/ansible/v1/scaffolds/internal/templates/roles/meta_main.go (97%) rename {internal => pkg}/plugins/ansible/v1/scaffolds/internal/templates/roles/placeholder.go (100%) rename {internal => pkg}/plugins/ansible/v1/scaffolds/internal/templates/roles/readme.go (96%) rename {internal => pkg}/plugins/ansible/v1/scaffolds/internal/templates/roles/tasks_main.go (92%) rename {internal => pkg}/plugins/ansible/v1/scaffolds/internal/templates/roles/templates_dir.go (92%) rename {internal => pkg}/plugins/ansible/v1/scaffolds/internal/templates/roles/vars_main.go (92%) rename {internal => pkg}/plugins/ansible/v1/scaffolds/internal/templates/watches.go (100%) rename {internal => pkg}/plugins/plugins.go (100%) rename {internal => pkg}/plugins/util/cleanup.go (100%) rename {internal => pkg}/plugins/util/message.go (100%) diff --git a/.github/workflows/unit.yml b/.github/workflows/unit.yml index eaeda5a..49b993d 100644 --- a/.github/workflows/unit.yml +++ b/.github/workflows/unit.yml @@ -14,6 +14,3 @@ jobs: with: fetch-depth: 0 - run: make test-unit - - uses: shogo82148/actions-goveralls@v1 - with: - path-to-profile: coverage.out diff --git a/Makefile b/Makefile index 50290d3..c49004b 100644 --- a/Makefile +++ b/Makefile @@ -4,13 +4,15 @@ SHELL = /bin/bash # This value must be updated to the release tag of the most recent release, a change that must # occur in the release commit. IMAGE_VERSION will be removed once each subproject that uses this # version is moved to a separate repo and release process. -export IMAGE_VERSION = v1.30.0 +export IMAGE_VERSION = v1.31.0 # Build-time variables to inject into binaries export SIMPLE_VERSION = $(shell (test "$(shell git describe --tags)" = "$(shell git describe --tags --abbrev=0)" && echo $(shell git describe --tags)) || echo $(shell git describe --tags --abbrev=0)+git) export GIT_VERSION = $(shell git describe --dirty --tags --always) export GIT_COMMIT = $(shell git rev-parse HEAD) export K8S_VERSION = 1.26.0 +export OPERATOR_SDK_VERSION = $(IMAGE_VERSION) + # Build settings export TOOLS_DIR = tools/bin export SCRIPTS_DIR = tools/scripts @@ -35,9 +37,9 @@ export PATH := $(PWD)/$(BUILD_DIR):$(PWD)/$(TOOLS_DIR):$(PATH) ##@ Development .PHONY: generate -generate: build # Generate CLI docs and samples +generate: operator-sdk build # Generate CLI docs and samples rm -rf testdata - go run ./hack/generate/samples/generate_testdata.go + go run ./hack/generate/samples/generate_testdata.go --bin $(OPERATOR_SDK) go generate ./... .PHONY: fix @@ -45,7 +47,7 @@ fix: ## Fixup files in the repo. go mod tidy go fmt ./... make setup-lint - $(TOOLS_DIR)/golangci-lint run --fix + $(TOOLS_DIR)/golangci-lint run --fix --timeout=2m .PHONY: setup-lint setup-lint: ## Setup the lint @@ -140,7 +142,7 @@ e2e_targets := test-e2e $(e2e_tests) export KIND_CLUSTER := osdk-test KUBEBUILDER_ASSETS = $(PWD)/$(shell go install sigs.k8s.io/controller-runtime/tools/setup-envtest@latest && $(shell go env GOPATH)/bin/setup-envtest use $(K8S_VERSION) --bin-dir tools/bin/ -p path) -test-e2e-setup:: build dev-install cluster-create +test-e2e-setup:: operator-sdk build dev-install cluster-create .PHONY: cluster-create cluster-create:: @@ -162,13 +164,29 @@ test-e2e-teardown: $(e2e_targets):: test-e2e-setup test-e2e:: $(e2e_tests) ## Run e2e tests -test-e2e-ansible:: image/ansible-operator ## Run Ansible e2e tests +test-e2e-ansible:: operator-sdk image/ansible-operator ## Run Ansible e2e tests go test -count=1 ./internal/ansible/proxy/... go test ./test/e2e/ansible -v -ginkgo.v test-e2e-ansible-molecule:: install dev-install image/ansible-operator ## Run molecule-based Ansible e2e tests go run ./hack/generate/samples/molecule/generate.go ./hack/tests/e2e-ansible-molecule.sh +## Location to install dependencies to +LOCALBIN ?= $(shell pwd)/bin +$(LOCALBIN): + mkdir -p $(LOCALBIN) + +.PHONY: operator-sdk +OPERATOR_SDK ?= $(LOCALBIN)/operator-sdk +operator-sdk: ## Download operator-sdk locally if necessary. + @{ \ + set -e ;\ + mkdir -p $(dir $(OPERATOR_SDK)) ;\ + OS=$(shell go env GOOS) && ARCH=$(shell go env GOARCH) && \ + curl -sSLo $(OPERATOR_SDK) https://github.com/operator-framework/operator-sdk/releases/download/$(OPERATOR_SDK_VERSION)/operator-sdk_$${OS}_$${ARCH} ;\ + chmod +x $(OPERATOR_SDK) ;\ + } + .DEFAULT_GOAL := help .PHONY: help help: ## Show this help screen. diff --git a/go.mod b/go.mod index c0ff83a..8650571 100644 --- a/go.mod +++ b/go.mod @@ -19,7 +19,6 @@ require ( github.com/spf13/pflag v1.0.5 github.com/spf13/viper v1.10.0 github.com/stretchr/testify v1.8.2 - github.com/thoas/go-funk v0.8.0 golang.org/x/text v0.9.0 k8s.io/api v0.26.2 k8s.io/apiextensions-apiserver v0.26.2 diff --git a/go.sum b/go.sum index d045f22..d198eae 100644 --- a/go.sum +++ b/go.sum @@ -574,8 +574,6 @@ github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o github.com/subosito/gotenv v1.2.0 h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s= github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww= -github.com/thoas/go-funk v0.8.0 h1:JP9tKSvnpFVclYgDM0Is7FD9M4fhPvqA0s0BsXmzSRQ= -github.com/thoas/go-funk v0.8.0/go.mod h1:+IWnUfUmFO1+WVYQWQtIJHeRRdaIyyYglZN7xzUPe4Q= github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc= github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= diff --git a/internal/plugins/util/legacy_keys.go b/internal/plugins/util/legacy_keys.go deleted file mode 100644 index 1e0da04..0000000 --- a/internal/plugins/util/legacy_keys.go +++ /dev/null @@ -1,93 +0,0 @@ -// Copyright 2021 The Operator-SDK 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 util - -import ( - "errors" - - log "github.com/sirupsen/logrus" - gofunk "github.com/thoas/go-funk" - "sigs.k8s.io/kubebuilder/v3/pkg/config" - cfgv3 "sigs.k8s.io/kubebuilder/v3/pkg/config/v3" -) - -const ( - // The catch-all plugin key for the go/v2+manifests+scorecard plugins. - // Should still be accepted for backwards-compat. - legacyGoPluginKey = "go.sdk.operatorframework.io/v2-alpha" - legacyGoPluginAlphaKey = "go.sdk.operatorframework.io/v2-alpha" - - // Hard-code the latest manifests and scorecard keys here to avoid a circular import. - manifestsKey = "manifests.sdk.operatorframework.io/v2" - scorecardKey = "scorecard.sdk.operatorframework.io/v2" -) - -// Plugin keys that existed when manifests/scorecard keys did not. -var acceptedLayoutKeys = []string{ - "ansible.sdk.operatorframework.io/v1", - "helm.sdk.operatorframework.io/v1", -} - -// UpdateIfLegacyKey returns true if c's "plugins" map or "layout" value contains -// a legacy key that may require this plugin be executed, even if the "manifests" key -// isn't in "plugins". -func UpdateIfLegacyKey(c config.Config) bool { - if c.GetVersion().Compare(cfgv3.Version) < 0 { - return false - } - - if IsGolangLegacyLayout(c) { - return true - } - - chain := c.GetPluginChain() - for _, key := range acceptedLayoutKeys { - if gofunk.ContainsString(chain, key) { - // Encode missing plugin keys. - if !gofunk.ContainsString(chain, manifestsKey) { - if err := c.EncodePluginConfig(manifestsKey, struct{}{}); err != nil { - log.Error(err) - } - } - if !gofunk.ContainsString(chain, scorecardKey) { - if err := c.EncodePluginConfig(scorecardKey, struct{}{}); err != nil { - log.Error(err) - } - } - return true - } - } - - return false -} - -// IsGolangLegacyLayout returns true if c's does not have the plugins -// configuration. -func IsGolangLegacyLayout(c config.Config) bool { - err := c.DecodePluginConfig(legacyGoPluginKey, struct{}{}) - if err == nil || !errors.As(err, &config.PluginKeyNotFoundError{}) { - // There is no way to remove keys from "plugins", so print a warning. - log.Warnf("Plugin key %q is deprecated. Replace this key with %q and %q on separate lines.", - legacyGoPluginKey, manifestsKey, scorecardKey) - return true - } - - err = c.DecodePluginConfig(legacyGoPluginAlphaKey, struct{}{}) - if err == nil || !errors.As(err, &config.PluginKeyNotFoundError{}) { - return true - } - - return false -} diff --git a/internal/testutils/utils.go b/internal/testutils/utils.go index cec6537..c674655 100644 --- a/internal/testutils/utils.go +++ b/internal/testutils/utils.go @@ -29,7 +29,7 @@ import ( kbtestutils "sigs.k8s.io/kubebuilder/v3/test/e2e/utils" ) -const BinaryName = "operator-sdk" +const BinaryName = "bin/operator-sdk" // TestContext wraps kubebuilder's e2e TestContext. type TestContext struct { diff --git a/internal/plugins/ansible/v1/api.go b/pkg/plugins/ansible/v1/api.go similarity index 96% rename from internal/plugins/ansible/v1/api.go rename to pkg/plugins/ansible/v1/api.go index dc70295..37a5500 100644 --- a/internal/plugins/ansible/v1/api.go +++ b/pkg/plugins/ansible/v1/api.go @@ -26,8 +26,8 @@ import ( "sigs.k8s.io/kubebuilder/v3/pkg/plugin" pluginutil "sigs.k8s.io/kubebuilder/v3/pkg/plugin/util" - "github.com/operator-framework/ansible-operator-plugins/internal/plugins/ansible/v1/scaffolds" - "github.com/operator-framework/ansible-operator-plugins/internal/plugins/util" + "github.com/operator-framework/ansible-operator-plugins/pkg/plugins/ansible/v1/scaffolds" + "github.com/operator-framework/ansible-operator-plugins/pkg/plugins/util" ) const ( diff --git a/internal/plugins/ansible/v1/constants/constants.go b/pkg/plugins/ansible/v1/constants/constants.go similarity index 100% rename from internal/plugins/ansible/v1/constants/constants.go rename to pkg/plugins/ansible/v1/constants/constants.go diff --git a/internal/plugins/ansible/v1/init.go b/pkg/plugins/ansible/v1/init.go similarity index 98% rename from internal/plugins/ansible/v1/init.go rename to pkg/plugins/ansible/v1/init.go index c370511..235e63e 100644 --- a/internal/plugins/ansible/v1/init.go +++ b/pkg/plugins/ansible/v1/init.go @@ -25,8 +25,8 @@ import ( "sigs.k8s.io/kubebuilder/v3/pkg/plugin" "sigs.k8s.io/kubebuilder/v3/pkg/plugin/util" - "github.com/operator-framework/ansible-operator-plugins/internal/plugins/ansible/v1/scaffolds" - sdkpluginutil "github.com/operator-framework/ansible-operator-plugins/internal/plugins/util" + "github.com/operator-framework/ansible-operator-plugins/pkg/plugins/ansible/v1/scaffolds" + sdkpluginutil "github.com/operator-framework/ansible-operator-plugins/pkg/plugins/util" ) const ( diff --git a/internal/plugins/ansible/v1/plugin.go b/pkg/plugins/ansible/v1/plugin.go similarity index 95% rename from internal/plugins/ansible/v1/plugin.go rename to pkg/plugins/ansible/v1/plugin.go index 8383c37..43de6cb 100644 --- a/internal/plugins/ansible/v1/plugin.go +++ b/pkg/plugins/ansible/v1/plugin.go @@ -19,7 +19,7 @@ import ( cfgv3 "sigs.k8s.io/kubebuilder/v3/pkg/config/v3" "sigs.k8s.io/kubebuilder/v3/pkg/plugin" - "github.com/operator-framework/ansible-operator-plugins/internal/plugins" + "github.com/operator-framework/ansible-operator-plugins/pkg/plugins" ) const pluginName = "base.ansible" + plugins.DefaultNameQualifier diff --git a/internal/plugins/ansible/v1/scaffolds/api.go b/pkg/plugins/ansible/v1/scaffolds/api.go similarity index 78% rename from internal/plugins/ansible/v1/scaffolds/api.go rename to pkg/plugins/ansible/v1/scaffolds/api.go index faeb718..207b1c5 100644 --- a/internal/plugins/ansible/v1/scaffolds/api.go +++ b/pkg/plugins/ansible/v1/scaffolds/api.go @@ -23,13 +23,13 @@ import ( "sigs.k8s.io/kubebuilder/v3/pkg/model/resource" "sigs.k8s.io/kubebuilder/v3/pkg/plugins" - "github.com/operator-framework/ansible-operator-plugins/internal/plugins/ansible/v1/constants" - "github.com/operator-framework/ansible-operator-plugins/internal/plugins/ansible/v1/scaffolds/internal/templates" - "github.com/operator-framework/ansible-operator-plugins/internal/plugins/ansible/v1/scaffolds/internal/templates/config/crd" - "github.com/operator-framework/ansible-operator-plugins/internal/plugins/ansible/v1/scaffolds/internal/templates/config/rbac" - "github.com/operator-framework/ansible-operator-plugins/internal/plugins/ansible/v1/scaffolds/internal/templates/molecule/mdefault" - "github.com/operator-framework/ansible-operator-plugins/internal/plugins/ansible/v1/scaffolds/internal/templates/playbooks" - ansibleroles "github.com/operator-framework/ansible-operator-plugins/internal/plugins/ansible/v1/scaffolds/internal/templates/roles" + "github.com/operator-framework/ansible-operator-plugins/pkg/plugins/ansible/v1/constants" + "github.com/operator-framework/ansible-operator-plugins/pkg/plugins/ansible/v1/scaffolds/internal/templates" + "github.com/operator-framework/ansible-operator-plugins/pkg/plugins/ansible/v1/scaffolds/internal/templates/config/crd" + "github.com/operator-framework/ansible-operator-plugins/pkg/plugins/ansible/v1/scaffolds/internal/templates/config/rbac" + "github.com/operator-framework/ansible-operator-plugins/pkg/plugins/ansible/v1/scaffolds/internal/templates/molecule/mdefault" + "github.com/operator-framework/ansible-operator-plugins/pkg/plugins/ansible/v1/scaffolds/internal/templates/playbooks" + ansibleroles "github.com/operator-framework/ansible-operator-plugins/pkg/plugins/ansible/v1/scaffolds/internal/templates/roles" ) var _ plugins.Scaffolder = &apiScaffolder{} diff --git a/internal/plugins/ansible/v1/scaffolds/init.go b/pkg/plugins/ansible/v1/scaffolds/init.go similarity index 73% rename from internal/plugins/ansible/v1/scaffolds/init.go rename to pkg/plugins/ansible/v1/scaffolds/init.go index b6c7588..f29ce53 100644 --- a/internal/plugins/ansible/v1/scaffolds/init.go +++ b/pkg/plugins/ansible/v1/scaffolds/init.go @@ -23,15 +23,15 @@ import ( "sigs.k8s.io/kubebuilder/v3/pkg/plugins" kustomizev2Alpha "sigs.k8s.io/kubebuilder/v3/pkg/plugins/common/kustomize/v2-alpha" - "github.com/operator-framework/ansible-operator-plugins/internal/plugins/ansible/v1/scaffolds/internal/templates" - "github.com/operator-framework/ansible-operator-plugins/internal/plugins/ansible/v1/scaffolds/internal/templates/config/rbac" - "github.com/operator-framework/ansible-operator-plugins/internal/plugins/ansible/v1/scaffolds/internal/templates/config/testing" - "github.com/operator-framework/ansible-operator-plugins/internal/plugins/ansible/v1/scaffolds/internal/templates/config/testing/pullpolicy" - "github.com/operator-framework/ansible-operator-plugins/internal/plugins/ansible/v1/scaffolds/internal/templates/molecule/mdefault" - "github.com/operator-framework/ansible-operator-plugins/internal/plugins/ansible/v1/scaffolds/internal/templates/molecule/mkind" - "github.com/operator-framework/ansible-operator-plugins/internal/plugins/ansible/v1/scaffolds/internal/templates/playbooks" - "github.com/operator-framework/ansible-operator-plugins/internal/plugins/ansible/v1/scaffolds/internal/templates/roles" "github.com/operator-framework/ansible-operator-plugins/internal/version" + "github.com/operator-framework/ansible-operator-plugins/pkg/plugins/ansible/v1/scaffolds/internal/templates" + "github.com/operator-framework/ansible-operator-plugins/pkg/plugins/ansible/v1/scaffolds/internal/templates/config/rbac" + "github.com/operator-framework/ansible-operator-plugins/pkg/plugins/ansible/v1/scaffolds/internal/templates/config/testing" + "github.com/operator-framework/ansible-operator-plugins/pkg/plugins/ansible/v1/scaffolds/internal/templates/config/testing/pullpolicy" + "github.com/operator-framework/ansible-operator-plugins/pkg/plugins/ansible/v1/scaffolds/internal/templates/molecule/mdefault" + "github.com/operator-framework/ansible-operator-plugins/pkg/plugins/ansible/v1/scaffolds/internal/templates/molecule/mkind" + "github.com/operator-framework/ansible-operator-plugins/pkg/plugins/ansible/v1/scaffolds/internal/templates/playbooks" + "github.com/operator-framework/ansible-operator-plugins/pkg/plugins/ansible/v1/scaffolds/internal/templates/roles" ) const imageName = "controller:latest" diff --git a/internal/plugins/ansible/v1/scaffolds/internal/templates/config/crd/crd.go b/pkg/plugins/ansible/v1/scaffolds/internal/templates/config/crd/crd.go similarity index 100% rename from internal/plugins/ansible/v1/scaffolds/internal/templates/config/crd/crd.go rename to pkg/plugins/ansible/v1/scaffolds/internal/templates/config/crd/crd.go diff --git a/internal/plugins/ansible/v1/scaffolds/internal/templates/config/crd/kustomization.go b/pkg/plugins/ansible/v1/scaffolds/internal/templates/config/crd/kustomization.go similarity index 100% rename from internal/plugins/ansible/v1/scaffolds/internal/templates/config/crd/kustomization.go rename to pkg/plugins/ansible/v1/scaffolds/internal/templates/config/crd/kustomization.go diff --git a/internal/plugins/ansible/v1/scaffolds/internal/templates/config/rbac/role.go b/pkg/plugins/ansible/v1/scaffolds/internal/templates/config/rbac/role.go similarity index 100% rename from internal/plugins/ansible/v1/scaffolds/internal/templates/config/rbac/role.go rename to pkg/plugins/ansible/v1/scaffolds/internal/templates/config/rbac/role.go diff --git a/internal/plugins/ansible/v1/scaffolds/internal/templates/config/testing/debug_logs_patch.go b/pkg/plugins/ansible/v1/scaffolds/internal/templates/config/testing/debug_logs_patch.go similarity index 100% rename from internal/plugins/ansible/v1/scaffolds/internal/templates/config/testing/debug_logs_patch.go rename to pkg/plugins/ansible/v1/scaffolds/internal/templates/config/testing/debug_logs_patch.go diff --git a/internal/plugins/ansible/v1/scaffolds/internal/templates/config/testing/kustomization.go b/pkg/plugins/ansible/v1/scaffolds/internal/templates/config/testing/kustomization.go similarity index 100% rename from internal/plugins/ansible/v1/scaffolds/internal/templates/config/testing/kustomization.go rename to pkg/plugins/ansible/v1/scaffolds/internal/templates/config/testing/kustomization.go diff --git a/internal/plugins/ansible/v1/scaffolds/internal/templates/config/testing/manager_image.go b/pkg/plugins/ansible/v1/scaffolds/internal/templates/config/testing/manager_image.go similarity index 100% rename from internal/plugins/ansible/v1/scaffolds/internal/templates/config/testing/manager_image.go rename to pkg/plugins/ansible/v1/scaffolds/internal/templates/config/testing/manager_image.go diff --git a/internal/plugins/ansible/v1/scaffolds/internal/templates/config/testing/pullpolicy/always_pull_patch.go b/pkg/plugins/ansible/v1/scaffolds/internal/templates/config/testing/pullpolicy/always_pull_patch.go similarity index 100% rename from internal/plugins/ansible/v1/scaffolds/internal/templates/config/testing/pullpolicy/always_pull_patch.go rename to pkg/plugins/ansible/v1/scaffolds/internal/templates/config/testing/pullpolicy/always_pull_patch.go diff --git a/internal/plugins/ansible/v1/scaffolds/internal/templates/config/testing/pullpolicy/ifnotpresent_pull_patch.go b/pkg/plugins/ansible/v1/scaffolds/internal/templates/config/testing/pullpolicy/ifnotpresent_pull_patch.go similarity index 100% rename from internal/plugins/ansible/v1/scaffolds/internal/templates/config/testing/pullpolicy/ifnotpresent_pull_patch.go rename to pkg/plugins/ansible/v1/scaffolds/internal/templates/config/testing/pullpolicy/ifnotpresent_pull_patch.go diff --git a/internal/plugins/ansible/v1/scaffolds/internal/templates/config/testing/pullpolicy/never_pull_patch.go b/pkg/plugins/ansible/v1/scaffolds/internal/templates/config/testing/pullpolicy/never_pull_patch.go similarity index 100% rename from internal/plugins/ansible/v1/scaffolds/internal/templates/config/testing/pullpolicy/never_pull_patch.go rename to pkg/plugins/ansible/v1/scaffolds/internal/templates/config/testing/pullpolicy/never_pull_patch.go diff --git a/internal/plugins/ansible/v1/scaffolds/internal/templates/dockerfile.go b/pkg/plugins/ansible/v1/scaffolds/internal/templates/dockerfile.go similarity index 95% rename from internal/plugins/ansible/v1/scaffolds/internal/templates/dockerfile.go rename to pkg/plugins/ansible/v1/scaffolds/internal/templates/dockerfile.go index 5227ec1..a575bbc 100644 --- a/internal/plugins/ansible/v1/scaffolds/internal/templates/dockerfile.go +++ b/pkg/plugins/ansible/v1/scaffolds/internal/templates/dockerfile.go @@ -19,7 +19,7 @@ import ( "sigs.k8s.io/kubebuilder/v3/pkg/machinery" - "github.com/operator-framework/ansible-operator-plugins/internal/plugins/ansible/v1/constants" + "github.com/operator-framework/ansible-operator-plugins/pkg/plugins/ansible/v1/constants" ) var _ machinery.Template = &Dockerfile{} diff --git a/internal/plugins/ansible/v1/scaffolds/internal/templates/gitignore.go b/pkg/plugins/ansible/v1/scaffolds/internal/templates/gitignore.go similarity index 100% rename from internal/plugins/ansible/v1/scaffolds/internal/templates/gitignore.go rename to pkg/plugins/ansible/v1/scaffolds/internal/templates/gitignore.go diff --git a/internal/plugins/ansible/v1/scaffolds/internal/templates/makefile.go b/pkg/plugins/ansible/v1/scaffolds/internal/templates/makefile.go similarity index 100% rename from internal/plugins/ansible/v1/scaffolds/internal/templates/makefile.go rename to pkg/plugins/ansible/v1/scaffolds/internal/templates/makefile.go diff --git a/internal/plugins/ansible/v1/scaffolds/internal/templates/molecule/mdefault/converge.go b/pkg/plugins/ansible/v1/scaffolds/internal/templates/molecule/mdefault/converge.go similarity index 100% rename from internal/plugins/ansible/v1/scaffolds/internal/templates/molecule/mdefault/converge.go rename to pkg/plugins/ansible/v1/scaffolds/internal/templates/molecule/mdefault/converge.go diff --git a/internal/plugins/ansible/v1/scaffolds/internal/templates/molecule/mdefault/create.go b/pkg/plugins/ansible/v1/scaffolds/internal/templates/molecule/mdefault/create.go similarity index 100% rename from internal/plugins/ansible/v1/scaffolds/internal/templates/molecule/mdefault/create.go rename to pkg/plugins/ansible/v1/scaffolds/internal/templates/molecule/mdefault/create.go diff --git a/internal/plugins/ansible/v1/scaffolds/internal/templates/molecule/mdefault/destroy.go b/pkg/plugins/ansible/v1/scaffolds/internal/templates/molecule/mdefault/destroy.go similarity index 100% rename from internal/plugins/ansible/v1/scaffolds/internal/templates/molecule/mdefault/destroy.go rename to pkg/plugins/ansible/v1/scaffolds/internal/templates/molecule/mdefault/destroy.go diff --git a/internal/plugins/ansible/v1/scaffolds/internal/templates/molecule/mdefault/kustomize.go b/pkg/plugins/ansible/v1/scaffolds/internal/templates/molecule/mdefault/kustomize.go similarity index 100% rename from internal/plugins/ansible/v1/scaffolds/internal/templates/molecule/mdefault/kustomize.go rename to pkg/plugins/ansible/v1/scaffolds/internal/templates/molecule/mdefault/kustomize.go diff --git a/internal/plugins/ansible/v1/scaffolds/internal/templates/molecule/mdefault/molecule.go b/pkg/plugins/ansible/v1/scaffolds/internal/templates/molecule/mdefault/molecule.go similarity index 100% rename from internal/plugins/ansible/v1/scaffolds/internal/templates/molecule/mdefault/molecule.go rename to pkg/plugins/ansible/v1/scaffolds/internal/templates/molecule/mdefault/molecule.go diff --git a/internal/plugins/ansible/v1/scaffolds/internal/templates/molecule/mdefault/prepare.go b/pkg/plugins/ansible/v1/scaffolds/internal/templates/molecule/mdefault/prepare.go similarity index 100% rename from internal/plugins/ansible/v1/scaffolds/internal/templates/molecule/mdefault/prepare.go rename to pkg/plugins/ansible/v1/scaffolds/internal/templates/molecule/mdefault/prepare.go diff --git a/internal/plugins/ansible/v1/scaffolds/internal/templates/molecule/mdefault/tasks_test_resource.go b/pkg/plugins/ansible/v1/scaffolds/internal/templates/molecule/mdefault/tasks_test_resource.go similarity index 100% rename from internal/plugins/ansible/v1/scaffolds/internal/templates/molecule/mdefault/tasks_test_resource.go rename to pkg/plugins/ansible/v1/scaffolds/internal/templates/molecule/mdefault/tasks_test_resource.go diff --git a/internal/plugins/ansible/v1/scaffolds/internal/templates/molecule/mdefault/verify.go b/pkg/plugins/ansible/v1/scaffolds/internal/templates/molecule/mdefault/verify.go similarity index 100% rename from internal/plugins/ansible/v1/scaffolds/internal/templates/molecule/mdefault/verify.go rename to pkg/plugins/ansible/v1/scaffolds/internal/templates/molecule/mdefault/verify.go diff --git a/internal/plugins/ansible/v1/scaffolds/internal/templates/molecule/mkind/converge.go b/pkg/plugins/ansible/v1/scaffolds/internal/templates/molecule/mkind/converge.go similarity index 100% rename from internal/plugins/ansible/v1/scaffolds/internal/templates/molecule/mkind/converge.go rename to pkg/plugins/ansible/v1/scaffolds/internal/templates/molecule/mkind/converge.go diff --git a/internal/plugins/ansible/v1/scaffolds/internal/templates/molecule/mkind/create.go b/pkg/plugins/ansible/v1/scaffolds/internal/templates/molecule/mkind/create.go similarity index 100% rename from internal/plugins/ansible/v1/scaffolds/internal/templates/molecule/mkind/create.go rename to pkg/plugins/ansible/v1/scaffolds/internal/templates/molecule/mkind/create.go diff --git a/internal/plugins/ansible/v1/scaffolds/internal/templates/molecule/mkind/destroy.go b/pkg/plugins/ansible/v1/scaffolds/internal/templates/molecule/mkind/destroy.go similarity index 100% rename from internal/plugins/ansible/v1/scaffolds/internal/templates/molecule/mkind/destroy.go rename to pkg/plugins/ansible/v1/scaffolds/internal/templates/molecule/mkind/destroy.go diff --git a/internal/plugins/ansible/v1/scaffolds/internal/templates/molecule/mkind/molecule.go b/pkg/plugins/ansible/v1/scaffolds/internal/templates/molecule/mkind/molecule.go similarity index 100% rename from internal/plugins/ansible/v1/scaffolds/internal/templates/molecule/mkind/molecule.go rename to pkg/plugins/ansible/v1/scaffolds/internal/templates/molecule/mkind/molecule.go diff --git a/internal/plugins/ansible/v1/scaffolds/internal/templates/playbooks/placeholder.go b/pkg/plugins/ansible/v1/scaffolds/internal/templates/playbooks/placeholder.go similarity index 100% rename from internal/plugins/ansible/v1/scaffolds/internal/templates/playbooks/placeholder.go rename to pkg/plugins/ansible/v1/scaffolds/internal/templates/playbooks/placeholder.go diff --git a/internal/plugins/ansible/v1/scaffolds/internal/templates/playbooks/playbook.go b/pkg/plugins/ansible/v1/scaffolds/internal/templates/playbooks/playbook.go similarity index 100% rename from internal/plugins/ansible/v1/scaffolds/internal/templates/playbooks/playbook.go rename to pkg/plugins/ansible/v1/scaffolds/internal/templates/playbooks/playbook.go diff --git a/internal/plugins/ansible/v1/scaffolds/internal/templates/requirements.go b/pkg/plugins/ansible/v1/scaffolds/internal/templates/requirements.go similarity index 100% rename from internal/plugins/ansible/v1/scaffolds/internal/templates/requirements.go rename to pkg/plugins/ansible/v1/scaffolds/internal/templates/requirements.go diff --git a/internal/plugins/ansible/v1/scaffolds/internal/templates/roles/defaults_main.go b/pkg/plugins/ansible/v1/scaffolds/internal/templates/roles/defaults_main.go similarity index 92% rename from internal/plugins/ansible/v1/scaffolds/internal/templates/roles/defaults_main.go rename to pkg/plugins/ansible/v1/scaffolds/internal/templates/roles/defaults_main.go index 06a2d1e..dd25256 100644 --- a/internal/plugins/ansible/v1/scaffolds/internal/templates/roles/defaults_main.go +++ b/pkg/plugins/ansible/v1/scaffolds/internal/templates/roles/defaults_main.go @@ -19,7 +19,7 @@ import ( "sigs.k8s.io/kubebuilder/v3/pkg/machinery" - "github.com/operator-framework/ansible-operator-plugins/internal/plugins/ansible/v1/constants" + "github.com/operator-framework/ansible-operator-plugins/pkg/plugins/ansible/v1/constants" ) var _ machinery.Template = &DefaultsMain{} diff --git a/internal/plugins/ansible/v1/scaffolds/internal/templates/roles/files_dir.go b/pkg/plugins/ansible/v1/scaffolds/internal/templates/roles/files_dir.go similarity index 92% rename from internal/plugins/ansible/v1/scaffolds/internal/templates/roles/files_dir.go rename to pkg/plugins/ansible/v1/scaffolds/internal/templates/roles/files_dir.go index 02f607c..f77124b 100644 --- a/internal/plugins/ansible/v1/scaffolds/internal/templates/roles/files_dir.go +++ b/pkg/plugins/ansible/v1/scaffolds/internal/templates/roles/files_dir.go @@ -19,7 +19,7 @@ import ( "sigs.k8s.io/kubebuilder/v3/pkg/machinery" - "github.com/operator-framework/ansible-operator-plugins/internal/plugins/ansible/v1/constants" + "github.com/operator-framework/ansible-operator-plugins/pkg/plugins/ansible/v1/constants" ) var _ machinery.Template = &RoleFiles{} diff --git a/internal/plugins/ansible/v1/scaffolds/internal/templates/roles/handlers_main.go b/pkg/plugins/ansible/v1/scaffolds/internal/templates/roles/handlers_main.go similarity index 92% rename from internal/plugins/ansible/v1/scaffolds/internal/templates/roles/handlers_main.go rename to pkg/plugins/ansible/v1/scaffolds/internal/templates/roles/handlers_main.go index 75e8370..17f7484 100644 --- a/internal/plugins/ansible/v1/scaffolds/internal/templates/roles/handlers_main.go +++ b/pkg/plugins/ansible/v1/scaffolds/internal/templates/roles/handlers_main.go @@ -19,7 +19,7 @@ import ( "sigs.k8s.io/kubebuilder/v3/pkg/machinery" - "github.com/operator-framework/ansible-operator-plugins/internal/plugins/ansible/v1/constants" + "github.com/operator-framework/ansible-operator-plugins/pkg/plugins/ansible/v1/constants" ) var _ machinery.Template = &HandlersMain{} diff --git a/internal/plugins/ansible/v1/scaffolds/internal/templates/roles/meta_main.go b/pkg/plugins/ansible/v1/scaffolds/internal/templates/roles/meta_main.go similarity index 97% rename from internal/plugins/ansible/v1/scaffolds/internal/templates/roles/meta_main.go rename to pkg/plugins/ansible/v1/scaffolds/internal/templates/roles/meta_main.go index 3f159e2..0a90ea5 100644 --- a/internal/plugins/ansible/v1/scaffolds/internal/templates/roles/meta_main.go +++ b/pkg/plugins/ansible/v1/scaffolds/internal/templates/roles/meta_main.go @@ -19,7 +19,7 @@ import ( "sigs.k8s.io/kubebuilder/v3/pkg/machinery" - "github.com/operator-framework/ansible-operator-plugins/internal/plugins/ansible/v1/constants" + "github.com/operator-framework/ansible-operator-plugins/pkg/plugins/ansible/v1/constants" ) var _ machinery.Template = &MetaMain{} diff --git a/internal/plugins/ansible/v1/scaffolds/internal/templates/roles/placeholder.go b/pkg/plugins/ansible/v1/scaffolds/internal/templates/roles/placeholder.go similarity index 100% rename from internal/plugins/ansible/v1/scaffolds/internal/templates/roles/placeholder.go rename to pkg/plugins/ansible/v1/scaffolds/internal/templates/roles/placeholder.go diff --git a/internal/plugins/ansible/v1/scaffolds/internal/templates/roles/readme.go b/pkg/plugins/ansible/v1/scaffolds/internal/templates/roles/readme.go similarity index 96% rename from internal/plugins/ansible/v1/scaffolds/internal/templates/roles/readme.go rename to pkg/plugins/ansible/v1/scaffolds/internal/templates/roles/readme.go index 154a2e6..1d6d903 100644 --- a/internal/plugins/ansible/v1/scaffolds/internal/templates/roles/readme.go +++ b/pkg/plugins/ansible/v1/scaffolds/internal/templates/roles/readme.go @@ -19,7 +19,7 @@ import ( "sigs.k8s.io/kubebuilder/v3/pkg/machinery" - "github.com/operator-framework/ansible-operator-plugins/internal/plugins/ansible/v1/constants" + "github.com/operator-framework/ansible-operator-plugins/pkg/plugins/ansible/v1/constants" ) const ReadmePath = "README.md" diff --git a/internal/plugins/ansible/v1/scaffolds/internal/templates/roles/tasks_main.go b/pkg/plugins/ansible/v1/scaffolds/internal/templates/roles/tasks_main.go similarity index 92% rename from internal/plugins/ansible/v1/scaffolds/internal/templates/roles/tasks_main.go rename to pkg/plugins/ansible/v1/scaffolds/internal/templates/roles/tasks_main.go index 760f3d7..244a872 100644 --- a/internal/plugins/ansible/v1/scaffolds/internal/templates/roles/tasks_main.go +++ b/pkg/plugins/ansible/v1/scaffolds/internal/templates/roles/tasks_main.go @@ -19,7 +19,7 @@ import ( "sigs.k8s.io/kubebuilder/v3/pkg/machinery" - "github.com/operator-framework/ansible-operator-plugins/internal/plugins/ansible/v1/constants" + "github.com/operator-framework/ansible-operator-plugins/pkg/plugins/ansible/v1/constants" ) var _ machinery.Template = &TasksMain{} diff --git a/internal/plugins/ansible/v1/scaffolds/internal/templates/roles/templates_dir.go b/pkg/plugins/ansible/v1/scaffolds/internal/templates/roles/templates_dir.go similarity index 92% rename from internal/plugins/ansible/v1/scaffolds/internal/templates/roles/templates_dir.go rename to pkg/plugins/ansible/v1/scaffolds/internal/templates/roles/templates_dir.go index cd63197..4ca7218 100644 --- a/internal/plugins/ansible/v1/scaffolds/internal/templates/roles/templates_dir.go +++ b/pkg/plugins/ansible/v1/scaffolds/internal/templates/roles/templates_dir.go @@ -19,7 +19,7 @@ import ( "sigs.k8s.io/kubebuilder/v3/pkg/machinery" - "github.com/operator-framework/ansible-operator-plugins/internal/plugins/ansible/v1/constants" + "github.com/operator-framework/ansible-operator-plugins/pkg/plugins/ansible/v1/constants" ) var _ machinery.Template = &RoleTemplates{} diff --git a/internal/plugins/ansible/v1/scaffolds/internal/templates/roles/vars_main.go b/pkg/plugins/ansible/v1/scaffolds/internal/templates/roles/vars_main.go similarity index 92% rename from internal/plugins/ansible/v1/scaffolds/internal/templates/roles/vars_main.go rename to pkg/plugins/ansible/v1/scaffolds/internal/templates/roles/vars_main.go index 537c42c..2d2902f 100644 --- a/internal/plugins/ansible/v1/scaffolds/internal/templates/roles/vars_main.go +++ b/pkg/plugins/ansible/v1/scaffolds/internal/templates/roles/vars_main.go @@ -19,7 +19,7 @@ import ( "sigs.k8s.io/kubebuilder/v3/pkg/machinery" - "github.com/operator-framework/ansible-operator-plugins/internal/plugins/ansible/v1/constants" + "github.com/operator-framework/ansible-operator-plugins/pkg/plugins/ansible/v1/constants" ) var _ machinery.Template = &VarsMain{} diff --git a/internal/plugins/ansible/v1/scaffolds/internal/templates/watches.go b/pkg/plugins/ansible/v1/scaffolds/internal/templates/watches.go similarity index 100% rename from internal/plugins/ansible/v1/scaffolds/internal/templates/watches.go rename to pkg/plugins/ansible/v1/scaffolds/internal/templates/watches.go diff --git a/internal/plugins/plugins.go b/pkg/plugins/plugins.go similarity index 100% rename from internal/plugins/plugins.go rename to pkg/plugins/plugins.go diff --git a/internal/plugins/util/cleanup.go b/pkg/plugins/util/cleanup.go similarity index 100% rename from internal/plugins/util/cleanup.go rename to pkg/plugins/util/cleanup.go diff --git a/internal/plugins/util/message.go b/pkg/plugins/util/message.go similarity index 100% rename from internal/plugins/util/message.go rename to pkg/plugins/util/message.go diff --git a/test/e2e/ansible/scorecard_test.go b/test/e2e/ansible/scorecard_test.go index f39d551..f17ec21 100644 --- a/test/e2e/ansible/scorecard_test.go +++ b/test/e2e/ansible/scorecard_test.go @@ -14,10 +14,9 @@ package e2e_ansible_test -import ( - . "github.com/onsi/ginkgo/v2" +// import ( +// . "github.com/onsi/ginkgo/v2" +// ) - "github.com/operator-framework/ansible-operator-plugins/test/common" -) - -var _ = Describe("scorecard", common.ScorecardSpec(&tc, "ansible")) +// For now don't run Scorecard tests +// var _ = Describe("scorecard", common.ScorecardSpec(&tc, "ansible")) diff --git a/test/e2e/ansible/suite_test.go b/test/e2e/ansible/suite_test.go index 25c6a2c..9db22f7 100644 --- a/test/e2e/ansible/suite_test.go +++ b/test/e2e/ansible/suite_test.go @@ -17,6 +17,7 @@ package e2e_ansible_test import ( "fmt" "os/exec" + "path" "path/filepath" "strings" "testing" @@ -46,9 +47,11 @@ var _ = BeforeSuite(func() { var err error By("creating a new test context") - tc, err = testutils.NewTestContext(testutils.BinaryName, "GO111MODULE=on") + tc, err = testutils.NewTestContext(path.Join("../../../../", testutils.BinaryName), "GO111MODULE=on") Expect(err).NotTo(HaveOccurred()) + fmt.Println(tc.Dir) + tc.Domain = "example.com" tc.Version = "v1alpha1" tc.Group = "cache" @@ -140,14 +143,6 @@ var _ = BeforeSuite(func() { err = tc.Make("docker-build", "IMG="+tc.ImageName) Expect(err).NotTo(HaveOccurred()) - onKind, err := tc.IsRunningOnKind() - Expect(err).NotTo(HaveOccurred()) - if onKind { - By("loading the required images into Kind cluster") - Expect(tc.LoadImageToKindCluster()).To(Succeed()) - Expect(tc.LoadImageToKindClusterWithName("quay.io/operator-framework/scorecard-test:dev")).To(Succeed()) - } - By("generating bundle") Expect(tc.GenerateBundle()).To(Succeed()) }) diff --git a/testdata/ansible/memcached-operator/Dockerfile b/testdata/ansible/memcached-operator/Dockerfile index 4fb6c38..fe7cfbf 100644 --- a/testdata/ansible/memcached-operator/Dockerfile +++ b/testdata/ansible/memcached-operator/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/operator-framework/ansible-operator:v1.30.0 +FROM quay.io/operator-framework/ansible-operator:v1.31.0 COPY requirements.yml ${HOME}/requirements.yml RUN ansible-galaxy collection install -r ${HOME}/requirements.yml \ diff --git a/testdata/ansible/memcached-operator/Makefile b/testdata/ansible/memcached-operator/Makefile index e7aee60..21e4773 100644 --- a/testdata/ansible/memcached-operator/Makefile +++ b/testdata/ansible/memcached-operator/Makefile @@ -48,7 +48,7 @@ endif # Set the Operator SDK version to use. By default, what is installed on the system is used. # This is useful for CI or a project to utilize a specific version of the operator-sdk toolkit. -OPERATOR_SDK_VERSION ?= v1.30.0 +OPERATOR_SDK_VERSION ?= v1.31.0 # Image URL to use all building/pushing image targets IMG ?= controller:latest @@ -151,7 +151,7 @@ ifeq (,$(shell which ansible-operator 2>/dev/null)) @{ \ set -e ;\ mkdir -p $(dir $(ANSIBLE_OPERATOR)) ;\ - curl -sSLo $(ANSIBLE_OPERATOR) https://github.com/operator-framework/operator-sdk/releases/download/v1.30.0/ansible-operator_$(OS)_$(ARCH) ;\ + curl -sSLo $(ANSIBLE_OPERATOR) https://github.com/operator-framework/operator-sdk/releases/download/v1.31.0/ansible-operator_$(OS)_$(ARCH) ;\ chmod +x $(ANSIBLE_OPERATOR) ;\ } else diff --git a/testdata/ansible/memcached-operator/bundle/tests/scorecard/config.yaml b/testdata/ansible/memcached-operator/bundle/tests/scorecard/config.yaml index 104883e..0c0690c 100644 --- a/testdata/ansible/memcached-operator/bundle/tests/scorecard/config.yaml +++ b/testdata/ansible/memcached-operator/bundle/tests/scorecard/config.yaml @@ -8,7 +8,7 @@ stages: - entrypoint: - scorecard-test - basic-check-spec - image: quay.io/operator-framework/scorecard-test:v1.30.0 + image: quay.io/operator-framework/scorecard-test:v1.31.0 labels: suite: basic test: basic-check-spec-test @@ -18,7 +18,7 @@ stages: - entrypoint: - scorecard-test - olm-bundle-validation - image: quay.io/operator-framework/scorecard-test:v1.30.0 + image: quay.io/operator-framework/scorecard-test:v1.31.0 labels: suite: olm test: olm-bundle-validation-test @@ -28,7 +28,7 @@ stages: - entrypoint: - scorecard-test - olm-crds-have-validation - image: quay.io/operator-framework/scorecard-test:v1.30.0 + image: quay.io/operator-framework/scorecard-test:v1.31.0 labels: suite: olm test: olm-crds-have-validation-test @@ -38,7 +38,7 @@ stages: - entrypoint: - scorecard-test - olm-crds-have-resources - image: quay.io/operator-framework/scorecard-test:v1.30.0 + image: quay.io/operator-framework/scorecard-test:v1.31.0 labels: suite: olm test: olm-crds-have-resources-test @@ -48,7 +48,7 @@ stages: - entrypoint: - scorecard-test - olm-spec-descriptors - image: quay.io/operator-framework/scorecard-test:v1.30.0 + image: quay.io/operator-framework/scorecard-test:v1.31.0 labels: suite: olm test: olm-spec-descriptors-test @@ -58,7 +58,7 @@ stages: - entrypoint: - scorecard-test - olm-status-descriptors - image: quay.io/operator-framework/scorecard-test:v1.30.0 + image: quay.io/operator-framework/scorecard-test:v1.31.0 labels: suite: olm test: olm-status-descriptors-test diff --git a/testdata/ansible/memcached-operator/config/scorecard/patches/basic.config.yaml b/testdata/ansible/memcached-operator/config/scorecard/patches/basic.config.yaml index c95b4ec..04b59f3 100644 --- a/testdata/ansible/memcached-operator/config/scorecard/patches/basic.config.yaml +++ b/testdata/ansible/memcached-operator/config/scorecard/patches/basic.config.yaml @@ -4,7 +4,7 @@ entrypoint: - scorecard-test - basic-check-spec - image: quay.io/operator-framework/scorecard-test:v1.30.0 + image: quay.io/operator-framework/scorecard-test:v1.31.0 labels: suite: basic test: basic-check-spec-test diff --git a/testdata/ansible/memcached-operator/config/scorecard/patches/olm.config.yaml b/testdata/ansible/memcached-operator/config/scorecard/patches/olm.config.yaml index f6607c2..8f1c952 100644 --- a/testdata/ansible/memcached-operator/config/scorecard/patches/olm.config.yaml +++ b/testdata/ansible/memcached-operator/config/scorecard/patches/olm.config.yaml @@ -4,7 +4,7 @@ entrypoint: - scorecard-test - olm-bundle-validation - image: quay.io/operator-framework/scorecard-test:v1.30.0 + image: quay.io/operator-framework/scorecard-test:v1.31.0 labels: suite: olm test: olm-bundle-validation-test @@ -14,7 +14,7 @@ entrypoint: - scorecard-test - olm-crds-have-validation - image: quay.io/operator-framework/scorecard-test:v1.30.0 + image: quay.io/operator-framework/scorecard-test:v1.31.0 labels: suite: olm test: olm-crds-have-validation-test @@ -24,7 +24,7 @@ entrypoint: - scorecard-test - olm-crds-have-resources - image: quay.io/operator-framework/scorecard-test:v1.30.0 + image: quay.io/operator-framework/scorecard-test:v1.31.0 labels: suite: olm test: olm-crds-have-resources-test @@ -34,7 +34,7 @@ entrypoint: - scorecard-test - olm-spec-descriptors - image: quay.io/operator-framework/scorecard-test:v1.30.0 + image: quay.io/operator-framework/scorecard-test:v1.31.0 labels: suite: olm test: olm-spec-descriptors-test @@ -44,7 +44,7 @@ entrypoint: - scorecard-test - olm-status-descriptors - image: quay.io/operator-framework/scorecard-test:v1.30.0 + image: quay.io/operator-framework/scorecard-test:v1.31.0 labels: suite: olm test: olm-status-descriptors-test diff --git a/testdata/ansible/memcached-operator/molecule/default/molecule.yml b/testdata/ansible/memcached-operator/molecule/default/molecule.yml index ea58004..91fcfca 100644 --- a/testdata/ansible/memcached-operator/molecule/default/molecule.yml +++ b/testdata/ansible/memcached-operator/molecule/default/molecule.yml @@ -3,18 +3,12 @@ dependency: name: galaxy driver: name: delegated -lint: | - set -e - yamllint -d "{extends: relaxed, rules: {line-length: {max: 120}}}" . platforms: - name: cluster groups: - k8s provisioner: name: ansible - lint: | - set -e - ansible-lint inventory: group_vars: all: @@ -31,6 +25,3 @@ provisioner: K8S_AUTH_KUBECONFIG: ${KUBECONFIG:-"~/.kube/config"} verifier: name: ansible - lint: | - set -e - ansible-lint diff --git a/testdata/ansible/memcached-operator/requirements.yml b/testdata/ansible/memcached-operator/requirements.yml index 6fcdac3..8baf919 100644 --- a/testdata/ansible/memcached-operator/requirements.yml +++ b/testdata/ansible/memcached-operator/requirements.yml @@ -1,7 +1,7 @@ --- collections: - name: operator_sdk.util - version: "0.4.0" + version: "0.5.0" - name: kubernetes.core version: "2.4.0" - name: cloud.common