Skip to content

Commit fac86df

Browse files
benjaminvalienteBenjamin Valiente (Contractor)github-actions[bot]
authored
fix: flatten vpc-endpoints module and revert SUBMODULES glob change (#275)
* fix: flatten vpc-endpoints module and revert SUBMODULES glob change * terraform-docs: automated action --------- Co-authored-by: Benjamin Valiente (Contractor) <benjamin.valiente@thoughtbot.com> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
1 parent 5f3614b commit fac86df

10 files changed

Lines changed: 48 additions & 53 deletions

File tree

‎aws/network/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ module "network" {
7171
| <a name="module_private_subnets"></a> [private\_subnets](#module\_private\_subnets) | ./modules/private-subnets | n/a |
7272
| <a name="module_public_subnet_routes"></a> [public\_subnet\_routes](#module\_public\_subnet\_routes) | ./modules/public-subnet-routes | n/a |
7373
| <a name="module_public_subnets"></a> [public\_subnets](#module\_public\_subnets) | ./modules/public-subnets | n/a |
74-
| <a name="module_s3_endpoint"></a> [s3\_endpoint](#module\_s3\_endpoint) | ./modules/vpc-endpoints/s3-vpc-endpoint | n/a |
74+
| <a name="module_s3_endpoint"></a> [s3\_endpoint](#module\_s3\_endpoint) | ./modules/vpc-endpoints | n/a |
7575
| <a name="module_vpc"></a> [vpc](#module\_vpc) | ./modules/vpc | n/a |
7676

7777
## Resources

‎aws/network/main.tf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ module "public_subnet_routes" {
8989

9090
module "s3_endpoint" {
9191
count = var.create_s3_endpoint ? 1 : 0
92-
source = "./modules/vpc-endpoints/s3-vpc-endpoint"
92+
source = "./modules/vpc-endpoints"
9393

9494
name = var.name
9595
namespace = var.namespace
Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
# AWS S3 VPC Endpoint
2+
3+
Module for creating a S3 VPC Endpoint in AWS.
4+
<!-- BEGIN_TF_DOCS -->
5+
## Requirements
6+
7+
| Name | Version |
8+
|------|---------|
9+
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.6.2 |
10+
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | ~> 6.0 |
11+
12+
## Providers
13+
14+
| Name | Version |
15+
|------|---------|
16+
| <a name="provider_aws"></a> [aws](#provider\_aws) | ~> 6.0 |
17+
18+
## Resources
19+
20+
| Name | Type |
21+
|------|------|
22+
| [aws_vpc_endpoint.s3](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/vpc_endpoint) | resource |
23+
| [aws_region.current](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/region) | data source |
24+
25+
## Inputs
26+
27+
| Name | Description | Type | Default | Required |
28+
|------|-------------|------|---------|:--------:|
29+
| <a name="input_name"></a> [name](#input\_name) | Name for this network (used in the endpoint's Name tag) | `string` | n/a | yes |
30+
| <a name="input_namespace"></a> [namespace](#input\_namespace) | Prefix to be applied to created resources | `list(string)` | `[]` | no |
31+
| <a name="input_route_table_ids"></a> [route\_table\_ids](#input\_route\_table\_ids) | List of route table IDs to associate with the S3 Gateway endpoint | `list(string)` | n/a | yes |
32+
| <a name="input_tags"></a> [tags](#input\_tags) | Tags to be applied to the endpoint | `map(string)` | `{}` | no |
33+
| <a name="input_vpc"></a> [vpc](#input\_vpc) | The VPC object in which to create the S3 endpoint | <pre>object({<br> id = string<br> })</pre> | n/a | yes |
34+
35+
## Outputs
36+
37+
| Name | Description |
38+
|------|-------------|
39+
| <a name="output_endpoint_id"></a> [endpoint\_id](#output\_endpoint\_id) | ID of the S3 Gateway VPC endpoint |
40+
| <a name="output_prefix_list_id"></a> [prefix\_list\_id](#output\_prefix\_list\_id) | Prefix list ID of the S3 endpoint (useful for security group egress rules) |
41+
<!-- END_TF_DOCS -->
File renamed without changes.
File renamed without changes.
File renamed without changes.

‎aws/network/modules/vpc-endpoints/s3-vpc-endpoint/README.md‎

Lines changed: 0 additions & 41 deletions
This file was deleted.

aws/network/modules/vpc-endpoints/s3-vpc-endpoint/variables.tf renamed to aws/network/modules/vpc-endpoints/variables.tf

File renamed without changes.
File renamed without changes.

‎makefile‎

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,11 @@ export TFDOCSRC := $(CURDIR)/.terraform-docs.yml
66

77
SUBMODULES := $(filter-out \
88
%.md,\
9-
$(foreach dir,\
10-
$(wildcard \
11-
platform/modules/* \
12-
platform \
13-
aws/*/modules/* \
14-
aws/* \
15-
platform/modules/*/* \
16-
aws/*/modules/*/* \
17-
),\
18-
$(if $(wildcard $(dir)/*.tf),$(dir),)\
9+
$(wildcard \
10+
platform/modules/* \
11+
platform \
12+
aws/*/modules/*\
13+
aws/* \
1914
)\
2015
)
2116
SUBMODULEMAKEFILES := $(foreach module,$(SUBMODULES),$(module)/makefile)

0 commit comments

Comments
 (0)