Merge branch 'main' into issue-212

Author: davidcollom

cmd/app/options.go

@@ -263,49 +263,51 @@ func (o *Options) addAuthFlags(fs *pflag.FlagSet) {
 	fs.StringVar(&o.selfhosted.Username,
 		"selfhosted-username", "",
 		fmt.Sprintf(
-			"Username is authenticate with a selfhosted registry (%s_%s).",
-			envPrefix, envSelfhostedUsername,
+			"Username is authenticate with a selfhosted registry (%s_%s_%s).",
+			envPrefix, envSelfhostedPrefix, envSelfhostedUsername,
 		))
 	fs.StringVar(&o.selfhosted.Password,
 		"selfhosted-password", "",
 		fmt.Sprintf(
-			"Password is authenticate with a selfhosted registry (%s_%s).",
-			envPrefix, envSelfhostedPassword,
+			"Password is authenticate with a selfhosted registry (%s_%s_%s).",
+			envPrefix, envSelfhostedPrefix, envSelfhostedPassword,
 		))
 	fs.StringVar(&o.selfhosted.Bearer,
 		"selfhosted-token", "",
 		fmt.Sprintf(
 			"Token to authenticate to a selfhosted registry. Cannot be used with "+
-				"username/password (%s_%s).",
-			envPrefix, envSelfhostedBearer,
+				"username/password (%s_%s_%s).",
+			envPrefix, envSelfhostedPrefix, envSelfhostedBearer,
 		))
 	fs.StringVar(&o.selfhosted.TokenPath,
 		"selfhosted-token-path", "",
 		fmt.Sprintf(
 			"Override the default selfhosted registry's token auth path. "+
-				"(%s_%s).",
-			envPrefix, envSelfhostedTokenPath,
+				"(%s_%s_%s).",
+			envPrefix, envSelfhostedPrefix, envSelfhostedTokenPath,
 		))
 	fs.StringVar(&o.selfhosted.Host,
 		"selfhosted-registry-host", "",
 		fmt.Sprintf(
-			"Full host of the selfhosted registry. Include http[s] scheme (%s_%s)",
-			envPrefix, envSelfhostedHost,
+			"Full host of the selfhosted registry. Include http[s] scheme (%s_%s_%s)",
+			envPrefix, envSelfhostedPrefix, envSelfhostedHost,
 		))
-	fs.StringVar(&o.selfhosted.Host,
+	fs.StringVar(&o.selfhosted.CAPath,
 		"selfhosted-registry-ca-path", "",
 		fmt.Sprintf(
-			"Absolute path to a PEM encoded x509 certificate chain. (%s_%s)",
-			envPrefix, envSelfhostedCAPath,
+			"Absolute path to a PEM encoded x509 certificate chain. (%s_%s_%s)",
+			envPrefix, envSelfhostedPrefix, envSelfhostedCAPath,
 		))
 	fs.BoolVarP(&o.selfhosted.Insecure,
 		"selfhosted-insecure", "", false,
 		fmt.Sprintf(
 			"Enable/Disable SSL Certificate Validation. WARNING: "+
-				"THIS IS NOT RECOMMENDED AND IS INTENDED FOR DEBUGGING (%s_%s)",
-			envPrefix, envSelfhostedInsecure,
+				"THIS IS NOT RECOMMENDED AND IS INTENDED FOR DEBUGGING (%s_%s_%s)",
+			envPrefix, envSelfhostedPrefix, envSelfhostedInsecure,
 		))
-	///
+	// if !validSelfHostedOpts(o) {
+	// 	panic(fmt.Errorf("invalid self hosted configuration"))
+	// }
 }
 
 func (o *Options) complete() {
@@ -450,4 +452,26 @@ func (o *Options) assignSelfhosted(envs []string) {
 	if len(o.selfhosted.Host) > 0 {
 		o.Client.Selfhosted[o.selfhosted.Host] = &o.selfhosted
 	}
+	if !validSelfHostedOpts(o) {
+		panic(fmt.Errorf("invalid self hosted configuration"))
+	}
+}
+
+func validSelfHostedOpts(opts *Options) bool {
+	// opts set using env vars
+	if opts.Client.Selfhosted != nil {
+		for _, selfHostedOpts := range opts.Client.Selfhosted {
+			return isValidOption(selfHostedOpts.Host, "")
+		}
+	}
+
+	// opts set using flags
+	if opts.selfhosted != (selfhosted.Options{}) {
+		return isValidOption(opts.selfhosted.Host, "")
+	}
+	return true
+}
+
+func isValidOption(option, invalid string) bool {
+	return option != invalid
 }

cmd/app/options_test.go

@@ -187,6 +187,61 @@ func TestComplete(t *testing.T) {
 	}
 }
 
+func TestInvalidSelfhostedPanic(t *testing.T) {
+	tests := map[string]struct {
+		envs []string
+	}{
+		"single host for all options should be included": {
+			envs: []string{
+				"VERSION_CHECKER_SELFHOSTED_INSECURE_FOO=true",
+			},
+		},
+	}
+	for name, test := range tests {
+		t.Run(name, func(t *testing.T) {
+			defer func() { recover() }()
+
+			o := new(Options)
+			o.assignSelfhosted(test.envs)
+
+			t.Errorf("did not panic")
+		})
+	}
+}
+
+func TestInvalidSelfhostedOpts(t *testing.T) {
+	tests := map[string]struct {
+		opts  Options
+		valid bool
+	}{
+		"no self hosted configuration": {
+			opts:  Options{},
+			valid: true,
+		},
+		"no self hosted host provided": {
+			opts: Options{
+				Client: client.Options{
+					Selfhosted: map[string]*selfhosted.Options{"foo": &selfhosted.Options{
+						Insecure: true,
+					}},
+				},
+			},
+			valid: false,
+		},
+	}
+	for name, test := range tests {
+		t.Run(name, func(t *testing.T) {
+
+			valid := validSelfHostedOpts(&test.opts)
+
+			if !reflect.DeepEqual(test.valid, valid) {
+				t.Errorf("unexpected selfhosted valid options, exp=%#+v got=%#+v",
+					test.valid, valid)
+			}
+		})
+	}
+}
+
 func TestAssignSelfhosted(t *testing.T) {
 	tests := map[string]struct {
 		envs       []string