diff --git a/.github/workflows/release-branch.yml b/.github/workflows/branch.yml
similarity index 52%
rename from .github/workflows/release-branch.yml
rename to .github/workflows/branch.yml
index 852d5e3e..fd64cd85 100644
--- a/.github/workflows/release-branch.yml
+++ b/.github/workflows/branch.yml
@@ -1,6 +1,11 @@
---
-name: release-branch
+name: Branch
on:
+ pull_request:
+ branches:
+ - main
+ - release/**
+ types: [opened, synchronize, reopened, labeled, unlabeled]
push:
branches:
- main
@@ -16,5 +21,5 @@ permissions: {}
jobs:
terraform-module:
- uses: cloudposse/github-actions-workflows-terraform-module/.github/workflows/release-branch.yml@main
+ uses: cloudposse/.github/.github/workflows/shared-terraform-module.yml@main
secrets: inherit
diff --git a/.github/workflows/feature-branch-chatops.yml b/.github/workflows/chatops.yml
similarity index 60%
rename from .github/workflows/feature-branch-chatops.yml
rename to .github/workflows/chatops.yml
index 9abfc612..c3d47fa6 100644
--- a/.github/workflows/feature-branch-chatops.yml
+++ b/.github/workflows/chatops.yml
@@ -1,5 +1,5 @@
---
-name: feature-branch-chatops
+name: chatops
on:
issue_comment:
types: [created]
@@ -11,6 +11,6 @@ permissions:
jobs:
terraform-module:
- uses: cloudposse/github-actions-workflows-terraform-module/.github/workflows/feature-branch-chatops.yml@main
+ uses: cloudposse/.github/.github/workflows/shared-terraform-chatops.yml@main
secrets:
github_access_token: ${{ secrets.REPO_ACCESS_TOKEN }}
diff --git a/.github/workflows/feature-branch.yml b/.github/workflows/feature-branch.yml
deleted file mode 100644
index ebd8854f..00000000
--- a/.github/workflows/feature-branch.yml
+++ /dev/null
@@ -1,19 +0,0 @@
----
-name: feature-branch
-on:
- pull_request:
- branches:
- - main
- - release/**
- types: [opened, synchronize, reopened, labeled, unlabeled]
-
-permissions:
- pull-requests: write
- id-token: write
- contents: write
- issues: write
-
-jobs:
- terraform-module:
- uses: cloudposse/github-actions-workflows-terraform-module/.github/workflows/feature-branch.yml@main
- secrets: inherit
diff --git a/.github/workflows/release-published.yml b/.github/workflows/release-published.yml
deleted file mode 100644
index 1b0aaca7..00000000
--- a/.github/workflows/release-published.yml
+++ /dev/null
@@ -1,13 +0,0 @@
----
-name: release-published
-on:
- release:
- types:
- - published
-
-permissions: {}
-
-jobs:
- terraform-module:
- uses: cloudposse/github-actions-workflows-terraform-module/.github/workflows/release-published.yml@main
- secrets: inherit
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
new file mode 100644
index 00000000..dc8a7502
--- /dev/null
+++ b/.github/workflows/release.yml
@@ -0,0 +1,16 @@
+---
+name: release
+on:
+ release:
+ types:
+ - published
+
+permissions:
+ id-token: write
+ contents: write
+ pull-requests: write
+
+jobs:
+ terraform-module:
+ uses: cloudposse/.github/.github/workflows/shared-release-branches.yml@main
+ secrets: inherit
diff --git a/.github/workflows/scheduled.yml b/.github/workflows/scheduled.yml
index 7bc09ab9..a79e9498 100644
--- a/.github/workflows/scheduled.yml
+++ b/.github/workflows/scheduled.yml
@@ -12,5 +12,5 @@ permissions:
jobs:
scheduled:
- uses: cloudposse/github-actions-workflows-terraform-module/.github/workflows/scheduled.yml@main
+ uses: cloudposse/.github/.github/workflows/shared-terraform-scheduled.yml@main
secrets: inherit
diff --git a/README.md b/README.md
index acc4c327..b9a96349 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
-
+
@@ -120,14 +120,14 @@ Available targets:
| Name | Version |
|------|---------|
-| [terraform](#requirement\_terraform) | >= 0.13.0 |
-| [aws](#requirement\_aws) | >= 3.34, < 5.0 |
+| [terraform](#requirement\_terraform) | >= 1 |
+| [aws](#requirement\_aws) | >= 5.0 |
## Providers
| Name | Version |
|------|---------|
-| [aws](#provider\_aws) | >= 3.34, < 5.0 |
+| [aws](#provider\_aws) | >= 5.0 |
## Modules
@@ -138,9 +138,9 @@ Available targets:
| [container\_definition](#module\_container\_definition) | cloudposse/ecs-container-definition/aws | 0.58.1 |
| [ecr](#module\_ecr) | cloudposse/ecr/aws | 0.41.0 |
| [ecs\_alb\_service\_task](#module\_ecs\_alb\_service\_task) | cloudposse/ecs-alb-service-task/aws | 0.64.1 |
-| [ecs\_cloudwatch\_autoscaling](#module\_ecs\_cloudwatch\_autoscaling) | cloudposse/ecs-cloudwatch-autoscaling/aws | 0.7.3 |
+| [ecs\_cloudwatch\_autoscaling](#module\_ecs\_cloudwatch\_autoscaling) | cloudposse/ecs-cloudwatch-autoscaling/aws | 0.7.5 |
| [ecs\_cloudwatch\_sns\_alarms](#module\_ecs\_cloudwatch\_sns\_alarms) | cloudposse/ecs-cloudwatch-sns-alarms/aws | 0.12.2 |
-| [ecs\_codepipeline](#module\_ecs\_codepipeline) | cloudposse/ecs-codepipeline/aws | 0.33.0 |
+| [ecs\_codepipeline](#module\_ecs\_codepipeline) | cloudposse/ecs-codepipeline/aws | 0.34.1 |
| [this](#module\_this) | cloudposse/label/null | 0.25.0 |
## Resources
@@ -441,9 +441,9 @@ Check out these related projects.
>
> Use Cloud Posse's ready-to-go [terraform architecture blueprints](https://cloudposse.com/reference-architecture/) for AWS to get up and running quickly.
>
-> ✅ We build it with you.
-> ✅ You own everything.
-> ✅ Your team wins.
+> ✅ We build it together with your team.
+> ✅ Your team owns everything.
+> ✅ 100% Open Source and backed by fanatical support.
>
>
> 📚 Learn More
diff --git a/docs/terraform.md b/docs/terraform.md
index 29efc075..ae5565e1 100644
--- a/docs/terraform.md
+++ b/docs/terraform.md
@@ -4,13 +4,13 @@
| Name | Version |
|------|---------|
| [terraform](#requirement\_terraform) | >= 0.13.0 |
-| [aws](#requirement\_aws) | >= 3.34, < 5.0 |
+| [aws](#requirement\_aws) | < 5.44 |
## Providers
| Name | Version |
|------|---------|
-| [aws](#provider\_aws) | >= 3.34, < 5.0 |
+| [aws](#provider\_aws) | < 5.44 |
## Modules
diff --git a/main.tf b/main.tf
index 2fde9114..1df406e4 100644
--- a/main.tf
+++ b/main.tf
@@ -191,7 +191,7 @@ module "ecs_alb_service_task" {
module "ecs_codepipeline" {
enabled = var.codepipeline_enabled
source = "cloudposse/ecs-codepipeline/aws"
- version = "0.33.0"
+ version = "0.34.1"
region = coalesce(var.region, data.aws_region.current.name)
github_oauth_token = var.github_oauth_token
@@ -242,7 +242,7 @@ module "ecs_codepipeline" {
module "ecs_cloudwatch_autoscaling" {
enabled = var.autoscaling_enabled
source = "cloudposse/ecs-cloudwatch-autoscaling/aws"
- version = "0.7.3"
+ version = "0.7.5"
name = var.name
namespace = var.namespace
stage = var.stage
diff --git a/test/src/go.mod b/test/src/go.mod
index d57e35cb..b1a5592c 100644
--- a/test/src/go.mod
+++ b/test/src/go.mod
@@ -26,7 +26,7 @@ require (
github.com/googleapis/gax-go/v2 v2.7.1 // indirect
github.com/hashicorp/errwrap v1.0.0 // indirect
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
- github.com/hashicorp/go-getter v1.7.1 // indirect
+ github.com/hashicorp/go-getter v1.7.4 // indirect
github.com/hashicorp/go-multierror v1.1.0 // indirect
github.com/hashicorp/go-safetemp v1.0.0 // indirect
github.com/hashicorp/go-version v1.6.0 // indirect
diff --git a/test/src/go.sum b/test/src/go.sum
index f5c565b4..29e0c2e3 100644
--- a/test/src/go.sum
+++ b/test/src/go.sum
@@ -344,8 +344,8 @@ github.com/hashicorp/errwrap v1.0.0 h1:hLrqtEDnRye3+sgx6z4qVLNuviH3MR5aQ0ykNJa/U
github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
github.com/hashicorp/go-cleanhttp v0.5.2 h1:035FKYIWjmULyFRBKPs8TBQoi0x6d9G4xc9neXJWAZQ=
github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48=
-github.com/hashicorp/go-getter v1.7.1 h1:SWiSWN/42qdpR0MdhaOc/bLR48PLuP1ZQtYLRlM69uY=
-github.com/hashicorp/go-getter v1.7.1/go.mod h1:W7TalhMmbPmsSMdNjD0ZskARur/9GJ17cfHTRtXV744=
+github.com/hashicorp/go-getter v1.7.4 h1:3yQjWuxICvSpYwqSayAdKRFcvBl1y/vogCxczWSmix0=
+github.com/hashicorp/go-getter v1.7.4/go.mod h1:W7TalhMmbPmsSMdNjD0ZskARur/9GJ17cfHTRtXV744=
github.com/hashicorp/go-multierror v1.1.0 h1:B9UzwGQJehnUY1yNrnwREHc3fGbC2xefo8g4TbElacI=
github.com/hashicorp/go-multierror v1.1.0/go.mod h1:spPvp8C1qA32ftKqdAHm4hHTbPw+vmowP0z+KUhOZdA=
github.com/hashicorp/go-safetemp v1.0.0 h1:2HR189eFNrjHQyENnQMMpCiBAsRxzbTMIgBhEyExpmo=
diff --git a/versions.tf b/versions.tf
index 3653ad95..e8e59e0e 100644
--- a/versions.tf
+++ b/versions.tf
@@ -1,13 +1,10 @@
terraform {
- required_version = ">= 0.13.0"
+ required_version = ">= 1"
required_providers {
aws = {
- source = "hashicorp/aws"
- # TODO: Remove upper bound after the transitive dependency `cloudposse/codebuild/aws` gets
- # proper support for AWS provider v5.
- # Related pull request: https://github.com/cloudposse/terraform-aws-codebuild/pull/123
- version = ">= 3.34, < 5.0"
+ source = "hashicorp/aws"
+ version = ">= 5.0"
}
}
}