Add -u and -p flags for push and pull commands

Author: nadundesilva

components/cli/cmd/cellery/pull.go

@@ -19,13 +19,17 @@
 package main
 
 import (
+	"fmt"
+
 	"github.com/spf13/cobra"
 
 	"github.com/cellery-io/sdk/components/cli/pkg/commands"
 	"github.com/cellery-io/sdk/components/cli/pkg/util"
 )
 
 func newPullCommand() *cobra.Command {
+	var username string
+	var password string
 	cmd := &cobra.Command{
 		Use:   "pull [<registry>/]<organization>/<cell-image>:<version>",
 		Short: "Pull cell image from the remote repository",
@@ -38,13 +42,18 @@ func newPullCommand() *cobra.Command {
 			if err != nil {
 				return err
 			}
+			if password != "" && username == "" {
+				return fmt.Errorf("expects username if the password is provided, username not provided")
+			}
 			return nil
 		},
 		Run: func(cmd *cobra.Command, args []string) {
-			commands.RunPull(args[0], false)
+			commands.RunPull(args[0], false, username, password)
 		},
 		Example: "  cellery pull cellery-samples/employee:1.0.0\n" +
 			"  cellery pull registry.foo.io/cellery-samples/employee:1.0.0",
 	}
+	cmd.Flags().StringVarP(&username, "username", "u", "", "Username for Cellery Registry")
+	cmd.Flags().StringVarP(&password, "password", "p", "", "Password for Cellery Registry")
 	return cmd
 }

components/cli/cmd/cellery/push.go

@@ -19,13 +19,17 @@
 package main
 
 import (
+	"fmt"
+
 	"github.com/spf13/cobra"
 
 	"github.com/cellery-io/sdk/components/cli/pkg/commands"
 	"github.com/cellery-io/sdk/components/cli/pkg/util"
 )
 
 func newPushCommand() *cobra.Command {
+	var username string
+	var password string
 	cmd := &cobra.Command{
 		Use:   "push [<registry>/]<organization>/<cell-image>:<version>",
 		Short: "Push cell image to the remote repository",
@@ -38,13 +42,18 @@ func newPushCommand() *cobra.Command {
 			if err != nil {
 				return err
 			}
+			if password != "" && username == "" {
+				return fmt.Errorf("expects username if the password is provided, username not provided")
+			}
 			return nil
 		},
 		Run: func(cmd *cobra.Command, args []string) {
-			commands.RunPush(args[0])
+			commands.RunPush(args[0], username, password)
 		},
 		Example: "  cellery push cellery-samples/employee:1.0.0\n" +
 			"  cellery push registry.foo.io/cellery-samples/employee:1.0.0",
 	}
+	cmd.Flags().StringVarP(&username, "username", "u", "", "Username for Cellery Registry")
+	cmd.Flags().StringVarP(&password, "password", "p", "", "Password for Cellery Registry")
 	return cmd
 }

components/cli/pkg/commands/build.go

@@ -223,7 +223,7 @@ func generateMetaData(cellImage *util.CellImage, targetDir string, spinner *util
 			dependencyExists, err := util.FileExists(cellImageZip)
 			if !dependencyExists {
 				spinner.Pause()
-				RunPull(dependency, true)
+				RunPull(dependency, true, "", "")
 				fmt.Println()
 				spinner.Resume()
 			}

components/cli/pkg/commands/pull.go

@@ -37,31 +37,42 @@ import (
 
 // RunPull connects to the Cellery Registry and pulls the cell image and saves it in the local repository.
 // This also adds the relevant ballerina files to the ballerina repo directory.
-func RunPull(cellImage string, isSilent bool) {
+func RunPull(cellImage string, isSilent bool, username string, password string) {
 	parsedCellImage, err := util.ParseImageTag(cellImage)
 	if err != nil {
 		util.ExitWithErrorMessage("Error occurred while parsing cell image", err)
 	}
 
-	// Instantiating a native keyring
-	ring, err := keyring.Open(keyring.Config{
-		ServiceName: constants.CELLERY_HUB_KEYRING_NAME,
-	})
-	if err != nil {
-		util.ExitWithErrorMessage("Error occurred while logging out", err)
+	var registryCredentials = &util.RegistryCredentials{
+		Username: username,
+		Password: password,
 	}
-
-	// Reading the existing credentials
-	var registryCredentials = &util.RegistryCredentials{}
-	if err == nil {
-		ringItem, err := ring.Get(parsedCellImage.Registry)
-		if err == nil && ringItem.Data != nil {
-			err = json.Unmarshal(ringItem.Data, registryCredentials)
-		}
+	if username != "" && password == "" {
+		username, password, err = util.RequestCredentials("Cellery Registry", username)
 	}
 	isCredentialsPresent := err == nil && registryCredentials.Username != "" &&
 		registryCredentials.Password != ""
 
+	var ring keyring.Keyring
+	if !isCredentialsPresent {
+		// Instantiating a native keyring
+		ring, err := keyring.Open(keyring.Config{
+			ServiceName: constants.CELLERY_HUB_KEYRING_NAME,
+		})
+		if err != nil {
+			util.ExitWithErrorMessage("Error occurred while logging out", err)
+		}
+
+		if err == nil {
+			ringItem, err := ring.Get(parsedCellImage.Registry)
+			if err == nil && ringItem.Data != nil {
+				err = json.Unmarshal(ringItem.Data, registryCredentials)
+			}
+		}
+		isCredentialsPresent = err == nil && registryCredentials.Username != "" &&
+			registryCredentials.Password != ""
+	}
+
 	if isCredentialsPresent {
 		// Pulling the image using the saved credentials
 		err = pullImage(parsedCellImage, registryCredentials.Username, registryCredentials.Password)
@@ -92,16 +103,18 @@ func RunPull(cellImage string, isSilent bool) {
 				if err != nil {
 					util.ExitWithErrorMessage("Error occurred while saving Credentials", err)
 				}
-				err = ring.Set(keyring.Item{
-					Key:  parsedCellImage.Registry,
-					Data: credentialsData,
-				})
-				if err == nil {
-					fmt.Printf("\n%s Saved Credentials for %s Registry", util.GreenBold("\U00002714"),
-						util.Bold(parsedCellImage.Registry))
-				} else {
-					fmt.Printf("\n\n%s %s", util.YellowBold("\U000026A0"),
-						"Error occurred while saving credentials")
+				if ring != nil {
+					err = ring.Set(keyring.Item{
+						Key:  parsedCellImage.Registry,
+						Data: credentialsData,
+					})
+					if err == nil {
+						fmt.Printf("\n%s Saved Credentials for %s Registry", util.GreenBold("\U00002714"),
+							util.Bold(parsedCellImage.Registry))
+					} else {
+						fmt.Printf("\n\n%s %s", util.YellowBold("\U000026A0"),
+							"Error occurred while saving credentials")
+					}
 				}
 			} else {
 				util.ExitWithErrorMessage("Failed to pull image", err)

components/cli/pkg/commands/push.go

@@ -44,31 +44,42 @@ import (
 
 // RunPush parses the cell image name to recognize the Cellery Registry (A Docker Registry), Organization and version
 // and pushes to the Cellery Registry
-func RunPush(cellImage string) {
+func RunPush(cellImage string, username string, password string) {
 	parsedCellImage, err := util.ParseImageTag(cellImage)
 	if err != nil {
 		util.ExitWithErrorMessage("Error occurred while parsing cell image", err)
 	}
 
-	// Instantiating a native keyring
-	ring, err := keyring.Open(keyring.Config{
-		ServiceName: constants.CELLERY_HUB_KEYRING_NAME,
-	})
-	if err != nil {
-		util.ExitWithErrorMessage("Error occurred while logging out", err)
+	var registryCredentials = &util.RegistryCredentials{
+		Username: username,
+		Password: password,
 	}
-
-	// Reading the existing credentials
-	var registryCredentials = &util.RegistryCredentials{}
-	if err == nil {
-		ringItem, err := ring.Get(parsedCellImage.Registry)
-		if err == nil && ringItem.Data != nil {
-			err = json.Unmarshal(ringItem.Data, registryCredentials)
-		}
+	if username != "" && password == "" {
+		username, password, err = util.RequestCredentials("Cellery Registry", username)
 	}
 	isCredentialsPresent := err == nil && registryCredentials.Username != "" &&
 		registryCredentials.Password != ""
 
+	var ring keyring.Keyring
+	if !isCredentialsPresent {
+		// Instantiating a native keyring
+		ring, err := keyring.Open(keyring.Config{
+			ServiceName: constants.CELLERY_HUB_KEYRING_NAME,
+		})
+		if err != nil {
+			util.ExitWithErrorMessage("Error occurred while logging out", err)
+		}
+
+		if err == nil {
+			ringItem, err := ring.Get(parsedCellImage.Registry)
+			if err == nil && ringItem.Data != nil {
+				err = json.Unmarshal(ringItem.Data, registryCredentials)
+			}
+		}
+		isCredentialsPresent = err == nil && registryCredentials.Username != "" &&
+			registryCredentials.Password != ""
+	}
+
 	if isCredentialsPresent {
 		// Pushing the image using the saved credentials
 		err = pushImage(parsedCellImage, registryCredentials.Username, registryCredentials.Password)
@@ -99,16 +110,18 @@ func RunPush(cellImage string) {
 				if err != nil {
 					util.ExitWithErrorMessage("Error occurred while saving Credentials", err)
 				}
-				err = ring.Set(keyring.Item{
-					Key:  parsedCellImage.Registry,
-					Data: credentialsData,
-				})
-				if err == nil {
-					fmt.Printf("\n%s Saved Credentials for %s Registry", util.GreenBold("\U00002714"),
-						util.Bold(parsedCellImage.Registry))
-				} else {
-					fmt.Printf("\n\n%s %s", util.YellowBold("\U000026A0"),
-						"Error occurred while saving credentials")
+				if ring != nil {
+					err = ring.Set(keyring.Item{
+						Key:  parsedCellImage.Registry,
+						Data: credentialsData,
+					})
+					if err == nil {
+						fmt.Printf("\n%s Saved Credentials for %s Registry", util.GreenBold("\U00002714"),
+							util.Bold(parsedCellImage.Registry))
+					} else {
+						fmt.Printf("\n\n%s %s", util.YellowBold("\U000026A0"),
+							"Error occurred while saving credentials")
+					}
 				}
 			} else {
 				util.ExitWithErrorMessage("Failed to pull image", err)

components/cli/pkg/commands/run.go

@@ -788,7 +788,7 @@ func extractImage(cellImage *util.CellImage, spinner *util.Spinner) (string, err
 	}
 	if !imageExists {
 		spinner.Pause()
-		RunPull(cellImageTag, true)
+		RunPull(cellImageTag, true, "", "")
 		fmt.Println()
 		spinner.Resume()
 	}