Move preview Options to disambiguate (#6839)

This PR moves the Options type from pkg/cli/cmd/preview/options to
pkg/cli/cmd/preview to disambiguate its name. It is now referenced as
preview.Options instead of options.Options.

Fixes #6838

Author: justinsb

pkg/cli/cmd/preview.go

@@ -16,7 +16,6 @@ package cmd
 
 import (
 	"github.com/GoogleCloudPlatform/k8s-config-connector/pkg/cli/cmd/preview"
-	"github.com/GoogleCloudPlatform/k8s-config-connector/pkg/cli/cmd/preview/options"
 	"github.com/spf13/cobra"
 )
 
@@ -28,7 +27,7 @@ const (
 )
 
 func NewPreviewCmd() *cobra.Command {
-	opts := options.NewOptions()
+	opts := preview.NewOptions()
 	cmd := &cobra.Command{
 		Use:     "preview",
 		Short:   "preview Config Connector resources",

pkg/cli/cmd/preview/execute.go

@@ -20,7 +20,6 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/GoogleCloudPlatform/k8s-config-connector/pkg/cli/cmd/preview/options"
 	corepreview "github.com/GoogleCloudPlatform/k8s-config-connector/pkg/cli/preview"
 	"golang.org/x/oauth2"
 	"golang.org/x/oauth2/google"
@@ -36,7 +35,7 @@ const (
 	defaultTimeout = 15
 )
 
-func Execute(ctx context.Context, opts *options.Options) error {
+func Execute(ctx context.Context, opts *Options) error {
 	// Use a custom FlagSet for klog to avoid conflicts with global flag.CommandLine
 	klogFlags := flag.NewFlagSet("klog", flag.ExitOnError)
 	klog.InitFlags(klogFlags)
@@ -103,7 +102,7 @@ func Execute(ctx context.Context, opts *options.Options) error {
 	return nil
 }
 
-func getRESTConfig(ctx context.Context, opts *options.Options) (*rest.Config, error) {
+func getRESTConfig(ctx context.Context, opts *Options) (*rest.Config, error) {
 	// TODO: Add rate limiting to Kube client.
 	if opts.InCluster {
 		return rest.InClusterConfig()
@@ -119,7 +118,7 @@ func getRESTConfig(ctx context.Context, opts *options.Options) (*rest.Config, er
 		&clientcmd.ConfigOverrides{}).ClientConfig()
 }
 
-func getGCPAuthorization(ctx context.Context, opts *options.Options) (oauth2.TokenSource, error) {
+func getGCPAuthorization(ctx context.Context, opts *Options) (oauth2.TokenSource, error) {
 	// TODO: Add scope
 	scopes := []string{defaultScope}
 	ts, err := google.DefaultTokenSource(ctx, scopes...)
@@ -129,7 +128,7 @@ func getGCPAuthorization(ctx context.Context, opts *options.Options) (oauth2.Tok
 	return ts, nil
 }
 
-func printCapturedObjects(recorder *corepreview.Recorder, opts *options.Options) error {
+func printCapturedObjects(recorder *corepreview.Recorder, opts *Options) error {
 	now := time.Now()
 	timestamp := now.Format("20060102-150405.000")
 	summaryFile := fmt.Sprintf("%s-%s", opts.ReportNamePrefix, timestamp)

pkg/cli/cmd/preview/options/options.go pkg/cli/cmd/preview/options.gopkg/cli/cmd/preview/options/options.go renamed to pkg/cli/cmd/preview/options.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package options
+package preview
 
 import (
 	"github.com/spf13/pflag"