Skip to content

Commit ce40b2a

Browse files
Merge branch 'vulnerability-fix' into 'master'
fix vulnerabilities See merge request cidaas-management/terraform!147
2 parents 21a0c5a + cccc00f commit ce40b2a

16 files changed

+117
-40
lines changed

.gitlab-ci.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ get_prereqiusites:
1414
- never
1515

1616
acceptance_test:
17-
image: golang:1.24
17+
image: golang:1.24.4
1818
stage: test
1919
before_script:
2020
- echo "machine gitlab.widas.de login $GITLAB_LOGIN password $GITLAB_TOKEN" > ~/.netrc
@@ -26,6 +26,9 @@ acceptance_test:
2626
paths:
2727
- coverage.html
2828

29+
dependency_scanning:
30+
image: golang:1.24.4
31+
2932
# get_version is not required as we don't create tag by CI anymore
3033
get_version:
3134
stage: prepare

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,10 @@
66

77
- Fixed issue where `redirect_uris`, `allowed_logout_urls`, and `grant_types` fields were not being properly set during resource import based on client type requirements.
88
- Changed `order` attribute from optional to computed-only as it is now automatically managed by the backend service and cannot be set or updated from the client side.
9+
- vulnerability fix
910

11+
### Security
12+
- Upgraded Go toolchain from 1.21.0 to 1.24.4 for provider build to fix known standard library vulnerabilities
1013

1114
### 3.5.0
1215
- Added context support for proper HTTP request cancellation and timeout handling

go.mod

Lines changed: 25 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/Cidaas/terraform-provider-cidaas
22

3-
go 1.21.0
3+
go 1.24.4
44

55
require (
66
github.com/google/uuid v1.6.0
@@ -13,20 +13,28 @@ require (
1313
)
1414

1515
require (
16+
dario.cat/mergo v1.0.1 // indirect
1617
github.com/BurntSushi/toml v1.2.1 // indirect
1718
github.com/Kunde21/markdownfmt/v3 v3.1.0 // indirect
1819
github.com/Masterminds/goutils v1.1.1 // indirect
1920
github.com/Masterminds/semver/v3 v3.2.0 // indirect
2021
github.com/Masterminds/sprig/v3 v3.2.3 // indirect
21-
github.com/ProtonMail/go-crypto v1.1.0-alpha.2 // indirect
22+
github.com/Microsoft/go-winio v0.6.2 // indirect
23+
github.com/ProtonMail/go-crypto v1.3.0 // indirect
2224
github.com/agext/levenshtein v1.2.2 // indirect
2325
github.com/apparentlymart/go-textseg/v15 v15.0.0 // indirect
2426
github.com/armon/go-radix v1.0.0 // indirect
2527
github.com/bgentry/speakeasy v0.1.0 // indirect
2628
github.com/bmatcuk/doublestar/v4 v4.6.1 // indirect
27-
github.com/cloudflare/circl v1.3.7 // indirect
29+
github.com/cloudflare/circl v1.6.1 // indirect
30+
github.com/cyphar/filepath-securejoin v0.4.1 // indirect
2831
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
32+
github.com/emirpasic/gods v1.18.1 // indirect
2933
github.com/fatih/color v1.17.0 // indirect
34+
github.com/go-git/gcfg/v2 v2.0.2 // indirect
35+
github.com/go-git/go-billy/v6 v6.0.0-20250627091229-31e2a16eef30 // indirect
36+
github.com/go-git/go-git/v6 v6.0.0-20250728093604-6aaf1933ecab // indirect
37+
github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect
3038
github.com/golang/protobuf v1.5.4 // indirect
3139
github.com/google/go-cmp v0.6.0 // indirect
3240
github.com/hashicorp/cli v1.1.6 // indirect
@@ -50,6 +58,7 @@ require (
5058
github.com/hashicorp/yamux v0.1.1 // indirect
5159
github.com/huandu/xstrings v1.3.3 // indirect
5260
github.com/imdario/mergo v0.3.15 // indirect
61+
github.com/kevinburke/ssh_config v1.2.0 // indirect
5362
github.com/mattn/go-colorable v0.1.13 // indirect
5463
github.com/mattn/go-isatty v0.0.20 // indirect
5564
github.com/mattn/go-runewidth v0.0.9 // indirect
@@ -59,30 +68,33 @@ require (
5968
github.com/mitchellh/mapstructure v1.5.0 // indirect
6069
github.com/mitchellh/reflectwalk v1.0.2 // indirect
6170
github.com/oklog/run v1.1.0 // indirect
71+
github.com/pjbgf/sha1cd v0.4.0 // indirect
6272
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
6373
github.com/posener/complete v1.2.3 // indirect
74+
github.com/sergi/go-diff v1.4.0 // indirect
6475
github.com/shopspring/decimal v1.3.1 // indirect
6576
github.com/spf13/cast v1.5.0 // indirect
66-
github.com/stretchr/testify v1.9.0 // indirect
77+
github.com/stretchr/testify v1.10.0 // indirect
6778
github.com/vmihailenco/msgpack v4.0.4+incompatible // indirect
6879
github.com/vmihailenco/msgpack/v5 v5.4.1 // indirect
6980
github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect
7081
github.com/yuin/goldmark v1.7.1 // indirect
7182
github.com/yuin/goldmark-meta v1.1.0 // indirect
7283
github.com/zclconf/go-cty v1.14.4 // indirect
7384
go.abhg.dev/goldmark/frontmatter v0.2.0 // indirect
74-
golang.org/x/crypto v0.26.0 // indirect
75-
golang.org/x/exp v0.0.0-20230626212559-97b1e661b5df // indirect
76-
golang.org/x/mod v0.17.0 // indirect
77-
golang.org/x/net v0.28.0 // indirect
78-
golang.org/x/sync v0.8.0 // indirect
79-
golang.org/x/sys v0.24.0 // indirect
80-
golang.org/x/text v0.17.0 // indirect
81-
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
85+
golang.org/x/crypto v0.40.0 // indirect
86+
golang.org/x/exp v0.0.0-20250531010427-b6e5de432a8b // indirect
87+
golang.org/x/mod v0.25.0 // indirect
88+
golang.org/x/net v0.42.0 // indirect
89+
golang.org/x/oauth2 v0.30.0 // indirect
90+
golang.org/x/sync v0.16.0 // indirect
91+
golang.org/x/sys v0.34.0 // indirect
92+
golang.org/x/text v0.27.0 // indirect
93+
golang.org/x/tools v0.34.0 // indirect
8294
google.golang.org/appengine v1.6.8 // indirect
8395
google.golang.org/genproto/googleapis/rpc v0.0.0-20240814211410-ddb44dafa142 // indirect
8496
google.golang.org/grpc v1.65.0 // indirect
8597
google.golang.org/protobuf v1.34.2 // indirect
86-
gopkg.in/yaml.v2 v2.3.0 // indirect
98+
gopkg.in/yaml.v2 v2.4.0 // indirect
8799
gopkg.in/yaml.v3 v3.0.1 // indirect
88100
)

0 commit comments

Comments
 (0)