-
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.
r/api_management_api_version_set: handling changes to the Azure Resou…
…rce ID (#7071) This PR is a continuation of the changes done by @jochenrichter in #7055 but adds a State Migration for migrating from the old -> new ID Fixes #6609
- Loading branch information
1 parent
c2d9c96
commit 3c3ef81
Showing
11 changed files
with
337 additions
and
140 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
57 changes: 57 additions & 0 deletions
57
azurerm/internal/services/apimanagement/migration/api_version_set.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,57 @@ | ||
| package migration | ||
|
|
||
| import ( | ||
| "log" | ||
| "strings" | ||
|
|
||
| "github.com/hashicorp/terraform-plugin-sdk/helper/schema" | ||
| "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" | ||
| ) | ||
|
|
||
| func ApiVersionSetUpgradeV0Schema() *schema.Resource { | ||
| return &schema.Resource{ | ||
| Schema: map[string]*schema.Schema{ | ||
| "name": azure.SchemaApiManagementChildName(), | ||
|
|
||
| "resource_group_name": azure.SchemaResourceGroupName(), | ||
|
|
||
| "api_management_name": azure.SchemaApiManagementName(), | ||
|
|
||
| "display_name": { | ||
| Type: schema.TypeString, | ||
| Required: true, | ||
| }, | ||
|
|
||
| "versioning_scheme": { | ||
| Type: schema.TypeString, | ||
| Required: true, | ||
| }, | ||
|
|
||
| "description": { | ||
| Type: schema.TypeString, | ||
| Optional: true, | ||
| }, | ||
|
|
||
| "version_header_name": { | ||
| Type: schema.TypeString, | ||
| Optional: true, | ||
| }, | ||
|
|
||
| "version_query_name": { | ||
| Type: schema.TypeString, | ||
| Optional: true, | ||
| }, | ||
| }, | ||
| } | ||
| } | ||
|
|
||
| func ApiVersionSetUpgradeV0ToV1(rawState map[string]interface{}, meta interface{}) (map[string]interface{}, error) { | ||
| oldId := rawState["id"].(string) | ||
| newId := strings.Replace(rawState["id"].(string), "/api-version-set/", "/apiVersionSets/", 1) | ||
|
|
||
| log.Printf("[DEBUG] Updating ID from %q to %q", oldId, newId) | ||
|
|
||
| rawState["id"] = newId | ||
|
|
||
| return rawState, nil | ||
| } |
File renamed without changes.
34 changes: 34 additions & 0 deletions
34
azurerm/internal/services/apimanagement/parse/api_version_set_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,34 @@ | ||
| package parse | ||
|
|
||
| import "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" | ||
|
|
||
| type ApiVersionSetId struct { | ||
| ResourceGroup string | ||
| ServiceName string | ||
| Name string | ||
| } | ||
|
|
||
| func APIVersionSetID(input string) (*ApiVersionSetId, error) { | ||
| id, err := azure.ParseAzureResourceID(input) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| logger := ApiVersionSetId{ | ||
| ResourceGroup: id.ResourceGroup, | ||
| } | ||
|
|
||
| if logger.ServiceName, err = id.PopSegment("service"); err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| if logger.Name, err = id.PopSegment("apiVersionSets"); err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| if err := id.ValidateNoEmptySegments(input); err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| return &logger, nil | ||
| } |
91 changes: 91 additions & 0 deletions
91
azurerm/internal/services/apimanagement/parse/api_version_set_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,91 @@ | ||
| package parse | ||
|
|
||
| import "testing" | ||
|
|
||
| func TestApiVersionSetID(t *testing.T) { | ||
| testData := []struct { | ||
| Name string | ||
| Input string | ||
| Expected *ApiVersionSetId | ||
| }{ | ||
| { | ||
| Name: "Empty", | ||
| Input: "", | ||
| Expected: nil, | ||
| }, | ||
| { | ||
| Name: "No Resource Groups Segment", | ||
| Input: "/subscriptions/00000000-0000-0000-0000-000000000000", | ||
| Expected: nil, | ||
| }, | ||
| { | ||
| Name: "No Resource Groups Value", | ||
| Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/", | ||
| Expected: nil, | ||
| }, | ||
| { | ||
| Name: "Resource Group ID", | ||
| Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/foo/", | ||
| Expected: nil, | ||
| }, | ||
| { | ||
| Name: "Missing Service Name", | ||
| Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/resGroup1/providers/Microsoft.ApiManagement/service/", | ||
| Expected: nil, | ||
| }, | ||
| { | ||
| Name: "Missing Diagnostic", | ||
| Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/resGroup1/providers/Microsoft.ApiManagement/service/service1", | ||
| Expected: nil, | ||
| }, | ||
| { | ||
| Name: "Missing Diagnostic Value", | ||
| Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/resGroup1/providers/Microsoft.ApiManagement/service/service1/apiVersionSets", | ||
| Expected: nil, | ||
| }, | ||
| { | ||
| Name: "Diagnostic ID", | ||
| Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/resGroup1/providers/Microsoft.ApiManagement/service/service1/apiVersionSets/set1", | ||
| Expected: &ApiVersionSetId{ | ||
| Name: "set1", | ||
| ServiceName: "service1", | ||
| ResourceGroup: "resGroup1", | ||
| }, | ||
| }, | ||
| { | ||
| Name: "Wrong Casing", | ||
| Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/resGroup1/providers/Microsoft.ApiManagement/service/service1/ApiVersionSets/set1", | ||
| Expected: nil, | ||
| }, | ||
| { | ||
| Name: "Legacy ID", | ||
| Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/resGroup1/providers/Microsoft.ApiManagement/service/service1/api-version-sets/set1", | ||
| Expected: nil, | ||
| }, | ||
| } | ||
|
|
||
| for _, v := range testData { | ||
| t.Logf("[DEBUG] Testing %q", v.Name) | ||
|
|
||
| actual, err := APIVersionSetID(v.Input) | ||
| if err != nil { | ||
| if v.Expected == nil { | ||
| continue | ||
| } | ||
|
|
||
| t.Fatalf("Expected a value but got an error: %s", err) | ||
| } | ||
|
|
||
| if actual.Name != v.Expected.Name { | ||
| t.Fatalf("Expected %q but got %q for Name", v.Expected.Name, actual.Name) | ||
| } | ||
|
|
||
| if actual.ServiceName != v.Expected.ServiceName { | ||
| t.Fatalf("Expected %q but got %q for Service Name", v.Expected.Name, actual.Name) | ||
| } | ||
|
|
||
| if actual.ResourceGroup != v.Expected.ResourceGroup { | ||
| t.Fatalf("Expected %q but got %q for Resource Group", v.Expected.ResourceGroup, actual.ResourceGroup) | ||
| } | ||
| } | ||
| } |
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
Oops, something went wrong.