Skip to content

Commit c3a84e7

Browse files
authored
chore: Update Go to 1.24.6 (#1416)
1 parent 683b669 commit c3a84e7

File tree

10 files changed

+801
-483
lines changed

10 files changed

+801
-483
lines changed

.github/workflows/code-health.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
5252
- name: golangci-lint
5353
uses: golangci/golangci-lint-action@4afd733a84b1f43292c63897423277bb7f4313a9
5454
with:
55-
version: v2.1.6 # Also update GOLANGCI_VERSION variable in Makefile when updating this version
55+
version: v2.3.1 # Also update GOLANGCI_VERSION variable in Makefile when updating this version
5656
working-directory: cfn-resources
5757
- name: actionlint
5858
run: |

.gitignore

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,13 @@
22
.DS_Store
33
._*
44

5-
# our logs
5+
# logs & backups
66
rpdk.log
7+
*.bak
8+
*.log
9+
*.mdc
10+
__debug_*
11+
*~
712

813
#compiled file
914
bin/
@@ -36,6 +41,10 @@ pytestdebug.log
3641
*.idea
3742
*.iml
3843
*.secrets
44+
.vscode
45+
.windsurf
46+
CLAUDE.md
47+
.claude
3948

4049
# generated markdown file with resource versions, will not be commited until we have mechanism to keep updated
4150
cfn-resources/resource-versions.md

Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ goarch=amd64
77
ldXflags=github.com/mongodb/mongodbatlas-cloudformation-resources/util.defaultLogLevel=info
88
ldXflagsD=github.com/mongodb/mongodbatlas-cloudformation-resources/util.defaultLogLevel=debug
99

10-
MOCKERY_VERSION=v2.42.1
11-
GOLANGCI_VERSION=v2.1.6 # Also update golangci-lint GH action in code-health.yml when updating this version
10+
MOCKERY_VERSION=v3.5.3
11+
GOLANGCI_VERSION=v2.3.1 # Also update golangci-lint GH action in code-health.yml when updating this version
1212

1313
.PHONY: submit
1414
submit:
@@ -32,7 +32,7 @@ tools: ## Install dev tools
3232
go install mvdan.cc/sh/v3/cmd/shfmt@latest
3333
go install github.com/rhysd/actionlint/cmd/actionlint@latest
3434
go install go.uber.org/mock/mockgen@latest
35-
go install github.com/vektra/mockery/v2@$(MOCKERY_VERSION)
35+
go install github.com/vektra/mockery/v3@$(MOCKERY_VERSION)
3636
curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(shell go env GOPATH)/bin $(GOLANGCI_VERSION)
3737

3838
.PHONY: link-git-hooks

cfn-resources/.mockery.yaml

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,14 @@
1-
with-expecter: true
2-
disable-version-string: true
31
dir: testutil/mocksvc
4-
outpkg: mocksvc
2+
structname: '{{.InterfaceName}}'
3+
pkgname: mocksvc
4+
template: testify
5+
template-data:
6+
unroll-variadic: true
57
filename: "{{ .InterfaceName | snakecase }}.go"
6-
mockname: "{{.InterfaceName}}"
7-
88
packages:
9-
go.mongodb.org/atlas-sdk/v20231115014/admin:
10-
interfaces:
11-
AtlasSearchApi:
12-
139
github.com/mongodb/mongodbatlas-cloudformation-resources/teams/cmd/resource/team-user:
1410
interfaces:
15-
TeamUsersAPI:
16-
11+
TeamUsersAPI: {}
12+
go.mongodb.org/atlas-sdk/v20231115014/admin:
13+
interfaces:
14+
AtlasSearchApi: {}

cfn-resources/cloud-backup-snapshot/.gitignore

Lines changed: 0 additions & 34 deletions
This file was deleted.

cfn-resources/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/mongodb/mongodbatlas-cloudformation-resources
22

3-
go 1.23.1
3+
go 1.24.6
44

55
// Replacing with local copy of Atlas SDK v20231115014 to support new AdvancedConfiguration in *admin.AdvancedClusterDescription
66
replace go.mongodb.org/atlas-sdk/v20231115014 => ../vendor/go.mongodb.org/atlas-sdk/v20231115014

cfn-resources/test/e2e/utility/util.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ package utility
1616

1717
import (
1818
"bytes"
19+
"context"
1920
"crypto/rand"
2021
"encoding/json"
2122
"fmt"
@@ -76,7 +77,8 @@ func PublishToPrivateRegistry(t *testing.T, rctx ResourceContext) {
7677

7778
func runShScript(t *testing.T, scriptPath string) ([]byte, error) {
7879
t.Helper()
79-
cmd := exec.Command(scriptPath)
80+
ctx := context.Background()
81+
cmd := exec.CommandContext(ctx, scriptPath)
8082
resp, err := cmd.CombinedOutput()
8183

8284
t.Logf("runShScript Output: %v", string(resp))

0 commit comments

Comments
 (0)