diff --git a/.github/workflows/quality.yml b/.github/workflows/quality.yml index 6470184..e148157 100644 --- a/.github/workflows/quality.yml +++ b/.github/workflows/quality.yml @@ -1,4 +1,4 @@ -name: ๐Ÿ“‹ GolangCI Checks +name: ๐Ÿ“‹ Lint on: pull_request: @@ -6,19 +6,13 @@ on: jobs: lint: - name: ๐Ÿ“‹ GolangCI runs-on: ubuntu-latest steps: - name: โฌ‡๏ธ Git clone the repository uses: actions/checkout@v6 - name: ๐Ÿ“ฆ Install Mise - run: | - curl https://mise.run | sh - mise install - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + uses: jdx/mise-action@v4 - name: ๐Ÿงช Lint - run: | - mise run lint + run: mise run lint diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 57bd4c9..08e694d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -26,16 +26,12 @@ jobs: password: ${{ secrets.GITHUB_TOKEN }} - name: ๐Ÿ“ฆ Install Mise - run: | - curl https://mise.run | sh - mise install - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + uses: jdx/mise-action@v4 - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 - name: Run GoReleaser - run: mise release + run: mise run release env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 34df649..ff218ec 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -18,10 +18,7 @@ jobs: uses: actions/checkout@v6 - name: ๐Ÿ“ฆ Install Mise - run: | - curl https://mise.run | sh - mise install + uses: jdx/mise-action@v4 - name: ๐Ÿงช Test - run: | - mise run test + run: mise run test diff --git a/.golangci.yml b/.golangci.yml new file mode 100644 index 0000000..2285de2 --- /dev/null +++ b/.golangci.yml @@ -0,0 +1,23 @@ +version: "2" + +issues: + max-issues-per-linter: 0 + max-same-issues: 0 + +linters: + enable: + - gosec + +formatters: + enable: + - gci + settings: + gci: + sections: + - standard + - default + - localmodule + no-inline-comments: true + no-prefix-comments: true + custom-order: true + no-lex-order: true diff --git a/.mise.toml b/.mise.toml index 77b1557..4475a65 100644 --- a/.mise.toml +++ b/.mise.toml @@ -1,12 +1,13 @@ [tools] go = "1.26" "go:github.com/daixiang0/gci" = "latest" -"ubi:golangci/golangci-lint" = "2.10" -"ubi:goreleaser/goreleaser" = "2.14" +"github:golangci/golangci-lint" = "latest" +"github:securego/gosec" = "latest" +"github:goreleaser/goreleaser" = "latest" [env] CGO_ENABLED=0 -LGFLAGS="-extldflags '-static'" +LDFLAGS="-extldflags '-static'" IMAGE="skpr/grpc-go:latest" PB_DIR="./pb" @@ -32,7 +33,7 @@ docker run -w /data -v .:/data $IMAGE /bin/bash -c 'protoc --go_out=./pb --go_op [tasks."build"] description = "Build the application" -run = "go build -o bin/apiserver-mock -ldflags=${CLI_LDFLAGS} github.com/skpr/api/cmd/apiserver-mock" +run = "go build -o bin/apiserver-mock -ldflags=\"${LDFLAGS}\" github.com/skpr/api/cmd/apiserver-mock" depends = ["vendor"] [tasks.mock] diff --git a/internal/model/model.go b/internal/model/model.go index f544b0f..3204da3 100644 --- a/internal/model/model.go +++ b/internal/model/model.go @@ -40,7 +40,7 @@ func (s *Model) GetEnvironments() []*Environment { return response } -func (s *Model) CreateEnvironment(name string, size int, metrics bool) { +func (s *Model) CreateEnvironment(name string, size int32, metrics bool) { environment := &pb.Environment{ Name: name, Version: "v0.0.1", @@ -62,9 +62,9 @@ func (s *Model) CreateEnvironment(name string, size int, metrics bool) { Limit: 512 * int64(size) * 1024, }, Replicas: &pb.EnvironmentResourcesReplicas{ - Current: 1 * int32(size), - Min: 1 * int32(size), - Max: 5 * int32(size), + Current: 1 * size, + Min: 1 * size, + Max: 5 * size, }, }, Cron: []*pb.Cron{ diff --git a/internal/random/string.go b/internal/random/string.go index b883486..92375e0 100644 --- a/internal/random/string.go +++ b/internal/random/string.go @@ -9,7 +9,7 @@ const charset = "ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789" func StringOfLength(length int) string { b := make([]byte, length) for i := range b { - b[i] = charset[rand.Intn(len(charset))] + b[i] = charset[rand.Intn(len(charset))] //nolint:gosec // G404: cosmetic random string, not used for auth/tokens } return string(b) } diff --git a/internal/server/mock/metrics/server.go b/internal/server/mock/metrics/server.go index 22afd33..e61ac79 100644 --- a/internal/server/mock/metrics/server.go +++ b/internal/server/mock/metrics/server.go @@ -7,10 +7,11 @@ import ( "strings" "time" - "github.com/skpr/api/pb" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" "google.golang.org/protobuf/types/known/timestamppb" + + "github.com/skpr/api/pb" ) // Server implements the GRPC "events" definition. diff --git a/internal/server/mock/metrics/server_test.go b/internal/server/mock/metrics/server_test.go index 3ffe83a..031f58d 100644 --- a/internal/server/mock/metrics/server_test.go +++ b/internal/server/mock/metrics/server_test.go @@ -5,10 +5,11 @@ import ( "testing" "time" - "github.com/skpr/api/pb" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" "google.golang.org/protobuf/types/known/timestamppb" + + "github.com/skpr/api/pb" ) var srv = &Server{}