provider/aws: Adding some other simple S3 Bucket Object (Optional) Inputs

[stack72]

Added the following to the S3 Bucket Object:

• cache_control
• content_disposition
• content_encoding
• content_language
• content_type

Tests pass as expected:

make testacc TEST=./builtin/providers/aws TESTARGS='-run=S3BucketObject' 2>~/tf.log
go generate ./...
TF_ACC=1 go test ./builtin/providers/aws -v -run=S3BucketObject -timeout 90m
=== RUN TestAccAWSS3BucketObject_basic
--- PASS: TestAccAWSS3BucketObject_basic (4.64s)
=== RUN TestAccAWSS3BucketObject_withContentCharacteristics
--- PASS: TestAccAWSS3BucketObject_withContentCharacteristics (3.45s)
PASS
ok      github.com/hashicorp/terraform/builtin/providers/aws    8.109s

[stack72]

@catsby while you are on a merging spree, this one should be a pretty simple addition :) It just adds support for some more pieces of the S3 puzzle

[catsby]

Can we throw in a few examples of these? e.g. for cache_control, two examples would be no-cache, or max-age=3000? Is the max-age=3000 even valid? Some guidance would help people (like myself...) on how to use it correctly

[stack72]

@catsby thanks for reviewing this. I have added links to the correct sections of w3c docs for some of the more complex documentation (e.g. cache_control and content_disposition) and then added some samples for content_type and content_language

Also changed the PutObject input to check for empty strings before adding to the struct

[stack72]

@catsby ok, I have added some explanations here and changed to support the empty string checks

FYI, master had removed the Update method and 'Forced New' on everything. So I was getting this error:

--- FAIL: TestProvider-2 (0.00s)
    provider_test.go:24: err: aws_s3_bucket_object: No Update defined, must set ForceNew on: []string{"cache_control", "content_disposition", "content_encoding", "content_language", "content_type"}

By making the same changes to my code, the world was a better place :)

I think this may be ready for you now

[catsby]

Seems like at least this one needs to be computed as well, I'm getting a plan loop with this config:

provider "aws" {
  region = "us-west-2"
}

resource "aws_s3_bucket" "object_bucket" {
    bucket = "tf-object-test-bucket-1234"
}

resource "aws_s3_bucket_object" "object" {
    bucket = "${aws_s3_bucket.object_bucket.bucket}"
    key = "test-key"
    source = "terraform.tfstate"
}

~ aws_s3_bucket_object.object
    content_type: "binary/octet-stream" => ""

[stack72]

@catsby can a param be both Optional and Computed?

[catsby]

One final bit and we're good to go

[stack72]

@catsby we are good with this now :)

[catsby]

Thanks @stack72 !

[ghost]

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.