Merge 9f3f641 into 41e6457

cmd/gitops/add/clusters/cmd.go

@@ -117,7 +117,7 @@ func getClusterCmdRunE(endpoint *string, client *resty.Client) func(*cobra.Comma
 			return cmderrors.ErrNoURL
 		}
 
-		url, err := gitproviders.NewRepoURL(flags.RepositoryURL, true)
+		url, err := gitproviders.NewRepoURL(flags.RepositoryURL)
 		if err != nil {
 			return fmt.Errorf("cannot parse url: %w", err)
 		}

cmd/gitops/beta/cmd/install.go

@@ -83,9 +83,9 @@ func installRunCmd(cmd *cobra.Command, args []string) error {
 	}
 
 	gitClient, gitProvider, err := factory.GetGitClients(context.Background(), k, providerClient, services.GitConfigParams{
-		URL:       installParams.ConfigRepo,
-		Namespace: namespace,
-		DryRun:    installParams.DryRun,
+		ConfigRepo: installParams.ConfigRepo,
+		Namespace:  namespace,
+		DryRun:     installParams.DryRun,
 	})
 	if err != nil {
 		return fmt.Errorf("error creating git clients: %w", err)

cmd/gitops/delete/clusters/cmd.go

@@ -73,7 +73,7 @@ func getClusterCmdRunE(endpoint *string, client *resty.Client) func(*cobra.Comma
 			return cmderrors.ErrNoURL
 		}
 
-		url, err := gitproviders.NewRepoURL(flags.RepositoryURL, true)
+		url, err := gitproviders.NewRepoURL(flags.RepositoryURL)
 		if err != nil {
 			return fmt.Errorf("cannot parse url: %w", err)
 		}

cmd/gitops/install/cmd.go

@@ -64,7 +64,7 @@ func installRunCmd(cmd *cobra.Command, args []string) error {
 	ctx := context.Background()
 	namespace, _ := cmd.Parent().Flags().GetString("namespace")
 
-	configURL, err := gitproviders.NewRepoURL(installParams.ConfigRepo, true)
+	configURL, err := gitproviders.NewRepoURL(installParams.ConfigRepo)
 	if err != nil {
 		return err
 	}
@@ -119,8 +119,6 @@ func installRunCmd(cmd *cobra.Command, args []string) error {
 	// This is going to be broken up to reduce complexity
 	// and then generates the source yaml of the config repo when using dry-run option
 	gitClient, gitProvider, err := factory.GetGitClients(context.Background(), kubeClient, providerClient, services.GitConfigParams{
-		// We need to set URL and ConfigRepo to the same value so a deploy key is created for public config repos
-		URL:        installParams.ConfigRepo,
 		ConfigRepo: installParams.ConfigRepo,
 		Namespace:  namespace,
 		DryRun:     installParams.DryRun,

cmd/gitops/upgrade/cmd.go

@@ -78,9 +78,9 @@ func upgradeCmdRunE() func(*cobra.Command, []string) error {
 		providerClient := internal.NewGitProviderClient(os.Stdout, os.LookupEnv, auth.NewAuthCLIHandler, log)
 
 		gitClient, gitProvider, err := factory.GetGitClients(ctx, kubeClient, providerClient, services.GitConfigParams{
-			URL:       upgradeCmdFlags.ConfigRepo,
-			Namespace: upgradeCmdFlags.Namespace,
-			DryRun:    upgradeCmdFlags.DryRun,
+			ConfigRepo: upgradeCmdFlags.ConfigRepo,
+			Namespace:  upgradeCmdFlags.Namespace,
+			DryRun:     upgradeCmdFlags.DryRun,
 		})
 		if err != nil {
 			return fmt.Errorf("failed to get git clients: %w", err)

cmd/internal/provider_test.go

@@ -72,7 +72,7 @@ var _ = Describe("Get git provider", func() {
 		It("invalid token key returns an error", func() {
 			fakeLogger = &loggerfakes.FakeLogger{}
 			client = NewGitProviderClient(os.Stdout, fakeEnvLookupExists, fakeAuthHandlerFuncError, fakeLogger)
-			repoUrl, _ = gitproviders.NewRepoURL("ssh://git@some-bucket.com/weaveworks/weave-gitops.git", false)
+			repoUrl, _ = gitproviders.NewRepoURL("ssh://git@some-bucket.com/weaveworks/weave-gitops.git")
 
 			provider, err := client.GetProvider(repoUrl, fakeAccountGetterSuccess)
 			Expect(provider).To(BeNil())
@@ -87,7 +87,7 @@ var _ = Describe("Get git provider", func() {
 			BeforeEach(func() {
 				fakeLogger = &loggerfakes.FakeLogger{}
 				client = NewGitProviderClient(os.Stdout, fakeEnvLookupExists, fakeAuthHandlerFuncError, fakeLogger)
-				repoUrl, _ = gitproviders.NewRepoURL("ssh://git@github.com/weaveworks/weave-gitops.git", false)
+				repoUrl, _ = gitproviders.NewRepoURL("ssh://git@github.com/weaveworks/weave-gitops.git")
 			})
 
 			It("gitproviders.New returns an error", func() {
@@ -111,7 +111,7 @@ var _ = Describe("Get git provider", func() {
 			BeforeEach(func() {
 				fakeLogger = &loggerfakes.FakeLogger{}
 				client = NewGitProviderClient(os.Stdout, fakeEnvLookupExists, fakeAuthHandlerFuncError, fakeLogger)
-				repoUrl, _ = gitproviders.NewRepoURL("ssh://git@gitlab.com/weaveworks/weave-gitops.git", false)
+				repoUrl, _ = gitproviders.NewRepoURL("ssh://git@gitlab.com/weaveworks/weave-gitops.git")
 			})
 
 			It("gitproviders.New returns an error", func() {
@@ -135,7 +135,7 @@ var _ = Describe("Get git provider", func() {
 			fakeLogger = &loggerfakes.FakeLogger{
 				WarningfStub: func(fmtArg string, restArgs ...interface{}) {},
 			}
-			repoUrl, _ = gitproviders.NewRepoURL("ssh://git@github.com/weaveworks/weave-gitops.git", false)
+			repoUrl, _ = gitproviders.NewRepoURL("ssh://git@github.com/weaveworks/weave-gitops.git")
 		})
 
 		AfterEach(func() {

pkg/flux/flux_test.go

@@ -84,7 +84,7 @@ var _ = Describe("CreateSourceGit", func() {
 			return []byte("out"), nil
 		}
 
-		repoUrl, err := gitproviders.NewRepoURL("https://github.com/foo/my-name", false)
+		repoUrl, err := gitproviders.NewRepoURL("https://github.com/foo/my-name")
 		Expect(err).ShouldNot(HaveOccurred())
 		out, err := fluxClient.CreateSourceGit("my-name", repoUrl, "main", "my-secret", wego.DefaultNamespace)
 		Expect(err).ShouldNot(HaveOccurred())
@@ -100,7 +100,7 @@ var _ = Describe("CreateSourceGit", func() {
 		runner.RunStub = func(s1 string, s2 ...string) ([]byte, error) {
 			return []byte("out"), nil
 		}
-		repoUrl, err := gitproviders.NewRepoURL("ssh://git@github.com/foo/my-name", false)
+		repoUrl, err := gitproviders.NewRepoURL("ssh://git@github.com/foo/my-name")
 		Expect(err).ShouldNot(HaveOccurred())
 		out, err := fluxClient.CreateSourceGit("my-name", repoUrl, "main", "", wego.DefaultNamespace)
 		Expect(err).ShouldNot(HaveOccurred())
@@ -119,7 +119,7 @@ var _ = Describe("CreateSourceGit", func() {
 			return []byte("out"), nil
 		}
 
-		repoUrl, err := gitproviders.NewRepoURL("ssh://git@gitlab.com/foo/my-name", false)
+		repoUrl, err := gitproviders.NewRepoURL("ssh://git@gitlab.com/foo/my-name")
 		Expect(err).ShouldNot(HaveOccurred())
 		out, err := fluxClient.CreateSourceGit("my-name", repoUrl, "main", "", wego.DefaultNamespace)
 		Expect(err).ShouldNot(HaveOccurred())
@@ -244,7 +244,7 @@ var _ = Describe("CreateSecretGit", func() {
 			return []byte(`ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCh...`), nil
 		}
 
-		repoUrl, err := gitproviders.NewRepoURL("ssh://git@github.com/foo/bar.git", false)
+		repoUrl, err := gitproviders.NewRepoURL("ssh://git@github.com/foo/bar.git")
 		Expect(err).ShouldNot(HaveOccurred())
 		out, err := fluxClient.CreateSecretGit("my-secret", repoUrl, wego.DefaultNamespace)
 		Expect(err).ShouldNot(HaveOccurred())

pkg/gitproviders/provider_org_test.go

@@ -48,7 +48,7 @@ var _ = Describe("Org Provider", func() {
 		}
 
 		var err error
-		repoUrl, err = NewRepoURL("http://github.com/owner/repo-name", false)
+		repoUrl, err = NewRepoURL("http://github.com/owner/repo-name")
 		Expect(err).ToNot(HaveOccurred())
 	})
 

pkg/gitproviders/provider_user_test.go

@@ -46,7 +46,7 @@ var _ = Describe("User Provider", func() {
 		}
 
 		var err error
-		repoUrl, err = NewRepoURL("http://github.com/owner/repo-name", false)
+		repoUrl, err = NewRepoURL("http://github.com/owner/repo-name")
 		Expect(err).ToNot(HaveOccurred())
 	})
 

pkg/gitproviders/repo_url.go

@@ -17,16 +17,15 @@ const RepositoryURLProtocolHTTPS RepositoryURLProtocol = "https"
 const RepositoryURLProtocolSSH RepositoryURLProtocol = "ssh"
 
 type RepoURL struct {
-	repoName     string
-	owner        string
-	url          *url.URL
-	normalized   string
-	provider     GitProviderName
-	protocol     RepositoryURLProtocol
-	isConfigRepo bool
+	repoName   string
+	owner      string
+	url        *url.URL
+	normalized string
+	provider   GitProviderName
+	protocol   RepositoryURLProtocol
 }
 
-func NewRepoURL(uri string, isConfigRepo bool) (RepoURL, error) {
+func NewRepoURL(uri string) (RepoURL, error) {
 	providerName, err := detectGitProviderFromUrl(uri, ViperGetStringMapString("git-host-types"))
 	if err != nil {
 		return RepoURL{}, fmt.Errorf("could not get provider name from URL %s: %w", uri, err)
@@ -53,13 +52,12 @@ func NewRepoURL(uri string, isConfigRepo bool) (RepoURL, error) {
 	}
 
 	return RepoURL{
-		repoName:     utils.UrlToRepoName(uri),
-		owner:        owner,
-		url:          u,
-		normalized:   normalized,
-		provider:     providerName,
-		protocol:     protocol,
-		isConfigRepo: isConfigRepo,
+		repoName:   utils.UrlToRepoName(uri),
+		owner:      owner,
+		url:        u,
+		normalized: normalized,
+		provider:   providerName,
+		protocol:   protocol,
 	}, nil
 }
 
@@ -87,10 +85,6 @@ func (n RepoURL) Protocol() RepositoryURLProtocol {
 	return n.protocol
 }
 
-func (n RepoURL) IsConfigRepo() bool {
-	return n.isConfigRepo
-}
-
 func getOwnerFromUrl(url url.URL, providerName GitProviderName) (string, error) {
 	url.Path = strings.TrimPrefix(url.Path, "/")
 

pkg/gitproviders/repo_url_test.go

@@ -71,7 +71,7 @@ var _ = DescribeTable("NewRepoURL", func(input, gitProviderEnv string, expected
 	if gitProviderEnv != "" {
 		viper.Set("git-host-types", gitProviderEnv)
 	}
-	result, err := NewRepoURL(input, false)
+	result, err := NewRepoURL(input)
 	Expect(err).NotTo(HaveOccurred())
 
 	Expect(result.String()).To(Equal(expected.s))

pkg/models/manifest_test.go

@@ -34,7 +34,7 @@ var _ = Describe("Installer", func() {
 	}
 	var err error
 	var _ = BeforeEach(func() {
-		params.ConfigRepo, err = gitproviders.NewRepoURL("ssh://git@github.com/test-user/test-repo", true)
+		params.ConfigRepo, err = gitproviders.NewRepoURL("ssh://git@github.com/test-user/test-repo")
 
 		fakeFluxClient = &fluxfakes.FakeFlux{}
 		fakeKubeClient = &kubefakes.FakeKube{}
@@ -145,7 +145,7 @@ var _ = Describe("Installer", func() {
 
 				boostrapManifests = []Manifest{}
 
-				configRepo, err := gitproviders.NewRepoURL("ssh://git@github.com/test-user/test-repo", true)
+				configRepo, err := gitproviders.NewRepoURL("ssh://git@github.com/test-user/test-repo")
 				Expect(err).ShouldNot(HaveOccurred())
 
 				params = GitopsManifestsParams{

pkg/server/internal/provider_test.go

@@ -24,7 +24,7 @@ var _ = Describe("Get git provider", func() {
 	var repoUrl gitproviders.RepoURL
 	BeforeEach(func() {
 		client = NewGitProviderClient(fakeToken)
-		repoUrl, _ = gitproviders.NewRepoURL("ssh://git@github.com/weaveworks/weave-gitops.git", false)
+		repoUrl, _ = gitproviders.NewRepoURL("ssh://git@github.com/weaveworks/weave-gitops.git")
 	})
 
 	It("gitproviders.New throws an error", func() {

pkg/server/server.go

@@ -304,7 +304,7 @@ func (s *applicationServer) AddApplication(ctx context.Context, msg *pb.AddAppli
 		return nil, fmt.Errorf("failed to create kube service: %w", err)
 	}
 
-	appUrl, err := gitproviders.NewRepoURL(msg.Url, false)
+	appUrl, err := gitproviders.NewRepoURL(msg.Url)
 	if err != nil {
 		return nil, grpcStatus.Errorf(codes.InvalidArgument, "unable to parse app url %q: %s", msg.Url, err)
 	}
@@ -314,7 +314,7 @@ func (s *applicationServer) AddApplication(ctx context.Context, msg *pb.AddAppli
 		return nil, fmt.Errorf("failed getting wego config")
 	}
 
-	configRepo, err := gitproviders.NewRepoURL(wegoConfig.ConfigRepo, true)
+	configRepo, err := gitproviders.NewRepoURL(wegoConfig.ConfigRepo)
 	if err != nil {
 		return nil, grpcStatus.Errorf(codes.InvalidArgument, "unable to parse config url %q: %s", wegoConfig.ConfigRepo, err)
 	}
@@ -677,7 +677,7 @@ func (s *applicationServer) Authenticate(_ context.Context, msg *pb.Authenticate
 }
 
 func (s *applicationServer) ParseRepoURL(ctx context.Context, msg *pb.ParseRepoURLRequest) (*pb.ParseRepoURLResponse, error) {
-	u, err := gitproviders.NewRepoURL(msg.Url, false)
+	u, err := gitproviders.NewRepoURL(msg.Url)
 	if err != nil {
 		return nil, grpcStatus.Errorf(codes.InvalidArgument, "could not parse url: %s", err.Error())
 	}

pkg/services/app/add.go

@@ -2,6 +2,7 @@ package app
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"strings"
 
@@ -141,10 +142,13 @@ func (a *AppSvc) updateParametersIfNecessary(ctx context.Context, gitProvider gi
 			return params, fmt.Errorf("--url must be specified for helm repositories")
 		}
 
+		if params.ConfigRepo == "" {
+			return params, errors.New("--config-repo should be provided")
+		}
 	default:
 		var err error
 
-		appRepoUrl, err = gitproviders.NewRepoURL(params.Url, false)
+		appRepoUrl, err = gitproviders.NewRepoURL(params.Url)
 		if err != nil {
 			return params, fmt.Errorf("error normalizing url: %w", err)
 		}
@@ -157,7 +161,7 @@ func (a *AppSvc) updateParametersIfNecessary(ctx context.Context, gitProvider gi
 
 	// making sure the config url is in good format
 	if models.IsExternalConfigRepo(params.ConfigRepo) {
-		configRepoUrl, err := gitproviders.NewRepoURL(params.ConfigRepo, true)
+		configRepoUrl, err := gitproviders.NewRepoURL(params.ConfigRepo)
 		if err != nil {
 			return params, fmt.Errorf("error normalizing url: %w", err)
 		}
@@ -231,7 +235,7 @@ func makeApplication(params AddParams) (models.Application, error) {
 	if models.SourceType(params.SourceType) == models.SourceTypeHelm {
 		helmSourceURL = params.Url
 	} else {
-		gitSourceURL, err = gitproviders.NewRepoURL(params.Url, false)
+		gitSourceURL, err = gitproviders.NewRepoURL(params.Url)
 		if err != nil {
 			return models.Application{}, err
 		}
@@ -240,7 +244,7 @@ func makeApplication(params AddParams) (models.Application, error) {
 	configRepo := gitSourceURL
 
 	if params.ConfigRepo != "" {
-		curl, err := gitproviders.NewRepoURL(params.ConfigRepo, true)
+		curl, err := gitproviders.NewRepoURL(params.ConfigRepo)
 		if err != nil {
 			return models.Application{}, err
 		}

pkg/services/app/commit.go

@@ -22,7 +22,7 @@ func (a *AppSvc) GetCommits(gitProvider gitproviders.GitProvider, params CommitP
 		return nil, fmt.Errorf("unable to get commits for a helm chart")
 	}
 
-	repoUrl, err := gitproviders.NewRepoURL(application.Spec.URL, false)
+	repoUrl, err := gitproviders.NewRepoURL(application.Spec.URL)
 	if err != nil {
 		return nil, fmt.Errorf("error creating normalized url: %w", err)
 	}

pkg/services/applicationv2/fetcher.go

@@ -81,7 +81,7 @@ func translateApp(app wego.Application) (models.Application, error) {
 	)
 
 	if wego.DeploymentType(app.Spec.SourceType) == wego.DeploymentType(wego.SourceTypeGit) {
-		appRepoUrl, err = gitproviders.NewRepoURL(app.Spec.URL, false)
+		appRepoUrl, err = gitproviders.NewRepoURL(app.Spec.URL)
 		if err != nil {
 			return models.Application{}, err
 		}
@@ -92,7 +92,7 @@ func translateApp(app wego.Application) (models.Application, error) {
 	}
 
 	if models.IsExternalConfigRepo(app.Spec.ConfigRepo) {
-		configRepoUrl, err = gitproviders.NewRepoURL(app.Spec.ConfigRepo, true)
+		configRepoUrl, err = gitproviders.NewRepoURL(app.Spec.ConfigRepo)
 		if err != nil {
 			return models.Application{}, err
 		}

pkg/services/auth/auth.go

@@ -6,7 +6,6 @@ import (
 	"io"
 	"net/http"
 
-	"github.com/fluxcd/go-git-providers/gitprovider"
 	"github.com/weaveworks/weave-gitops/pkg/models"
 	"github.com/weaveworks/weave-gitops/pkg/services/auth/internal"
 
@@ -69,6 +68,7 @@ func (sn SecretName) NamespacedName() types.NamespacedName {
 
 type AuthService interface {
 	CreateGitClient(ctx context.Context, repoUrl gitproviders.RepoURL, targetName string, namespace string, dryRun bool) (git.Git, error)
+	SetupDeployKey(ctx context.Context, name SecretName, targetName string, repo gitproviders.RepoURL) (*ssh.PublicKeys, error)
 	GetGitProvider() gitproviders.GitProvider
 }
 
@@ -109,7 +109,7 @@ func (a *authSvc) CreateGitClient(ctx context.Context, repoUrl gitproviders.Repo
 		Namespace: namespace,
 	}
 
-	pubKey, keyErr := a.setupDeployKey(ctx, secretName, targetName, repoUrl)
+	pubKey, keyErr := a.SetupDeployKey(ctx, secretName, targetName, repoUrl)
 	if keyErr != nil {
 		return nil, fmt.Errorf("error setting up deploy keys: %w", keyErr)
 	}
@@ -124,9 +124,9 @@ func (a *authSvc) CreateGitClient(ctx context.Context, repoUrl gitproviders.Repo
 	return git.New(pubKey, wrapper.NewGoGit()), nil
 }
 
-// setupDeployKey creates a git.Git client instrumented with existing or generated deploy keys.
+// SetupDeployKey creates a git.Git client instrumented with existing or generated deploy keys.
 // This ensures that git operations are done with stored deploy keys instead of a user's local ssh-agent or equivalent.
-func (a *authSvc) setupDeployKey(ctx context.Context, name SecretName, targetName string, repo gitproviders.RepoURL) (*ssh.PublicKeys, error) {
+func (a *authSvc) SetupDeployKey(ctx context.Context, name SecretName, targetName string, repo gitproviders.RepoURL) (*ssh.PublicKeys, error) {
 	deployKeyExists, err := a.gitProvider.DeployKeyExists(ctx, repo)
 	if err != nil {
 		return nil, fmt.Errorf("failed check for existing deploy key: %w", err)
@@ -161,15 +161,6 @@ func (a *authSvc) setupDeployKey(ctx context.Context, name SecretName, targetNam
 }
 
 func (a *authSvc) provisionDeployKey(ctx context.Context, targetName string, name SecretName, repo gitproviders.RepoURL) (*ssh.PublicKeys, error) {
-	visibility, err := a.gitProvider.GetRepoVisibility(ctx, repo)
-	if err != nil {
-		return nil, fmt.Errorf("error getting repo visibility: %w", err)
-	}
-
-	if *visibility == gitprovider.RepositoryVisibilityPublic && !repo.IsConfigRepo() {
-		return nil, nil
-	}
-
 	deployKey, secret, err := a.generateDeployKey(targetName, name, repo)
 	if err != nil {
 		return nil, fmt.Errorf("error generating deploy key: %w", err)