Skip to content

Commit

Permalink
New release with update to 10.9.1 SEMP API spec
Browse files Browse the repository at this point in the history
* Updated provider version dependency to 1.1
bczoma authored Oct 31, 2024

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
1 parent fdbc0e1 commit 711421c
Showing 17 changed files with 240 additions and 143 deletions.
31 changes: 17 additions & 14 deletions .github/workflows/broker-build-test.yml
Original file line number Diff line number Diff line change
@@ -18,7 +18,12 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v3
with:
go-version: "1.22"
go-version: "1.23"

- name: Set up Terraform latest
uses: hashicorp/setup-terraform@v3
with:
terraform_wrapper: false

- name: Checkout generator
uses: actions/checkout@v4
@@ -61,35 +66,33 @@ jobs:
run: |
echo "No changes detected, skipping further steps"
- name: List changed files - from now on all tests are run only if there were changes
# if: steps.check-changed-files.outputs.files_changed == 'true'
run: |
echo "Changed files: ${{ steps.check-changed-files.outputs.changed_files }}"
git diff
- name: Set up Terraform latest
# if: steps.check-changed-files.outputs.files_changed == 'true'
uses: hashicorp/setup-terraform@v2
with:
terraform_wrapper: false

- name: Setup Test broker
# if: steps.check-changed-files.outputs.files_changed == 'true'
if: steps.check-changed-files.outputs.files_changed == 'true'
run: |
mkdir -p $HOME/solace; chmod 777 $HOME/solace
docker run -d -p 8080:8080 -p 55555:55555 --shm-size=1g --env username_admin_globalaccesslevel=admin --env username_admin_password=admin --env system_scaling_maxkafkabridgecount="10" --name=solace \
--env system_scaling_maxconnectioncount="1000" --mount type=bind,source=$HOME/solace,destination=/var/lib/solace,ro=false solace/solace-pubsub-standard:latest
while ! curl -s localhost:8080 | grep aurelia ; do sleep 1 ; done
sleep 30 # wait for broker to be ready
- name: List changed files - from now on all tests are run only if there were changes
if: steps.check-changed-files.outputs.files_changed == 'true'
run: |
echo "Changed files: ${{ steps.check-changed-files.outputs.changed_files }}"
git diff
- name: Test module from template on test broker
if: steps.check-changed-files.outputs.files_changed == 'true'
run: |
ci/scripts/test-module.sh ci/template-test
- name: Test module root on test broker
if: steps.check-changed-files.outputs.files_changed == 'true'
run: |
ci/scripts/test-module.sh ci/module-test
- name: Test examples
if: steps.check-changed-files.outputs.files_changed == 'true'
run: |
shopt -s extglob
for d in examples/!(adding-headers)/; do (ci/scripts/test-module.sh "$d"); done
12 changes: 6 additions & 6 deletions .github/workflows/module-test-pipeline-main-branch-only.yml
Original file line number Diff line number Diff line change
@@ -13,19 +13,19 @@ jobs:
- name: Check out code
uses: actions/checkout@v4

- name: Set up Terraform latest - with token
uses: hashicorp/setup-terraform@v3
with:
cli_config_credentials_token: ${{ secrets.TF_API_TOKEN }}
terraform_wrapper: true

- name: Setup test broker
run: |
mkdir -p $HOME/solace; chmod 777 $HOME/solace
docker run -d -p 8080:8080 -p 55555:55555 --shm-size=1g --env username_admin_globalaccesslevel=admin --env username_admin_password=admin --env system_scaling_maxkafkabridgecount="10" --name=solace \
--env system_scaling_maxconnectioncount="1000" --mount type=bind,source=$HOME/solace,destination=/var/lib/solace,ro=false solace/solace-pubsub-standard:latest
while ! curl -s localhost:8080 | grep aurelia ; do sleep 1 ; done
- name: Set up Terraform latest - with token
uses: hashicorp/setup-terraform@v3
with:
cli_config_credentials_token: ${{ secrets.TF_API_TOKEN }}
terraform_wrapper: true

- name: Test module root on test broker
run: |
ci/scripts/test-module.sh ci/module-test
2 changes: 1 addition & 1 deletion .github/workflows/module-test-pipeline.yml
Original file line number Diff line number Diff line change
@@ -57,7 +57,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v3
with:
go-version: "1.22"
go-version: "1.23"

- name: Checkout generator
uses: actions/checkout@v4
2 changes: 1 addition & 1 deletion .github/workflows/prep-internal-release.yml
Original file line number Diff line number Diff line change
@@ -20,7 +20,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v3
with:
go-version: "1.22"
go-version: "1.23"

- name: Checkout the code
uses: actions/checkout@v2
2 changes: 1 addition & 1 deletion .github/workflows/verify-registry-release.yml
Original file line number Diff line number Diff line change
@@ -20,7 +20,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v3
with:
go-version: "1.22"
go-version: "1.23"

- name: Check out code
uses: actions/checkout@v4
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -54,7 +54,7 @@ Note that the "rest consumer" and the "protected request headers" outputs are [s

| Name | Version |
|------|---------|
| <a name="provider_solacebroker"></a> [solacebroker](https://registry.terraform.io/providers/SolaceProducts/solacebroker/latest) | >= 1.0 |
| <a name="provider_solacebroker"></a> [solacebroker](https://registry.terraform.io/providers/SolaceProducts/solacebroker/latest) | >= 1.1 |

## Resources

2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.0.0
1.1.0
2 changes: 1 addition & 1 deletion ci/module-test/providers.tf
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@ terraform {
required_providers {
solacebroker = {
source = "registry.terraform.io/solaceproducts/solacebroker"
version = "~> 1.0"
version = "~> 1.1"
}
}
required_version = "~> 1.2"

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ci/template-test/providers.tf
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@ terraform {
required_providers {
solacebroker = {
source = "registry.terraform.io/solaceproducts/solacebroker"
version = "~> 1.0"
version = "~> 1.1"
}
}
required_version = "~> 1.2"
2 changes: 1 addition & 1 deletion examples/adding-headers/providers.tf
Original file line number Diff line number Diff line change
@@ -18,7 +18,7 @@ terraform {
required_providers {
solacebroker = {
source = "registry.terraform.io/solaceproducts/solacebroker"
version = "~> 1.0"
version = "~> 1.1"
}
}
required_version = "~> 1.2"
2 changes: 1 addition & 1 deletion examples/basic/providers.tf
Original file line number Diff line number Diff line change
@@ -18,7 +18,7 @@ terraform {
required_providers {
solacebroker = {
source = "registry.terraform.io/solaceproducts/solacebroker"
version = "~> 1.0"
version = "~> 1.1"
}
}
required_version = "~> 1.2"
2 changes: 1 addition & 1 deletion examples/using-substitution-expressions/providers.tf
Original file line number Diff line number Diff line change
@@ -18,7 +18,7 @@ terraform {
required_providers {
solacebroker = {
source = "registry.terraform.io/solaceproducts/solacebroker"
version = "~> 1.0"
version = "~> 1.1"
}
}
required_version = "~> 1.2"
2 changes: 1 addition & 1 deletion internal/gen-template/provider.tf
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@ terraform {
required_providers {
solacebroker = {
source = "registry.terraform.io/solaceproducts/solacebroker"
version = ">= 1.0"
version = ">= 1.1"
}
}
}
2 changes: 2 additions & 0 deletions main.tf
Original file line number Diff line number Diff line change
@@ -56,10 +56,12 @@ resource "solacebroker_msg_vpn_rest_delivery_point_rest_consumer" "main" {
authentication_http_header_name = var.authentication_http_header_name
authentication_http_header_value = var.authentication_http_header_value
authentication_oauth_client_id = var.authentication_oauth_client_id
authentication_oauth_client_proxy_name = var.authentication_oauth_client_proxy_name
authentication_oauth_client_scope = var.authentication_oauth_client_scope
authentication_oauth_client_secret = var.authentication_oauth_client_secret
authentication_oauth_client_token_endpoint = var.authentication_oauth_client_token_endpoint
authentication_oauth_client_token_expiry_default = var.authentication_oauth_client_token_expiry_default
authentication_oauth_jwt_proxy_name = var.authentication_oauth_jwt_proxy_name
authentication_oauth_jwt_secret_key = var.authentication_oauth_jwt_secret_key
authentication_oauth_jwt_token_endpoint = var.authentication_oauth_jwt_token_endpoint
authentication_oauth_jwt_token_expiry_default = var.authentication_oauth_jwt_token_expiry_default
2 changes: 1 addition & 1 deletion provider.tf
Original file line number Diff line number Diff line change
@@ -18,7 +18,7 @@ terraform {
required_providers {
solacebroker = {
source = "registry.terraform.io/solaceproducts/solacebroker"
version = ">= 1.0"
version = ">= 1.1"
}
}
}
12 changes: 12 additions & 0 deletions variables.tf
Original file line number Diff line number Diff line change
@@ -125,6 +125,12 @@ variable "authentication_oauth_client_id" {
default = null
}

variable "authentication_oauth_client_proxy_name" {
description = "The name of the proxy to use"
type = string
default = null
}

variable "authentication_oauth_client_scope" {
description = "The OAuth scope"
type = string
@@ -150,6 +156,12 @@ variable "authentication_oauth_client_token_expiry_default" {
default = null
}

variable "authentication_oauth_jwt_proxy_name" {
description = "The name of the proxy to use"
type = string
default = null
}

variable "authentication_oauth_jwt_secret_key" {
description = "The OAuth secret key used to sign the token request JWT"
type = string

0 comments on commit 711421c

Please sign in to comment.