fix: merging main

Author: pavelsmejkal

.circleci/config.yml

@@ -2,20 +2,27 @@
 # syntax, such as anchors, will be fixed automatically.
 version: 2.1
 orbs:
-  shared: getoutreach/shared@2.26.2
+  shared: getoutreach/shared@2.29.4
   queue: eddiewebb/[email protected]
+  ## <<Stencil::Block(CircleCIExtraOrbs)>>
+
+  ## <</Stencil::Block>>
 
 parameters:
   rebuild_cache:
     type: boolean
     default: false
+  ## <<Stencil::Block(CircleCIExtraParams)>>
+
+  ## <</Stencil::Block>>
 
 # Extra contexts to expose to all jobs below
 contexts: &contexts
   - aws-credentials
   - ghaccesstoken
   - docker-registry
   - npm-credentials
+  - box
   - vault-dev
   - confluence
   - circleci-credentials
@@ -39,6 +46,10 @@ test: &test
 release_branches: &release_branches
   - "main"
 
+## <<Stencil::Block(circleAnchorExtra)>>
+
+## <</Stencil::Block>>
+
 jobs:
   {}
   ## <<Stencil::Block(circleJobs)>>
@@ -76,7 +87,8 @@ workflows:
 
   release:
     when:
-      not: << pipeline.parameters.rebuild_cache >>
+      and:
+        - not: << pipeline.parameters.rebuild_cache >>
     jobs:
       ## <<Stencil::Block(circleWorkflowJobs)>>
 
@@ -96,12 +108,19 @@ workflows:
             - shared/test
           filters:
             branches:
-              only: *release_branches
-
-      # Dryrun release for PRs.
-      - shared/release:
-          <<: *release
+              only: main
+      # Dryrun for PRs
+      - shared/pre-release: &pre-release
           dryrun: true
+          context: *contexts
+          ## <<Stencil::Block(circlePreReleaseDryRunExtra)>>
+
+          ## <</Stencil::Block>>
+          requires:
+            ## <<Stencil::Block(circlePreReleaseDryRunRequires)>>
+
+            ## <</Stencil::Block>>
+            - shared/test
           filters:
             branches:
               ignore: *release_branches

.github/dependabot.yml

@@ -9,9 +9,9 @@ updates:
     ignore:
       - dependency-name: github.com/getoutreach/gobox
       - dependency-name: github.com/getoutreach/stencil-golang/pkg
+      - dependency-name: github.com/getoutreach/mint
       - dependency-name: github.com/getoutreach/services
       - dependency-name: github.com/getoutreach/datastores/v2
-      - dependency-name: github.com/getoutreach/mint
       - dependency-name: github.com/getoutreach/httpx
 
   # Ignore semantic-release, this code is only executed in CI.

.tool-versions

@@ -4,10 +4,10 @@
 # you are reducing compatibility guarantees.
 ## <<Stencil::Block(toolverOverride)>>
 ## <</Stencil::Block>>
-golang 1.22.0
-nodejs 18.17.1
 protoc 21.5
+nodejs 20.16.0
 terraform 1.5.7
+golang 1.23.4
 # Note: Versions in this block do not override the default versions above
 # but sometimes you have to declare additional versions of the same tool
 # while leaving the 'default' version intact for the infra.

.vscode/extensions.json

@@ -9,7 +9,8 @@
     "zxh404.vscode-proto3",
     "redhat.vscode-yaml",
     "ms-azuretools.vscode-docker",
-    "foxundermoon.shell-format"
+    "foxundermoon.shell-format",
+    "WizCloud.wizcli-vscode"
 
     // Please consider contributing back all recommended
     // extensions to stencil!

.vscode/launch.json

@@ -38,14 +38,14 @@
         // Maps the go module cache on the host to the persistent volume used by devspaces.
         // These should be the respective values of `go env GOMODCACHE`.
         {
-          "from": "${env:HOME}/.asdf/installs/golang/1.22.0/packages/pkg/mod",
-          "to": "/home/dev/.asdf/installs/golang/1.22.0/packages/pkg/mod"
+          "from": "${env:HOME}/.asdf/installs/golang/1.23.4/packages/pkg/mod",
+          "to": "/home/dev/.asdf/installs/golang/1.23.4/packages/pkg/mod"
         },
         {
           // Maps the standard library location on the host to the location in the devspace.
           // This enables debugging standard library code.
-          "from": "${env:HOME}/.asdf/installs/golang/1.22.0/go/src",
-          "to": "/home/dev/.asdf/installs/golang/1.22.0/go/src"
+          "from": "${env:HOME}/.asdf/installs/golang/1.23.4/go/src",
+          "to": "/home/dev/.asdf/installs/golang/1.23.4/go/src"
         }
       ]
     },

.vscode/settings.json

@@ -12,6 +12,11 @@
   "go.alternateTools": {
     "golangci-lint": "${workspaceFolder}/.bootstrap/shell/vscode/golang-linters.sh"
   },
+  // This is disabled because it causes version mismatches between the
+  // tools used/installed by asdf / stencil, and the ones updated by VSCode.
+  // In particular, this is a problem with newer versions of golangci-lint
+  // incompatible with older versions of Go.
+  "go.toolsManagement.autoUpdate": false,
   "go.buildTags": "or_dev",
   "go.testTags": "or_test,or_int,or_e2e",
   "files.trimTrailingWhitespace": true,

Makefile

@@ -1,6 +1,6 @@
 APP := plumber
 OSS := true
-_ := $(shell ./scripts/devbase.sh) 
+_ := $(shell ./scripts/devbase.sh)
 
 include .bootstrap/root/Makefile
 

cortex.yaml

@@ -39,8 +39,8 @@ info:
     repo: https://github.com/getoutreach/plumber
     framework: stencil
     language: Golang
-    stencil_version: v1.38.0
-    golang_version: 1.22.0
+    stencil_version: v1.40.1
+    golang_version: 1.23.4
     cli: false
     service: false
     product: Outreach
@@ -50,8 +50,8 @@ info:
     reporting_team: ce-ecs
     lintroller: platinum
   x-cortex-groups:
-    - lifecycle: in_development
-    - product: Outreach
-    - language: Golang
-    - framework: stencil
-    - engOrg: ce
+    - lifecycle:in_development
+    - product:Outreach
+    - language:Golang
+    - framework:stencil
+    - engOrg:ce

go.mod

@@ -1,17 +1,21 @@
 module github.com/getoutreach/plumber
 
-go 1.22.0
+go 1.23.0
 
-toolchain go1.22.6
+toolchain go1.23.4
 
 require (
 	github.com/samber/lo v1.49.1
 	gotest.tools/v3 v3.5.2
 )
 
-require golang.org/x/text v0.21.0 // indirect
+require (
+	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
+	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
+	golang.org/x/text v0.21.0 // indirect
+)
 
 require (
-	github.com/google/go-cmp v0.5.9 // indirect
-	golang.org/x/sync v0.11.0
+	github.com/google/go-cmp v0.6.0 // indirect
+	golang.org/x/sync v0.12.0
 )

go.sum

@@ -288,11 +288,9 @@ type closerContext struct {
 // startClosers starts closers functions and captures an error
 func (c *closerContext) startClosers(messages chan any, closers ...func(context.Context) error) {
 	for _, closer := range closers {
-		func(func(context.Context) error) {
-			c.erg.Go(func() error {
-				return closer(c.ctx)
-			})
-		}(closer)
+		c.erg.Go(func() error {
+			return closer(c.ctx)
+		})
 	}
 
 	// closers go routine

orchestration.go

@@ -1,15 +1,15 @@
 {
   "license": "UNLICENSED",
   "devDependencies": {
-    "@semantic-release/commit-analyzer": "^10.0.1",
+    "@semantic-release/commit-analyzer": "^12.0.0",
     "@semantic-release/exec": "^6.0.3",
     "@semantic-release/git": "^10.0.1",
-    "@semantic-release/github": "^9.0.3",
-    "@semantic-release/npm": "^10.0.4",
-    "@semantic-release/release-notes-generator": "^11.0.3",
-    "conventional-changelog-conventionalcommits": "^6.0.0",
+    "@semantic-release/github": "^10.0.3",
+    "@semantic-release/npm": "^12.0.0",
+    "@semantic-release/release-notes-generator": "^13.0.0",
+    "conventional-changelog-conventionalcommits": "^7.0.2",
     "prettier": "^2.8.8",
-    "semantic-release": "^21.0.5",
-    "semver": "^7.5.2"
+    "semantic-release": "^23.0.8",
+    "semver": "^7.6.0"
   }
 }

package.json

@@ -6,7 +6,7 @@ DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)"
 libDir="$DIR/../.bootstrap"
 lockfile="$DIR/../stencil.lock"
 serviceYaml="$DIR/../service.yaml"
-gojqVersion="v0.12.14"
+gojqVersion="v0.12.16"
 
 # get_absolute_path returns the absolute path of a file
 get_absolute_path() {

scripts/devbase.sh

@@ -7,7 +7,8 @@ linters-settings:
   errcheck:
     check-blank: true
   govet:
-    check-shadowing: true
+    enable:
+      - shadow
   revive:
     rules:
       # Enable the default golint rules. We must include these because
@@ -56,9 +57,6 @@ linters-settings:
       - style
     disabled-checks:
       - whyNoLint # Doesn't seem to work properly
-      # Suggests bad simplifications (After is not identical to !Before).
-      # TODO(jkinkead): Remove when we have a version of go-critic with
-      # https://github.com/go-critic/go-critic/pull/1281 merged.
   funlen:
     lines: 500
     statements: 50
@@ -68,11 +66,11 @@ linters:
   disable-all: true
   enable:
     - bodyclose
+    - copyloopvar # Detects places where loop variables are copied.
     - dogsled
     - errcheck
     - errorlint
     - exhaustive # Checks exhaustiveness of enum switch statements.
-    - exportloopref # Checks for pointers to enclosing loop variables.
     - funlen
     - gochecknoinits
     - goconst
@@ -96,6 +94,7 @@ linters:
     - whitespace
 
 issues:
+  max-same-issues: 10
   exclude:
     # We allow error shadowing
     - 'declaration of "err" shadows declaration at'
@@ -125,6 +124,8 @@ issues:
       source: "^//go:generate "
 
 output:
-  format: colored-line-number
+  formats:
+    - format: colored-line-number
+      path: stdout
   sort-results: true
   print-severity: true

scripts/golangci.yml

@@ -1,29 +1,29 @@
-version: v1.38.0
+version: v1.40.1
 modules:
     - name: github.com/getoutreach/devbase
       url: https://github.com/getoutreach/devbase
-      version: v2.26.2
+      version: v2.29.4
     - name: github.com/getoutreach/stencil-actions
       url: https://github.com/getoutreach/stencil-actions
-      version: v0.4.0
+      version: v0.4.4
     - name: github.com/getoutreach/stencil-base
       url: https://github.com/getoutreach/stencil-base
-      version: v0.15.2
+      version: v0.16.3
     - name: github.com/getoutreach/stencil-circleci
       url: https://github.com/getoutreach/stencil-circleci
-      version: v1.12.1
+      version: v1.15.0
     - name: github.com/getoutreach/stencil-discovery
       url: https://github.com/getoutreach/stencil-discovery
-      version: v1.8.2
+      version: v1.8.7
     - name: github.com/getoutreach/stencil-golang
       url: https://github.com/getoutreach/stencil-golang
-      version: v1.22.0
+      version: v1.25.0
     - name: github.com/getoutreach/stencil-outreach
       url: https://github.com/getoutreach/stencil-outreach
-      version: v0.21.1
+      version: v0.24.0
     - name: github.com/getoutreach/stencil-pipeline
       url: https://github.com/getoutreach/stencil-pipeline
-      version: v1.1.0
+      version: v1.2.4
 files:
     - name: .circleci/config.yml
       template: .circleci/config.yml.tpl