fixup main tests

Author: peterguy

cmd/src/main.go

@@ -137,6 +137,15 @@ type config struct {
 	endpointURL       *url.URL
 }
 
+// configFromFile holds the config as read from the config file,
+// which is validated and parsed into the config struct
+type configFromFile struct {
+	Endpoint          string            `json:"endpoint"`
+	AccessToken       string            `json:"accessToken"`
+	AdditionalHeaders map[string]string `json:"additionalHeaders"`
+	Proxy             string            `json:"proxy"`
+}
+
 // apiClient returns an api.Client built from the configuration.
 func (c *config) apiClient(flags *api.Flags, out io.Writer) api.Client {
 	return api.NewClient(api.ClientOpts{
@@ -168,24 +177,20 @@ func readConfig() (*config, error) {
 	if err != nil && (!os.IsNotExist(err) || userSpecified) {
 		return nil, err
 	}
-	var configFromFile struct {
-		Endpoint          string            `json:"endpoint"`
-		AccessToken       string            `json:"accessToken"`
-		AdditionalHeaders map[string]string `json:"additionalHeaders"`
-		Proxy             string            `json:"proxy"`
-	}
+
+	var cfgFromFile configFromFile
 	var cfg config
 	var endpointStr string
 	var proxyStr string
 	if err == nil {
 		cfg.configFilePath = cfgPath
-		if err := json.Unmarshal(data, &configFromFile); err != nil {
+		if err := json.Unmarshal(data, &cfgFromFile); err != nil {
 			return nil, err
 		}
-		endpointStr = configFromFile.Endpoint
-		cfg.accessToken = configFromFile.AccessToken
-		cfg.additionalHeaders = configFromFile.AdditionalHeaders
-		proxyStr = configFromFile.Proxy
+		endpointStr = cfgFromFile.Endpoint
+		cfg.accessToken = cfgFromFile.AccessToken
+		cfg.additionalHeaders = cfgFromFile.AdditionalHeaders
+		proxyStr = cfgFromFile.Proxy
 	}
 
 	envToken := os.Getenv("SRC_ACCESS_TOKEN")

cmd/src/main_test.go

@@ -30,7 +30,7 @@ func TestReadConfig(t *testing.T) {
 
 	tests := []struct {
 		name         string
-		fileContents map[string]any
+		fileContents *configFromFile
 		envToken     string
 		envFooHeader string
 		envHeaders   string
@@ -52,10 +52,10 @@ func TestReadConfig(t *testing.T) {
 		},
 		{
 			name: "config file, no overrides, trim slash",
-			fileContents: map[string]any{
-				"endpoint":    "https://example.com/",
-				"accessToken": "deadbeef",
-				"proxy":       "https://proxy.com:8080",
+			fileContents: &configFromFile{
+				Endpoint:    "https://example.com/",
+				AccessToken: "deadbeef",
+				Proxy:       "https://proxy.com:8080",
 			},
 			want: &config{
 				endpointURL: &url.URL{
@@ -73,30 +73,30 @@ func TestReadConfig(t *testing.T) {
 		},
 		{
 			name: "config file, token override only",
-			fileContents: map[string]any{
-				"endpoint":    "https://example.com/",
-				"accessToken": "deadbeef",
+			fileContents: &configFromFile{
+				Endpoint:    "https://example.com/",
+				AccessToken: "deadbeef",
 			},
 			envToken: "abc",
 			want:     nil,
 			wantErr:  errConfigMerge.Error(),
 		},
 		{
 			name: "config file, endpoint override only",
-			fileContents: map[string]any{
-				"endpoint":    "https://example.com/",
-				"accessToken": "deadbeef",
+			fileContents: &configFromFile{
+				Endpoint:    "https://example.com/",
+				AccessToken: "deadbeef",
 			},
 			envEndpoint: "https://exmaple2.com",
 			want:        nil,
 			wantErr:     errConfigMerge.Error(),
 		},
 		{
 			name: "config file, proxy override only (allow)",
-			fileContents: map[string]any{
-				"endpoint":    "https://example.com/",
-				"accessToken": "deadbeef",
-				"proxy":       "https://proxy.com:8080",
+			fileContents: &configFromFile{
+				Endpoint:    "https://example.com/",
+				AccessToken: "deadbeef",
+				Proxy:       "https://proxy.com:8080",
 			},
 			envProxy: "socks5://other.proxy.com:9999",
 			want: &config{
@@ -115,10 +115,10 @@ func TestReadConfig(t *testing.T) {
 		},
 		{
 			name: "config file, all override",
-			fileContents: map[string]any{
-				"endpoint":    "https://example.com/",
-				"accessToken": "deadbeef",
-				"proxy":       "https://proxy.com:8080",
+			fileContents: &configFromFile{
+				Endpoint:    "https://example.com/",
+				AccessToken: "deadbeef",
+				Proxy:       "https://proxy.com:8080",
 			},
 			envToken:    "abc",
 			envEndpoint: "https://override.com",
@@ -258,10 +258,10 @@ func TestReadConfig(t *testing.T) {
 		{
 			name:         "endpoint flag should override config",
 			flagEndpoint: "https://override.com/",
-			fileContents: map[string]any{
-				"endpoint":          "https://example.com/",
-				"accessToken":       "deadbeef",
-				"additionalHeaders": map[string]string{},
+			fileContents: &configFromFile{
+				Endpoint:          "https://example.com/",
+				AccessToken:       "deadbeef",
+				AdditionalHeaders: map[string]string{},
 			},
 			want: &config{
 				endpointURL: &url.URL{