remove core options

tuunit · tuunit · commit d232ed5f28d9 · 2024-05-10T09:06:23.000+02:00
diff --git a/main.go b/main.go
@@ -107,7 +107,7 @@ func loadLegacyOptions(config string, extraFlags *pflag.FlagSet, args []string)
 func loadYamlOptions(yamlConfig, config string, extraFlags *pflag.FlagSet, args []string) (*options.Options, error) {
 	opts, err := loadOptions(config, extraFlags, args)
 	if err != nil {
-		return nil, fmt.Errorf("failed to load core options: %v", err)
+		return nil, fmt.Errorf("please convert all legacy options: %v", err)
 	}
 
 	alphaOpts := options.NewAlphaOptions(opts)
diff --git a/main_test.go b/main_test.go
@@ -35,6 +35,8 @@ redirect_url="http://localhost:4180/oauth2/callback"
 session_cookie_minimal="true"
 ping_path="/ping-pong"
 ready_path="/readysteady"
+errors_to_info_log="true"
+silence_ping_logging="true"
 `
 
 	const testAlphaConfig = `
@@ -89,6 +91,9 @@ session:
 probeOptions:
   pingPath: /ping-pong
   readyPath: /readysteady
+logging:
+  errToInfo: true
+  silencePing: true
 providers:
 - provider: google
   ID: google=oauth2-proxy
@@ -109,11 +114,6 @@ providers:
     - force
 `
 
-	const testCoreConfig = `
-		errors_to_info_log="true"
-		silence_ping_logging="true"
-	`
-
 	boolPtr := func(b bool) *bool {
 		return &b
 	}
@@ -271,30 +271,30 @@ providers:
 			Expect(opts).To(EqualOpts(in.expectedOptions()))
 		},
 		Entry("with legacy configuration", loadConfigurationTableInput{
-			configContent:   testCoreConfig + testLegacyConfig,
+			configContent:   testLegacyConfig,
 			expectedOptions: testExpectedOptions,
 		}),
 		Entry("with alpha configuration", loadConfigurationTableInput{
-			configContent:      testCoreConfig,
+			configContent:      "",
 			alphaConfigContent: testAlphaConfig,
 			expectedOptions:    testExpectedOptions,
 		}),
 		Entry("with bad legacy configuration", loadConfigurationTableInput{
-			configContent:   testCoreConfig + "unknown_field=\"something\"",
+			configContent:   testLegacyConfig + "unknown_field=\"something\"",
 			expectedOptions: func() *options.Options { return nil },
 			expectedErr:     errors.New("failed to load config: error unmarshalling config: 1 error(s) decoding:\n\n* '' has invalid keys: unknown_field"),
 		}),
 		Entry("with bad alpha configuration", loadConfigurationTableInput{
-			configContent:      testCoreConfig,
+			configContent:      "",
 			alphaConfigContent: testAlphaConfig + ":",
 			expectedOptions:    func() *options.Options { return nil },
 			expectedErr:        fmt.Errorf("failed to load alpha options: error unmarshalling config: error converting YAML to JSON: yaml: line %d: did not find expected key", strings.Count(testAlphaConfig, "\n")),
 		}),
-		Entry("with alpha configuration and bad core configuration", loadConfigurationTableInput{
-			configContent:      testCoreConfig + "unknown_field=\"something\"",
+		Entry("with alpha configuration and legacy configuration", loadConfigurationTableInput{
+			configContent:      testLegacyConfig,
 			alphaConfigContent: testAlphaConfig,
 			expectedOptions:    func() *options.Options { return nil },
-			expectedErr:        errors.New("has invalid keys: unknown_field"),
+			expectedErr:        errors.New("please convert all legacy options"),
 		}),
 	)
 })
diff --git a/pkg/apis/options/alpha_options.go b/pkg/apis/options/alpha_options.go
@@ -70,7 +70,7 @@ type AlphaOptions struct {
 	Logging Logging `json:"logging,omitempty"`
 }
 
-// Initialize alpha options with default values and settings of the core options
+// Initialize alpha options with default values
 func NewAlphaOptions(opts *Options) *AlphaOptions {
 	aOpts := &AlphaOptions{}
 	aOpts.ExtractFrom(opts)

Original file line number	Diff line number	Diff line change
`@@ -107,7 +107,7 @@ func loadLegacyOptions(config string, extraFlags *pflag.FlagSet, args []string)`
`107`	`107`	`func loadYamlOptions(yamlConfig, config string, extraFlags pflag.FlagSet, args []string) (options.Options, error) {`
`108`	`108`	`opts, err := loadOptions(config, extraFlags, args)`
`109`	`109`	`if err != nil {`
`110`		`- return nil, fmt.Errorf("failed to load core options: %v", err)`
	`110`	`+ return nil, fmt.Errorf("please convert all legacy options: %v", err)`
`111`	`111`	`}`
`112`	`112`
`113`	`113`	`alphaOpts := options.NewAlphaOptions(opts)`
Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ type AlphaOptions struct {`
`70`	`70`	Logging Logging `json:"logging,omitempty"`
`71`	`71`	`}`
`72`	`72`
`73`		`-// Initialize alpha options with default values and settings of the core options`
	`73`	`+// Initialize alpha options with default values`
`74`	`74`	`func NewAlphaOptions(opts Options) AlphaOptions {`
`75`	`75`	`aOpts := &AlphaOptions{}`
`76`	`76`	`aOpts.ExtractFrom(opts)`