Merge pull request #34 from pluralsh/marcin/prod-3812-need-to-update-go-client-in-kas

chore: Update Console client

Author: maciaszczykm

.github/workflows/ci.yaml

@@ -57,28 +57,28 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-go@v4
+      - uses: actions/setup-go@v5
         with:
           go-version-file: go.mod
           check-latest: true
-      - uses: golangci/golangci-lint-action@v6.1.1
+      - uses: golangci/golangci-lint-action@v7.0.0
         with:
-          version: v1.63.4
-  publish-debug-docker:
-    name: Build and push debug kas containers
-    runs-on: ubuntu-20.04
-    permissions:
-      contents: 'read'
-      id-token: 'write'
-      packages: 'write'
-    strategy:
-      matrix:
-        image: [kas-debug, agentk-debug]
-        include:
-          - image: kas-debug
-            dockerfile: ./build/docker/kas.debug.Dockerfile
-          - image: agentk-debug
-            dockerfile: ./build/docker/agentk.debug.Dockerfile
+          version: v2.1.2
+#  publish-debug-docker:
+#    name: Build and push debug kas containers
+#    runs-on: ubuntu-20.04
+#    permissions:
+#      contents: 'read'
+#      id-token: 'write'
+#      packages: 'write'
+#    strategy:
+#      matrix:
+#        image: [kas-debug, agentk-debug]
+#        include:
+#          - image: kas-debug
+#            dockerfile: ./build/docker/kas.debug.Dockerfile
+#          - image: agentk-debug
+#            dockerfile: ./build/docker/agentk.debug.Dockerfile
     steps:
       - name: Checkout
         uses: actions/checkout@v4

.golangci.yml

@@ -1,34 +1,45 @@
+version: "2"
 run:
   modules-download-mode: readonly
   allow-parallel-runners: true
-  timeout: 5m
-
+  tests: false
 linters:
-  disable-all: true
+  default: none
   enable:
-    # default linters
+    - copyloopvar
     - errcheck
-    - gosimple
-    - govet
-    - ineffassign
-    - staticcheck
-    - typecheck
-    - unused
-
-    # additional linters
-    - errorlint
     - errname
-    - gocyclo
-    - goimports
-    - misspell
-    - gofmt
-    - importas
+    - errorlint
     - goconst
     - gocritic
+    - gocyclo
+    - govet
+    - importas
+    - ineffassign
     - misspell
-
-issues:
-  # Excluding configuration per-path, per-linter, per-text and per-source
-  exclude-files:
-    # Exclude some linters from running on tests files.
-    - .*_test\.go
+    - prealloc
+    - staticcheck
+    - usestdlibvars
+    - wastedassign
+    - whitespace
+  exclusions:
+    generated: lax
+    presets:
+      - comments
+      - common-false-positives
+      - legacy
+      - std-error-handling
+    paths:
+      - third_party$
+      - builtin$
+      - examples$
+formatters:
+  enable:
+    - gofmt
+    - goimports
+  exclusions:
+    generated: lax
+    paths:
+      - third_party$
+      - builtin$
+      - examples$

build/docker/agentk.Dockerfile

@@ -1,6 +1,6 @@
 # Dockerfile for agentk
 
-FROM docker.io/golang:1.23 as builder
+FROM docker.io/golang:1.24 as builder
 
 WORKDIR /src
 COPY . .

build/docker/agentk.debug.Dockerfile

@@ -1,7 +1,7 @@
 # Dockerfile for kas
 
 FROM busybox:uclibc as busybox
-FROM docker.io/golang:1.23 as builder
+FROM docker.io/golang:1.24 as builder
 
 # Build Delve
 RUN go install github.com/go-delve/delve/cmd/dlv@latest

build/docker/kas.Dockerfile

@@ -1,6 +1,6 @@
 # Dockerfile for kas
 
-FROM docker.io/golang:1.23 as builder
+FROM docker.io/golang:1.24 as builder
 
 WORKDIR /src
 COPY . .

build/docker/kas.debug.Dockerfile

@@ -1,7 +1,7 @@
 # Dockerfile for kas
 
 FROM busybox:uclibc as busybox
-FROM docker.io/golang:1.23 as builder
+FROM docker.io/golang:1.24 as builder
 
 # Build Delve
 RUN go install github.com/go-delve/delve/cmd/dlv@latest

cmd/kas/kasapp/app_internal_server.go

@@ -26,7 +26,6 @@ type internalServer struct {
 func newInternalServer(tp trace.TracerProvider, mp otelmetric.MeterProvider, p propagation.TextMapPropagator,
 	factory modserver.RpcApiFactory, probeRegistry *observability.ProbeRegistry,
 	grpcServerErrorReporter grpctool2.ServerErrorReporter) (*internalServer, error) {
-
 	// In-memory gRPC client->listener pipe
 	listener := grpctool2.NewDialListener()
 

cmd/kas/kasapp/app_private_api_server.go

@@ -201,7 +201,6 @@ func newKasPool(log *zap.Logger, errRep errz.ErrReporter, tp trace.TracerProvide
 	p propagation.TextMapPropagator, csh stats.Handler, jwtSecret []byte, ownPrivateApiUrl, ownPrivateApiHost, caCertificateFile string,
 	dialer func(context.Context, string) (net.Conn, error),
 	streamClientProm grpc.StreamClientInterceptor, unaryClientProm grpc.UnaryClientInterceptor) (grpctool2.PoolInterface, error) {
-
 	sharedPoolOpts := []grpc.DialOption{
 		grpc.WithSharedWriteBuffer(true),
 		// Default gRPC parameters are good, no need to change them at the moment.
@@ -260,7 +259,6 @@ func newKasPool(log *zap.Logger, errRep errz.ErrReporter, tp trace.TracerProvide
 
 func constructOwnUrl(interfaceAddrs func() ([]net.Addr, error),
 	ownUrl, ownCidr, ownScheme, ownPort, listenNetwork, listenAddress string) (string, error) {
-
 	if ownUrl != "" {
 		if ownCidr != "" {
 			return "", fmt.Errorf("either %s or %s should be specified, not both", envVarOwnPrivateApiUrl, envVarOwnPrivateApiCidr)

cmd/kas/kasapp/configured_app.go

@@ -560,7 +560,7 @@ func (a *ConfiguredApp) isTracingEnabled() bool {
 
 func startModules(stage stager.Stage, modules []modserver2.Module) {
 	for _, module := range modules {
-		module := module // closure captures the right variable
+		// closure captures the right variable
 		stage.Go(func(ctx context.Context) error {
 			err := module.Run(ctx)
 			if err != nil {

cmd/kas/kasapp/router_kas_tunnel_finder.go

@@ -195,7 +195,7 @@ func (f *tunnelFinder) tryKasLocked(kasUrl string) {
 func (f *tunnelFinder) tryKasAsync(ctx context.Context, cancel context.CancelFunc, kasUrl string) {
 	log := f.log.With(logz.KasUrl(kasUrl)) // nolint:govet
 	noTunnelSent := false
-	_ = retry.PollWithBackoff(ctx, f.pollConfig(), func(ctx context.Context) (error, retry.AttemptResult) {
+	_ = retry.PollWithBackoff(ctx, f.pollConfig(), func(ctx context.Context) (error, retry.AttemptResult) { // nolint:staticcheck
 		success := false
 
 		// 1. Dial another kas