linting errors

Emyrk · Emyrk · commit 549e4fb7b19e · 2024-09-04T09:18:54.000-05:00
diff --git a/coderd/runtimeconfig/config_test.go b/coderd/runtimeconfig/config_test.go
@@ -16,6 +16,8 @@ import (
 )
 
 func TestUsage(t *testing.T) {
+	t.Parallel()
+
 	t.Run("deployment value without runtimeconfig", func(t *testing.T) {
 		t.Parallel()
 
@@ -186,7 +188,9 @@ func TestConfig(t *testing.T) {
 }
 
 func TestScoped(t *testing.T) {
-	orgId := uuid.New()
+	t.Parallel()
+
+	orgID := uuid.New()
 
 	ctx := testutil.Context(t, testutil.WaitShort)
 
@@ -209,7 +213,7 @@ func TestScoped(t *testing.T) {
 	require.Equal(t, host, val.Host)
 	require.Equal(t, port, val.Port)
 
-	orgMgr := mgr.Scoped(orgId.String())
+	orgMgr := mgr.Scoped(orgID.String())
 	// Using the org scope, nothing will be returned.
 	_, err = field.Resolve(ctx, orgMgr)
 	require.ErrorIs(t, err, runtimeconfig.EntryNotFound)
diff --git a/coderd/runtimeconfig/manager.go b/coderd/runtimeconfig/manager.go
@@ -17,15 +17,15 @@ func NewNoopManager() *NoopManager {
 	return &NoopManager{}
 }
 
-func (n NoopManager) GetRuntimeSetting(context.Context, string) (string, error) {
+func (NoopManager) GetRuntimeSetting(context.Context, string) (string, error) {
 	return "", EntryNotFound
 }
 
-func (n NoopManager) UpsertRuntimeSetting(context.Context, string, string) error {
+func (NoopManager) UpsertRuntimeSetting(context.Context, string, string) error {
 	return EntryNotFound
 }
 
-func (n NoopManager) DeleteRuntimeSetting(context.Context, string) error {
+func (NoopManager) DeleteRuntimeSetting(context.Context, string) error {
 	return EntryNotFound
 }
 
@@ -62,7 +62,7 @@ func (m StoreManager) GetRuntimeSetting(ctx context.Context, key string) (string
 func (m StoreManager) UpsertRuntimeSetting(ctx context.Context, key, val string) error {
 	err := m.Store.UpsertRuntimeConfig(ctx, database.UpsertRuntimeConfigParams{Key: m.namespacedKey(key), Value: val})
 	if err != nil {
-		return xerrors.Errorf("update %q: %w", err)
+		return xerrors.Errorf("update %q: %w", key, err)
 	}
 	return nil
 }
diff --git a/coderd/runtimeconfig/util.go b/coderd/runtimeconfig/util.go
@@ -1,17 +1,11 @@
 package runtimeconfig
 
 import (
-	"fmt"
 	"reflect"
-
-	"github.com/google/uuid"
 )
 
 func create[T any]() T {
 	var zero T
+	//nolint:forcetypeassert
 	return reflect.New(reflect.TypeOf(zero).Elem()).Interface().(T)
 }
-
-func orgKey(orgID uuid.UUID, key string) string {
-	return fmt.Sprintf("%s:%s", orgID.String(), key)
-}

Original file line number	Diff line number	Diff line change
`@@ -17,15 +17,15 @@ func NewNoopManager() *NoopManager {`
`17`	`17`	`return &NoopManager{}`
`18`	`18`	`}`
`19`	`19`
`20`		`-func (n NoopManager) GetRuntimeSetting(context.Context, string) (string, error) {`
	`20`	`+func (NoopManager) GetRuntimeSetting(context.Context, string) (string, error) {`
`21`	`21`	`return "", EntryNotFound`
`22`	`22`	`}`
`23`	`23`
`24`		`-func (n NoopManager) UpsertRuntimeSetting(context.Context, string, string) error {`
	`24`	`+func (NoopManager) UpsertRuntimeSetting(context.Context, string, string) error {`
`25`	`25`	`return EntryNotFound`
`26`	`26`	`}`
`27`	`27`
`28`		`-func (n NoopManager) DeleteRuntimeSetting(context.Context, string) error {`
	`28`	`+func (NoopManager) DeleteRuntimeSetting(context.Context, string) error {`
`29`	`29`	`return EntryNotFound`
`30`	`30`	`}`
`31`	`31`
`@@ -62,7 +62,7 @@ func (m StoreManager) GetRuntimeSetting(ctx context.Context, key string) (string`
`62`	`62`	`func (m StoreManager) UpsertRuntimeSetting(ctx context.Context, key, val string) error {`
`63`	`63`	`err := m.Store.UpsertRuntimeConfig(ctx, database.UpsertRuntimeConfigParams{Key: m.namespacedKey(key), Value: val})`
`64`	`64`	`if err != nil {`
`65`		`- return xerrors.Errorf("update %q: %w", err)`
	`65`	`+ return xerrors.Errorf("update %q: %w", key, err)`
`66`	`66`	`}`
`67`	`67`	`return nil`
`68`	`68`	`}`