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

network - refactoring the usages of hashicorp/go-azure-sdk to use a Meta Client #22676

Merged
merged 24 commits into from
Jul 28, 2023
Merged

network - refactoring the usages of hashicorp/go-azure-sdk to use a Meta Client #22676

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
3463ee8
network: updating to API Version `2023-02-01`
tombuildsstuff Jul 25, 2023
10b5c84
go mod vendor
tombuildsstuff Jul 25, 2023
4bc1490
network: making use of the meta client
tombuildsstuff Jul 25, 2023
6bad17b
go mod tidy / go mod vendor
tombuildsstuff Jul 25, 2023
f356f63
r/application_security_group: refactoring to use the meta client
tombuildsstuff Jul 25, 2023
1c6a4af
r/network_connection_monitor: refactoring to use the meta client
tombuildsstuff Jul 25, 2023
47c0b0f
r/bastion_host: refactoring to use the meta client
tombuildsstuff Jul 25, 2023
56e13fa
r/network_watcher_flow_log: refactoring to use the meta client
tombuildsstuff Jul 25, 2023
b769189
r/network_manager_*: refactoring to use the meta client
tombuildsstuff Jul 25, 2023
0c3d454
r/network_manager_admin_rule: refactoring to use the meta client
tombuildsstuff Jul 25, 2023
976c933
r/network_manager_admin_rule_collection: refactoring to use the meta …
tombuildsstuff Jul 25, 2023
fa616cd
r/network_manager_connectivity_configuration: refactoring to use the …
tombuildsstuff Jul 25, 2023
00f6b2a
r/network_manager_*_connection: refactoring to use the meta client
tombuildsstuff Jul 25, 2023
5d0e93f
r/network_manager_network_group: refactoring to use the meta client
tombuildsstuff Jul 25, 2023
3a42659
r/network_interface: refactoring to use the meta client
tombuildsstuff Jul 25, 2023
d7aea6f
r/network_manager_scope_connection: refactoring to use the meta client
tombuildsstuff Jul 25, 2023
1c64b9a
r/network_manager_security_admin_configuration: refactoring to use th…
tombuildsstuff Jul 25, 2023
606587f
r/private_endpoint_*: refactoring to use the meta client
tombuildsstuff Jul 25, 2023
798bc96
r/route_filter: refactoring to use the meta client
tombuildsstuff Jul 25, 2023
a36819d
r/network_manager_static_member: refactoring to use the meta client
tombuildsstuff Jul 25, 2023
956809c
r/route: refactoring to use the meta client
tombuildsstuff Jul 25, 2023
5f75ed4
network: refactoring `network_security_rule` and `route_table` to use…
tombuildsstuff Jul 25, 2023
8af05ce
r/private_endpoint: retrieving the existing resource to get the corre…
tombuildsstuff Jul 26, 2023
562ea76
go mod vendor
tombuildsstuff Jul 27, 2023
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
Prev Previous commit
Next Next commit
r/network_manager_*: refactoring to use the meta client
  • Loading branch information
@tombuildsstuff
tombuildsstuff committed Jul 27, 2023
commit b7691891ebf3fa54d8d76ddec4ec21791a88d0d4
9 changes: 0 additions & 9 deletions internal/services/network/client/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ import (
"github.com/hashicorp/go-azure-sdk/resource-manager/network/2023-02-01/networkgroups"
"github.com/hashicorp/go-azure-sdk/resource-manager/network/2023-02-01/networkinterfaces"
"github.com/hashicorp/go-azure-sdk/resource-manager/network/2023-02-01/networkmanagerconnections"
"github.com/hashicorp/go-azure-sdk/resource-manager/network/2023-02-01/networkmanagers"
"github.com/hashicorp/go-azure-sdk/resource-manager/network/2023-02-01/privateendpoints"
"github.com/hashicorp/go-azure-sdk/resource-manager/network/2023-02-01/routefilters"
"github.com/hashicorp/go-azure-sdk/resource-manager/network/2023-02-01/routes"
Expand Down Expand Up @@ -46,7 +45,6 @@ type Client struct {
InterfacesClient *network.InterfacesClient
IPGroupsClient *network.IPGroupsClient
LocalNetworkGatewaysClient *network.LocalNetworkGatewaysClient
ManagersClient *networkmanagers.NetworkManagersClient
ManagerAdminRulesClient *adminrules.AdminRulesClient
ManagerAdminRuleCollectionsClient *adminrulecollections.AdminRuleCollectionsClient
ManagerConnectivityConfigurationsClient *connectivityconfigurations.ConnectivityConfigurationsClient
Expand Down Expand Up @@ -145,12 +143,6 @@ func NewClient(o *common.ClientOptions) (*Client, error) {
LocalNetworkGatewaysClient := network.NewLocalNetworkGatewaysClientWithBaseURI(o.ResourceManagerEndpoint, o.SubscriptionId)
o.ConfigureClient(&LocalNetworkGatewaysClient.Client, o.ResourceManagerAuthorizer)

ManagersClient, err := networkmanagers.NewNetworkManagersClientWithBaseURI(o.Environment.ResourceManager)
if err != nil {
return nil, fmt.Errorf("building network managers client: %+v", err)
}
o.Configure(ManagersClient.Client, o.Authorizers.ResourceManager)

ManagerAdminRulesClient, err := adminrules.NewAdminRulesClientWithBaseURI(o.Environment.ResourceManager)
if err != nil {
return nil, fmt.Errorf("building network manager admin rules client: %+v", err)
Expand Down Expand Up @@ -360,7 +352,6 @@ func NewClient(o *common.ClientOptions) (*Client, error) {
InterfacesClient: &InterfacesClient,
IPGroupsClient: &IpGroupsClient,
LocalNetworkGatewaysClient: &LocalNetworkGatewaysClient,
ManagersClient: ManagersClient,
ManagerAdminRulesClient: ManagerAdminRulesClient,
ManagerAdminRuleCollectionsClient: ManagerAdminRuleCollectionsClient,
ManagerConnectivityConfigurationsClient: ManagerConnectivityConfigurationsClient,
Expand Down
10 changes: 5 additions & 5 deletions internal/services/network/network_manager_deployment_resource.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ func (r ManagerDeploymentResource) Create() sdk.ResourceFunc {
return err
}

client := metadata.Client.Network.ManagersClient
client := metadata.Client.Network.NetworkManagers

networkManagerId, err := networkmanagers.ParseNetworkManagerID(state.NetworkManagerId)
if err != nil {
Expand Down Expand Up @@ -151,7 +151,7 @@ func (r ManagerDeploymentResource) Create() sdk.ResourceFunc {
func (r ManagerDeploymentResource) Read() sdk.ResourceFunc {
return sdk.ResourceFunc{
Func: func(ctx context.Context, metadata sdk.ResourceMetaData) error {
client := metadata.Client.Network.ManagersClient
client := metadata.Client.Network.NetworkManagers
id, err := parse.NetworkManagerDeploymentID(metadata.ResourceData.Id())
if err != nil {
return err
Expand Down Expand Up @@ -209,7 +209,7 @@ func (r ManagerDeploymentResource) Update() sdk.ResourceFunc {
}

metadata.Logger.Infof("updating %s..", *id)
client := metadata.Client.Network.ManagersClient
client := metadata.Client.Network.NetworkManagers

listParam := networkmanagers.NetworkManagerDeploymentStatusParameter{
Regions: &[]string{id.Location},
Expand Down Expand Up @@ -277,7 +277,7 @@ func (r ManagerDeploymentResource) Update() sdk.ResourceFunc {
func (r ManagerDeploymentResource) Delete() sdk.ResourceFunc {
return sdk.ResourceFunc{
Func: func(ctx context.Context, metadata sdk.ResourceMetaData) error {
client := metadata.Client.Network.ManagersClient
client := metadata.Client.Network.NetworkManagers
id, err := parse.NetworkManagerDeploymentID(metadata.ResourceData.Id())
if err != nil {
return err
Expand All @@ -296,7 +296,7 @@ func (r ManagerDeploymentResource) Delete() sdk.ResourceFunc {
return fmt.Errorf("deleting %s: %+v", *id, err)
}

statusClient := metadata.Client.Network.ManagersClient
statusClient := metadata.Client.Network.NetworkManagers
if err = resourceManagerDeploymentWaitForDeleted(ctx, statusClient, id, metadata.ResourceData); err != nil {
return err
}
Expand Down
2 changes: 1 addition & 1 deletion internal/services/network/network_manager_deployment_resource_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ func (r ManagerDeploymentResource) Exists(ctx context.Context, clients *clients.
return nil, err
}

client := clients.Network.ManagersClient
client := clients.Network.NetworkManagers
listParam := networkmanagers.NetworkManagerDeploymentStatusParameter{
Regions: &[]string{azure.NormalizeLocation(id.Location)},
DeploymentTypes: &[]networkmanagers.ConfigurationType{networkmanagers.ConfigurationType(id.ScopeAccess)},
Expand Down
8 changes: 4 additions & 4 deletions internal/services/network/network_manager_resource.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ func (r ManagerResource) Create() sdk.ResourceFunc {
return err
}

client := metadata.Client.Network.ManagersClient
client := metadata.Client.Network.NetworkManagers
subscriptionId := metadata.Client.Account.SubscriptionId

id := networkmanagers.NewNetworkManagerID(subscriptionId, state.ResourceGroupName, state.Name)
Expand Down Expand Up @@ -201,7 +201,7 @@ func (r ManagerResource) Create() sdk.ResourceFunc {
func (r ManagerResource) Read() sdk.ResourceFunc {
return sdk.ResourceFunc{
Func: func(ctx context.Context, metadata sdk.ResourceMetaData) error {
client := metadata.Client.Network.ManagersClient
client := metadata.Client.Network.NetworkManagers
id, err := networkmanagers.ParseNetworkManagerID(metadata.ResourceData.Id())
if err != nil {
return err
Expand Down Expand Up @@ -256,7 +256,7 @@ func (r ManagerResource) Update() sdk.ResourceFunc {
}

metadata.Logger.Infof("updating %s..", *id)
client := metadata.Client.Network.ManagersClient
client := metadata.Client.Network.NetworkManagers
existing, err := client.Get(ctx, *id)
if err != nil {
return fmt.Errorf("retrieving %s: %+v", *id, err)
Expand Down Expand Up @@ -301,7 +301,7 @@ func (r ManagerResource) Update() sdk.ResourceFunc {
func (r ManagerResource) Delete() sdk.ResourceFunc {
return sdk.ResourceFunc{
Func: func(ctx context.Context, metadata sdk.ResourceMetaData) error {
client := metadata.Client.Network.ManagersClient
client := metadata.Client.Network.NetworkManagers
id, err := networkmanagers.ParseNetworkManagerID(metadata.ResourceData.Id())
if err != nil {
return err
Expand Down
2 changes: 1 addition & 1 deletion internal/services/network/network_manager_resource_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ func (r ManagerResource) Exists(ctx context.Context, clients *clients.Client, st
if err != nil {
return nil, err
}
resp, err := clients.Network.ManagersClient.Get(ctx, *id)
resp, err := clients.Network.NetworkManagers.Get(ctx, *id)
if err != nil {
if response.WasNotFound(resp.HttpResponse) {
return utils.Bool(false), nil
Expand Down