Rename functions

Emyrk · Emyrk · commit 84509a19de05 · 2023-11-06T07:40:56.000-06:00
diff --git a/coderd/externalauth/externalauth.go b/coderd/externalauth/externalauth.go
@@ -410,7 +410,7 @@ func ConvertConfig(entries []codersdk.ExternalAuthConfig, accessURL *url.URL) ([
 		// Applies defaults to the config entry.
 		// This allows users to very simply state that they type is "GitHub",
 		// apply their client secret and ID, and have the UI appear nicely.
-		configDefaults(&entry)
+		applyDefaultsToConfig(&entry)
 
 		valid := httpapi.NameValid(entry.ID)
 		if valid != nil {
@@ -494,27 +494,27 @@ func ConvertConfig(entries []codersdk.ExternalAuthConfig, accessURL *url.URL) ([
 }
 
 // applyDefaultsToConfig applies defaults to the config entry.
-func configDefaults(config *codersdk.ExternalAuthConfig) {
+func applyDefaultsToConfig(config *codersdk.ExternalAuthConfig) {
 	// If static defaults exist, apply them.
 	if defaults, ok := staticDefaults[codersdk.EnhancedExternalAuthProvider(config.Type)]; ok {
-		applyDefaultsToConfig(config, defaults)
+		copyDefaultSettings(config, defaults)
 		return
 	}
 
 	// Dynamic defaults
 	switch codersdk.EnhancedExternalAuthProvider(config.Type) {
 	case codersdk.EnhancedExternalAuthProviderBitBucketServer:
-		applyDefaultsToConfig(config, bitbucketServerDefaults(config))
+		copyDefaultSettings(config, bitbucketServerDefaults(config))
 		return
 	default:
 		// No defaults for this type. We still want to run this apply with
 		// an empty set of defaults.
-		applyDefaultsToConfig(config, codersdk.ExternalAuthConfig{})
+		copyDefaultSettings(config, codersdk.ExternalAuthConfig{})
 		return
 	}
 }
 
-func applyDefaultsToConfig(config *codersdk.ExternalAuthConfig, defaults codersdk.ExternalAuthConfig) {
+func copyDefaultSettings(config *codersdk.ExternalAuthConfig, defaults codersdk.ExternalAuthConfig) {
 	if config.AuthURL == "" {
 		config.AuthURL = defaults.AuthURL
 	}
diff --git a/coderd/externalauth/externalauth_internal_test.go b/coderd/externalauth/externalauth_internal_test.go
@@ -55,7 +55,7 @@ func Test_bitbucketServerConfigDefaults(t *testing.T) {
 		tt := tt
 		t.Run(tt.name, func(t *testing.T) {
 			t.Parallel()
-			configDefaults(tt.config)
+			applyDefaultsToConfig(tt.config)
 			require.Equal(t, tt.expected, *tt.config)
 		})
 	}

Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ func Test_bitbucketServerConfigDefaults(t *testing.T) {`
`55`	`55`	`tt := tt`
`56`	`56`	`t.Run(tt.name, func(t *testing.T) {`
`57`	`57`	`t.Parallel()`
`58`		`- configDefaults(tt.config)`
	`58`	`+ applyDefaultsToConfig(tt.config)`
`59`	`59`	`require.Equal(t, tt.expected, *tt.config)`
`60`	`60`	`})`
`61`	`61`	`}`