From 1a30ef103cfd360fc175afe504a7ab431e21ede3 Mon Sep 17 00:00:00 2001 From: Kent 'picat' Gruber Date: Fri, 13 Nov 2020 11:03:32 -0500 Subject: [PATCH 1/3] Update go-getter to v1.5.1 with support for vhost style S3 paths --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 158935d60..f1e73bb5d 100644 --- a/go.mod +++ b/go.mod @@ -51,7 +51,7 @@ require ( github.com/hashicorp/go-azure-helpers v0.12.0 github.com/hashicorp/go-checkpoint v0.5.0 github.com/hashicorp/go-cleanhttp v0.5.1 - github.com/hashicorp/go-getter v1.5.0 + github.com/hashicorp/go-getter v1.5.1 github.com/hashicorp/go-hclog v0.15.0 github.com/hashicorp/go-immutable-radix v0.0.0-20180129170900-7f3cd4390caa // indirect github.com/hashicorp/go-msgpack v0.5.4 // indirect diff --git a/go.sum b/go.sum index 40ea1106e..d22a19900 100644 --- a/go.sum +++ b/go.sum @@ -299,6 +299,8 @@ github.com/hashicorp/go-cleanhttp v0.5.1 h1:dH3aiDG9Jvb5r5+bYHsikaOUIpcM0xvgMXVo github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= github.com/hashicorp/go-getter v1.5.0 h1:ciWJaeZWSMbc5OiLMpKp40MKFPqO44i0h3uyfXPBkkk= github.com/hashicorp/go-getter v1.5.0/go.mod h1:a7z7NPPfNQpJWcn4rSWFtdrSldqLdLPEF3d8nFMsSLM= +github.com/hashicorp/go-getter v1.5.1 h1:lM9sM02nvEApQGFgkXxWbhfqtyN+AyhQmi+MaMdBDOI= +github.com/hashicorp/go-getter v1.5.1/go.mod h1:a7z7NPPfNQpJWcn4rSWFtdrSldqLdLPEF3d8nFMsSLM= github.com/hashicorp/go-hclog v0.0.0-20180709165350-ff2cf002a8dd/go.mod h1:9bjs9uLqI8l75knNv3lV1kA55veR+WUPSiKIWcQHudI= github.com/hashicorp/go-hclog v0.14.1/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ= github.com/hashicorp/go-hclog v0.14.2-0.20201022192508-e59fd7e11108 h1:njjwC6QCapHoavbrnzrenpovKeHauePE1wPVdflPvRU= From 20026819dd7aa5caed42ff2126893a8a7365cb98 Mon Sep 17 00:00:00 2001 From: Kent 'picat' Gruber Date: Fri, 13 Nov 2020 11:15:06 -0500 Subject: [PATCH 2/3] Remove path-style specific wording in module sources doc Follow up on wording added in https://github.com/hashicorp/terraform/pull/20377 --- website/docs/modules/sources.html.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/docs/modules/sources.html.markdown b/website/docs/modules/sources.html.markdown index c78c2458e..6454db99c 100644 --- a/website/docs/modules/sources.html.markdown +++ b/website/docs/modules/sources.html.markdown @@ -357,7 +357,7 @@ information. You can use archives stored in S3 as module sources using the special `s3::` prefix, followed by -[a path-style S3 bucket object URL](http://docs.aws.amazon.com/AmazonS3/latest/dev/UsingBucket.html#access-bucket-intro). +[a S3 bucket object URL](http://docs.aws.amazon.com/AmazonS3/latest/dev/UsingBucket.html#access-bucket-intro). ```hcl module "consul" { From 63cc597bc37ca485047b68f5a068bfe7279dd890 Mon Sep 17 00:00:00 2001 From: Kent 'picat' Gruber Date: Fri, 13 Nov 2020 11:28:13 -0500 Subject: [PATCH 3/3] Fix grammar Co-authored-by: Pam Selle --- website/docs/modules/sources.html.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/docs/modules/sources.html.markdown b/website/docs/modules/sources.html.markdown index 6454db99c..d6f11b15e 100644 --- a/website/docs/modules/sources.html.markdown +++ b/website/docs/modules/sources.html.markdown @@ -357,7 +357,7 @@ information. You can use archives stored in S3 as module sources using the special `s3::` prefix, followed by -[a S3 bucket object URL](http://docs.aws.amazon.com/AmazonS3/latest/dev/UsingBucket.html#access-bucket-intro). +[an S3 bucket object URL](http://docs.aws.amazon.com/AmazonS3/latest/dev/UsingBucket.html#access-bucket-intro). ```hcl module "consul" {