-
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.
azurerm_mssql_managed_instance - add support for `maintenance_confi…
…guration_name` (#16832) * add support for maintenance config * use id.SubscriptionId
- Loading branch information
1 parent
42701a2
commit 5d49be5
Showing
8 changed files
with
349 additions
and
20 deletions.
There are no files selected for viewing
61 changes: 61 additions & 0 deletions
61
internal/services/maintenance/parse/public_maintenance_configuration.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,61 @@ | ||
| 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 PublicMaintenanceConfigurationId struct { | ||
| SubscriptionId string | ||
| Name string | ||
| } | ||
|
|
||
| func NewPublicMaintenanceConfigurationID(subscriptionId, name string) PublicMaintenanceConfigurationId { | ||
| return PublicMaintenanceConfigurationId{ | ||
| SubscriptionId: subscriptionId, | ||
| Name: name, | ||
| } | ||
| } | ||
|
|
||
| func (id PublicMaintenanceConfigurationId) String() string { | ||
| segments := []string{ | ||
| fmt.Sprintf("Name %q", id.Name), | ||
| } | ||
| segmentsStr := strings.Join(segments, " / ") | ||
| return fmt.Sprintf("%s: (%s)", "Public Maintenance Configuration", segmentsStr) | ||
| } | ||
|
|
||
| func (id PublicMaintenanceConfigurationId) ID() string { | ||
| fmtString := "/subscriptions/%s/providers/Microsoft.Maintenance/publicMaintenanceConfigurations/%s" | ||
| return fmt.Sprintf(fmtString, id.SubscriptionId, id.Name) | ||
| } | ||
|
|
||
| // PublicMaintenanceConfigurationID parses a PublicMaintenanceConfiguration ID into an PublicMaintenanceConfigurationId struct | ||
| func PublicMaintenanceConfigurationID(input string) (*PublicMaintenanceConfigurationId, error) { | ||
| id, err := resourceids.ParseAzureResourceID(input) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| resourceId := PublicMaintenanceConfigurationId{ | ||
| SubscriptionId: id.SubscriptionID, | ||
| } | ||
|
|
||
| if resourceId.SubscriptionId == "" { | ||
| return nil, fmt.Errorf("ID was missing the 'subscriptions' element") | ||
| } | ||
|
|
||
| if resourceId.Name, err = id.PopSegment("publicMaintenanceConfigurations"); err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| if err := id.ValidateNoEmptySegments(input); err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| return &resourceId, nil | ||
| } |
96 changes: 96 additions & 0 deletions
96
internal/services/maintenance/parse/public_maintenance_configuration_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,96 @@ | ||
| 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 = PublicMaintenanceConfigurationId{} | ||
|
|
||
| func TestPublicMaintenanceConfigurationIDFormatter(t *testing.T) { | ||
| actual := NewPublicMaintenanceConfigurationID("12345678-1234-9876-4563-123456789012", "publicMaintenanceConfiguration1").ID() | ||
| expected := "/subscriptions/12345678-1234-9876-4563-123456789012/providers/Microsoft.Maintenance/publicMaintenanceConfigurations/publicMaintenanceConfiguration1" | ||
| if actual != expected { | ||
| t.Fatalf("Expected %q but got %q", expected, actual) | ||
| } | ||
| } | ||
|
|
||
| func TestPublicMaintenanceConfigurationID(t *testing.T) { | ||
| testData := []struct { | ||
| Input string | ||
| Error bool | ||
| Expected *PublicMaintenanceConfigurationId | ||
| }{ | ||
|
|
||
| { | ||
| // empty | ||
| Input: "", | ||
| Error: true, | ||
| }, | ||
|
|
||
| { | ||
| // missing SubscriptionId | ||
| Input: "/", | ||
| Error: true, | ||
| }, | ||
|
|
||
| { | ||
| // missing value for SubscriptionId | ||
| Input: "/subscriptions/", | ||
| Error: true, | ||
| }, | ||
|
|
||
| { | ||
| // missing Name | ||
| Input: "/subscriptions/12345678-1234-9876-4563-123456789012/providers/Microsoft.Maintenance/", | ||
| Error: true, | ||
| }, | ||
|
|
||
| { | ||
| // missing value for Name | ||
| Input: "/subscriptions/12345678-1234-9876-4563-123456789012/providers/Microsoft.Maintenance/publicMaintenanceConfigurations/", | ||
| Error: true, | ||
| }, | ||
|
|
||
| { | ||
| // valid | ||
| Input: "/subscriptions/12345678-1234-9876-4563-123456789012/providers/Microsoft.Maintenance/publicMaintenanceConfigurations/publicMaintenanceConfiguration1", | ||
| Expected: &PublicMaintenanceConfigurationId{ | ||
| SubscriptionId: "12345678-1234-9876-4563-123456789012", | ||
| Name: "publicMaintenanceConfiguration1", | ||
| }, | ||
| }, | ||
|
|
||
| { | ||
| // upper-cased | ||
| Input: "/SUBSCRIPTIONS/12345678-1234-9876-4563-123456789012/PROVIDERS/MICROSOFT.MAINTENANCE/PUBLICMAINTENANCECONFIGURATIONS/PUBLICMAINTENANCECONFIGURATION1", | ||
| Error: true, | ||
| }, | ||
| } | ||
|
|
||
| for _, v := range testData { | ||
| t.Logf("[DEBUG] Testing %q", v.Input) | ||
|
|
||
| actual, err := PublicMaintenanceConfigurationID(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.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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,4 @@ | ||
| package maintenance | ||
|
|
||
| //go:generate go run ../../tools/generator-resource-id/main.go -path=./ -name=MaintenanceConfiguration -id=/subscriptions/12345678-1234-9876-4563-123456789012/resourceGroups/resGroup1/providers/Microsoft.Maintenance/maintenanceConfigurations/maintenanceConfiguration1 -rewrite=true | ||
| //go:generate go run ../../tools/generator-resource-id/main.go -path=./ -name=PublicMaintenanceConfiguration -id=/subscriptions/12345678-1234-9876-4563-123456789012/providers/Microsoft.Maintenance/publicMaintenanceConfigurations/publicMaintenanceConfiguration1 |
23 changes: 23 additions & 0 deletions
23
internal/services/maintenance/validate/public_maintenance_configuration_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/maintenance/parse" | ||
| ) | ||
|
|
||
| func PublicMaintenanceConfigurationID(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.PublicMaintenanceConfigurationID(v); err != nil { | ||
| errors = append(errors, err) | ||
| } | ||
|
|
||
| return | ||
| } |
64 changes: 64 additions & 0 deletions
64
internal/services/maintenance/validate/public_maintenance_configuration_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,64 @@ | ||
| package validate | ||
|
|
||
| // NOTE: this file is generated via 'go:generate' - manual changes will be overwritten | ||
|
|
||
| import "testing" | ||
|
|
||
| func TestPublicMaintenanceConfigurationID(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 Name | ||
| Input: "/subscriptions/12345678-1234-9876-4563-123456789012/providers/Microsoft.Maintenance/", | ||
| Valid: false, | ||
| }, | ||
|
|
||
| { | ||
| // missing value for Name | ||
| Input: "/subscriptions/12345678-1234-9876-4563-123456789012/providers/Microsoft.Maintenance/publicMaintenanceConfigurations/", | ||
| Valid: false, | ||
| }, | ||
|
|
||
| { | ||
| // valid | ||
| Input: "/subscriptions/12345678-1234-9876-4563-123456789012/providers/Microsoft.Maintenance/publicMaintenanceConfigurations/publicMaintenanceConfiguration1", | ||
| Valid: true, | ||
| }, | ||
|
|
||
| { | ||
| // upper-cased | ||
| Input: "/SUBSCRIPTIONS/12345678-1234-9876-4563-123456789012/PROVIDERS/MICROSOFT.MAINTENANCE/PUBLICMAINTENANCECONFIGURATIONS/PUBLICMAINTENANCECONFIGURATION1", | ||
| Valid: false, | ||
| }, | ||
| } | ||
| for _, tc := range cases { | ||
| t.Logf("[DEBUG] Testing Value %s", tc.Input) | ||
| _, errors := PublicMaintenanceConfigurationID(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.