Allow users to provide a Registry URL for storing images

pkg/odo/cli/pipelines/bootstrap.go

@@ -25,38 +25,39 @@ var (
 	bootstrapShortDesc = `Bootstrap pipelines`
 )
 
-// BootstrapOptions encapsulates the options for the odo pipelines bootstrap
+// BootstrapParameters encapsulates the paratmeters for the odo pipelines bootstrap
 // command.
-type BootstrapOptions struct {
-	deploymentPath     string
-	quayUsername       string
-	gitRepo            string // e.g. tekton/triggers
-	prefix             string // used to generate the environments in a shared cluster
-	githubToken        string
-	quayIOAuthFilename string
-	skipChecks         bool
+type BootstrapParameters struct {
+	deploymentPath           string
+	githubToken              string
+	gitRepo                  string // e.g. tekton/triggers
+	imageRepo                string
+	internalRegistryHostname string
+	prefix                   string // used to generate the environments in a shared cluster
+	dockerConfigJSONFileName string
+	skipChecks               bool
 	// generic context options common to all commands
 	*genericclioptions.Context
 }
 
-// NewBootstrapOptions bootstraps a BootstrapOptions instance.
-func NewBootstrapOptions() *BootstrapOptions {
-	return &BootstrapOptions{}
+// NewBootstrapParameters bootstraps a BootstrapParameters instance.
+func NewBootstrapParameters() *BootstrapParameters {
+	return &BootstrapParameters{}
 }
 
-// Complete completes BootstrapOptions after they've been created.
+// Complete completes BootstrapParameters after they've been created.
 //
 // If the prefix provided doesn't have a "-" then one is added, this makes the
 // generated environment names nicer to read.
-func (bo *BootstrapOptions) Complete(name string, cmd *cobra.Command, args []string) error {
+func (bo *BootstrapParameters) Complete(name string, cmd *cobra.Command, args []string) error {
 	if bo.prefix != "" && !strings.HasSuffix(bo.prefix, "-") {
 		bo.prefix = bo.prefix + "-"
 	}
 	return nil
 }
 
-// Validate validates the parameters of the BootstrapOptions.
-func (bo *BootstrapOptions) Validate() error {
+// Validate validates the parameters of the BootstrapParameters.
+func (bo *BootstrapParameters) Validate() error {
 	// TODO: this won't work with GitLab as the repo can have more path elements.
 	if len(strings.Split(bo.gitRepo, "/")) != 2 {
 		return fmt.Errorf("repo must be org/repo: %s", bo.gitRepo)
@@ -65,22 +66,24 @@ func (bo *BootstrapOptions) Validate() error {
 }
 
 // Run runs the project bootstrap command.
-func (bo *BootstrapOptions) Run() error {
-	options := pipelines.BootstrapOptions{
-		DeploymentPath:   bo.deploymentPath,
-		GithubToken:      bo.githubToken,
-		GitRepo:          bo.gitRepo,
-		Prefix:           bo.prefix,
-		QuayAuthFileName: bo.quayIOAuthFilename,
-		QuayUserName:     bo.quayUsername,
-		SkipChecks:       bo.skipChecks,
+func (bo *BootstrapParameters) Run() error {
+	options := pipelines.BootstrapParameters{
+		DeploymentPath:           bo.deploymentPath,
+		GithubToken:              bo.githubToken,
+		GitRepo:                  bo.gitRepo,
+		ImageRepo:                bo.imageRepo,
+		InternalRegistryHostname: bo.internalRegistryHostname,
+		Prefix:                   bo.prefix,
+		DockerConfigJSONFileName: bo.dockerConfigJSONFileName,
+		SkipChecks:               bo.skipChecks,
 	}
+
 	return pipelines.Bootstrap(&options)
 }
 
 // NewCmdBootstrap creates the project bootstrap command.
 func NewCmdBootstrap(name, fullName string) *cobra.Command {
-	o := NewBootstrapOptions()
+	o := NewBootstrapParameters()
 
 	bootstrapCmd := &cobra.Command{
 		Use:     name,
@@ -93,16 +96,17 @@ func NewCmdBootstrap(name, fullName string) *cobra.Command {
 	}
 
 	bootstrapCmd.Flags().StringVarP(&o.prefix, "prefix", "p", "", "add a prefix to the environment names")
-	bootstrapCmd.Flags().StringVar(&o.quayUsername, "quay-username", "", "image registry username")
-	bootstrapCmd.MarkFlagRequired("quay-username")
 	bootstrapCmd.Flags().StringVar(&o.githubToken, "github-token", "", "provide the Github token")
 	bootstrapCmd.MarkFlagRequired("github-token")
-	bootstrapCmd.Flags().StringVar(&o.quayIOAuthFilename, "dockerconfigjson", "", "Docker configuration json filename")
-	bootstrapCmd.MarkFlagRequired("dockerconfigjson")
+	bootstrapCmd.Flags().StringVar(&o.dockerConfigJSONFileName, "dockerconfigjson", "", "Docker configuration json filename")
 	bootstrapCmd.Flags().StringVar(&o.gitRepo, "git-repo", "", "git repository in this form <username>/<repository>")
 	bootstrapCmd.MarkFlagRequired("git-repo")
+	bootstrapCmd.Flags().StringVar(&o.imageRepo, "image-repo", "", "image repository in this form <registry>/<username>/<repository> or <project>/<app> for internal registry")
+	bootstrapCmd.MarkFlagRequired("image-repo")
 	bootstrapCmd.Flags().StringVar(&o.deploymentPath, "deployment-path", "", "deployment folder path name")
 	bootstrapCmd.MarkFlagRequired("deployment-path")
 	bootstrapCmd.Flags().BoolVarP(&o.skipChecks, "skip-checks", "b", false, "skip Tekton installation checks")
+	bootstrapCmd.Flags().StringVar(&o.internalRegistryHostname, "internal-registry-hostname", "image-registry.openshift-image-registry.svc:5000", "internal image registry hostname")
+
 	return bootstrapCmd
 }

pkg/odo/cli/pipelines/bootstrap_test.go

@@ -13,7 +13,7 @@ type keyValuePair struct {
 	value string
 }
 
-func TestCompleteBootstrapOptions(t *testing.T) {
+func TestCompleteBootstrapParameters(t *testing.T) {
 	completeTests := []struct {
 		name       string
 		prefix     string
@@ -25,7 +25,7 @@ func TestCompleteBootstrapOptions(t *testing.T) {
 	}
 
 	for _, tt := range completeTests {
-		o := BootstrapOptions{prefix: tt.prefix}
+		o := BootstrapParameters{prefix: tt.prefix}
 
 		err := o.Complete("test", &cobra.Command{}, []string{"test", "test/repo"})
 
@@ -39,7 +39,7 @@ func TestCompleteBootstrapOptions(t *testing.T) {
 	}
 }
 
-func TestValidateBootstrapOptions(t *testing.T) {
+func TestValidateBootstrapParameters(t *testing.T) {
 	optionTests := []struct {
 		name    string
 		gitRepo string
@@ -50,7 +50,7 @@ func TestValidateBootstrapOptions(t *testing.T) {
 	}
 
 	for _, tt := range optionTests {
-		o := BootstrapOptions{quayUsername: "testing", gitRepo: tt.gitRepo, prefix: "test"}
+		o := BootstrapParameters{gitRepo: tt.gitRepo, prefix: "test"}
 
 		err := o.Validate()
 
@@ -64,25 +64,33 @@ func TestValidateBootstrapOptions(t *testing.T) {
 		}
 	}
 }
+
 func TestBootstrapCommandWithMissingParams(t *testing.T) {
 	cmdTests := []struct {
+		desc    string
 		flags   []keyValuePair
 		wantErr string
 	}{
-		{[]keyValuePair{flag("quay-username", "example"), flag("github-token", "abc123"), flag("dockerconfigjson", "~/"),
-			flag("deployment-path", "foo")}, `Required flag(s) "git-repo" have/has not been set`},
-		{[]keyValuePair{flag("quay-username", "example"), flag("github-token", "abc123"), flag("git-repo", "example/repo"),
-			flag("deployment-path", "foo")}, `Required flag(s) "dockerconfigjson" have/has not been set`},
-		{[]keyValuePair{flag("quay-username", "example"), flag("dockerconfigjson", "~/"), flag("git-repo", "example/repo"),
-			flag("deployment-path", "foo")}, `Required flag(s) "github-token" have/has not been set`},
-		{[]keyValuePair{flag("github-token", "abc123"), flag("dockerconfigjson", "~/"), flag("git-repo", "example/repo"),
-			flag("deployment-path", "foo")}, `Required flag(s) "quay-username" have/has not been set`},
+		{"Missing git-repo flag",
+			[]keyValuePair{flag("github-token", "abc123"),
+				flag("dockerconfigjson", "~/"), flag("image-repo", "foo/bar/bar"), flag("deployment-path", "foo")},
+			`Required flag(s) "git-repo" have/has not been set`},
+		{"Missing github-token flag",
+			[]keyValuePair{flag("dockerconfigjson", "~/"),
+				flag("git-repo", "example/repo"), flag("image-repo", "foo/bar/bar"), flag("deployment-path", "foo")},
+			`Required flag(s) "github-token" have/has not been set`},
+		{"Missing image-repo",
+			[]keyValuePair{flag("github-token", "abc123"),
+				flag("dockerconfigjson", "~/"), flag("git-repo", "example/repo"), flag("deployment-path", "foo")},
+			`Required flag(s) "image-repo" have/has not been set`},
 	}
 	for _, tt := range cmdTests {
-		_, _, err := executeCommand(NewCmdBootstrap("bootstrap", "odo pipelines bootstrap"), tt.flags...)
-		if err.Error() != tt.wantErr {
-			t.Errorf("got %s, want %s", err, tt.wantErr)
-		}
+		t.Run(tt.desc, func(t *testing.T) {
+			_, _, err := executeCommand(NewCmdBootstrap("bootstrap", "odo pipelines bootstrap"), tt.flags...)
+			if err.Error() != tt.wantErr {
+				t.Errorf("got %s, want %s", err, tt.wantErr)
+			}
+		})
 	}
 }
 
@@ -97,17 +105,19 @@ func TestBypassChecks(t *testing.T) {
 	}
 
 	for _, test := range tests {
-		o := BootstrapOptions{skipChecks: test.skipChecks}
+		t.Run(test.description, func(t *testing.T) {
+			o := BootstrapParameters{skipChecks: test.skipChecks}
 
-		err := o.Complete("test", &cobra.Command{}, []string{"test", "test/repo"})
+			err := o.Complete("test", &cobra.Command{}, []string{"test", "test/repo"})
 
-		if err != nil {
-			t.Errorf("Complete() %#v failed: ", err)
-		}
+			if err != nil {
+				t.Errorf("Complete() %#v failed: ", err)
+			}
 
-		if o.skipChecks != test.wantedBypassChecks {
-			t.Errorf("Complete() %#v bypassChecks flag: got %v, want %v", test.description, o.skipChecks, test.wantedBypassChecks)
-		}
+			if o.skipChecks != test.wantedBypassChecks {
+				t.Errorf("Complete() %#v bypassChecks flag: got %v, want %v", test.description, o.skipChecks, test.wantedBypassChecks)
+			}
+		})
 	}
 
 }