Repository: FairwindsOps/pluto (go)

Issue:
Error message shows wrong flag
```
└─ ./pluto detect-helm --helm-version 2
APIVersions were found, but none were deprecated. Try --show-non-deprecated.
```

Pull request description:
Add e2e testing for helm 2. Remove ref to --show-non-deprecated. Add helm2 to readme.
Fixes #28 - Remove ref to --show-non-deprecated.

Patch:
diff --git a/README.md b/README.md
index aeae19d..dc0cf98 100644
--- a/README.md
+++ b/README.md
@@ -57,6 +57,15 @@ StatefulSet   apps/v1beta1   true         audit-dashboard-prod-rabbitmq-ha
 
 This indicates that the StatefulSet audit-dashboard-prod-rabbitmq-ha was deployed with apps/v1beta1 which is deprecated in 1.16
 
+You can also use Pluto with helm 2:
+
+```
+$ pluto detect-helm --helm-version=2 -A
+KIND         VERSION              DEPRECATED   RESOURCE NAME
+Deployment   extensions/v1beta1   true         invincible-zebu-metrics-server
+Deployment   apps/v1              false        lunging-bat-metrics-server
+```
+
 ### Helm Chart Checking (local files)
 
 You can run `helm template <chart-dir> | pluto detect --show-all -`
diff --git a/pkg/api/output.go b/pkg/api/output.go
index 0532aba..7bd5084 100644
--- a/pkg/api/output.go
+++ b/pkg/api/output.go
@@ -61,7 +61,7 @@ func tabOut(outputs []*Output, showNonDeprecated bool) (*tabwriter.Writer, error
 		}
 	}
 	if len(usableOutputs) == 0 {
-		_, err := fmt.Fprintln(w, "APIVersions were found, but none were deprecated. Try --show-non-deprecated.")
+		_, err := fmt.Fprintln(w, "APIVersions were found, but none were deprecated. Try --show-all.")
 		if err != nil {
 			return nil, err
 		}


Test patch:
diff --git a/e2e/tests/00_static_files.yaml b/e2e/tests/00_static_files.yaml
index 9d3c3c0..92f0595 100644
--- a/e2e/tests/00_static_files.yaml
+++ b/e2e/tests/00_static_files.yaml
@@ -21,18 +21,18 @@ testcases:
 
 - name: helm template show all
   steps:
-  - script: helm template assets/helmchartest | pluto detect -A -
+  - script: helm template assets/helm3chart | pluto detect -A -
     assertions:
     - result.code ShouldEqual 0
     - result.systemout ShouldContainSubstring "KIND         VERSION              DEPRECATED   RESOURCE NAME"
-    - result.systemout ShouldContainSubstring "Deployment   extensions/v1beta1   true         RELEASE-NAME-helmchartest"
-    - result.systemout ShouldContainSubstring "Deployment   apps/v1              false        RELEASE-NAME-helmchartest"
+    - result.systemout ShouldContainSubstring "Deployment   extensions/v1beta1   true         RELEASE-NAME-helm3chart"
+    - result.systemout ShouldContainSubstring "Deployment   apps/v1              false        RELEASE-NAME-helm3chart"
 
 - name: helm template
   steps:
-  - script: helm template assets/helmchartest | pluto detect -
+  - script: helm template assets/helm3chart | pluto detect -
     assertions:
     - result.code ShouldEqual 0
     - result.systemout ShouldContainSubstring "KIND         VERSION              DEPRECATED   RESOURCE NAME"
-    - result.systemout ShouldContainSubstring "Deployment   extensions/v1beta1   true         RELEASE-NAME-helmchartest"
-    - result.systemout ShouldNotContainSubstring "Deployment   apps/v1              false        RELEASE-NAME-helmchartest"
+    - result.systemout ShouldContainSubstring "Deployment   extensions/v1beta1   true         RELEASE-NAME-helm3chart"
+    - result.systemout ShouldNotContainSubstring "Deployment   apps/v1              false        RELEASE-NAME-helm3chart"
diff --git a/e2e/tests/01_helm-detect.yaml b/e2e/tests/01_helm-detect-3.yaml
similarity index 66%
rename from e2e/tests/01_helm-detect.yaml
rename to e2e/tests/01_helm-detect-3.yaml
index 41e8092..39aa86e 100644
--- a/e2e/tests/01_helm-detect.yaml
+++ b/e2e/tests/01_helm-detect-3.yaml
@@ -3,27 +3,26 @@ name: "Static Code Files (including helm)"
 testcases:
 - name: install helm chart
   steps:
-  - script: helm install test assets/helmchartest
+  - script: helm install test assets/helm3chart
     assertions:
     - result.code ShouldEqual 0
 
 - name: helm detect show all
   steps:
-  - script: pluto detect-helm -A -
+  - script: pluto detect-helm --helm-version=3 -A
     assertions:
     - result.code ShouldEqual 0
     - result.systemout ShouldContainSubstring "KIND         VERSION              DEPRECATED   RESOURCE NAME"
-    - result.systemout ShouldContainSubstring "Deployment   extensions/v1beta1   true         test-helmchartest-v1beta1"
-    - result.systemout ShouldContainSubstring "Deployment   apps/v1              false        test-helmchartest"
+    - result.systemout ShouldContainSubstring "Deployment   extensions/v1beta1   true         test-helm3chart-v1beta1"
+    - result.systemout ShouldContainSubstring "Deployment   apps/v1              false        test-helm3chart"
 
 - name: helm detect
   steps:
-  - script: pluto detect-helm
+  - script: pluto detect-helm --helm-version=3
     assertions:
     - result.code ShouldEqual 0
     - result.systemout ShouldContainSubstring "KIND         VERSION              DEPRECATED   RESOURCE NAME"
-    - result.systemout ShouldContainSubstring "Deployment   extensions/v1beta1   true         test-helmchartest-v1beta1"
-    - result.systemout ShouldNotContainSubstring "Deployment   apps/v1              false        test-helmchartest"
+    - result.systemout ShouldContainSubstring "Deployment   extensions/v1beta1   true         test-helm3chart-v1beta1"
 - name: cleanup
   steps:
   - script: helm delete test
diff --git a/e2e/tests/02_helm-detect-2.yaml b/e2e/tests/02_helm-detect-2.yaml
new file mode 100644
index 0000000..30ef876
--- /dev/null
+++ b/e2e/tests/02_helm-detect-2.yaml
@@ -0,0 +1,30 @@
+version: "2"
+name: "Static Code Files (including helm)"
+testcases:
+- name: install helm 2 configmaps
+  steps:
+  - script: |
+      kubectl create ns helm-system
+      kubectl apply -f assets/helm2/
+    assertions:
+    - result.code ShouldEqual 0
+
+- name: helm2 detect in-cluster show-all
+  steps:
+  - script: pluto detect-helm --helm-version=2 -A
+    assertions:
+    - result.code ShouldEqual 0
+    - result.systemout ShouldContainSubstring "KIND         VERSION              DEPRECATED   RESOURCE NAME"
+    - result.systemout ShouldContainSubstring "Deployment   extensions/v1beta1   true         invincible-zebu-metrics-server"
+    - result.systemout ShouldContainSubstring "Deployment   apps/v1              false        lunging-bat-metrics-server"
+
+- name: helm2 detect in-cluster
+  steps:
+  - script: pluto detect-helm --helm-version=2
+    assertions:
+    - result.code ShouldEqual 0
+    - result.systemout ShouldContainSubstring "KIND         VERSION              DEPRECATED   RESOURCE NAME"
+    - result.systemout ShouldContainSubstring "Deployment   extensions/v1beta1   true         invincible-zebu-metrics-server"
+- name: cleanup
+  steps:
+  - script: kubectl delete ns helm-system
diff --git a/e2e/tests/assets/helm2/helm2configmap-deprecated.yaml b/e2e/tests/assets/helm2/helm2configmap-deprecated.yaml
new file mode 100644
index 0000000..daa7416
--- /dev/null
+++ b/e2e/tests/assets/helm2/helm2configmap-deprecated.yaml
@@ -0,0 +1,17 @@
+apiVersion: v1
+data:
+  release: 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
+kind: ConfigMap
+metadata:
+  creationTimestamp: "2020-04-02T21:24:40Z"
+  labels:
+    MODIFIED_AT: "1585862680"
+    NAME: invincible-zebu
+    OWNER: TILLER
+    STATUS: DEPLOYED
+    VERSION: "1"
+  name: invincible-zebu.v1
+  namespace: helm-system
+  resourceVersion: "265249"
+  selfLink: /api/v1/namespaces/helm-system/configmaps/invincible-zebu.v1
+  uid: 362f70c7-91dc-4478-88eb-08a7b368bfd0
diff --git a/e2e/tests/assets/helm2/helm2configmap-no-deprecated.yaml b/e2e/tests/assets/helm2/helm2configmap-no-deprecated.yaml
new file mode 100644
index 0000000..625e028
--- /dev/null
+++ b/e2e/tests/assets/helm2/helm2configmap-no-deprecated.yaml
@@ -0,0 +1,17 @@
+apiVersion: v1
+data:
+  release: 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
+kind: ConfigMap
+metadata:
+  creationTimestamp: "2020-04-02T21:18:01Z"
+  labels:
+    MODIFIED_AT: "1585862281"
+    NAME: lunging-bat
+    OWNER: TILLER
+    STATUS: DEPLOYED
+    VERSION: "1"
+  name: lunging-bat.v1
+  namespace: helm-system
+  resourceVersion: "264417"
+  selfLink: /api/v1/namespaces/helm-system/configmaps/lunging-bat.v1
+  uid: 9782c0d6-83f0-401c-be4e-bfad2e5a765d
diff --git a/e2e/tests/assets/helmchartest/.helmignore b/e2e/tests/assets/helm3chart/.helmignore
similarity index 100%
rename from e2e/tests/assets/helmchartest/.helmignore
rename to e2e/tests/assets/helm3chart/.helmignore
diff --git a/e2e/tests/assets/helmchartest/Chart.yaml b/e2e/tests/assets/helm3chart/Chart.yaml
similarity index 97%
rename from e2e/tests/assets/helmchartest/Chart.yaml
rename to e2e/tests/assets/helm3chart/Chart.yaml
index be97cec..c1c93bf 100644
--- a/e2e/tests/assets/helmchartest/Chart.yaml
+++ b/e2e/tests/assets/helm3chart/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v2
-name: helmchartest
+name: helm3chart
 description: A Helm chart for Kubernetes
 
 # A chart can be either an 'application' or a 'library' chart.
diff --git a/e2e/tests/assets/helmchartest/templates/NOTES.txt b/e2e/tests/assets/helm3chart/templates/NOTES.txt
similarity index 74%
rename from e2e/tests/assets/helmchartest/templates/NOTES.txt
rename to e2e/tests/assets/helm3chart/templates/NOTES.txt
index 2715b60..b76558f 100644
--- a/e2e/tests/assets/helmchartest/templates/NOTES.txt
+++ b/e2e/tests/assets/helm3chart/templates/NOTES.txt
@@ -6,16 +6,16 @@
   {{- end }}
 {{- end }}
 {{- else if contains "NodePort" .Values.service.type }}
-  export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "helmchartest.fullname" . }})
+  export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "helm3chart.fullname" . }})
   export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
   echo http://$NODE_IP:$NODE_PORT
 {{- else if contains "LoadBalancer" .Values.service.type }}
      NOTE: It may take a few minutes for the LoadBalancer IP to be available.
-           You can watch the status of by running 'kubectl get --namespace {{ .Release.Namespace }} svc -w {{ include "helmchartest.fullname" . }}'
-  export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "helmchartest.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}")
+           You can watch the status of by running 'kubectl get --namespace {{ .Release.Namespace }} svc -w {{ include "helm3chart.fullname" . }}'
+  export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "helm3chart.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}")
   echo http://$SERVICE_IP:{{ .Values.service.port }}
 {{- else if contains "ClusterIP" .Values.service.type }}
-  export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "helmchartest.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
+  export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "helm3chart.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
   echo "Visit http://127.0.0.1:8080 to use your application"
   kubectl --namespace {{ .Release.Namespace }} port-forward $POD_NAME 8080:80
 {{- end }}
diff --git a/e2e/tests/assets/helmchartest/templates/_helpers.tpl b/e2e/tests/assets/helm3chart/templates/_helpers.tpl
similarity index 74%
rename from e2e/tests/assets/helmchartest/templates/_helpers.tpl
rename to e2e/tests/assets/helm3chart/templates/_helpers.tpl
index 45d88d0..638d79e 100644
--- a/e2e/tests/assets/helmchartest/templates/_helpers.tpl
+++ b/e2e/tests/assets/helm3chart/templates/_helpers.tpl
@@ -2,7 +2,7 @@
 {{/*
 Expand the name of the chart.
 */}}
-{{- define "helmchartest.name" -}}
+{{- define "helm3chart.name" -}}
 {{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
 
@@ -11,7 +11,7 @@ Create a default fully qualified app name.
 We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
 If release name contains chart name it will be used as a full name.
 */}}
-{{- define "helmchartest.fullname" -}}
+{{- define "helm3chart.fullname" -}}
 {{- if .Values.fullnameOverride -}}
 {{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
 {{- else -}}
@@ -27,16 +27,16 @@ If release name contains chart name it will be used as a full name.
 {{/*
 Create chart name and version as used by the chart label.
 */}}
-{{- define "helmchartest.chart" -}}
+{{- define "helm3chart.chart" -}}
 {{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
 
 {{/*
 Common labels
 */}}
-{{- define "helmchartest.labels" -}}
-helm.sh/chart: {{ include "helmchartest.chart" . }}
-{{ include "helmchartest.selectorLabels" . }}
+{{- define "helm3chart.labels" -}}
+helm.sh/chart: {{ include "helm3chart.chart" . }}
+{{ include "helm3chart.selectorLabels" . }}
 {{- if .Chart.AppVersion }}
 app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
 {{- end }}
@@ -46,17 +46,17 @@ app.kubernetes.io/managed-by: {{ .Release.Service }}
 {{/*
 Selector labels
 */}}
-{{- define "helmchartest.selectorLabels" -}}
-app.kubernetes.io/name: {{ include "helmchartest.name" . }}
+{{- define "helm3chart.selectorLabels" -}}
+app.kubernetes.io/name: {{ include "helm3chart.name" . }}
 app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end -}}
 
 {{/*
 Create the name of the service account to use
 */}}
-{{- define "helmchartest.serviceAccountName" -}}
+{{- define "helm3chart.serviceAccountName" -}}
 {{- if .Values.serviceAccount.create -}}
-    {{ default (include "helmchartest.fullname" .) .Values.serviceAccount.name }}
+    {{ default (include "helm3chart.fullname" .) .Values.serviceAccount.name }}
 {{- else -}}
     {{ default "default" .Values.serviceAccount.name }}
 {{- end -}}
diff --git a/e2e/tests/assets/helmchartest/templates/deployment-deprecated.yaml b/e2e/tests/assets/helm3chart/templates/deployment-deprecated.yaml
similarity index 80%
rename from e2e/tests/assets/helmchartest/templates/deployment-deprecated.yaml
rename to e2e/tests/assets/helm3chart/templates/deployment-deprecated.yaml
index 1c72d1c..cea2be0 100644
--- a/e2e/tests/assets/helmchartest/templates/deployment-deprecated.yaml
+++ b/e2e/tests/assets/helm3chart/templates/deployment-deprecated.yaml
@@ -1,24 +1,24 @@
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
-  name: {{ include "helmchartest.fullname" . }}-v1beta1
+  name: {{ include "helm3chart.fullname" . }}-v1beta1
   labels:
-    {{- include "helmchartest.labels" . | nindent 4 }}
+    {{- include "helm3chart.labels" . | nindent 4 }}
 spec:
   replicas: {{ .Values.replicaCount }}
   selector:
     matchLabels:
-      {{- include "helmchartest.selectorLabels" . | nindent 6 }}
+      {{- include "helm3chart.selectorLabels" . | nindent 6 }}
   template:
     metadata:
       labels:
-        {{- include "helmchartest.selectorLabels" . | nindent 8 }}
+        {{- include "helm3chart.selectorLabels" . | nindent 8 }}
     spec:
     {{- with .Values.imagePullSecrets }}
       imagePullSecrets:
         {{- toYaml . | nindent 8 }}
     {{- end }}
-      serviceAccountName: {{ include "helmchartest.serviceAccountName" . }}
+      serviceAccountName: {{ include "helm3chart.serviceAccountName" . }}
       securityContext:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
       containers:
diff --git a/e2e/tests/assets/helmchartest/templates/deployment.yaml b/e2e/tests/assets/helm3chart/templates/deployment.yaml
similarity index 81%
rename from e2e/tests/assets/helmchartest/templates/deployment.yaml
rename to e2e/tests/assets/helm3chart/templates/deployment.yaml
index 47621a4..b1db658 100644
--- a/e2e/tests/assets/helmchartest/templates/deployment.yaml
+++ b/e2e/tests/assets/helm3chart/templates/deployment.yaml
@@ -1,24 +1,24 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: {{ include "helmchartest.fullname" . }}
+  name: {{ include "helm3chart.fullname" . }}
   labels:
-    {{- include "helmchartest.labels" . | nindent 4 }}
+    {{- include "helm3chart.labels" . | nindent 4 }}
 spec:
   replicas: {{ .Values.replicaCount }}
   selector:
     matchLabels:
-      {{- include "helmchartest.selectorLabels" . | nindent 6 }}
+      {{- include "helm3chart.selectorLabels" . | nindent 6 }}
   template:
     metadata:
       labels:
-        {{- include "helmchartest.selectorLabels" . | nindent 8 }}
+        {{- include "helm3chart.selectorLabels" . | nindent 8 }}
     spec:
     {{- with .Values.imagePullSecrets }}
       imagePullSecrets:
         {{- toYaml . | nindent 8 }}
     {{- end }}
-      serviceAccountName: {{ include "helmchartest.serviceAccountName" . }}
+      serviceAccountName: {{ include "helm3chart.serviceAccountName" . }}
       securityContext:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
       containers:
diff --git a/e2e/tests/assets/helmchartest/values.yaml b/e2e/tests/assets/helm3chart/values.yaml
similarity index 97%
rename from e2e/tests/assets/helmchartest/values.yaml
rename to e2e/tests/assets/helm3chart/values.yaml
index fa2a9c5..910c406 100644
--- a/e2e/tests/assets/helmchartest/values.yaml
+++ b/e2e/tests/assets/helm3chart/values.yaml
@@ -1,4 +1,4 @@
-# Default values for helmchartest.
+# Default values for helm3chart.
 # This is a YAML-formatted file.
 # Declare variables to be passed into your templates.
 
diff --git a/e2e/tests/assets/helmchartest/templates/serviceaccount.yaml b/e2e/tests/assets/helmchartest/templates/serviceaccount.yaml
deleted file mode 100644
index 323010e..0000000
--- a/e2e/tests/assets/helmchartest/templates/serviceaccount.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: {{ include "helmchartest.serviceAccountName" . }}
diff --git a/pkg/api/output_test.go b/pkg/api/output_test.go
index 80a776d..4e8ef12 100644
--- a/pkg/api/output_test.go
+++ b/pkg/api/output_test.go
@@ -67,7 +67,7 @@ func ExampleDisplayOutput_yaml() {
 func ExampleDisplayOutput_noOutput() {
 	_ = DisplayOutput([]*Output{testOutput1}, "tabular", false)
 
-	// Output: APIVersions were found, but none were deprecated. Try --show-non-deprecated.
+	// Output: APIVersions were found, but none were deprecated. Try --show-all.
 }
 
 func ExampleDisplayOutput_badFormat() {