address comments and fix helm test workflow

Author: AlexFenlon

.github/workflows/ci.yml

@@ -467,6 +467,10 @@ jobs:
           kind load docker-image "${{ matrix.image }}:${{ matrix.tag }}" --name ${{ github.run_id }}
         if: ${{ steps.stable_exists.outputs.exists != 'true' && needs.checks.outputs.docs_only == 'false' }}
 
+      - name: Create Plus Secret
+        run: kubectl create secret generic license-token --from-literal=license.jwt="${{ secrets.PLUS_JWT }}" --type="nginx.com/license"
+        if: ${{ matrix.type == 'plus' && steps.stable_exists.outputs.exists != 'true' && needs.checks.outputs.docs_only == 'false' }}
+
       - name: Install Chart
         run: >
           helm install

cmd/nginx-ingress/main.go

@@ -721,7 +721,7 @@ func getAndValidateSecret(kubeClient *kubernetes.Clientset, secretNsName string,
 	case secrets.SecretTypeLicense:
 		err = secrets.ValidateLicenseSecret(secret)
 		if err != nil {
-			return secret, err
+			return nil, err
 		}
 	}
 	return secret, nil

internal/configs/configmaps_test.go

@@ -440,7 +440,8 @@ func TestParseMGMTConfigMapEnforceInitialReport(t *testing.T) {
 
 			if result.EnforceInitialReport == nil {
 				t.Fatalf("EnforceInitialReport: want %v, got nil", *test.want.EnforceInitialReport)
-			} else if *result.EnforceInitialReport != *test.want.EnforceInitialReport {
+			}
+			if *result.EnforceInitialReport != *test.want.EnforceInitialReport {
 				t.Fatalf("EnforceInitialReport: want %v, got %v", *test.want.EnforceInitialReport, *result.EnforceInitialReport)
 			}
 		})