Skip to content

Commit c88a33c

Browse files
committed
revert to default and clean up
1 parent 87eb361 commit c88a33c

File tree

7 files changed

+17
-7
lines changed

7 files changed

+17
-7
lines changed

aws/README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -188,6 +188,7 @@ The documentation below is auto-generated to give insight on what's created via
188188
| <a name="input_cluster_version"></a> [cluster\_version](#input\_cluster\_version) | The EKS cluster version to use | `string` | `"1.23"` | no |
189189
| <a name="input_extra_allowed_ip_ranges"></a> [extra\_allowed\_ip\_ranges](#input\_extra\_allowed\_ip\_ranges) | Allowed IP ranges in addition to creator IP | `list(string)` | `[]` | no |
190190
| <a name="input_region"></a> [region](#input\_region) | The AWS region to use | `string` | `"eu-west-1"` | no |
191+
| <a name="input_state_bucket_arn"></a> [state\_bucket\_arn](#input\_state\_bucket\_arn) | ARN of the state bucket to grant access to the s3 user | `string` | n/a | yes |
191192

192193
## Outputs
193194

aws/main.tf

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
terraform {
22
# Set your region and bucket name (output from shared state) in the placeholder below
33
# Then uncomment and apply!
4-
backend "s3" {
5-
region = "eu-west-1" # Change if desired
6-
bucket = "terraform-20221107072744117300000001"
7-
key = "wrongsecrets/terraform.tfstate"
8-
}
4+
# backend "s3" {
5+
# region = "eu-west-1" # Change if desired
6+
# bucket = "" # Put your bucket name here
7+
# key = "wrongsecrets/terraform.tfstate" # Change if desired
8+
# }
99
}
1010

1111
locals {

aws/shared-state/README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,5 +36,6 @@ No modules.
3636

3737
| Name | Description |
3838
|------|-------------|
39+
| <a name="output_s3_bucket_arn"></a> [s3\_bucket\_arn](#output\_s3\_bucket\_arn) | Name of the terraform state bucket |
3940
| <a name="output_s3_bucket_name"></a> [s3\_bucket\_name](#output\_s3\_bucket\_name) | Name of the terraform state bucket |
4041
<!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->

aws/shared-state/main.tf

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,9 @@ provider "aws" {
1111
region = var.region
1212
}
1313

14-
resource "aws_s3_bucket" "state" {}
14+
resource "aws_s3_bucket" "state" {
15+
force_destroy = true
16+
}
1517

1618
resource "aws_s3_bucket_server_side_encryption_configuration" "encryption" {
1719
bucket = aws_s3_bucket.state.id

aws/shared-state/outputs.tf

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,8 @@ output "s3_bucket_name" {
22
description = "Name of the terraform state bucket"
33
value = aws_s3_bucket.state.id
44
}
5+
6+
output "s3_bucket_arn" {
7+
description = "Name of the terraform state bucket"
8+
value = aws_s3_bucket.state.id
9+
}

aws/terraform.tfvars

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
cluster_version = "1.22"
22
region = "eu-west-1"
3+
# state_bucket_arn = "...."

aws/variables.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,5 +24,5 @@ variable "extra_allowed_ip_ranges" {
2424

2525
variable "state_bucket_arn" {
2626
description = "ARN of the state bucket to grant access to the s3 user"
27-
type = string
27+
type = string
2828
}

0 commit comments

Comments
 (0)