f

Author: emosbaugh

cmd/installer/cli/install.go

@@ -401,7 +401,7 @@ func preRunInstallCommon(cmd *cobra.Command, flags *InstallCmdFlags, rc runtimec
 		if err != nil {
 			var notALicenseFileErr helpers.ErrNotALicenseFile
 			if errors.As(err, &notALicenseFileErr) {
-				return fmt.Errorf("license file is not a valid license file")
+				return fmt.Errorf("failed to parse the license file at %q, please ensure it is not corrupt: %w", flags.licenseFile, err)
 			}
 
 			return fmt.Errorf("failed to parse license file: %w", err)

pkg/helpers/parse.go

@@ -14,7 +14,7 @@ type ErrNotALicenseFile struct {
 }
 
 func (e ErrNotALicenseFile) Error() string {
-	return fmt.Sprintf("not a license file: %v", e.Err)
+	return e.Err.Error()
 }
 
 // ParseEndUserConfig parses the end user configuration from the given file.

pkg/helpers/parse_test.go

@@ -132,21 +132,13 @@ func TestParseLicense(t *testing.T) {
 			wantErr: ErrNotALicenseFile{},
 		},
 		{
-			name:  "valid YAML but not a license succeeds (no validation)",
+			name:  "valid YAML but not a license returns ErrNotALicenseFile",
 			fpath: "not-license.yaml",
 			fileContent: `apiVersion: v1
 kind: ConfigMap
 metadata:
   name: test`,
-			expected: &kotsv1beta1.License{
-				TypeMeta: metav1.TypeMeta{
-					APIVersion: "v1",
-					Kind:       "ConfigMap",
-				},
-				ObjectMeta: metav1.ObjectMeta{
-					Name: "test",
-				},
-			},
+			wantErr: ErrNotALicenseFile{},
 		},
 		{
 			name:  "valid license",
@@ -178,12 +170,17 @@ spec:
 			name:  "minimal valid license",
 			fpath: "minimal-license.yaml",
 			fileContent: `apiVersion: kots.io/v1beta1
-kind: License`,
+kind: License
+spec:
+  licenseID: "test-license-id"`,
 			expected: &kotsv1beta1.License{
 				TypeMeta: metav1.TypeMeta{
 					APIVersion: "kots.io/v1beta1",
 					Kind:       "License",
 				},
+				Spec: kotsv1beta1.LicenseSpec{
+					LicenseID: "test-license-id",
+				},
 			},
 		},
 	}