-
Notifications
You must be signed in to change notification settings - Fork 9.1k
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 #22915 from hashicorp/td-fsx-ou-distinguidshed
fsx/ontap_storeage_virtulal_mcahine: Remove deprecadted distinguidshed
- Loading branch information
Showing
8 changed files
with
279 additions
and
81 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,3 @@ | ||
| ```release-note:breaking-change | ||
| resource/aws_fsx_ontap_storage_virtual_machine: Remove deprecated `active_directory_configuration.0.self_managed_active_directory_configuration.0.organizational_unit_distinguidshed_name`, migrating value to `active_directory_configuration.0.self_managed_active_directory_configuration.0.organizational_unit_distinguished_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
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
217 changes: 217 additions & 0 deletions
217
internal/service/fsx/ontap_storage_virtual_machine_migrate.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,217 @@ | ||
| package fsx | ||
|
|
||
| import ( | ||
| "context" | ||
| "log" | ||
| "strings" | ||
|
|
||
| "github.com/aws/aws-sdk-go/service/fsx" | ||
| "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" | ||
| "github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation" | ||
| tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" | ||
| ) | ||
|
|
||
| func ResourceOntapStorageVirtualMachineV0() *schema.Resource { | ||
| return &schema.Resource{ | ||
| SchemaVersion: 0, | ||
| Schema: map[string]*schema.Schema{ | ||
| "arn": { | ||
| Type: schema.TypeString, | ||
| Computed: true, | ||
| }, | ||
| "active_directory_configuration": { | ||
| Type: schema.TypeList, | ||
| Optional: true, | ||
| MaxItems: 1, | ||
| Elem: &schema.Resource{ | ||
| Schema: map[string]*schema.Schema{ | ||
| "netbios_name": { | ||
| Type: schema.TypeString, | ||
| Optional: true, | ||
| DiffSuppressFunc: func(k, old, new string, d *schema.ResourceData) bool { | ||
| return strings.EqualFold(old, new) | ||
| }, | ||
| ValidateFunc: validation.StringLenBetween(1, 15), | ||
| }, | ||
| "self_managed_active_directory_configuration": { | ||
| Type: schema.TypeList, | ||
| Optional: true, | ||
| MaxItems: 1, | ||
| Elem: &schema.Resource{ | ||
| Schema: map[string]*schema.Schema{ | ||
| "dns_ips": { | ||
| Type: schema.TypeSet, | ||
| Required: true, | ||
| MinItems: 1, | ||
| MaxItems: 3, | ||
| Elem: &schema.Schema{ | ||
| Type: schema.TypeString, | ||
| ValidateFunc: validation.IsIPAddress, | ||
| }, | ||
| }, | ||
| "domain_name": { | ||
| Type: schema.TypeString, | ||
| Required: true, | ||
| ForceNew: true, | ||
| ValidateFunc: validation.StringLenBetween(1, 255), | ||
| }, | ||
| "file_system_administrators_group": { | ||
| Type: schema.TypeString, | ||
| Optional: true, | ||
| ForceNew: true, | ||
| ValidateFunc: validation.StringLenBetween(1, 256), | ||
| }, | ||
| "organizational_unit_distinguidshed_name": { | ||
| Type: schema.TypeString, | ||
| Optional: true, | ||
| ForceNew: true, | ||
| ValidateFunc: validation.StringLenBetween(1, 2000), | ||
| Deprecated: "use 'organizational_unit_distinguished_name' instead", | ||
| ConflictsWith: []string{"active_directory_configuration.0.self_managed_active_directory_configuration.0.organizational_unit_distinguished_name"}, | ||
| }, | ||
| "organizational_unit_distinguished_name": { | ||
| Type: schema.TypeString, | ||
| Optional: true, | ||
| ForceNew: true, | ||
| ValidateFunc: validation.StringLenBetween(1, 2000), | ||
| ConflictsWith: []string{"active_directory_configuration.0.self_managed_active_directory_configuration.0.organizational_unit_distinguidshed_name"}, | ||
| }, | ||
| "password": { | ||
| Type: schema.TypeString, | ||
| Sensitive: true, | ||
| Required: true, | ||
| ValidateFunc: validation.StringLenBetween(1, 256), | ||
| }, | ||
| "username": { | ||
| Type: schema.TypeString, | ||
| Required: true, | ||
| ValidateFunc: validation.StringLenBetween(1, 256), | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| "endpoints": { | ||
| Type: schema.TypeList, | ||
| Computed: true, | ||
| Elem: &schema.Resource{ | ||
| Schema: map[string]*schema.Schema{ | ||
| "iscsi": { | ||
| Type: schema.TypeList, | ||
| Computed: true, | ||
| Elem: &schema.Resource{ | ||
| Schema: map[string]*schema.Schema{ | ||
| "dns_name": { | ||
| Type: schema.TypeString, | ||
| Computed: true, | ||
| }, | ||
| "ip_addresses": { | ||
| Type: schema.TypeSet, | ||
| Computed: true, | ||
| Elem: &schema.Schema{Type: schema.TypeString}, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| "management": { | ||
| Type: schema.TypeList, | ||
| Computed: true, | ||
| Elem: &schema.Resource{ | ||
| Schema: map[string]*schema.Schema{ | ||
| "dns_name": { | ||
| Type: schema.TypeString, | ||
| Computed: true, | ||
| }, | ||
| "ip_addresses": { | ||
| Type: schema.TypeSet, | ||
| Computed: true, | ||
| Elem: &schema.Schema{Type: schema.TypeString}, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| "nfs": { | ||
| Type: schema.TypeList, | ||
| Computed: true, | ||
| Elem: &schema.Resource{ | ||
| Schema: map[string]*schema.Schema{ | ||
| "dns_name": { | ||
| Type: schema.TypeString, | ||
| Computed: true, | ||
| }, | ||
| "ip_addresses": { | ||
| Type: schema.TypeSet, | ||
| Computed: true, | ||
| Elem: &schema.Schema{Type: schema.TypeString}, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| "smb": { | ||
| Type: schema.TypeList, | ||
| Computed: true, | ||
| Elem: &schema.Resource{ | ||
| Schema: map[string]*schema.Schema{ | ||
| "dns_name": { | ||
| Type: schema.TypeString, | ||
| Computed: true, | ||
| }, | ||
| "ip_addresses": { | ||
| Type: schema.TypeSet, | ||
| Computed: true, | ||
| Elem: &schema.Schema{Type: schema.TypeString}, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| "file_system_id": { | ||
| Type: schema.TypeString, | ||
| Required: true, | ||
| ValidateFunc: validation.StringLenBetween(11, 21), | ||
| }, | ||
| "name": { | ||
| Type: schema.TypeString, | ||
| Required: true, | ||
| ForceNew: true, | ||
| ValidateFunc: validation.StringLenBetween(1, 47), | ||
| }, | ||
| "root_volume_security_style": { | ||
| Type: schema.TypeString, | ||
| Optional: true, | ||
| ForceNew: true, | ||
| ValidateFunc: validation.StringInSlice(fsx.StorageVirtualMachineRootVolumeSecurityStyle_Values(), false), | ||
| }, | ||
| "subtype": { | ||
| Type: schema.TypeString, | ||
| Computed: true, | ||
| }, | ||
| "svm_admin_password": { | ||
| Type: schema.TypeString, | ||
| Optional: true, | ||
| Sensitive: true, | ||
| ValidateFunc: validation.StringLenBetween(8, 50), | ||
| }, | ||
| "tags": tftags.TagsSchema(), | ||
| "tags_all": tftags.TagsSchemaComputed(), | ||
| "uuid": { | ||
| Type: schema.TypeString, | ||
| Computed: true, | ||
| }, | ||
| }, | ||
| } | ||
| } | ||
|
|
||
| func ResourceOntapStorageVirtualMachineStateUpgradeV0(_ context.Context, rawState map[string]interface{}, meta interface{}) (map[string]interface{}, error) { | ||
| log.Printf("[DEBUG] Attributes before migration: %#v", rawState) | ||
|
|
||
| rawState["active_directory_configuration.0.self_managed_active_directory_configuration.0.organizational_unit_distinguished_name"] = rawState["active_directory_configuration.0.self_managed_active_directory_configuration.0.organizational_unit_distinguidshed_name"] | ||
| delete(rawState, "active_directory_configuration.0.self_managed_active_directory_configuration.0.organizational_unit_distinguidshed_name") | ||
|
|
||
| log.Printf("[DEBUG] Attributes after migration: %#v", rawState) | ||
| return rawState, nil | ||
| } |
35 changes: 35 additions & 0 deletions
35
internal/service/fsx/ontap_storage_virtual_machine_migrate_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,35 @@ | ||
| package fsx_test | ||
|
|
||
| import ( | ||
| "context" | ||
| "reflect" | ||
| "testing" | ||
|
|
||
| tffsx "github.com/hashicorp/terraform-provider-aws/internal/service/fsx" | ||
| ) | ||
|
|
||
| func testOntapStorageVirtualMachineStateDataV0() map[string]interface{} { | ||
| return map[string]interface{}{ | ||
| "active_directory_configuration.0.self_managed_active_directory_configuration.0.organizational_unit_distinguidshed_name": "MeArrugoDerrito", | ||
| } | ||
| } | ||
|
|
||
| func testOntapStorageVirtualMachineStateDataV1() map[string]interface{} { | ||
| v0 := testOntapStorageVirtualMachineStateDataV0() | ||
| return map[string]interface{}{ | ||
| "active_directory_configuration.0.self_managed_active_directory_configuration.0.organizational_unit_distinguished_name": v0["active_directory_configuration.0.self_managed_active_directory_configuration.0.organizational_unit_distinguidshed_name"], | ||
| } | ||
| } | ||
|
|
||
| func TestOntapStorageVirtualMachineStateUpgradeV0(t *testing.T) { | ||
| expected := testOntapStorageVirtualMachineStateDataV1() | ||
| actual, err := tffsx.ResourceOntapStorageVirtualMachineStateUpgradeV0(context.Background(), testOntapStorageVirtualMachineStateDataV0(), nil) | ||
|
|
||
| if err != nil { | ||
| t.Fatalf("error migrating state: %s", err) | ||
| } | ||
|
|
||
| if !reflect.DeepEqual(expected, actual) { | ||
| t.Fatalf("\n\nexpected:\n\n%#v\n\ngot:\n\n%#v\n\n", expected, actual) | ||
| } | ||
| } |
Oops, something went wrong.