Skip to content

Commit

Permalink
vmware: consolidating on/updating to API Version 2022-05-01 (#21458)
Browse files Browse the repository at this point in the history 
* vendor: updating `vmware` to `2022-05-01`

* vmware: updating to API Version `2022-05-01`

* vmware: breaking changes in API version 2022-05-01
  • Loading branch information
@tombuildsstuff
tombuildsstuff authored Apr 19, 2023
1 parent ac81d1b commit ae2d233
Show file tree
Hide file tree
Showing 91 changed files with 483 additions and 91 deletions.
8 changes: 4 additions & 4 deletions internal/services/vmware/client/client.go
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package client

import (
"github.com/hashicorp/go-azure-sdk/resource-manager/vmware/2020-03-20/authorizations"
"github.com/hashicorp/go-azure-sdk/resource-manager/vmware/2020-03-20/clusters"
"github.com/hashicorp/go-azure-sdk/resource-manager/vmware/2020-03-20/privateclouds"
"github.com/hashicorp/go-azure-sdk/resource-manager/vmware/2021-12-01/datastores"
"github.com/hashicorp/go-azure-sdk/resource-manager/vmware/2022-05-01/authorizations"
"github.com/hashicorp/go-azure-sdk/resource-manager/vmware/2022-05-01/clusters"
"github.com/hashicorp/go-azure-sdk/resource-manager/vmware/2022-05-01/datastores"
"github.com/hashicorp/go-azure-sdk/resource-manager/vmware/2022-05-01/privateclouds"
"github.com/hashicorp/terraform-provider-azurerm/internal/common"
)

Expand Down
2 changes: 1 addition & 1 deletion internal/services/vmware/validate/cluster_id.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package validate
import (
"fmt"

"github.com/hashicorp/go-azure-sdk/resource-manager/vmware/2020-03-20/clusters"
"github.com/hashicorp/go-azure-sdk/resource-manager/vmware/2022-05-01/clusters"
)

func ClusterID(input interface{}, key string) (warnings []string, errors []error) {
Expand Down
2 changes: 1 addition & 1 deletion internal/services/vmware/validate/express_route_authorization_id.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package validate
import (
"fmt"

"github.com/hashicorp/go-azure-sdk/resource-manager/vmware/2020-03-20/authorizations"
"github.com/hashicorp/go-azure-sdk/resource-manager/vmware/2022-05-01/authorizations"
)

func ExpressRouteAuthorizationID(input interface{}, key string) (warnings []string, errors []error) {
Expand Down
2 changes: 1 addition & 1 deletion internal/services/vmware/validate/private_cloud_id.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package validate
import (
"fmt"

"github.com/hashicorp/go-azure-sdk/resource-manager/vmware/2020-03-20/privateclouds"
"github.com/hashicorp/go-azure-sdk/resource-manager/vmware/2022-05-01/privateclouds"
)

func PrivateCloudID(input interface{}, key string) (warnings []string, errors []error) {
Expand Down
9 changes: 5 additions & 4 deletions internal/services/vmware/vmware_cluster_resource.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,10 @@ import (
"log"
"time"

"github.com/hashicorp/go-azure-helpers/lang/pointer"
"github.com/hashicorp/go-azure-helpers/lang/response"
"github.com/hashicorp/go-azure-sdk/resource-manager/vmware/2020-03-20/clusters"
"github.com/hashicorp/go-azure-sdk/resource-manager/vmware/2020-03-20/privateclouds"
"github.com/hashicorp/go-azure-sdk/resource-manager/vmware/2022-05-01/clusters"
"github.com/hashicorp/go-azure-sdk/resource-manager/vmware/2022-05-01/privateclouds"
"github.com/hashicorp/terraform-provider-azurerm/helpers/tf"
"github.com/hashicorp/terraform-provider-azurerm/internal/clients"
"github.com/hashicorp/terraform-provider-azurerm/internal/services/vmware/validate"
Expand Down Expand Up @@ -113,8 +114,8 @@ func resourceVmwareClusterCreate(d *pluginsdk.ResourceData, meta interface{}) er
Sku: clusters.Sku{
Name: d.Get("sku_name").(string),
},
Properties: clusters.ClusterProperties{
ClusterSize: int64(d.Get("cluster_node_count").(int)),
Properties: &clusters.CommonClusterProperties{
ClusterSize: pointer.To(int64(d.Get("cluster_node_count").(int))),
},
}

Expand Down
2 changes: 1 addition & 1 deletion internal/services/vmware/vmware_cluster_resource_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"fmt"
"testing"

"github.com/hashicorp/go-azure-sdk/resource-manager/vmware/2020-03-20/clusters"
"github.com/hashicorp/go-azure-sdk/resource-manager/vmware/2022-05-01/clusters"
"github.com/hashicorp/terraform-provider-azurerm/internal/acceptance"
"github.com/hashicorp/terraform-provider-azurerm/internal/acceptance/check"
"github.com/hashicorp/terraform-provider-azurerm/internal/clients"
Expand Down
4 changes: 2 additions & 2 deletions internal/services/vmware/vmware_express_route_authorization_resource.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"time"

"github.com/hashicorp/go-azure-helpers/lang/response"
"github.com/hashicorp/go-azure-sdk/resource-manager/vmware/2020-03-20/authorizations"
"github.com/hashicorp/go-azure-sdk/resource-manager/vmware/2020-03-20/privateclouds"
"github.com/hashicorp/go-azure-sdk/resource-manager/vmware/2022-05-01/authorizations"
"github.com/hashicorp/go-azure-sdk/resource-manager/vmware/2022-05-01/privateclouds"
"github.com/hashicorp/terraform-provider-azurerm/helpers/tf"
"github.com/hashicorp/terraform-provider-azurerm/internal/clients"
"github.com/hashicorp/terraform-provider-azurerm/internal/services/vmware/validate"
Expand Down
2 changes: 1 addition & 1 deletion internal/services/vmware/vmware_express_route_authorization_resource_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"fmt"
"testing"

"github.com/hashicorp/go-azure-sdk/resource-manager/vmware/2020-03-20/authorizations"
"github.com/hashicorp/go-azure-sdk/resource-manager/vmware/2022-05-01/authorizations"
"github.com/hashicorp/terraform-provider-azurerm/internal/acceptance"
"github.com/hashicorp/terraform-provider-azurerm/internal/acceptance/check"
"github.com/hashicorp/terraform-provider-azurerm/internal/clients"
Expand Down
4 changes: 2 additions & 2 deletions internal/services/vmware/vmware_private_cloud.go
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package vmware

import (
"github.com/hashicorp/go-azure-sdk/resource-manager/vmware/2020-03-20/privateclouds"
"github.com/hashicorp/go-azure-sdk/resource-manager/vmware/2022-05-01/privateclouds"
"github.com/hashicorp/terraform-provider-azurerm/utils"
)

func flattenPrivateCloudManagementCluster(input privateclouds.ManagementCluster) []interface{} {
func flattenPrivateCloudManagementCluster(input privateclouds.CommonClusterProperties) []interface{} {
return []interface{}{
map[string]interface{}{
"size": input.ClusterSize,
Expand Down
2 changes: 1 addition & 1 deletion internal/services/vmware/vmware_private_cloud_data_source.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"github.com/hashicorp/go-azure-helpers/resourcemanager/commonschema"
"github.com/hashicorp/go-azure-helpers/resourcemanager/location"
"github.com/hashicorp/go-azure-helpers/resourcemanager/tags"
"github.com/hashicorp/go-azure-sdk/resource-manager/vmware/2020-03-20/privateclouds"
"github.com/hashicorp/go-azure-sdk/resource-manager/vmware/2022-05-01/privateclouds"
"github.com/hashicorp/terraform-provider-azurerm/internal/clients"
"github.com/hashicorp/terraform-provider-azurerm/internal/tf/pluginsdk"
"github.com/hashicorp/terraform-provider-azurerm/internal/timeouts"
Expand Down
4 changes: 2 additions & 2 deletions internal/services/vmware/vmware_private_cloud_netapp_file_volume_attachment_resource.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"time"

"github.com/hashicorp/go-azure-helpers/lang/response"
"github.com/hashicorp/go-azure-sdk/resource-manager/vmware/2020-03-20/clusters"
"github.com/hashicorp/go-azure-sdk/resource-manager/vmware/2021-12-01/datastores"
"github.com/hashicorp/go-azure-sdk/resource-manager/vmware/2022-05-01/clusters"
"github.com/hashicorp/go-azure-sdk/resource-manager/vmware/2022-05-01/datastores"
"github.com/hashicorp/terraform-provider-azurerm/internal/sdk"
"github.com/hashicorp/terraform-provider-azurerm/internal/services/vmware/validate"
"github.com/hashicorp/terraform-provider-azurerm/internal/tf/pluginsdk"
Expand Down
2 changes: 1 addition & 1 deletion internal/services/vmware/vmware_private_cloud_netapp_file_volume_attachment_resource_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"testing"

"github.com/hashicorp/go-azure-helpers/lang/response"
"github.com/hashicorp/go-azure-sdk/resource-manager/vmware/2021-12-01/datastores"
"github.com/hashicorp/go-azure-sdk/resource-manager/vmware/2022-05-01/datastores"
"github.com/hashicorp/terraform-provider-azurerm/internal/acceptance"
"github.com/hashicorp/terraform-provider-azurerm/internal/acceptance/check"
"github.com/hashicorp/terraform-provider-azurerm/internal/clients"
Expand Down
19 changes: 12 additions & 7 deletions internal/services/vmware/vmware_private_cloud_resource.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,12 @@ import (
"log"
"time"

"github.com/hashicorp/go-azure-helpers/lang/pointer"
"github.com/hashicorp/go-azure-helpers/lang/response"
"github.com/hashicorp/go-azure-helpers/resourcemanager/commonschema"
"github.com/hashicorp/go-azure-helpers/resourcemanager/location"
"github.com/hashicorp/go-azure-helpers/resourcemanager/tags"
"github.com/hashicorp/go-azure-sdk/resource-manager/vmware/2020-03-20/privateclouds"
"github.com/hashicorp/go-azure-sdk/resource-manager/vmware/2022-05-01/privateclouds"
"github.com/hashicorp/terraform-provider-azurerm/helpers/tf"
"github.com/hashicorp/terraform-provider-azurerm/internal/clients"
"github.com/hashicorp/terraform-provider-azurerm/internal/tf/pluginsdk"
Expand Down Expand Up @@ -220,9 +221,9 @@ func resourceVmwarePrivateCloudCreate(d *pluginsdk.ResourceData, meta interface{
Sku: privateclouds.Sku{
Name: d.Get("sku_name").(string),
},
Properties: privateclouds.PrivateCloudProperties{
ManagementCluster: privateclouds.ManagementCluster{
ClusterSize: int64(d.Get("management_cluster.0.size").(int)),
Properties: &privateclouds.PrivateCloudProperties{
ManagementCluster: privateclouds.CommonClusterProperties{
ClusterSize: pointer.To(int64(d.Get("management_cluster.0.size").(int))),
},
NetworkBlock: d.Get("network_subnet_cidr").(string),
Internet: &internet,
Expand All @@ -236,12 +237,16 @@ func resourceVmwarePrivateCloudCreate(d *pluginsdk.ResourceData, meta interface{
return fmt.Errorf("creating %s: %+v", id, err)
}

deadline, ok := ctx.Deadline()
if !ok {
return fmt.Errorf("internal-error: context had no deadline")
}
stateConf := &pluginsdk.StateChangeConf{
Pending: []string{string(privateclouds.PrivateCloudProvisioningStateBuilding)},
Target: []string{string(privateclouds.PrivateCloudProvisioningStateSucceeded)},
Refresh: privateCloudStateRefreshFunc(ctx, client, id),
MinTimeout: 15 * time.Second,
Timeout: d.Timeout(pluginsdk.TimeoutCreate),
Timeout: time.Until(deadline),
}

if _, err := stateConf.WaitForStateContext(ctx); err != nil {
Expand Down Expand Up @@ -331,8 +336,8 @@ func resourceVmwarePrivateCloudUpdate(d *pluginsdk.ResourceData, meta interface{
}

if d.HasChange("management_cluster") {
privateCloudUpdate.Properties.ManagementCluster = &privateclouds.ManagementCluster{
ClusterSize: int64(d.Get("management_cluster.0.size").(int)),
privateCloudUpdate.Properties.ManagementCluster = &privateclouds.CommonClusterProperties{
ClusterSize: pointer.To(int64(d.Get("management_cluster.0.size").(int))),
}
}

Expand Down
2 changes: 1 addition & 1 deletion internal/services/vmware/vmware_private_cloud_resource_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"fmt"
"testing"

"github.com/hashicorp/go-azure-sdk/resource-manager/vmware/2020-03-20/privateclouds"
"github.com/hashicorp/go-azure-sdk/resource-manager/vmware/2022-05-01/privateclouds"
"github.com/hashicorp/terraform-provider-azurerm/internal/acceptance"
"github.com/hashicorp/terraform-provider-azurerm/internal/acceptance/check"
"github.com/hashicorp/terraform-provider-azurerm/internal/clients"
Expand Down
12 changes: 0 additions & 12 deletions ...b.com/hashicorp/go-azure-sdk/resource-manager/vmware/2020-03-20/clusters/model_cluster.go
View file

This file was deleted.

14 changes: 0 additions & 14 deletions ...icorp/go-azure-sdk/resource-manager/vmware/2020-03-20/privateclouds/model_privatecloud.go
View file

This file was deleted.

10 changes: 0 additions & 10 deletions ...dk/resource-manager/vmware/2020-03-20/privateclouds/model_privatecloudupdateproperties.go
View file

This file was deleted.

6 changes: 3 additions & 3 deletions ...mware/2020-03-20/authorizations/README.md → ...mware/2022-05-01/authorizations/README.md
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 ...mware/2020-03-20/authorizations/client.go → ...mware/2022-05-01/authorizations/client.go
View file
File renamed without changes.
3 changes: 3 additions & 0 deletions ...re/2020-03-20/authorizations/constants.go → ...re/2022-05-01/authorizations/constants.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 ...-03-20/authorizations/id_authorization.go → ...-05-01/authorizations/id_authorization.go
View file
File renamed without changes.
0 ...0-03-20/authorizations/id_privatecloud.go → ...2-05-01/authorizations/id_privatecloud.go
View file
File renamed without changes.
0 ...zations/method_createorupdate_autorest.go → ...zations/method_createorupdate_autorest.go
View file
File renamed without changes.
0 .../authorizations/method_delete_autorest.go → .../authorizations/method_delete_autorest.go
View file
File renamed without changes.
0 ...-20/authorizations/method_get_autorest.go → ...-01/authorizations/method_get_autorest.go
View file
File renamed without changes.
0 ...20/authorizations/method_list_autorest.go → ...01/authorizations/method_list_autorest.go
View file
File renamed without changes.
0 ...ations/model_expressrouteauthorization.go → ...ations/model_expressrouteauthorization.go
View file
File renamed without changes.
1 change: 1 addition & 0 deletions ...el_expressrouteauthorizationproperties.go → ...el_expressrouteauthorizationproperties.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 ...e/2020-03-20/authorizations/predicates.go → ...e/2022-05-01/authorizations/predicates.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion ...ware/2020-03-20/authorizations/version.go → ...ware/2022-05-01/authorizations/version.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions ...ager/vmware/2020-03-20/clusters/README.md → ...ager/vmware/2022-05-01/clusters/README.md
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 ...ager/vmware/2020-03-20/clusters/client.go → ...ager/vmware/2022-05-01/clusters/client.go
View file
File renamed without changes.
3 changes: 3 additions & 0 deletions ...r/vmware/2020-03-20/clusters/constants.go → ...r/vmware/2022-05-01/clusters/constants.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 .../vmware/2020-03-20/clusters/id_cluster.go → .../vmware/2022-05-01/clusters/id_cluster.go
View file
File renamed without changes.
0 ...re/2020-03-20/clusters/id_privatecloud.go → ...re/2022-05-01/clusters/id_privatecloud.go
View file
File renamed without changes.
0 ...lusters/method_createorupdate_autorest.go → ...lusters/method_createorupdate_autorest.go
View file
File renamed without changes.
0 ...-03-20/clusters/method_delete_autorest.go → ...-05-01/clusters/method_delete_autorest.go
View file
File renamed without changes.
0 ...020-03-20/clusters/method_get_autorest.go → ...022-05-01/clusters/method_get_autorest.go
View file
File renamed without changes.
0 ...20-03-20/clusters/method_list_autorest.go → ...22-05-01/clusters/method_list_autorest.go
View file
File renamed without changes.
0 ...-03-20/clusters/method_update_autorest.go → ...-05-01/clusters/method_update_autorest.go
View file
File renamed without changes.
12 changes: 12 additions & 0 deletions ...b.com/hashicorp/go-azure-sdk/resource-manager/vmware/2022-05-01/clusters/model_cluster.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 ...020-03-20/clusters/model_clusterupdate.go → ...022-05-01/clusters/model_clusterupdate.go
View file
File renamed without changes.
3 changes: 2 additions & 1 deletion ...clusters/model_clusterupdateproperties.go → ...clusters/model_clusterupdateproperties.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions ...03-20/clusters/model_clusterproperties.go → ...clusters/model_commonclusterproperties.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 ...r/vmware/2020-03-20/clusters/model_sku.go → ...r/vmware/2022-05-01/clusters/model_sku.go
View file
File renamed without changes.
0 .../vmware/2020-03-20/clusters/predicates.go → .../vmware/2022-05-01/clusters/predicates.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion ...ger/vmware/2020-03-20/clusters/version.go → ...ger/vmware/2022-05-01/clusters/version.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit ae2d233

Please sign in to comment.