chore: stylecheck (#918)

Author: FoseFx

.golangci.yaml

@@ -8,11 +8,9 @@ linters:
     - depguard # no need
     - ireturn # no need
     - funlen # we tend to have long funlens, who cares?
-    - execinquery # deprecated
     - goimports # unused
     - gochecknoglobals # we currently make use of globals
     - godot # petty linter
-    - gomnd # deprecated
     - gomoddirectives # not needed
     - gofumpt # false positives
     - mnd # too many false-positives
@@ -38,7 +36,6 @@ linters:
     - paralleltest # TODO
     - protogetter # TODO
     - revive # TODO
-    - stylecheck # TODO
     - testpackage # TODO
 
 linters-settings:

libs/common/auth/auth.go

@@ -19,9 +19,8 @@ import (
 // to avoid ambiguity please read: https://wiki.helpwave.de/doc/keycloak-jedzCcERwF
 
 var (
-	DEFAULT_OAUTH_ISSUER_URL = "https://accounts.helpwave.de/realms/helpwave"
-
-	DEFAULT_OAUTH_CLIENT_ID = "helpwave-services"
+	DefaultOAuthIssuerURL   = "https://accounts.helpwave.de/realms/helpwave"
+	DefaultOAuthClientID    = "helpwave-services"
 	onlyFakeAuthEnabled     bool
 	insecureFakeTokenEnable = false
 	oauthConfig             *oauth2.Config
@@ -40,22 +39,22 @@ type (
 	organizationIDKey struct{}
 )
 
-func GetOAuthIssuerUrl() string {
-	issuerUrl := hwutil.GetEnvOr("OAUTH_ISSUER_URL", DEFAULT_OAUTH_ISSUER_URL)
-	if issuerUrl != DEFAULT_OAUTH_ISSUER_URL {
+func GetOAuthIssuerURL() string {
+	issuerURL := hwutil.GetEnvOr("OAUTH_ISSUER_URL", DefaultOAuthIssuerURL)
+	if issuerURL != DefaultOAuthIssuerURL {
 		zlog.Warn().
-			Str("OAUTH_ISSUER_URL", issuerUrl).
+			Str("OAUTH_ISSUER_URL", issuerURL).
 			Msg("using custom OAuth issuer url")
 	}
-	return issuerUrl
+	return issuerURL
 }
 
-func GetOAuthClientId() string {
-	clientId := hwutil.GetEnvOr("OAUTH_CLIENT_ID", DEFAULT_OAUTH_CLIENT_ID)
-	if clientId != DEFAULT_OAUTH_CLIENT_ID {
-		zlog.Warn().Str("OAUTH_CLIENT_ID", clientId).Msg("using custom OAuth client id")
+func GetOAuthClientID() string {
+	clientID := hwutil.GetEnvOr("OAUTH_CLIENT_ID", DefaultOAuthClientID)
+	if clientID != DefaultOAuthClientID {
+		zlog.Warn().Str("OAUTH_CLIENT_ID", clientID).Msg("using custom OAuth client id")
 	}
-	return clientId
+	return clientID
 }
 
 func IsOnlyFakeAuthEnabled() bool {
@@ -109,7 +108,7 @@ type IDTokenClaims struct {
 }
 
 type OrganizationTokenClaim struct {
-	Id   string `json:"id" validate:"required,uuid"`
+	ID   string `json:"id" validate:"required,uuid"`
 	Name string `json:"name" validate:"required"`
 }
 
@@ -156,7 +155,7 @@ func VerifyFakeToken(ctx context.Context, token string) (*IDTokenClaims, *time.T
 	}
 
 	claims := IDTokenClaims{}
-	if err := hwutil.ParseValidJson(plainToken, &claims); err != nil {
+	if err := hwutil.ParseValidJSON(plainToken, &claims); err != nil {
 		return nil, nil, fmt.Errorf("VerifyFakeToken: cant parse json: %w", err)
 	}
 
@@ -267,13 +266,13 @@ func SetupAuth(ctx context.Context, fakeOnly bool, passedInsecureFakeTokenEnable
 
 	insecureFakeTokenEnable = passedInsecureFakeTokenEnable
 
-	provider, err := oidc.NewProvider(context.Background(), GetOAuthIssuerUrl())
+	provider, err := oidc.NewProvider(context.Background(), GetOAuthIssuerURL())
 	if err != nil {
 		log.Fatal().Err(err).Send()
 	}
 
 	oauthConfig = &oauth2.Config{
-		ClientID: GetOAuthClientId(),
+		ClientID: GetOAuthClientID(),
 		Endpoint: provider.Endpoint(),
 	}
 

libs/common/auth/auth_test.go

@@ -20,7 +20,7 @@ func TestIDTokenClaims_AsExpected(t *testing.T) {
 				Name:              "Test User",
 				PreferredUsername: "testuser",
 				Organization: &OrganizationTokenClaim{
-					Id:   "6759b6d7-a864-800c-a2e9-a780a83ec767",
+					ID:   "6759b6d7-a864-800c-a2e9-a780a83ec767",
 					Name: "Example Org",
 				},
 			},
@@ -33,7 +33,7 @@ func TestIDTokenClaims_AsExpected(t *testing.T) {
 				Name:              "Test User",
 				PreferredUsername: "testuser",
 				Organization: &OrganizationTokenClaim{
-					Id:   "6759b6d7-a864-800c-a2e9-a780a83ec767",
+					ID:   "6759b6d7-a864-800c-a2e9-a780a83ec767",
 					Name: "Example Org",
 				},
 			},
@@ -47,7 +47,7 @@ func TestIDTokenClaims_AsExpected(t *testing.T) {
 				Name:              "Test User",
 				PreferredUsername: "testuser",
 				Organization: &OrganizationTokenClaim{
-					Id:   "6759b6d7-a864-800c-a2e9-a780a83ec767",
+					ID:   "6759b6d7-a864-800c-a2e9-a780a83ec767",
 					Name: "Example Org",
 				},
 			},
@@ -71,7 +71,7 @@ func TestIDTokenClaims_AsExpected(t *testing.T) {
 				Name:              "Test User",
 				PreferredUsername: "testuser",
 				Organization: &OrganizationTokenClaim{
-					Id:   "asdasd",
+					ID:   "asdasd",
 					Name: "Example Org",
 				},
 			},
@@ -85,7 +85,7 @@ func TestIDTokenClaims_AsExpected(t *testing.T) {
 				Name:              "Test User",
 				PreferredUsername: "testuser",
 				Organization: &OrganizationTokenClaim{
-					Id:   "",
+					ID:   "",
 					Name: "",
 				},
 			},

libs/common/dapr.go

@@ -63,7 +63,7 @@ func MustNewDaprGRPCClient() *daprc.GRPCClient {
 }
 
 // PrepCtxForSvcToSvcCall returns a context that can be used with Dapr specific service to service gRPC calls
-func PrepCtxForSvcToSvcCall(ctx context.Context, targetDaprAppId string) (context.Context, context.CancelFunc, error) {
+func PrepCtxForSvcToSvcCall(ctx context.Context, targetDaprAppID string) (context.Context, context.CancelFunc, error) {
 	md, ok := metadata.FromIncomingContext(ctx)
 	if !ok {
 		return nil, nil, status.Errorf(codes.Internal, "No incoming metadata in context")
@@ -72,7 +72,7 @@ func PrepCtxForSvcToSvcCall(ctx context.Context, targetDaprAppId string) (contex
 
 	timeout := time.Second * 3
 	ctx, cancel := context.WithTimeout(outgoingCtx, timeout)
-	ctx = metadata.AppendToOutgoingContext(ctx, "dapr-app-id", targetDaprAppId)
+	ctx = metadata.AppendToOutgoingContext(ctx, "dapr-app-id", targetDaprAppID)
 
 	return ctx, cancel, nil
 }

libs/common/hwgrpc/organization_interceptor.go

@@ -49,7 +49,7 @@ func StreamOrganizationInterceptor(
 	return next(req, stream)
 }
 
-var ErrOrganizationIdMissing = errors.New("organization.id missing in id token")
+var ErrOrganizationIDMissing = errors.New("organization.id missing in id token")
 
 // organizationInterceptor parses and injects the organization id of the OIDC claims into the current context
 // This is a separate function to allow endpoints to not fail when an organization id is not provided
@@ -62,12 +62,12 @@ func organizationInterceptor(ctx context.Context) (context.Context, error) {
 		return nil, err
 	}
 
-	if len(claims.Organization.Id) == 0 {
-		return nil, ErrOrganizationIdMissing
+	if len(claims.Organization.ID) == 0 {
+		return nil, ErrOrganizationIDMissing
 	}
 
 	// parse organizationID
-	organizationID, err := uuid.Parse(claims.Organization.Id)
+	organizationID, err := uuid.Parse(claims.Organization.ID)
 	if err != nil {
 		return nil, status.Errorf(codes.Internal, "invalid organizationID")
 	}

libs/common/test/grpc.go

@@ -78,19 +78,19 @@ func AuthenticatedUserClaim(userID string) map[string]interface{} {
 // AuthenticatedUserMetadata gives you a ready-to use grpc metadata object
 func AuthenticatedUserMetadata(userID string) metadata.MD {
 	claims := AuthenticatedUserClaim(userID)
-	claimsJson, err := json.Marshal(claims)
+	claimsJSON, err := json.Marshal(claims)
 	if err != nil {
 		log.Fatal(err)
 	}
-	fakeToken := base64.StdEncoding.EncodeToString(claimsJson)
+	fakeToken := base64.StdEncoding.EncodeToString(claimsJSON)
 
 	return metadata.New(map[string]string{
 		"Authorization": "Bearer " + fakeToken,
 	})
 }
 
-func AuthenticatedUserContext(ctx context.Context, userId string) context.Context {
-	md := AuthenticatedUserMetadata(userId)
+func AuthenticatedUserContext(ctx context.Context, userID string) context.Context {
+	md := AuthenticatedUserMetadata(userID)
 	if existing, existed := metadata.FromOutgoingContext(ctx); existed {
 		md = metadata.Join(md, existing)
 	}

libs/decaying_lru/README.md libs/decaying-lru/README.mdlibs/decaying_lru/README.md renamed to libs/decaying-lru/README.md

@@ -1,4 +1,4 @@
-# decaying_lru
+# decayinglru
 
 A module, which allows a service to leverage a redis-powered [LRU](https://en.wikipedia.org/wiki/Least_Recently_Used) which decays.
 Such a data structure is, for example, needed for `recently-used` tracking.

libs/decaying_lru/add.lua libs/decaying-lru/add.lualibs/decaying_lru/add.lua renamed to libs/decaying-lru/add.lua

@@ -6,7 +6,7 @@ import (
 	"fmt"
 	"time"
 
-	"decaying_lru"
+	"decayinglru"
 )
 
 func must(err error) {
@@ -22,7 +22,7 @@ const (
 
 func main() {
 	ctx := context.Background()
-	lru := decaying_lru.Setup(ctx, "example", size, time.Second, inverseP)
+	lru := decayinglru.Setup(ctx, "example", size, time.Second, inverseP)
 
 	must(lru.AddItemForUser(ctx, "test", "1", "abc"))
 	must(lru.AddItemForUser(ctx, "test", "1", "def"))

libs/decaying_lru/cmd/example/main.go libs/decaying-lru/cmd/example/main.golibs/decaying_lru/cmd/example/main.go renamed to libs/decaying-lru/cmd/example/main.go

@@ -1,4 +1,4 @@
-module decaying_lru
+module decayinglru
 
 go 1.23