Merge pull request #39 from wallix/develop

Release v0.14.0

.changes/.template.md

@@ -0,0 +1,6 @@
+<!-- markdownlint-disable-file MD013 MD041 -->
+FEATURES:
+
+ENHANCEMENTS:
+
+BUG FIXES:

.github/workflows/go.yml

@@ -1,15 +1,16 @@
 name: Go Tests
 on: [push, pull_request]
 jobs:
-  build-1_20:
-    name: Build 1.20
+  build-1_22:
+    name: Build 1.22
     runs-on: ubuntu-latest
     steps:
-      - name: Set up Go 1.20
+      - name: Set up Go 1.22
         uses: actions/setup-go@v5
         with:
-          go-version: '1.20'
+          go-version: '1.22'
           check-latest: true
+          cache: false
         id: go
       - name: Disable cgo
         run: |
@@ -21,15 +22,16 @@ jobs:
       - name: Build
         run: go build -v .
 
-  build-1_21:
-    name: Build 1.21
+  build-1_23:
+    name: Build 1.23
     runs-on: ubuntu-latest
     steps:
-      - name: Set up Go 1.21
+      - name: Set up Go 1.23
         uses: actions/setup-go@v5
         with:
-          go-version: '1.21'
+          go-version: '1.23'
           check-latest: true
+          cache: false
         id: go
       - name: Disable cgo
         run: |
@@ -45,11 +47,12 @@ jobs:
     name: Test
     runs-on: ubuntu-latest
     steps:
-      - name: Set up Go 1.21
+      - name: Set up Go 1.23
         uses: actions/setup-go@v5
         with:
-          go-version: '1.21'
+          go-version: '1.23'
           check-latest: true
+          cache: false
         id: go
       - name: Disable cgo
         run: |

.github/workflows/linters.yml

@@ -5,10 +5,10 @@ jobs:
     name: golangci-lint
     runs-on: ubuntu-latest
     steps:
-      - name: Set up Go 1.21
+      - name: Set up Go 1.23
         uses: actions/setup-go@v5
         with:
-          go-version: '1.21'
+          go-version: '1.23'
           check-latest: true
         id: go
       - name: Disable cgo
@@ -17,10 +17,11 @@ jobs:
       - name: Check out code
         uses: actions/checkout@v4
       - name: golangci-lint
-        uses: golangci/golangci-lint-action@v4
+        uses: golangci/golangci-lint-action@v6
         with:
-          version: v1.54
+          version: v1.61.0
           args: -c .golangci.yml -v
+          skip-cache: true
 
   markdown-lint:
     name: markdown-lint
@@ -38,11 +39,12 @@ jobs:
     name: terrafmt
     runs-on: ubuntu-latest
     steps:
-      - name: Set up Go 1.21
+      - name: Set up Go 1.23
         uses: actions/setup-go@v5
         with:
-          go-version: '1.21'
+          go-version: '1.23'
           check-latest: true
+          skip-cache: true
         id: go
       - name: Show version
         run: go version
@@ -54,6 +56,7 @@ jobs:
           repository: katbyte/terrafmt
           ref: v0.5.2
           path: terrafmt
+          skip-cache: true
       - name: Build terrafmt bin
         run: cd terrafmt && go install ./... && cd ${GITHUB_WORKSPACE}
       - name: Detect resource/data-source blocks without double quote on type and name (blocks not detected by terrafmt)

.github/workflows/release.yml

@@ -19,20 +19,20 @@ jobs:
         name: Set up Go
         uses: actions/setup-go@v5
         with:
-          go-version: '1.21'
+          go-version: '1.23'
       -
         name: Import GPG key
-        uses: crazy-max/ghaction-import-gpg@v6.1.0
+        uses: crazy-max/ghaction-import-gpg@v6.2.0
         id: import_gpg
         with:
           gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
           passphrase: ${{ secrets.PASSPHRASE }}
       -
         name: Run GoReleaser
-        uses: goreleaser/goreleaser-action@v5.0.0
+        uses: goreleaser/goreleaser-action@v6.0.0
         with:
           version: latest
-          args: release --rm-dist
+          args: release --clean
         env:
           GPG_FINGERPRINT: ${{ steps.import_gpg.outputs.fingerprint }}
           # GitHub sets this automatically

.golangci.yml

@@ -1,34 +1,36 @@
 run:
   timeout: 5m
+
 linters:
   enable-all: true
   disable:
-    # maligned # deprecated 1.38.0 but govet-fieldalignment not usuable
-    - interfacer # deprecated 1.38.0
-    - scopelint # deprecated 1.39.0
-    - golint # deprecated 1.41.0
-    - exhaustivestruct # deprecated 1.46.0
-    # ifshort # deprecated 1.48.0 but no replacement
-    - nosnakecase # deprecated 1.48.1
-    - deadcode # deprecated 1.49.0
-    - structcheck # deprecated 1.49.0
-    - varcheck # deprecated 1.49.0
-    - funlen
+    # deprecated
+    - execinquery # deprecated 1.58.0
+    - gomnd # deprecated 1.58.0
+    - exportloopref # deprecated 1.60.2
+    # unwanted
+    - cyclop
+    - depguard
     - dupl
-    - wsl
-    - gomnd
-    - goerr113 
-    - nestif
+    - err113
     - exhaustruct
-    - paralleltest
-    - gci
-    - cyclop
     - forcetypeassert
-    - tagliatelle
+    - funlen
     - gomoddirectives
+    - mnd
+    - nestif
+    - paralleltest
+    - tagliatelle
     - varnamelen
-    - depguard
+    - wsl
+
 linters-settings:
+  gci:
+    custom-order: true
+    sections:
+      - standard
+      - localModule
+      - default
   govet:
     enable-all: true
     disable:
@@ -39,4 +41,3 @@ linters-settings:
   gocyclo:
     # minimal code complexity to report, 30 by default
     min-complexity: 30
-

.goreleaser.yml

@@ -1,3 +1,4 @@
+version: 2
 before:
   hooks:
     - go mod tidy
@@ -40,4 +41,4 @@ signs:
 release:
   draft: true
 changelog:
-  skip: true
+  disable: true

CHANGELOG.md

@@ -1,5 +1,32 @@
 # changelog
 
+## 0.14.0 (November 08, 2024)
+
+BREAKING CHANGES:
+
+* remove compatibility with API version 3.3 and 3.6
+* remove resource `wallix-bastion_ldapdomain`
+* remove resource `wallix-bastion_ldapmapping`
+* default provider api_version argument is now `v3.8`
+* user statement is now mandatory
+
+FEATURES:
+
+* add compatibility with API version 3.12
+
+ENHANCEMENTS:
+
+* **resource/wallix-bastion_application**:
+  * add `category`, `application_url`, `browser`, `browser_version` arguments to be able to add `jumphost` application (not tested)
+  * `paths` and `target` is now only required when `category` = `standard`
+* **resource/wallix-bastion_connection_policy**: add `type` argument with default value as `protocol` value
+* **resource/wallix-bastion_externalauth_saml**: add `claim_customization` block argument
+
+## 0.13.0 (March 08, 2024)
+
+* build(deps): bump github.com/cloudflare/circl from 1.3.3 to 1.3.7 by @dependabot in https://github.com/wallix/terraform-provider-wallix-bastion/pull/13
+* added http basic authentication by @moulip in https://github.com/wallix/terraform-provider-wallix-bastion/pull/15
+
 ## 0.12.2 (January 03, 2024)
 
 * Corrected and added documentation example

README.md

@@ -6,7 +6,7 @@
 
 ### In addition to develop
 
-- [Go](https://golang.org/doc/install) `v1.20` or `v1.21`
+- [Go](https://golang.org/doc/install) `v1.22` or `v1.23`
 
 ### Special Thanks
 

bastion/data_source_configoption.go

@@ -5,12 +5,12 @@ import (
 	"encoding/json"
 	"fmt"
 	"net/http"
+	"slices"
+	"strings"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
-	balt "github.com/jeremmfr/go-utils/basicalter"
-	bchk "github.com/jeremmfr/go-utils/basiccheck"
 )
 
 type jsonConfigOptions struct {
@@ -57,7 +57,7 @@ func dataSourceConfigoption() *schema.Resource {
 }
 
 func dataSourceConfigoptionVersionCheck(version string) error {
-	if bchk.InSlice(version, defaultVersionsValid()) {
+	if slices.Contains(defaultVersionsValid(), version) {
 		return nil
 	}
 
@@ -94,7 +94,7 @@ func readConfigoption(
 		for _, v := range optionsList {
 			params += v.(string) + ","
 		}
-		_ = balt.CutPrefixInString(&params, ",")
+		params = strings.TrimSuffix(params, ",")
 	}
 	body, code, err := c.newRequest(ctx, "/configoptions/"+d.Get("config_id").(string)+params, http.MethodGet, nil)
 	if err != nil {

bastion/data_source_configoption_test.go

@@ -2,7 +2,7 @@ package bastion_test
 
 import (
 	"encoding/json"
-	"fmt"
+	"errors"
 	"testing"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
@@ -30,7 +30,7 @@ func TestAccDataSourceConfigoption_basic(t *testing.T) {
 								return err
 							}
 							if jsonData["name"].(string) != "one_time_password_ttl" {
-								return fmt.Errorf("can't find name=one_time_password_ttl in json")
+								return errors.New("can't find name=one_time_password_ttl in json")
 							}
 
 							return nil

bastion/data_source_domain.go

@@ -3,10 +3,10 @@ package bastion
 import (
 	"context"
 	"fmt"
+	"slices"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-	bchk "github.com/jeremmfr/go-utils/basiccheck"
 )
 
 func dataSourceDomain() *schema.Resource {
@@ -54,7 +54,7 @@ func dataSourceDomain() *schema.Resource {
 }
 
 func dataSourceDomainVersionCheck(version string) error {
-	if bchk.InSlice(version, defaultVersionsValid()) {
+	if slices.Contains(defaultVersionsValid(), version) {
 		return nil
 	}
 

bastion/data_source_local_password_policy.go

@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 	"net/http"
+	"slices"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-	bchk "github.com/jeremmfr/go-utils/basiccheck"
 )
 
 type jsonLocalPasswordPolicy struct {
@@ -97,7 +97,7 @@ func dataSourceLocalPasswordPolicy() *schema.Resource {
 }
 
 func dataSourceLocalPasswordPolicyVersionCheck(version string) error {
-	if bchk.InSlice(version, defaultVersionsValid()) {
+	if slices.Contains(defaultVersionsValid(), version) {
 		return nil
 	}