Merge branch 'nephio-project:main' into disaster-recovery-setup

Author: JamesMcDermott

pkg/externalrepo/git/gitrepofactory.go

@@ -66,15 +66,13 @@ func (f *GitRepoFactory) NewRepositoryImpl(ctx context.Context, repositorySpec *
 }
 
 func (f *GitRepoFactory) CheckRepositoryConnection(ctx context.Context, repositorySpec *configapi.Repository, options externalrepotypes.ExternalRepoOptions) error {
-	// Nil checks
-	if repositorySpec == nil || repositorySpec.Spec.Git == nil {
-		return fmt.Errorf("repositorySpec is nil or missing Git configuration")
-	}
-	if repositorySpec.Spec.Git.Repo == "" {
-		return fmt.Errorf("repository URL is empty")
+	if err := f.validateRepositorySpec(repositorySpec); err != nil {
+		return err
 	}
-	if repositorySpec.Spec.Git.Branch == "" {
-		return fmt.Errorf("target branch is empty")
+
+	branch := repositorySpec.Spec.Git.Branch
+	if branch == "" {
+		branch = "main"
 	}
 
 	// Fetch credentials from secret
@@ -101,7 +99,7 @@ func (f *GitRepoFactory) CheckRepositoryConnection(ctx context.Context, reposito
 	})
 
 	refs, err := remote.List(&gogit.ListOptions{
-		Auth: auth,
+		Auth:    auth,
 		Timeout: 20,
 	})
 	if err != nil {
@@ -110,15 +108,25 @@ func (f *GitRepoFactory) CheckRepositoryConnection(ctx context.Context, reposito
 
 	branchExists := false
 	for _, ref := range refs {
-		if ref.Name().IsBranch() && ref.Name().Short() == repositorySpec.Spec.Git.Branch {
+		if ref.Name().IsBranch() && ref.Name().Short() == branch {
 			branchExists = true
 			break
 		}
 	}
 
-	if !branchExists {
-		return fmt.Errorf("branch %q not found in repository", repositorySpec.Spec.Git.Branch)
+	if !branchExists && !repositorySpec.Spec.Git.CreateBranch {
+		return fmt.Errorf("branch %q not found in repository", branch)
 	}
 
 	return nil
 }
+
+func (f *GitRepoFactory) validateRepositorySpec(repositorySpec *configapi.Repository) error {
+	if repositorySpec == nil || repositorySpec.Spec.Git == nil {
+		return fmt.Errorf("repositorySpec is nil or missing Git configuration")
+	}
+	if repositorySpec.Spec.Git.Repo == "" {
+		return fmt.Errorf("repository URL is empty")
+	}
+	return nil
+}

pkg/externalrepo/git/gitrepofactory_test.go

@@ -80,13 +80,6 @@ func TestCheckRepositoryConnection(t *testing.T) {
 	assert.True(t, err != nil)
 	assert.Contains(t, err.Error(), "repository URL is empty")
 
-	// empty branch name
-	repoSpec.Spec.Git.Repo = "https://example.com/repo.git"
-	repoSpec.Spec.Git.Branch = ""
-	err = gf.CheckRepositoryConnection(context.TODO(), repoSpec, externalrepotypes.ExternalRepoOptions{})
-	assert.True(t, err != nil)
-	assert.Contains(t, err.Error(), "target branch is empty")
-
 	tempDir := t.TempDir()
 	tarfile := filepath.Join("testdata", "trivial-repository.tar")
 	branch := "main"
@@ -105,6 +98,31 @@ func TestCheckRepositoryConnection(t *testing.T) {
 	err = gf.CheckRepositoryConnection(context.TODO(), repoSpec, externalrepotypes.ExternalRepoOptions{})
 	assert.NoError(t, err)
 
+	// empty branch defaults to main
+	repoSpec = &configapi.Repository{
+		Spec: configapi.RepositorySpec{
+			Git: &configapi.GitRepository{
+				Repo:   address,
+				Branch: "", // empty branch should default to main
+			},
+		},
+	}
+	err = gf.CheckRepositoryConnection(context.TODO(), repoSpec, externalrepotypes.ExternalRepoOptions{})
+	assert.NoError(t, err)
+
+	// branch not found but createBranch is set to true
+	repoSpec = &configapi.Repository{
+		Spec: configapi.RepositorySpec{
+			Git: &configapi.GitRepository{
+				Repo:         address,
+				Branch:       "nonexistent-branch",
+				CreateBranch: true,
+			},
+		},
+	}
+	err = gf.CheckRepositoryConnection(context.TODO(), repoSpec, externalrepotypes.ExternalRepoOptions{})
+	assert.NoError(t, err)
+
 	// branch not found
 	repoSpec = &configapi.Repository{
 		Spec: configapi.RepositorySpec{