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
SolaceProducts · Jan 26, 2024 · 5fa1c94 · 5fa1c94
1 parent 87b11a4
commit 5fa1c94
Show file tree

Hide file tree

Showing 262 changed files with 3,336 additions and 2,200 deletions.
diff --git a/.github/workflows/cli-test-pipeline.yml b/.github/workflows/cli-test-pipeline.yml
@@ -10,7 +10,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v3
         with:
-          go-version: "1.20"
+          go-version: "1.21"
 
       - name: Check out code
         uses: actions/checkout@v4
@@ -21,8 +21,8 @@ jobs:
       - 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 --name=solace \
-            --mount type=bind,source=$HOME/solace,destination=/var/lib/solace,ro=false solace/solace-pubsub-standard
+          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 \
+            --mount type=bind,source=$HOME/solace,destination=/var/lib/solace,ro=false solace/solace-pubsub-standard:"10.6.1.52"
           while ! curl -s localhost:8080 | grep aurelia ; do sleep 1 ; done
 
       - name: Use local provider
@@ -37,7 +37,7 @@ jobs:
 
       - name: Build provider
         run: |
-          go mod tidy
+          make dep
           make install
           ls ~/go/bin
           terraform-provider-solacebrokerappliance -h

diff --git a/.github/workflows/core-pipeline-dev.yml b/.github/workflows/core-pipeline-dev.yml
@@ -1,4 +1,6 @@
 name: Build Terraform Provider in Development phase
+# Branch naming convention assumes dev branches start with "dev" then semver release name,
+#          internal QA release candidate branches start with "v" then semver release name.
 
 on:
   push:
@@ -13,7 +15,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v3
         with:
-          go-version: "1.20"
+          go-version: "1.21"
 
       - name: Check out code
         uses: actions/checkout@v4
@@ -51,47 +53,55 @@ jobs:
 
       - name: Build provider
         run: |
-          go mod tidy
-          go fmt
+          make dep
+          make fmt
           make install
           ~/go/bin/terraform-provider-solacebrokerappliance version
           ~/go/bin/terraform-provider-solacebrokerappliance help
 
       - name: Test Provider and generate documentations
         run: |
-          make test-coverage
+          make testacc
           make generate-docs
 
+      - name: Ensure version reflects release candidate version
+        run: |
+          if echo "${{ github.ref_name }}" | grep ^dev || echo "${{ github.ref_name }}" | grep ^v ; then
+            VERSION=$(echo "${{ github.ref_name }}" | cut -d'v' -f2)
+            sed -i "s/version =.*$/version = \"${VERSION}\"/g" version.go
+          fi
+
       - name: Check changed files
-        uses: tj-actions/verify-changed-files@v14
+        uses: tj-actions/verify-changed-files@v17
         id: check-changed-files
         with:
           files: |
-            internal/broker/generated
-            docs
+            !broker-terraform-provider-generator
 
       - name: Run step only when any of the above files change.
         if: steps.check-changed-files.outputs.files_changed == 'true'
         run: |
           echo "Changed files: ${{ steps.check-changed-files.outputs.changed_files }}"
 
-      # - name: Commit back any updated source code
-      #   if: steps.check-changed-files.outputs.files_changed == 'true'
-      #   uses: EndBug/add-and-commit@v9
-      #   with:
-      #     committer_name: GitHub Actions
-      #     committer_email: [email protected]
-      #     message: 'Updating generated source [skip ci]'
-      #     add: 'internal/broker/generated/*.go'
-      #     new_branch: GeneratedSourceUpdates-${{ github.ref_name }}
-
-      # - name: Create pull request
-      #   if: steps.check-changed-files.outputs.files_changed == 'true'
-      #   run: |
-      #     CURRENT_BRANCH=${GITHUB_REF_NAME}
-      #     gh pr create -B ${CURRENT_BRANCH} -H "GeneratedSourceUpdates-${CURRENT_BRANCH}" --title "Merge generated source updates into ${CURRENT_BRANCH}" --body 'Created by Github action'
-      #   env:
-      #     GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - name: Commit back any updated source code
+        if: steps.check-changed-files.outputs.files_changed == 'true'
+        uses: EndBug/add-and-commit@v9
+        with:
+          committer_name: GitHub Actions
+          committer_email: [email protected]
+          message: 'Updating generated source'
+          add: ". ':!broker-terraform-provider-generator'"
+          new_branch: GeneratedSourceUpdates-${{ github.ref_name }}
+
+      - name: Create pull request
+        if: steps.check-changed-files.outputs.files_changed == 'true'
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          CURRENT_BRANCH=${GITHUB_REF_NAME}
+          gh pr create -B ${CURRENT_BRANCH} -H "GeneratedSourceUpdates-${CURRENT_BRANCH}" --title "Merge generated source updates into ${CURRENT_BRANCH}" --body 'Created by Github action'
+          echo Review and approve PR before push can continue
+          exit 1 // force actions stop here
 
   Plugin-Integration-Test:
     needs: build

diff --git a/.github/workflows/core-pipeline-main-branch-only.yml b/.github/workflows/core-pipeline-main-branch-only.yml
@@ -13,7 +13,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v3
         with:
-          go-version: "1.20"
+          go-version: "1.21"
 
       - name: Check out code
         uses: actions/checkout@v4
@@ -25,8 +25,6 @@ jobs:
 
       - name: Build provider
         run: |
-          go mod tidy
-          go fmt
           make install
           ~/go/bin/terraform-provider-solacebrokerappliance version
           ~/go/bin/terraform-provider-solacebrokerappliance help

diff --git a/.github/workflows/prep-internal-release.yml b/.github/workflows/prep-internal-release.yml
@@ -1,3 +1,4 @@
+# Launched manually
 on:
   workflow_dispatch:
     inputs:
@@ -15,7 +16,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v3
         with:
-          go-version: "1.20"
+          go-version: "1.21"
 
       - name: Checkout the code
         uses: actions/checkout@v2
@@ -80,7 +81,7 @@ jobs:
           sed -i "s/version =.*$/version = \"${VERSION}\"/g" version.go
 
       - name: Check changed files
-        uses: tj-actions/verify-changed-files@v14
+        uses: tj-actions/verify-changed-files@v17
         id: check-changed-files
 
       - name: Run step only when any of the files change
@@ -105,7 +106,7 @@ jobs:
           CURRENT_BRANCH=${GITHUB_REF_NAME}
           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'
           echo Review and approve PR before release can continue
-          exit 1 // force actions fail here
+          exit 1 // force actions stop here
 
       - name: Prep product release for Whitesource
         run: |
@@ -131,17 +132,28 @@ jobs:
         with:
           branch: "${{ github.event.inputs.release_branch_name }}"
 
+      # - name: Create next dev branch
+      #   if: env.NEXT_DEV_VERSION != ''
+      #   uses: peterjgrainger/[email protected]
+      #   env:
+      #     GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      #   with:
+      #     branch: ${{ env.NEXT_DEV_VERSION }}
+
       - name: Create next dev branch
         if: env.NEXT_DEV_VERSION != ''
-        uses: peterjgrainger/[email protected]
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          branch: ${{ env.NEXT_DEV_VERSION }}
+        run: |
+          git checkout -b ${{ env.NEXT_DEV_VERSION }}
+          VERSION=$(echo "${{ env.NEXT_DEV_VERSION }}" | cut -d'v' -f2)
+          sed -i "s/version =.*$/version = \"${VERSION}\"/g" version.go
+          git commit -a -m "Uprev'd version to ${VERSION}"
+          git push --set-upstream origin ${{ env.NEXT_DEV_VERSION }}
 
       - name: Delete last dev branch
+        if: env.NEXT_DEV_VERSION != ''
         uses: dawidd6/action-delete-branch@v3
         with:
           github_token: ${{github.token}}
           branches: "${{ github.ref_name }}"
-
diff --git a/.github/workflows/provider-acceptance-test.yml b/.github/workflows/provider-acceptance-test.yml
@@ -11,7 +11,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v3
         with:
-          go-version: "1.20"
+          go-version: "1.21"
 
       - name: Check out code
         uses: actions/checkout@v4

diff --git a/.github/workflows/provider-test-pipeline.yml b/.github/workflows/provider-test-pipeline.yml
@@ -10,7 +10,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v3
         with:
-          go-version: "1.20"
+          go-version: "1.21"
 
       - name: Check out code
         uses: actions/checkout@v4
@@ -21,8 +21,8 @@ jobs:
       - 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 --name=solace \
-            --mount type=bind,source=$HOME/solace,destination=/var/lib/solace,ro=false solace/solace-pubsub-standard
+          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:"10.6.1.52"
           while ! curl -s localhost:8080 | grep aurelia ; do sleep 1 ; done
 
       - name: Use local provider
@@ -69,3 +69,10 @@ jobs:
           rm terraform.tfstate*
           terraform import solacebroker_msg_vpn.newone new
           popd
+          # larger config
+          pushd ci/bigtest
+          terraform plan
+          terraform apply -auto-approve
+          terraform plan
+          terraform destroy -auto-approve
+          popd
diff --git a/.github/workflows/verify-registry-release.yml b/.github/workflows/verify-registry-release.yml
@@ -20,16 +20,16 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v3
         with:
-          go-version: "1.20"
+          go-version: "1.21"
 
       - name: Check out code
         uses: actions/checkout@v4
 
       - 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 --name=solace \
-            --mount type=bind,source=$HOME/solace,destination=/var/lib/solace,ro=false solace/solace-pubsub-standard
+          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 \
+            --mount type=bind,source=$HOME/solace,destination=/var/lib/solace,ro=false solace/solace-pubsub-standard:"10.6.1.52"
           while ! curl -s localhost:8080 | grep aurelia ; do sleep 1 ; done
 
       - name: Set up Terraform latest - public

diff --git a/LICENSE b/LICENSE
@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2023 Solace Corporation
+   Copyright 2024 Solace Corporation
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.