Revert CI to use apk for Alpine runner

The CI runner uses Alpine Linux, so we need to use apk instead of apt-get

.github/workflows/ci.yml

@@ -43,20 +43,9 @@ jobs:
       - name: Generate code
         run: |
           make generate-proto
-          echo "Checking for Ent schema directory..."
+          if [ -d "ent" ] && [ -f "ent/generate.go" ]; then
-          if [ -d "ent/schema" ]; then
-            echo "Generating Ent code..."
             go install entgo.io/ent/cmd/ent@latest
-            cd ent/schema && go run -mod=mod entgo.io/ent/cmd/ent generate .
+            cd ent && go generate ./...
-            echo "Copying Ent code to internal/ent..."
-            cd .. && mkdir -p ../internal/ent
-            cp -r *.go */ ../internal/ent/ 2>/dev/null || true
-            rm -f ../internal/ent/generate.go
-            rm -rf ../internal/ent/schema
-            echo "Verifying internal/ent/ent.go exists..."
-            ls -la ../internal/ent/ent.go || echo "ERROR: ent.go not found!"
-          else
-            echo "WARNING: ent/schema directory not found!"
           fi
 
       - name: Check for test files
@@ -115,27 +104,15 @@ jobs:
       - name: Generate code
         run: |
           make generate-proto
-          echo "Checking for Ent schema directory..."
+          if [ -d "ent" ] && [ -f "ent/generate.go" ]; then
-          if [ -d "ent/schema" ]; then
-            echo "Generating Ent code..."
             go install entgo.io/ent/cmd/ent@latest
-            cd ent/schema && go run -mod=mod entgo.io/ent/cmd/ent generate .
+            cd ent && go generate ./...
-            echo "Copying Ent code to internal/ent..."
-            cd .. && mkdir -p ../internal/ent
-            cp -r *.go */ ../internal/ent/ 2>/dev/null || true
-            rm -f ../internal/ent/generate.go
-            rm -rf ../internal/ent/schema
-            echo "Verifying internal/ent/ent.go exists..."
-            ls -la ../internal/ent/ent.go || echo "ERROR: ent.go not found!"
-          else
-            echo "WARNING: ent/schema directory not found!"
           fi
 
       - name: Install golangci-lint
         run: |
-          curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin
+          go install github.com/golangci/golangci-lint/cmd/golangci-lint@latest
-          echo "$(go env GOPATH)/bin" >> $GITHUB_PATH
+          echo "$HOME/go/bin" >> $GITHUB_PATH
-          golangci-lint --version
 
       - name: Run linters
         run: make lint
@@ -173,20 +150,9 @@ jobs:
       - name: Generate code
         run: |
           make generate-proto
-          echo "Checking for Ent schema directory..."
+          if [ -d "ent" ] && [ -f "ent/generate.go" ]; then
-          if [ -d "ent/schema" ]; then
-            echo "Generating Ent code..."
             go install entgo.io/ent/cmd/ent@latest
-            cd ent/schema && go run -mod=mod entgo.io/ent/cmd/ent generate .
+            cd ent && go generate ./...
-            echo "Copying Ent code to internal/ent..."
-            cd .. && mkdir -p ../internal/ent
-            cp -r *.go */ ../internal/ent/ 2>/dev/null || true
-            rm -f ../internal/ent/generate.go
-            rm -rf ../internal/ent/schema
-            echo "Verifying internal/ent/ent.go exists..."
-            ls -la ../internal/ent/ent.go || echo "ERROR: ent.go not found!"
-          else
-            echo "WARNING: ent/schema directory not found!"
           fi
 
       - name: Build

.gitignore

@@ -69,9 +69,7 @@ Thumbs.db
 # Generated protobuf files
 api/proto/generated/
 
-# Generated Ent ORM files (but keep schema source files)
+# Generated Ent ORM files
 internal/ent/
-ent/*.go
+ent/
-ent/*/
-!ent/schema/
 git.dcentral.systems/

AGENTS.md

@@ -197,14 +197,10 @@ When working on this project, follow this workflow:
 
 ### 7. Commit Changes
 - **ALWAYS commit** after successful implementation
-- Verify that everything is in order before commit:
+- Ensure the code builds (`go build`)
-  - there is a Gitea Runner image in ci/pre-commit
+- Ensure all tests pass (`go test`)
-    - run scripts/pre-commit-check.sh
+- Ensure there are no linter issues (`make lint`)
-      - Ensure the code builds (`make build`)
+- Ensure there are no fmt issues (`make fmt-check`)
-      - Ensure all tests pass (`make test`)
-      - Ensure there are no linter issues (`make lint`)
-      - Ensure there are no fmt issues (`make fmt-check`)
-    - If there are issues, fix them before comitting
 - Verify all acceptance criteria are met
 - Write a clear, descriptive commit message
 

ci/pre-commit/Dockerfile

@@ -1,40 +0,0 @@
-FROM alpine:latest
-
-# Install system dependencies
-RUN apk add --no-cache \
-    nodejs \
-    npm \
-    gcc \
-    build-base \
-    musl-dev \
-    curl \
-    make \
-    wget \
-    tar \
-    bash \
-    git \
-    protobuf \
-    protobuf-dev
-
-# Install Go 1.25.3
-RUN cd /tmp && \
-    wget -q https://go.dev/dl/go1.25.3.linux-amd64.tar.gz && \
-    tar -C /usr/local -xzf go1.25.3.linux-amd64.tar.gz && \
-    rm go1.25.3.linux-amd64.tar.gz
-
-# Set up Go environment
-ENV PATH=/usr/local/go/bin:$PATH:/root/go/bin
-ENV GOROOT=/usr/local/go
-ENV GOPATH=/root/go
-ENV CGO_ENABLED=1
-ENV GOFLAGS=-buildvcs=false
-
-# Install Go protobuf plugins
-RUN go install google.golang.org/protobuf/cmd/protoc-gen-go@latest && \
-    go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@latest
-
-# Install golangci-lint
-RUN curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b /root/go/bin
-
-# Set working directory
-WORKDIR /workspace

cmd/audit-service/audit_service_fx.go

@@ -5,7 +5,6 @@ package main
 import (
 	"context"
 	"fmt"
-	"math"
 	"net"
 	"time"
 
@@ -276,16 +275,9 @@ func (s *auditServerImpl) Query(ctx context.Context, req *auditv1.QueryRequest)
 		})
 	}
 
-	total := len(protoEntries)
-	var totalInt32 int32
-	if total > math.MaxInt32 {
-		totalInt32 = math.MaxInt32
-	} else {
-		totalInt32 = int32(total)
-	}
 	return &auditv1.QueryResponse{
 		Entries: protoEntries,
-		Total:   totalInt32,
+		Total:   int32(len(protoEntries)),
 	}, nil
 }
 

cmd/identity-service/identity_service_fx.go

@@ -8,7 +8,6 @@ import (
 	"crypto/subtle"
 	"encoding/base64"
 	"fmt"
-	"math"
 	"net"
 	"strings"
 	"time"
@@ -73,17 +72,7 @@ func verifyPassword(password, hash string) (bool, error) {
 	if err != nil {
 		return false, err
 	}
-	hashLen := len(expectedHash)
+	actualHash := argon2.IDKey([]byte(password), salt, 3, 64*1024, 4, uint32(len(expectedHash)))
-	if hashLen < 0 || hashLen > math.MaxUint32 {
-		return false, fmt.Errorf("invalid hash length: %d", hashLen)
-	}
-	var hashLenUint32 uint32
-	if hashLen > math.MaxUint32 {
-		hashLenUint32 = math.MaxUint32
-	} else {
-		hashLenUint32 = uint32(hashLen)
-	}
-	actualHash := argon2.IDKey([]byte(password), salt, 3, 64*1024, 4, hashLenUint32)
 	return subtle.ConstantTimeCompare(expectedHash, actualHash) == 1, nil
 }
 

ent/schema/audit_log.go

@@ -1,59 +0,0 @@
-// Package schema defines the Ent schema for domain entities.
-package schema
-
-import (
-	"time"
-
-	"entgo.io/ent"
-	"entgo.io/ent/schema/field"
-	"entgo.io/ent/schema/index"
-)
-
-// AuditLog holds the schema definition for the AuditLog entity.
-type AuditLog struct {
-	ent.Schema
-}
-
-// Fields of the AuditLog.
-func (AuditLog) Fields() []ent.Field {
-	return []ent.Field{
-		field.String("id").
-			Unique().
-			Immutable(),
-		field.String("user_id").
-			NotEmpty().
-			Comment("ID of the user/actor performing the action"),
-		field.String("action").
-			NotEmpty().
-			Comment("Action performed (e.g., user.create, user.update)"),
-		field.String("resource").
-			Optional().
-			Comment("Resource type (e.g., user, role)"),
-		field.String("resource_id").
-			Optional().
-			Comment("ID of the target resource"),
-		field.String("ip_address").
-			Optional().
-			Comment("IP address of the client"),
-		field.String("user_agent").
-			Optional().
-			Comment("User agent of the client"),
-		field.JSON("metadata", map[string]interface{}{}).
-			Optional().
-			Comment("Additional metadata as JSON"),
-		field.Time("timestamp").
-			Default(time.Now).
-			Immutable(),
-	}
-}
-
-// Indexes of the AuditLog.
-func (AuditLog) Indexes() []ent.Index {
-	return []ent.Index{
-		index.Fields("user_id"),
-		index.Fields("resource_id"),
-		index.Fields("timestamp"),
-		index.Fields("action"),
-		index.Fields("resource"),
-	}
-}

ent/schema/permission.go

@@ -1,32 +0,0 @@
-package schema
-
-import (
-	"entgo.io/ent"
-	"entgo.io/ent/schema/edge"
-	"entgo.io/ent/schema/field"
-)
-
-// Permission holds the schema definition for the Permission entity.
-type Permission struct {
-	ent.Schema
-}
-
-// Fields of the Permission.
-func (Permission) Fields() []ent.Field {
-	return []ent.Field{
-		field.String("id").
-			Unique().
-			Immutable(),
-		field.String("name").
-			Unique().
-			NotEmpty().
-			Comment("Format: module.resource.action"),
-	}
-}
-
-// Edges of the Permission.
-func (Permission) Edges() []ent.Edge {
-	return []ent.Edge{
-		edge.To("role_permissions", RolePermission.Type),
-	}
-}

ent/schema/refresh_token.go

@@ -1,44 +0,0 @@
-package schema
-
-import (
-	"time"
-
-	"entgo.io/ent"
-	"entgo.io/ent/schema/field"
-	"entgo.io/ent/schema/index"
-)
-
-// RefreshToken holds the schema definition for the RefreshToken entity.
-type RefreshToken struct {
-	ent.Schema
-}
-
-// Fields of the RefreshToken.
-func (RefreshToken) Fields() []ent.Field {
-	return []ent.Field{
-		field.String("id").
-			Unique().
-			Immutable(),
-		field.String("user_id").
-			NotEmpty().
-			Comment("ID of the user who owns this refresh token"),
-		field.String("token_hash").
-			NotEmpty().
-			Sensitive().
-			Comment("SHA256 hash of the refresh token"),
-		field.Time("expires_at").
-			Comment("When the refresh token expires"),
-		field.Time("created_at").
-			Default(time.Now).
-			Immutable(),
-	}
-}
-
-// Indexes of the RefreshToken.
-func (RefreshToken) Indexes() []ent.Index {
-	return []ent.Index{
-		index.Fields("user_id"),
-		index.Fields("token_hash"),
-		index.Fields("expires_at"),
-	}
-}

ent/schema/role.go

@@ -1,39 +0,0 @@
-package schema
-
-import (
-	"time"
-
-	"entgo.io/ent"
-	"entgo.io/ent/schema/edge"
-	"entgo.io/ent/schema/field"
-)
-
-// Role holds the schema definition for the Role entity.
-type Role struct {
-	ent.Schema
-}
-
-// Fields of the Role.
-func (Role) Fields() []ent.Field {
-	return []ent.Field{
-		field.String("id").
-			Unique().
-			Immutable(),
-		field.String("name").
-			Unique().
-			NotEmpty(),
-		field.String("description").
-			Optional(),
-		field.Time("created_at").
-			Default(time.Now).
-			Immutable(),
-	}
-}
-
-// Edges of the Role.
-func (Role) Edges() []ent.Edge {
-	return []ent.Edge{
-		edge.To("role_permissions", RolePermission.Type),
-		edge.To("user_roles", UserRole.Type),
-	}
-}

ent/schema/role_permission.go

@@ -1,34 +0,0 @@
-package schema
-
-import (
-	"entgo.io/ent"
-	"entgo.io/ent/schema/edge"
-	"entgo.io/ent/schema/field"
-)
-
-// RolePermission holds the schema definition for the RolePermission entity (many-to-many relationship).
-type RolePermission struct {
-	ent.Schema
-}
-
-// Fields of the RolePermission.
-func (RolePermission) Fields() []ent.Field {
-	return []ent.Field{
-		field.String("role_id"),
-		field.String("permission_id"),
-	}
-}
-
-// Edges of the RolePermission.
-func (RolePermission) Edges() []ent.Edge {
-	return []ent.Edge{
-		edge.To("role", Role.Type).
-			Unique().
-			Required().
-			Field("role_id"),
-		edge.To("permission", Permission.Type).
-			Unique().
-			Required().
-			Field("permission_id"),
-	}
-}

ent/schema/user.go

@@ -1,57 +0,0 @@
-package schema
-
-import (
-	"time"
-
-	"entgo.io/ent"
-	"entgo.io/ent/schema/edge"
-	"entgo.io/ent/schema/field"
-)
-
-// User holds the schema definition for the User entity.
-type User struct {
-	ent.Schema
-}
-
-// Fields of the User.
-func (User) Fields() []ent.Field {
-	return []ent.Field{
-		field.String("id").
-			Unique().
-			Immutable(),
-		field.String("email").
-			Unique().
-			NotEmpty(),
-		field.String("username").
-			Optional(),
-		field.String("first_name").
-			Optional(),
-		field.String("last_name").
-			Optional(),
-		field.String("password_hash").
-			NotEmpty(),
-		field.Bool("verified").
-			Default(false),
-		field.String("email_verification_token").
-			Optional().
-			Sensitive(),
-		field.String("password_reset_token").
-			Optional().
-			Sensitive(),
-		field.Time("password_reset_expires_at").
-			Optional(),
-		field.Time("created_at").
-			Default(time.Now).
-			Immutable(),
-		field.Time("updated_at").
-			Default(time.Now).
-			UpdateDefault(time.Now),
-	}
-}
-
-// Edges of the User.
-func (User) Edges() []ent.Edge {
-	return []ent.Edge{
-		edge.To("user_roles", UserRole.Type),
-	}
-}

ent/schema/user_role.go

@@ -1,34 +0,0 @@
-package schema
-
-import (
-	"entgo.io/ent"
-	"entgo.io/ent/schema/edge"
-	"entgo.io/ent/schema/field"
-)
-
-// UserRole holds the schema definition for the UserRole entity (many-to-many relationship).
-type UserRole struct {
-	ent.Schema
-}
-
-// Fields of the UserRole.
-func (UserRole) Fields() []ent.Field {
-	return []ent.Field{
-		field.String("user_id"),
-		field.String("role_id"),
-	}
-}
-
-// Edges of the UserRole.
-func (UserRole) Edges() []ent.Edge {
-	return []ent.Edge{
-		edge.To("user", User.Type).
-			Unique().
-			Required().
-			Field("user_id"),
-		edge.To("role", Role.Type).
-			Unique().
-			Required().
-			Field("role_id"),
-	}
-}

internal/client/grpc/audit_client.go

@@ -4,7 +4,6 @@ package grpc
 import (
 	"context"
 	"fmt"
-	"math"
 
 	auditv1 "git.dcentral.systems/toolz/goplt/api/proto/generated/audit/v1"
 	"git.dcentral.systems/toolz/goplt/pkg/registry"
@@ -87,24 +86,9 @@ func (c *AuditClient) Query(ctx context.Context, filters *services.AuditLogFilte
 		return nil, err
 	}
 
-	var limitInt32, offsetInt32 int32
-	if filters.Limit > math.MaxInt32 {
-		limitInt32 = math.MaxInt32
-	} else if filters.Limit < math.MinInt32 {
-		limitInt32 = math.MinInt32
-	} else {
-		limitInt32 = int32(filters.Limit) //nolint:gosec // bounds checked above
-	}
-	if filters.Offset > math.MaxInt32 {
-		offsetInt32 = math.MaxInt32
-	} else if filters.Offset < math.MinInt32 {
-		offsetInt32 = math.MinInt32
-	} else {
-		offsetInt32 = int32(filters.Offset) //nolint:gosec // bounds checked above
-	}
 	req := &auditv1.QueryRequest{
-		Limit:  limitInt32,
+		Limit:  int32(filters.Limit),
-		Offset: offsetInt32,
+		Offset: int32(filters.Offset),
 	}
 
 	if filters.UserID != nil {

internal/client/grpc/identity_client.go

@@ -204,7 +204,7 @@ func (c *IdentityClient) VerifyPassword(ctx context.Context, email, password str
 
 	resp, err := c.client.VerifyPassword(ctx, &identityv1.VerifyPasswordRequest{
 		Email:    email,
-		Password: password,
+		Password:  password,
 	})
 	if err != nil {
 		return nil, fmt.Errorf("verify password failed: %w", err)

internal/config/config.go

@@ -100,15 +100,9 @@ func LoadConfig(env string) (config.ConfigProvider, error) {
 	// e.g., DATABASE_DSN -> database.dsn, SERVER_PORT -> server.port
 	v.SetEnvKeyReplacer(strings.NewReplacer(".", "_"))
 	// Bind specific environment variables to config keys
-	if err := v.BindEnv("database.dsn", "DATABASE_DSN"); err != nil {
+	v.BindEnv("database.dsn", "DATABASE_DSN")
-		return nil, fmt.Errorf("failed to bind DATABASE_DSN: %w", err)
+	v.BindEnv("registry.consul.address", "REGISTRY_CONSUL_ADDRESS")
-	}
+	v.BindEnv("registry.type", "REGISTRY_TYPE")
-	if err := v.BindEnv("registry.consul.address", "REGISTRY_CONSUL_ADDRESS"); err != nil {
-		return nil, fmt.Errorf("failed to bind REGISTRY_CONSUL_ADDRESS: %w", err)
-	}
-	if err := v.BindEnv("registry.type", "REGISTRY_TYPE"); err != nil {
-		return nil, fmt.Errorf("failed to bind REGISTRY_TYPE: %w", err)
-	}
 
 	return NewViperConfig(v), nil
 }

internal/ent/schema/audit_log.go

@@ -1,59 +0,0 @@
-// Package schema defines the Ent schema for domain entities.
-package schema
-
-import (
-	"time"
-
-	"entgo.io/ent"
-	"entgo.io/ent/schema/field"
-	"entgo.io/ent/schema/index"
-)
-
-// AuditLog holds the schema definition for the AuditLog entity.
-type AuditLog struct {
-	ent.Schema
-}
-
-// Fields of the AuditLog.
-func (AuditLog) Fields() []ent.Field {
-	return []ent.Field{
-		field.String("id").
-			Unique().
-			Immutable(),
-		field.String("user_id").
-			NotEmpty().
-			Comment("ID of the user/actor performing the action"),
-		field.String("action").
-			NotEmpty().
-			Comment("Action performed (e.g., user.create, user.update)"),
-		field.String("resource").
-			Optional().
-			Comment("Resource type (e.g., user, role)"),
-		field.String("resource_id").
-			Optional().
-			Comment("ID of the target resource"),
-		field.String("ip_address").
-			Optional().
-			Comment("IP address of the client"),
-		field.String("user_agent").
-			Optional().
-			Comment("User agent of the client"),
-		field.JSON("metadata", map[string]interface{}{}).
-			Optional().
-			Comment("Additional metadata as JSON"),
-		field.Time("timestamp").
-			Default(time.Now).
-			Immutable(),
-	}
-}
-
-// Indexes of the AuditLog.
-func (AuditLog) Indexes() []ent.Index {
-	return []ent.Index{
-		index.Fields("user_id"),
-		index.Fields("resource_id"),
-		index.Fields("timestamp"),
-		index.Fields("action"),
-		index.Fields("resource"),
-	}
-}

internal/ent/schema/permission.go

@@ -1,32 +0,0 @@
-package schema
-
-import (
-	"entgo.io/ent"
-	"entgo.io/ent/schema/edge"
-	"entgo.io/ent/schema/field"
-)
-
-// Permission holds the schema definition for the Permission entity.
-type Permission struct {
-	ent.Schema
-}
-
-// Fields of the Permission.
-func (Permission) Fields() []ent.Field {
-	return []ent.Field{
-		field.String("id").
-			Unique().
-			Immutable(),
-		field.String("name").
-			Unique().
-			NotEmpty().
-			Comment("Format: module.resource.action"),
-	}
-}
-
-// Edges of the Permission.
-func (Permission) Edges() []ent.Edge {
-	return []ent.Edge{
-		edge.To("role_permissions", RolePermission.Type),
-	}
-}

internal/ent/schema/refresh_token.go

@@ -1,44 +0,0 @@
-package schema
-
-import (
-	"time"
-
-	"entgo.io/ent"
-	"entgo.io/ent/schema/field"
-	"entgo.io/ent/schema/index"
-)
-
-// RefreshToken holds the schema definition for the RefreshToken entity.
-type RefreshToken struct {
-	ent.Schema
-}
-
-// Fields of the RefreshToken.
-func (RefreshToken) Fields() []ent.Field {
-	return []ent.Field{
-		field.String("id").
-			Unique().
-			Immutable(),
-		field.String("user_id").
-			NotEmpty().
-			Comment("ID of the user who owns this refresh token"),
-		field.String("token_hash").
-			NotEmpty().
-			Sensitive().
-			Comment("SHA256 hash of the refresh token"),
-		field.Time("expires_at").
-			Comment("When the refresh token expires"),
-		field.Time("created_at").
-			Default(time.Now).
-			Immutable(),
-	}
-}
-
-// Indexes of the RefreshToken.
-func (RefreshToken) Indexes() []ent.Index {
-	return []ent.Index{
-		index.Fields("user_id"),
-		index.Fields("token_hash"),
-		index.Fields("expires_at"),
-	}
-}

internal/ent/schema/role.go

@@ -1,39 +0,0 @@
-package schema
-
-import (
-	"time"
-
-	"entgo.io/ent"
-	"entgo.io/ent/schema/edge"
-	"entgo.io/ent/schema/field"
-)
-
-// Role holds the schema definition for the Role entity.
-type Role struct {
-	ent.Schema
-}
-
-// Fields of the Role.
-func (Role) Fields() []ent.Field {
-	return []ent.Field{
-		field.String("id").
-			Unique().
-			Immutable(),
-		field.String("name").
-			Unique().
-			NotEmpty(),
-		field.String("description").
-			Optional(),
-		field.Time("created_at").
-			Default(time.Now).
-			Immutable(),
-	}
-}
-
-// Edges of the Role.
-func (Role) Edges() []ent.Edge {
-	return []ent.Edge{
-		edge.To("role_permissions", RolePermission.Type),
-		edge.To("user_roles", UserRole.Type),
-	}
-}

internal/ent/schema/role_permission.go

@@ -1,34 +0,0 @@
-package schema
-
-import (
-	"entgo.io/ent"
-	"entgo.io/ent/schema/edge"
-	"entgo.io/ent/schema/field"
-)
-
-// RolePermission holds the schema definition for the RolePermission entity (many-to-many relationship).
-type RolePermission struct {
-	ent.Schema
-}
-
-// Fields of the RolePermission.
-func (RolePermission) Fields() []ent.Field {
-	return []ent.Field{
-		field.String("role_id"),
-		field.String("permission_id"),
-	}
-}
-
-// Edges of the RolePermission.
-func (RolePermission) Edges() []ent.Edge {
-	return []ent.Edge{
-		edge.To("role", Role.Type).
-			Unique().
-			Required().
-			Field("role_id"),
-		edge.To("permission", Permission.Type).
-			Unique().
-			Required().
-			Field("permission_id"),
-	}
-}

internal/ent/schema/user.go

@@ -1,57 +0,0 @@
-package schema
-
-import (
-	"time"
-
-	"entgo.io/ent"
-	"entgo.io/ent/schema/edge"
-	"entgo.io/ent/schema/field"
-)
-
-// User holds the schema definition for the User entity.
-type User struct {
-	ent.Schema
-}
-
-// Fields of the User.
-func (User) Fields() []ent.Field {
-	return []ent.Field{
-		field.String("id").
-			Unique().
-			Immutable(),
-		field.String("email").
-			Unique().
-			NotEmpty(),
-		field.String("username").
-			Optional(),
-		field.String("first_name").
-			Optional(),
-		field.String("last_name").
-			Optional(),
-		field.String("password_hash").
-			NotEmpty(),
-		field.Bool("verified").
-			Default(false),
-		field.String("email_verification_token").
-			Optional().
-			Sensitive(),
-		field.String("password_reset_token").
-			Optional().
-			Sensitive(),
-		field.Time("password_reset_expires_at").
-			Optional(),
-		field.Time("created_at").
-			Default(time.Now).
-			Immutable(),
-		field.Time("updated_at").
-			Default(time.Now).
-			UpdateDefault(time.Now),
-	}
-}
-
-// Edges of the User.
-func (User) Edges() []ent.Edge {
-	return []ent.Edge{
-		edge.To("user_roles", UserRole.Type),
-	}
-}

internal/ent/schema/user_role.go

@@ -1,34 +0,0 @@
-package schema
-
-import (
-	"entgo.io/ent"
-	"entgo.io/ent/schema/edge"
-	"entgo.io/ent/schema/field"
-)
-
-// UserRole holds the schema definition for the UserRole entity (many-to-many relationship).
-type UserRole struct {
-	ent.Schema
-}
-
-// Fields of the UserRole.
-func (UserRole) Fields() []ent.Field {
-	return []ent.Field{
-		field.String("user_id"),
-		field.String("role_id"),
-	}
-}
-
-// Edges of the UserRole.
-func (UserRole) Edges() []ent.Edge {
-	return []ent.Edge{
-		edge.To("user", User.Type).
-			Unique().
-			Required().
-			Field("user_id"),
-		edge.To("role", Role.Type).
-			Unique().
-			Required().
-			Field("role_id"),
-	}
-}

scripts/pre-commit-check.sh

@@ -1,57 +0,0 @@
-#!/bin/bash
-# Pre-commit check script that runs lint, fmt-check, test, and build in gitea-runner container
-
-set -e
-
-SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-PROJECT_ROOT="$(cd "$SCRIPT_DIR/.." && pwd)"
-IMAGE_NAME="wirelos/pre-commit"
-CONTAINER_NAME="goplt-pre-commit-check"
-
-echo "🔍 Checking for Docker image: $IMAGE_NAME"
-if ! docker images --format "{{.Repository}}:{{.Tag}}" | grep -q "^${IMAGE_NAME}:latest$"; then
-    echo "📦 Image not found. Building $IMAGE_NAME from ci/pre-commit/Dockerfile..."
-    docker build -t "$IMAGE_NAME:latest" -f "$PROJECT_ROOT/ci/pre-commit/Dockerfile" "$PROJECT_ROOT/ci/pre-commit" || {
-        echo "❌ Failed to build Docker image"
-        exit 1
-    }
-    echo "✅ Image built successfully"
-else
-    echo "✅ Image found locally"
-fi
-
-echo "🧹 Cleaning up any existing container..."
-docker rm -f "$CONTAINER_NAME" 2>/dev/null || true
-
-echo "🚀 Starting pre-commit container..."
-docker run --rm \
-    --name "$CONTAINER_NAME" \
-    -v "$PROJECT_ROOT:/workspace" \
-    -w /workspace \
-    "$IMAGE_NAME:latest" \
-    sh -c "
-        echo '📋 Running make fmt-check...'
-        make fmt-check || exit 1
-        
-        echo '🔍 Running make lint...'
-        make lint || exit 1
-        
-        echo '🧪 Running make test...'
-        make test || exit 1
-        
-        echo '🔨 Running make build...'
-        make build || exit 1
-        
-        echo '✅ All checks passed!'
-    "
-
-EXIT_CODE=$?
-
-if [ $EXIT_CODE -eq 0 ]; then
-    echo "✅ All pre-commit checks passed!"
-else
-    echo "❌ Pre-commit checks failed. Please fix the issues above."
-fi
-
-exit $EXIT_CODE
-

services/audit/internal/api/server.go

@@ -3,7 +3,6 @@ package api
 
 import (
 	"context"
-	"math"
 
 	auditv1 "git.dcentral.systems/toolz/goplt/api/proto/generated/audit/v1"
 	"git.dcentral.systems/toolz/goplt/services/audit/internal/service"
@@ -119,15 +118,8 @@ func (s *Server) Query(ctx context.Context, req *auditv1.QueryRequest) (*auditv1
 		})
 	}
 
-	total := len(protoEntries)
-	var totalInt32 int32
-	if total > math.MaxInt32 {
-		totalInt32 = math.MaxInt32
-	} else {
-		totalInt32 = int32(total)
-	}
 	return &auditv1.QueryResponse{
 		Entries: protoEntries,
-		Total:   totalInt32, // Note: This is a simplified total, actual total would require a count query
+		Total:   int32(len(protoEntries)), // Note: This is a simplified total, actual total would require a count query
 	}, nil
 }

services/gateway/gateway_helpers_test.go

@@ -182,3 +182,4 @@ func TestGateway_matchRoute(t *testing.T) {
 		})
 	}
 }
+

services/gateway/gateway_test.go

@@ -456,20 +456,20 @@ func (m *mockAuthClient) Logout(ctx context.Context, refreshToken string) error
 
 // mockIdentityClient implements services.IdentityServiceClient for testing.
 type mockIdentityClient struct {
-	getUserResp             *services.User
+	getUserResp              *services.User
-	getUserErr              error
+	getUserErr               error
-	getUserByEmailResp      *services.User
+	getUserByEmailResp       *services.User
-	getUserByEmailErr       error
+	getUserByEmailErr        error
-	createUserResp          *services.User
+	createUserResp           *services.User
-	createUserErr           error
+	createUserErr            error
-	updateUserResp          *services.User
+	updateUserResp           *services.User
-	updateUserErr           error
+	updateUserErr            error
-	deleteUserErr           error
+	deleteUserErr            error
-	verifyEmailErr          error
+	verifyEmailErr           error
-	requestPasswordResetErr error
+	requestPasswordResetErr  error
-	resetPasswordErr        error
+	resetPasswordErr          error
-	verifyPasswordResp      *services.User
+	verifyPasswordResp       *services.User
-	verifyPasswordErr       error
+	verifyPasswordErr        error
 }
 
 func (m *mockIdentityClient) GetUser(ctx context.Context, id string) (*services.User, error) {

services/gateway/handlers_test.go

@@ -61,7 +61,7 @@ func TestGateway_handleLogin(t *testing.T) {
 			name: "client error - unauthorized",
 			requestBody: map[string]string{
 				"email":    "test@example.com",
-				"password": "wrongpassword",
+				"password":  "wrongpassword",
 			},
 			clientErr:      status.Error(codes.Unauthenticated, "invalid credentials"),
 			expectedStatus: http.StatusUnauthorized,
@@ -70,7 +70,7 @@ func TestGateway_handleLogin(t *testing.T) {
 			name: "client error - internal",
 			requestBody: map[string]string{
 				"email":    "test@example.com",
-				"password": "password123",
+				"password":  "password123",
 			},
 			clientErr:      status.Error(codes.Internal, "internal error"),
 			expectedStatus: http.StatusInternalServerError,
@@ -132,7 +132,7 @@ func TestGateway_handleRefreshToken(t *testing.T) {
 			expectedStatus: http.StatusOK,
 		},
 		{
-			name:        "invalid request body",
+			name: "invalid request body",
 			requestBody: map[string]string{
 				// missing refresh_token
 			},
@@ -200,7 +200,7 @@ func TestGateway_handleValidateToken(t *testing.T) {
 			expectedStatus: http.StatusOK,
 		},
 		{
-			name:        "invalid request body",
+			name: "invalid request body",
 			requestBody: map[string]string{
 				// missing token
 			},
@@ -261,7 +261,7 @@ func TestGateway_handleLogout(t *testing.T) {
 			expectedStatus: http.StatusOK,
 		},
 		{
-			name:        "invalid request body",
+			name: "invalid request body",
 			requestBody: map[string]string{
 				// missing refresh_token
 			},
@@ -316,11 +316,11 @@ func TestGateway_handleGetUser(t *testing.T) {
 	}{
 		{
 			name:   "successful get user",
-			userID: "user-123",
+			userID:  "user-123",
 			clientResp: &services.User{
 				ID:        "user-123",
 				Email:     "test@example.com",
-				Username:  "testuser",
+				Username:   "testuser",
 				FirstName: "Test",
 				LastName:  "User",
 			},
@@ -374,31 +374,31 @@ func TestGateway_handleCreateUser(t *testing.T) {
 			name: "successful create",
 			requestBody: services.CreateUserRequest{
 				Email:     "test@example.com",
-				Username:  "testuser",
+				Username:   "testuser",
-				Password:  "password123",
+				Password:   "password123",
-				FirstName: "Test",
+				FirstName:  "Test",
-				LastName:  "User",
+				LastName:   "User",
 			},
 			clientResp: &services.User{
 				ID:        "user-123",
 				Email:     "test@example.com",
-				Username:  "testuser",
+				Username:   "testuser",
 				FirstName: "Test",
 				LastName:  "User",
 			},
 			expectedStatus: http.StatusCreated,
 		},
 		{
-			name:           "invalid JSON",
+			name: "invalid JSON",
-			requestBody:    "not a json object",
+			requestBody: "not a json object",
 			expectedStatus: http.StatusBadRequest,
 		},
 		{
 			name: "client error - already exists",
 			requestBody: services.CreateUserRequest{
 				Email:    "existing@example.com",
-				Username: "existing",
+				Username:  "existing",
-				Password: "password123",
+				Password:  "password123",
 			},
 			clientErr:      status.Error(codes.AlreadyExists, "user already exists"),
 			expectedStatus: http.StatusConflict,
@@ -517,3 +517,4 @@ func TestGateway_handleGRPCError(t *testing.T) {
 		})
 	}
 }
+

services/identity/internal/password/password.go

@@ -7,7 +7,6 @@ import (
 	"encoding/base64"
 	"errors"
 	"fmt"
-	"math"
 	"strings"
 
 	"golang.org/x/crypto/argon2"
@@ -78,44 +77,7 @@ func Verify(password, hash string) (bool, error) {
 	}
 
 	// Compute hash with same parameters
-	hashLen := len(expectedHash)
+	actualHash := argon2.IDKey([]byte(password), salt, uint32(t), uint32(m), uint8(p), uint32(len(expectedHash)))
-	if hashLen < 0 || hashLen > math.MaxUint32 {
-		return false, fmt.Errorf("invalid hash length: %d", hashLen)
-	}
-	var hashLenUint32 uint32
-	if hashLen > math.MaxUint32 {
-		hashLenUint32 = math.MaxUint32
-	} else {
-		hashLenUint32 = uint32(hashLen)
-	}
-
-	// Bounds check for t and m to prevent overflow
-	var tUint32, mUint32 uint32
-	if t > math.MaxUint32 {
-		tUint32 = math.MaxUint32
-	} else if t < 0 {
-		tUint32 = 0
-	} else {
-		tUint32 = uint32(t) //nolint:gosec // bounds checked above
-	}
-	if m > math.MaxUint32 {
-		mUint32 = math.MaxUint32
-	} else if m < 0 {
-		mUint32 = 0
-	} else {
-		mUint32 = uint32(m) //nolint:gosec // bounds checked above
-	}
-
-	var pUint8 uint8
-	if p > math.MaxUint8 {
-		pUint8 = math.MaxUint8
-	} else if p < 0 {
-		pUint8 = 0
-	} else {
-		pUint8 = uint8(p)
-	}
-
-	actualHash := argon2.IDKey([]byte(password), salt, tUint32, mUint32, pUint8, hashLenUint32)
 
 	// Constant-time comparison
 	if subtle.ConstantTimeCompare(expectedHash, actualHash) == 1 {

services/identity/internal/password/password_test.go

@@ -208,3 +208,35 @@ func TestHash_Uniqueness(t *testing.T) {
 		assert.True(t, valid, "All hashes should verify correctly")
 	}
 }
+
+// Helper functions for test
+func splitHash(hash string) []string {
+	parts := make([]string, 0, 6)
+	current := ""
+	for _, char := range hash {
+		if char == '$' {
+			if current != "" {
+				parts = append(parts, current)
+				current = ""
+			}
+		} else {
+			current += string(char)
+		}
+	}
+	if current != "" {
+		parts = append(parts, current)
+	}
+	return parts
+}
+
+func joinHash(parts []string) string {
+	result := ""
+	for i, part := range parts {
+		if i > 0 {
+			result += "$"
+		}
+		result += part
+	}
+	return result
+}
+