add validations to kpt alpha rpkg init command (#3650)

kptdev · Nov 4, 2022 · 04f18c7 · 04f18c7
1 parent 45b33ce
commit 04f18c7
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/commands/alpha/rpkg/clone/command.go b/commands/alpha/rpkg/clone/command.go
@@ -113,7 +113,7 @@ func (r *runner) preRunE(cmd *cobra.Command, args []string) error {
 	}
 
 	if r.workspace == "" {
-		return errors.E(op, fmt.Errorf("--workspace is required to specify downstream workspaceName"))
+		return errors.E(op, fmt.Errorf("--workspace is required to specify downstream workspace name"))
 	}
 
 	source := args[0]

diff --git a/commands/alpha/rpkg/copy/command.go b/commands/alpha/rpkg/copy/command.go
@@ -124,7 +124,7 @@ func (r *runner) getPackageRevisionSpec() (*porchapi.PackageRevisionSpec, error)
 	}
 
 	if r.workspace == "" {
-		return nil, fmt.Errorf("--workspace is required to specify downstream workspaceName")
+		return nil, fmt.Errorf("--workspace is required to specify workspace name")
 	}
 
 	spec := &porchapi.PackageRevisionSpec{

diff --git a/commands/alpha/rpkg/init/command.go b/commands/alpha/rpkg/init/command.go
@@ -56,8 +56,8 @@ func newRunner(ctx context.Context, rcg *genericclioptions.ConfigFlags) *runner
 	c.Flags().StringVar(&r.Description, "description", "sample description", "short description of the package.")
 	c.Flags().StringSliceVar(&r.Keywords, "keywords", []string{}, "list of keywords for the package.")
 	c.Flags().StringVar(&r.Site, "site", "", "link to page with information about the package.")
-	c.Flags().StringVar(&r.repository, "repository", "", "Repository to which package will be cloned (downstream repository).")
-	c.Flags().StringVar(&r.workspace, "workspace", "", "Workspace name of the downstream package.")
+	c.Flags().StringVar(&r.repository, "repository", "", "Repository to which package will be created.")
+	c.Flags().StringVar(&r.workspace, "workspace", "", "Workspace name of the package.")
 
 	return r
 }
@@ -90,6 +90,14 @@ func (r *runner) preRunE(cmd *cobra.Command, args []string) error {
 		return errors.E(op, "PACKAGE_NAME is a required positional argument")
 	}
 
+	if r.repository == "" {
+		return errors.E(op, fmt.Errorf("--repository is required to specify target repository"))
+	}
+
+	if r.workspace == "" {
+		return errors.E(op, fmt.Errorf("--workspace is required to specify workspace name"))
+	}
+
 	r.name = args[0]
 	pkgExists, err := util.PackageAlreadyExists(r.ctx, r.client, r.repository, r.name, *r.cfg.Namespace)
 	if err != nil {