From da6dfd5a1bdb2fe709269fcbdea24c036b789e23 Mon Sep 17 00:00:00 2001 From: Soule BA Date: Sat, 18 Dec 2021 22:03:32 +0100 Subject: [PATCH] Use provided ssh hostname to sync with ssh Signed-off-by: Soule BA --- internal/bootstrap/bootstrap_provider.go | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/internal/bootstrap/bootstrap_provider.go b/internal/bootstrap/bootstrap_provider.go index 8f475b99..dd23f75f 100644 --- a/internal/bootstrap/bootstrap_provider.go +++ b/internal/bootstrap/bootstrap_provider.go @@ -200,8 +200,10 @@ func (b *GitProviderBootstrapper) ReconcileSyncConfig(ctx context.Context, optio if err != nil { return err } + options.URL = syncURL } + return b.PlainGitBootstrapper.ReconcileSyncConfig(ctx, options) } @@ -414,14 +416,11 @@ func (b *GitProviderBootstrapper) getOrganization(ctx context.Context, subOrgs [ func (b *GitProviderBootstrapper) getCloneURL(repository gitprovider.UserRepository, transport gitprovider.TransportType) (string, error) { var url string if cloner, ok := repository.(gitprovider.CloneableURL); ok { - return cloner.GetCloneURL("", transport), nil + url = cloner.GetCloneURL("", transport) + } else { + url = repository.Repository().GetCloneURL(transport) } - url = repository.Repository().GetCloneURL(transport) - // TODO(hidde): https://github.com/fluxcd/go-git-providers/issues/55 - if strings.HasPrefix(url, "https://https://") { - url = strings.TrimPrefix(url, "https://") - } var err error if transport == gitprovider.TransportTypeSSH && b.sshHostname != "" { if url, err = setHostname(url, b.sshHostname); err != nil {