From f400d763ae1b61bb738d35e9e729b12763d777fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christoph=20St=C3=A4bler?= Date: Wed, 1 Apr 2026 11:48:00 +0200 Subject: [PATCH] Move Git e2e helpers to test/utils package --- test/e2e/bundle_test.go | 2 +- test/e2e/func_deploy_test.go | 6 ++--- test/{e2e/gitea_helpers.go => utils/git.go} | 27 ++++++++++----------- 3 files changed, 17 insertions(+), 18 deletions(-) rename test/{e2e/gitea_helpers.go => utils/git.go} (85%) diff --git a/test/e2e/bundle_test.go b/test/e2e/bundle_test.go index a0f5a70..1b3f35e 100644 --- a/test/e2e/bundle_test.go +++ b/test/e2e/bundle_test.go @@ -381,7 +381,7 @@ func createNamespaceAndDeployFunction() TestNamespace { DeferCleanup(cleanup) // Initialize repo with function code - repoDir, err := InitializeRepoWithFunction(repoURL, username, password, "go") + repoDir, err := utils.InitializeRepoWithFunction(repoURL, username, password, "go") Expect(err).NotTo(HaveOccurred()) DeferCleanup(os.RemoveAll, repoDir) diff --git a/test/e2e/func_deploy_test.go b/test/e2e/func_deploy_test.go index 9ea5115..3e8630f 100644 --- a/test/e2e/func_deploy_test.go +++ b/test/e2e/func_deploy_test.go @@ -54,7 +54,7 @@ var _ = Describe("Operator", func() { DeferCleanup(cleanup) // Initialize repository with function code - repoDir, err = InitializeRepoWithFunction(repoURL, username, password, "go") + repoDir, err = utils.InitializeRepoWithFunction(repoURL, username, password, "go") Expect(err).NotTo(HaveOccurred()) DeferCleanup(os.RemoveAll, repoDir) @@ -79,7 +79,7 @@ var _ = Describe("Operator", func() { }) // Commit func.yaml changes - err = CommitAndPush(repoDir, "Update func.yaml after deploy", "func.yaml") + err = utils.CommitAndPush(repoDir, "Update func.yaml after deploy", "func.yaml") Expect(err).NotTo(HaveOccurred()) }) @@ -173,7 +173,7 @@ var _ = Describe("Operator", func() { DeferCleanup(cleanup) // Initialize repository with function code - repoDir, err = InitializeRepoWithFunction(repoURL, username, password, "go") + repoDir, err = utils.InitializeRepoWithFunction(repoURL, username, password, "go") Expect(err).NotTo(HaveOccurred()) DeferCleanup(os.RemoveAll, repoDir) diff --git a/test/e2e/gitea_helpers.go b/test/utils/git.go similarity index 85% rename from test/e2e/gitea_helpers.go rename to test/utils/git.go index abc6263..3598fc5 100644 --- a/test/e2e/gitea_helpers.go +++ b/test/utils/git.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package e2e +package utils import ( "fmt" @@ -22,7 +22,6 @@ import ( "os/exec" "strings" - "github.com/functions-dev/func-operator/test/utils" "k8s.io/apimachinery/pkg/util/rand" ) @@ -41,43 +40,43 @@ func InitializeRepoWithFunction(repoURL, username, password, language string) (r // Initialize function (func init creates the directory) cmd := exec.Command("func", "init", "-l", language, repoDir) - if _, err = utils.Run(cmd); err != nil { + if _, err = Run(cmd); err != nil { return "", fmt.Errorf("failed to init function: %w", err) } // Initialize git repo with main as default branch cmd = exec.Command("git", "-C", repoDir, "init", "-b", "main") - if _, err = utils.Run(cmd); err != nil { + if _, err = Run(cmd); err != nil { 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 { + if _, err = 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 { + if _, err = 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 { + if _, err = Run(cmd); err != nil { return "", fmt.Errorf("failed to add remote: %w", err) } // Commit and push cmd = exec.Command("git", "-C", repoDir, "add", ".") - if _, err = utils.Run(cmd); err != nil { + if _, err = Run(cmd); err != nil { return "", fmt.Errorf("failed to git add: %w", err) } cmd = exec.Command("git", "-C", repoDir, "commit", "-m", "Initial function") - if _, err = utils.Run(cmd); err != nil { + if _, err = Run(cmd); err != nil { return "", fmt.Errorf("failed to git commit: %w", err) } cmd = exec.Command("git", "-C", repoDir, "push", "-u", "origin", "main") - if _, err = utils.Run(cmd); err != nil { + if _, err = Run(cmd); err != nil { return "", fmt.Errorf("failed to push initial commit: %w", err) } @@ -89,27 +88,27 @@ func InitializeRepoWithFunction(repoURL, username, password, language string) (r func CommitAndPush(repoDir string, msg string, file string, otherFiles ...string) error { // Add first file cmd := exec.Command("git", "-C", repoDir, "add", file) - if _, err := utils.Run(cmd); err != nil { + if _, err := Run(cmd); err != nil { return fmt.Errorf("failed to git add %s: %w", file, err) } // Add other files if provided for _, f := range otherFiles { cmd = exec.Command("git", "-C", repoDir, "add", f) - if _, err := utils.Run(cmd); err != nil { + if _, err := Run(cmd); err != nil { return fmt.Errorf("failed to git add %s: %w", f, err) } } // Commit cmd = exec.Command("git", "-C", repoDir, "commit", "-m", msg) - if _, err := utils.Run(cmd); err != nil { + if _, err := Run(cmd); err != nil { return fmt.Errorf("failed to git commit: %w", err) } // Push cmd = exec.Command("git", "-C", repoDir, "push") - if _, err := utils.Run(cmd); err != nil { + if _, err := Run(cmd); err != nil { return fmt.Errorf("failed to push: %w", err) }