-
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.
postgresql/database: updating to use the ID Parser
- Loading branch information
1 parent
d0df19f
commit 2070c2f
Showing
4 changed files
with
200 additions
and
18 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,56 @@ | ||
| package parse | ||
|
|
||
| // NOTE: this file is generated via 'go:generate' - manual changes will be overwritten | ||
|
|
||
| import ( | ||
| "fmt" | ||
|
|
||
| "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" | ||
| ) | ||
|
|
||
| type DatabaseId struct { | ||
| SubscriptionId string | ||
| ResourceGroup string | ||
| ServerName string | ||
| Name string | ||
| } | ||
|
|
||
| func NewDatabaseID(subscriptionId, resourceGroup, serverName, name string) DatabaseId { | ||
| return DatabaseId{ | ||
| SubscriptionId: subscriptionId, | ||
| ResourceGroup: resourceGroup, | ||
| ServerName: serverName, | ||
| Name: name, | ||
| } | ||
| } | ||
|
|
||
| func (id DatabaseId) ID(_ string) string { | ||
| fmtString := "/subscriptions/%s/resourceGroups/%s/providers/Microsoft.DBforPostgreSQL/servers/%s/databases/%s" | ||
| return fmt.Sprintf(fmtString, id.SubscriptionId, id.ResourceGroup, id.ServerName, id.Name) | ||
| } | ||
|
|
||
| // DatabaseID parses a Database ID into an DatabaseId struct | ||
| func DatabaseID(input string) (*DatabaseId, error) { | ||
| id, err := azure.ParseAzureResourceID(input) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| resourceId := DatabaseId{ | ||
| SubscriptionId: id.SubscriptionID, | ||
| ResourceGroup: id.ResourceGroup, | ||
| } | ||
|
|
||
| if resourceId.ServerName, err = id.PopSegment("servers"); err != nil { | ||
| return nil, err | ||
| } | ||
| if resourceId.Name, err = id.PopSegment("databases"); 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
azurerm/internal/services/postgres/parse/database_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/terraform-providers/terraform-provider-azurerm/azurerm/internal/resourceid" | ||
| ) | ||
|
|
||
| var _ resourceid.Formatter = DatabaseId{} | ||
|
|
||
| func TestDatabaseIDFormatter(t *testing.T) { | ||
| actual := NewDatabaseID("12345678-1234-9876-4563-123456789012", "resGroup1", "server1", "database1").ID("") | ||
| expected := "/subscriptions/12345678-1234-9876-4563-123456789012/resourceGroups/resGroup1/providers/Microsoft.DBforPostgreSQL/servers/server1/databases/database1" | ||
| if actual != expected { | ||
| t.Fatalf("Expected %q but got %q", expected, actual) | ||
| } | ||
| } | ||
|
|
||
| func TestDatabaseID(t *testing.T) { | ||
| testData := []struct { | ||
| Input string | ||
| Error bool | ||
| Expected *DatabaseId | ||
| }{ | ||
|
|
||
| { | ||
| // 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 ServerName | ||
| Input: "/subscriptions/12345678-1234-9876-4563-123456789012/resourceGroups/resGroup1/providers/Microsoft.DBforPostgreSQL/", | ||
| Error: true, | ||
| }, | ||
|
|
||
| { | ||
| // missing value for ServerName | ||
| Input: "/subscriptions/12345678-1234-9876-4563-123456789012/resourceGroups/resGroup1/providers/Microsoft.DBforPostgreSQL/servers/", | ||
| Error: true, | ||
| }, | ||
|
|
||
| { | ||
| // missing Name | ||
| Input: "/subscriptions/12345678-1234-9876-4563-123456789012/resourceGroups/resGroup1/providers/Microsoft.DBforPostgreSQL/servers/server1/", | ||
| Error: true, | ||
| }, | ||
|
|
||
| { | ||
| // missing value for Name | ||
| Input: "/subscriptions/12345678-1234-9876-4563-123456789012/resourceGroups/resGroup1/providers/Microsoft.DBforPostgreSQL/servers/server1/databases/", | ||
| Error: true, | ||
| }, | ||
|
|
||
| { | ||
| // valid | ||
| Input: "/subscriptions/12345678-1234-9876-4563-123456789012/resourceGroups/resGroup1/providers/Microsoft.DBforPostgreSQL/servers/server1/databases/database1", | ||
| Expected: &DatabaseId{ | ||
| SubscriptionId: "12345678-1234-9876-4563-123456789012", | ||
| ResourceGroup: "resGroup1", | ||
| ServerName: "server1", | ||
| Name: "database1", | ||
| }, | ||
| }, | ||
|
|
||
| { | ||
| // upper-cased | ||
| Input: "/SUBSCRIPTIONS/12345678-1234-9876-4563-123456789012/RESOURCEGROUPS/RESGROUP1/PROVIDERS/MICROSOFT.DBFORPOSTGRESQL/SERVERS/SERVER1/DATABASES/DATABASE1", | ||
| Error: true, | ||
| }, | ||
| } | ||
|
|
||
| for _, v := range testData { | ||
| t.Logf("[DEBUG] Testing %q", v.Input) | ||
|
|
||
| actual, err := DatabaseID(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.ServerName != v.Expected.ServerName { | ||
| t.Fatalf("Expected %q but got %q for ServerName", v.Expected.ServerName, actual.ServerName) | ||
| } | ||
| if actual.Name != v.Expected.Name { | ||
| t.Fatalf("Expected %q but got %q for Name", v.Expected.Name, actual.Name) | ||
| } | ||
| } | ||
| } |
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