Skip to content

refactor(config): embed AuthConfig in ExportConfig #35

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fmenesesg merged 1 commit into from
Jun 11, 2026
Merged

refactor(config): embed AuthConfig in ExportConfig #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions internal/cli/cli_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,10 @@ func TestRunExportHappyPath(t *testing.T) {

dir := t.TempDir()
err := RunExport(context.Background(), config.ExportConfig{
AdminURL: srv.URL,
Token: "secret",
AuthConfig: config.AuthConfig{
AdminURL: srv.URL,
Token: "secret",
},
OutDir: dir,
ToolboxNativeBinary: toolboxBin,
})
Expand Down
35 changes: 10 additions & 25 deletions internal/config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,12 @@ var (
)

type ExportConfig struct {
AdminURL string
Token string
AuthConfig
OutDir string
IncludeApplications bool
RedactSecrets bool
PerPage int
MaxConcurrent int
InsecureTLS bool
ToolboxImage string
ToolboxRuntime string
ToolboxNativeBinary string
Expand All @@ -37,29 +35,18 @@ type ExportConfig struct {

func LoadExportFromEnv() (ExportConfig, error) {
cfg := ExportConfig{
AdminURL: strings.TrimSpace(os.Getenv("THREESCALE_ADMIN_URL")),
Token: strings.TrimSpace(os.Getenv("THREESCALE_ACCESS_TOKEN")),
OutDir: strings.TrimSpace(os.Getenv("THREESCALE_OUTPUT_DIR")),
PerPage: DefaultPerPage,
MaxConcurrent: DefaultMaxConcurrent,
ToolboxImage: strings.TrimSpace(os.Getenv("THREESCALE_TOOLBOX_IMAGE")),
ToolboxRuntime: strings.TrimSpace(os.Getenv("THREESCALE_TOOLBOX_RUNTIME")),
ToolboxNativeBinary: strings.TrimSpace(os.Getenv("THREESCALE_TOOLBOX_BINARY")),
ToolboxCertFile: strings.TrimSpace(os.Getenv("THREESCALE_TOOLBOX_TLS_CERT")),
AuthConfig: LoadAuthFromEnv(),
OutDir: strings.TrimSpace(os.Getenv("THREESCALE_OUTPUT_DIR")),
PerPage: DefaultPerPage,
MaxConcurrent: DefaultMaxConcurrent,
ToolboxImage: strings.TrimSpace(os.Getenv("THREESCALE_TOOLBOX_IMAGE")),
ToolboxRuntime: strings.TrimSpace(os.Getenv("THREESCALE_TOOLBOX_RUNTIME")),
ToolboxNativeBinary: strings.TrimSpace(os.Getenv("THREESCALE_TOOLBOX_BINARY")),
ToolboxCertFile: strings.TrimSpace(os.Getenv("THREESCALE_TOOLBOX_TLS_CERT")),
}
return cfg, cfg.ValidateAuth()
}

func (c ExportConfig) ValidateAuth() error {
if c.AdminURL == "" {
return ErrMissingAdminURL
}
if c.Token == "" {
return ErrMissingToken
}
return nil
}

func (c ExportConfig) ValidateOutput() error {
if err := c.ValidateAuth(); err != nil {
return err
Expand All @@ -71,14 +58,12 @@ func (c ExportConfig) ValidateOutput() error {
}

func BindExportFlags(fs *pflag.FlagSet, cfg *ExportConfig) {
fs.StringVar(&cfg.AdminURL, "admin-url", cfg.AdminURL, "3scale Admin Portal base URL")
fs.StringVar(&cfg.Token, "token", cfg.Token, "3scale Personal Access Token")
BindAuthFlags(fs, &cfg.AuthConfig)
fs.StringVar(&cfg.OutDir, "output", cfg.OutDir, "export output directory")
fs.BoolVar(&cfg.IncludeApplications, "include-applications", cfg.IncludeApplications, "export applications and linked accounts")
fs.BoolVar(&cfg.RedactSecrets, "redact-secrets", cfg.RedactSecrets, "mask API keys and OIDC secrets in output")
fs.IntVar(&cfg.PerPage, "per-page", cfg.PerPage, "Admin API page size (max 500)")
fs.IntVar(&cfg.MaxConcurrent, "concurrency", cfg.MaxConcurrent, "max concurrent Admin API requests")
fs.BoolVar(&cfg.InsecureTLS, "insecure", cfg.InsecureTLS, "skip TLS certificate verification")
fs.StringVar(&cfg.ToolboxImage, "toolbox-image", cfg.ToolboxImage, "3scale toolbox container image (Red Hat official)")
fs.StringVar(&cfg.ToolboxRuntime, "toolbox-runtime", cfg.ToolboxRuntime, "container runtime for toolbox (docker or podman; auto-detects if empty)")
fs.StringVar(&cfg.ToolboxNativeBinary, "toolbox-binary", cfg.ToolboxNativeBinary, "optional local 3scale binary instead of container")
Expand Down
10 changes: 6 additions & 4 deletions internal/config/config_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@ import (
)

func TestValidateAuthMissingURL(t *testing.T) {
cfg := ExportConfig{Token: "tok"}
cfg := ExportConfig{AuthConfig: AuthConfig{Token: "tok"}}
err := cfg.ValidateAuth()
if !errors.Is(err, ErrMissingAdminURL) {
t.Fatalf("err = %v", err)
}
}

func TestValidateAuthMissingToken(t *testing.T) {
cfg := ExportConfig{AdminURL: "https://tenant.example.com"}
cfg := ExportConfig{AuthConfig: AuthConfig{AdminURL: "https://tenant.example.com"}}
err := cfg.ValidateAuth()
if !errors.Is(err, ErrMissingToken) {
t.Fatalf("err = %v", err)
Expand All @@ -25,8 +25,10 @@ func TestValidateAuthMissingToken(t *testing.T) {

func TestValidateOutputRequiresDir(t *testing.T) {
cfg := ExportConfig{
AdminURL: "https://tenant.example.com",
Token: "tok",
AuthConfig: AuthConfig{
AdminURL: "https://tenant.example.com",
Token: "tok",
},
}
err := cfg.ValidateOutput()
if err == nil || err.Error() != "output directory is required: use --output" {
Expand Down
Loading