Skip to content

Commit b879ccf

Browse files
author
Rohan Suryawanshi
authored
Merge pull request #631 from vmware/jenkins_sync_31.1.1_tf
Updated go.mod and go.sum with latest go sdk
2 parents 36d2271 + e9f185c commit b879ccf

7 files changed

+14
-35
lines changed

Diff for: ‎.github/workflows/golangci-lint.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@ jobs:
99
steps:
1010
- uses: actions/setup-go@v5
1111
with:
12-
go-version: 1.22
12+
go-version: 1.23
1313
- uses: actions/checkout@v4
1414
- name: golangci-lint
1515
uses: golangci/golangci-lint-action@v6
1616
with:
17-
version: v1.56.1
17+
version: v1.63.4
1818
args: --issues-exit-code=1 --verbose
1919
only-new-issues: true
20-
skip-pkg-cache: true
21-
skip-build-cache: true
20+
skip-cache: true
21+
skip-save-cache: true

Diff for: ‎.github/workflows/release.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,15 @@ jobs:
1717
name: Set up Go
1818
uses: actions/setup-go@v5
1919
with:
20-
go-version: 1.22
20+
go-version: 1.23
2121
-
2222
name: golangci-lint
2323
uses: golangci/golangci-lint-action@v6
2424
with:
25-
version: v1.56.1
25+
version: v1.63.4
2626
args: --issues-exit-code=1
27-
skip-pkg-cache: true
28-
skip-build-cache: true
27+
skip-cache: true
28+
skip-save-cache: true
2929
-
3030
name: Import GPG key
3131
id: import_gpg

Diff for: ‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ Requirements
1717
------------
1818

1919
- [Terraform](https://www.terraform.io/downloads.html) 0.12.x/0.13+ (0.11.x or lower is incompatible)
20-
- [Go](https://golang.org/doc/install) 1.22.6 (to build the provider plugin)
20+
- [Go](https://golang.org/doc/install) 1.23.4 (to build the provider plugin)
2121

2222
Building The Provider (Terraform v0.12+)
2323
----------------------------------------

Diff for: ‎avi/data_source_avi_controllerproperties_test.go

-9
Original file line numberDiff line numberDiff line change
@@ -45,14 +45,8 @@ func TestAVIDataSourceControllerPropertiesBasic(t *testing.T) {
4545
"avi_controllerproperties.testControllerProperties", "enable_memory_balancer", "true"),
4646
resource.TestCheckResourceAttr(
4747
"avi_controllerproperties.testControllerProperties", "max_dead_se_in_grp", "1"),
48-
resource.TestCheckResourceAttr(
49-
"avi_controllerproperties.testControllerProperties", "seupgrade_fabric_pool_size", "20"),
5048
resource.TestCheckResourceAttr(
5149
"avi_controllerproperties.testControllerProperties", "vs_key_rotate_period", "60"),
52-
resource.TestCheckResourceAttr(
53-
"avi_controllerproperties.testControllerProperties", "seupgrade_segroup_min_dead_timeout", "360"),
54-
resource.TestCheckResourceAttr(
55-
"avi_controllerproperties.testControllerProperties", "upgrade_lease_time", "360"),
5650
resource.TestCheckResourceAttr(
5751
"avi_controllerproperties.testControllerProperties", "se_create_timeout", "900"),
5852
resource.TestCheckResourceAttr(
@@ -125,10 +119,7 @@ resource "avi_controllerproperties" "testControllerProperties" {
125119
max_pcap_per_tenant = "4"
126120
enable_memory_balancer = true
127121
max_dead_se_in_grp = "1"
128-
seupgrade_fabric_pool_size = "20"
129122
vs_key_rotate_period = "60"
130-
seupgrade_segroup_min_dead_timeout = "360"
131-
upgrade_lease_time = "360"
132123
se_create_timeout = "900"
133124
query_host_fail = "180"
134125
bm_use_ansible = true

Diff for: ‎avi/resource_avi_controllerproperties_test.go

-12
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,6 @@ func TestAVIControllerPropertiesBasic(t *testing.T) {
4949
"avi_controllerproperties.testControllerProperties", "seupgrade_fabric_pool_size", "20"),
5050
resource.TestCheckResourceAttr(
5151
"avi_controllerproperties.testControllerProperties", "vs_key_rotate_period", "60"),
52-
resource.TestCheckResourceAttr(
53-
"avi_controllerproperties.testControllerProperties", "seupgrade_segroup_min_dead_timeout", "360"),
54-
resource.TestCheckResourceAttr(
55-
"avi_controllerproperties.testControllerProperties", "upgrade_lease_time", "360"),
5652
resource.TestCheckResourceAttr(
5753
"avi_controllerproperties.testControllerProperties", "se_create_timeout", "900"),
5854
resource.TestCheckResourceAttr(
@@ -139,10 +135,6 @@ func TestAVIControllerPropertiesBasic(t *testing.T) {
139135
"avi_controllerproperties.testControllerProperties", "seupgrade_fabric_pool_size", "20"),
140136
resource.TestCheckResourceAttr(
141137
"avi_controllerproperties.testControllerProperties", "vs_key_rotate_period", "60"),
142-
resource.TestCheckResourceAttr(
143-
"avi_controllerproperties.testControllerProperties", "seupgrade_segroup_min_dead_timeout", "360"),
144-
resource.TestCheckResourceAttr(
145-
"avi_controllerproperties.testControllerProperties", "upgrade_lease_time", "360"),
146138
resource.TestCheckResourceAttr(
147139
"avi_controllerproperties.testControllerProperties", "se_create_timeout", "900"),
148140
resource.TestCheckResourceAttr(
@@ -246,8 +238,6 @@ resource "avi_controllerproperties" "testControllerProperties" {
246238
max_dead_se_in_grp = "1"
247239
seupgrade_fabric_pool_size = "20"
248240
vs_key_rotate_period = "60"
249-
seupgrade_segroup_min_dead_timeout = "360"
250-
upgrade_lease_time = "360"
251241
se_create_timeout = "900"
252242
query_host_fail = "180"
253243
bm_use_ansible = true
@@ -294,8 +284,6 @@ resource "avi_controllerproperties" "testControllerProperties" {
294284
max_dead_se_in_grp = "1"
295285
seupgrade_fabric_pool_size = "20"
296286
vs_key_rotate_period = "60"
297-
seupgrade_segroup_min_dead_timeout = "360"
298-
upgrade_lease_time = "360"
299287
se_create_timeout = "900"
300288
query_host_fail = "180"
301289
bm_use_ansible = true

Diff for: ‎go.mod

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
module github.com/vmware/terraform-provider-avi
22

3-
go 1.22
3+
go 1.23.2
44

5-
toolchain go1.22.6
5+
toolchain go1.23.4
66

77
require (
88
github.com/hashicorp/terraform-plugin-sdk/v2 v2.20.0
9-
github.com/vmware/alb-sdk v0.0.0-20240605102317-cc857152bc67
9+
github.com/vmware/alb-sdk v0.0.0-20250204180729-3538c8c2fac5
1010
)
1111

1212
require (

Diff for: ‎go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -202,8 +202,8 @@ github.com/vmihailenco/msgpack/v4 v4.3.12 h1:07s4sz9IReOgdikxLTKNbBdqDMLsjPKXwvC
202202
github.com/vmihailenco/msgpack/v4 v4.3.12/go.mod h1:gborTTJjAo/GWTqqRjrLCn9pgNN+NXzzngzBKDPIqw4=
203203
github.com/vmihailenco/tagparser v0.1.1 h1:quXMXlA39OCbd2wAdTsGDlK9RkOk6Wuw+x37wVyIuWY=
204204
github.com/vmihailenco/tagparser v0.1.1/go.mod h1:OeAg3pn3UbLjkWt+rN9oFYB6u/cQgqMEUPoW2WPyhdI=
205-
github.com/vmware/alb-sdk v0.0.0-20240605102317-cc857152bc67 h1:AbMBmnIbvNTVS6u94U14BKABMNkmPaSFwFXzXOr4fE0=
206-
github.com/vmware/alb-sdk v0.0.0-20240605102317-cc857152bc67/go.mod h1:fuRb4saDY/xy/UMeMvyKYmcplNknEL9ysaqYSw7reNE=
205+
github.com/vmware/alb-sdk v0.0.0-20250204180729-3538c8c2fac5 h1:ODgT4czAkb5ZeSfFHxEO7T7cjzr/dPV1zdb5b7ofAVI=
206+
github.com/vmware/alb-sdk v0.0.0-20250204180729-3538c8c2fac5/go.mod h1:JIJgWAdD+NzyGU/cC5FOl7D8jXsNDuaAoi3zZtdGiMY=
207207
github.com/xanzy/ssh-agent v0.3.0 h1:wUMzuKtKilRgBAD1sUb8gOwwRr2FGoBVumcjoOACClI=
208208
github.com/xanzy/ssh-agent v0.3.0/go.mod h1:3s9xbODqPuuhK9JV1R321M/FlMZSBvE5aY6eAcqrDh0=
209209
github.com/zclconf/go-cty v1.1.0/go.mod h1:xnAOWiHeOqg2nWS62VtQ7pbOu17FtxJNW8RLEih+O3s=

0 commit comments

Comments
 (0)