Skip to content

Commit 028b076

Browse files
bryantbiggsbryantbiggs
committed
Merge branch 'master' of github.com:terraform-aws-modules/terraform-aws-msk-kafka-cluster
2 parents aa9ee8a + d7b2b2e commit 028b076

24 files changed

+238
-38
lines changed

‎.github/workflows/lock.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
lock:
99
runs-on: ubuntu-latest
1010
steps:
11-
- uses: dessant/lock-threads@v4
11+
- uses: dessant/lock-threads@v5
1212
with:
1313
github-token: ${{ secrets.GITHUB_TOKEN }}
1414
issue-comment: >

‎.github/workflows/pr-title.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
steps:
1515
# Please look up the latest version from
1616
# https://github.com/amannn/action-semantic-pull-request/releases
17-
- uses: amannn/action-semantic-pull-request@v5.0.2
17+
- uses: amannn/action-semantic-pull-request@v5.4.0
1818
env:
1919
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
2020
with:

‎.github/workflows/pre-commit.yml

+26-10
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88

99
env:
1010
TERRAFORM_DOCS_VERSION: v0.16.0
11-
TFLINT_VERSION: v0.44.1
11+
TFLINT_VERSION: v0.50.3
1212

1313
jobs:
1414
collectInputs:
@@ -18,11 +18,11 @@ jobs:
1818
directories: ${{ steps.dirs.outputs.directories }}
1919
steps:
2020
- name: Checkout
21-
uses: actions/checkout@v3
21+
uses: actions/checkout@v4
2222

2323
- name: Get root directories
2424
id: dirs
25-
uses: clowdhaus/terraform-composite-actions/directories@v1.8.3
25+
uses: clowdhaus/terraform-composite-actions/directories@v1.9.0
2626

2727
preCommitMinVersions:
2828
name: Min TF pre-commit
@@ -32,19 +32,27 @@ jobs:
3232
matrix:
3333
directory: ${{ fromJson(needs.collectInputs.outputs.directories) }}
3434
steps:
35+
# https://github.com/orgs/community/discussions/25678#discussioncomment-5242449
36+
- name: Delete huge unnecessary tools folder
37+
run: |
38+
rm -rf /opt/hostedtoolcache/CodeQL
39+
rm -rf /opt/hostedtoolcache/Java_Temurin-Hotspot_jdk
40+
rm -rf /opt/hostedtoolcache/Ruby
41+
rm -rf /opt/hostedtoolcache/go
42+
3543
- name: Checkout
36-
uses: actions/checkout@v3
44+
uses: actions/checkout@v4
3745

3846
- name: Terraform min/max versions
3947
id: minMax
40-
uses: clowdhaus/terraform-min-max@v1.2.4
48+
uses: clowdhaus/terraform-min-max@v1.3.0
4149
with:
4250
directory: ${{ matrix.directory }}
4351

4452
- name: Pre-commit Terraform ${{ steps.minMax.outputs.minVersion }}
4553
# Run only validate pre-commit check on min version supported
4654
if: ${{ matrix.directory != '.' }}
47-
uses: clowdhaus/terraform-composite-actions/pre-commit@v1.8.3
55+
uses: clowdhaus/terraform-composite-actions/pre-commit@v1.9.0
4856
with:
4957
terraform-version: ${{ steps.minMax.outputs.minVersion }}
5058
tflint-version: ${{ env.TFLINT_VERSION }}
@@ -53,7 +61,7 @@ jobs:
5361
- name: Pre-commit Terraform ${{ steps.minMax.outputs.minVersion }}
5462
# Run only validate pre-commit check on min version supported
5563
if: ${{ matrix.directory == '.' }}
56-
uses: clowdhaus/terraform-composite-actions/pre-commit@v1.8.3
64+
uses: clowdhaus/terraform-composite-actions/pre-commit@v1.9.0
5765
with:
5866
terraform-version: ${{ steps.minMax.outputs.minVersion }}
5967
tflint-version: ${{ env.TFLINT_VERSION }}
@@ -64,18 +72,26 @@ jobs:
6472
runs-on: ubuntu-latest
6573
needs: collectInputs
6674
steps:
75+
# https://github.com/orgs/community/discussions/25678#discussioncomment-5242449
76+
- name: Delete huge unnecessary tools folder
77+
run: |
78+
rm -rf /opt/hostedtoolcache/CodeQL
79+
rm -rf /opt/hostedtoolcache/Java_Temurin-Hotspot_jdk
80+
rm -rf /opt/hostedtoolcache/Ruby
81+
rm -rf /opt/hostedtoolcache/go
82+
6783
- name: Checkout
68-
uses: actions/checkout@v3
84+
uses: actions/checkout@v4
6985
with:
7086
ref: ${{ github.event.pull_request.head.ref }}
7187
repository: ${{github.event.pull_request.head.repo.full_name}}
7288

7389
- name: Terraform min/max versions
7490
id: minMax
75-
uses: clowdhaus/terraform-min-max@v1.2.4
91+
uses: clowdhaus/terraform-min-max@v1.3.0
7692

7793
- name: Pre-commit Terraform ${{ steps.minMax.outputs.maxVersion }}
78-
uses: clowdhaus/terraform-composite-actions/pre-commit@v1.8.3
94+
uses: clowdhaus/terraform-composite-actions/pre-commit@v1.9.0
7995
with:
8096
terraform-version: ${{ steps.minMax.outputs.maxVersion }}
8197
tflint-version: ${{ env.TFLINT_VERSION }}

‎.github/workflows/release.yml

+6-6
Original file line numberDiff line numberDiff line change
@@ -20,18 +20,18 @@ jobs:
2020
if: github.repository_owner == 'terraform-aws-modules'
2121
steps:
2222
- name: Checkout
23-
uses: actions/checkout@v3
23+
uses: actions/checkout@v4
2424
with:
2525
persist-credentials: false
2626
fetch-depth: 0
2727

2828
- name: Release
29-
uses: cycjimmy/semantic-release-action@v3
29+
uses: cycjimmy/semantic-release-action@v4
3030
with:
31-
semantic_version: 18.0.0
31+
semantic_version: 23.0.2
3232
extra_plugins: |
33-
@semantic-release/[email protected].0
34-
@semantic-release/[email protected].0
35-
conventional-changelog-conventionalcommits@4.6.3
33+
@semantic-release/[email protected].3
34+
@semantic-release/[email protected].1
35+
conventional-changelog-conventionalcommits@7.0.2
3636
env:
3737
GITHUB_TOKEN: ${{ secrets.SEMANTIC_RELEASE_TOKEN }}

‎.github/workflows/stale-actions.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jobs:
77
stale:
88
runs-on: ubuntu-latest
99
steps:
10-
- uses: actions/stale@v6
10+
- uses: actions/stale@v9
1111
with:
1212
repo-token: ${{ secrets.GITHUB_TOKEN }}
1313
# Staling issues and PR's

‎.pre-commit-config.yaml

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
repos:
22
- repo: https://github.com/antonbabenko/pre-commit-terraform
3-
rev: v1.88.2
3+
rev: v1.88.0
44
hooks:
55
- id: terraform_fmt
6-
- id: terraform_validate
76
- id: terraform_docs
87
args:
98
- '--args=--lockfile=false'
@@ -22,8 +21,11 @@ repos:
2221
- '--args=--only=terraform_required_providers'
2322
- '--args=--only=terraform_standard_module_structure'
2423
- '--args=--only=terraform_workspace_remote'
24+
- '--args=--only=terraform_unused_required_providers'
25+
- id: terraform_validate
2526
- repo: https://github.com/pre-commit/pre-commit-hooks
2627
rev: v4.5.0
2728
hooks:
2829
- id: check-merge-conflict
2930
- id: end-of-file-fixer
31+
- id: trailing-whitespace

‎CHANGELOG.md

+14
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,20 @@
22

33
All notable changes to this project will be documented in this file.
44

5+
## [2.4.0](https://github.com/terraform-aws-modules/terraform-aws-msk-kafka-cluster/compare/v2.3.1...v2.4.0) (2024-03-18)
6+
7+
8+
### Features
9+
10+
* Suport MSK cluster policy resource and add `cluster_uuid` attribute ([#23](https://github.com/terraform-aws-modules/terraform-aws-msk-kafka-cluster/issues/23)) ([e0c41cd](https://github.com/terraform-aws-modules/terraform-aws-msk-kafka-cluster/commit/e0c41cd343c9216b7ca8d8542bdf04770b6a77af))
11+
12+
## [2.3.1](https://github.com/terraform-aws-modules/terraform-aws-msk-kafka-cluster/compare/v2.3.0...v2.3.1) (2024-03-06)
13+
14+
15+
### Bug Fixes
16+
17+
* Update CI workflow versions to remove deprecated runtime warnings ([#22](https://github.com/terraform-aws-modules/terraform-aws-msk-kafka-cluster/issues/22)) ([5311b62](https://github.com/terraform-aws-modules/terraform-aws-msk-kafka-cluster/commit/5311b626e1d49bb5dc4a80bbc4e9c9ed11c38a62))
18+
519
## [2.3.0](https://github.com/terraform-aws-modules/terraform-aws-msk-kafka-cluster/compare/v2.2.0...v2.3.0) (2023-09-14)
620

721

‎README.md

+10-3
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ module "msk_kafka_cluster" {
1313
source = "terraform-aws-modules/msk-kafka-cluster/aws"
1414
1515
name = local.name
16-
kafka_version = "3.4.0"
16+
kafka_version = "3.5.1"
1717
number_of_broker_nodes = 3
1818
enhanced_monitoring = "PER_TOPIC_PER_PARTITION"
1919
@@ -128,14 +128,14 @@ Examples codified under the [`examples`](https://github.com/terraform-aws-module
128128
| Name | Version |
129129
|------|---------|
130130
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0 |
131-
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 5.12 |
131+
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 5.21 |
132132
| <a name="requirement_random"></a> [random](#requirement\_random) | >= 3.6 |
133133

134134
## Providers
135135

136136
| Name | Version |
137137
|------|---------|
138-
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 5.12 |
138+
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 5.21 |
139139
| <a name="provider_random"></a> [random](#provider\_random) | >= 3.6 |
140140

141141
## Modules
@@ -152,12 +152,14 @@ No modules.
152152
| [aws_glue_registry.this](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/glue_registry) | resource |
153153
| [aws_glue_schema.this](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/glue_schema) | resource |
154154
| [aws_msk_cluster.this](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/msk_cluster) | resource |
155+
| [aws_msk_cluster_policy.this](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/msk_cluster_policy) | resource |
155156
| [aws_msk_configuration.this](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/msk_configuration) | resource |
156157
| [aws_msk_scram_secret_association.this](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/msk_scram_secret_association) | resource |
157158
| [aws_msk_vpc_connection.this](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/msk_vpc_connection) | resource |
158159
| [aws_mskconnect_custom_plugin.this](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/mskconnect_custom_plugin) | resource |
159160
| [aws_mskconnect_worker_configuration.this](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/mskconnect_worker_configuration) | resource |
160161
| [random_id.this](https://registry.terraform.io/providers/hashicorp/random/latest/docs/resources/id) | resource |
162+
| [aws_iam_policy_document.this](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/iam_policy_document) | data source |
161163

162164
## Inputs
163165

@@ -174,6 +176,9 @@ No modules.
174176
| <a name="input_cloudwatch_log_group_name"></a> [cloudwatch\_log\_group\_name](#input\_cloudwatch\_log\_group\_name) | Name of the Cloudwatch Log Group to deliver logs to | `string` | `null` | no |
175177
| <a name="input_cloudwatch_log_group_retention_in_days"></a> [cloudwatch\_log\_group\_retention\_in\_days](#input\_cloudwatch\_log\_group\_retention\_in\_days) | Specifies the number of days you want to retain log events in the log group | `number` | `0` | no |
176178
| <a name="input_cloudwatch_logs_enabled"></a> [cloudwatch\_logs\_enabled](#input\_cloudwatch\_logs\_enabled) | Indicates whether you want to enable or disable streaming broker logs to Cloudwatch Logs | `bool` | `false` | no |
179+
| <a name="input_cluster_override_policy_documents"></a> [cluster\_override\_policy\_documents](#input\_cluster\_override\_policy\_documents) | Override policy documents for cluster policy | `list(string)` | `null` | no |
180+
| <a name="input_cluster_policy_statements"></a> [cluster\_policy\_statements](#input\_cluster\_policy\_statements) | Map of policy statements for cluster policy | `any` | `null` | no |
181+
| <a name="input_cluster_source_policy_documents"></a> [cluster\_source\_policy\_documents](#input\_cluster\_source\_policy\_documents) | Source policy documents for cluster policy | `list(string)` | `null` | no |
177182
| <a name="input_configuration_arn"></a> [configuration\_arn](#input\_configuration\_arn) | ARN of an externally created configuration to use | `string` | `null` | no |
178183
| <a name="input_configuration_description"></a> [configuration\_description](#input\_configuration\_description) | Description of the configuration | `string` | `null` | no |
179184
| <a name="input_configuration_name"></a> [configuration\_name](#input\_configuration\_name) | Name of the configuration | `string` | `null` | no |
@@ -186,6 +191,7 @@ No modules.
186191
| <a name="input_connect_worker_config_properties_file_content"></a> [connect\_worker\_config\_properties\_file\_content](#input\_connect\_worker\_config\_properties\_file\_content) | Contents of connect-distributed.properties file. The value can be either base64 encoded or in raw format | `string` | `null` | no |
187192
| <a name="input_create"></a> [create](#input\_create) | Determines whether cluster resources will be created | `bool` | `true` | no |
188193
| <a name="input_create_cloudwatch_log_group"></a> [create\_cloudwatch\_log\_group](#input\_create\_cloudwatch\_log\_group) | Determines whether to create a CloudWatch log group | `bool` | `true` | no |
194+
| <a name="input_create_cluster_policy"></a> [create\_cluster\_policy](#input\_create\_cluster\_policy) | Determines whether to create an MSK cluster policy | `bool` | `false` | no |
189195
| <a name="input_create_configuration"></a> [create\_configuration](#input\_create\_configuration) | Determines whether to create a configuration | `bool` | `true` | no |
190196
| <a name="input_create_connect_worker_configuration"></a> [create\_connect\_worker\_configuration](#input\_create\_connect\_worker\_configuration) | Determines whether to create connect worker configuration | `bool` | `false` | no |
191197
| <a name="input_create_schema_registry"></a> [create\_schema\_registry](#input\_create\_schema\_registry) | Determines whether to create a Glue schema registry for managing Avro schemas for the cluster | `bool` | `true` | no |
@@ -229,6 +235,7 @@ No modules.
229235
| <a name="output_bootstrap_brokers_sasl_iam"></a> [bootstrap\_brokers\_sasl\_iam](#output\_bootstrap\_brokers\_sasl\_iam) | One or more DNS names (or IP addresses) and SASL IAM port pairs. This attribute will have a value if `encryption_in_transit_client_broker` is set to `TLS_PLAINTEXT` or `TLS` and `client_authentication_sasl_iam` is set to `true` |
230236
| <a name="output_bootstrap_brokers_sasl_scram"></a> [bootstrap\_brokers\_sasl\_scram](#output\_bootstrap\_brokers\_sasl\_scram) | One or more DNS names (or IP addresses) and SASL SCRAM port pairs. This attribute will have a value if `encryption_in_transit_client_broker` is set to `TLS_PLAINTEXT` or `TLS` and `client_authentication_sasl_scram` is set to `true` |
231237
| <a name="output_bootstrap_brokers_tls"></a> [bootstrap\_brokers\_tls](#output\_bootstrap\_brokers\_tls) | One or more DNS names (or IP addresses) and TLS port pairs. This attribute will have a value if `encryption_in_transit_client_broker` is set to `TLS_PLAINTEXT` or `TLS` |
238+
| <a name="output_cluster_uuid"></a> [cluster\_uuid](#output\_cluster\_uuid) | UUID of the MSK cluster, for use in IAM policies |
232239
| <a name="output_configuration_arn"></a> [configuration\_arn](#output\_configuration\_arn) | Amazon Resource Name (ARN) of the configuration |
233240
| <a name="output_configuration_latest_revision"></a> [configuration\_latest\_revision](#output\_configuration\_latest\_revision) | Latest revision of the configuration |
234241
| <a name="output_connect_custom_plugins"></a> [connect\_custom\_plugins](#output\_connect\_custom\_plugins) | A map of output attributes for the connect custom plugins created |

‎examples/basic/README.md

+3-2
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@ Note that this example may create resources which will incur monetary charges on
2323
| Name | Version |
2424
|------|---------|
2525
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0 |
26-
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 5.12 |
26+
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 5.21 |
2727

2828
## Providers
2929

3030
| Name | Version |
3131
|------|---------|
32-
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 5.12 |
32+
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 5.21 |
3333

3434
## Modules
3535

@@ -63,6 +63,7 @@ No inputs.
6363
| <a name="output_bootstrap_brokers_sasl_iam"></a> [bootstrap\_brokers\_sasl\_iam](#output\_bootstrap\_brokers\_sasl\_iam) | One or more DNS names (or IP addresses) and SASL IAM port pairs. This attribute will have a value if `encryption_in_transit_client_broker` is set to `TLS_PLAINTEXT` or `TLS` and `client_authentication_sasl_iam` is set to `true` |
6464
| <a name="output_bootstrap_brokers_sasl_scram"></a> [bootstrap\_brokers\_sasl\_scram](#output\_bootstrap\_brokers\_sasl\_scram) | One or more DNS names (or IP addresses) and SASL SCRAM port pairs. This attribute will have a value if `encryption_in_transit_client_broker` is set to `TLS_PLAINTEXT` or `TLS` and `client_authentication_sasl_scram` is set to `true` |
6565
| <a name="output_bootstrap_brokers_tls"></a> [bootstrap\_brokers\_tls](#output\_bootstrap\_brokers\_tls) | One or more DNS names (or IP addresses) and TLS port pairs. This attribute will have a value if `encryption_in_transit_client_broker` is set to `TLS_PLAINTEXT` or `TLS` |
66+
| <a name="output_cluster_uuid"></a> [cluster\_uuid](#output\_cluster\_uuid) | UUID of the MSK cluster, for use in IAM policies |
6667
| <a name="output_configuration_arn"></a> [configuration\_arn](#output\_configuration\_arn) | Amazon Resource Name (ARN) of the configuration |
6768
| <a name="output_configuration_latest_revision"></a> [configuration\_latest\_revision](#output\_configuration\_latest\_revision) | Latest revision of the configuration |
6869
| <a name="output_connect_custom_plugins"></a> [connect\_custom\_plugins](#output\_connect\_custom\_plugins) | A map of output attributes for the connect custom plugins created |

‎examples/basic/main.tf

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ module "msk_cluster" {
2626
source = "../.."
2727

2828
name = local.name
29-
kafka_version = "3.4.0"
29+
kafka_version = "3.5.1"
3030
number_of_broker_nodes = 3
3131

3232
broker_node_client_subnets = module.vpc.private_subnets

‎examples/basic/outputs.tf

+5
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,11 @@ output "bootstrap_brokers_tls" {
3232
value = module.msk_cluster.bootstrap_brokers_tls
3333
}
3434

35+
output "cluster_uuid" {
36+
description = "UUID of the MSK cluster, for use in IAM policies"
37+
value = module.msk_cluster.cluster_uuid
38+
}
39+
3540
output "current_version" {
3641
description = "Current version of the MSK Cluster used for updates, e.g. `K13V1IB3VIYZZH`"
3742
value = module.msk_cluster.current_version

‎examples/basic/versions.tf

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ terraform {
44
required_providers {
55
aws = {
66
source = "hashicorp/aws"
7-
version = ">= 5.12"
7+
version = ">= 5.21"
88
}
99
}
1010
}

0 commit comments

Comments
 (0)