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.

Sign up for GitHub

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

Jump to bottom

Add additional properties for google resource storage bucket object. #14259

Merged
merged 3 commits into from
May 8, 2017
Merged

Add additional properties for google resource storage bucket object. #14259

merged 3 commits into from
May 8, 2017

Conversation

emilymye
Copy link
Contributor

@emilymye emilymye commented May 5, 2017

Resolves #13616

@danawillow danawillow self-requested a review May 5, 2017 22:34
dasch
dasch reviewed May 8, 2017
View reviewed changes
builtin/providers/google/resource_storage_bucket_object.go Outdated

return nil
}

Copy link
Contributor

Choose a reason for hiding this comment

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

Why this change? It will cause errors if an object is deleted manually.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I...don't actually know where this is from, i think it was a last minute merge issue that I didn't catch. I'll fix this.

@emilymye emilymye force-pushed the emilyye_13616_google_storage_bucket_object_add_props branch 2 times, most recently from 50769b1 to 9365962 Compare May 8, 2017 17:56
@emilymye emilymye force-pushed the emilyye_13616_google_storage_bucket_object_add_props branch from 9365962 to 6bc2c1e Compare May 8, 2017 17:58
danawillow
danawillow suggested changes May 8, 2017
View reviewed changes
Copy link
Contributor

@danawillow danawillow left a comment

Choose a reason for hiding this comment

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

Looks good!

TF_ACC=1 go test ./builtin/providers/google -v -run=TestAccGoogleStorageObject -timeout 120m
=== RUN   TestAccGoogleStorageObject_basic
--- PASS: TestAccGoogleStorageObject_basic (4.23s)
=== RUN   TestAccGoogleStorageObject_content
--- PASS: TestAccGoogleStorageObject_content (4.06s)
=== RUN   TestAccGoogleStorageObjectAcl_basic
--- PASS: TestAccGoogleStorageObjectAcl_basic (6.59s)
=== RUN   TestAccGoogleStorageObjectAcl_upgrade
--- PASS: TestAccGoogleStorageObjectAcl_upgrade (11.32s)
=== RUN   TestAccGoogleStorageObjectAcl_downgrade
--- PASS: TestAccGoogleStorageObjectAcl_downgrade (9.81s)
=== RUN   TestAccGoogleStorageObjectAcl_predefined
--- PASS: TestAccGoogleStorageObjectAcl_predefined (5.03s)
PASS
ok  	github.com/hashicorp/terraform/builtin/providers/google	41.139s

website/source/docs/providers/google/r/storage_bucket_object.html.markdown Outdated

* `content_language` - (Optional) [Content-Language](https://tools.ietf.org/html/rfc7231#section-3.1.3.2) of the object data.

* `content_type` - (Optional) [Content-Type]() of the object data. Defaults to "application/octet-stream" or "text/plain; charset=utf-8".
Copy link
Contributor

Choose a reason for hiding this comment

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

Missing link?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Added

builtin/providers/google/resource_storage_bucket_object.go
Optional: true,
},

"content_type": &schema.Schema{
Copy link
Contributor

Choose a reason for hiding this comment

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

This and storage_class still need ForceNew: true since they can't be updated

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done!

@danawillow
Copy link
Contributor

Whoops, ran tests in wrong client. They're still passing, but just for posterity:

TF_ACC=1 go test ./builtin/providers/google -v -run=TestAccGoogleStorageObject -timeout 120m
=== RUN   TestAccGoogleStorageObject_basic
--- PASS: TestAccGoogleStorageObject_basic (5.12s)
=== RUN   TestAccGoogleStorageObject_content
--- PASS: TestAccGoogleStorageObject_content (4.21s)
=== RUN   TestAccGoogleStorageObject_withContentCharacteristics
--- PASS: TestAccGoogleStorageObject_withContentCharacteristics (3.86s)
=== RUN   TestAccGoogleStorageObject_cacheControl
--- PASS: TestAccGoogleStorageObject_cacheControl (4.24s)
=== RUN   TestAccGoogleStorageObject_storageClass
--- PASS: TestAccGoogleStorageObject_storageClass (4.46s)
=== RUN   TestAccGoogleStorageObjectAcl_basic
--- PASS: TestAccGoogleStorageObjectAcl_basic (5.85s)
=== RUN   TestAccGoogleStorageObjectAcl_upgrade
--- PASS: TestAccGoogleStorageObjectAcl_upgrade (9.73s)
=== RUN   TestAccGoogleStorageObjectAcl_downgrade
--- PASS: TestAccGoogleStorageObjectAcl_downgrade (10.03s)
=== RUN   TestAccGoogleStorageObjectAcl_predefined
--- PASS: TestAccGoogleStorageObjectAcl_predefined (4.82s)
PASS
ok  	github.com/hashicorp/terraform/builtin/providers/google	52.440s

@danawillow
Copy link
Contributor

Looks good, thanks @emilymye!

@danawillow danawillow merged commit 64c2e68 into hashicorp:master May 8, 2017
@emilymye emilymye deleted the emilyye_13616_google_storage_bucket_object_add_props branch May 8, 2017 23:44
@ghost
Copy link

ghost commented Apr 12, 2020

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 have found a problem that seems similar to this, please open a new issue and complete the issue template so we can capture all the details necessary to investigate further.

@ghost ghost locked and limited conversation to collaborators Apr 12, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@dasch dasch dasch left review comments

@danawillow danawillow danawillow approved these changes

Assignees
No one assigned
Labels
enhancement provider/google-cloud
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Additional properties for google_storage_bucket_object
3 participants
@emilymye @danawillow @dasch