Skip to content

Commit 5fa1c94

Browse files
bczomabczoma
authored
Updated Beta release 0.9.2 (#23)
* Updated SEMP schema to 2.39 * Improvements and fixes: * SOL-109405 Upgrade Terraform provider to Go v1.21 * SOL-100797 Objects that dont have dependancies dont follow the 'request_min_interval' provider attribute * SOL-100812 The request_min_interval attribute seems to wait before the first SEMP request is sent * SOL-101839 Improved retry mechanism in provider SEMP client * SOL-104984 Generator needs to escape certain charaters in attribute names * SOL-105581 Removed `id` attribute as it is no longer needed by the Terraform test framework v1.5 * SOL-105859 broker provider makes API calls at configure time * SOL-105867 Generator needs to handle terraform interpolation in string outputs * Bump github.com/cloudflare/circl from 1.3.3 to 1.3.7
1 parent 87b11a4 commit 5fa1c94

File tree

262 files changed

+3336
-2200
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

262 files changed

+3336
-2200
lines changed

‎.github/workflows/cli-test-pipeline.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
- name: Set up Go
1111
uses: actions/setup-go@v3
1212
with:
13-
go-version: "1.20"
13+
go-version: "1.21"
1414

1515
- name: Check out code
1616
uses: actions/checkout@v4
@@ -21,8 +21,8 @@ jobs:
2121
- name: Setup Test broker
2222
run: |
2323
mkdir -p $HOME/solace; chmod 777 $HOME/solace
24-
docker run -d -p 8080:8080 -p 55555:55555 --shm-size=1g --env username_admin_globalaccesslevel=admin --env username_admin_password=admin --name=solace \
25-
--mount type=bind,source=$HOME/solace,destination=/var/lib/solace,ro=false solace/solace-pubsub-standard
24+
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 \
25+
--mount type=bind,source=$HOME/solace,destination=/var/lib/solace,ro=false solace/solace-pubsub-standard:"10.6.1.52"
2626
while ! curl -s localhost:8080 | grep aurelia ; do sleep 1 ; done
2727
2828
- name: Use local provider
@@ -37,7 +37,7 @@ jobs:
3737
3838
- name: Build provider
3939
run: |
40-
go mod tidy
40+
make dep
4141
make install
4242
ls ~/go/bin
4343
terraform-provider-solacebrokerappliance -h

‎.github/workflows/core-pipeline-dev.yml

Lines changed: 34 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
name: Build Terraform Provider in Development phase
2+
# Branch naming convention assumes dev branches start with "dev" then semver release name,
3+
# internal QA release candidate branches start with "v" then semver release name.
24

35
on:
46
push:
@@ -13,7 +15,7 @@ jobs:
1315
- name: Set up Go
1416
uses: actions/setup-go@v3
1517
with:
16-
go-version: "1.20"
18+
go-version: "1.21"
1719

1820
- name: Check out code
1921
uses: actions/checkout@v4
@@ -51,47 +53,55 @@ jobs:
5153
5254
- name: Build provider
5355
run: |
54-
go mod tidy
55-
go fmt
56+
make dep
57+
make fmt
5658
make install
5759
~/go/bin/terraform-provider-solacebrokerappliance version
5860
~/go/bin/terraform-provider-solacebrokerappliance help
5961
6062
- name: Test Provider and generate documentations
6163
run: |
62-
make test-coverage
64+
make testacc
6365
make generate-docs
6466
67+
- name: Ensure version reflects release candidate version
68+
run: |
69+
if echo "${{ github.ref_name }}" | grep ^dev || echo "${{ github.ref_name }}" | grep ^v ; then
70+
VERSION=$(echo "${{ github.ref_name }}" | cut -d'v' -f2)
71+
sed -i "s/version =.*$/version = \"${VERSION}\"/g" version.go
72+
fi
73+
6574
- name: Check changed files
66-
uses: tj-actions/verify-changed-files@v14
75+
uses: tj-actions/verify-changed-files@v17
6776
id: check-changed-files
6877
with:
6978
files: |
70-
internal/broker/generated
71-
docs
79+
!broker-terraform-provider-generator
7280
7381
- name: Run step only when any of the above files change.
7482
if: steps.check-changed-files.outputs.files_changed == 'true'
7583
run: |
7684
echo "Changed files: ${{ steps.check-changed-files.outputs.changed_files }}"
7785
78-
# - name: Commit back any updated source code
79-
# if: steps.check-changed-files.outputs.files_changed == 'true'
80-
# uses: EndBug/add-and-commit@v9
81-
# with:
82-
# committer_name: GitHub Actions
83-
# committer_email: actions@github.com
84-
# message: 'Updating generated source [skip ci]'
85-
# add: 'internal/broker/generated/*.go'
86-
# new_branch: GeneratedSourceUpdates-${{ github.ref_name }}
87-
88-
# - name: Create pull request
89-
# if: steps.check-changed-files.outputs.files_changed == 'true'
90-
# run: |
91-
# CURRENT_BRANCH=${GITHUB_REF_NAME}
92-
# gh pr create -B ${CURRENT_BRANCH} -H "GeneratedSourceUpdates-${CURRENT_BRANCH}" --title "Merge generated source updates into ${CURRENT_BRANCH}" --body 'Created by Github action'
93-
# env:
94-
# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
86+
- name: Commit back any updated source code
87+
if: steps.check-changed-files.outputs.files_changed == 'true'
88+
uses: EndBug/add-and-commit@v9
89+
with:
90+
committer_name: GitHub Actions
91+
committer_email: actions@github.com
92+
message: 'Updating generated source'
93+
add: ". ':!broker-terraform-provider-generator'"
94+
new_branch: GeneratedSourceUpdates-${{ github.ref_name }}
95+
96+
- name: Create pull request
97+
if: steps.check-changed-files.outputs.files_changed == 'true'
98+
env:
99+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
100+
run: |
101+
CURRENT_BRANCH=${GITHUB_REF_NAME}
102+
gh pr create -B ${CURRENT_BRANCH} -H "GeneratedSourceUpdates-${CURRENT_BRANCH}" --title "Merge generated source updates into ${CURRENT_BRANCH}" --body 'Created by Github action'
103+
echo Review and approve PR before push can continue
104+
exit 1 // force actions stop here
95105
96106
Plugin-Integration-Test:
97107
needs: build

‎.github/workflows/core-pipeline-main-branch-only.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
- name: Set up Go
1414
uses: actions/setup-go@v3
1515
with:
16-
go-version: "1.20"
16+
go-version: "1.21"
1717

1818
- name: Check out code
1919
uses: actions/checkout@v4
@@ -25,8 +25,6 @@ jobs:
2525

2626
- name: Build provider
2727
run: |
28-
go mod tidy
29-
go fmt
3028
make install
3129
~/go/bin/terraform-provider-solacebrokerappliance version
3230
~/go/bin/terraform-provider-solacebrokerappliance help

‎.github/workflows/prep-internal-release.yml

Lines changed: 19 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
# Launched manually
12
on:
23
workflow_dispatch:
34
inputs:
@@ -15,7 +16,7 @@ jobs:
1516
- name: Set up Go
1617
uses: actions/setup-go@v3
1718
with:
18-
go-version: "1.20"
19+
go-version: "1.21"
1920

2021
- name: Checkout the code
2122
uses: actions/checkout@v2
@@ -80,7 +81,7 @@ jobs:
8081
sed -i "s/version =.*$/version = \"${VERSION}\"/g" version.go
8182
8283
- name: Check changed files
83-
uses: tj-actions/verify-changed-files@v14
84+
uses: tj-actions/verify-changed-files@v17
8485
id: check-changed-files
8586

8687
- name: Run step only when any of the files change
@@ -105,7 +106,7 @@ jobs:
105106
CURRENT_BRANCH=${GITHUB_REF_NAME}
106107
gh pr create -B ${CURRENT_BRANCH} -H "GeneratedSourceUpdates-${CURRENT_BRANCH}" --title "Merge generated source updates into release candidate ${CURRENT_BRANCH}" --body 'Created by Github action'
107108
echo Review and approve PR before release can continue
108-
exit 1 // force actions fail here
109+
exit 1 // force actions stop here
109110
110111
- name: Prep product release for Whitesource
111112
run: |
@@ -131,17 +132,28 @@ jobs:
131132
with:
132133
branch: "${{ github.event.inputs.release_branch_name }}"
133134

135+
# - name: Create next dev branch
136+
# if: env.NEXT_DEV_VERSION != ''
137+
# uses: peterjgrainger/action-create-branch@v2.4.0
138+
# env:
139+
# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
140+
# with:
141+
# branch: ${{ env.NEXT_DEV_VERSION }}
142+
134143
- name: Create next dev branch
135144
if: env.NEXT_DEV_VERSION != ''
136-
uses: peterjgrainger/action-create-branch@v2.4.0
137145
env:
138146
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
139-
with:
140-
branch: ${{ env.NEXT_DEV_VERSION }}
147+
run: |
148+
git checkout -b ${{ env.NEXT_DEV_VERSION }}
149+
VERSION=$(echo "${{ env.NEXT_DEV_VERSION }}" | cut -d'v' -f2)
150+
sed -i "s/version =.*$/version = \"${VERSION}\"/g" version.go
151+
git commit -a -m "Uprev'd version to ${VERSION}"
152+
git push --set-upstream origin ${{ env.NEXT_DEV_VERSION }}
141153
142154
- name: Delete last dev branch
155+
if: env.NEXT_DEV_VERSION != ''
143156
uses: dawidd6/action-delete-branch@v3
144157
with:
145158
github_token: ${{github.token}}
146159
branches: "${{ github.ref_name }}"
147-

‎.github/workflows/provider-acceptance-test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
- name: Set up Go
1212
uses: actions/setup-go@v3
1313
with:
14-
go-version: "1.20"
14+
go-version: "1.21"
1515

1616
- name: Check out code
1717
uses: actions/checkout@v4

‎.github/workflows/provider-test-pipeline.yml

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
- name: Set up Go
1111
uses: actions/setup-go@v3
1212
with:
13-
go-version: "1.20"
13+
go-version: "1.21"
1414

1515
- name: Check out code
1616
uses: actions/checkout@v4
@@ -21,8 +21,8 @@ jobs:
2121
- name: Setup test broker
2222
run: |
2323
mkdir -p $HOME/solace; chmod 777 $HOME/solace
24-
docker run -d -p 8080:8080 -p 55555:55555 --shm-size=1g --env username_admin_globalaccesslevel=admin --env username_admin_password=admin --name=solace \
25-
--mount type=bind,source=$HOME/solace,destination=/var/lib/solace,ro=false solace/solace-pubsub-standard
24+
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 \
25+
--env system_scaling_maxconnectioncount="1000" --mount type=bind,source=$HOME/solace,destination=/var/lib/solace,ro=false solace/solace-pubsub-standard:"10.6.1.52"
2626
while ! curl -s localhost:8080 | grep aurelia ; do sleep 1 ; done
2727
2828
- name: Use local provider
@@ -69,3 +69,10 @@ jobs:
6969
rm terraform.tfstate*
7070
terraform import solacebroker_msg_vpn.newone new
7171
popd
72+
# larger config
73+
pushd ci/bigtest
74+
terraform plan
75+
terraform apply -auto-approve
76+
terraform plan
77+
terraform destroy -auto-approve
78+
popd

‎.github/workflows/verify-registry-release.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,16 +20,16 @@ jobs:
2020
- name: Set up Go
2121
uses: actions/setup-go@v3
2222
with:
23-
go-version: "1.20"
23+
go-version: "1.21"
2424

2525
- name: Check out code
2626
uses: actions/checkout@v4
2727

2828
- name: Setup test broker
2929
run: |
3030
mkdir -p $HOME/solace; chmod 777 $HOME/solace
31-
docker run -d -p 8080:8080 -p 55555:55555 --shm-size=1g --env username_admin_globalaccesslevel=admin --env username_admin_password=admin --name=solace \
32-
--mount type=bind,source=$HOME/solace,destination=/var/lib/solace,ro=false solace/solace-pubsub-standard
31+
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 \
32+
--mount type=bind,source=$HOME/solace,destination=/var/lib/solace,ro=false solace/solace-pubsub-standard:"10.6.1.52"
3333
while ! curl -s localhost:8080 | grep aurelia ; do sleep 1 ; done
3434
3535
- name: Set up Terraform latest - public

‎LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@
186186
same "printed page" as the copyright notice for easier
187187
identification within third-party archives.
188188

189-
Copyright 2023 Solace Corporation
189+
Copyright 2024 Solace Corporation
190190

191191
Licensed under the Apache License, Version 2.0 (the "License");
192192
you may not use this file except in compliance with the License.

0 commit comments

Comments
 (0)