Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package helmfile for openSUSE:Factory checked in at 2021-07-23 23:41:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/helmfile (Old) and /work/SRC/openSUSE:Factory/.helmfile.new.1899 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "helmfile" Fri Jul 23 23:41:11 2021 rev:22 rq:907909 version:0.140.0 Changes: -------- --- /work/SRC/openSUSE:Factory/helmfile/helmfile.changes 2021-06-11 22:31:47.810246946 +0200 +++ /work/SRC/openSUSE:Factory/.helmfile.new.1899/helmfile.changes 2021-07-23 23:41:29.865809409 +0200 @@ -1,0 +2,7 @@ +Fri Jul 23 07:48:29 UTC 2021 - Manfred Hollstein <[email protected]> + +- v0.140.0: + * d8247e6 (HEAD, tag: v0.140.0) + Update writing-helmfile.md: fix typos (#1892) + +------------------------------------------------------------------- @@ -576 +583 @@ -Fri Jul 17 09:20:51 - [email protected] +Fri Jul 17 09:20:51 UTC 2020 - Manfred Hollstein <[email protected]> Old: ---- helmfile-0.139.9.tar.gz New: ---- helmfile-0.140.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ helmfile.spec ++++++ --- /var/tmp/diff_new_pack.7BLgCH/_old 2021-07-23 23:41:30.481808622 +0200 +++ /var/tmp/diff_new_pack.7BLgCH/_new 2021-07-23 23:41:30.481808622 +0200 @@ -16,9 +16,9 @@ # Please submit bugfixes or comments via https://bugs.opensuse.org/ # -%define git_commit c623730374b55949824a9522141ed27b4b8477c1 +%define git_commit d8247e6543ebc4fb0864ac6160230d3bdf762dd7 Name: helmfile -Version: 0.139.9 +Version: 0.140.0 Release: 0 Summary: Deploy Kubernetes Helm Charts License: MIT ++++++ _service ++++++ --- /var/tmp/diff_new_pack.7BLgCH/_old 2021-07-23 23:41:30.509808586 +0200 +++ /var/tmp/diff_new_pack.7BLgCH/_new 2021-07-23 23:41:30.513808581 +0200 @@ -5,7 +5,7 @@ <param name="exclude">.git</param> <param name="versionformat">@PARENT_TAG@</param> <param name="versionrewrite-pattern">v(.*)</param> - <param name="revision">v0.139.9</param> + <param name="revision">v0.140.0</param> <param name="changesgenerate">enable</param> </service> <service name="recompress" mode="disabled"> ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.7BLgCH/_old 2021-07-23 23:41:30.529808560 +0200 +++ /var/tmp/diff_new_pack.7BLgCH/_new 2021-07-23 23:41:30.529808560 +0200 @@ -1,4 +1,4 @@ <servicedata> <service name="tar_scm"> <param name="url">https://github.com/roboll/helmfile.git</param> - <param name="changesrevision">c623730374b55949824a9522141ed27b4b8477c1</param></service></servicedata> + <param name="changesrevision">d8247e6543ebc4fb0864ac6160230d3bdf762dd7</param></service></servicedata> ++++++ helmfile-0.139.9.tar.gz -> helmfile-0.140.0.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/helmfile-0.139.9/README.md new/helmfile-0.140.0/README.md --- old/helmfile-0.139.9/README.md 2021-06-10 02:16:11.000000000 +0200 +++ new/helmfile-0.140.0/README.md 2021-07-02 00:31:47.000000000 +0200 @@ -62,6 +62,7 @@ username: optional_username password: optional_password oci: true + passCredentials: true # Advanced configuration: You can use a ca bundle to use an https repo # with a self-signed certificate - name: insecure diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/helmfile-0.139.9/docs/writing-helmfile.md new/helmfile-0.140.0/docs/writing-helmfile.md --- old/helmfile-0.139.9/docs/writing-helmfile.md 2021-06-10 02:16:11.000000000 +0200 +++ new/helmfile-0.140.0/docs/writing-helmfile.md 2021-07-02 00:31:47.000000000 +0200 @@ -10,7 +10,7 @@ ``` app: - project: {{.Environmont.Name}}-{{.StateValues.project}} # Same as {{.Environmont.Name}}-{{.Values.project}} + project: {{.Environment.Name}}-{{.StateValues.project}} # Same as {{.Environment.Name}}-{{.Values.project}} {{` extraEnvVars: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/helmfile-0.139.9/pkg/app/app_test.go new/helmfile-0.140.0/pkg/app/app_test.go --- old/helmfile-0.139.9/pkg/app/app_test.go 2021-06-10 02:16:11.000000000 +0200 +++ new/helmfile-0.140.0/pkg/app/app_test.go 2021-07-02 00:31:47.000000000 +0200 @@ -2519,7 +2519,7 @@ func (helm *mockHelmExec) SetHelmBinary(bin string) { return } -func (helm *mockHelmExec) AddRepo(name, repository, cafile, certfile, keyfile, username, password string, managed string) error { +func (helm *mockHelmExec) AddRepo(name, repository, cafile, certfile, keyfile, username, password string, managed string, passCredentials string) error { helm.repos = append(helm.repos, mockRepo{Name: name}) return nil } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/helmfile-0.139.9/pkg/app/mocks_test.go new/helmfile-0.140.0/pkg/app/mocks_test.go --- old/helmfile-0.139.9/pkg/app/mocks_test.go 2021-06-10 02:16:11.000000000 +0200 +++ new/helmfile-0.140.0/pkg/app/mocks_test.go 2021-07-02 00:31:47.000000000 +0200 @@ -48,7 +48,7 @@ helm.doPanic() return } -func (helm *noCallHelmExec) AddRepo(name, repository, cafile, certfile, keyfile, username, password string, managed string) error { +func (helm *noCallHelmExec) AddRepo(name, repository, cafile, certfile, keyfile, username, password string, managed string, passCredentials string) error { helm.doPanic() return nil } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/helmfile-0.139.9/pkg/exectest/helm.go new/helmfile-0.140.0/pkg/exectest/helm.go --- old/helmfile-0.139.9/pkg/exectest/helm.go 2021-06-10 02:16:11.000000000 +0200 +++ new/helmfile-0.140.0/pkg/exectest/helm.go 2021-07-02 00:31:47.000000000 +0200 @@ -84,8 +84,8 @@ func (helm *Helm) SetHelmBinary(bin string) { return } -func (helm *Helm) AddRepo(name, repository, cafile, certfile, keyfile, username, password string, managed string) error { - helm.Repo = []string{name, repository, cafile, certfile, keyfile, username, password, managed} +func (helm *Helm) AddRepo(name, repository, cafile, certfile, keyfile, username, password string, managed string, passCredentials string) error { + helm.Repo = []string{name, repository, cafile, certfile, keyfile, username, password, managed, passCredentials} return nil } func (helm *Helm) UpdateRepo() error { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/helmfile-0.139.9/pkg/helmexec/exec.go new/helmfile-0.140.0/pkg/helmexec/exec.go --- old/helmfile-0.139.9/pkg/helmexec/exec.go 2021-06-10 02:16:11.000000000 +0200 +++ new/helmfile-0.140.0/pkg/helmexec/exec.go 2021-07-02 00:31:47.000000000 +0200 @@ -108,7 +108,7 @@ helm.helmBinary = bin } -func (helm *execer) AddRepo(name, repository, cafile, certfile, keyfile, username, password string, managed string) error { +func (helm *execer) AddRepo(name, repository, cafile, certfile, keyfile, username, password string, managed string, passCredentials string) error { var args []string var out []byte var err error @@ -141,6 +141,9 @@ if username != "" && password != "" { args = append(args, "--username", username, "--password", password) } + if passCredentials == "true" { + args = append(args, "--pass-credentials") + } helm.logger.Infof("Adding repo %v %v", name, repository) out, err = helm.exec(args, map[string]string{}) default: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/helmfile-0.139.9/pkg/helmexec/exec_test.go new/helmfile-0.140.0/pkg/helmexec/exec_test.go --- old/helmfile-0.139.9/pkg/helmexec/exec_test.go 2021-06-10 02:16:11.000000000 +0200 +++ new/helmfile-0.140.0/pkg/helmexec/exec_test.go 2021-07-02 00:31:47.000000000 +0200 @@ -89,7 +89,7 @@ kubeContext: "dev", runner: &mockRunner{}, } - helm.AddRepo("myRepo", "https://repo.example.com/";, "", "cert.pem", "key.pem", "", "", "") + helm.AddRepo("myRepo", "https://repo.example.com/";, "", "cert.pem", "key.pem", "", "", "", "") expected := `Adding repo myRepo https://repo.example.com/ exec: helm --kube-context dev repo add myRepo https://repo.example.com/ --force-update --cert-file cert.pem --key-file key.pem ` @@ -102,7 +102,7 @@ var buffer bytes.Buffer logger := NewLogger(&buffer, "debug") helm := MockExecer(logger, "dev") - helm.AddRepo("myRepo", "https://repo.example.com/";, "", "cert.pem", "key.pem", "", "", "") + helm.AddRepo("myRepo", "https://repo.example.com/";, "", "cert.pem", "key.pem", "", "", "", "") expected := `Adding repo myRepo https://repo.example.com/ exec: helm --kube-context dev repo add myRepo https://repo.example.com/ --cert-file cert.pem --key-file key.pem ` @@ -111,7 +111,7 @@ } buffer.Reset() - helm.AddRepo("myRepo", "https://repo.example.com/";, "ca.crt", "", "", "", "", "") + helm.AddRepo("myRepo", "https://repo.example.com/";, "ca.crt", "", "", "", "", "", "") expected = `Adding repo myRepo https://repo.example.com/ exec: helm --kube-context dev repo add myRepo https://repo.example.com/ --ca-file ca.crt ` @@ -120,7 +120,7 @@ } buffer.Reset() - helm.AddRepo("myRepo", "https://repo.example.com/";, "", "", "", "", "", "") + helm.AddRepo("myRepo", "https://repo.example.com/";, "", "", "", "", "", "", "") expected = `Adding repo myRepo https://repo.example.com/ exec: helm --kube-context dev repo add myRepo https://repo.example.com/ ` @@ -129,7 +129,7 @@ } buffer.Reset() - helm.AddRepo("acrRepo", "", "", "", "", "", "", "acr") + helm.AddRepo("acrRepo", "", "", "", "", "", "", "acr", "") expected = `Adding repo acrRepo (acr) exec: az acr helm repo add --name acrRepo exec: az acr helm repo add --name acrRepo: @@ -139,7 +139,7 @@ } buffer.Reset() - helm.AddRepo("otherRepo", "", "", "", "", "", "", "unknown") + helm.AddRepo("otherRepo", "", "", "", "", "", "", "unknown", "") expected = `ERROR: unknown type 'unknown' for repository otherRepo ` if buffer.String() != expected { @@ -147,7 +147,7 @@ } buffer.Reset() - helm.AddRepo("myRepo", "https://repo.example.com/";, "", "", "", "example_user", "example_password", "") + helm.AddRepo("myRepo", "https://repo.example.com/";, "", "", "", "example_user", "example_password", "", "") expected = `Adding repo myRepo https://repo.example.com/ exec: helm --kube-context dev repo add myRepo https://repo.example.com/ --username example_user --password example_password ` @@ -156,13 +156,23 @@ } buffer.Reset() - helm.AddRepo("", "https://repo.example.com/";, "", "", "", "", "", "") + helm.AddRepo("", "https://repo.example.com/";, "", "", "", "", "", "", "") expected = `empty field name ` if buffer.String() != expected { t.Errorf("helmexec.AddRepo()\nactual = %v\nexpect = %v", buffer.String(), expected) } + + buffer.Reset() + helm.AddRepo("myRepo", "https://repo.example.com/";, "", "", "", "example_user", "example_password", "", "true") + expected = `Adding repo myRepo https://repo.example.com/ +exec: helm --kube-context dev repo add myRepo https://repo.example.com/ --username example_user --password example_password --pass-credentials +` + if buffer.String() != expected { + t.Errorf("helmexec.AddRepo()\nactual = %v\nexpect = %v", buffer.String(), expected) + } + } func Test_UpdateRepo(t *testing.T) { @@ -506,7 +516,7 @@ buffer.Reset() logger := NewLogger(&buffer, logLevel) helm := MockExecer(logger, "") - helm.AddRepo("myRepo", "https://repo.example.com/";, "", "", "", "example_user", "example_password", "") + helm.AddRepo("myRepo", "https://repo.example.com/";, "", "", "", "example_user", "example_password", "", "") if buffer.String() != expected { t.Errorf("helmexec.AddRepo()\nactual = %v\nexpect = %v", buffer.String(), expected) } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/helmfile-0.139.9/pkg/helmexec/helmexec.go new/helmfile-0.140.0/pkg/helmexec/helmexec.go --- old/helmfile-0.139.9/pkg/helmexec/helmexec.go 2021-06-10 02:16:11.000000000 +0200 +++ new/helmfile-0.140.0/pkg/helmexec/helmexec.go 2021-07-02 00:31:47.000000000 +0200 @@ -12,7 +12,7 @@ SetExtraArgs(args ...string) SetHelmBinary(bin string) - AddRepo(name, repository, cafile, certfile, keyfile, username, password string, managed string) error + AddRepo(name, repository, cafile, certfile, keyfile, username, password string, managed string, passCredentials string) error UpdateRepo() error RegistryLogin(name string, username string, password string) error BuildDeps(name, chart string) error diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/helmfile-0.139.9/pkg/state/state.go new/helmfile-0.140.0/pkg/state/state.go --- old/helmfile-0.139.9/pkg/state/state.go 2021-06-10 02:16:11.000000000 +0200 +++ new/helmfile-0.140.0/pkg/state/state.go 2021-07-02 00:31:47.000000000 +0200 @@ -163,15 +163,16 @@ // RepositorySpec that defines values for a helm repo type RepositorySpec struct { - Name string `yaml:"name,omitempty"` - URL string `yaml:"url,omitempty"` - CaFile string `yaml:"caFile,omitempty"` - CertFile string `yaml:"certFile,omitempty"` - KeyFile string `yaml:"keyFile,omitempty"` - Username string `yaml:"username,omitempty"` - Password string `yaml:"password,omitempty"` - Managed string `yaml:"managed,omitempty"` - OCI bool `yaml:"oci,omitempty"` + Name string `yaml:"name,omitempty"` + URL string `yaml:"url,omitempty"` + CaFile string `yaml:"caFile,omitempty"` + CertFile string `yaml:"certFile,omitempty"` + KeyFile string `yaml:"keyFile,omitempty"` + Username string `yaml:"username,omitempty"` + Password string `yaml:"password,omitempty"` + Managed string `yaml:"managed,omitempty"` + OCI bool `yaml:"oci,omitempty"` + PassCredentials string `yaml:"passCredentials,omitempty"` } // ReleaseSpec defines the structure of a helm release @@ -392,7 +393,7 @@ type RepoUpdater interface { IsHelm3() bool - AddRepo(name, repository, cafile, certfile, keyfile, username, password string, managed string) error + AddRepo(name, repository, cafile, certfile, keyfile, username, password string, managed string, passCredentials string) error UpdateRepo() error RegistryLogin(name string, username string, password string) error } @@ -441,7 +442,7 @@ err = helm.RegistryLogin(repo.URL, username, password) } } else { - err = helm.AddRepo(repo.Name, repo.URL, repo.CaFile, repo.CertFile, repo.KeyFile, repo.Username, repo.Password, repo.Managed) + err = helm.AddRepo(repo.Name, repo.URL, repo.CaFile, repo.CertFile, repo.KeyFile, repo.Username, repo.Password, repo.Managed, repo.PassCredentials) } if err != nil { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/helmfile-0.139.9/pkg/state/state_test.go new/helmfile-0.140.0/pkg/state/state_test.go --- old/helmfile-0.139.9/pkg/state/state_test.go 2021-06-10 02:16:11.000000000 +0200 +++ new/helmfile-0.140.0/pkg/state/state_test.go 2021-07-02 00:31:47.000000000 +0200 @@ -883,16 +883,17 @@ name: "normal repository", repos: []RepositorySpec{ { - Name: "name", - URL: "http://example.com/";, - CertFile: "", - KeyFile: "", - Username: "", - Password: "", + Name: "name", + URL: "http://example.com/";, + CertFile: "", + KeyFile: "", + Username: "", + Password: "", + PassCredentials: "", }, }, helm: &exectest.Helm{}, - want: []string{"name", "http://example.com/";, "", "", "", "", "", ""}, + want: []string{"name", "http://example.com/";, "", "", "", "", "", "", ""}, }, { name: "ACR hosted repository", @@ -903,51 +904,70 @@ }, }, helm: &exectest.Helm{}, - want: []string{"name", "", "", "", "", "", "", "acr"}, + want: []string{"name", "", "", "", "", "", "", "acr", ""}, }, { name: "repository with cert and key", repos: []RepositorySpec{ { - Name: "name", - URL: "http://example.com/";, - CertFile: "certfile", - KeyFile: "keyfile", - Username: "", - Password: "", + Name: "name", + URL: "http://example.com/";, + CertFile: "certfile", + KeyFile: "keyfile", + Username: "", + Password: "", + PassCredentials: "", }, }, helm: &exectest.Helm{}, - want: []string{"name", "http://example.com/";, "", "certfile", "keyfile", "", "", ""}, + want: []string{"name", "http://example.com/";, "", "certfile", "keyfile", "", "", "", ""}, }, { name: "repository with ca file", repos: []RepositorySpec{ { - Name: "name", - URL: "http://example.com/";, - CaFile: "cafile", - Username: "", - Password: "", + Name: "name", + URL: "http://example.com/";, + CaFile: "cafile", + Username: "", + Password: "", + PassCredentials: "", }, }, helm: &exectest.Helm{}, - want: []string{"name", "http://example.com/";, "cafile", "", "", "", "", ""}, + want: []string{"name", "http://example.com/";, "cafile", "", "", "", "", "", ""}, }, { name: "repository with username and password", repos: []RepositorySpec{ { - Name: "name", - URL: "http://example.com/";, - CertFile: "", - KeyFile: "", - Username: "example_user", - Password: "example_password", + Name: "name", + URL: "http://example.com/";, + CertFile: "", + KeyFile: "", + Username: "example_user", + Password: "example_password", + PassCredentials: "", }, }, helm: &exectest.Helm{}, - want: []string{"name", "http://example.com/";, "", "", "", "example_user", "example_password", ""}, + want: []string{"name", "http://example.com/";, "", "", "", "example_user", "example_password", "", ""}, + }, + { + name: "repository with username and password and pass-credentials", + repos: []RepositorySpec{ + { + Name: "name", + URL: "http://example.com/";, + CertFile: "", + KeyFile: "", + Username: "example_user", + Password: "example_password", + PassCredentials: "true", + }, + }, + helm: &exectest.Helm{}, + want: []string{"name", "http://example.com/";, "", "", "", "example_user", "example_password", "", "true"}, }, } for i := range tests { ++++++ vendor.tar.gz ++++++ /work/SRC/openSUSE:Factory/helmfile/vendor.tar.gz /work/SRC/openSUSE:Factory/.helmfile.new.1899/vendor.tar.gz differ: char 5, line 1
