revert legacy package

tuunit · Nov 5, 2023 · 543993e · 543993e
1 parent 76a37fd
commit 543993e
Show file tree

Hide file tree

Showing 10 changed files with 16 additions and 21 deletions.
diff --git a/main.go b/main.go
@@ -9,7 +9,6 @@ import (
 
 	"github.com/ghodss/yaml"
 	"github.com/oauth2-proxy/oauth2-proxy/v7/pkg/apis/options"
-	"github.com/oauth2-proxy/oauth2-proxy/v7/pkg/apis/options/legacy"
 	"github.com/oauth2-proxy/oauth2-proxy/v7/pkg/logger"
 	"github.com/oauth2-proxy/oauth2-proxy/v7/pkg/validation"
 	"github.com/spf13/pflag"
@@ -85,13 +84,13 @@ func loadConfiguration(config, legacyConfig string, extraFlags *pflag.FlagSet, a
 // loadLegacyOptions loads the old toml options using the legacy flagset
 // and legacy options struct.
 func loadLegacyOptions(legacyConfig string, extraFlags *pflag.FlagSet, args []string) (*options.Options, error) {
-	legacyFlagSet := legacy.NewLegacyFlagSet()
+	legacyFlagSet := options.NewLegacyFlagSet()
 	legacyFlagSet.AddFlagSet(extraFlags)
 	if err := legacyFlagSet.Parse(args); err != nil {
 		return nil, fmt.Errorf("failed to parse flags: %v", err)
 	}
 
-	legacyOpts := legacy.NewLegacyOptions()
+	legacyOpts := options.NewLegacyOptions()
 	if err := options.Load(legacyConfig, legacyFlagSet, legacyOpts); err != nil {
 		return nil, fmt.Errorf("failed to load config: %v", err)
 	}

diff --git a/main_test.go b/main_test.go
@@ -102,7 +102,7 @@ redirect_url="http://localhost:4180/oauth2/callback"
 	}
 
 	testExpectedOptions := func() *options.Options {
-		opts, err := legacy.NewLegacyOptions().ToOptions()
+		opts, err := NewLegacyOptions().ToOptions()
 		Expect(err).ToNot(HaveOccurred())
 
 		opts.Cookie.Secret = "OQINaROshtE9TcZkNAm-5Zs2Pv3xaWytBmc5W7sPX7w="

diff --git a/pkg/apis/options/legacy/legacy_cookie.go → pkg/apis/options/legacy_cookie.go b/pkg/apis/options/legacy/legacy_cookie.go → pkg/apis/options/legacy_cookie.go
@@ -1,9 +1,8 @@
-package legacy
+package options
 
 import (
 	"time"
 
-	. "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/apis/options"
 	"github.com/spf13/pflag"
 )
 

diff --git a/pkg/apis/options/legacy/legacy_logging.go → pkg/apis/options/legacy_logging.go b/pkg/apis/options/legacy/legacy_logging.go → pkg/apis/options/legacy_logging.go
@@ -1,7 +1,6 @@
-package legacy
+package options
 
 import (
-	. "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/apis/options"
 	"github.com/oauth2-proxy/oauth2-proxy/v7/pkg/logger"
 	"github.com/spf13/pflag"
 )

diff --git a/pkg/apis/options/legacy/legacy_options.go → pkg/apis/options/legacy_options.go b/pkg/apis/options/legacy/legacy_options.go → pkg/apis/options/legacy_options.go
@@ -1,4 +1,4 @@
-package legacy
+package options
 
 import (
 	"fmt"
@@ -8,7 +8,6 @@ import (
 	"strings"
 	"time"
 
-	. "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/apis/options"
 	"github.com/oauth2-proxy/oauth2-proxy/v7/pkg/logger"
 	"github.com/spf13/pflag"
 )
@@ -34,6 +33,8 @@ type LegacyOptions struct {
 
 	LegacyPageTemplates LegacyPageTemplates `cfg:",squash"`
 
+	LegacyProxyOptions LegacyProxyOptions `cfg:",squash"`
+
 	LegacyProbeOptions LegacyProbeOptions `cfg:",squash"`
 
 	Options Options `cfg:",squash"`
@@ -170,6 +171,8 @@ func (l *LegacyOptions) ToOptions() (*Options, error) {
 
 	l.Options.PageTemplates = l.LegacyPageTemplates.convert()
 
+	l.Options.ProxyOptions = l.LegacyProxyOptions.convert()
+
 	l.Options.ProbeOptions = l.LegacyProbeOptions.convert()
 
 	l.Options.LegacyPreferEmailToUser = l.LegacyHeaders.PreferEmailToUser

diff --git a/...pis/options/legacy/legacy_options_test.go → pkg/apis/options/legacy_options_test.go b/...pis/options/legacy/legacy_options_test.go → pkg/apis/options/legacy_options_test.go
@@ -1,9 +1,8 @@
-package legacy
+package options
 
 import (
 	"time"
 
-	. "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/apis/options"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/ginkgo/extensions/table"
 	. "github.com/onsi/gomega"

diff --git a/...s/options/legacy/legacy_page_templates.go → pkg/apis/options/legacy_page_templates.go b/...s/options/legacy/legacy_page_templates.go → pkg/apis/options/legacy_page_templates.go
@@ -1,7 +1,6 @@
-package legacy
+package options
 
 import (
-	. "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/apis/options"
 	"github.com/spf13/pflag"
 )
 

diff --git a/pkg/apis/options/legacy/legacy_proxy.go → pkg/apis/options/legacy_proxy.go b/pkg/apis/options/legacy/legacy_proxy.go → pkg/apis/options/legacy_proxy.go
@@ -1,7 +1,6 @@
-package legacy
+package options
 
 import (
-	. "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/apis/options"
 	"github.com/spf13/pflag"
 )
 

diff --git a/pkg/apis/options/legacy/legacy_sessions.go → pkg/apis/options/legacy_sessions.go b/pkg/apis/options/legacy/legacy_sessions.go → pkg/apis/options/legacy_sessions.go
@@ -1,7 +1,6 @@
-package legacy
+package options
 
 import (
-	. "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/apis/options"
 	"github.com/spf13/pflag"
 )
 

diff --git a/pkg/apis/options/load_test.go b/pkg/apis/options/load_test.go
@@ -6,7 +6,6 @@ import (
 	"os"
 	"time"
 
-	"github.com/oauth2-proxy/oauth2-proxy/v7/pkg/apis/options/legacy"
 	"github.com/oauth2-proxy/oauth2-proxy/v7/pkg/logger"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/ginkgo/extensions/table"
@@ -15,8 +14,8 @@ import (
 )
 
 var _ = Describe("Load", func() {
-	legacyOptionsWithNilProvider := &legacy.LegacyOptions{
-		LegacyUpstreams: legacy.LegacyUpstreams{
+	legacyOptionsWithNilProvider := &LegacyOptions{
+		LegacyUpstreams: LegacyUpstreams{
 			PassHostHeader:  true,
 			ProxyWebSockets: true,
 			FlushInterval:   DefaultUpstreamFlushInterval,