Skip to content

Commit

Permalink
Support AWS Provider V5 (#30)
Browse files Browse the repository at this point in the history
* Support AWS Provider V5

* Update versions.tf

* Update versions.tf

* Support AWS Provider V5

* upd

* upd

* upd
  • Loading branch information
max-lobur authored Jun 13, 2023
1 parent 36e119a commit 6942b18
Show file tree
Hide file tree
Showing 8 changed files with 20 additions and 19 deletions.
1 change: 1 addition & 0 deletions .github/workflows/release-branch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ on:
- 'docs/**'
- 'examples/**'
- 'test/**'
- 'README.*'

permissions:
contents: write
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-published.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ permissions:

jobs:
terraform-module:
uses: cloudposse/github-actions-workflows-terraform-module/.github/workflows/release.yml@main
uses: cloudposse/github-actions-workflows-terraform-module/.github/workflows/release-published.yml@main
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -144,21 +144,21 @@ Available targets:

| Name | Version |
|------|---------|
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.13.0 |
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 3.0 |
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0 |
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 5.0 |

## Providers

| Name | Version |
|------|---------|
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 3.0 |
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 5.0 |

## Modules

| Name | Source | Version |
|------|--------|---------|
| <a name="module_aws_config_label"></a> [aws\_config\_label](#module\_aws\_config\_label) | cloudposse/label/null | 0.25.0 |
| <a name="module_storage"></a> [storage](#module\_storage) | cloudposse/s3-log-storage/aws | 0.26.0 |
| <a name="module_storage"></a> [storage](#module\_storage) | cloudposse/s3-log-storage/aws | 1.4.0 |
| <a name="module_this"></a> [this](#module\_this) | cloudposse/label/null | 0.25.0 |

## Resources
Expand Down
8 changes: 4 additions & 4 deletions docs/terraform.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,21 @@

| Name | Version |
|------|---------|
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.13.0 |
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 3.0 |
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0 |
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 5.0 |

## Providers

| Name | Version |
|------|---------|
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 3.0 |
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 5.0 |

## Modules

| Name | Source | Version |
|------|--------|---------|
| <a name="module_aws_config_label"></a> [aws\_config\_label](#module\_aws\_config\_label) | cloudposse/label/null | 0.25.0 |
| <a name="module_storage"></a> [storage](#module\_storage) | cloudposse/s3-log-storage/aws | 0.26.0 |
| <a name="module_storage"></a> [storage](#module\_storage) | cloudposse/s3-log-storage/aws | 1.4.0 |
| <a name="module_this"></a> [this](#module\_this) | cloudposse/label/null | 0.25.0 |

## Resources
Expand Down
4 changes: 2 additions & 2 deletions examples/complete/versions.tf
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
terraform {
required_version = ">= 0.13.0"
required_version = ">= 1.0"

required_providers {
aws = {
source = "hashicorp/aws"
version = ">= 2.0"
version = ">= 5.0"
}
}
}
4 changes: 2 additions & 2 deletions main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ module "aws_config_label" {

module "storage" {
source = "cloudposse/s3-log-storage/aws"
version = "0.26.0"
version = "1.4.0"
count = module.this.enabled ? 1 : 0

acl = "private"
Expand All @@ -32,7 +32,7 @@ module "storage" {
restrict_public_buckets = true
access_log_bucket_name = var.access_log_bucket_name
allow_ssl_requests_only = var.allow_ssl_requests_only
policy = join("", data.aws_iam_policy_document.aws_config_bucket_policy.*.json)
policy = join("", data.aws_iam_policy_document.aws_config_bucket_policy[*].json)

bucket_notifications_enabled = var.bucket_notifications_enabled
bucket_notifications_type = var.bucket_notifications_type
Expand Down
8 changes: 4 additions & 4 deletions outputs.tf
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
output "bucket_domain_name" {
value = join("", module.storage.*.bucket_domain_name)
value = join("", module.storage[*].bucket_domain_name)
description = "FQDN of bucket"
}

output "bucket_id" {
value = join("", module.storage.*.bucket_id)
value = join("", module.storage[*].bucket_id)
description = "Bucket Name (aka ID)"
}

output "bucket_arn" {
value = join("", module.storage.*.bucket_arn)
value = join("", module.storage[*].bucket_arn)
description = "Bucket ARN"
}

Expand All @@ -24,6 +24,6 @@ output "enabled" {
}

output "bucket_notifications_sqs_queue_arn" {
value = join("", module.storage.*.bucket_notifications_sqs_queue_arn)
value = join("", module.storage[*].bucket_notifications_sqs_queue_arn)
description = "Notifications SQS queue ARN"
}
4 changes: 2 additions & 2 deletions versions.tf
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
terraform {
required_version = ">= 0.13.0"
required_version = ">= 1.0"

required_providers {
aws = {
source = "hashicorp/aws"
version = ">= 3.0"
version = ">= 5.0"
}
}
}

0 comments on commit 6942b18

Please sign in to comment.