Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

desktopvirtualization: refactoring to use go-azure-sdk #17340

Merged
merged 13 commits into from
Jun 22, 2022
Merged

desktopvirtualization: refactoring to use go-azure-sdk #17340

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
bc7f976
r/virtual_desktop_application_group: refactoring to use go-azure-sdk
tombuildsstuff Jun 22, 2022
c32638b
r/virtual_desktop_application: refactoring to use go-azure-sdk
tombuildsstuff Jun 22, 2022
474e5d6
r/virtual_desktop_host_pool_registration_info: refactoring to use go-…
tombuildsstuff Jun 22, 2022
fd9b1da
r/virtual_desktop_host_pool: refactoring to use go-azure-sdk
tombuildsstuff Jun 22, 2022
f00a1c0
r/virtual_desktop_scaling_plan: refactoring to use go-azure-sdk
tombuildsstuff Jun 22, 2022
3fca008
r/virtual_desktop_workspace_application_group_association: refactorin…
tombuildsstuff Jun 22, 2022
80693cf
desktopvirtualisation: removing the unused OperationsClient
tombuildsstuff Jun 22, 2022
30d1a62
r/virtual_desktop_workspace: refactoring to use `go-azure-sdk`
tombuildsstuff Jun 22, 2022
ec8a198
migration: switching to use the ID Parsers in go-azure-sdk
tombuildsstuff Jun 22, 2022
47a1c9e
desktopvirtualization: removing the Resource IDs now available in go-…
tombuildsstuff Jun 22, 2022
93fd97d
ependencies: vendoring `2021-09-03-preview` of `desktopvirtualization…
tombuildsstuff Jun 22, 2022
d1ad74e
r/virtual_desktop_workspace_application_group_association: switching …
tombuildsstuff Jun 22, 2022
118b70e
go mod tidy
tombuildsstuff Jun 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
70 changes: 35 additions & 35 deletions internal/services/desktopvirtualization/client/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,55 +1,55 @@
package client

import (
"github.com/Azure/azure-sdk-for-go/services/preview/desktopvirtualization/mgmt/2021-09-03-preview/desktopvirtualization"
"github.com/hashicorp/go-azure-sdk/resource-manager/desktopvirtualization/2021-09-03-preview/application"
"github.com/hashicorp/go-azure-sdk/resource-manager/desktopvirtualization/2021-09-03-preview/applicationgroup"
"github.com/hashicorp/go-azure-sdk/resource-manager/desktopvirtualization/2021-09-03-preview/desktop"
"github.com/hashicorp/go-azure-sdk/resource-manager/desktopvirtualization/2021-09-03-preview/hostpool"
"github.com/hashicorp/go-azure-sdk/resource-manager/desktopvirtualization/2021-09-03-preview/scalingplan"
"github.com/hashicorp/go-azure-sdk/resource-manager/desktopvirtualization/2021-09-03-preview/sessionhost"
"github.com/hashicorp/go-azure-sdk/resource-manager/desktopvirtualization/2021-09-03-preview/workspace"
"github.com/hashicorp/terraform-provider-azurerm/internal/common"
)

type Client struct {
ApplicationGroupsClient *desktopvirtualization.ApplicationGroupsClient
ApplicationsClient *desktopvirtualization.ApplicationsClient
DesktopsClient *desktopvirtualization.DesktopsClient
HostPoolsClient *desktopvirtualization.HostPoolsClient
OperationsClient *desktopvirtualization.OperationsClient
SessionHostsClient *desktopvirtualization.SessionHostsClient
ScalingPlansClient *desktopvirtualization.ScalingPlansClient
WorkspacesClient *desktopvirtualization.WorkspacesClient
ApplicationGroupsClient *applicationgroup.ApplicationGroupClient
ApplicationsClient *application.ApplicationClient
DesktopsClient *desktop.DesktopClient
HostPoolsClient *hostpool.HostPoolClient
SessionHostsClient *sessionhost.SessionHostClient
ScalingPlansClient *scalingplan.ScalingPlanClient
WorkspacesClient *workspace.WorkspaceClient
}

// NewClient - New client for desktop virtualization
func NewClient(o *common.ClientOptions) *Client {
ApplicationGroupsClient := desktopvirtualization.NewApplicationGroupsClientWithBaseURI(o.ResourceManagerEndpoint, o.SubscriptionId)
o.ConfigureClient(&ApplicationGroupsClient.Client, o.ResourceManagerAuthorizer)
applicationGroupsClient := applicationgroup.NewApplicationGroupClientWithBaseURI(o.ResourceManagerEndpoint)
o.ConfigureClient(&applicationGroupsClient.Client, o.ResourceManagerAuthorizer)

ApplicationsClient := desktopvirtualization.NewApplicationsClientWithBaseURI(o.ResourceManagerEndpoint, o.SubscriptionId)
o.ConfigureClient(&ApplicationsClient.Client, o.ResourceManagerAuthorizer)
applicationsClient := application.NewApplicationClientWithBaseURI(o.ResourceManagerEndpoint)
o.ConfigureClient(&applicationsClient.Client, o.ResourceManagerAuthorizer)

DesktopsClient := desktopvirtualization.NewDesktopsClientWithBaseURI(o.ResourceManagerEndpoint, o.SubscriptionId)
o.ConfigureClient(&DesktopsClient.Client, o.ResourceManagerAuthorizer)
desktopsClient := desktop.NewDesktopClientWithBaseURI(o.ResourceManagerEndpoint)
o.ConfigureClient(&desktopsClient.Client, o.ResourceManagerAuthorizer)

HostPoolsClient := desktopvirtualization.NewHostPoolsClientWithBaseURI(o.ResourceManagerEndpoint, o.SubscriptionId)
o.ConfigureClient(&HostPoolsClient.Client, o.ResourceManagerAuthorizer)
hostPoolsClient := hostpool.NewHostPoolClientWithBaseURI(o.ResourceManagerEndpoint)
o.ConfigureClient(&hostPoolsClient.Client, o.ResourceManagerAuthorizer)

OperationsClient := desktopvirtualization.NewOperationsClientWithBaseURI(o.ResourceManagerEndpoint, o.SubscriptionId)
o.ConfigureClient(&OperationsClient.Client, o.ResourceManagerAuthorizer)
sessionHostsClient := sessionhost.NewSessionHostClientWithBaseURI(o.ResourceManagerEndpoint)
o.ConfigureClient(&sessionHostsClient.Client, o.ResourceManagerAuthorizer)

SessionHostsClient := desktopvirtualization.NewSessionHostsClientWithBaseURI(o.ResourceManagerEndpoint, o.SubscriptionId)
o.ConfigureClient(&SessionHostsClient.Client, o.ResourceManagerAuthorizer)
scalingPlansClient := scalingplan.NewScalingPlanClientWithBaseURI(o.ResourceManagerEndpoint)
o.ConfigureClient(&scalingPlansClient.Client, o.ResourceManagerAuthorizer)

ScalingPlansClient := desktopvirtualization.NewScalingPlansClientWithBaseURI(o.ResourceManagerEndpoint, o.SubscriptionId)
o.ConfigureClient(&ScalingPlansClient.Client, o.ResourceManagerAuthorizer)

WorkspacesClient := desktopvirtualization.NewWorkspacesClientWithBaseURI(o.ResourceManagerEndpoint, o.SubscriptionId)
o.ConfigureClient(&WorkspacesClient.Client, o.ResourceManagerAuthorizer)
workspacesClient := workspace.NewWorkspaceClientWithBaseURI(o.ResourceManagerEndpoint)
o.ConfigureClient(&workspacesClient.Client, o.ResourceManagerAuthorizer)

return &Client{
ApplicationGroupsClient: &ApplicationGroupsClient,
ApplicationsClient: &ApplicationsClient,
DesktopsClient: &DesktopsClient,
HostPoolsClient: &HostPoolsClient,
OperationsClient: &OperationsClient,
SessionHostsClient: &SessionHostsClient,
ScalingPlansClient: &ScalingPlansClient,
WorkspacesClient: &WorkspacesClient,
ApplicationGroupsClient: &applicationGroupsClient,
ApplicationsClient: &applicationsClient,
DesktopsClient: &desktopsClient,
HostPoolsClient: &hostPoolsClient,
SessionHostsClient: &sessionHostsClient,
ScalingPlansClient: &scalingPlansClient,
WorkspacesClient: &workspacesClient,
}
}
7 changes: 4 additions & 3 deletions internal/services/desktopvirtualization/migration/application_group_v0.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ import (
"context"
"log"

"github.com/hashicorp/terraform-provider-azurerm/internal/services/desktopvirtualization/parse"
"github.com/hashicorp/go-azure-sdk/resource-manager/desktopvirtualization/2021-09-03-preview/applicationgroup"
"github.com/hashicorp/go-azure-sdk/resource-manager/desktopvirtualization/2021-09-03-preview/hostpool"
"github.com/hashicorp/terraform-provider-azurerm/internal/tf/pluginsdk"
)

Expand Down Expand Up @@ -66,7 +67,7 @@ func (ApplicationGroupV0ToV1) Schema() map[string]*pluginsdk.Schema {
func (ApplicationGroupV0ToV1) UpgradeFunc() pluginsdk.StateUpgraderFunc {
return func(ctx context.Context, rawState map[string]interface{}, meta interface{}) (map[string]interface{}, error) {
oldId := rawState["id"].(string)
id, err := parse.ApplicationGroupIDInsensitively(oldId)
id, err := applicationgroup.ParseApplicationGroupIDInsensitively(oldId)
if err != nil {
return nil, err
}
Expand All @@ -75,7 +76,7 @@ func (ApplicationGroupV0ToV1) UpgradeFunc() pluginsdk.StateUpgraderFunc {
rawState["id"] = newId

oldHostPoolId := rawState["host_pool_id"].(string)
hostPoolId, err := parse.HostPoolIDInsensitively(oldHostPoolId)
hostPoolId, err := hostpool.ParseHostPoolIDInsensitively(oldHostPoolId)
if err != nil {
return nil, err
}
Expand Down
4 changes: 2 additions & 2 deletions internal/services/desktopvirtualization/migration/host_pool_v0.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"context"
"log"

"github.com/hashicorp/go-azure-sdk/resource-manager/desktopvirtualization/2021-09-03-preview/hostpool"
"github.com/hashicorp/terraform-provider-azurerm/helpers/azure"
"github.com/hashicorp/terraform-provider-azurerm/internal/services/desktopvirtualization/parse"
"github.com/hashicorp/terraform-provider-azurerm/internal/tags"
"github.com/hashicorp/terraform-provider-azurerm/internal/tf/pluginsdk"
)
Expand Down Expand Up @@ -106,7 +106,7 @@ func (HostPoolV0ToV1) UpgradeFunc() pluginsdk.StateUpgraderFunc {
return func(ctx context.Context, rawState map[string]interface{}, meta interface{}) (map[string]interface{}, error) {
oldId := rawState["id"].(string)

id, err := parse.HostPoolIDInsensitively(oldId)
id, err := hostpool.ParseHostPoolIDInsensitively(oldId)
if err != nil {
return nil, err
}
Expand Down
4 changes: 2 additions & 2 deletions internal/services/desktopvirtualization/migration/workspace_v0.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"context"
"log"

"github.com/hashicorp/terraform-provider-azurerm/internal/services/desktopvirtualization/parse"
"github.com/hashicorp/go-azure-sdk/resource-manager/desktopvirtualization/2021-09-03-preview/workspace"
"github.com/hashicorp/terraform-provider-azurerm/internal/tf/pluginsdk"
)

Expand Down Expand Up @@ -56,7 +56,7 @@ func (WorkspaceV0ToV1) UpgradeFunc() pluginsdk.StateUpgraderFunc {
return func(ctx context.Context, rawState map[string]interface{}, meta interface{}) (map[string]interface{}, error) {
oldId := rawState["id"].(string)

id, err := parse.WorkspaceID(oldId)
id, err := workspace.ParseWorkspaceID(oldId)
if err != nil {
return nil, err
}
Expand Down
131 changes: 0 additions & 131 deletions internal/services/desktopvirtualization/parse/application.go
View file
Open in desktop

This file was deleted.

Loading