move asking user confirmation to shared file

Signed-off-by: Shivam Mukhade <smukhade@redhat.com>

pkg/cli/webhook/github.go

@@ -32,23 +32,13 @@ func (gh *gitHubConfig) GetName() string {
 }
 
 func (gh *gitHubConfig) Run(ctx context.Context, opts *Options) (*response, error) {
-	msg := "Would you like me to configure a GitHub Webhook for your repository? "
-	var configureWebhook bool
-	if err := prompt.SurveyAskOne(&survey.Confirm{Message: msg, Default: true}, &configureWebhook); err != nil {
-		return nil, err
-	}
-	if !configureWebhook {
-		return &response{UserDeclined: true}, nil
-	}
-
 	err := gh.askGHWebhookConfig(opts.RepositoryURL, opts.ControllerURL)
 	if err != nil {
 		return nil, err
 	}
 	gh.APIURL = opts.ProviderAPIURL
 
 	return &response{
-		UserDeclined:        false,
 		ControllerURL:       gh.controllerURL,
 		PersonalAccessToken: gh.personalAccessToken,
 		WebhookSecret:       gh.webhookSecret,

pkg/cli/webhook/github_test.go

@@ -11,42 +11,6 @@ import (
 	rtesting "knative.dev/pkg/reconciler/testing"
 )
 
-func TestGithubWebhook(t *testing.T) {
-	tests := []struct {
-		name       string
-		wantErrStr string
-		askStubs   func(*prompt.AskStubber)
-		response   response
-	}{
-		{
-			name: "declined by user",
-			askStubs: func(as *prompt.AskStubber) {
-				as.StubOne("n")
-			},
-			response: response{UserDeclined: true},
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			ctx, _ := rtesting.SetupFakeContext(t)
-			as, teardown := prompt.InitAskStubber()
-			defer teardown()
-			if tt.askStubs != nil {
-				tt.askStubs(as)
-			}
-			gh := gitHubConfig{}
-			res, err := gh.Run(ctx, &Options{})
-			if tt.wantErrStr != "" {
-				assert.Equal(t, err.Error(), tt.wantErrStr)
-				return
-			}
-			assert.NilError(t, err)
-			assert.Equal(t, res.UserDeclined, tt.response.UserDeclined)
-		})
-	}
-}
-
 func TestAskGHWebhookConfig(t *testing.T) {
 	tests := []struct {
 		name          string

pkg/cli/webhook/gitlab.go

@@ -26,23 +26,13 @@ func (gl *gitLabConfig) GetName() string {
 }
 
 func (gl *gitLabConfig) Run(ctx context.Context, opts *Options) (*response, error) {
-	msg := "Would you like me to configure a GitLab Webhook for your repository? "
-	var configureWebhook bool
-	if err := prompt.SurveyAskOne(&survey.Confirm{Message: msg, Default: true}, &configureWebhook); err != nil {
-		return nil, err
-	}
-	if !configureWebhook {
-		return &response{UserDeclined: true}, nil
-	}
-
 	err := gl.askGLWebhookConfig(opts.ControllerURL)
 	if err != nil {
 		return nil, err
 	}
 	gl.APIURL = opts.ProviderAPIURL
 
 	return &response{
-		UserDeclined:        false,
 		ControllerURL:       gl.controllerURL,
 		PersonalAccessToken: gl.personalAccessToken,
 		WebhookSecret:       gl.webhookSecret,

pkg/cli/webhook/webhook.go

@@ -2,6 +2,7 @@ package webhook
 
 import (
 	"context"
+	"fmt"
 	"strings"
 
 	"github.com/AlecAivazis/survey/v2"
@@ -32,7 +33,6 @@ type Options struct {
 }
 
 type response struct {
-	UserDeclined        bool
 	ControllerURL       string
 	WebhookSecret       string
 	PersonalAccessToken string
@@ -65,6 +65,16 @@ func (w *Options) Install(ctx context.Context) error {
 		return nil
 	}
 
+	msg := fmt.Sprintf("Would you like me to configure a %s Webhook for your repository? ",
+		strings.TrimSuffix(webhookProvider.GetName(), "Webhook"))
+	var configureWebhook bool
+	if err := prompt.SurveyAskOne(&survey.Confirm{Message: msg, Default: true}, &configureWebhook); err != nil {
+		return err
+	}
+	if !configureWebhook {
+		return nil
+	}
+
 	// check if info configmap has url then use that otherwise try to detec
 	if pacInfo.ControllerURL != "" && w.ControllerURL == "" {
 		w.ControllerURL = pacInfo.ControllerURL
@@ -73,7 +83,7 @@ func (w *Options) Install(ctx context.Context) error {
 	}
 
 	response, err := webhookProvider.Run(ctx, w)
-	if err != nil || response.UserDeclined {
+	if err != nil {
 		return err
 	}