Skip to content

Commit ca52510

Browse files
authored
Upgrade dependencies and migrate to stdlib packages (#2059) (#2300)
Replace golang.org/x/exp/slices and golang.org/x/exp/maps with the standard library equivalents. (cherry picked from commit 246fab2)
1 parent d2e171e commit ca52510

6 files changed

Lines changed: 4 additions & 8 deletions

go.mod

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ require (
1515
github.com/vmware/vsphere-automation-sdk-go/services/nsxt v0.12.1-0.20260614145640-9b3a306dd40d
1616
github.com/vmware/vsphere-automation-sdk-go/services/nsxt-gm v0.9.1-0.20241118070726-666c7cd6e466
1717
github.com/vmware/vsphere-automation-sdk-go/services/nsxt-mp v0.6.1-0.20241118070726-666c7cd6e466
18-
golang.org/x/exp v0.0.0-20260813180055-c1d0aacb2297
1918
)
2019

2120
require (

go.sum

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -202,8 +202,6 @@ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACk
202202
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
203203
golang.org/x/crypto v0.55.0 h1:+KWHjbgOaAQ66dh/YlkZKHlz9ZUlq61AFirAR9ntP8M=
204204
golang.org/x/crypto v0.55.0/go.mod h1:uq0V9dE/fzQuJtbnL+2EhWOE63vo164FY8xqEnV9xis=
205-
golang.org/x/exp v0.0.0-20260813180055-c1d0aacb2297 h1:YXnL44eJ77R+ji4/ooy8UsXIhz+lbi2Qgdlc8iRN0gY=
206-
golang.org/x/exp v0.0.0-20260813180055-c1d0aacb2297/go.mod h1:Mkmymgv+uMpSQ/XxJ/7GpdrdYoqm3u72jEbpCLiJmNk=
207205
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
208206
golang.org/x/mod v0.39.0 h1:UF5zwQdCRRUpHfyPwr7d4UrGiVeldIsogtzWVnczL74=
209207
golang.org/x/mod v0.39.0/go.mod h1:bvIbwjQ0HUFFf5AKukeeYQG4ZBUG9yxQbR9aEweIwYY=

nsxt/data_source_nsxt_upgrade_prepare_ready.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@ package nsxt
77
import (
88
"errors"
99
"fmt"
10+
"slices"
1011

1112
"github.com/vmware/terraform-provider-nsxt/nsxt/util"
1213

1314
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
1415
nsxModel "github.com/vmware/vsphere-automation-sdk-go/services/nsxt-mp/nsx/model"
1516
"github.com/vmware/vsphere-automation-sdk-go/services/nsxt-mp/nsx/upgrade"
16-
"golang.org/x/exp/slices"
1717
)
1818

1919
func dataSourceNsxtUpgradePrepareReady() *schema.Resource {

nsxt/provider.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ import (
1717
"net/url"
1818
"os"
1919
"regexp"
20+
"slices"
2021
"strings"
2122
"time"
2223

@@ -32,7 +33,6 @@ import (
3233
"github.com/vmware/vsphere-automation-sdk-go/runtime/security"
3334
"github.com/vmware/vsphere-automation-sdk-go/services/nsxt-mp/nsx"
3435
"github.com/vmware/vsphere-automation-sdk-go/services/nsxt-mp/nsx/model"
35-
"golang.org/x/exp/slices"
3636
)
3737

3838
var defaultRetryOnStatusCodes = []int{400, 409, 429, 500, 503, 504}

nsxt/resource_nsxt_edge_transport_node.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ package nsxt
77
import (
88
"fmt"
99
"log"
10+
"maps"
1011
"reflect"
1112
"strings"
1213
"time"
@@ -22,7 +23,6 @@ import (
2223
"github.com/vmware/vsphere-automation-sdk-go/services/nsxt-mp/nsx/transport_nodes"
2324
"github.com/vmware/vsphere-automation-sdk-go/services/nsxt/infra"
2425
"github.com/vmware/vsphere-automation-sdk-go/services/nsxt/model"
25-
"golang.org/x/exp/maps"
2626

2727
"github.com/vmware/terraform-provider-nsxt/nsxt/util"
2828
)

nsxt/resource_nsxt_manager_cluster.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,10 @@ import (
99
"log"
1010
"math/rand"
1111
"net"
12+
"slices"
1213
"strings"
1314
"time"
1415

15-
"golang.org/x/exp/slices"
16-
1716
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
1817
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
1918
"github.com/hashicorp/terraform-plugin-testing/helper/resource"

0 commit comments

Comments
 (0)