Merge pull request #13 from castai/multiple-streams

KUBE-553: add podname and enable linters

.github/workflows/build.yaml

@@ -49,7 +49,7 @@ jobs:
           CGO_ENABLED: 0
 
       - name: Test
-        run: go test -race ./...
+        run: make test
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v2

.github/workflows/fossa.yaml

@@ -0,0 +1,13 @@
+name: FOSSA
+on:
+  push:
+    branches:
+      - main
+jobs:
+  fossa-scan:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: fossas/fossa-action@v1
+        with:
+          api-key: ${{ secrets.FOSSA_API_KEY }}

.github/workflows/golangci-lint.yaml

@@ -0,0 +1,18 @@
+name: golangci-lint
+on:
+  pull_request:
+permissions:
+  contents: read
+jobs:
+  golangci:
+    name: lint
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-go@v5
+        with:
+          go-version: stable
+      - name: golangci-lint
+        uses: golangci/golangci-lint-action@v6
+        with:
+          args: --timeout=5m

.golangci.yaml

@@ -0,0 +1,93 @@
+linters:
+  disable-all: true
+  enable:
+    - containedctx
+    - dogsled
+    - dupword
+    - durationcheck
+    - errcheck
+    - errname
+    - errorlint
+    - gci
+    - gocognit
+    - goconst
+    - gocritic
+    - godot
+    - gofmt
+    - gofumpt
+    - goprintffuncname
+    - gosec
+    - gosimple
+    - govet
+    - ineffassign
+    - lll
+    - misspell
+    - nakedret
+    - paralleltest
+    - revive
+    - sqlclosecheck
+    - staticcheck
+    - stylecheck
+    - typecheck
+    - unconvert
+    - unparam
+    - unused
+    - whitespace
+
+linters-settings:
+  gocritic:
+    enabled-all: true
+    disabled-checks:
+      - commentFormatting
+  godot:
+    scope: all
+  gofumpt:
+    module-path: cloud-proxy
+    extra-rules: true
+  goconst:
+    min-len: 2
+    min-occurrences: 5
+  golint:
+    min-confidence: 0
+  gomnd:
+    settings:
+      mnd:
+        # don't include the "operation" and "assign"
+        checks: [argument,case,condition,return]
+  govet:
+    # shadow is marked as experimental feature, skip it for now.
+    check-shadowing: false
+    settings:
+      printf:
+        funcs:
+          - (github.com/golangci/golangci-lint/pkg/logutils.Log).Infof
+          - (github.com/golangci/golangci-lint/pkg/logutils.Log).Warnf
+          - (github.com/golangci/golangci-lint/pkg/logutils.Log).Errorf
+          - (github.com/golangci/golangci-lint/pkg/logutils.Log).Fatalf
+  lll:
+    line-length: 200
+  maligned:
+    suggest-new: true
+  misspell:
+    locale: US
+  revive:
+    rules:
+      - name: redefines-builtin-id
+        disabled: true
+
+      # Allow code like:
+      #      Items: binpacking.Items{
+      #        {
+      #        },
+      #      }
+      - name: nested-structs
+        disabled: true
+  gci:
+    sections:
+      - standard
+      - default
+      - prefix(cloud-proxy)
+issues:
+  exclude-dirs:
+    - mock
+    - internal/castai

Makefile

@@ -29,3 +29,14 @@ generate-grpc:
 			--go-grpc_out=proto/gen --go-grpc_opt paths=source_relative
 .PHONY: generate-grpc
 
+lint:
+	golangci-lint run ./...
+.PHONY: lint
+
+fix:
+	golangci-lint run --fix ./...
+.PHONY: fix
+
+test:
+	go test ./... -race
+.PHONY: test

cmd/proxy/main.go

@@ -8,18 +8,18 @@ import (
 	"runtime"
 	"time"
 
-	"cloud-proxy/internal/cloud/gcp"
-	"cloud-proxy/internal/cloud/gcp/gcpauth"
-	"cloud-proxy/internal/config"
-	"cloud-proxy/internal/healthz"
-	"cloud-proxy/internal/proxy"
-
 	"github.com/sirupsen/logrus"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/backoff"
 	"google.golang.org/grpc/credentials"
 	"google.golang.org/grpc/credentials/insecure"
 	"google.golang.org/grpc/metadata"
+
+	"cloud-proxy/internal/cloud/gcp"
+	"cloud-proxy/internal/cloud/gcp/gcpauth"
+	"cloud-proxy/internal/config"
+	"cloud-proxy/internal/healthz"
+	"cloud-proxy/internal/proxy"
 )
 
 var (
@@ -35,7 +35,7 @@ func main() {
 
 	dialOpts := make([]grpc.DialOption, 0)
 	if cfg.CastAI.DisableGRPCTLS {
-		// ONLY For testing purposes
+		// ONLY For testing purposes.
 		dialOpts = append(dialOpts, grpc.WithTransportCredentials(insecure.NewCredentials()))
 	} else {
 		dialOpts = append(dialOpts, grpc.WithTransportCredentials(credentials.NewTLS(nil)))
@@ -73,14 +73,13 @@ func main() {
 	}(conn)
 
 	ctx := metadata.NewOutgoingContext(context.Background(), metadata.Pairs(
-		"authorization", fmt.Sprintf("Token %s", cfg.CastAI.ApiKey),
+		"authorization", fmt.Sprintf("Token %s", cfg.CastAI.APIKey),
 	))
 
-	client := proxy.New(conn, gcp.New(gcpauth.NewCredentialsSource(), http.DefaultClient), logger,
-		cfg.ClusterID, GetVersion(), cfg.KeepAlive, cfg.KeepAliveTimeout)
-
 	go startHealthServer(logger, cfg.HealthAddress)
 
+	client := proxy.New(conn, gcp.New(gcpauth.NewCredentialsSource(), http.DefaultClient), logger,
+		cfg.GetPodName(), cfg.ClusterID, GetVersion(), cfg.KeepAlive, cfg.KeepAliveTimeout)
 	err = client.Run(ctx)
 	if err != nil {
 		logger.Panicf("Failed to run client: %v", err)
@@ -97,7 +96,7 @@ func setupLogger(cfg config.Config) *logrus.Logger {
 	logger.SetLevel(logrus.Level(cfg.Log.Level))
 	logger.SetReportCaller(true)
 	logger.Formatter = &logrus.TextFormatter{
-		CallerPrettyfier: func(f *runtime.Frame) (function string, file string) {
+		CallerPrettyfier: func(f *runtime.Frame) (function, file string) {
 			filename := path.Base(f.File)
 			return fmt.Sprintf("%s()", f.Function), fmt.Sprintf("%s:%d", filename, f.Line)
 		},