From 43388ec67ba364b5d17f12bd88cc72b7f1bce95b Mon Sep 17 00:00:00 2001 From: Hidde Beydals Date: Wed, 21 Apr 2021 09:13:02 +0200 Subject: [PATCH] Drop AutoInit from Org repository create Pushing the first branch is sufficient to set a default, and the `README.md` (and/or LICENSE) can better be pushed later on so commit author and templates be configured. This was already done for User in an earlier patch release. Signed-off-by: Hidde Beydals --- internal/bootstrap/bootstrap_provider.go | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/internal/bootstrap/bootstrap_provider.go b/internal/bootstrap/bootstrap_provider.go index 88c4f241..6df1d2db 100644 --- a/internal/bootstrap/bootstrap_provider.go +++ b/internal/bootstrap/bootstrap_provider.go @@ -280,11 +280,8 @@ func (b *GitProviderBootstrapper) reconcileOrgRepository(ctx context.Context) (g } // go-git-providers has at present some issues with the idempotency // of the available Reconcile methods, and setting e.g. the default - // branch correctly. Resort to Create with AutoInit until this has - // been resolved. - repo, err = b.provider.OrgRepositories().Create(ctx, repoRef, repoInfo, &gitprovider.RepositoryCreateOptions{ - AutoInit: gitprovider.BoolVar(true), - }) + // branch correctly. Resort to Create until this has been resolved. + repo, err = b.provider.OrgRepositories().Create(ctx, repoRef, repoInfo) if err != nil { return nil, fmt.Errorf("failed to create new Git repository %q: %w", repoRef.String(), err) } @@ -348,6 +345,7 @@ func (b *GitProviderBootstrapper) reconcileUserRepository(ctx context.Context) ( repoRef := newUserRepositoryRef(userRef, repoName) repoInfo := newRepositoryInfo(b.description, b.defaultBranch, b.visibility) + // Reconcile the user repository repo, err := b.provider.UserRepositories().Get(ctx, repoRef) if err != nil { if !errors.Is(err, gitprovider.ErrNotFound) { @@ -355,9 +353,8 @@ func (b *GitProviderBootstrapper) reconcileUserRepository(ctx context.Context) ( } // go-git-providers has at present some issues with the idempotency // of the available Reconcile methods, and setting e.g. the default - // branch correctly. Resort to Create with AutoInit until this has - // been resolved. - repo, err = b.provider.UserRepositories().Create(ctx, repoRef, repoInfo, &gitprovider.RepositoryCreateOptions{}) + // branch correctly. Resort to Create until this has been resolved. + repo, err = b.provider.UserRepositories().Create(ctx, repoRef, repoInfo) if err != nil { return nil, fmt.Errorf("failed to create new Git repository %q: %w", repoRef.String(), err) }