Skip to content

Commit

Permalink
fix: rename resource from virutal_hub_route to virtual_hub_route_tabl…
Browse files Browse the repository at this point in the history 
…e_route
  • Loading branch information
@josh-barker
josh-barker committed Oct 21, 2021
1 parent 620315c commit 64a468e
Show file tree
Hide file tree
Showing 4 changed files with 46 additions and 46 deletions.
2 changes: 1 addition & 1 deletion internal/services/network/registration.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,8 +104,8 @@ func (r Registration) SupportedResources() map[string]*pluginsdk.Resource {
"azurerm_virtual_hub_bgp_connection": resourceVirtualHubBgpConnection(),
"azurerm_virtual_hub_connection": resourceVirtualHubConnection(),
"azurerm_virtual_hub_ip": resourceVirtualHubIP(),
"azurerm_virtual_hub_route": resourceVirtualHubRoute(),
"azurerm_virtual_hub_route_table": resourceVirtualHubRouteTable(),
"azurerm_virtual_hub_route_table_route": resourceVirtualHubRouteTableRoute(),
"azurerm_virtual_network_dns_servers": resourceVirtualNetworkDnsServers(),
"azurerm_virtual_network_gateway_connection": resourceVirtualNetworkGatewayConnection(),
"azurerm_virtual_network_gateway": resourceVirtualNetworkGateway(),
Expand Down
20 changes: 10 additions & 10 deletions ...ces/network/virtual_hub_route_resource.go → ...virtual_hub_route_table_route_resource.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@ import (
"github.com/hashicorp/terraform-provider-azurerm/utils"
)

func resourceVirtualHubRoute() *pluginsdk.Resource {
func resourceVirtualHubRouteTableRoute() *pluginsdk.Resource {
return &pluginsdk.Resource{
Create: resourceVirtualHubRouteCreateUpdate,
Read: resourceVirtualHubRouteRead,
Update: resourceVirtualHubRouteCreateUpdate,
Delete: resourceVirtualHubRouteDelete,
Create: resourceVirtualHubRouteTableRouteCreateUpdate,
Read: resourceVirtualHubRouteTableRouteRead,
Update: resourceVirtualHubRouteTableRouteCreateUpdate,
Delete: resourceVirtualHubRouteTableRouteDelete,

Timeouts: &pluginsdk.ResourceTimeout{
Create: pluginsdk.DefaultTimeout(30 * time.Minute),
Expand Down Expand Up @@ -89,7 +89,7 @@ func resourceVirtualHubRoute() *pluginsdk.Resource {
}
}

func resourceVirtualHubRouteCreateUpdate(d *pluginsdk.ResourceData, meta interface{}) error {
func resourceVirtualHubRouteTableRouteCreateUpdate(d *pluginsdk.ResourceData, meta interface{}) error {
client := meta.(*clients.Client).Network.HubRouteTableClient
ctx, cancel := timeouts.ForCreateUpdate(meta.(*clients.Client).StopContext, d)
defer cancel()
Expand Down Expand Up @@ -117,7 +117,7 @@ func resourceVirtualHubRouteCreateUpdate(d *pluginsdk.ResourceData, meta interfa
if d.IsNewResource() {
for _, r := range *routeTable.Routes {
if *r.Name == name {
return tf.ImportAsExistsError("azurerm_virtual_hub_route", id.ID())
return tf.ImportAsExistsError("azurerm_virtual_hub_route_table_route", id.ID())
}
}

Expand Down Expand Up @@ -155,10 +155,10 @@ func resourceVirtualHubRouteCreateUpdate(d *pluginsdk.ResourceData, meta interfa

d.SetId(id.ID())

return resourceVirtualHubRouteRead(d, meta)
return resourceVirtualHubRouteTableRouteRead(d, meta)
}

func resourceVirtualHubRouteRead(d *pluginsdk.ResourceData, meta interface{}) error {
func resourceVirtualHubRouteTableRouteRead(d *pluginsdk.ResourceData, meta interface{}) error {
client := meta.(*clients.Client).Network.HubRouteTableClient
ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d)
defer cancel()
Expand Down Expand Up @@ -208,7 +208,7 @@ func resourceVirtualHubRouteRead(d *pluginsdk.ResourceData, meta interface{}) er
return nil
}

func resourceVirtualHubRouteDelete(d *pluginsdk.ResourceData, meta interface{}) error {
func resourceVirtualHubRouteTableRouteDelete(d *pluginsdk.ResourceData, meta interface{}) error {
client := meta.(*clients.Client).Network.HubRouteTableClient
ctx, cancel := timeouts.ForDelete(meta.(*clients.Client).StopContext, d)
defer cancel()
Expand Down
60 changes: 30 additions & 30 deletions ...etwork/virtual_hub_route_resource_test.go → ...al_hub_route_table_route_resource_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ import (
"github.com/hashicorp/terraform-provider-azurerm/utils"
)

type VirtualHubRouteResource struct {
type VirtualHubRouteTableRouteResource struct {
}

func TestAccVirtualHubRoute_basic(t *testing.T) {
data := acceptance.BuildTestData(t, "azurerm_virtual_hub_route", "test")
r := VirtualHubRouteResource{}
func TestAccVirtualHubRouteTableRoute_basic(t *testing.T) {
data := acceptance.BuildTestData(t, "azurerm_virtual_hub_route_table_route", "test")
r := VirtualHubRouteTableRouteResource{}
data.ResourceTest(t, r, []acceptance.TestStep{
{
Config: r.basic(data),
Expand All @@ -30,9 +30,9 @@ func TestAccVirtualHubRoute_basic(t *testing.T) {
})
}

func TestAccVirtualHubRoute_requiresImport(t *testing.T) {
data := acceptance.BuildTestData(t, "azurerm_virtual_hub_route", "test")
r := VirtualHubRouteResource{}
func TestAccVirtualHubRouteTableRoute_requiresImport(t *testing.T) {
data := acceptance.BuildTestData(t, "azurerm_virtual_hub_route_table_route", "test")
r := VirtualHubRouteTableRouteResource{}
data.ResourceTest(t, r, []acceptance.TestStep{
{
Config: r.basic(data),
Expand All @@ -44,24 +44,24 @@ func TestAccVirtualHubRoute_requiresImport(t *testing.T) {
})
}

func TestAccVirtualHubRoute_complete(t *testing.T) {
data := acceptance.BuildTestData(t, "azurerm_virtual_hub_route", "test")
r := VirtualHubRouteResource{}
func TestAccVirtualHubRouteTableRoute_complete(t *testing.T) {
data := acceptance.BuildTestData(t, "azurerm_virtual_hub_route_table_route", "test")
r := VirtualHubRouteTableRouteResource{}
data.ResourceTest(t, r, []acceptance.TestStep{
{
Config: r.complete(data),
Check: acceptance.ComposeTestCheckFunc(
check.That(data.ResourceName).ExistsInAzure(r),
check.That("azurerm_virtual_hub_route.test_2").ExistsInAzure(r),
check.That("azurerm_virtual_hub_route_table_route.test_2").ExistsInAzure(r),
),
},
data.ImportStep(),
})
}

func TestAccVirtualHubRoute_update(t *testing.T) {
data := acceptance.BuildTestData(t, "azurerm_virtual_hub_route", "test")
r := VirtualHubRouteResource{}
func TestAccVirtualHubRouteTableRoute_update(t *testing.T) {
data := acceptance.BuildTestData(t, "azurerm_virtual_hub_route_table_route", "test")
r := VirtualHubRouteTableRouteResource{}
data.ResourceTest(t, r, []acceptance.TestStep{
{
Config: r.basic(data),
Expand All @@ -74,7 +74,7 @@ func TestAccVirtualHubRoute_update(t *testing.T) {
Config: r.complete(data),
Check: acceptance.ComposeTestCheckFunc(
check.That(data.ResourceName).ExistsInAzure(r),
check.That("azurerm_virtual_hub_route.test_2").ExistsInAzure(r),
check.That("azurerm_virtual_hub_route_table_route.test_2").ExistsInAzure(r),
),
},
data.ImportStep(),
Expand All @@ -88,7 +88,7 @@ func TestAccVirtualHubRoute_update(t *testing.T) {
})
}

func (t VirtualHubRouteResource) Exists(ctx context.Context, clients *clients.Client, state *pluginsdk.InstanceState) (*bool, error) {
func (t VirtualHubRouteTableRouteResource) Exists(ctx context.Context, clients *clients.Client, state *pluginsdk.InstanceState) (*bool, error) {
route, err := parse.HubRouteTableRouteID(state.ID)
if err != nil {
return nil, err
Expand All @@ -112,7 +112,7 @@ func (t VirtualHubRouteResource) Exists(ctx context.Context, clients *clients.Cl
return utils.Bool(false), nil
}

func (VirtualHubRouteResource) template(data acceptance.TestData) string {
func (VirtualHubRouteTableRouteResource) template(data acceptance.TestData) string {
return fmt.Sprintf(`
provider "azurerm" {
features {}
Expand Down Expand Up @@ -176,11 +176,11 @@ resource "azurerm_virtual_hub_route_table" "test" {
`, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger, data.RandomInteger, data.RandomInteger, data.RandomInteger, data.RandomInteger, data.RandomInteger)
}

func (r VirtualHubRouteResource) basic(data acceptance.TestData) string {
func (r VirtualHubRouteTableRouteResource) basic(data acceptance.TestData) string {
return fmt.Sprintf(`
%s
resource "azurerm_virtual_hub_route" "test" {
resource "azurerm_virtual_hub_route_table_route" "test" {
route_table_id = azurerm_virtual_hub_route_table.test.id
name = "acctest-Route-%d"
Expand All @@ -193,26 +193,26 @@ resource "azurerm_virtual_hub_route" "test" {
`, r.template(data), data.RandomInteger)
}

func (r VirtualHubRouteResource) requiresImport(data acceptance.TestData) string {
func (r VirtualHubRouteTableRouteResource) requiresImport(data acceptance.TestData) string {
return fmt.Sprintf(`
%s
resource "azurerm_virtual_hub_route" "import" {
route_table_id = azurerm_virtual_hub_route.test.route_table_id
resource "azurerm_virtual_hub_route_table_route" "import" {
route_table_id = azurerm_virtual_hub_route_table_route.test.route_table_id
name = azurerm_virtual_hub_route.test.name
destinations_type = azurerm_virtual_hub_route.test.destinations_type
destinations = azurerm_virtual_hub_route.test.destinations
next_hop_type = azurerm_virtual_hub_route.test.next_hop_type
next_hop = azurerm_virtual_hub_route.test.next_hop
name = azurerm_virtual_hub_route_table_route.test.name
destinations_type = azurerm_virtual_hub_route_table_route.test.destinations_type
destinations = azurerm_virtual_hub_route_table_route.test.destinations
next_hop_type = azurerm_virtual_hub_route_table_route.test.next_hop_type
next_hop = azurerm_virtual_hub_route_table_route.test.next_hop
}
`, r.basic(data))
}

func (r VirtualHubRouteResource) complete(data acceptance.TestData) string {
func (r VirtualHubRouteTableRouteResource) complete(data acceptance.TestData) string {
return fmt.Sprintf(`
%s
resource "azurerm_virtual_hub_route" "test" {
resource "azurerm_virtual_hub_route_table_route" "test" {
route_table_id = azurerm_virtual_hub_route_table.test.id
name = "acctest-Route-%d-renamed"
Expand All @@ -223,7 +223,7 @@ resource "azurerm_virtual_hub_route" "test" {
next_hop = azurerm_virtual_hub_connection.test.id
}
resource "azurerm_virtual_hub_route" "test_2" {
resource "azurerm_virtual_hub_route_table_route" "test_2" {
route_table_id = azurerm_virtual_hub_route_table.test.id
name = "acctest-Route-%d"
Expand Down
10 changes: 5 additions & 5 deletions ...te/docs/r/virtual_hub_route.html.markdown → ...rtual_hub_route_table_route.html.markdown
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
---
subcategory: "Network"
layout: "azurerm"
page_title: "Azure Resource Manager: azurerm_virtual_hub_route"
page_title: "Azure Resource Manager: azurerm_virtual_hub_route_table_route"
description: |-
Manages a Virtual Hub Route.
---

# azurerm_virtual_hub_route
# azurerm_virtual_hub_route_table_route

Manages a Virtual Hub Route.

Expand Down Expand Up @@ -75,7 +75,7 @@ resource "azurerm_virtual_hub_route_table" "example" {
labels = ["label1"]
}
resource "azurerm_virtual_hub_route" "example" {
resource "azurerm_virtual_hub_route_table_route" "example" {
route_table_id = azurerm_virtual_hub_route_table.example.id
name = "example-route"
Expand Down Expand Up @@ -119,8 +119,8 @@ The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/d

## Import

Virtual Hub Route Tables can be imported using `<Route Table Resource Id>/<Route Name>`, e.g.
Virtual Hub Route Table Routes can be imported using `<Route Table Resource Id>/routes/<Route Name>`, e.g.

```shell
terraform import azurerm_virtual_hub_route_table.example /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/group1/providers/Microsoft.Network/virtualHubs/virtualHub1/hubRouteTables/routeTable1/routeName
terraform import azurerm_virtual_hub_route_table.example /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/group1/providers/Microsoft.Network/virtualHubs/virtualHub1/hubRouteTables/routeTable1/routes/routeName
```

0 comments on commit 64a468e

Please sign in to comment.