operator-framework · jmccormick2001 · Jul 16, 2020 · Jul 16, 2020 · Jul 16, 2020 · Jul 16, 2020
diff --git a/changelog/fragments/scorecard-move-alpha.yaml b/changelog/fragments/scorecard-move-alpha.yaml
@@ -0,0 +1,27 @@
+entries:
+  - description: >
+      Changes the alpha scorecard command to become the standard scorecard 
+      command.  
+
+    kind: "change"
+
+    # Is this a breaking change?
+    breaking: true
+
+    # NOTE: ONLY USE `pull_request_override` WHEN ADDING THIS
+    # FILE FOR A PREVIOUSLY MERGED PULL_REQUEST!
+    #
+    # The generator auto-detects the PR number from the commit
+    # message in which this file was originally added.
+    #
+    # What is the pull request number (without the "#")?
+    # pull_request_override: 0
+
+
+    # Migration can be defined to automatically add a section to
+    # the migration guide. This is required for breaking changes.
+    migration:
+      header: Move scorecard/alpha to scorecard
+      body: |
+        If you referenced 'operator-sdk alpha scorecard', you will
+        need to update them to use 'operator-sdk scorecard'.
diff --git a/cmd/operator-sdk/alpha/alpha_suite_test.go b/cmd/operator-sdk/alpha/alpha_suite_test.go
diff --git a/cmd/operator-sdk/alpha/cmd.go b/cmd/operator-sdk/alpha/cmd.go
diff --git a/cmd/operator-sdk/alpha/cmd_test.go b/cmd/operator-sdk/alpha/cmd_test.go
diff --git a/cmd/operator-sdk/bundle/create.go b/cmd/operator-sdk/bundle/create.go
@@ -28,7 +28,7 @@ import (
 
 	"github.com/blang/semver"
 	"github.com/operator-framework/operator-registry/pkg/lib/bundle"
-	scorecard "github.com/operator-framework/operator-sdk/internal/scorecard/alpha"
+	"github.com/operator-framework/operator-sdk/internal/scorecard"
 	log "github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"

diff --git a/cmd/operator-sdk/cli/cli.go b/cmd/operator-sdk/cli/cli.go
@@ -15,7 +15,6 @@
 package cli
 
 import (
-	"github.com/operator-framework/operator-sdk/cmd/operator-sdk/alpha"
 	"github.com/operator-framework/operator-sdk/cmd/operator-sdk/build"
 	"github.com/operator-framework/operator-sdk/cmd/operator-sdk/bundle"
 	"github.com/operator-framework/operator-sdk/cmd/operator-sdk/cleanup"
@@ -24,6 +23,7 @@ import (
 	"github.com/operator-framework/operator-sdk/cmd/operator-sdk/new"
 	"github.com/operator-framework/operator-sdk/cmd/operator-sdk/olm"
 	"github.com/operator-framework/operator-sdk/cmd/operator-sdk/run"
+	"github.com/operator-framework/operator-sdk/cmd/operator-sdk/scorecard"
 	"github.com/operator-framework/operator-sdk/cmd/operator-sdk/version"
 	"github.com/operator-framework/operator-sdk/internal/flags"
 	golangv2 "github.com/operator-framework/operator-sdk/internal/plugins/golang/v2"
@@ -40,8 +40,7 @@ var commands = []*cobra.Command{
 	// The "new" cmd provides a way to scaffold Helm/Ansible projects
 	// from the new CLI.
 	new.NewCmd(),
-
-	alpha.NewCmd(),
+	scorecard.NewCmd(),
 	build.NewCmd(),
 	bundle.NewCmd(),
 	cleanup.NewCmd(),

diff --git a/cmd/operator-sdk/cli/legacy.go b/cmd/operator-sdk/cli/legacy.go
@@ -20,13 +20,13 @@ import (
 	"github.com/spf13/viper"
 
 	"github.com/operator-framework/operator-sdk/cmd/operator-sdk/add"
-	"github.com/operator-framework/operator-sdk/cmd/operator-sdk/alpha"
 	"github.com/operator-framework/operator-sdk/cmd/operator-sdk/build"
 	"github.com/operator-framework/operator-sdk/cmd/operator-sdk/bundle"
 	"github.com/operator-framework/operator-sdk/cmd/operator-sdk/completion"
 	"github.com/operator-framework/operator-sdk/cmd/operator-sdk/generate"
 	"github.com/operator-framework/operator-sdk/cmd/operator-sdk/new"
 	"github.com/operator-framework/operator-sdk/cmd/operator-sdk/olm"
+	"github.com/operator-framework/operator-sdk/cmd/operator-sdk/scorecard"
 	"github.com/operator-framework/operator-sdk/cmd/operator-sdk/version"
 	"github.com/operator-framework/operator-sdk/internal/flags"
 	"github.com/operator-framework/operator-sdk/internal/util/projutil"
@@ -64,9 +64,9 @@ func GetCLIRoot() *cobra.Command {
 
 	root.AddCommand(
 		add.NewCmd(),
-		alpha.NewCmd(),
 		build.NewCmd(),
 		bundle.NewCmdLegacy(),
+		scorecard.NewCmd(),
 		completion.NewCmd(),
 		generate.NewCmdLegacy(),
 		new.NewCmd(),

diff --git a/cmd/operator-sdk/alpha/scorecard/cmd.go → cmd/operator-sdk/scorecard/cmd.go b/cmd/operator-sdk/alpha/scorecard/cmd.go → cmd/operator-sdk/scorecard/cmd.go
@@ -31,7 +31,7 @@ import (
 
 	"github.com/operator-framework/operator-sdk/internal/flags"
 	registryutil "github.com/operator-framework/operator-sdk/internal/registry"
-	scorecard "github.com/operator-framework/operator-sdk/internal/scorecard/alpha"
+	"github.com/operator-framework/operator-sdk/internal/scorecard"
 	"github.com/operator-framework/operator-sdk/pkg/apis/scorecard/v1alpha3"
 )
 

diff --git a/cmd/operator-sdk/alpha/scorecard/cmd_test.go → cmd/operator-sdk/scorecard/cmd_test.go b/cmd/operator-sdk/alpha/scorecard/cmd_test.go → cmd/operator-sdk/scorecard/cmd_test.go
@@ -19,7 +19,7 @@ import (
 	. "github.com/onsi/gomega"
 )
 
-var _ = Describe("Running an alpha scorecard command", func() {
+var _ = Describe("Running the scorecard command", func() {
 	Describe("NewCmd", func() {
 		It("builds and returns a cobra command", func() {
 			cmd := NewCmd()

diff --git a/...k/alpha/scorecard/scorecard_suite_test.go → ...tor-sdk/scorecard/scorecard_suite_test.go b/...k/alpha/scorecard/scorecard_suite_test.go → ...tor-sdk/scorecard/scorecard_suite_test.go
diff --git a/images/scorecard-test/cmd/test/main.go b/images/scorecard-test/cmd/test/main.go
@@ -23,8 +23,8 @@ import (
 	apimanifests "github.com/operator-framework/api/pkg/manifests"
 
 	registryutil "github.com/operator-framework/operator-sdk/internal/registry"
-	scorecard "github.com/operator-framework/operator-sdk/internal/scorecard/alpha"
-	"github.com/operator-framework/operator-sdk/internal/scorecard/alpha/tests"
+	"github.com/operator-framework/operator-sdk/internal/scorecard"
+	"github.com/operator-framework/operator-sdk/internal/scorecard/tests"
 	scapiv1alpha3 "github.com/operator-framework/operator-sdk/pkg/apis/scorecard/v1alpha3"
 )
 

diff --git a/internal/scorecard/alpha/bundle.go → internal/scorecard/bundle.go b/internal/scorecard/alpha/bundle.go → internal/scorecard/bundle.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package alpha
+package scorecard
 
 import (
 	"archive/tar"

diff --git a/internal/scorecard/alpha/bundle_test.go → internal/scorecard/bundle_test.go b/internal/scorecard/alpha/bundle_test.go → internal/scorecard/bundle_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package alpha
+package scorecard
 
 import (
 	"archive/tar"

diff --git a/internal/scorecard/alpha/config.go → internal/scorecard/config.go b/internal/scorecard/alpha/config.go → internal/scorecard/config.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package alpha
+package scorecard
 
 import (
 	"io/ioutil"

diff --git a/internal/scorecard/alpha/config_test.go → internal/scorecard/config_test.go b/internal/scorecard/alpha/config_test.go → internal/scorecard/config_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package alpha
+package scorecard
 
 import (
 	"testing"

diff --git a/.../examples/custom-scorecard-tests/Makefile → .../examples/custom-scorecard-tests/Makefile b/.../examples/custom-scorecard-tests/Makefile → .../examples/custom-scorecard-tests/Makefile
diff --git a/...sts/cache.example.com_memcacheds_crd.yaml → ...sts/cache.example.com_memcacheds_crd.yaml b/...sts/cache.example.com_memcacheds_crd.yaml → ...sts/cache.example.com_memcacheds_crd.yaml
diff --git a/...ached-operator.clusterserviceversion.yaml → ...ached-operator.clusterserviceversion.yaml b/...ached-operator.clusterserviceversion.yaml → ...ached-operator.clusterserviceversion.yaml
diff --git a/...rd-tests/bundle/metadata/annotations.yaml → ...rd-tests/bundle/metadata/annotations.yaml b/...rd-tests/bundle/metadata/annotations.yaml → ...rd-tests/bundle/metadata/annotations.yaml
diff --git a/...-tests/bundle/tests/scorecard/config.yaml → ...-tests/bundle/tests/scorecard/config.yaml b/...-tests/bundle/tests/scorecard/config.yaml → ...-tests/bundle/tests/scorecard/config.yaml
diff --git a/...ha/examples/custom-scorecard-tests/go.mod → ...rd/examples/custom-scorecard-tests/go.mod b/...ha/examples/custom-scorecard-tests/go.mod → ...rd/examples/custom-scorecard-tests/go.mod
diff --git a/.../images/custom-scorecard-tests/Dockerfile → .../images/custom-scorecard-tests/Dockerfile b/.../images/custom-scorecard-tests/Dockerfile → .../images/custom-scorecard-tests/Dockerfile
diff --git a/...ges/custom-scorecard-tests/bin/entrypoint → ...ges/custom-scorecard-tests/bin/entrypoint b/...ges/custom-scorecard-tests/bin/entrypoint → ...ges/custom-scorecard-tests/bin/entrypoint
diff --git a/...ges/custom-scorecard-tests/bin/user_setup → ...ges/custom-scorecard-tests/bin/user_setup b/...ges/custom-scorecard-tests/bin/user_setup → ...ges/custom-scorecard-tests/bin/user_setup
diff --git a/...s/custom-scorecard-tests/cmd/test/main.go → ...s/custom-scorecard-tests/cmd/test/main.go b/...s/custom-scorecard-tests/cmd/test/main.go → ...s/custom-scorecard-tests/cmd/test/main.go
@@ -20,8 +20,8 @@ import (
 	"log"
 	"os"
 
-	scorecard "github.com/operator-framework/operator-sdk/internal/scorecard/alpha"
-	"github.com/operator-framework/operator-sdk/internal/scorecard/alpha/examples/custom-scorecard-tests/internal/tests"
+	"github.com/operator-framework/operator-sdk/internal/scorecard"
+	"github.com/operator-framework/operator-sdk/internal/scorecard/examples/custom-scorecard-tests/internal/tests"
 
 	apimanifests "github.com/operator-framework/api/pkg/manifests"
 	scapiv1alpha3 "github.com/operator-framework/operator-sdk/pkg/apis/scorecard/v1alpha3"
@@ -51,7 +51,7 @@ func main() {
 	var result scapiv1alpha3.TestStatus
 
 	// Names of the custom tests which would be passed in the
-	// `operator-sdk alpha` command.
+	// `operator-sdk` command.
 	switch entrypoint[0] {
 	case tests.CustomTest1Name:
 		result = tests.CustomTest1(cfg)

diff --git a/...m-scorecard-tests/internal/tests/tests.go → ...m-scorecard-tests/internal/tests/tests.go b/...m-scorecard-tests/internal/tests/tests.go → ...m-scorecard-tests/internal/tests/tests.go
diff --git a/internal/scorecard/alpha/formatting.go → internal/scorecard/formatting.go b/internal/scorecard/alpha/formatting.go → internal/scorecard/formatting.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package alpha
+package scorecard
 
 import (
 	"context"

diff --git a/internal/scorecard/alpha/formatting_test.go → internal/scorecard/formatting_test.go b/internal/scorecard/alpha/formatting_test.go → internal/scorecard/formatting_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package alpha
+package scorecard
 
 import (
 	"path/filepath"

diff --git a/internal/scorecard/alpha/kubeclient.go → internal/scorecard/kubeclient.go b/internal/scorecard/alpha/kubeclient.go → internal/scorecard/kubeclient.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package alpha
+package scorecard
 
 import (
 	"os"

diff --git a/internal/scorecard/alpha/labels_test.go → internal/scorecard/labels_test.go b/internal/scorecard/alpha/labels_test.go → internal/scorecard/labels_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package alpha
+package scorecard
 
 import (
 	"testing"

diff --git a/internal/scorecard/alpha/run_test.go → internal/scorecard/run_test.go b/internal/scorecard/alpha/run_test.go → internal/scorecard/run_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package alpha
+package scorecard
 
 import (
 	"context"

diff --git a/internal/scorecard/alpha/scorecard.go → internal/scorecard/scorecard.go b/internal/scorecard/alpha/scorecard.go → internal/scorecard/scorecard.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package alpha
+package scorecard
 
 import (
 	"context"

diff --git a/internal/scorecard/alpha/tar.go → internal/scorecard/tar.go b/internal/scorecard/alpha/tar.go → internal/scorecard/tar.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package alpha
+package scorecard
 
 import (
 	"archive/tar"

diff --git a/internal/scorecard/alpha/testconfigmap.go → internal/scorecard/testconfigmap.go b/internal/scorecard/alpha/testconfigmap.go → internal/scorecard/testconfigmap.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package alpha
+package scorecard
 
 import (
 	"context"

diff --git a/...al/scorecard/alpha/testdata/bundle.tar.gz → internal/scorecard/testdata/bundle.tar.gz b/...al/scorecard/alpha/testdata/bundle.tar.gz → internal/scorecard/testdata/bundle.tar.gz
diff --git a/...sts/cache.example.com_memcacheds_crd.yaml → ...sts/cache.example.com_memcacheds_crd.yaml b/...sts/cache.example.com_memcacheds_crd.yaml → ...sts/cache.example.com_memcacheds_crd.yaml
diff --git a/...ached-operator.clusterserviceversion.yaml → ...ached-operator.clusterserviceversion.yaml b/...ached-operator.clusterserviceversion.yaml → ...ached-operator.clusterserviceversion.yaml
diff --git a/...testdata/bundle/metadata/annotations.yaml → ...testdata/bundle/metadata/annotations.yaml b/...testdata/bundle/metadata/annotations.yaml → ...testdata/bundle/metadata/annotations.yaml
diff --git a/...stdata/bundle/tests/scorecard/config.yaml → ...stdata/bundle/tests/scorecard/config.yaml b/...stdata/bundle/tests/scorecard/config.yaml → ...stdata/bundle/tests/scorecard/config.yaml
diff --git a/...dle/tests/scorecard/kuttl/kuttl-test.yaml → ...dle/tests/scorecard/kuttl/kuttl-test.yaml b/...dle/tests/scorecard/kuttl/kuttl-test.yaml → ...dle/tests/scorecard/kuttl/kuttl-test.yaml
diff --git a/.../scorecard/kuttl/list-pods/00-assert.yaml → .../scorecard/kuttl/list-pods/00-assert.yaml b/.../scorecard/kuttl/list-pods/00-assert.yaml → .../scorecard/kuttl/list-pods/00-assert.yaml
diff --git a/...sts/scorecard/kuttl/list-pods/00-pod.yaml → ...sts/scorecard/kuttl/list-pods/00-pod.yaml b/...sts/scorecard/kuttl/list-pods/00-pod.yaml → ...sts/scorecard/kuttl/list-pods/00-pod.yaml
diff --git a/internal/scorecard/alpha/testdata/pod.yaml → internal/scorecard/testdata/pod.yaml b/internal/scorecard/alpha/testdata/pod.yaml → internal/scorecard/testdata/pod.yaml
diff --git a/internal/scorecard/alpha/testpod.go → internal/scorecard/testpod.go b/internal/scorecard/alpha/testpod.go → internal/scorecard/testpod.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package alpha
+package scorecard
 
 import (
 	"bytes"

diff --git a/internal/scorecard/alpha/tests/basic.go → internal/scorecard/tests/basic.go b/internal/scorecard/alpha/tests/basic.go → internal/scorecard/tests/basic.go
diff --git a/...rnal/scorecard/alpha/tests/bundle_test.go → internal/scorecard/tests/bundle_test.go b/...rnal/scorecard/alpha/tests/bundle_test.go → internal/scorecard/tests/bundle_test.go
diff --git a/internal/scorecard/alpha/tests/crhelper.go → internal/scorecard/tests/crhelper.go b/internal/scorecard/alpha/tests/crhelper.go → internal/scorecard/tests/crhelper.go
diff --git a/internal/scorecard/alpha/tests/olm.go → internal/scorecard/tests/olm.go b/internal/scorecard/alpha/tests/olm.go → internal/scorecard/tests/olm.go
diff --git a/website/content/en/docs/cli/operator-sdk.md b/website/content/en/docs/cli/operator-sdk.md
@@ -18,12 +18,12 @@ An SDK for building operators with ease
 ### SEE ALSO
 
 * [operator-sdk add](../operator-sdk_add)	 - Adds a controller or resource to the project
-* [operator-sdk alpha](../operator-sdk_alpha)	 - Run an alpha subcommand
 * [operator-sdk build](../operator-sdk_build)	 - Compiles code and builds artifacts
 * [operator-sdk bundle](../operator-sdk_bundle)	 - Manage operator bundle metadata
 * [operator-sdk completion](../operator-sdk_completion)	 - Generators for shell completions
 * [operator-sdk generate](../operator-sdk_generate)	 - Invokes a specific generator
 * [operator-sdk new](../operator-sdk_new)	 - Creates a new operator application
 * [operator-sdk olm](../operator-sdk_olm)	 - Manage the Operator Lifecycle Manager installation in your cluster
+* [operator-sdk scorecard](../operator-sdk_scorecard)	 - Runs scorecard
 * [operator-sdk version](../operator-sdk_version)	 - Prints the version of operator-sdk
 
diff --git a/website/content/en/docs/cli/operator-sdk_alpha.md b/website/content/en/docs/cli/operator-sdk_alpha.md