Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Migrate Storage Gateway resources to AWS SDK V2 #38554

Merged
merged 42 commits into from
Jul 31, 2024
Merged
Changes from 1 commit
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
9d06385
feat: regenerate client to v2
DanielRieske Jul 23, 2024
4bba24e
feat: migrate r/cache to sdkv2
DanielRieske Jul 23, 2024
bd171da
feat: migrate errors and find package to use sdkv2
DanielRieske Jul 23, 2024
394b8e9
Merge branch 'main' into f/migrate-storagegateway-sdkv2
DanielRieske Jul 26, 2024
68394b5
feat: migrate r/working_storage to SDKv2
DanielRieske Jul 26, 2024
ef9d002
feat: migrate r/cached_iscsi_volume to SDKv2
DanielRieske Jul 26, 2024
2773371
feat: migrate r/file_system_association to SDKv2
DanielRieske Jul 26, 2024
921fbf6
feat: migrate r/gateway to SDKv2
DanielRieske Jul 26, 2024
90183a0
feat: migrate r/nfs_file_share to SDKv2
DanielRieske Jul 26, 2024
443784c
feat: migrate r/smb_file_share to SDKv2
DanielRieske Jul 26, 2024
d1c250d
feat: migrate r/stored_iscsi_volume to SDKv2
DanielRieske Jul 26, 2024
4cd2069
feat: migrate r/upload_buffer to SDKv2
DanielRieske Jul 26, 2024
2f03d58
feat: migrate sweepers to SDKv2
DanielRieske Jul 26, 2024
bbff4e1
feat: migrate r/tape_pool to SDKv2
DanielRieske Jul 26, 2024
77f4b74
feat: migrate d/local_disk to SDKv2
DanielRieske Jul 26, 2024
07b9973
chore: reduce visibility
DanielRieske Jul 26, 2024
93b918f
feat: migrate `find` functions
DanielRieske Jul 26, 2024
2fe6a86
feat: migrate `status` functions to SDKv2
DanielRieske Jul 26, 2024
60ba820
feat: migrate `wait` functions to SDKv2
DanielRieske Jul 26, 2024
3755e47
chore: fix exports
DanielRieske Jul 26, 2024
5b18c41
fix: nil exception
DanielRieske Jul 26, 2024
c65609a
fix: fix `TestAccStorageGatewayTapePool_disappears`
DanielRieske Jul 26, 2024
b62214d
fix: spelling mistake in error message
DanielRieske Jul 26, 2024
0070e3f
fix: fix `TestAccStorageGatewayGateway_GatewayType_cached`
DanielRieske Jul 27, 2024
e8165f6
Merge branch 'main' into HEAD
ewbankkit Jul 27, 2024
703b349
Run 'go mod tidy'.
ewbankkit Jul 27, 2024
29fa298
Add 'findCacheByTwoPartKey'.
ewbankkit Jul 27, 2024
9077e79
Add 'findCachediSCSIVolumeByARN'.
ewbankkit Jul 28, 2024
6a680d5
r/aws_storagegateway_file_system_association: Cosmetics.
ewbankkit Jul 28, 2024
450041e
r/aws_storagegateway_gateway: Cosmetics.
ewbankkit Jul 29, 2024
4963ecb
d/aws_storagegateway_local_disk: Cosmetics.
ewbankkit Jul 29, 2024
ea20d02
r/aws_storagegateway_nfs_file_share: Cosmetics.
ewbankkit Jul 29, 2024
e2341a5
r/aws_storagegateway_smb_file_share: Cosmetics.
ewbankkit Jul 29, 2024
6d5d1a7
Add 'findStorediSCSIVolumeByARN'.
ewbankkit Jul 29, 2024
f3278ac
Add 'findTapePoolByARN'.
ewbankkit Jul 29, 2024
44c3acf
r/aws_storagegateway_upload_buffer: Cosmetics.
ewbankkit Jul 30, 2024
c524616
r/aws_storagegateway_working_storage: Add 'findWorkingStorageDiskIDBy…
ewbankkit Jul 31, 2024
2864aec
storagegateway: Tweak 'operationErrorCode'.
ewbankkit Jul 31, 2024
998c0d6
Merge branch 'main' into HEAD
ewbankkit Jul 31, 2024
4ab7daa
r/aws_storagegateway_file_system_association: Add configurable timeouts.
ewbankkit Jul 31, 2024
dafc14b
Fix semgrep 'dgryski.semgrep-go.errnilcheck.err-nil-check'.
ewbankkit Jul 31, 2024
ce32cd7
Fix 'TestAccStorageGatewayLocalDiskDataSource_diskNode' and 'TestAccS…
ewbankkit Jul 31, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
d/aws_storagegateway_local_disk: Cosmetics.
ewbankkit committed Jul 29, 2024

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
commit 4963ecb8a7d938be037f4edb726dec4a732ea26d
5 changes: 2 additions & 3 deletions internal/service/storagegateway/local_disk_data_source.go
Original file line number Diff line number Diff line change
@@ -5,7 +5,6 @@ package storagegateway

import (
"context"
"log"

"github.com/aws/aws-sdk-go-v2/aws"
"github.com/aws/aws-sdk-go-v2/service/storagegateway"
@@ -54,10 +53,10 @@ func dataSourceLocalDiskRead(ctx context.Context, d *schema.ResourceData, meta i
GatewayARN: aws.String(d.Get("gateway_arn").(string)),
}

log.Printf("[DEBUG] Reading Storage Gateway Local Disk: %#v", input)
output, err := conn.ListLocalDisks(ctx, input)

if err != nil {
return sdkdiag.AppendErrorf(diags, "reading Storage Gateway Local Disk: %s", err)
return sdkdiag.AppendErrorf(diags, "reading Storage Gateway Local Disks: %s", err)
}

if output == nil || len(output.Disks) == 0 {
26 changes: 5 additions & 21 deletions internal/service/storagegateway/local_disk_data_source_test.go
Original file line number Diff line number Diff line change
@@ -10,7 +10,6 @@ import (
"github.com/YakDriver/regexache"
sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest"
"github.com/hashicorp/terraform-plugin-testing/helper/resource"
"github.com/hashicorp/terraform-plugin-testing/terraform"
"github.com/hashicorp/terraform-provider-aws/internal/acctest"
"github.com/hashicorp/terraform-provider-aws/names"
)
@@ -24,7 +23,6 @@ func TestAccStorageGatewayLocalDiskDataSource_diskNode(t *testing.T) {
PreCheck: func() { acctest.PreCheck(ctx, t) },
ErrorCheck: acctest.ErrorCheck(t, names.StorageGatewayServiceID),
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories,
CheckDestroy: testAccCheckGatewayDestroy(ctx),
Steps: []resource.TestStep{
{
Config: testAccLocalDiskDataSourceConfig_nodeNonExistent(rName),
@@ -33,7 +31,6 @@ func TestAccStorageGatewayLocalDiskDataSource_diskNode(t *testing.T) {
{
Config: testAccLocalDiskDataSourceConfig_node(rName),
Check: resource.ComposeTestCheckFunc(
testAccLocalDiskExistsDataSource(dataSourceName),
resource.TestMatchResourceAttr(dataSourceName, "disk_id", regexache.MustCompile(`.+`)),
resource.TestMatchResourceAttr(dataSourceName, "disk_node", regexache.MustCompile(`.+`)),
resource.TestMatchResourceAttr(dataSourceName, "disk_path", regexache.MustCompile(`.+`)),
@@ -52,7 +49,6 @@ func TestAccStorageGatewayLocalDiskDataSource_diskPath(t *testing.T) {
PreCheck: func() { acctest.PreCheck(ctx, t) },
ErrorCheck: acctest.ErrorCheck(t, names.StorageGatewayServiceID),
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories,
CheckDestroy: testAccCheckGatewayDestroy(ctx),
Steps: []resource.TestStep{
{
Config: testAccLocalDiskDataSourceConfig_pathNonExistent(rName),
@@ -61,7 +57,6 @@ func TestAccStorageGatewayLocalDiskDataSource_diskPath(t *testing.T) {
{
Config: testAccLocalDiskDataSourceConfig_path(rName),
Check: resource.ComposeTestCheckFunc(
testAccLocalDiskExistsDataSource(dataSourceName),
resource.TestMatchResourceAttr(dataSourceName, "disk_id", regexache.MustCompile(`.+`)),
resource.TestMatchResourceAttr(dataSourceName, "disk_node", regexache.MustCompile(`.+`)),
resource.TestMatchResourceAttr(dataSourceName, "disk_path", regexache.MustCompile(`.+`)),
@@ -71,18 +66,7 @@ func TestAccStorageGatewayLocalDiskDataSource_diskPath(t *testing.T) {
})
}

func testAccLocalDiskExistsDataSource(dataSourceName string) resource.TestCheckFunc {
return func(s *terraform.State) error {
_, ok := s.RootModule().Resources[dataSourceName]
if !ok {
return fmt.Errorf("not found: %s", dataSourceName)
}

return nil
}
}

func testAccLocalDiskBaseDataSourceConfig(rName string) string {
func testAccLocalDiskDataSourceConfig_base(rName string) string {
return acctest.ConfigCompose(
testAccGatewayConfig_typeFileS3(rName),
fmt.Sprintf(`
@@ -107,7 +91,7 @@ resource "aws_volume_attachment" "test" {

func testAccLocalDiskDataSourceConfig_node(rName string) string {
return acctest.ConfigCompose(
testAccLocalDiskBaseDataSourceConfig(rName),
testAccLocalDiskDataSourceConfig_base(rName),
`
data "aws_storagegateway_local_disk" "test" {
disk_node = aws_volume_attachment.test.device_name
@@ -118,7 +102,7 @@ data "aws_storagegateway_local_disk" "test" {

func testAccLocalDiskDataSourceConfig_nodeNonExistent(rName string) string {
return acctest.ConfigCompose(
testAccLocalDiskBaseDataSourceConfig(rName),
testAccLocalDiskDataSourceConfig_base(rName),
`
data "aws_storagegateway_local_disk" "test" {
disk_node = replace(aws_volume_attachment.test.device_name, "xvdb", "nonexistent")
@@ -129,7 +113,7 @@ data "aws_storagegateway_local_disk" "test" {

func testAccLocalDiskDataSourceConfig_path(rName string) string {
return acctest.ConfigCompose(
testAccLocalDiskBaseDataSourceConfig(rName),
testAccLocalDiskDataSourceConfig_base(rName),
`
data "aws_storagegateway_local_disk" "test" {
disk_path = split(".", aws_instance.test.instance_type)[0] == "m4" ? aws_volume_attachment.test.device_name : replace(aws_volume_attachment.test.device_name, "xvdb", "nvme1n1")
@@ -140,7 +124,7 @@ data "aws_storagegateway_local_disk" "test" {

func testAccLocalDiskDataSourceConfig_pathNonExistent(rName string) string {
return acctest.ConfigCompose(
testAccLocalDiskBaseDataSourceConfig(rName),
testAccLocalDiskDataSourceConfig_base(rName),
`
data "aws_storagegateway_local_disk" "test" {
disk_path = replace(aws_volume_attachment.test.device_name, "xvdb", "nonexistent")