Merge pull request #4941 from werf/test-e2e-add-converge-test

test(e2e): add simple converge test

test/e2e/build/suite_test.go

@@ -7,7 +7,7 @@ import (
 	. "github.com/onsi/ginkgo/v2"
 
 	"github.com/werf/werf/test/pkg/suite_init"
-	iutils "github.com/werf/werf/test/pkg/utils"
+	"github.com/werf/werf/test/pkg/utils"
 	"github.com/werf/werf/test/pkg/utils/docker"
 )
 
@@ -45,6 +45,6 @@ var (
 	})
 
 	_ = AfterEach(func() {
-		iutils.RunSucceedCommand("", SuiteData.WerfBinPath, "host", "purge", "--force", "--project-name", SuiteData.ProjectName)
+		utils.RunSucceedCommand("", SuiteData.WerfBinPath, "host", "purge", "--force", "--project-name", SuiteData.ProjectName)
 	})
 )

test/e2e/converge/_fixtures/simple/state0/.helm/templates/configmap.yaml

@@ -0,0 +1,6 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: test1
+data:
+  key1: value1

test/e2e/converge/_fixtures/simple/state0/werf.yaml

@@ -0,0 +1,6 @@
+project: werf-test-e2e-converge-simple
+configVersion: 1
+
+---
+image: main
+from: ubuntu:22.04

test/e2e/converge/common_test.go

@@ -0,0 +1,20 @@
+package e2e_converge_test
+
+import (
+	"os"
+	"strings"
+
+	"github.com/werf/werf/pkg/util"
+)
+
+func setupEnv() {
+	SuiteData.Stubs.SetEnv("WERF_REPO", strings.Join([]string{os.Getenv("WERF_TEST_K8S_DOCKER_REGISTRY"), SuiteData.ProjectName}, "/"))
+
+	if util.GetBoolEnvironmentDefaultFalse("WERF_TEST_K8S_DOCKER_REGISTRY_INSECURE") {
+		SuiteData.Stubs.SetEnv("WERF_INSECURE_REGISTRY", "1")
+		SuiteData.Stubs.SetEnv("WERF_SKIP_TLS_VERIFY_REGISTRY", "1")
+	} else {
+		SuiteData.Stubs.UnsetEnv("WERF_INSECURE_REGISTRY")
+		SuiteData.Stubs.UnsetEnv("WERF_SKIP_TLS_VERIFY_REGISTRY")
+	}
+}

test/e2e/converge/simple_test.go

@@ -0,0 +1,54 @@
+package e2e_converge_test
+
+import (
+	"context"
+
+	. "github.com/onsi/ginkgo/v2"
+	. "github.com/onsi/gomega"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+
+	"github.com/werf/kubedog/pkg/kube"
+	"github.com/werf/werf/test/pkg/utils"
+	"github.com/werf/werf/test/pkg/werf"
+)
+
+var _ = Describe("Simple converge", Label("e2e", "converge", "simple"), func() {
+	var repoDirname string
+
+	BeforeEach(func() {
+		Expect(kube.Init(kube.InitOptions{})).To(Succeed())
+	})
+
+	AfterEach(func() {
+		utils.RunSucceedCommand(SuiteData.GetTestRepoPath(repoDirname), SuiteData.WerfBinPath, "dismiss", "--with-namespace")
+	})
+
+	It("should succeed and deploy expected resources",
+		func() {
+			By("initializing")
+			repoDirname = "repo0"
+			setupEnv()
+
+			By("state0: starting")
+			{
+				fixtureRelPath := "simple/state0"
+
+				By("state0: preparing test repo")
+				SuiteData.InitTestRepo(repoDirname, fixtureRelPath)
+				werfProject := werf.NewProject(SuiteData.WerfBinPath, SuiteData.GetTestRepoPath(repoDirname))
+
+				By("state0: execute converge")
+				combinedOut := werfProject.Converge(&werf.ConvergeOptions{})
+
+				By("state0: check converge output")
+				Expect(combinedOut).To(ContainSubstring("STATUS: deployed"))
+				Expect(combinedOut).To(ContainSubstring("REVISION: 1"))
+
+				By("state0: check deployed resources in cluster")
+				cm, err := kube.Client.CoreV1().ConfigMaps(werfProject.Namespace()).Get(context.Background(), "test1", metav1.GetOptions{})
+				Expect(err).NotTo(HaveOccurred())
+				Expect(cm.Data).To(Equal(map[string]string{"key1": "value1"}))
+			}
+		},
+	)
+})

test/e2e/converge/suite_test.go

@@ -0,0 +1,35 @@
+package e2e_converge_test
+
+import (
+	"testing"
+
+	. "github.com/onsi/ginkgo/v2"
+
+	"github.com/werf/werf/test/pkg/suite_init"
+	"github.com/werf/werf/test/pkg/utils"
+)
+
+func TestSuite(t *testing.T) {
+	suite_init.MakeTestSuiteEntrypointFunc("E2E converge suite", suite_init.TestSuiteEntrypointFuncOptions{
+		RequiredSuiteTools: []string{"docker", "git"},
+		RequiredSuiteEnvs: []string{
+			"WERF_TEST_K8S_DOCKER_REGISTRY",
+		},
+	})(t)
+}
+
+var SuiteData suite_init.SuiteData
+
+var (
+	_ = SuiteData.SetupStubs(suite_init.NewStubsData())
+	_ = SuiteData.SetupSynchronizedSuiteCallbacks(suite_init.NewSynchronizedSuiteCallbacksData())
+	_ = SuiteData.SetupWerfBinary(suite_init.NewWerfBinaryData(SuiteData.SynchronizedSuiteCallbacksData))
+	_ = SuiteData.SetupProjectName(suite_init.NewProjectNameData(SuiteData.StubsData))
+	_ = SuiteData.SetupTmp(suite_init.NewTmpDirData())
+
+	_ = SuiteData.SetupK8sDockerRegistry(suite_init.NewK8sDockerRegistryData(SuiteData.ProjectNameData, SuiteData.StubsData))
+
+	_ = AfterEach(func() {
+		utils.RunSucceedCommand("", SuiteData.WerfBinPath, "host", "purge", "--force", "--project-name", SuiteData.ProjectName)
+	})
+)

test/e2e/kube-run/_fixtures/simple/state0/werf.yaml

@@ -1,4 +1,4 @@
-project: werf-test-e2e-kube-run-complex
+project: werf-test-e2e-kube-run-simple
 configVersion: 1
 
 ---

test/e2e/kube-run/kube_run_test.go → test/e2e/kube-run/simple_test.go

@@ -13,7 +13,7 @@ import (
 
 var _ = Describe("Simple kube-run", Label("e2e", "kube-run", "simple"), func() {
 	DescribeTable("should",
-		func(kubeRunOpts *werf.KubeRunOptions, outputExpectationsFunc func(out string)) {
+		func(kubeRunOpts *werf.KubeRunOptions, expectOutFn func(out string)) {
 			By("initializing")
 			setupEnv()
 			repoDirname := "repo0"
@@ -25,7 +25,7 @@ var _ = Describe("Simple kube-run", Label("e2e", "kube-run", "simple"), func() {
 
 			By("state0: execute kube-run")
 			combinedOut := werfProject.KubeRun(kubeRunOpts)
-			outputExpectationsFunc(combinedOut)
+			expectOutFn(combinedOut)
 		},
 		Entry(
 			"succeed and produce expected output, running non-interactively",

test/e2e/kube-run/suite_test.go

@@ -11,8 +11,6 @@ func TestSuite(t *testing.T) {
 		RequiredSuiteTools: []string{"docker", "git"},
 		RequiredSuiteEnvs: []string{
 			"WERF_TEST_K8S_DOCKER_REGISTRY",
-			"WERF_TEST_K8S_DOCKER_REGISTRY_USERNAME",
-			"WERF_TEST_K8S_DOCKER_REGISTRY_PASSWORD",
 		},
 	})(t)
 }

test/pkg/werf/project.go

@@ -3,6 +3,7 @@ package werf
 import (
 	"encoding/json"
 	"os"
+	"strings"
 
 	. "github.com/onsi/gomega"
 
@@ -20,6 +21,7 @@ func NewProject(werfBinPath, gitRepoPath string) *Project {
 type Project struct {
 	GitRepoPath string
 	WerfBinPath string
+	namespace   string
 }
 
 type CommonOptions struct {
@@ -35,6 +37,10 @@ type BuildWithReportOptions struct {
 	CommonOptions
 }
 
+type ConvergeOptions struct {
+	CommonOptions
+}
+
 type KubeRunOptions struct {
 	CommonOptions
 	Command []string
@@ -78,6 +84,17 @@ func (p *Project) BuildWithReport(buildReportPath string, opts *BuildWithReportO
 	return out, buildReport
 }
 
+func (p *Project) Converge(opts *ConvergeOptions) (combinedOut string) {
+	if opts == nil {
+		opts = &ConvergeOptions{}
+	}
+
+	args := append([]string{"converge"}, opts.ExtraArgs...)
+	outb := p.runCommand(runCommandOptions{Args: args, ShouldFail: opts.ShouldFail})
+
+	return string(outb)
+}
+
 func (p *Project) KubeRun(opts *KubeRunOptions) string {
 	if opts == nil {
 		opts = &KubeRunOptions{}
@@ -107,6 +124,14 @@ func (p *Project) KubeCtl(opts *KubeCtlOptions) string {
 	return p.runCommand(runCommandOptions{Args: args, ShouldFail: opts.ShouldFail})
 }
 
+func (p *Project) Namespace() string {
+	if p.namespace == "" {
+		p.namespace = strings.TrimSpace(p.runCommand(runCommandOptions{Args: []string{"helm", "get-namespace"}}))
+	}
+
+	return p.namespace
+}
+
 func (p *Project) runCommand(opts runCommandOptions) string {
 	outb, err := iutils.RunCommand(p.GitRepoPath, p.WerfBinPath, iutils.WerfBinArgs(opts.Args...)...)
 	if opts.ShouldFail {