Skip to content

Commit

Permalink
network - update express route to use hashicorp/go-azure-sdk (#26066
Browse files Browse the repository at this point in the history 
)

* update all express route resources to use go-azure-sdk

* convert connection types

* fix various issues that caused test failures

* update peering location since Canberra doesn't have the peering capacity for our tests

* remove unnecesary logic around logging a not found message

* only return error when the circuit connections cannot be retrieved for reasons other than not found

* update peering locations for circuit connection and port tests

* rebase

* only return error when circuit connections cannot be retrieved

* update peering locations
  • Loading branch information
@stephybun
stephybun authored May 30, 2024
1 parent fb82712 commit ba45032
Show file tree
Hide file tree
Showing 18 changed files with 863 additions and 892 deletions.
61 changes: 27 additions & 34 deletions internal/services/network/express_route_circuit_authorization_resource.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@ import (
"fmt"
"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-sdk/resource-manager/network/2023-09-01/expressroutecircuitauthorizations"
"github.com/hashicorp/terraform-provider-azurerm/helpers/tf"
"github.com/hashicorp/terraform-provider-azurerm/internal/clients"
"github.com/hashicorp/terraform-provider-azurerm/internal/locks"
"github.com/hashicorp/terraform-provider-azurerm/internal/services/network/parse"
"github.com/hashicorp/terraform-provider-azurerm/internal/tf/pluginsdk"
"github.com/hashicorp/terraform-provider-azurerm/internal/timeouts"
"github.com/hashicorp/terraform-provider-azurerm/utils"
"github.com/tombuildsstuff/kermit/sdk/network/2022-07-01/network"
)

func resourceExpressRouteCircuitAuthorization() *pluginsdk.Resource {
Expand All @@ -24,7 +24,7 @@ func resourceExpressRouteCircuitAuthorization() *pluginsdk.Resource {
Read: resourceExpressRouteCircuitAuthorizationRead,
Delete: resourceExpressRouteCircuitAuthorizationDelete,
Importer: pluginsdk.ImporterValidatingResourceId(func(id string) error {
_, err := parse.ExpressRouteCircuitAuthorizationID(id)
_, err := expressroutecircuitauthorizations.ParseAuthorizationID(id)
return err
}),

Expand Down Expand Up @@ -64,40 +64,35 @@ func resourceExpressRouteCircuitAuthorization() *pluginsdk.Resource {
}

func resourceExpressRouteCircuitAuthorizationCreate(d *pluginsdk.ResourceData, meta interface{}) error {
client := meta.(*clients.Client).Network.ExpressRouteAuthsClient
client := meta.(*clients.Client).Network.ExpressRouteCircuitAuthorizations
ctx, cancel := timeouts.ForCreate(meta.(*clients.Client).StopContext, d)
subscriptionId := meta.(*clients.Client).Account.SubscriptionId
defer cancel()

id := parse.NewExpressRouteCircuitAuthorizationID(subscriptionId, d.Get("resource_group_name").(string), d.Get("express_route_circuit_name").(string), d.Get("name").(string))
id := expressroutecircuitauthorizations.NewAuthorizationID(subscriptionId, d.Get("resource_group_name").(string), d.Get("express_route_circuit_name").(string), d.Get("name").(string))

locks.ByName(id.ExpressRouteCircuitName, expressRouteCircuitResourceName)
defer locks.UnlockByName(id.ExpressRouteCircuitName, expressRouteCircuitResourceName)

if d.IsNewResource() {
existing, err := client.Get(ctx, id.ResourceGroup, id.ExpressRouteCircuitName, id.AuthorizationName)
existing, err := client.Get(ctx, id)
if err != nil {
if !utils.ResponseWasNotFound(existing.Response) {
if !response.WasNotFound(existing.HttpResponse) {
return fmt.Errorf("checking for presence of existing %s: %s", id, err)
}
}

if !utils.ResponseWasNotFound(existing.Response) {
if !response.WasNotFound(existing.HttpResponse) {
return tf.ImportAsExistsError("azurerm_express_route_circuit_authorization", id.ID())
}
}

properties := network.ExpressRouteCircuitAuthorization{
AuthorizationPropertiesFormat: &network.AuthorizationPropertiesFormat{},
properties := expressroutecircuitauthorizations.ExpressRouteCircuitAuthorization{
Properties: &expressroutecircuitauthorizations.AuthorizationPropertiesFormat{},
}

future, err := client.CreateOrUpdate(ctx, id.ResourceGroup, id.ExpressRouteCircuitName, id.AuthorizationName, properties)
if err != nil {
return fmt.Errorf("Creating/Updating %s: %+v", id, err)
}

if err = future.WaitForCompletionRef(ctx, client.Client); err != nil {
return fmt.Errorf("waiting for %s to finish creating/updating: %+v", id, err)
if err := client.CreateOrUpdateThenPoll(ctx, id, properties); err != nil {
return fmt.Errorf("creating/updating %s: %+v", id, err)
}

d.SetId(id.ID())
Expand All @@ -106,57 +101,55 @@ func resourceExpressRouteCircuitAuthorizationCreate(d *pluginsdk.ResourceData, m
}

func resourceExpressRouteCircuitAuthorizationRead(d *pluginsdk.ResourceData, meta interface{}) error {
client := meta.(*clients.Client).Network.ExpressRouteAuthsClient
client := meta.(*clients.Client).Network.ExpressRouteCircuitAuthorizations
ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d)
defer cancel()

id, err := parse.ExpressRouteCircuitAuthorizationID(d.Id())
id, err := expressroutecircuitauthorizations.ParseAuthorizationID(d.Id())
if err != nil {
return err
}

resp, err := client.Get(ctx, id.ResourceGroup, id.ExpressRouteCircuitName, id.AuthorizationName)
resp, err := client.Get(ctx, *id)
if err != nil {
if utils.ResponseWasNotFound(resp.Response) {
if response.WasNotFound(resp.HttpResponse) {
d.SetId("")
return nil
}
return fmt.Errorf("retrieving %s: %+v", *id, err)
}

d.Set("name", id.AuthorizationName)
d.Set("resource_group_name", id.ResourceGroup)
d.Set("resource_group_name", id.ResourceGroupName)
d.Set("express_route_circuit_name", id.ExpressRouteCircuitName)

if props := resp.AuthorizationPropertiesFormat; props != nil {
d.Set("authorization_key", props.AuthorizationKey)
d.Set("authorization_use_status", string(props.AuthorizationUseStatus))
if model := resp.Model; model != nil {
if props := model.Properties; props != nil {
d.Set("authorization_key", props.AuthorizationKey)
d.Set("authorization_use_status", string(pointer.From(props.AuthorizationUseStatus)))

}
}

return nil
}

func resourceExpressRouteCircuitAuthorizationDelete(d *pluginsdk.ResourceData, meta interface{}) error {
client := meta.(*clients.Client).Network.ExpressRouteAuthsClient
client := meta.(*clients.Client).Network.ExpressRouteCircuitAuthorizations
ctx, cancel := timeouts.ForDelete(meta.(*clients.Client).StopContext, d)
defer cancel()

id, err := parse.ExpressRouteCircuitAuthorizationID(d.Id())
id, err := expressroutecircuitauthorizations.ParseAuthorizationID(d.Id())
if err != nil {
return err
}

locks.ByName(id.ExpressRouteCircuitName, expressRouteCircuitResourceName)
defer locks.UnlockByName(id.ExpressRouteCircuitName, expressRouteCircuitResourceName)

future, err := client.Delete(ctx, id.ResourceGroup, id.ExpressRouteCircuitName, id.AuthorizationName)
if err != nil {
if err := client.DeleteThenPoll(ctx, *id); err != nil {
return fmt.Errorf("deleting %s: %+v", *id, err)
}

if err = future.WaitForCompletionRef(ctx, client.Client); err != nil {
return fmt.Errorf("waiting for %s to be deleted: %+v", *id, err)
}

return nil
}
12 changes: 6 additions & 6 deletions internal/services/network/express_route_circuit_authorization_resource_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ import (
"fmt"
"testing"

"github.com/hashicorp/go-azure-helpers/lang/pointer"
"github.com/hashicorp/go-azure-sdk/resource-manager/network/2023-09-01/expressroutecircuitauthorizations"
"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"
"github.com/hashicorp/terraform-provider-azurerm/internal/services/network/parse"
"github.com/hashicorp/terraform-provider-azurerm/internal/tf/pluginsdk"
"github.com/hashicorp/terraform-provider-azurerm/utils"
)

type ExpressRouteCircuitAuthorizationResource struct{}
Expand Down Expand Up @@ -71,17 +71,17 @@ func testAccExpressRouteCircuitAuthorization_multiple(t *testing.T) {
}

func (t ExpressRouteCircuitAuthorizationResource) Exists(ctx context.Context, clients *clients.Client, state *pluginsdk.InstanceState) (*bool, error) {
id, err := parse.ExpressRouteCircuitAuthorizationID(state.ID)
id, err := expressroutecircuitauthorizations.ParseAuthorizationID(state.ID)
if err != nil {
return nil, err
}

resp, err := clients.Network.ExpressRouteAuthsClient.Get(ctx, id.ResourceGroup, id.ExpressRouteCircuitName, id.AuthorizationName)
resp, err := clients.Network.ExpressRouteCircuitAuthorizations.Get(ctx, *id)
if err != nil {
return nil, fmt.Errorf("reading %s: %+v", *id, err)
return nil, fmt.Errorf("retrieving %s: %+v", *id, err)
}

return utils.Bool(resp.ID != nil), nil
return pointer.To(resp.Model != nil), nil
}

func (ExpressRouteCircuitAuthorizationResource) basicConfig(data acceptance.TestData) string {
Expand Down
Loading

0 comments on commit ba45032

Please sign in to comment.