-
Notifications
You must be signed in to change notification settings - Fork 4.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
New resource: azurerm_virtual_network_gateway_nat_rule (#15720)
To resolve the issue #15348, it has to implement Virtual Network Gateway Nat Rule first. Once this PR is merged, I assume it has to submit another PR to implement egressNatRules and ingressNatRules of Virtual Network Gateway Connection (azurerm_virtual_network_gateway_connection).
- Loading branch information
Neil Ye
authored
May 18, 2022
1 parent
372fd6e
commit 68131fb
Showing
12 changed files
with
1,088 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
75 changes: 75 additions & 0 deletions
75
internal/services/network/parse/virtual_network_gateway_nat_rule.go
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,75 @@ | ||
| package parse | ||
|
|
||
| // NOTE: this file is generated via 'go:generate' - manual changes will be overwritten | ||
|
|
||
| import ( | ||
| "fmt" | ||
| "strings" | ||
|
|
||
| "github.com/hashicorp/go-azure-helpers/resourcemanager/resourceids" | ||
| ) | ||
|
|
||
| type VirtualNetworkGatewayNatRuleId struct { | ||
| SubscriptionId string | ||
| ResourceGroup string | ||
| VirtualNetworkGatewayName string | ||
| NatRuleName string | ||
| } | ||
|
|
||
| func NewVirtualNetworkGatewayNatRuleID(subscriptionId, resourceGroup, virtualNetworkGatewayName, natRuleName string) VirtualNetworkGatewayNatRuleId { | ||
| return VirtualNetworkGatewayNatRuleId{ | ||
| SubscriptionId: subscriptionId, | ||
| ResourceGroup: resourceGroup, | ||
| VirtualNetworkGatewayName: virtualNetworkGatewayName, | ||
| NatRuleName: natRuleName, | ||
| } | ||
| } | ||
|
|
||
| func (id VirtualNetworkGatewayNatRuleId) String() string { | ||
| segments := []string{ | ||
| fmt.Sprintf("Nat Rule Name %q", id.NatRuleName), | ||
| fmt.Sprintf("Virtual Network Gateway Name %q", id.VirtualNetworkGatewayName), | ||
| fmt.Sprintf("Resource Group %q", id.ResourceGroup), | ||
| } | ||
| segmentsStr := strings.Join(segments, " / ") | ||
| return fmt.Sprintf("%s: (%s)", "Virtual Network Gateway Nat Rule", segmentsStr) | ||
| } | ||
|
|
||
| func (id VirtualNetworkGatewayNatRuleId) ID() string { | ||
| fmtString := "/subscriptions/%s/resourceGroups/%s/providers/Microsoft.Network/virtualNetworkGateways/%s/natRules/%s" | ||
| return fmt.Sprintf(fmtString, id.SubscriptionId, id.ResourceGroup, id.VirtualNetworkGatewayName, id.NatRuleName) | ||
| } | ||
|
|
||
| // VirtualNetworkGatewayNatRuleID parses a VirtualNetworkGatewayNatRule ID into an VirtualNetworkGatewayNatRuleId struct | ||
| func VirtualNetworkGatewayNatRuleID(input string) (*VirtualNetworkGatewayNatRuleId, error) { | ||
| id, err := resourceids.ParseAzureResourceID(input) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| resourceId := VirtualNetworkGatewayNatRuleId{ | ||
| SubscriptionId: id.SubscriptionID, | ||
| ResourceGroup: id.ResourceGroup, | ||
| } | ||
|
|
||
| if resourceId.SubscriptionId == "" { | ||
| return nil, fmt.Errorf("ID was missing the 'subscriptions' element") | ||
| } | ||
|
|
||
| if resourceId.ResourceGroup == "" { | ||
| return nil, fmt.Errorf("ID was missing the 'resourceGroups' element") | ||
| } | ||
|
|
||
| if resourceId.VirtualNetworkGatewayName, err = id.PopSegment("virtualNetworkGateways"); err != nil { | ||
| return nil, err | ||
| } | ||
| if resourceId.NatRuleName, err = id.PopSegment("natRules"); err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| if err := id.ValidateNoEmptySegments(input); err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| return &resourceId, nil | ||
| } |
128 changes: 128 additions & 0 deletions
128
internal/services/network/parse/virtual_network_gateway_nat_rule_test.go
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,128 @@ | ||
| package parse | ||
|
|
||
| // NOTE: this file is generated via 'go:generate' - manual changes will be overwritten | ||
|
|
||
| import ( | ||
| "testing" | ||
|
|
||
| "github.com/hashicorp/go-azure-helpers/resourcemanager/resourceids" | ||
| ) | ||
|
|
||
| var _ resourceids.Id = VirtualNetworkGatewayNatRuleId{} | ||
|
|
||
| func TestVirtualNetworkGatewayNatRuleIDFormatter(t *testing.T) { | ||
| actual := NewVirtualNetworkGatewayNatRuleID("12345678-1234-9876-4563-123456789012", "resGroup1", "gw1", "rule1").ID() | ||
| expected := "/subscriptions/12345678-1234-9876-4563-123456789012/resourceGroups/resGroup1/providers/Microsoft.Network/virtualNetworkGateways/gw1/natRules/rule1" | ||
| if actual != expected { | ||
| t.Fatalf("Expected %q but got %q", expected, actual) | ||
| } | ||
| } | ||
|
|
||
| func TestVirtualNetworkGatewayNatRuleID(t *testing.T) { | ||
| testData := []struct { | ||
| Input string | ||
| Error bool | ||
| Expected *VirtualNetworkGatewayNatRuleId | ||
| }{ | ||
|
|
||
| { | ||
| // empty | ||
| Input: "", | ||
| Error: true, | ||
| }, | ||
|
|
||
| { | ||
| // missing SubscriptionId | ||
| Input: "/", | ||
| Error: true, | ||
| }, | ||
|
|
||
| { | ||
| // missing value for SubscriptionId | ||
| Input: "/subscriptions/", | ||
| Error: true, | ||
| }, | ||
|
|
||
| { | ||
| // missing ResourceGroup | ||
| Input: "/subscriptions/12345678-1234-9876-4563-123456789012/", | ||
| Error: true, | ||
| }, | ||
|
|
||
| { | ||
| // missing value for ResourceGroup | ||
| Input: "/subscriptions/12345678-1234-9876-4563-123456789012/resourceGroups/", | ||
| Error: true, | ||
| }, | ||
|
|
||
| { | ||
| // missing VirtualNetworkGatewayName | ||
| Input: "/subscriptions/12345678-1234-9876-4563-123456789012/resourceGroups/resGroup1/providers/Microsoft.Network/", | ||
| Error: true, | ||
| }, | ||
|
|
||
| { | ||
| // missing value for VirtualNetworkGatewayName | ||
| Input: "/subscriptions/12345678-1234-9876-4563-123456789012/resourceGroups/resGroup1/providers/Microsoft.Network/virtualNetworkGateways/", | ||
| Error: true, | ||
| }, | ||
|
|
||
| { | ||
| // missing NatRuleName | ||
| Input: "/subscriptions/12345678-1234-9876-4563-123456789012/resourceGroups/resGroup1/providers/Microsoft.Network/virtualNetworkGateways/gw1/", | ||
| Error: true, | ||
| }, | ||
|
|
||
| { | ||
| // missing value for NatRuleName | ||
| Input: "/subscriptions/12345678-1234-9876-4563-123456789012/resourceGroups/resGroup1/providers/Microsoft.Network/virtualNetworkGateways/gw1/natRules/", | ||
| Error: true, | ||
| }, | ||
|
|
||
| { | ||
| // valid | ||
| Input: "/subscriptions/12345678-1234-9876-4563-123456789012/resourceGroups/resGroup1/providers/Microsoft.Network/virtualNetworkGateways/gw1/natRules/rule1", | ||
| Expected: &VirtualNetworkGatewayNatRuleId{ | ||
| SubscriptionId: "12345678-1234-9876-4563-123456789012", | ||
| ResourceGroup: "resGroup1", | ||
| VirtualNetworkGatewayName: "gw1", | ||
| NatRuleName: "rule1", | ||
| }, | ||
| }, | ||
|
|
||
| { | ||
| // upper-cased | ||
| Input: "/SUBSCRIPTIONS/12345678-1234-9876-4563-123456789012/RESOURCEGROUPS/RESGROUP1/PROVIDERS/MICROSOFT.NETWORK/VIRTUALNETWORKGATEWAYS/GW1/NATRULES/RULE1", | ||
| Error: true, | ||
| }, | ||
| } | ||
|
|
||
| for _, v := range testData { | ||
| t.Logf("[DEBUG] Testing %q", v.Input) | ||
|
|
||
| actual, err := VirtualNetworkGatewayNatRuleID(v.Input) | ||
| if err != nil { | ||
| if v.Error { | ||
| continue | ||
| } | ||
|
|
||
| t.Fatalf("Expect a value but got an error: %s", err) | ||
| } | ||
| if v.Error { | ||
| t.Fatal("Expect an error but didn't get one") | ||
| } | ||
|
|
||
| if actual.SubscriptionId != v.Expected.SubscriptionId { | ||
| t.Fatalf("Expected %q but got %q for SubscriptionId", v.Expected.SubscriptionId, actual.SubscriptionId) | ||
| } | ||
| if actual.ResourceGroup != v.Expected.ResourceGroup { | ||
| t.Fatalf("Expected %q but got %q for ResourceGroup", v.Expected.ResourceGroup, actual.ResourceGroup) | ||
| } | ||
| if actual.VirtualNetworkGatewayName != v.Expected.VirtualNetworkGatewayName { | ||
| t.Fatalf("Expected %q but got %q for VirtualNetworkGatewayName", v.Expected.VirtualNetworkGatewayName, actual.VirtualNetworkGatewayName) | ||
| } | ||
| if actual.NatRuleName != v.Expected.NatRuleName { | ||
| t.Fatalf("Expected %q but got %q for NatRuleName", v.Expected.NatRuleName, actual.NatRuleName) | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
23 changes: 23 additions & 0 deletions
23
internal/services/network/validate/virtual_network_gateway_nat_rule_id.go
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| package validate | ||
|
|
||
| // NOTE: this file is generated via 'go:generate' - manual changes will be overwritten | ||
|
|
||
| import ( | ||
| "fmt" | ||
|
|
||
| "github.com/hashicorp/terraform-provider-azurerm/internal/services/network/parse" | ||
| ) | ||
|
|
||
| func VirtualNetworkGatewayNatRuleID(input interface{}, key string) (warnings []string, errors []error) { | ||
| v, ok := input.(string) | ||
| if !ok { | ||
| errors = append(errors, fmt.Errorf("expected %q to be a string", key)) | ||
| return | ||
| } | ||
|
|
||
| if _, err := parse.VirtualNetworkGatewayNatRuleID(v); err != nil { | ||
| errors = append(errors, err) | ||
| } | ||
|
|
||
| return | ||
| } |
88 changes: 88 additions & 0 deletions
88
internal/services/network/validate/virtual_network_gateway_nat_rule_id_test.go
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,88 @@ | ||
| package validate | ||
|
|
||
| // NOTE: this file is generated via 'go:generate' - manual changes will be overwritten | ||
|
|
||
| import "testing" | ||
|
|
||
| func TestVirtualNetworkGatewayNatRuleID(t *testing.T) { | ||
| cases := []struct { | ||
| Input string | ||
| Valid bool | ||
| }{ | ||
|
|
||
| { | ||
| // empty | ||
| Input: "", | ||
| Valid: false, | ||
| }, | ||
|
|
||
| { | ||
| // missing SubscriptionId | ||
| Input: "/", | ||
| Valid: false, | ||
| }, | ||
|
|
||
| { | ||
| // missing value for SubscriptionId | ||
| Input: "/subscriptions/", | ||
| Valid: false, | ||
| }, | ||
|
|
||
| { | ||
| // missing ResourceGroup | ||
| Input: "/subscriptions/12345678-1234-9876-4563-123456789012/", | ||
| Valid: false, | ||
| }, | ||
|
|
||
| { | ||
| // missing value for ResourceGroup | ||
| Input: "/subscriptions/12345678-1234-9876-4563-123456789012/resourceGroups/", | ||
| Valid: false, | ||
| }, | ||
|
|
||
| { | ||
| // missing VirtualNetworkGatewayName | ||
| Input: "/subscriptions/12345678-1234-9876-4563-123456789012/resourceGroups/resGroup1/providers/Microsoft.Network/", | ||
| Valid: false, | ||
| }, | ||
|
|
||
| { | ||
| // missing value for VirtualNetworkGatewayName | ||
| Input: "/subscriptions/12345678-1234-9876-4563-123456789012/resourceGroups/resGroup1/providers/Microsoft.Network/virtualNetworkGateways/", | ||
| Valid: false, | ||
| }, | ||
|
|
||
| { | ||
| // missing NatRuleName | ||
| Input: "/subscriptions/12345678-1234-9876-4563-123456789012/resourceGroups/resGroup1/providers/Microsoft.Network/virtualNetworkGateways/gw1/", | ||
| Valid: false, | ||
| }, | ||
|
|
||
| { | ||
| // missing value for NatRuleName | ||
| Input: "/subscriptions/12345678-1234-9876-4563-123456789012/resourceGroups/resGroup1/providers/Microsoft.Network/virtualNetworkGateways/gw1/natRules/", | ||
| Valid: false, | ||
| }, | ||
|
|
||
| { | ||
| // valid | ||
| Input: "/subscriptions/12345678-1234-9876-4563-123456789012/resourceGroups/resGroup1/providers/Microsoft.Network/virtualNetworkGateways/gw1/natRules/rule1", | ||
| Valid: true, | ||
| }, | ||
|
|
||
| { | ||
| // upper-cased | ||
| Input: "/SUBSCRIPTIONS/12345678-1234-9876-4563-123456789012/RESOURCEGROUPS/RESGROUP1/PROVIDERS/MICROSOFT.NETWORK/VIRTUALNETWORKGATEWAYS/GW1/NATRULES/RULE1", | ||
| Valid: false, | ||
| }, | ||
| } | ||
| for _, tc := range cases { | ||
| t.Logf("[DEBUG] Testing Value %s", tc.Input) | ||
| _, errors := VirtualNetworkGatewayNatRuleID(tc.Input, "test") | ||
| valid := len(errors) == 0 | ||
|
|
||
| if tc.Valid != valid { | ||
| t.Fatalf("Expected %t but got %t", tc.Valid, valid) | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.