fix: complete Gitea integration for e2e tests

Fixes multiple issues preventing e2e tests from running with in-cluster
Gitea instead of external GitHub:

- Set MustChangePassword to false when creating users to prevent auth errors
- Use AdminCreateRepo to create repos under correct user account
- Rewrite function initialization to avoid git/func init conflicts
- Add git user configuration for commits
- Use main branch instead of master for modern git compatibility
- Improve error messages by using utils.Run for all git commands
- Add function code to "not yet deployed" test scenario

Author: creydr

test/e2e/func_deploy_test.go

@@ -153,19 +153,25 @@ var _ = Describe("Operator", Ordered, func() {
 	})
 	Context("with a not yet deployed function", func() {
 		var repoURL    string
+		var repoDir    string
 		var functionName, functionNamespace string
 
 		BeforeEach(func() {
 			var err error
 
-			// Create repository but don't deploy
-			username, _, _, cleanup, err := repoProvider.CreateRandomUser()
+			// Create repository with function code but don't deploy
+			username, password, _, cleanup, err := repoProvider.CreateRandomUser()
 			Expect(err).NotTo(HaveOccurred())
 			DeferCleanup(cleanup)
 
 			_, repoURL, cleanup, err = repoProvider.CreateRandomRepo(username, false)
 			Expect(err).NotTo(HaveOccurred())
 			DeferCleanup(cleanup)
+
+			// Initialize repository with function code
+			repoDir, err = InitializeRepoWithFunction(repoURL, username, password, "go")
+			Expect(err).NotTo(HaveOccurred())
+			DeferCleanup(os.RemoveAll, repoDir)
 		})
 
 		AfterEach(func() {

test/e2e/gitea_helpers.go

@@ -32,34 +32,52 @@ func buildAuthURL(repoURL, username, password string) string {
 		fmt.Sprintf("http://%s:%s@", username, password), 1)
 }
 
-// InitializeRepoWithFunction clones an empty Gitea repo, initializes a function, and pushes it
+// InitializeRepoWithFunction creates a function project and pushes it to the Gitea repo
 func InitializeRepoWithFunction(repoURL, username, password, language string) (repoDir string, err error) {
 	repoDir = fmt.Sprintf("%s/func-test-%s", os.TempDir(), rand.String(10))
 
 	// Build authenticated URL
 	authURL := buildAuthURL(repoURL, username, password)
 
-	// Clone empty repo
-	cmd := exec.Command("git", "clone", authURL, repoDir)
+	// Initialize function (func init creates the directory)
+	cmd := exec.Command("func", "init", "-l", language, repoDir)
 	if _, err = utils.Run(cmd); err != nil {
-		return "", fmt.Errorf("failed to clone repo: %w", err)
+		return "", fmt.Errorf("failed to init function: %w", err)
 	}
 
-	// Initialize function
-	cmd = exec.Command("func", "init", "-l", language)
-	cmd.Dir = repoDir
+	// Initialize git repo
+	cmd = exec.Command("git", "-C", repoDir, "init")
 	if _, err = utils.Run(cmd); err != nil {
-		return "", fmt.Errorf("failed to init function: %w", err)
+		return "", fmt.Errorf("failed to git init: %w", err)
+	}
+
+	// Configure git user
+	cmd = exec.Command("git", "-C", repoDir, "config", "user.name", "Test User")
+	if _, err = utils.Run(cmd); err != nil {
+		return "", fmt.Errorf("failed to set git user.name: %w", err)
+	}
+	cmd = exec.Command("git", "-C", repoDir, "config", "user.email", "test@example.com")
+	if _, err = utils.Run(cmd); err != nil {
+		return "", fmt.Errorf("failed to set git user.email: %w", err)
+	}
+
+	// Add remote
+	cmd = exec.Command("git", "-C", repoDir, "remote", "add", "origin", authURL)
+	if _, err = utils.Run(cmd); err != nil {
+		return "", fmt.Errorf("failed to add remote: %w", err)
 	}
 
 	// Commit and push
-	if err = exec.Command("git", "-C", repoDir, "add", ".").Run(); err != nil {
+	cmd = exec.Command("git", "-C", repoDir, "add", ".")
+	if _, err = utils.Run(cmd); err != nil {
 		return "", fmt.Errorf("failed to git add: %w", err)
 	}
-	if err = exec.Command("git", "-C", repoDir, "commit", "-m", "Initial function").Run(); err != nil {
+	cmd = exec.Command("git", "-C", repoDir, "commit", "-m", "Initial function")
+	if _, err = utils.Run(cmd); err != nil {
 		return "", fmt.Errorf("failed to git commit: %w", err)
 	}
-	if err = exec.Command("git", "-C", repoDir, "push").Run(); err != nil {
+	cmd = exec.Command("git", "-C", repoDir, "push", "-u", "origin", "main")
+	if _, err = utils.Run(cmd); err != nil {
 		return "", fmt.Errorf("failed to push initial commit: %w", err)
 	}
 
@@ -70,24 +88,28 @@ func InitializeRepoWithFunction(repoURL, username, password, language string) (r
 // Requires at least one file to be specified
 func CommitAndPush(repoDir string, msg string, file string, otherFiles ...string) error {
 	// Add first file
-	if err := exec.Command("git", "-C", repoDir, "add", file).Run(); err != nil {
+	cmd := exec.Command("git", "-C", repoDir, "add", file)
+	if _, err := utils.Run(cmd); err != nil {
 		return fmt.Errorf("failed to git add %s: %w", file, err)
 	}
 
 	// Add other files if provided
 	for _, f := range otherFiles {
-		if err := exec.Command("git", "-C", repoDir, "add", f).Run(); err != nil {
+		cmd = exec.Command("git", "-C", repoDir, "add", f)
+		if _, err := utils.Run(cmd); err != nil {
 			return fmt.Errorf("failed to git add %s: %w", f, err)
 		}
 	}
 
 	// Commit
-	if err := exec.Command("git", "-C", repoDir, "commit", "-m", msg).Run(); err != nil {
+	cmd = exec.Command("git", "-C", repoDir, "commit", "-m", msg)
+	if _, err := utils.Run(cmd); err != nil {
 		return fmt.Errorf("failed to git commit: %w", err)
 	}
 
 	// Push
-	if err := exec.Command("git", "-C", repoDir, "push").Run(); err != nil {
+	cmd = exec.Command("git", "-C", repoDir, "push")
+	if _, err := utils.Run(cmd); err != nil {
 		return fmt.Errorf("failed to push: %w", err)
 	}
 

test/utils/gitea.go

@@ -101,10 +101,12 @@ func NewGiteaClient() (*GiteaClient, error) {
 
 // CreateUser creates a new Gitea user
 func (g *GiteaClient) CreateUser(username, password, email string) (cleanup func(), err error) {
+	mustChangePassword := false
 	_, _, err = g.client.AdminCreateUser(gitea.CreateUserOption{
-		Username: username,
-		Password: password,
-		Email:    email,
+		Username:           username,
+		Password:           password,
+		Email:              email,
+		MustChangePassword: &mustChangePassword,
 	})
 	if err != nil {
 		return nil, fmt.Errorf("failed to create user %s: %w", username, err)
@@ -137,7 +139,8 @@ func (g *GiteaClient) CreateRandomUser() (username, password, email string, clea
 
 // CreateRepo creates a new repository and returns its URL
 func (g *GiteaClient) CreateRepo(owner, name string, private bool) (url string, cleanup func(), err error) {
-	_, _, err = g.client.CreateRepo(gitea.CreateRepoOption{
+	// Use admin client to create repo for the specified owner
+	_, _, err = g.client.AdminCreateRepo(owner, gitea.CreateRepoOption{
 		Name:    name,
 		Private: private,
 	})