-
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.
Merge pull request #7248 from terraform-providers/f/event-hub-auth-rules
r/eventhub_namespace_authorization_rule: adding a state migration
- Loading branch information
Showing
4 changed files
with
189 additions
and
24 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
41 changes: 41 additions & 0 deletions
41
azurerm/internal/services/eventhub/migration/namespace_authorization_rule_v0.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,41 @@ | ||
| package migration | ||
|
|
||
| import ( | ||
| "log" | ||
| "strings" | ||
|
|
||
| "github.com/hashicorp/terraform-plugin-sdk/helper/schema" | ||
| "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" | ||
| ) | ||
|
|
||
| func EventHubNamespaceAuthorizationRuleUpgradeV0Schema() *schema.Resource { | ||
| return &schema.Resource{ | ||
| Schema: map[string]*schema.Schema{ | ||
| "name": { | ||
| Type: schema.TypeString, | ||
| Required: true, | ||
| ForceNew: true, | ||
| }, | ||
|
|
||
| "namespace_name": { | ||
| Type: schema.TypeString, | ||
| Required: true, | ||
| ForceNew: true, | ||
| }, | ||
|
|
||
| "resource_group_name": azure.SchemaResourceGroupName(), | ||
| }, | ||
| } | ||
| } | ||
|
|
||
| func EventHubNamespaceAuthorizationRuleUpgradeV0ToV1(rawState map[string]interface{}, meta interface{}) (map[string]interface{}, error) { | ||
| oldId := rawState["id"].(string) | ||
|
|
||
| newId := strings.Replace(rawState["id"].(string), "/authorizationRules/", "/AuthorizationRules/", 1) | ||
|
|
||
| log.Printf("[DEBUG] Updating ID from %q to %q", oldId, newId) | ||
|
|
||
| rawState["id"] = newId | ||
|
|
||
| return rawState, nil | ||
| } |
34 changes: 34 additions & 0 deletions
34
azurerm/internal/services/eventhub/parse/namespace_authorization_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,34 @@ | ||
| package parse | ||
|
|
||
| import "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" | ||
|
|
||
| type NamespaceAuthorizationRuleId struct { | ||
| ResourceGroup string | ||
| NamespaceName string | ||
| Name string | ||
| } | ||
|
|
||
| func NamespaceAuthorizationRuleID(input string) (*NamespaceAuthorizationRuleId, error) { | ||
| id, err := azure.ParseAzureResourceID(input) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| rule := NamespaceAuthorizationRuleId{ | ||
| ResourceGroup: id.ResourceGroup, | ||
| } | ||
|
|
||
| if rule.NamespaceName, err = id.PopSegment("namespaces"); err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| if rule.Name, err = id.PopSegment("AuthorizationRules"); err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| if err := id.ValidateNoEmptySegments(input); err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| return &rule, nil | ||
| } |
90 changes: 90 additions & 0 deletions
90
azurerm/internal/services/eventhub/parse/namespace_authorization_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,90 @@ | ||
| package parse | ||
|
|
||
| import ( | ||
| "testing" | ||
| ) | ||
|
|
||
| func TestNamespaceAuthorizationRuleID(t *testing.T) { | ||
| testData := []struct { | ||
| Name string | ||
| Input string | ||
| Error bool | ||
| Expect *NamespaceAuthorizationRuleId | ||
| }{ | ||
| { | ||
| Name: "Empty", | ||
| Input: "", | ||
| Error: true, | ||
| }, | ||
| { | ||
| Name: "No Resource Groups Segment", | ||
| Input: "/subscriptions/00000000-0000-0000-0000-000000000000", | ||
| Error: true, | ||
| }, | ||
| { | ||
| Name: "No Resource Groups Value", | ||
| Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/", | ||
| Error: true, | ||
| }, | ||
| { | ||
| Name: "Resource Group ID", | ||
| Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/foo/", | ||
| Error: true, | ||
| }, | ||
| { | ||
| Name: "Missing Namespaces Key", | ||
| Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/group1/providers/Microsoft.EventHub/namespaces/", | ||
| Error: true, | ||
| }, | ||
| { | ||
| Name: "Missing Namespaces Value", | ||
| Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/group1/providers/Microsoft.EventHub/namespaces/namespace1", | ||
| Error: true, | ||
| }, | ||
| { | ||
| Name: "Missing AuthorizationRules Key", | ||
| Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/group1/providers/Microsoft.EventHub/namespaces/namespace1/AuthorizationRules", | ||
| Error: true, | ||
| }, | ||
| { | ||
| Name: "Namespace Authorization Rule ID", | ||
| Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/group1/providers/Microsoft.EventHub/namespaces/namespace1/AuthorizationRules/rule1", | ||
| Error: false, | ||
| Expect: &NamespaceAuthorizationRuleId{ | ||
| ResourceGroup: "group1", | ||
| NamespaceName: "namespace1", | ||
| Name: "rule1", | ||
| }, | ||
| }, | ||
| { | ||
| Name: "Wrong Casing", | ||
| Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/group1/providers/Microsoft.EventHub/namespaces/namespace1/authorizationRules/rule1", | ||
| Error: true, | ||
| }, | ||
| } | ||
|
|
||
| for _, v := range testData { | ||
| t.Logf("[DEBUG] Testing %q", v.Name) | ||
|
|
||
| actual, err := NamespaceAuthorizationRuleID(v.Input) | ||
| if err != nil { | ||
| if v.Error { | ||
| continue | ||
| } | ||
|
|
||
| t.Fatalf("Expected a value but got an error: %s", err) | ||
| } | ||
|
|
||
| if actual.Name != v.Expect.Name { | ||
| t.Fatalf("Expected %q but got %q for Name", v.Expect.Name, actual.Name) | ||
| } | ||
|
|
||
| if actual.NamespaceName != v.Expect.NamespaceName { | ||
| t.Fatalf("Expected %q but got %q for Name", v.Expect.NamespaceName, actual.NamespaceName) | ||
| } | ||
|
|
||
| if actual.ResourceGroup != v.Expect.ResourceGroup { | ||
| t.Fatalf("Expected %q but got %q for Resource Group", v.Expect.ResourceGroup, actual.ResourceGroup) | ||
| } | ||
| } | ||
| } |