diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml index 1bd86370..a53602b1 100644 --- a/.github/workflows/golangci-lint.yml +++ b/.github/workflows/golangci-lint.yml @@ -9,13 +9,13 @@ jobs: steps: - uses: actions/setup-go@v5 with: - go-version: 1.22 + go-version: 1.23 - uses: actions/checkout@v4 - name: golangci-lint uses: golangci/golangci-lint-action@v6 with: - version: v1.56.1 + version: v1.63.4 args: --issues-exit-code=1 --verbose only-new-issues: true - skip-pkg-cache: true - skip-build-cache: true + skip-cache: true + skip-save-cache: true diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 763f11a9..28b21f87 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -17,15 +17,15 @@ jobs: name: Set up Go uses: actions/setup-go@v5 with: - go-version: 1.22 + go-version: 1.23 - name: golangci-lint uses: golangci/golangci-lint-action@v6 with: - version: v1.56.1 + version: v1.63.4 args: --issues-exit-code=1 - skip-pkg-cache: true - skip-build-cache: true + skip-cache: true + skip-save-cache: true - name: Import GPG key id: import_gpg diff --git a/README.md b/README.md index 2493543e..32e89efe 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ Requirements ------------ - [Terraform](https://www.terraform.io/downloads.html) 0.12.x/0.13+ (0.11.x or lower is incompatible) -- [Go](https://golang.org/doc/install) 1.22.6 (to build the provider plugin) +- [Go](https://golang.org/doc/install) 1.23.4 (to build the provider plugin) Building The Provider (Terraform v0.12+) ---------------------------------------- diff --git a/avi/data_source_avi_controllerproperties_test.go b/avi/data_source_avi_controllerproperties_test.go index ab0a9bce..f2d47ff8 100644 --- a/avi/data_source_avi_controllerproperties_test.go +++ b/avi/data_source_avi_controllerproperties_test.go @@ -45,14 +45,8 @@ func TestAVIDataSourceControllerPropertiesBasic(t *testing.T) { "avi_controllerproperties.testControllerProperties", "enable_memory_balancer", "true"), resource.TestCheckResourceAttr( "avi_controllerproperties.testControllerProperties", "max_dead_se_in_grp", "1"), - resource.TestCheckResourceAttr( - "avi_controllerproperties.testControllerProperties", "seupgrade_fabric_pool_size", "20"), resource.TestCheckResourceAttr( "avi_controllerproperties.testControllerProperties", "vs_key_rotate_period", "60"), - resource.TestCheckResourceAttr( - "avi_controllerproperties.testControllerProperties", "seupgrade_segroup_min_dead_timeout", "360"), - resource.TestCheckResourceAttr( - "avi_controllerproperties.testControllerProperties", "upgrade_lease_time", "360"), resource.TestCheckResourceAttr( "avi_controllerproperties.testControllerProperties", "se_create_timeout", "900"), resource.TestCheckResourceAttr( @@ -125,10 +119,7 @@ resource "avi_controllerproperties" "testControllerProperties" { max_pcap_per_tenant = "4" enable_memory_balancer = true max_dead_se_in_grp = "1" - seupgrade_fabric_pool_size = "20" vs_key_rotate_period = "60" - seupgrade_segroup_min_dead_timeout = "360" - upgrade_lease_time = "360" se_create_timeout = "900" query_host_fail = "180" bm_use_ansible = true diff --git a/avi/resource_avi_controllerproperties_test.go b/avi/resource_avi_controllerproperties_test.go index f7d4a404..5cc1d176 100644 --- a/avi/resource_avi_controllerproperties_test.go +++ b/avi/resource_avi_controllerproperties_test.go @@ -49,10 +49,6 @@ func TestAVIControllerPropertiesBasic(t *testing.T) { "avi_controllerproperties.testControllerProperties", "seupgrade_fabric_pool_size", "20"), resource.TestCheckResourceAttr( "avi_controllerproperties.testControllerProperties", "vs_key_rotate_period", "60"), - resource.TestCheckResourceAttr( - "avi_controllerproperties.testControllerProperties", "seupgrade_segroup_min_dead_timeout", "360"), - resource.TestCheckResourceAttr( - "avi_controllerproperties.testControllerProperties", "upgrade_lease_time", "360"), resource.TestCheckResourceAttr( "avi_controllerproperties.testControllerProperties", "se_create_timeout", "900"), resource.TestCheckResourceAttr( @@ -139,10 +135,6 @@ func TestAVIControllerPropertiesBasic(t *testing.T) { "avi_controllerproperties.testControllerProperties", "seupgrade_fabric_pool_size", "20"), resource.TestCheckResourceAttr( "avi_controllerproperties.testControllerProperties", "vs_key_rotate_period", "60"), - resource.TestCheckResourceAttr( - "avi_controllerproperties.testControllerProperties", "seupgrade_segroup_min_dead_timeout", "360"), - resource.TestCheckResourceAttr( - "avi_controllerproperties.testControllerProperties", "upgrade_lease_time", "360"), resource.TestCheckResourceAttr( "avi_controllerproperties.testControllerProperties", "se_create_timeout", "900"), resource.TestCheckResourceAttr( @@ -246,8 +238,6 @@ resource "avi_controllerproperties" "testControllerProperties" { max_dead_se_in_grp = "1" seupgrade_fabric_pool_size = "20" vs_key_rotate_period = "60" - seupgrade_segroup_min_dead_timeout = "360" - upgrade_lease_time = "360" se_create_timeout = "900" query_host_fail = "180" bm_use_ansible = true @@ -294,8 +284,6 @@ resource "avi_controllerproperties" "testControllerProperties" { max_dead_se_in_grp = "1" seupgrade_fabric_pool_size = "20" vs_key_rotate_period = "60" - seupgrade_segroup_min_dead_timeout = "360" - upgrade_lease_time = "360" se_create_timeout = "900" query_host_fail = "180" bm_use_ansible = true diff --git a/go.mod b/go.mod index 4227e3e4..45741f1c 100644 --- a/go.mod +++ b/go.mod @@ -1,12 +1,12 @@ module github.com/vmware/terraform-provider-avi -go 1.22 +go 1.23.2 -toolchain go1.22.6 +toolchain go1.23.4 require ( github.com/hashicorp/terraform-plugin-sdk/v2 v2.20.0 - github.com/vmware/alb-sdk v0.0.0-20240605102317-cc857152bc67 + github.com/vmware/alb-sdk v0.0.0-20250204180729-3538c8c2fac5 ) require ( diff --git a/go.sum b/go.sum index 025f97f3..706ce28d 100644 --- a/go.sum +++ b/go.sum @@ -202,8 +202,8 @@ github.com/vmihailenco/msgpack/v4 v4.3.12 h1:07s4sz9IReOgdikxLTKNbBdqDMLsjPKXwvC github.com/vmihailenco/msgpack/v4 v4.3.12/go.mod h1:gborTTJjAo/GWTqqRjrLCn9pgNN+NXzzngzBKDPIqw4= github.com/vmihailenco/tagparser v0.1.1 h1:quXMXlA39OCbd2wAdTsGDlK9RkOk6Wuw+x37wVyIuWY= github.com/vmihailenco/tagparser v0.1.1/go.mod h1:OeAg3pn3UbLjkWt+rN9oFYB6u/cQgqMEUPoW2WPyhdI= -github.com/vmware/alb-sdk v0.0.0-20240605102317-cc857152bc67 h1:AbMBmnIbvNTVS6u94U14BKABMNkmPaSFwFXzXOr4fE0= -github.com/vmware/alb-sdk v0.0.0-20240605102317-cc857152bc67/go.mod h1:fuRb4saDY/xy/UMeMvyKYmcplNknEL9ysaqYSw7reNE= +github.com/vmware/alb-sdk v0.0.0-20250204180729-3538c8c2fac5 h1:ODgT4czAkb5ZeSfFHxEO7T7cjzr/dPV1zdb5b7ofAVI= +github.com/vmware/alb-sdk v0.0.0-20250204180729-3538c8c2fac5/go.mod h1:JIJgWAdD+NzyGU/cC5FOl7D8jXsNDuaAoi3zZtdGiMY= github.com/xanzy/ssh-agent v0.3.0 h1:wUMzuKtKilRgBAD1sUb8gOwwRr2FGoBVumcjoOACClI= github.com/xanzy/ssh-agent v0.3.0/go.mod h1:3s9xbODqPuuhK9JV1R321M/FlMZSBvE5aY6eAcqrDh0= github.com/zclconf/go-cty v1.1.0/go.mod h1:xnAOWiHeOqg2nWS62VtQ7pbOu17FtxJNW8RLEih+O3s=