Skip to content

Commit 715d1c0

Browse files
oredavidsoredavids
authored
Revert "Updated with the [latest changes](https://github.com/gruntwork-io/terraform-aws-static-assets/releases/tag/v0.17.5) from the terraform-aws-static-assets@v0.17.5 source branch. (#1272)" (#1282)
This reverts commit e7126d2.
1 parent ad6f490 commit 715d1c0

File tree

2 files changed

+32
-67
lines changed

2 files changed

+32
-67
lines changed

‎docs/reference/modules/terraform-aws-static-assets/s3-cloudfront/s3-cloudfront.md‎

Lines changed: 14 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -9,25 +9,25 @@ import VersionBadge from '../../../../../src/components/VersionBadge.tsx';
99
import { HclListItem, HclListItemDescription, HclListItemTypeDetails, HclListItemDefaultValue, HclGeneralListItem } from '../../../../../src/components/HclListItem.tsx';
1010
import { ModuleUsage } from "../../../../../src/components/ModuleUsage";
1111

12-
<VersionBadge repoTitle="Static Assets Modules" version="0.17.5" lastModifiedVersion="0.17.5"/>
12+
<VersionBadge repoTitle="Static Assets Modules" version="0.17.4" lastModifiedVersion="0.17.4"/>
1313

1414
# S3 CloudFront Module
1515

16-
<a href="https://github.com/gruntwork-io/terraform-aws-static-assets/tree/v0.17.5/modules/s3-cloudfront" className="link-button" title="View the source code for this module in GitHub.">View Source</a>
16+
<a href="https://github.com/gruntwork-io/terraform-aws-static-assets/tree/v0.17.4/modules/s3-cloudfront" className="link-button" title="View the source code for this module in GitHub.">View Source</a>
1717

18-
<a href="https://github.com/gruntwork-io/terraform-aws-static-assets/releases/tag/v0.17.5" className="link-button" title="Release notes for only versions which impacted this module.">Release Notes</a>
18+
<a href="https://github.com/gruntwork-io/terraform-aws-static-assets/releases/tag/v0.17.4" className="link-button" title="Release notes for only versions which impacted this module.">Release Notes</a>
1919

2020
This module deploys a [CloudFront](https://aws.amazon.com/cloudfront/) distribution as a Content Distribution Network
2121
(CDN) in front of an [S3 bucket](https://aws.amazon.com/s3/). This reduces latency for your users, by caching your
2222
static content in servers around the world. It also allows you to use SSL with the static content in an S3 bucket.
2323

24-
See the [s3-static-website module](https://github.com/gruntwork-io/terraform-aws-static-assets/tree/v0.17.5/modules/s3-static-website) for how to deploy static content in an S3 bucket.
24+
See the [s3-static-website module](https://github.com/gruntwork-io/terraform-aws-static-assets/tree/v0.17.4/modules/s3-static-website) for how to deploy static content in an S3 bucket.
2525

2626
## Quick Start
2727

28-
* See the [cloudfront-s3-public](https://github.com/gruntwork-io/terraform-aws-static-assets/tree/v0.17.5/examples/cloudfront-s3-public) and
29-
[cloudfront-s3-private](https://github.com/gruntwork-io/terraform-aws-static-assets/tree/v0.17.5/examples/cloudfront-s3-private) examples for working sample code.
30-
* Check out [vars.tf](https://github.com/gruntwork-io/terraform-aws-static-assets/tree/v0.17.5/modules/s3-cloudfront/vars.tf) for all parameters you can set for this module.
28+
* See the [cloudfront-s3-public](https://github.com/gruntwork-io/terraform-aws-static-assets/tree/v0.17.4/examples/cloudfront-s3-public) and
29+
[cloudfront-s3-private](https://github.com/gruntwork-io/terraform-aws-static-assets/tree/v0.17.4/examples/cloudfront-s3-private) examples for working sample code.
30+
* Check out [vars.tf](https://github.com/gruntwork-io/terraform-aws-static-assets/tree/v0.17.4/modules/s3-cloudfront/vars.tf) for all parameters you can set for this module.
3131

3232
## Public vs private S3 buckets
3333

@@ -130,7 +130,7 @@ most use cases, but is not particularly flexible. In particular, the limitations
130130
* Only one default cache behavior is supported
131131
([cache behaviors](https://www.terraform.io/docs/providers/aws/r/cloudfront_distribution.html#cache-behavior-arguments)
132132
is an inline block). You can control the default cache settings using a number of parameters, including
133-
`cached_methods`, `default_ttl`, `min_ttl`, `max_ttl`, and many others (see [vars.tf](https://github.com/gruntwork-io/terraform-aws-static-assets/tree/v0.17.5/modules/s3-cloudfront/vars.tf) for the full list).
133+
`cached_methods`, `default_ttl`, `min_ttl`, `max_ttl`, and many others (see [vars.tf](https://github.com/gruntwork-io/terraform-aws-static-assets/tree/v0.17.4/modules/s3-cloudfront/vars.tf) for the full list).
134134

135135
* Only two error responses are supported
136136
([error responses](https://www.terraform.io/docs/providers/aws/r/cloudfront_distribution.html#custom-error-response-arguments)
@@ -162,7 +162,7 @@ into your own codebase, using it as a guide, and adding the tweaks you need.
162162
163163
module "s_3_cloudfront" {
164164
165-
source = "git::git@github.com:gruntwork-io/terraform-aws-static-assets.git//modules/s3-cloudfront?ref=v0.17.5"
165+
source = "git::git@github.com:gruntwork-io/terraform-aws-static-assets.git//modules/s3-cloudfront?ref=v0.17.4"
166166
167167
# ----------------------------------------------------------------------------------------------------
168168
# REQUIRED VARIABLES
@@ -300,9 +300,6 @@ module "s_3_cloudfront" {
300300
# The error responses you want CloudFront to return to the viewer.
301301
error_responses = null
302302
303-
# The name of an existing logging bucket to use instead of creating.
304-
existing_s3_log_bucket_name = null
305-
306303
# The website endpoints for each failover S3 bucket. This value of each should
307304
# be of the format <BUCKET_NAME>.s3-website-<AWS_REGION>.amazonaws.com. Only
308305
# used if var.s3_bucket_is_public_website is true, and if you are providing a
@@ -424,10 +421,6 @@ module "s_3_cloudfront" {
424421
# var.acm_certificate_arn, or var.iam_certificate_id.
425422
use_cloudfront_default_certificate = true
426423
427-
# Enable the use of CloudFront OAC. Enabling the use of OAC will disable
428-
# Origin Access Identity (OAI)
429-
use_cloudfront_origin_access_control = false
430-
431424
# Use this element to specify the protocol that users can use to access the
432425
# files in the origin specified by TargetOriginId when a request matches the
433426
# path pattern in PathPattern. One of allow-all, https-only, or
@@ -462,7 +455,7 @@ module "s_3_cloudfront" {
462455
# ------------------------------------------------------------------------------------------------------
463456
464457
terraform {
465-
source = "git::git@github.com:gruntwork-io/terraform-aws-static-assets.git//modules/s3-cloudfront?ref=v0.17.5"
458+
source = "git::git@github.com:gruntwork-io/terraform-aws-static-assets.git//modules/s3-cloudfront?ref=v0.17.4"
466459
}
467460
468461
inputs = {
@@ -603,9 +596,6 @@ inputs = {
603596
# The error responses you want CloudFront to return to the viewer.
604597
error_responses = null
605598
606-
# The name of an existing logging bucket to use instead of creating.
607-
existing_s3_log_bucket_name = null
608-
609599
# The website endpoints for each failover S3 bucket. This value of each should
610600
# be of the format <BUCKET_NAME>.s3-website-<AWS_REGION>.amazonaws.com. Only
611601
# used if var.s3_bucket_is_public_website is true, and if you are providing a
@@ -727,10 +717,6 @@ inputs = {
727717
# var.acm_certificate_arn, or var.iam_certificate_id.
728718
use_cloudfront_default_certificate = true
729719
730-
# Enable the use of CloudFront OAC. Enabling the use of OAC will disable
731-
# Origin Access Identity (OAI)
732-
use_cloudfront_origin_access_control = false
733-
734720
# Use this element to specify the protocol that users can use to access the
735721
# files in the origin specified by TargetOriginId when a request matches the
736722
# path pattern in PathPattern. One of allow-all, https-only, or
@@ -1115,15 +1101,6 @@ The error responses you want CloudFront to return to the viewer.
11151101
<HclListItemDefaultValue defaultValue="null"/>
11161102
</HclListItem>
11171103

1118-
<HclListItem name="existing_s3_log_bucket_name" requirement="optional" type="string">
1119-
<HclListItemDescription>
1120-
1121-
The name of an existing logging bucket to use instead of creating.
1122-
1123-
</HclListItemDescription>
1124-
<HclListItemDefaultValue defaultValue="null"/>
1125-
</HclListItem>
1126-
11271104
<HclListItem name="failover_bucket_website_endpoints" requirement="optional" type="list(string)">
11281105
<HclListItemDescription>
11291106

@@ -1369,15 +1346,6 @@ Set to true if you want viewers to use HTTPS to request your objects and you're
13691346
<HclListItemDefaultValue defaultValue="true"/>
13701347
</HclListItem>
13711348

1372-
<HclListItem name="use_cloudfront_origin_access_control" requirement="optional" type="bool">
1373-
<HclListItemDescription>
1374-
1375-
Enable the use of CloudFront OAC. Enabling the use of OAC will disable Origin Access Identity (OAI)
1376-
1377-
</HclListItemDescription>
1378-
<HclListItemDefaultValue defaultValue="false"/>
1379-
</HclListItem>
1380-
13811349
<HclListItem name="viewer_protocol_policy" requirement="optional" type="string">
13821350
<HclListItemDescription>
13831351

@@ -1432,9 +1400,6 @@ If you have specified whitelist in <a href="#forward_cookies"><code>forward_cook
14321400
<HclListItem name="cloudfront_id">
14331401
</HclListItem>
14341402

1435-
<HclListItem name="cloudfront_origin_access_control_id">
1436-
</HclListItem>
1437-
14381403
<HclListItem name="cloudfront_origin_access_identity_iam_arn">
14391404
</HclListItem>
14401405

@@ -1448,11 +1413,11 @@ If you have specified whitelist in <a href="#forward_cookies"><code>forward_cook
14481413
<!-- ##DOCS-SOURCER-START
14491414
{
14501415
"originalSources": [
1451-
"https://github.com/gruntwork-io/terraform-aws-static-assets/tree/v0.17.5/modules/s3-cloudfront/readme.md",
1452-
"https://github.com/gruntwork-io/terraform-aws-static-assets/tree/v0.17.5/modules/s3-cloudfront/variables.tf",
1453-
"https://github.com/gruntwork-io/terraform-aws-static-assets/tree/v0.17.5/modules/s3-cloudfront/outputs.tf"
1416+
"https://github.com/gruntwork-io/terraform-aws-static-assets/tree/v0.17.4/modules/s3-cloudfront/readme.md",
1417+
"https://github.com/gruntwork-io/terraform-aws-static-assets/tree/v0.17.4/modules/s3-cloudfront/variables.tf",
1418+
"https://github.com/gruntwork-io/terraform-aws-static-assets/tree/v0.17.4/modules/s3-cloudfront/outputs.tf"
14541419
],
14551420
"sourcePlugin": "module-catalog-api",
1456-
"hash": "62a22806709b7cf7977e231f8b003b40"
1421+
"hash": "61171e65f045dde2ff03dec125f535be"
14571422
}
14581423
##DOCS-SOURCER-END -->

‎docs/reference/modules/terraform-aws-static-assets/s3-static-website/s3-static-website.md‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ import VersionBadge from '../../../../../src/components/VersionBadge.tsx';
99
import { HclListItem, HclListItemDescription, HclListItemTypeDetails, HclListItemDefaultValue, HclGeneralListItem } from '../../../../../src/components/HclListItem.tsx';
1010
import { ModuleUsage } from "../../../../../src/components/ModuleUsage";
1111

12-
<VersionBadge repoTitle="Static Assets Modules" version="0.17.5" lastModifiedVersion="0.17.4"/>
12+
<VersionBadge repoTitle="Static Assets Modules" version="0.17.4" lastModifiedVersion="0.17.4"/>
1313

1414
# S3 Static Website
1515

16-
<a href="https://github.com/gruntwork-io/terraform-aws-static-assets/tree/v0.17.5/modules/s3-static-website" className="link-button" title="View the source code for this module in GitHub.">View Source</a>
16+
<a href="https://github.com/gruntwork-io/terraform-aws-static-assets/tree/v0.17.4/modules/s3-static-website" className="link-button" title="View the source code for this module in GitHub.">View Source</a>
1717

1818
<a href="https://github.com/gruntwork-io/terraform-aws-static-assets/releases/tag/v0.17.4" className="link-button" title="Release notes for only versions which impacted this module.">Release Notes</a>
1919

@@ -29,39 +29,39 @@ This module creates an AWS S3 bucket that can be used to host a static website.
2929

3030
* Optionally configure a custom domain name for the website.
3131

32-
* Optionally deploy a CDN in front of S3 using the [s3-cloudfront module](https://github.com/gruntwork-io/terraform-aws-static-assets/tree/v0.17.5/modules/s3-cloudfront).
32+
* Optionally deploy a CDN in front of S3 using the [s3-cloudfront module](https://github.com/gruntwork-io/terraform-aws-static-assets/tree/v0.17.4/modules/s3-cloudfront).
3333

3434
## Learn
3535

3636
The reason to serve static content from S3 rather than from your own app server is that it can significantly reduce the load on your server, allowing it to solely focus on serving dynamic data. This will save you money and make your website run faster. For even bigger improvements in performance, consider deploying a CloudFront Content Distribution Network (CDN) in front of the S3 bucket using the s3-cloudfront module.
3737

3838
### Core concepts
3939

40-
* [Quick Start](https://github.com/gruntwork-io/terraform-aws-static-assets/tree/v0.17.5/modules/s3-static-website/core-concepts.md#quick-start)
40+
* [Quick Start](https://github.com/gruntwork-io/terraform-aws-static-assets/tree/v0.17.4/modules/s3-static-website/core-concepts.md#quick-start)
4141

42-
* [How to test the website](https://github.com/gruntwork-io/terraform-aws-static-assets/tree/v0.17.5/modules/s3-static-website/core-concepts.md#how-to-test-the-website)
42+
* [How to test the website](https://github.com/gruntwork-io/terraform-aws-static-assets/tree/v0.17.4/modules/s3-static-website/core-concepts.md#how-to-test-the-website)
4343

44-
* [How to configure HTTPS (SSL) or a CDN?](https://github.com/gruntwork-io/terraform-aws-static-assets/tree/v0.17.5/modules/s3-static-website/core-concepts.md#how-to-configure-http)
44+
* [How to configure HTTPS (SSL) or a CDN?](https://github.com/gruntwork-io/terraform-aws-static-assets/tree/v0.17.4/modules/s3-static-website/core-concepts.md#how-to-configure-http)
4545

46-
* [How to handle www + root domains](https://github.com/gruntwork-io/terraform-aws-static-assets/tree/v0.17.5/modules/s3-static-website/core-concepts.md#how-to-handle)
46+
* [How to handle www + root domains](https://github.com/gruntwork-io/terraform-aws-static-assets/tree/v0.17.4/modules/s3-static-website/core-concepts.md#how-to-handle)
4747

48-
* [How do I configure Cross Origin Resource Sharing (CORS)?](https://github.com/gruntwork-io/terraform-aws-static-assets/tree/v0.17.5/modules/s3-static-website/core-concepts.md#how-do-i-configure-cross-origin-resource-sharing-cors)
48+
* [How do I configure Cross Origin Resource Sharing (CORS)?](https://github.com/gruntwork-io/terraform-aws-static-assets/tree/v0.17.4/modules/s3-static-website/core-concepts.md#how-do-i-configure-cross-origin-resource-sharing-cors)
4949

5050
### Repo organization
5151

52-
* [modules](https://github.com/gruntwork-io/terraform-aws-static-assets/tree/v0.17.5/modules): The main implementation code for this repo, broken down into multiple standalone, orthogonal submodules.
52+
* [modules](https://github.com/gruntwork-io/terraform-aws-static-assets/tree/v0.17.4/modules): The main implementation code for this repo, broken down into multiple standalone, orthogonal submodules.
5353

54-
* [examples](https://github.com/gruntwork-io/terraform-aws-static-assets/tree/v0.17.5/examples): This folder contains working examples of how to use the submodules.
54+
* [examples](https://github.com/gruntwork-io/terraform-aws-static-assets/tree/v0.17.4/examples): This folder contains working examples of how to use the submodules.
5555

56-
* [test](https://github.com/gruntwork-io/terraform-aws-static-assets/tree/v0.17.5/test): Automated tests for the modules and examples.
56+
* [test](https://github.com/gruntwork-io/terraform-aws-static-assets/tree/v0.17.4/test): Automated tests for the modules and examples.
5757

5858
## Deploy
5959

6060
### Non-production deployment (quick start for learning)
6161

6262
If you just want to try this repo out for experimenting and learning, check out the following resources:
6363

64-
* [Examples folder](https://github.com/gruntwork-io/terraform-aws-static-assets/tree/v0.17.5/examples): The `examples` folder contains sample code optimized for learning, experimenting, and testing (but not production usage).
64+
* [Examples folder](https://github.com/gruntwork-io/terraform-aws-static-assets/tree/v0.17.4/examples): The `examples` folder contains sample code optimized for learning, experimenting, and testing (but not production usage).
6565

6666
### Production deployment
6767

@@ -82,7 +82,7 @@ If you want to deploy this repo in production, check out the following resources
8282
8383
module "s_3_static_website" {
8484
85-
source = "git::git@github.com:gruntwork-io/terraform-aws-static-assets.git//modules/s3-static-website?ref=v0.17.5"
85+
source = "git::git@github.com:gruntwork-io/terraform-aws-static-assets.git//modules/s3-static-website?ref=v0.17.4"
8686
8787
# ----------------------------------------------------------------------------------------------------
8888
# REQUIRED VARIABLES
@@ -267,7 +267,7 @@ module "s_3_static_website" {
267267
# ------------------------------------------------------------------------------------------------------
268268
269269
terraform {
270-
source = "git::git@github.com:gruntwork-io/terraform-aws-static-assets.git//modules/s3-static-website?ref=v0.17.5"
270+
source = "git::git@github.com:gruntwork-io/terraform-aws-static-assets.git//modules/s3-static-website?ref=v0.17.4"
271271
}
272272
273273
inputs = {
@@ -860,11 +860,11 @@ A value that can be used to chain resources to depend on the website bucket bein
860860
<!-- ##DOCS-SOURCER-START
861861
{
862862
"originalSources": [
863-
"https://github.com/gruntwork-io/terraform-aws-static-assets/tree/v0.17.5/modules/s3-static-website/readme.adoc",
864-
"https://github.com/gruntwork-io/terraform-aws-static-assets/tree/v0.17.5/modules/s3-static-website/variables.tf",
865-
"https://github.com/gruntwork-io/terraform-aws-static-assets/tree/v0.17.5/modules/s3-static-website/outputs.tf"
863+
"https://github.com/gruntwork-io/terraform-aws-static-assets/tree/v0.17.4/modules/s3-static-website/readme.adoc",
864+
"https://github.com/gruntwork-io/terraform-aws-static-assets/tree/v0.17.4/modules/s3-static-website/variables.tf",
865+
"https://github.com/gruntwork-io/terraform-aws-static-assets/tree/v0.17.4/modules/s3-static-website/outputs.tf"
866866
],
867867
"sourcePlugin": "module-catalog-api",
868-
"hash": "ba7211fdcc3e9aeb526777b9306b1b7e"
868+
"hash": "4cf33a07f2147d14b3d1b51760e9def9"
869869
}
870870
##DOCS-SOURCER-END -->

0 commit comments

Comments
 (0)