Merge pull request #388 from spring-financial-group/bug/release_names…

…_not_working_with_multiple_releases

fix: added failing test data for issues weve been seeing with aliases

OWNERS

@@ -2,7 +2,9 @@ approvers:
 - rawlingsj
 - jstrachan
 - rajdavies
+- tomhobson
 reviewers:
 - rawlingsj
 - jstrachan
 - rajdavies
+- tomhobson

cmd/app/main-win.go

@@ -1,3 +1,4 @@
+//go:build windows
 // +build windows
 
 package app

cmd/app/main.go

@@ -1,4 +1,5 @@
 //nolint
+//go:build !windows
 // +build !windows
 
 package app

hack/linter.sh

@@ -10,8 +10,8 @@ fi
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
 if ! [ -x "$(command -v golangci-lint)" ]; then
-	echo "Installing GolangCI-Lint"
-	${DIR}/install_golint.sh -b $GOPATH/bin v1.42.1
+        echo "Looks like golangci-lint isn't installed, to run \'make lint\' please install it."
+        exit 127
 fi
 
 export GO111MODULE=on

pkg/promote/promote_integration_test.go

@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package promote_test

pkg/promote/promote_test.go

@@ -1,3 +1,4 @@
+//go:build unit
 // +build unit
 
 package promote_test

pkg/rules/factory/factory_test.go

@@ -30,7 +30,7 @@ func TestRuleFactory(t *testing.T) {
 
 	t.Logf("creating tests at %s", tmpDir)
 
-	sourceData := filepath.Join("test_data")
+	sourceData := "test_data"
 	fileSlice, err := ioutil.ReadDir(sourceData)
 	assert.NoError(t, err)
 

pkg/rules/factory/test_data/helmfile-double-release-name-option-reversed/helmfile.yaml

@@ -0,0 +1,16 @@
+repositories:
+- name: yourorg
+  url: https://yourorg.example.com/charts
+releases:
+- name: dbmigrator
+  labels:
+    job: dbmigrator
+  chart: ./dbmigrator
+- chart: dev/myapp
+  version: 1.2.3
+  name: myapp
+  namespace: jx
+- chart: dev/myapp
+  version: 1.2.3
+  name: myapp-beta
+  namespace: jx

pkg/rules/factory/test_data/helmfile-double-release-name-option-reversed/helmfile.yaml.1.expected

@@ -0,0 +1,21 @@
+filepath: ""
+repositories:
+- name: yourorg
+  url: https://yourorg.example.com/charts
+- name: dev
+  url: http://chartmuseum-jx.34.78.195.22.nip.io
+releases:
+- chart: ./dbmigrator
+  name: dbmigrator
+  labels:
+    job: dbmigrator
+- chart: dev/myapp
+  version: 1.2.3
+  name: myapp
+  namespace: jx
+- chart: dev/myapp
+  version: 1.2.3
+  name: myapp-beta
+  namespace: jx
+templates: {}
+renderedvalues: {}

pkg/rules/factory/test_data/helmfile-double-release-name-option-reversed/helmfile.yaml.2.expected

@@ -0,0 +1,21 @@
+filepath: ""
+repositories:
+- name: yourorg
+  url: https://yourorg.example.com/charts
+- name: dev
+  url: http://chartmuseum-jx.34.78.195.22.nip.io
+releases:
+- chart: ./dbmigrator
+  name: dbmigrator
+  labels:
+    job: dbmigrator
+- chart: dev/myapp
+  version: 1.2.3
+  name: myapp
+  namespace: jx
+- chart: dev/myapp
+  version: 1.2.4
+  name: myapp-beta
+  namespace: jx
+templates: {}
+renderedvalues: {}

pkg/rules/factory/test_data/helmfile-double-release-name-option-reversed/options.yaml

@@ -0,0 +1,2 @@
+# test for when running `jx promote --release myapp-beta`
+release: myapp-beta

pkg/rules/factory/test_data/helmfile-double-release-name-option/helmfile.yaml

@@ -0,0 +1,16 @@
+repositories:
+- name: yourorg
+  url: https://yourorg.example.com/charts
+releases:
+- name: dbmigrator
+  labels:
+    job: dbmigrator
+  chart: ./dbmigrator
+- chart: dev/myapp
+  version: 1.2.3
+  name: myapp
+  namespace: jx
+- chart: dev/myapp
+  version: 1.2.3
+  name: myapp-beta
+  namespace: jx

pkg/rules/factory/test_data/helmfile-double-release-name-option/helmfile.yaml.1.expected

@@ -0,0 +1,21 @@
+filepath: ""
+repositories:
+- name: yourorg
+  url: https://yourorg.example.com/charts
+- name: dev
+  url: http://chartmuseum-jx.34.78.195.22.nip.io
+releases:
+- chart: ./dbmigrator
+  name: dbmigrator
+  labels:
+    job: dbmigrator
+- chart: dev/myapp
+  version: 1.2.3
+  name: myapp
+  namespace: jx
+- chart: dev/myapp
+  version: 1.2.3
+  name: myapp-beta
+  namespace: jx
+templates: {}
+renderedvalues: {}

pkg/rules/factory/test_data/helmfile-double-release-name-option/helmfile.yaml.2.expected

@@ -0,0 +1,21 @@
+filepath: ""
+repositories:
+- name: yourorg
+  url: https://yourorg.example.com/charts
+- name: dev
+  url: http://chartmuseum-jx.34.78.195.22.nip.io
+releases:
+- chart: ./dbmigrator
+  name: dbmigrator
+  labels:
+    job: dbmigrator
+- chart: dev/myapp
+  version: 1.2.3
+  name: myapp
+  namespace: jx
+- chart: dev/myapp
+  version: 1.2.4
+  name: myapp-beta
+  namespace: jx
+templates: {}
+renderedvalues: {}

pkg/rules/factory/test_data/helmfile-double-release-name-option/options.yaml

@@ -0,0 +1,2 @@
+# test for when running `jx promote --release myapp-beta`
+release: myapp-beta

pkg/rules/factory/test_data/helmfile-double-release/helmfile.yaml

@@ -0,0 +1,16 @@
+repositories:
+- name: yourorg
+  url: https://yourorg.example.com/charts
+releases:
+- name: dbmigrator
+  labels:
+    job: dbmigrator
+  chart: ./dbmigrator
+- chart: dev/myapp
+  version: 1.2.3
+  name: myapp
+  namespace: jx
+- chart: dev/myapp
+  version: 1.2.3
+  name: myapp-beta
+  namespace: jx

pkg/rules/factory/test_data/helmfile-double-release/helmfile.yaml.1.expected

@@ -0,0 +1,21 @@
+filepath: ""
+repositories:
+- name: yourorg
+  url: https://yourorg.example.com/charts
+- name: dev
+  url: http://chartmuseum-jx.34.78.195.22.nip.io
+releases:
+- chart: ./dbmigrator
+  name: dbmigrator
+  labels:
+    job: dbmigrator
+- chart: dev/myapp
+  version: 1.2.3
+  name: myapp
+  namespace: jx
+- chart: dev/myapp
+  version: 1.2.3
+  name: myapp-beta
+  namespace: jx
+templates: {}
+renderedvalues: {}

pkg/rules/factory/test_data/helmfile-double-release/helmfile.yaml.2.expected

@@ -0,0 +1,21 @@
+filepath: ""
+repositories:
+- name: yourorg
+  url: https://yourorg.example.com/charts
+- name: dev
+  url: http://chartmuseum-jx.34.78.195.22.nip.io
+releases:
+- chart: ./dbmigrator
+  name: dbmigrator
+  labels:
+    job: dbmigrator
+- chart: dev/myapp
+  version: 1.2.4
+  name: myapp
+  namespace: jx
+- chart: dev/myapp
+  version: 1.2.3
+  name: myapp-beta
+  namespace: jx
+templates: {}
+renderedvalues: {}

pkg/rules/factory/test_data/helmfile-nested-double-release-name-option/helmfile.yaml

@@ -0,0 +1,6 @@
+filepath: ""
+helmfiles:
+- path: helmfiles/nginx/helmfile.yaml
+- path: helmfiles/jx/helmfile.yaml
+templates: {}
+renderedvalues: {}

pkg/rules/factory/test_data/helmfile-nested-double-release-name-option/helmfile.yaml.expected

@@ -0,0 +1,6 @@
+filepath: ""
+helmfiles:
+- path: helmfiles/nginx/helmfile.yaml
+- path: helmfiles/jx/helmfile.yaml
+templates: {}
+renderedvalues: {}

pkg/rules/factory/test_data/helmfile-nested-double-release-name-option/helmfiles/jx/helmfile.yaml

@@ -0,0 +1,15 @@
+filepath: ""
+namespace: jx
+repositories:
+  - name: dev
+    url: http://chartmuseum-jx.34.78.195.22.nip.io
+releases:
+  - chart: dev/myapp
+    version: 1.2.3
+    name: myapp
+  - chart: dev/myapp
+    version: 1.2.3
+    name: myapp-beta
+templates: {}
+missingFileHandler: ""
+renderedvalues: {}

pkg/rules/factory/test_data/helmfile-nested-double-release-name-option/helmfiles/jx/helmfile.yaml.1.expected

@@ -0,0 +1,14 @@
+filepath: ""
+namespace: jx
+repositories:
+- name: dev
+  url: http://chartmuseum-jx.34.78.195.22.nip.io
+releases:
+- chart: dev/myapp
+  version: 1.2.3
+  name: myapp
+- chart: dev/myapp
+  version: 1.2.3
+  name: myapp-beta
+templates: {}
+renderedvalues: {}

pkg/rules/factory/test_data/helmfile-nested-double-release-name-option/helmfiles/jx/helmfile.yaml.2.expected

@@ -0,0 +1,14 @@
+filepath: ""
+namespace: jx
+repositories:
+- name: dev
+  url: http://chartmuseum-jx.34.78.195.22.nip.io
+releases:
+- chart: dev/myapp
+  version: 1.2.3
+  name: myapp
+- chart: dev/myapp
+  version: 1.2.4
+  name: myapp-beta
+templates: {}
+renderedvalues: {}

pkg/rules/factory/test_data/helmfile-nested-double-release-name-option/helmfiles/nginx/helmfile.yaml

@@ -0,0 +1,21 @@
+filepath: ""
+environments:
+  default:
+    values:
+    - ../../jx-values.yaml
+    - ../../versionStream/src/fake-secrets.yaml.gotmpl
+namespace: nginx
+repositories:
+- name: stable
+  url: https://charts.helm.sh/stable
+releases:
+- chart: stable/nginx-ingress
+  version: 1.39.1
+  name: nginx-ingress
+  values:
+  - ../../versionStream/charts/stable/nginx-ingress/values.yaml.gotmpl
+  forceNamespace: ""
+  skipDeps: null
+templates: {}
+missingFileHandler: ""
+renderedvalues: {}

pkg/rules/factory/test_data/helmfile-nested-double-release-name-option/options.yaml

@@ -0,0 +1,2 @@
+# test for when running `jx promote --release myapp-beta`
+release: myapp-beta

pkg/rules/factory/test_data/helmfile-nested-double-release/helmfile.yaml

@@ -0,0 +1,6 @@
+filepath: ""
+helmfiles:
+- path: helmfiles/nginx/helmfile.yaml
+- path: helmfiles/jx/helmfile.yaml
+templates: {}
+renderedvalues: {}

pkg/rules/factory/test_data/helmfile-nested-double-release/helmfile.yaml.expected

@@ -0,0 +1,6 @@
+filepath: ""
+helmfiles:
+- path: helmfiles/nginx/helmfile.yaml
+- path: helmfiles/jx/helmfile.yaml
+templates: {}
+renderedvalues: {}

pkg/rules/factory/test_data/helmfile-nested-double-release/helmfiles/jx/helmfile.yaml

@@ -0,0 +1,15 @@
+namespace: jx
+repositories:
+  - name: dev
+    url: http://chartmuseum-jx.34.78.195.22.nip.io
+releases:
+  - chart: dev/myapp
+    version: 1.2.3
+    name: myapp
+  - chart: dev/myapp
+    version: 1.2.3
+    name: myapp-beta
+templates: {}
+missingFileHandler: ""
+renderedvalues: {}
+

pkg/rules/factory/test_data/helmfile-nested-double-release/helmfiles/jx/helmfile.yaml.1.expected

@@ -0,0 +1,14 @@
+filepath: ""
+namespace: jx
+repositories:
+- name: dev
+  url: http://chartmuseum-jx.34.78.195.22.nip.io
+releases:
+- chart: dev/myapp
+  version: 1.2.3
+  name: myapp
+- chart: dev/myapp
+  version: 1.2.3
+  name: myapp-beta
+templates: {}
+renderedvalues: {}