From 6d751847f95641b796da367eb0ed029c9464ba92 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 30 Nov 2022 06:01:48 +0000 Subject: [PATCH 1/3] build(deps): bump github.com/aws/aws-sdk-go from 1.44.146 to 1.44.149 Bumps [github.com/aws/aws-sdk-go](https://github.com/aws/aws-sdk-go) from 1.44.146 to 1.44.149. - [Release notes](https://github.com/aws/aws-sdk-go/releases) - [Commits](https://github.com/aws/aws-sdk-go/compare/v1.44.146...v1.44.149) --- updated-dependencies: - dependency-name: github.com/aws/aws-sdk-go dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index a10578c9738..e09bbeb9747 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.19 require ( github.com/ProtonMail/go-crypto v0.0.0-20210428141323-04723f9f07d7 - github.com/aws/aws-sdk-go v1.44.146 + github.com/aws/aws-sdk-go v1.44.149 github.com/aws/aws-sdk-go-v2 v1.17.1 github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.12.19 github.com/aws/aws-sdk-go-v2/service/auditmanager v1.21.0 diff --git a/go.sum b/go.sum index a386ba03885..a459a8b41de 100644 --- a/go.sum +++ b/go.sum @@ -27,8 +27,8 @@ github.com/apparentlymart/go-textseg/v13 v13.0.0/go.mod h1:ZK2fH7c4NqDTLtiYLvIkE github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310 h1:BUAU3CGlLvorLI26FmByPp2eC2qla6E1Tw+scpcg/to= github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs= -github.com/aws/aws-sdk-go v1.44.146 h1:7YdGgPxDPRJu/yYffzZp/H7yHzQ6AqmuNFZPYraaN8I= -github.com/aws/aws-sdk-go v1.44.146/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= +github.com/aws/aws-sdk-go v1.44.149 h1:zTWaUTbSjgMHvwhaQ91s/6ER8wMb3mA8M1GCZFO9QIo= +github.com/aws/aws-sdk-go v1.44.149/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= github.com/aws/aws-sdk-go-v2 v1.16.3/go.mod h1:ytwTPBG6fXTZLxxeeCCWj2/EMYp/xDUgX+OET6TLNNU= github.com/aws/aws-sdk-go-v2 v1.17.1 h1:02c72fDJr87N8RAC2s3Qu0YuvMRZKNZJ9F+lAehCazk= github.com/aws/aws-sdk-go-v2 v1.17.1/go.mod h1:JLnGeGONAyi2lWXI1p0PCIOIy333JMVK1U7Hf0aRFLw= From 2b97bd6940d68b27e14b9bb00b223da407e3f187 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 29 Nov 2022 15:39:06 -0500 Subject: [PATCH 2/3] r/aws_fsx_ontap_storage_virtual_machine: Subtype removed in AWS SDK for Go v1.44.147. --- internal/service/fsx/ontap_storage_virtual_machine.go | 4 +++- internal/service/fsx/ontap_storage_virtual_machine_test.go | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/internal/service/fsx/ontap_storage_virtual_machine.go b/internal/service/fsx/ontap_storage_virtual_machine.go index 032c56286b6..846f1a25dbc 100644 --- a/internal/service/fsx/ontap_storage_virtual_machine.go +++ b/internal/service/fsx/ontap_storage_virtual_machine.go @@ -293,7 +293,9 @@ func resourceOntapStorageVirtualMachineRead(d *schema.ResourceData, meta interfa //RootVolumeSecurityStyle and SVMAdminPassword are write only properties so they don't get returned from the describe API so we just store the original setting to state d.Set("root_volume_security_style", d.Get("root_volume_security_style").(string)) d.Set("svm_admin_password", d.Get("svm_admin_password").(string)) - d.Set("subtype", storageVirtualMachine.Subtype) + // Subtype removed in AWS SDK for Go v1.44.147. + // d.Set("subtype", storageVirtualMachine.Subtype) + d.Set("subtype", nil) d.Set("uuid", storageVirtualMachine.UUID) if err := d.Set("active_directory_configuration", flattenOntapSvmActiveDirectoryConfiguration(d, storageVirtualMachine.ActiveDirectoryConfiguration)); err != nil { diff --git a/internal/service/fsx/ontap_storage_virtual_machine_test.go b/internal/service/fsx/ontap_storage_virtual_machine_test.go index 844da622194..19aafa5c582 100644 --- a/internal/service/fsx/ontap_storage_virtual_machine_test.go +++ b/internal/service/fsx/ontap_storage_virtual_machine_test.go @@ -42,7 +42,8 @@ func TestAccFSxOntapStorageVirtualMachine_basic(t *testing.T) { resource.TestCheckResourceAttrSet(resourceName, "endpoints.0.nfs.0.dns_name"), resource.TestCheckResourceAttrSet(resourceName, "file_system_id"), resource.TestCheckResourceAttr(resourceName, "name", rName), - resource.TestCheckResourceAttr(resourceName, "subtype", fsx.StorageVirtualMachineSubtypeDefault), + // Subtype removed in AWS SDK for Go v1.44.147. + //resource.TestCheckResourceAttr(resourceName, "subtype", fsx.StorageVirtualMachineSubtypeDefault), resource.TestCheckResourceAttr(resourceName, "tags.%", "0"), resource.TestCheckResourceAttrSet(resourceName, "uuid"), ), From a0e2616a83ffe3236dfc0567b6c06d7b323aa326 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 30 Nov 2022 09:08:19 -0500 Subject: [PATCH 3/3] r/aws_fsx_ontap_storage_virtual_machine: 'subtype' is always 'DEFAULT'. --- .changelog/28085.txt | 3 +++ internal/service/fsx/ontap_storage_virtual_machine.go | 2 +- internal/service/fsx/ontap_storage_virtual_machine_test.go | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 .changelog/28085.txt diff --git a/.changelog/28085.txt b/.changelog/28085.txt new file mode 100644 index 00000000000..59588cb3233 --- /dev/null +++ b/.changelog/28085.txt @@ -0,0 +1,3 @@ +```release-note:note +resource/aws_fsx_ontap_storage_virtual_machine: The `subtype` attribute will always have the value `"DEFAULT"` +``` \ No newline at end of file diff --git a/internal/service/fsx/ontap_storage_virtual_machine.go b/internal/service/fsx/ontap_storage_virtual_machine.go index 846f1a25dbc..610067426f8 100644 --- a/internal/service/fsx/ontap_storage_virtual_machine.go +++ b/internal/service/fsx/ontap_storage_virtual_machine.go @@ -295,7 +295,7 @@ func resourceOntapStorageVirtualMachineRead(d *schema.ResourceData, meta interfa d.Set("svm_admin_password", d.Get("svm_admin_password").(string)) // Subtype removed in AWS SDK for Go v1.44.147. // d.Set("subtype", storageVirtualMachine.Subtype) - d.Set("subtype", nil) + d.Set("subtype", "DEFAULT") d.Set("uuid", storageVirtualMachine.UUID) if err := d.Set("active_directory_configuration", flattenOntapSvmActiveDirectoryConfiguration(d, storageVirtualMachine.ActiveDirectoryConfiguration)); err != nil { diff --git a/internal/service/fsx/ontap_storage_virtual_machine_test.go b/internal/service/fsx/ontap_storage_virtual_machine_test.go index 19aafa5c582..fef8a30f2f8 100644 --- a/internal/service/fsx/ontap_storage_virtual_machine_test.go +++ b/internal/service/fsx/ontap_storage_virtual_machine_test.go @@ -44,6 +44,7 @@ func TestAccFSxOntapStorageVirtualMachine_basic(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "name", rName), // Subtype removed in AWS SDK for Go v1.44.147. //resource.TestCheckResourceAttr(resourceName, "subtype", fsx.StorageVirtualMachineSubtypeDefault), + resource.TestCheckResourceAttr(resourceName, "subtype", "DEFAULT"), resource.TestCheckResourceAttr(resourceName, "tags.%", "0"), resource.TestCheckResourceAttrSet(resourceName, "uuid"), ),