🔥 wip: enhance structure

.editorconfig

@@ -8,16 +8,11 @@ indent_style = space
 indent_size = 2
 
 [{Makefile,go.mod,go.sum,*.go,.gitmodules}]
-indent_style = tab
 indent_size = 4
 
 [*.md]
 indent_size = 4
 trim_trailing_whitespace = false
 
 [Taskfile.yaml]
-indent_size = 2
 indent_style = tab
-
-[Dockerfile]
-indent_size = 4

.golangci.yaml

@@ -0,0 +1,5 @@
+linters-settings:
+  gosec:
+    # To specify a set of rules to explicitly exclude.
+    # Available rules: https://github.com/securego/gosec#available-rules
+    excludes: []

.goreleaser.yaml

@@ -0,0 +1,105 @@
+---
+
+project_name: tlz
+before:
+  hooks:
+    - go mod tidy
+builds:
+  - env: [CGO_ENABLED=0]
+    binary: tlz
+    goos:
+      - linux
+    goarch:
+      - amd64
+      - arm64
+    id: "cli"
+    dir: .
+    main: ./cmd/server/main.go
+    ldflags:
+      - -s -w -X main.Version={{.Version}} -X main.Commit={{.Commit}} -X main.Date={{.Date}}
+
+archives:
+  - id: cli-archive
+    format: tar.gz
+    files:
+      - none*
+    builds:
+      - cli
+    format_overrides:
+      - goos: windows
+        format: zip
+    name_template: >-
+      {{ .ProjectName }}_
+      {{- title .Os }}_
+      {{- if eq .Arch "amd64" }}x86_64
+      {{- else if eq .Arch "386" }}i386
+      {{- else }}{{ .Arch }}{{ end }}
+
+dockers:
+  - use: buildx
+    goos: linux
+    goarch: amd64
+    image_templates:
+      - "ghcr.io/zcubbs/{{ .ProjectName }}:{{ .Version }}-amd64"
+      - "ghcr.io/zcubbs/{{ .ProjectName }}:latest-amd64"
+    build_flag_templates:
+      - "--platform=linux/amd64"
+      - "--label=org.opencontainers.image.created={{.Date}}"
+      - "--label=org.opencontainers.image.title={{.ProjectName}}"
+      - "--label=org.opencontainers.image.revision={{.FullCommit}}"
+      - "--label=org.opencontainers.image.version={{.Version}}"
+  - use: buildx
+    goos: linux
+    goarch: arm64
+    image_templates:
+      - "ghcr.io/zcubbs/{{ .ProjectName }}:{{ .Version }}-arm64"
+      - "ghcr.io/zcubbs/{{ .ProjectName }}:latest-arm64"
+    build_flag_templates:
+      - "--platform=linux/arm64"
+      - "--label=org.opencontainers.image.created={{.Date}}"
+      - "--label=org.opencontainers.image.title={{.ProjectName}}"
+      - "--label=org.opencontainers.image.revision={{.FullCommit}}"
+      - "--label=org.opencontainers.image.version={{.Version}}"
+docker_manifests:
+  - name_template: ghcr.io/zcubbs/{{ .ProjectName }}:{{ .Version }}
+    image_templates:
+      - ghcr.io/zcubbs/{{ .ProjectName }}:{{ .Version }}-amd64
+      - ghcr.io/zcubbs/{{ .ProjectName }}:{{ .Version }}-arm64
+  - name_template: ghcr.io/zcubbs/{{ .ProjectName }}:latest
+    image_templates:
+      - ghcr.io/zcubbs/{{ .ProjectName }}:latest-amd64
+      - ghcr.io/zcubbs/{{ .ProjectName }}:latest-arm64
+changelog:
+  sort: asc
+  filters:
+    exclude:
+      - '^docs:'
+      - '^test:'
+      - '^conf:'
+snapshot:
+  name_template: SNAPSHOT-{{ .Commit }}
+checksum:
+  name_template: '{{ .ProjectName }}_{{ .Version }}_checksums.txt'
+signs:
+  - cmd: gpg
+    args:
+      - --output
+      - $signature
+      - --detach-sig
+      - $artifact
+    signature: ${artifact}.sig
+    artifacts: none
+release:
+  gittlz:
+    owner: zcubbs
+    name: tlz
+  draft: false
+  prerelease: auto
+  header: |
+    ## ({{ .Date }})
+
+    Welcome to this new release!
+  footer: |
+    ## Thanks!
+    Those were the changes on {{ .Tag }}!
+  name_template: "{{.Tag}}"

.gosec.config.json

@@ -1,5 +1,5 @@
 {
   "global": {
-    "exclude": "G404,G402"
+    "exclude": "G203"
   }
 }

Taskfile.yaml

@@ -1,12 +1,5 @@
 version: '3'
 
-includes:
-  bootstrap_tasks: .taskfiles/bootstrap.yaml
-  container_tasks: .taskfiles/containers.yaml
-  build_tasks: .taskfiles/build.yaml
-  test_tasks: .taskfiles/test.yaml
-  gen_tasks: .taskfiles/gen.yaml
-
 env:
   GOOS: "{{OS}}"
 
@@ -15,114 +8,67 @@ vars:
   LOCAL_HOST: 127.0.0.1
 
 tasks:
-
-  ################################################################
-  # Bootstrap tasks
-  ################################################################
-  bootstrap:
-    desc: Install all necessary tools and CLI dependencies
-    cmds:
-      - task: bootstrap_tasks:local
-
-  boostrap:gh:
-    desc: Install all necessary tools and CLI dependencies for GitHub Actions
+  test:
     cmds:
-      - task: bootstrap_tasks:gh
-
+      - go test ./...
 
-  ################################################################
-  # Build tasks
-  ################################################################
   build:
     cmds:
-      - task: build_tasks:build
+      - task: build:{{OS}}
 
-  build:pack:
+  build:windows:
     cmds:
-      - task: build_tasks:build:pack
+      - go env -w GOOS=windows GOARCH=amd64
+      - go build -o bin/server.exe ./cmd/server/main.go
 
-  build:pack:gh:
+  build:darwin:
     cmds:
-      - task: build_tasks:build:pack:gh
+      - go env -w GOOS=darwin GOARCH=amd64
+      - go build -o bin/server ./cmd/server/main.go
 
-  ################################################################
-  # Test tasks
-  ################################################################
-  lint:
+  build:linux:
     cmds:
-      - task: test_tasks:lint
-
-  scan:
-    cmds:
-      - task: test_tasks:scan
-
-  test:
-    cmds:
-      - task: test_tasks:test
+      - go env -w GOOS=linux GOARCH=amd64
+      - go build -o bin/server ./cmd/server/main.go
 
   run:
     cmds:
-      - task: test_tasks:run
+      - task: build:{{OS}}
+      - task: run:{{OS}}
+        vars:
+          ARGS: "{{.CLI_ARGS}}"
 
-  preview:
+  run:darwin:
     cmds:
-      - task: test_tasks:preview
-
-  evans:
+      - bin/server {{.ARGS}}
+  run:linux:
     cmds:
-      - task: test_tasks:evans
-
-  ################################################################
-  # Generate tasks
-  ################################################################
-  proto:
+      - bin/server {{.ARGS}}
+  run:windows:
     cmds:
-      - task: gen_tasks:proto
+      - bin/server.exe {{.ARGS}}
 
-  mock:
-    cmds:
-      - task: gen_tasks:mock
-
-  sqlc:
-    cmds:
-      - task: gen_tasks:sqlc
-
-
-  ################################################################
-  # Container tasks
-  ################################################################
-  pg:
-    cmds:
-      - task: container_tasks:pg
-
-  pg:start:
-    cmds:
-      - task: container_tasks:pg:start
-
-  pg:down:
-    cmds:
-      - task: container_tasks:pg:down
-
-  redis:
+  lint:
     cmds:
-      - task: container_tasks:redis
+      - golangci-lint run ./... -v --timeout 5m
 
-  redis:start:
+  scan:
     cmds:
-      - task: container_tasks:redis:start
+      - gosec -conf .gosec.config.json "./..."
 
-  redis:down:
+  tools:install:
+    desc: Install tools
     cmds:
-      - task: container_tasks:redis:down
+      - task tools:install:golangci-lint
+      - task tools:install:gosec
 
-  mailhog:
+  tools:install:golangci-lint:
+    desc: Install golangci-lint
     cmds:
-      - task: container_tasks:mailhog
+      - go install github.com/golangci/golangci-lint/cmd/golangci-lint@latest
 
-  mailhog:start:
+  tools:install:gosec:
+    desc: Install gosec
     cmds:
-      - task: container_tasks:mailhog:start
+      - go install github.com/securego/gosec/v2/cmd/gosec@latest
 
-  mailhog:down:
-    cmds:
-      - task: container_tasks:mailhog:down

api/converter.go → cmd/server/api/converter.go

@@ -1,7 +1,7 @@
 package api
 
 import (
-	db "github.com/zcubbs/tlz/db/sqlc"
+	db "github.com/zcubbs/tlz/cmd/server/db/sqlc"
 	"github.com/zcubbs/tlz/pb"
 	"google.golang.org/protobuf/types/known/timestamppb"
 )

api/main_test.go → cmd/server/api/main_test.go

@@ -2,7 +2,7 @@ package api
 
 import (
 	"github.com/stretchr/testify/require"
-	db "github.com/zcubbs/tlz/db/sqlc"
+	db "github.com/zcubbs/tlz/cmd/server/db/sqlc"
 	"github.com/zcubbs/tlz/internal/util"
 	"github.com/zcubbs/tlz/worker"
 	"github.com/zcubbs/x/random"

api/rpc_create_user.go → cmd/server/api/rpc_create_user.go

@@ -3,7 +3,7 @@ package api
 import (
 	"context"
 	"github.com/hibiken/asynq"
-	db "github.com/zcubbs/tlz/db/sqlc"
+	db "github.com/zcubbs/tlz/cmd/server/db/sqlc"
 	"github.com/zcubbs/tlz/internal/validator"
 	"github.com/zcubbs/tlz/pb"
 	"github.com/zcubbs/tlz/worker"

api/rpc_create_user_test.go → cmd/server/api/rpc_create_user_test.go

@@ -5,8 +5,8 @@ import (
 	"database/sql"
 	"fmt"
 	"github.com/stretchr/testify/require"
-	mockdb "github.com/zcubbs/tlz/db/mock"
-	db "github.com/zcubbs/tlz/db/sqlc"
+	mockdb "github.com/zcubbs/tlz/cmd/server/db/mock"
+	db "github.com/zcubbs/tlz/cmd/server/db/sqlc"
 	"github.com/zcubbs/tlz/pb"
 	"github.com/zcubbs/tlz/worker"
 	mockwk "github.com/zcubbs/tlz/worker/mock"

api/rpc_login_user.go → cmd/server/api/rpc_login_user.go

@@ -3,7 +3,7 @@ package api
 import (
 	"context"
 	"errors"
-	db "github.com/zcubbs/tlz/db/sqlc"
+	db "github.com/zcubbs/tlz/cmd/server/db/sqlc"
 	"github.com/zcubbs/tlz/pb"
 	"github.com/zcubbs/x/password"
 	"google.golang.org/grpc/codes"

api/rpc_update_user.go → cmd/server/api/rpc_update_user.go

@@ -5,7 +5,7 @@ import (
 	"database/sql"
 	"errors"
 	"github.com/jackc/pgx/v5/pgtype"
-	db "github.com/zcubbs/tlz/db/sqlc"
+	db "github.com/zcubbs/tlz/cmd/server/db/sqlc"
 	"github.com/zcubbs/tlz/internal/validator"
 	"github.com/zcubbs/tlz/pb"
 	"github.com/zcubbs/x/password"

api/rpc_verify_user.go → cmd/server/api/rpc_verify_user.go

@@ -3,7 +3,7 @@ package api
 import (
 	"context"
 	"github.com/google/uuid"
-	db "github.com/zcubbs/tlz/db/sqlc"
+	db "github.com/zcubbs/tlz/cmd/server/db/sqlc"
 	"github.com/zcubbs/tlz/internal/validator"
 	"github.com/zcubbs/tlz/pb"
 	"google.golang.org/genproto/googleapis/rpc/errdetails"

api/server.go → cmd/server/api/server.go

@@ -7,7 +7,7 @@ import (
 	"github.com/charmbracelet/log"
 	"github.com/grpc-ecosystem/grpc-gateway/v2/runtime"
 	"github.com/rs/cors"
-	db "github.com/zcubbs/tlz/db/sqlc"
+	db "github.com/zcubbs/tlz/cmd/server/db/sqlc"
 	"github.com/zcubbs/tlz/internal/util"
 	"github.com/zcubbs/tlz/pb"
 	"github.com/zcubbs/tlz/pkg/token"