Skip to content

Commit 996f204

Browse files
authored
Release 2.2.0 (#19)
* Fix user error message * Fix documentation * Update .gitignore * Update GitHub Actions (#15) * Fix vhost (#16) * Fix vhost and update unitTests * Fix default vhost for queue unit tests * Add RabbitMQ 4.0 to testAcc * Fix DefaultQueueType unsuported by RMQ 3.9 and less * Tempory Fix DefaultQueueType for RMQ 3.10 * Update Acceptance Tests action * Fix RMQ 3.8 UnitTest * Fix RMQ 3.10 UnitTest * Update docs * Validate DefaultQueueType attribute * GitHub settings (#18) * Add dependabot settings * Update labeler setting * New release * Update CHANGELOG
1 parent 2f28c28 commit 996f204

File tree

26 files changed

+762
-253
lines changed

26 files changed

+762
-253
lines changed

.github/dependabot.yml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
# To get started with Dependabot version updates, you'll need to specify which
2+
# package ecosystems to update and where the package manifests are located.
3+
# Please see the documentation for all configuration options:
4+
# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file
5+
6+
version: 2
7+
updates:
8+
- package-ecosystem: "gomod" # See documentation for possible values
9+
directory: "/" # Location of package manifests
10+
schedule:
11+
interval: "weekly"
12+
target-branch: "develop"

.github/labeler.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,9 @@ enhancement:
44

55
# Add 'bug' label to bug resolution
66
bug:
7-
- head-branch: ['^bug', 'bug']
7+
- head-branch: ['^bug', 'bug', '^fix', 'fix']
88

99
# Add 'release' label to any PR that is opened against the `master` branch
1010
release:
11+
- head-branch: 'develop'
1112
- base-branch: 'master'

.github/workflows/test.yml

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,9 @@ jobs:
1212
runs-on: ubuntu-latest
1313

1414
strategy:
15+
fail-fast: false
1516
matrix:
16-
rmq_version: ["3.8", "3.9", "3.10", "3.11", "3.12", "3.13"]
17+
rmq_version: ["3.8", "3.9", "3.10", "3.11", "3.12", "3.13", "4.0"]
1718

1819
env:
1920
RABBITMQ_VERSION: ${{ matrix.rmq_version }}
@@ -29,5 +30,14 @@ jobs:
2930
cache: true
3031

3132
- name: Tests
33+
id: test
3234
run: make testacc
35+
36+
- name: Publish Test Summary Results
37+
run: |
38+
echo "### RabbitMQ $RABBITMQ_VERSION" >> $GITHUB_STEP_SUMMARY
39+
npx github-actions-ctrf summary ctrf-report.json
40+
npx github-actions-ctrf failed ctrf-report.json
41+
if: always()
42+
3343

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ terraform.tfplan
77
terraform.tfstate
88
bin/
99
dist/
10+
local/
1011
modules-dev/
1112
/pkg/
1213
website/.vagrant
@@ -36,3 +37,5 @@ website/vendor
3637

3738
# Keep windows files with windows line endings
3839
*.winfile eol=crlf
40+
41+
.vscode

CHANGELOG.md

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,26 @@ All notable changes to this project will be documented in this file.
55
The format is based on [Keep a Changelog](http://keepachangelog.com/)
66
and this project adheres to [Semantic Versioning](http://semver.org/).
77

8+
## 2.2.0 (September 29, 2024)
9+
10+
FIX:
11+
12+
* Fix vhost resource - @rfavreau
13+
([#16](https://github.com/rfd59/terraform-provider-rabbitmq/pull/16))
14+
> - Import `default_queue_type` when reading vhost resource ([#14](https://github.com/rfd59/terraform-provider-rabbitmq/pull/14))
15+
> - Fix `default_queue_type` for _RabbitMQ 3.10_
16+
> - Validate function for `default_queue_type` attribute
17+
> - Set default value for `default_queue_type`
18+
> - Update the Acceptance Tests
19+
20+
BUILD / DEV:
21+
22+
* Update GitHub Actions - @rfavreau
23+
([#15](https://github.com/rfd59/terraform-provider-rabbitmq/pull/15))
24+
25+
* GitHub settings - @rfavreau
26+
([#18](https://github.com/rfd59/terraform-provider-rabbitmq/pull/18))
27+
828
## 2.1.0 (May 26, 2024)
929

1030
FEATURES:

README.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
[RabbitMQ](https://rabbitmq.com) is an AMQP message broker server. The **RabbitMQ provider** exposes resources used to manage the configuration of resources in a RabbitMQ server.
1818

19-
The provider supports versions `3.13.x`, `3.12.x` and `3.11.x` of RabbitMQ. It may still work with versions `3.10.x`, `3.9.x` and `3.8.x`, however these versions are no longer officialy supported.
19+
The provider supports versions `4.0.x`, `3.13.x` and `3.12.x` of RabbitMQ. It may still work with versions `3.11.x`, `3.10.x`, `3.9.x` and `3.8.x`, however these versions are no longer officialy supported.
2020
> For information on RabbitMQ versions, see the RabbitMQ [Release Information](https://www.rabbitmq.com/release-information).
2121
2222
## Usage Example
@@ -25,20 +25,20 @@ The provider supports versions `3.13.x`, `3.12.x` and `3.11.x` of RabbitMQ. It m
2525
# 1. Specify the version of the RabbitMQ Provider to use
2626
terraform {
2727
required_providers {
28-
azurerm = {
28+
rabbitmq = {
2929
source = "rfd59/rabbitmq"
3030
version = "2.1.0"
3131
}
3232
}
3333
}
3434
3535
# 2. Configure the RabbitMQ Provider
36-
provider "azurerm" {
36+
provider "rabbi" {
3737
# The RabbitMQ management plugin must be enabled on the server, to use this provider.
3838
# You can enable the plugin by doing something similar to `$ sudo rabbitmq-plugins enable rabbitmq_management`
3939
# https://www.rabbitmq.com/docs/management
4040
41-
endpoint = "http://127.0.0.1"
41+
endpoint = "http://127.0.0.1:15672"
4242
username = "guest"
4343
password = "guest"
4444
}
@@ -55,8 +55,8 @@ resource "rabbitmq_vhost" "example" {
5555

5656
- [Terraform](https://www.terraform.io/downloads.html) 1.0.x
5757
- [Go](https://golang.org/doc/install) 1.21
58-
- [Docker Engine](https://docs.docker.com/engine/install) >= 24.x
59-
- [Docker Compose](https://docs.docker.com/compose/install/) >= 1.29.x
58+
- [Docker Engine](https://docs.docker.com/engine/install) >= 27.2.x
59+
- [Docker Compose plugin](https://docs.docker.com/compose/install/#scenario-two-install-the-compose-plugin) >= 2.29.x
6060

6161
### Building the Provider
6262

docs/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ Use the navigation to the left to read about the available resources.
1616
```terraform
1717
# Configure the RabbitMQ provider
1818
provider "rabbitmq" {
19-
endpoint = "http://127.0.0.1"
19+
endpoint = "http://127.0.0.1:15672"
2020
username = "guest"
2121
password = "guest"
2222
}

docs/resources/user.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,3 +39,12 @@ resource "rabbitmq_user" "example" {
3939
### Read-Only
4040

4141
- `id` (String) The ID of this resource.
42+
43+
## Import
44+
45+
Import is supported using the following syntax:
46+
47+
```shell
48+
# User can be imported by specifying its name.
49+
terraform import rabbitmq_user.example myuser
50+
```

docs/resources/vhost.md

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
---
2-
# generated by https://github.com/hashicorp/terraform-plugin-docs
32
page_title: "rabbitmq_vhost Resource - terraform-provider-rabbitmq"
43
subcategory: ""
54
description: |-
@@ -28,12 +27,26 @@ resource "rabbitmq_vhost" "example" {
2827

2928
### Optional
3029

31-
- `default_queue_type` (String) Default queue type for new queues. The available values are `classic`, `quorum` or `stream`.
30+
- `default_queue_type` (String) Default queue type for new queues. The available values are `classic`, `quorum` or `stream`. Defaults to `classic`.
3231
- `description` (String) A friendly description.
3332
- `max_connections` (String) To limit the total number of concurrent client connections in vhost.
3433
- `max_queues` (String) To limit the total number of queues in vhost.
35-
- `tracing` (Boolean) To enable/disable tracing.
34+
- `tracing` (Boolean) To enable/disable tracing. Defaults to `false`.
3635

3736
### Read-Only
3837

3938
- `id` (String) The ID of this resource.
39+
40+
### RabbitMQ Compliance
41+
- The update of `description` value is available since _RabbitMQ **3.9**_.
42+
- `default_queue_type` is available since _RabbitMQ **3.10**_.
43+
- The update of `default_queue_type` value is available since _RabbitMQ **3.11**_.
44+
45+
## Import
46+
47+
Import is supported using the following syntax:
48+
49+
```shell
50+
# Vhost can be imported by specifying its name.
51+
terraform import rabbitmq_vhost.example myvhost
52+
```

examples/provider/provider.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Configure the RabbitMQ provider
22
provider "rabbitmq" {
3-
endpoint = "http://127.0.0.1"
3+
endpoint = "http://127.0.0.1:15672"
44
username = "guest"
55
password = "guest"
66
}

0 commit comments

Comments
 (0)