feat: config system — TOML load/save with provider auth map

cmd/ry/main.go

@@ -0,0 +1,15 @@
+package main
+
+import (
+	"fmt"
+	"os"
+
+	"git.yoresee.cc/nightstar/ry/internal/cmd"
+)
+
+func main() {
+	if err := cmd.Execute(); err != nil {
+		fmt.Fprintln(os.Stderr, err)
+		os.Exit(1)
+	}
+}

go.mod

@@ -0,0 +1,13 @@
+module git.yoresee.cc/nightstar/ry
+
+go 1.18
+
+require (
+	github.com/BurntSushi/toml v1.6.0
+	github.com/spf13/cobra v1.10.2
+)
+
+require (
+	github.com/inconshreveable/mousetrap v1.1.0 // indirect
+	github.com/spf13/pflag v1.0.9 // indirect
+)

go.sum

@@ -0,0 +1,12 @@
+github.com/BurntSushi/toml v1.6.0 h1:dRaEfpa2VI55EwlIW72hMRHdWouJeRF7TPYhI+AUQjk=
+github.com/BurntSushi/toml v1.6.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho=
+github.com/cpuguy83/go-md2man/v2 v2.0.6/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6NIQQ7OS05n1F4g=
+github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
+github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
+github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
+github.com/spf13/cobra v1.10.2 h1:DMTTonx5m65Ic0GOoRY2c16WCbHxOOw6xxezuLaBpcU=
+github.com/spf13/cobra v1.10.2/go.mod h1:7C1pvHqHw5A4vrJfjNwvOdzYu0Gml16OCs2GRiTUUS4=
+github.com/spf13/pflag v1.0.9 h1:9exaQaMOCwffKiiiYk6/BndUBv+iRViNW+4lEMi0PvY=
+github.com/spf13/pflag v1.0.9/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
+go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=

internal/cmd/root.go

@@ -0,0 +1,14 @@
+package cmd
+
+import (
+	"github.com/spf13/cobra"
+)
+
+var rootCmd = &cobra.Command{
+	Use:   "ry",
+	Short: "Multi-cloud CLI, like gh for cloud providers",
+}
+
+func Execute() error {
+	return rootCmd.Execute()
+}

internal/config/config.go

@@ -0,0 +1,67 @@
+package config
+
+import (
+	"os"
+	"path/filepath"
+
+	"github.com/BurntSushi/toml"
+)
+
+type ProviderConfig struct {
+	APIKey          string `toml:"api_key,omitempty"`
+	AccessKeyID     string `toml:"access_key_id,omitempty"`
+	AccessKeySecret string `toml:"access_key_secret,omitempty"`
+	Endpoint        string `toml:"endpoint,omitempty"`
+}
+
+type Config struct {
+	CurrentProvider string                    `toml:"current_provider"`
+	Output          string                    `toml:"output"`
+	Providers       map[string]ProviderConfig `toml:"providers"`
+}
+
+func Load(path string) (*Config, error) {
+	cfg := &Config{
+		Output:    "table",
+		Providers: make(map[string]ProviderConfig),
+	}
+	data, err := os.ReadFile(path)
+	if err != nil {
+		if os.IsNotExist(err) {
+			return cfg, nil
+		}
+		return nil, err
+	}
+	if err := toml.Unmarshal(data, cfg); err != nil {
+		return nil, err
+	}
+	if cfg.Providers == nil {
+		cfg.Providers = make(map[string]ProviderConfig)
+	}
+	if cfg.Output == "" {
+		cfg.Output = "table"
+	}
+	return cfg, nil
+}
+
+func Save(path string, cfg *Config) error {
+	dir := filepath.Dir(path)
+	if err := os.MkdirAll(dir, 0700); err != nil {
+		return err
+	}
+	f, err := os.Create(path)
+	if err != nil {
+		return err
+	}
+	defer f.Close()
+	enc := toml.NewEncoder(f)
+	return enc.Encode(cfg)
+}
+
+func DefaultPath() string {
+	home, err := os.UserHomeDir()
+	if err != nil {
+		return "config.toml"
+	}
+	return filepath.Join(home, ".config", "ry", "config.toml")
+}

internal/config/config_test.go

@@ -0,0 +1,96 @@
+package config
+
+import (
+	"os"
+	"path/filepath"
+	"testing"
+)
+
+func TestLoadTOML(t *testing.T) {
+	dir := t.TempDir()
+	path := filepath.Join(dir, "config.toml")
+	content := `
+current_provider = "rainyun"
+output = "table"
+
+[providers.rainyun]
+api_key = "sk-test123"
+
+[providers.aliyun]
+access_key_id = "ak-xxx"
+access_key_secret = "sk-xxx"
+`
+	if err := os.WriteFile(path, []byte(content), 0600); err != nil {
+		t.Fatal(err)
+	}
+
+	cfg, err := Load(path)
+	if err != nil {
+		t.Fatalf("Load() error: %v", err)
+	}
+	if cfg.CurrentProvider != "rainyun" {
+		t.Errorf("CurrentProvider = %q, want %q", cfg.CurrentProvider, "rainyun")
+	}
+	if cfg.Output != "table" {
+		t.Errorf("Output = %q, want %q", cfg.Output, "table")
+	}
+	if cfg.Providers["rainyun"].APIKey != "sk-test123" {
+		t.Errorf("rainyun api_key = %q, want %q", cfg.Providers["rainyun"].APIKey, "sk-test123")
+	}
+	if cfg.Providers["aliyun"].AccessKeyID != "ak-xxx" {
+		t.Errorf("aliyun access_key_id = %q, want %q", cfg.Providers["aliyun"].AccessKeyID, "ak-xxx")
+	}
+}
+
+func TestLoadDefaults(t *testing.T) {
+	dir := t.TempDir()
+	path := filepath.Join(dir, "empty.toml")
+	if err := os.WriteFile(path, []byte(""), 0600); err != nil {
+		t.Fatal(err)
+	}
+	cfg, err := Load(path)
+	if err != nil {
+		t.Fatalf("Load() error: %v", err)
+	}
+	if cfg.Output != "table" {
+		t.Errorf("default Output = %q, want %q", cfg.Output, "table")
+	}
+}
+
+func TestSave(t *testing.T) {
+	dir := t.TempDir()
+	path := filepath.Join(dir, "out.toml")
+	cfg := &Config{
+		CurrentProvider: "test",
+		Output:          "json",
+		Providers: map[string]ProviderConfig{
+			"test": {APIKey: "secret"},
+		},
+	}
+	if err := Save(path, cfg); err != nil {
+		t.Fatalf("Save() error: %v", err)
+	}
+	loaded, err := Load(path)
+	if err != nil {
+		t.Fatalf("re-Load() error: %v", err)
+	}
+	if loaded.CurrentProvider != "test" {
+		t.Errorf("roundtrip CurrentProvider = %q", loaded.CurrentProvider)
+	}
+}
+
+func TestDefaultPath(t *testing.T) {
+	path := DefaultPath()
+	if path == "" {
+		t.Error("DefaultPath() returned empty")
+	}
+}
+
+func TestEnsureDir(t *testing.T) {
+	dir := filepath.Join(t.TempDir(), "sub", "dir")
+	path := filepath.Join(dir, "config.toml")
+	cfg := &Config{Output: "table"}
+	if err := Save(path, cfg); err != nil {
+		t.Fatalf("Save() to deep dir error: %v", err)
+	}
+}