-
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.
- Loading branch information
Showing
3 changed files
with
232 additions
and
62 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
223 changes: 204 additions & 19 deletions
223
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 |
|---|---|---|
| @@ -1,32 +1,217 @@ | ||
| package fsx | ||
|
|
||
| import ( | ||
| "fmt" | ||
| "context" | ||
| "log" | ||
| "strings" | ||
|
|
||
| "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" | ||
| "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 resourceOntapStorageVirtualMachineMigrateState(v int, is *terraform.InstanceState, meta interface{}) (*terraform.InstanceState, error) { | ||
| switch v { | ||
| case 0: | ||
| log.Println("[INFO] Found FSx Ontap Storage Virtual Machine state v0; migrating to v1") | ||
| return migrateOntapStorageVirtualMachineStateV0toV1(is) | ||
| default: | ||
| return is, fmt.Errorf("Unexpected schema version: %d", v) | ||
| 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 migrateOntapStorageVirtualMachineStateV0toV1(is *terraform.InstanceState) (*terraform.InstanceState, error) { | ||
| if is.Empty() || is.Attributes == nil { | ||
| log.Println("[DEBUG] Empty FSx Ontap Storage Virtual Machine state; nothing to migrate.") | ||
| return is, nil | ||
| } | ||
| func ResourceOntapStorageVirtualMachineStateUpgradeV0(_ context.Context, rawState map[string]interface{}, meta interface{}) (map[string]interface{}, error) { | ||
| log.Printf("[DEBUG] Attributes before migration: %#v", rawState) | ||
|
|
||
| log.Printf("[DEBUG] Attributes before migration: %#v", is.Attributes) | ||
| is.Attributes["active_directory_configuration.0.self_managed_active_directory_configuration.0.organizational_unit_distinguished_name"] = is.Attributes["active_directory_configuration.0.self_managed_active_directory_configuration.0.organizational_unit_distinguidshed_name"] | ||
| delete(is.Attributes, "active_directory_configuration.0.self_managed_active_directory_configuration.0.organizational_unit_distinguidshed_name") | ||
| 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", is.Attributes) | ||
| return is, nil | ||
| log.Printf("[DEBUG] Attributes after migration: %#v", rawState) | ||
| return rawState, nil | ||
| } |
63 changes: 21 additions & 42 deletions
63
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 |
|---|---|---|
| @@ -1,56 +1,35 @@ | ||
| package fsx_test | ||
|
|
||
| import ( | ||
| "context" | ||
| "reflect" | ||
| "testing" | ||
|
|
||
| "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" | ||
| tffsx "github.com/hashicorp/terraform-provider-aws/internal/service/fsx" | ||
| ) | ||
|
|
||
| func TestOntapStorageVirtualMachineMigrateState(t *testing.T) { | ||
| cases := map[string]struct { | ||
| StateVersion int | ||
| Attributes map[string]string | ||
| Expected map[string]string | ||
| Meta interface{} | ||
| }{ | ||
| "v0_1-notDistinguidshed": { | ||
| StateVersion: 0, | ||
| Attributes: map[string]string{ | ||
| "active_directory_configuration.0.self_managed_active_directory_configuration.0.organizational_unit_distinguidshed_name": "", | ||
| }, | ||
| Expected: map[string]string{ | ||
| "active_directory_configuration.0.self_managed_active_directory_configuration.0.organizational_unit_distinguished_name": "", | ||
| }, | ||
| }, | ||
| "v0_1-bitDistinguidshed": { | ||
| StateVersion: 0, | ||
| Attributes: map[string]string{ | ||
| "active_directory_configuration.0.self_managed_active_directory_configuration.0.organizational_unit_distinguidshed_name": "MeArrugoDerrito", | ||
| }, | ||
| Expected: map[string]string{ | ||
| "active_directory_configuration.0.self_managed_active_directory_configuration.0.organizational_unit_distinguished_name": "MeArrugoDerrito", | ||
| }, | ||
| }, | ||
| func testOntapStorageVirtualMachineStateDataV0() map[string]interface{} { | ||
| return map[string]interface{}{ | ||
| "active_directory_configuration.0.self_managed_active_directory_configuration.0.organizational_unit_distinguidshed_name": "MeArrugoDerrito", | ||
| } | ||
| } | ||
|
|
||
| for tn, tc := range cases { | ||
| is := &terraform.InstanceState{ | ||
| ID: "some_id", | ||
| Attributes: tc.Attributes, | ||
| } | ||
| 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"], | ||
| } | ||
| } | ||
|
|
||
| is, err := tffsx.ResourceOntapStorageVirtualMachine().MigrateState(tc.StateVersion, is, tc.Meta) | ||
| if err != nil { | ||
| t.Fatalf("bad: %s, err: %#v", tn, err) | ||
| } | ||
| 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) | ||
| } | ||
|
|
||
| for k, v := range tc.Expected { | ||
| if is.Attributes[k] != v { | ||
| t.Fatalf( | ||
| "bad: %s\n\n expected: %#v -> %#v\n got: %#v -> %#v\n in: %#v", | ||
| tn, k, v, k, is.Attributes[k], is.Attributes) | ||
| } | ||
| } | ||
| if !reflect.DeepEqual(expected, actual) { | ||
| t.Fatalf("\n\nexpected:\n\n%#v\n\ngot:\n\n%#v\n\n", expected, actual) | ||
| } | ||
| } |