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

service/storagegateway: Support Cached and VTL gateway upload buffers #18313

Merged
merged 2 commits into from
Mar 26, 2021

Conversation

bflad
Copy link
Contributor

@bflad bflad commented Mar 19, 2021

Community Note

  • Please vote on this pull request by adding a 👍 reaction to the original pull request comment to help the community and maintainers prioritize this request
  • Please do not leave "+1" or other comments that do not add relevant new information or questions, they generate extra noise for pull request followers and do not help prioritize the request

Closes #12847
Closes #17809

The referenced issue contains the context, but the gist of this issue is that the Storage Gateway API canonicalizes the Cached and VTL disk identifiers only after first cache or upload buffer use, which means that this resource must accept the path first, then perform its own lookup after creation.

This also fixes the aws_storagegateway_local_disk data source, which was missing Computed on the disk_node and disk_path attributes, which prevented it for being used to lookup one for the value of the other.

Previously:

=== CONT  TestAccAWSStorageGatewayUploadBuffer_DiskPath
    resource_aws_storagegateway_upload_buffer_test.go:107: Step 1/2 error: Error running apply: exit status 1

        Error: error reading Storage Gateway Upload Buffer (arn:aws:storagegateway:us-west-2:--OMITTED--:gateway/sgw-D0A941B9:/dev/nvme1n1): not found

          on terraform_plugin_test.tf line 129, in resource "aws_storagegateway_upload_buffer" "test":
         129: resource "aws_storagegateway_upload_buffer" "test" {

--- FAIL: TestAccAWSStorageGatewayUploadBuffer_DiskPath (418.35s)

Output from acceptance testing:

--- PASS: TestAccAWSStorageGatewayLocalDiskDataSource_DiskNode (288.52s)
--- PASS: TestAccAWSStorageGatewayLocalDiskDataSource_DiskPath (300.60s)

--- PASS: TestAccAWSStorageGatewayUploadBuffer_basic (418.26s)
--- PASS: TestAccAWSStorageGatewayUploadBuffer_DiskPath (444.33s)

Reference: #17809

The referenced issue contains the context, but the gist of this issue is that the Storage Gateway API canonicalizes the Cached and VTL disk identifiers only after first cache or upload buffer use, which means that this resource must accept the path first, then perform its own lookup after creation.

This also fixes the `aws_storagegateway_local_disk` data source, which was missing `Computed` on the `disk_node` and `disk_path` attributes, which prevented it for being used to lookup one for the value of the other.

Previously:

```
=== CONT  TestAccAWSStorageGatewayUploadBuffer_DiskPath
    resource_aws_storagegateway_upload_buffer_test.go:107: Step 1/2 error: Error running apply: exit status 1

        Error: error reading Storage Gateway Upload Buffer (arn:aws:storagegateway:us-west-2:187416307283:gateway/sgw-D0A941B9:/dev/nvme1n1): not found

          on terraform_plugin_test.tf line 129, in resource "aws_storagegateway_upload_buffer" "test":
         129: resource "aws_storagegateway_upload_buffer" "test" {

--- FAIL: TestAccAWSStorageGatewayUploadBuffer_DiskPath (418.35s)
```

Output from acceptance testing:

```
--- PASS: TestAccAWSStorageGatewayLocalDiskDataSource_DiskNode (288.52s)
--- PASS: TestAccAWSStorageGatewayLocalDiskDataSource_DiskPath (300.60s)

--- PASS: TestAccAWSStorageGatewayUploadBuffer_basic (418.26s)
--- PASS: TestAccAWSStorageGatewayUploadBuffer_DiskPath (444.33s)
```
@bflad bflad added bug Addresses a defect in current functionality. enhancement Requests to existing resources that expand the functionality or scope. labels Mar 19, 2021
@bflad bflad requested a review from a team as a code owner March 19, 2021 20:39
@ghost ghost added size/L Managed by automation to categorize the size of a PR. documentation Introduces or discusses updates to documentation. service/storagegateway Issues and PRs that pertain to the storagegateway service. tests PRs: expanded test coverage. Issues: expanded coverage, enhancements to test infrastructure. labels Mar 19, 2021
Copy link
Contributor

@gdavison gdavison left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM 🚀

--- PASS: TestDecodeStorageGatewayUploadBufferID (0.00s)
--- PASS: TestAccAWSStorageGatewayLocalDiskDataSource_DiskNode (223.01s)
--- PASS: TestAccAWSStorageGatewayLocalDiskDataSource_DiskPath (242.59s)
--- PASS: TestAccAWSStorageGatewayUploadBuffer_DiskPath (385.06s)
--- PASS: TestAccAWSStorageGatewayUploadBuffer_basic (413.71s)

@bflad bflad merged commit 21916ea into main Mar 26, 2021
@bflad bflad deleted the f-storagegateway-cached-upload-buffer branch March 26, 2021 00:06
@github-actions github-actions bot added this to the v3.34.0 milestone Mar 26, 2021
github-actions bot pushed a commit that referenced this pull request Mar 26, 2021
@ghost
Copy link

ghost commented Mar 26, 2021

This has been released in version 3.34.0 of the Terraform AWS provider. Please see the Terraform documentation on provider versioning or reach out if you need any assistance upgrading.

For further feature requests or bug reports with this functionality, please create a new GitHub issue following the template for triage. Thanks!

@ghost
Copy link

ghost commented Apr 25, 2021

I'm going to lock this issue because it has been closed for 30 days ⏳. This helps our maintainers find and focus on the active issues.

If you feel this issue should be reopened, we encourage creating a new issue linking back to this one for added context. Thanks!

@ghost ghost locked as resolved and limited conversation to collaborators Apr 25, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
bug Addresses a defect in current functionality. documentation Introduces or discusses updates to documentation. enhancement Requests to existing resources that expand the functionality or scope. service/storagegateway Issues and PRs that pertain to the storagegateway service. size/L Managed by automation to categorize the size of a PR. tests PRs: expanded test coverage. Issues: expanded coverage, enhancements to test infrastructure.
Projects
None yet
2 participants