-
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.
AKS (
azurerm_kubernetes_cluster, `azurerm_kubernetes_cluster_node_p…
…ool`): add support for version aliases (#17084) * Migrate to containerservice 2022-03-02-preview * Add support for AKS version alias - Allow alias version; - Do not rely on CurrentKubernetesVersion in resourceKubernetesClusterRead to avoid state drift. * make generate * Update docs * Add an acceptance test for cluster upgrades with version aliases * Migrate off deprecated test method
- Loading branch information
Showing
65 changed files
with
4,521 additions
and
278 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
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
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
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
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
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
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 ARecordId struct { | ||
| SubscriptionId string | ||
| ResourceGroup string | ||
| PrivateDnsZoneName string | ||
| AName string | ||
| } | ||
|
|
||
| func NewARecordID(subscriptionId, resourceGroup, privateDnsZoneName, aName string) ARecordId { | ||
| return ARecordId{ | ||
| SubscriptionId: subscriptionId, | ||
| ResourceGroup: resourceGroup, | ||
| PrivateDnsZoneName: privateDnsZoneName, | ||
| AName: aName, | ||
| } | ||
| } | ||
|
|
||
| func (id ARecordId) String() string { | ||
| segments := []string{ | ||
| fmt.Sprintf("A Name %q", id.AName), | ||
| fmt.Sprintf("Private Dns Zone Name %q", id.PrivateDnsZoneName), | ||
| fmt.Sprintf("Resource Group %q", id.ResourceGroup), | ||
| } | ||
| segmentsStr := strings.Join(segments, " / ") | ||
| return fmt.Sprintf("%s: (%s)", "A Record", segmentsStr) | ||
| } | ||
|
|
||
| func (id ARecordId) ID() string { | ||
| fmtString := "/subscriptions/%s/resourceGroups/%s/providers/Microsoft.Network/privateDnsZones/%s/A/%s" | ||
| return fmt.Sprintf(fmtString, id.SubscriptionId, id.ResourceGroup, id.PrivateDnsZoneName, id.AName) | ||
| } | ||
|
|
||
| // ARecordID parses a ARecord ID into an ARecordId struct | ||
| func ARecordID(input string) (*ARecordId, error) { | ||
| id, err := resourceids.ParseAzureResourceID(input) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| resourceId := ARecordId{ | ||
| 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.PrivateDnsZoneName, err = id.PopSegment("privateDnsZones"); err != nil { | ||
| return nil, err | ||
| } | ||
| if resourceId.AName, err = id.PopSegment("A"); err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| if err := id.ValidateNoEmptySegments(input); err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| return &resourceId, nil | ||
| } |
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 = ARecordId{} | ||
|
|
||
| func TestARecordIDFormatter(t *testing.T) { | ||
| actual := NewARecordID("12345678-1234-9876-4563-123456789012", "resGroup1", "privateDnsZone1", "eh1").ID() | ||
| expected := "/subscriptions/12345678-1234-9876-4563-123456789012/resourceGroups/resGroup1/providers/Microsoft.Network/privateDnsZones/privateDnsZone1/A/eh1" | ||
| if actual != expected { | ||
| t.Fatalf("Expected %q but got %q", expected, actual) | ||
| } | ||
| } | ||
|
|
||
| func TestARecordID(t *testing.T) { | ||
| testData := []struct { | ||
| Input string | ||
| Error bool | ||
| Expected *ARecordId | ||
| }{ | ||
|
|
||
| { | ||
| // 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 PrivateDnsZoneName | ||
| Input: "/subscriptions/12345678-1234-9876-4563-123456789012/resourceGroups/resGroup1/providers/Microsoft.Network/", | ||
| Error: true, | ||
| }, | ||
|
|
||
| { | ||
| // missing value for PrivateDnsZoneName | ||
| Input: "/subscriptions/12345678-1234-9876-4563-123456789012/resourceGroups/resGroup1/providers/Microsoft.Network/privateDnsZones/", | ||
| Error: true, | ||
| }, | ||
|
|
||
| { | ||
| // missing AName | ||
| Input: "/subscriptions/12345678-1234-9876-4563-123456789012/resourceGroups/resGroup1/providers/Microsoft.Network/privateDnsZones/privateDnsZone1/", | ||
| Error: true, | ||
| }, | ||
|
|
||
| { | ||
| // missing value for AName | ||
| Input: "/subscriptions/12345678-1234-9876-4563-123456789012/resourceGroups/resGroup1/providers/Microsoft.Network/privateDnsZones/privateDnsZone1/A/", | ||
| Error: true, | ||
| }, | ||
|
|
||
| { | ||
| // valid | ||
| Input: "/subscriptions/12345678-1234-9876-4563-123456789012/resourceGroups/resGroup1/providers/Microsoft.Network/privateDnsZones/privateDnsZone1/A/eh1", | ||
| Expected: &ARecordId{ | ||
| SubscriptionId: "12345678-1234-9876-4563-123456789012", | ||
| ResourceGroup: "resGroup1", | ||
| PrivateDnsZoneName: "privateDnsZone1", | ||
| AName: "eh1", | ||
| }, | ||
| }, | ||
|
|
||
| { | ||
| // upper-cased | ||
| Input: "/SUBSCRIPTIONS/12345678-1234-9876-4563-123456789012/RESOURCEGROUPS/RESGROUP1/PROVIDERS/MICROSOFT.NETWORK/PRIVATEDNSZONES/PRIVATEDNSZONE1/A/EH1", | ||
| Error: true, | ||
| }, | ||
| } | ||
|
|
||
| for _, v := range testData { | ||
| t.Logf("[DEBUG] Testing %q", v.Input) | ||
|
|
||
| actual, err := ARecordID(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.PrivateDnsZoneName != v.Expected.PrivateDnsZoneName { | ||
| t.Fatalf("Expected %q but got %q for PrivateDnsZoneName", v.Expected.PrivateDnsZoneName, actual.PrivateDnsZoneName) | ||
| } | ||
| if actual.AName != v.Expected.AName { | ||
| t.Fatalf("Expected %q but got %q for AName", v.Expected.AName, actual.AName) | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.