Merge pull request #177 from jstrachan/changes2

fix: failing test
jenkins-x-labs · Apr 7, 2020 · 01615f9 · 01615f9
2 parents de2a5ca + 8c0017a
commit 01615f9
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 145 deletions.
diff --git a/cmd/root/edit/edit.go b/cmd/root/edit/edit.go
@@ -93,17 +93,19 @@ func addTeamSettingsCommandsFromTags(baseCmd *cobra.Command, options *Options) e
 				var value interface{}
 				var err error
 				if len(args) > 0 {
-					if structField.Type.String() == "string" {
+					switch structField.Type.String() {
+					case "string":
 						value = args[0]
-					} else if structField.Type.String() == "bool" {
+					case "bool":
 						value, err = strconv.ParseBool(args[0])
 						helper.CheckErr(err)
 					}
 				} else if !options.BatchMode {
 					var err error
-					if structField.Type.String() == "string" {
+					switch structField.Type.String() {
+					case "string":
 						value, err = util.PickValue(commandUsage+":", field.String(), true, "", options.GetIOFileHandles())
-					} else if structField.Type.String() == "bool" {
+					case "bool":
 						value, err = util.Confirm(commandUsage+":", field.Bool(), "", options.GetIOFileHandles())
 					}
 					helper.CheckErr(err)

diff --git a/pkg/charttest/test_data/default/expected/batch/v1/Job/jx-boot.yaml b/pkg/charttest/test_data/default/expected/batch/v1/Job/jx-boot.yaml
@@ -24,7 +24,7 @@ spec:
         - --git-ref
         - "master"
         - --versions-repo
-        - "https://github.com/jenkins-x/jenkins-x-versions.git"
+        - "https://github.com/jenkins-x-labs/jenkins-x-versions.git"
         - --versions-ref
         - "master"
         command:
@@ -52,56 +52,10 @@ spec:
           value: /secrets/jx-boot/secrets.yaml
         - name: JX_INTERPRET_PIPELINE
           value: "true"
-        - name: JX_REQUIREMENT_TERRAFORM
-          value: "true"
-        - name: JX_REQUIREMENT_ENV_GIT_OWNER
-          value: ""
-        - name: JX_REQUIREMENT_KANIKO_SA_NAME
-          value: kaniko-sa
-
-        - name: JX_REQUIREMENT_VELERO_SA_NAME
-          value: velero-sa
-        - name: JX_REQUIREMENT_EXTERNALDNS_SA_NAME
-          value: externaldns-sa
-        - name: JX_REQUIREMENT_INGRESS_TLS_PRODUCTION
-          value: "false"
-        - name: JX_REQUIREMENT_ENV_GIT_PUBLIC
-          value: "false"
-        - name: JX_REQUIREMENT_GIT_PUBLIC
-          value: "false"
-        - name: JX_REQUIREMENT_STORAGE_BACKUP_ENABLED
-          value: "true"
-        - name: JX_REQUIREMENT_PROVIDER
-          value:  "gke"
-        - name: JX_REQUIREMENT_PROJECT
-          value:  
-        - name: JX_REQUIREMENT_CLUSTER_NAME
-          value: 
-        - name: JX_REQUIREMENT_ZONE
-          value: 
-        # - name: JX_REQUIREMENT_STORAGE_BACKUP_URL
-        #   value: ${storage_backup_url}
-        # - name: JX_REQUIREMENT_STORAGE_LOGS_ENABLED
-        #   value: "true"
-        # - name: JX_REQUIREMENT_STORAGE_LOGS_URL
-        #   value: ${storage_logs_url}
-        # - name: JX_REQUIREMENT_STORAGE_REPORTS_ENABLED
-        #   value: "false"
-        # - name: JX_REQUIREMENT_STORAGE_REPOSITORY_ENABLED
-        #   value: "false"
-        - name: USER_EMAIL
-          value: 
         - name: JX_HOME
           value: /secrets
         image: "gcr.io/jenkinsxio-labs/jxl:0.0.88"
         imagePullPolicy: IfNotPresent
         name: boot
-        volumeMounts:
-        - mountPath: /secrets/jx-boot
-          name: jx-boot-secrets
       restartPolicy: Never
       serviceAccountName: jxl-boot
-      volumes:
-      - name: jx-boot-secrets
-        secret:
-          secretName: jx-boot-secrets
diff --git a/pkg/charttest/test_data/eks/expected/batch/v1/Job/jx-boot.yaml b/pkg/charttest/test_data/eks/expected/batch/v1/Job/jx-boot.yaml
@@ -24,7 +24,7 @@ spec:
         - --git-ref
         - "master"
         - --versions-repo
-        - "https://github.com/jenkins-x/jenkins-x-versions.git"
+        - "https://github.com/jenkins-x-labs/jenkins-x-versions.git"
         - --versions-ref
         - "master"
         command:
@@ -52,56 +52,10 @@ spec:
           value: /secrets/jx-boot/secrets.yaml
         - name: JX_INTERPRET_PIPELINE
           value: "true"
-        - name: JX_REQUIREMENT_TERRAFORM
-          value: "true"
-        - name: JX_REQUIREMENT_ENV_GIT_OWNER
-          value: ""
-        - name: JX_REQUIREMENT_KANIKO_SA_NAME
-          value: kaniko-sa
-
-        - name: JX_REQUIREMENT_VELERO_SA_NAME
-          value: velero-sa
-        - name: JX_REQUIREMENT_EXTERNALDNS_SA_NAME
-          value: externaldns-sa
-        - name: JX_REQUIREMENT_INGRESS_TLS_PRODUCTION
-          value: "false"
-        - name: JX_REQUIREMENT_ENV_GIT_PUBLIC
-          value: "false"
-        - name: JX_REQUIREMENT_GIT_PUBLIC
-          value: "false"
-        - name: JX_REQUIREMENT_STORAGE_BACKUP_ENABLED
-          value: "true"
-        - name: JX_REQUIREMENT_PROVIDER
-          value:  "gke"
-        - name: JX_REQUIREMENT_PROJECT
-          value:  
-        - name: JX_REQUIREMENT_CLUSTER_NAME
-          value: 
-        - name: JX_REQUIREMENT_ZONE
-          value: 
-        # - name: JX_REQUIREMENT_STORAGE_BACKUP_URL
-        #   value: ${storage_backup_url}
-        # - name: JX_REQUIREMENT_STORAGE_LOGS_ENABLED
-        #   value: "true"
-        # - name: JX_REQUIREMENT_STORAGE_LOGS_URL
-        #   value: ${storage_logs_url}
-        # - name: JX_REQUIREMENT_STORAGE_REPORTS_ENABLED
-        #   value: "false"
-        # - name: JX_REQUIREMENT_STORAGE_REPOSITORY_ENABLED
-        #   value: "false"
-        - name: USER_EMAIL
-          value: 
         - name: JX_HOME
           value: /secrets
         image: "gcr.io/jenkinsxio-labs/jxl:0.0.88"
         imagePullPolicy: IfNotPresent
         name: boot
-        volumeMounts:
-        - mountPath: /secrets/jx-boot
-          name: jx-boot-secrets
       restartPolicy: Never
       serviceAccountName: jxl-boot
-      volumes:
-      - name: jx-boot-secrets
-        secret:
-          secretName: jx-boot-secrets
diff --git a/pkg/charttest/test_data/eks/expected/v1/ServiceAccount/jxl-boot.yaml b/pkg/charttest/test_data/eks/expected/v1/ServiceAccount/jxl-boot.yaml
@@ -13,3 +13,4 @@ metadata:
   annotations:
     eks.amazonaws.com/role-arn: arn:aws:iam::123456:role/jenkinsXaccessToS3
     foo: bar
+    eks.amazonaws.com/role-arn: arn:aws:iam::myproject:role/mycluster-jx-jxl-boot
diff --git a/pkg/charttest/test_data/gke/expected/batch/v1/Job/jx-boot.yaml b/pkg/charttest/test_data/gke/expected/batch/v1/Job/jx-boot.yaml
@@ -24,7 +24,7 @@ spec:
         - --git-ref
         - "master"
         - --versions-repo
-        - "https://github.com/jenkins-x/jenkins-x-versions.git"
+        - "https://github.com/jenkins-x-labs/jenkins-x-versions.git"
         - --versions-ref
         - "master"
         command:
@@ -52,56 +52,10 @@ spec:
           value: /secrets/jx-boot/secrets.yaml
         - name: JX_INTERPRET_PIPELINE
           value: "true"
-        - name: JX_REQUIREMENT_TERRAFORM
-          value: "true"
-        - name: JX_REQUIREMENT_ENV_GIT_OWNER
-          value: ""
-        - name: JX_REQUIREMENT_KANIKO_SA_NAME
-          value: kaniko-sa
-
-        - name: JX_REQUIREMENT_VELERO_SA_NAME
-          value: velero-sa
-        - name: JX_REQUIREMENT_EXTERNALDNS_SA_NAME
-          value: externaldns-sa
-        - name: JX_REQUIREMENT_INGRESS_TLS_PRODUCTION
-          value: "false"
-        - name: JX_REQUIREMENT_ENV_GIT_PUBLIC
-          value: "false"
-        - name: JX_REQUIREMENT_GIT_PUBLIC
-          value: "false"
-        - name: JX_REQUIREMENT_STORAGE_BACKUP_ENABLED
-          value: "true"
-        - name: JX_REQUIREMENT_PROVIDER
-          value:  "gke"
-        - name: JX_REQUIREMENT_PROJECT
-          value:  
-        - name: JX_REQUIREMENT_CLUSTER_NAME
-          value: 
-        - name: JX_REQUIREMENT_ZONE
-          value: 
-        # - name: JX_REQUIREMENT_STORAGE_BACKUP_URL
-        #   value: ${storage_backup_url}
-        # - name: JX_REQUIREMENT_STORAGE_LOGS_ENABLED
-        #   value: "true"
-        # - name: JX_REQUIREMENT_STORAGE_LOGS_URL
-        #   value: ${storage_logs_url}
-        # - name: JX_REQUIREMENT_STORAGE_REPORTS_ENABLED
-        #   value: "false"
-        # - name: JX_REQUIREMENT_STORAGE_REPOSITORY_ENABLED
-        #   value: "false"
-        - name: USER_EMAIL
-          value: 
         - name: JX_HOME
           value: /secrets
         image: "gcr.io/jenkinsxio-labs/jxl:0.0.88"
         imagePullPolicy: IfNotPresent
         name: boot
-        volumeMounts:
-        - mountPath: /secrets/jx-boot
-          name: jx-boot-secrets
       restartPolicy: Never
       serviceAccountName: jxl-boot
-      volumes:
-      - name: jx-boot-secrets
-        secret:
-          secretName: jx-boot-secrets