From 6899a7be7770e74dae98197895d06966cfe202fc Mon Sep 17 00:00:00 2001 From: Andriy Bulynko Date: Thu, 18 Jun 2020 08:40:38 -0400 Subject: [PATCH] go-git and test fixes (#431) --- go.mod | 4 ++-- go.sum | 8 ++++++-- pkg/api/copy_test.go | 17 ++++++++++++----- pkg/qliksense/fetch_test.go | 8 ++++---- 4 files changed, 24 insertions(+), 13 deletions(-) diff --git a/go.mod b/go.mod index dae5fe87..6c2fe422 100644 --- a/go.mod +++ b/go.mod @@ -22,7 +22,7 @@ require ( github.com/bugsnag/bugsnag-go v1.5.3 // indirect github.com/containers/image/v5 v5.1.0 github.com/docker/go-metrics v0.0.1 // indirect - github.com/go-git/go-git/v5 v5.0.0 + github.com/go-git/go-git/v5 v5.1.0 github.com/gobuffalo/envy v1.9.0 // indirect github.com/gobuffalo/logger v1.0.3 // indirect github.com/gobuffalo/packd v1.0.0 // indirect @@ -40,7 +40,7 @@ require ( github.com/mitchellh/go-homedir v1.1.0 github.com/otiai10/copy v1.1.1 github.com/pkg/errors v0.9.1 - github.com/qlik-oss/k-apis v0.1.7 + github.com/qlik-oss/k-apis v0.1.10 github.com/robfig/cron/v3 v3.0.1 github.com/rogpeppe/go-internal v1.5.2 // indirect github.com/spf13/cobra v0.0.6 diff --git a/go.sum b/go.sum index b48f8fd9..3a368d44 100644 --- a/go.sum +++ b/go.sum @@ -309,6 +309,8 @@ github.com/go-git/go-git-fixtures/v4 v4.0.1 h1:q+IFMfLx200Q3scvt2hN79JsEzy4AmBTp github.com/go-git/go-git-fixtures/v4 v4.0.1/go.mod h1:m+ICp2rF3jDhFgEZ/8yziagdT1C+ZpZcrJjappBCDSw= github.com/go-git/go-git/v5 v5.0.0 h1:k5RWPm4iJwYtfWoxIJy4wJX9ON7ihPeZZYC1fLYDnpg= github.com/go-git/go-git/v5 v5.0.0/go.mod h1:oYD8y9kWsGINPFJoLdaScGCN6dlKg23blmClfZwtUVA= +github.com/go-git/go-git/v5 v5.1.0 h1:HxJn9g/E7eYvKW3Fm7Jt4ee8LXfPOm/H1cdDu8vEssk= +github.com/go-git/go-git/v5 v5.1.0/go.mod h1:ZKfuPUoY1ZqIG4QG9BDBh3G4gLM5zvPuSJAozQrZuyM= github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= github.com/go-ini/ini v1.25.4/go.mod h1:ByCAeIL28uOIIG0E3PJtZPDL8WnHpFKFOtgjp+3Ies8= @@ -620,6 +622,8 @@ github.com/imdario/mergo v0.3.5/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJ github.com/imdario/mergo v0.3.7/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= github.com/imdario/mergo v0.3.8 h1:CGgOkSJeqMRmt0D9XLWExdT4m4F1vd3FV3VPt+0VxkQ= github.com/imdario/mergo v0.3.8/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= +github.com/imdario/mergo v0.3.9 h1:UauaLniWCFHWd+Jp9oCEkTBj8VO/9DKg3PV3VCNMDIg= +github.com/imdario/mergo v0.3.9/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 h1:BQSFePA1RWJOlocH6Fxy8MmwDt+yVQYULKfN0RoTN8A= @@ -881,8 +885,8 @@ github.com/prometheus/procfs v0.0.3/go.mod h1:4A/X28fw3Fc593LaREMrKMqOKvUAntwMDa github.com/prometheus/procfs v0.0.5 h1:3+auTFlqw+ZaQYJARz6ArODtkaIwtvBTx3N2NehQlL8= github.com/prometheus/procfs v0.0.5/go.mod h1:4A/X28fw3Fc593LaREMrKMqOKvUAntwMDaekg4FpcdQ= github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU= -github.com/qlik-oss/k-apis v0.1.7 h1:3QPymn+xMhwslm1F0oqdVqtJ/FdfAJn4vNnmS9NFIoY= -github.com/qlik-oss/k-apis v0.1.7/go.mod h1:r5hXo1mrHOzIdI0Ri9TI4SKjEXft1TZnAyJzOSm9pi0= +github.com/qlik-oss/k-apis v0.1.10 h1:adBXokJpE7oOr9wkPOHgpVbvuhLLKtqFdnX7V9MEyOs= +github.com/qlik-oss/k-apis v0.1.10/go.mod h1:qJVbbSYtZ+fFCojEyG9UoiCAmymm0JEtnhulr5M7HyU= github.com/qlik-oss/kustomize/api v0.3.3-0.20200612023448-4c1f2f38ea9b h1:RDh3OZJOriy/ap1NUHVKsPG07N4DALaCzaqXFFK57T0= github.com/qlik-oss/kustomize/api v0.3.3-0.20200612023448-4c1f2f38ea9b/go.mod h1:zh3yFgE5zFk1kreqzVyyj1eXyIxQJT53l4zSg8Wt4SA= github.com/quasilyte/go-consistent v0.0.0-20190521200055-c6f3937de18c/go.mod h1:5STLWrekHfjyYwxBRVRXNOSewLJ3PWfDJd1VyTS21fI= diff --git a/pkg/api/copy_test.go b/pkg/api/copy_test.go index ba0ccbb0..3c61b017 100644 --- a/pkg/api/copy_test.go +++ b/pkg/api/copy_test.go @@ -5,6 +5,7 @@ import ( "os" "path" "path/filepath" + "regexp" "testing" kapis_git "github.com/qlik-oss/k-apis/pkg/git" @@ -60,7 +61,7 @@ func TestCopyDirectory_withGit_withKuz(t *testing.T) { t.Fatalf("unexpected error: %v", err) } - if err := kapis_git.Checkout(repo2, "v0.0.2", "", nil); err != nil { + if err := kapis_git.Checkout(repo2, "v0.0.8", "", nil); err != nil { t.Fatalf("unexpected error: %v", err) } @@ -69,7 +70,7 @@ func TestCopyDirectory_withGit_withKuz(t *testing.T) { t.Fatalf("unexpected error: %v", err) } - if err := kapis_git.Checkout(repo1, "v0.0.2", "", nil); err != nil { + if err := kapis_git.Checkout(repo1, "v0.0.8", "", nil); err != nil { t.Fatalf("unexpected error: %v", err) } @@ -78,9 +79,15 @@ func TestCopyDirectory_withGit_withKuz(t *testing.T) { t.Fatalf("unexpected error: %v", err) } - if string(repo2Manifest) != string(repo1Manifest) { - t.Logf("manifest generated on the original config:\n%v", string(repo1Manifest)) - t.Logf("manifest generated on the copied config:\n%v", string(repo2Manifest)) + re, err := regexp.Compile(`name: qliksense-ca-certificates-[a-z]{5}`) + if err != nil { + t.Fatalf("unexpected error: %v", err) + } + repo1ManifestTweaked := re.ReplaceAllString(string(repo1Manifest), "name: qliksense-ca-certificates") + repo2ManifestTweaked := re.ReplaceAllString(string(repo2Manifest), "name: qliksense-ca-certificates") + if repo2ManifestTweaked != repo1ManifestTweaked { + t.Logf("manifest generated on the original config:\n%v", repo1ManifestTweaked) + t.Logf("manifest generated on the copied config:\n%v", repo2ManifestTweaked) t.Fatal("expected manifests to be equal, but they were not") } } diff --git a/pkg/qliksense/fetch_test.go b/pkg/qliksense/fetch_test.go index 3b14d168..68379aca 100644 --- a/pkg/qliksense/fetch_test.go +++ b/pkg/qliksense/fetch_test.go @@ -16,7 +16,7 @@ func TestFetchAndUpdateCR(t *testing.T) { } q.SetUpQliksenseContext("test1") qConfig := qapi.NewQConfig(tempHome) - if err := fetchAndUpdateCR(qConfig, "v0.0.2"); err != nil { + if err := fetchAndUpdateCR(qConfig, "v0.0.8"); err != nil { t.Log(err) t.FailNow() } @@ -28,8 +28,8 @@ func TestFetchAndUpdateCR(t *testing.T) { t.FailNow() } - if cr.Spec.ManifestsRoot != "contexts/test1/qlik-k8s/v0.0.2" { - t.Log("actual path: " + cr.Spec.ManifestsRoot + ", expected path: contexts/test1/qlik-k8s/v0.0.2") + if cr.Spec.ManifestsRoot != "contexts/test1/qlik-k8s/v0.0.8" { + t.Log("actual path: " + cr.Spec.ManifestsRoot + ", expected path: contexts/test1/qlik-k8s/v0.0.8") t.FailNow() } //testing latest tag is fetched @@ -43,7 +43,7 @@ func TestFetchAndUpdateCR(t *testing.T) { cr = &qapi.QliksenseCR{} qapi.ReadFromFile(cr, actualCrFile) v := cr.GetLabelFromCr("version") - if v == "" || v == "v0.0.2" { + if v == "" || v == "v0.0.8" { t.Log("should get latest but got version: " + v) t.Fail() }