From 876918fac8682a1b9032cecc61496e61587f6857 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 6 Dec 2022 01:43:53 +0600 Subject: [PATCH] chore(deps): update terraform cloudposse/s3-log-storage/aws to v1 (#58) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: cloudpossebot <11232728+cloudpossebot@users.noreply.github.com> Co-authored-by: Igor Rodionov --- README.md | 3 +-- docs/terraform.md | 3 +-- examples/complete/fixtures.us-east-2.tfvars | 2 +- main.tf | 3 +-- variables.tf | 14 -------------- 5 files changed, 4 insertions(+), 21 deletions(-) diff --git a/README.md b/README.md index 6114f0f..3011d3c 100644 --- a/README.md +++ b/README.md @@ -144,7 +144,7 @@ Available targets: | Name | Source | Version | |------|--------|---------| -| [s3\_bucket](#module\_s3\_bucket) | cloudposse/s3-log-storage/aws | 0.28.3 | +| [s3\_bucket](#module\_s3\_bucket) | cloudposse/s3-log-storage/aws | 1.0.0 | | [this](#module\_this) | cloudposse/label/null | 0.25.0 | ## Resources @@ -173,7 +173,6 @@ Available targets: | [environment](#input\_environment) | ID element. Usually used for region e.g. 'uw2', 'us-west-2', OR role 'prod', 'staging', 'dev', 'UAT' | `string` | `null` | no | | [expiration\_days](#input\_expiration\_days) | (Deprecated, use `lifecycle_configuration_rules` instead)
Number of days after which to expunge the objects | `number` | `90` | no | | [force\_destroy](#input\_force\_destroy) | When `true`, permits a non-empty S3 bucket to be deleted by first deleting all objects in the bucket.
THESE OBJECTS ARE NOT RECOVERABLE even if they were versioned and stored in Glacier.
Must be set `false` unless `force_destroy_enabled` is also `true`. | `bool` | `false` | no | -| [force\_destroy\_enabled](#input\_force\_destroy\_enabled) | When `true`, permits `force_destroy` to be set to `true`.
This is an extra safety precaution to reduce the chance that Terraform will destroy and recreate
your S3 bucket, causing COMPLETE LOSS OF ALL DATA even if it was stored in Glacier.
WARNING: Upgrading this module from a version prior to 0.27.0 to this version
will cause Terraform to delete your existing S3 bucket CAUSING COMPLETE DATA LOSS
unless you follow the upgrade instructions on the Wiki [here](https://github.com/cloudposse/terraform-aws-s3-log-storage/wiki/Upgrading-to-v0.27.0-(POTENTIAL-DATA-LOSS)).
See additional instructions for upgrading from v0.27.0 to v0.28.0 [here](https://github.com/cloudposse/terraform-aws-s3-log-storage/wiki/Upgrading-to-v0.28.0-and-AWS-provider-v4-(POTENTIAL-DATA-LOSS)). | `bool` | `false` | no | | [glacier\_transition\_days](#input\_glacier\_transition\_days) | (Deprecated, use `lifecycle_configuration_rules` instead)
Number of days after which to move the data to the Glacier Flexible Retrieval storage tier | `number` | `60` | no | | [id\_length\_limit](#input\_id\_length\_limit) | Limit `id` to this many characters (minimum 6).
Set to `0` for unlimited length.
Set to `null` for keep the existing setting, which defaults to `0`.
Does not affect `id_full`. | `number` | `null` | no | | [label\_key\_case](#input\_label\_key\_case) | Controls the letter case of the `tags` keys (label names) for tags generated by this module.
Does not affect keys of tags passed in via the `tags` input.
Possible values: `lower`, `title`, `upper`.
Default value: `title`. | `string` | `null` | no | diff --git a/docs/terraform.md b/docs/terraform.md index 4838bf9..7039c21 100644 --- a/docs/terraform.md +++ b/docs/terraform.md @@ -16,7 +16,7 @@ | Name | Source | Version | |------|--------|---------| -| [s3\_bucket](#module\_s3\_bucket) | cloudposse/s3-log-storage/aws | 0.28.3 | +| [s3\_bucket](#module\_s3\_bucket) | cloudposse/s3-log-storage/aws | 1.0.0 | | [this](#module\_this) | cloudposse/label/null | 0.25.0 | ## Resources @@ -45,7 +45,6 @@ | [environment](#input\_environment) | ID element. Usually used for region e.g. 'uw2', 'us-west-2', OR role 'prod', 'staging', 'dev', 'UAT' | `string` | `null` | no | | [expiration\_days](#input\_expiration\_days) | (Deprecated, use `lifecycle_configuration_rules` instead)
Number of days after which to expunge the objects | `number` | `90` | no | | [force\_destroy](#input\_force\_destroy) | When `true`, permits a non-empty S3 bucket to be deleted by first deleting all objects in the bucket.
THESE OBJECTS ARE NOT RECOVERABLE even if they were versioned and stored in Glacier.
Must be set `false` unless `force_destroy_enabled` is also `true`. | `bool` | `false` | no | -| [force\_destroy\_enabled](#input\_force\_destroy\_enabled) | When `true`, permits `force_destroy` to be set to `true`.
This is an extra safety precaution to reduce the chance that Terraform will destroy and recreate
your S3 bucket, causing COMPLETE LOSS OF ALL DATA even if it was stored in Glacier.
WARNING: Upgrading this module from a version prior to 0.27.0 to this version
will cause Terraform to delete your existing S3 bucket CAUSING COMPLETE DATA LOSS
unless you follow the upgrade instructions on the Wiki [here](https://github.com/cloudposse/terraform-aws-s3-log-storage/wiki/Upgrading-to-v0.27.0-(POTENTIAL-DATA-LOSS)).
See additional instructions for upgrading from v0.27.0 to v0.28.0 [here](https://github.com/cloudposse/terraform-aws-s3-log-storage/wiki/Upgrading-to-v0.28.0-and-AWS-provider-v4-(POTENTIAL-DATA-LOSS)). | `bool` | `false` | no | | [glacier\_transition\_days](#input\_glacier\_transition\_days) | (Deprecated, use `lifecycle_configuration_rules` instead)
Number of days after which to move the data to the Glacier Flexible Retrieval storage tier | `number` | `60` | no | | [id\_length\_limit](#input\_id\_length\_limit) | Limit `id` to this many characters (minimum 6).
Set to `0` for unlimited length.
Set to `null` for keep the existing setting, which defaults to `0`.
Does not affect `id_full`. | `number` | `null` | no | | [label\_key\_case](#input\_label\_key\_case) | Controls the letter case of the `tags` keys (label names) for tags generated by this module.
Does not affect keys of tags passed in via the `tags` input.
Possible values: `lower`, `title`, `upper`.
Default value: `title`. | `string` | `null` | no | diff --git a/examples/complete/fixtures.us-east-2.tfvars b/examples/complete/fixtures.us-east-2.tfvars index e9a7d20..ca016f7 100644 --- a/examples/complete/fixtures.us-east-2.tfvars +++ b/examples/complete/fixtures.us-east-2.tfvars @@ -8,4 +8,4 @@ name = "lb-s3-test" acl = "log-delivery-write" -force_destroy = false +force_destroy = true diff --git a/main.tf b/main.tf index 540d709..6db51d4 100644 --- a/main.tf +++ b/main.tf @@ -60,12 +60,11 @@ data "aws_partition" "current" {} module "s3_bucket" { source = "cloudposse/s3-log-storage/aws" - version = "0.28.3" + version = "1.0.0" acl = var.acl source_policy_documents = [join("", data.aws_iam_policy_document.default.*.json)] force_destroy = var.force_destroy - force_destroy_enabled = var.force_destroy_enabled versioning_enabled = var.versioning_enabled allow_ssl_requests_only = var.allow_ssl_requests_only access_log_bucket_name = var.access_log_bucket_name diff --git a/variables.tf b/variables.tf index b319a30..02686a5 100644 --- a/variables.tf +++ b/variables.tf @@ -14,20 +14,6 @@ variable "force_destroy" { EOT } -variable "force_destroy_enabled" { - type = bool - default = false - description = <<-EOT - When `true`, permits `force_destroy` to be set to `true`. - This is an extra safety precaution to reduce the chance that Terraform will destroy and recreate - your S3 bucket, causing COMPLETE LOSS OF ALL DATA even if it was stored in Glacier. - WARNING: Upgrading this module from a version prior to 0.27.0 to this version - will cause Terraform to delete your existing S3 bucket CAUSING COMPLETE DATA LOSS - unless you follow the upgrade instructions on the Wiki [here](https://github.com/cloudposse/terraform-aws-s3-log-storage/wiki/Upgrading-to-v0.27.0-(POTENTIAL-DATA-LOSS)). - See additional instructions for upgrading from v0.27.0 to v0.28.0 [here](https://github.com/cloudposse/terraform-aws-s3-log-storage/wiki/Upgrading-to-v0.28.0-and-AWS-provider-v4-(POTENTIAL-DATA-LOSS)). - EOT -} - variable "access_log_bucket_name" { type = string description = "Name of the S3 bucket where S3 access logs will be sent to"