Skip to content

Commit 35faf37

Browse files
Merge branch 'dev' into fix/database-pending-updates-set
2 parents dbd49c2 + af7e75d commit 35faf37

File tree

7 files changed

+164
-156
lines changed

7 files changed

+164
-156
lines changed

.github/workflows/codeql.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,13 @@ jobs:
2626
uses: actions/checkout@v5
2727

2828
- name: Initialize CodeQL
29-
uses: github/codeql-action/init@v3
29+
uses: github/codeql-action/init@v4
3030
with:
3131
languages: ${{ matrix.language }}
3232
build-mode: ${{ matrix.build-mode }}
3333
queries: security-and-quality
3434

3535
- name: Perform CodeQL Analysis
36-
uses: github/codeql-action/analyze@v3
36+
uses: github/codeql-action/analyze@v4
3737
with:
3838
category: "/language:${{matrix.language}}"

.github/workflows/integration_tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ jobs:
8383

8484
- name: Upload Test Report as Artifact
8585
if: always()
86-
uses: actions/upload-artifact@v4
86+
uses: actions/upload-artifact@v5
8787
with:
8888
name: test-report-${{ matrix.user }}
8989
if-no-files-found: ignore
@@ -170,7 +170,7 @@ jobs:
170170
run: pip3 install requests wheel boto3==1.35.99
171171

172172
- name: Download test report
173-
uses: actions/download-artifact@v5
173+
uses: actions/download-artifact@v6
174174

175175
- name: Get .xml reports from separate Artifacts into root folder
176176
run: rsync -av test-report-USER_*/* .

README.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,11 +58,17 @@ In order to run the full suite of Acceptance tests, run `make test-int`. Accepta
5858

5959
*Note:* Acceptance tests create real resources, and often cost money to run.
6060

61+
Initialize and update the e2e_scripts submodule before running Acceptance tests.
62+
63+
```sh
64+
git submodule update --init --recursive
65+
```
66+
6167
```sh
6268
make test-int
6369
```
6470

65-
Use the following command template to execute specific Acceptance test,
71+
Use the following command template to execute specific Acceptance test,
6672

6773
```shell
6874
# PKG_NAME is the directory in linode/ that contains the corresponding TEST_CASE

go.mod

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ go 1.24.0
55
toolchain go1.24.1
66

77
require (
8-
github.com/aws/aws-sdk-go-v2 v1.39.2
8+
github.com/aws/aws-sdk-go-v2 v1.39.5
99
github.com/aws/aws-sdk-go-v2/config v1.31.6
10-
github.com/aws/aws-sdk-go-v2/credentials v1.18.10
10+
github.com/aws/aws-sdk-go-v2/credentials v1.18.20
1111
github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.19.1
1212
github.com/aws/aws-sdk-go-v2/service/s3 v1.88.3
13-
github.com/aws/smithy-go v1.23.0
13+
github.com/aws/smithy-go v1.23.2
1414
github.com/go-resty/resty/v2 v2.16.5
1515
github.com/google/go-cmp v0.7.0
1616
github.com/google/uuid v1.6.0
@@ -19,13 +19,13 @@ require (
1919
github.com/hashicorp/go-version v1.7.0
2020
github.com/hashicorp/terraform-plugin-framework v1.16.1
2121
github.com/hashicorp/terraform-plugin-framework-nettypes v0.3.0
22-
github.com/hashicorp/terraform-plugin-framework-timeouts v0.5.0
22+
github.com/hashicorp/terraform-plugin-framework-timeouts v0.7.0
2323
github.com/hashicorp/terraform-plugin-framework-timetypes v0.5.0
2424
github.com/hashicorp/terraform-plugin-framework-validators v0.18.0
2525
github.com/hashicorp/terraform-plugin-go v0.29.0
2626
github.com/hashicorp/terraform-plugin-log v0.9.0
2727
github.com/hashicorp/terraform-plugin-mux v0.21.0
28-
github.com/hashicorp/terraform-plugin-sdk/v2 v2.37.0
28+
github.com/hashicorp/terraform-plugin-sdk/v2 v2.38.1
2929
github.com/hashicorp/terraform-plugin-testing v1.13.3
3030
github.com/linode/linodego v1.60.0
3131
github.com/linode/linodego/k8s v1.25.2
@@ -40,18 +40,18 @@ require (
4040
github.com/agext/levenshtein v1.2.2 // indirect
4141
github.com/apparentlymart/go-textseg/v15 v15.0.0 // indirect
4242
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.1 // indirect
43-
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.6 // indirect
44-
github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.9 // indirect
45-
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.9 // indirect
43+
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.12 // indirect
44+
github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.12 // indirect
45+
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.12 // indirect
4646
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.3 // indirect
4747
github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.9 // indirect
48-
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.1 // indirect
48+
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.2 // indirect
4949
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.8.9 // indirect
50-
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.9 // indirect
50+
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.12 // indirect
5151
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.9 // indirect
52-
github.com/aws/aws-sdk-go-v2/service/sso v1.29.1 // indirect
53-
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.34.2 // indirect
54-
github.com/aws/aws-sdk-go-v2/service/sts v1.38.2 // indirect
52+
github.com/aws/aws-sdk-go-v2/service/sso v1.30.0 // indirect
53+
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.4 // indirect
54+
github.com/aws/aws-sdk-go-v2/service/sts v1.39.0 // indirect
5555
github.com/cloudflare/circl v1.6.1 // indirect
5656
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
5757
github.com/emicklei/go-restful/v3 v3.9.0 // indirect
@@ -73,10 +73,10 @@ require (
7373
github.com/hashicorp/go-retryablehttp v0.7.7 // indirect
7474
github.com/hashicorp/go-uuid v1.0.3 // indirect
7575
github.com/hashicorp/hc-install v0.9.2 // indirect
76-
github.com/hashicorp/hcl/v2 v2.23.0 // indirect
76+
github.com/hashicorp/hcl/v2 v2.24.0 // indirect
7777
github.com/hashicorp/logutils v1.0.0 // indirect
78-
github.com/hashicorp/terraform-exec v0.23.0 // indirect
79-
github.com/hashicorp/terraform-json v0.25.0 // indirect
78+
github.com/hashicorp/terraform-exec v0.23.1 // indirect
79+
github.com/hashicorp/terraform-json v0.27.1 // indirect
8080
github.com/hashicorp/terraform-registry-address v0.4.0 // indirect
8181
github.com/hashicorp/terraform-svchost v0.1.1 // indirect
8282
github.com/hashicorp/yamux v0.1.2 // indirect
@@ -88,7 +88,7 @@ require (
8888
github.com/mattn/go-isatty v0.0.20 // indirect
8989
github.com/mitchellh/copystructure v1.2.0 // indirect
9090
github.com/mitchellh/go-testing-interface v1.14.1 // indirect
91-
github.com/mitchellh/go-wordwrap v1.0.0 // indirect
91+
github.com/mitchellh/go-wordwrap v1.0.1 // indirect
9292
github.com/mitchellh/mapstructure v1.5.0 // indirect
9393
github.com/mitchellh/reflectwalk v1.0.2 // indirect
9494
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
@@ -100,7 +100,7 @@ require (
100100
github.com/vmihailenco/msgpack v4.0.4+incompatible // indirect
101101
github.com/vmihailenco/msgpack/v5 v5.4.1 // indirect
102102
github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect
103-
github.com/zclconf/go-cty v1.16.3 // indirect
103+
github.com/zclconf/go-cty v1.17.0 // indirect
104104
golang.org/x/mod v0.27.0 // indirect
105105
golang.org/x/oauth2 v0.31.0 // indirect
106106
golang.org/x/sys v0.36.0 // indirect

0 commit comments

Comments
 (0)