Multiple other fixes for bootstrap

- Fix install on public Github where the URL wasn't set.
- Don't ask for the Github App URL anymore set it to the one from the
  Route and let user configure it in the github app page.
- Set proper defaults to ask yes or not questions.

Signed-off-by: Chmouel Boudjnah <[email protected]>

Author: chmouel

pkg/cmd/bootstrap/bootstrap.go

@@ -86,7 +86,6 @@ func createSecret(ctx context.Context, run *params.Run, opts *bootstrapOpts) err
 			return err
 		}
 	}
-
 	jeez, err := generateManifest(opts)
 	if err != nil {
 		return err

pkg/cmd/bootstrap/github.go

@@ -40,8 +40,7 @@ func generateManifest(opts *bootstrapOpts) ([]byte, error) {
 
 // getGHClient get github client
 func getGHClient(opts *bootstrapOpts) (*github.Client, error) {
-	if opts.GithubAPIURL == "" {
-		opts.GithubAPIURL = "https://github.com"
+	if opts.GithubAPIURL == defaultPublicGithub {
 		return github.NewClient(nil), nil
 	}
 

pkg/cmd/bootstrap/install.go

@@ -56,7 +56,7 @@ func installPac(ctx context.Context, opts *bootstrapOpts) error {
 		}
 	}
 
-	doinstall, err := askYN(opts, "🕵️ Pipelines as Code doesn't seem installed", fmt.Sprintf("Do you want me to install Pipelines as Code %s?", latestversion))
+	doinstall, err := askYN(opts, true, "🕵️ Pipelines as Code doesn't seem installed", fmt.Sprintf("Do you want me to install Pipelines as Code %s?", latestversion))
 	if err != nil {
 		return err
 	}
@@ -69,6 +69,6 @@ func installPac(ctx context.Context, opts *bootstrapOpts) error {
 	}
 
 	// nolint:forbidigo
-	fmt.Printf("✅  Pipelines-as-Code %s has been installed\n", latestversion)
+	fmt.Printf("✓ Pipelines-as-Code %s has been installed\n", latestversion)
 	return nil
 }

pkg/cmd/bootstrap/questions.go

@@ -2,18 +2,22 @@ package bootstrap
 
 import (
 	"fmt"
+	"strings"
 
 	"github.com/AlecAivazis/survey/v2"
 )
 
-func askYN(opts *bootstrapOpts, title, question string) (bool, error) {
+const defaultPublicGithub = "https://github.com"
+
+func askYN(opts *bootstrapOpts, deflt bool, title, question string) (bool, error) {
 	var answer bool
 	// nolint:forbidigo
 	fmt.Printf("%s\n", title)
 	err := opts.cliOpts.Ask([]*survey.Question{
 		{
 			Prompt: &survey.Confirm{
 				Message: question,
+				Default: deflt,
 			},
 		},
 	}, &answer)
@@ -29,7 +33,7 @@ func askQuestions(opts *bootstrapOpts) error {
 	var qs []*survey.Question
 
 	if opts.recreateSecret {
-		answer, err := askYN(opts,
+		answer, err := askYN(opts, false,
 			fmt.Sprintf("👀 A secret named %s in %s namespace has been detected.", secretName, opts.targetNamespace),
 			"Do you want me to override the secret?")
 		if err != nil {
@@ -43,23 +47,22 @@ func askQuestions(opts *bootstrapOpts) error {
 	if opts.vcsType == "github-enteprise-app" {
 		prompt := "Enter your Github enteprise API URL: "
 		qs = append(qs, &survey.Question{
-			Name:   "GithubAPIURL",
-			Prompt: &survey.Input{Message: prompt},
+			Name: "GithubAPIURL",
+			Prompt: &survey.Input{
+				Message: prompt,
+			},
+			Validate: survey.Required,
 		})
+	} else {
+		opts.GithubAPIURL = defaultPublicGithub
 	}
 
 	prompt := "Enter the name of your GitHub application: "
 	if opts.GithubApplicationName == "" {
 		qs = append(qs, &survey.Question{
-			Name:   "GithubApplicationName",
-			Prompt: &survey.Input{Message: prompt},
-		})
-	}
-	if opts.GithubApplicationURL == "" {
-		prompt = "Enter an URL for your GitHub application"
-		qs = append(qs, &survey.Question{
-			Name:   "GithubApplicationURL",
-			Prompt: &survey.Input{Message: prompt},
+			Name:     "GithubApplicationName",
+			Prompt:   &survey.Input{Message: prompt},
+			Validate: survey.Required,
 		})
 	}
 
@@ -68,8 +71,12 @@ func askQuestions(opts *bootstrapOpts) error {
 		return err
 	}
 
+	if !strings.HasPrefix(opts.GithubAPIURL, "https") {
+		opts.GithubAPIURL = "https://" + strings.Trim(opts.GithubAPIURL, "/")
+	}
+
 	if opts.RouteName != "" {
-		answer, err := askYN(opts,
+		answer, err := askYN(opts, true,
 			fmt.Sprintf("👀 We have detected an OpenShift Route on: %s", opts.RouteName),
 			"Do you want me to use it?")
 		if err != nil {
@@ -86,12 +93,17 @@ func askQuestions(opts *bootstrapOpts) error {
 				Prompt: &survey.Input{
 					Message: "Enter your public route URL: ",
 				},
+				Validate: survey.Required,
 			},
 		}, &opts.RouteName)
 		if err != nil {
 			return err
 		}
 	}
 
+	if opts.GithubApplicationURL == "" {
+		opts.GithubApplicationURL = opts.RouteName
+	}
+
 	return nil
 }

pkg/cmd/bootstrap/web.go

@@ -78,7 +78,7 @@ func startWebServer(ctx context.Context, opts *bootstrapOpts, run *params.Run, j
 	}
 
 	// nolint:forbidigo
-	fmt.Printf("🚀 You can now add your newly created application on your repository by going to this URL:\n%s\n", *manifest.HTMLURL)
+	fmt.Printf("🚀 You can now add your newly created application on your repository by going to this URL:\n%s\n\n", *manifest.HTMLURL)
 
 	// nolint:forbidigo
 	fmt.Println("💡 Don't forget to run the \"tkn pac repo create\" to create a new Repository CRD on your cluster.")