Merge pull request #6 from Conjur-Enterprise/update-go

CONJSE-1842: Update to Go 1.22

CHANGELOG.md

@@ -6,6 +6,11 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+## [0.6.7] - 2024-03-25
+
+### Changed
+- Upgrade Go to 1.22 (CONJSE-1842)
+
 ## [0.6.6] - 2023-06-21
 ### Security
 - Updated golang.org/x/sys to v0.8.0 and golang.org/x/text to v0.9.0

Dockerfile.goreleaser

@@ -11,5 +11,9 @@ FROM goreleaser/goreleaser
 ADD build_ca_certificate /usr/local/share/ca-certificates/
 RUN update-ca-certificates
 
+# Use newer version of Go if version in go.mod is higher
+# than the one in the goreleaser image
+ENV GOTOOLCHAIN=auto
+
 # Workaround for CVE-2022-24765 when running git inside a docker container
 RUN git config --global --add safe.directory /terraform-provider-conjur

bin/build

@@ -38,7 +38,7 @@ build_and_package_binaries() {
   echo "> Building and packaging binaries"
   docker compose run --rm \
     --entrypoint goreleaser \
-    goreleaser release --rm-dist --skip-validate
+    goreleaser release --clean --skip=validate
 
   # Needed for testing stages
   goos='linux'  # uname -s | tr '[:upper:]' '[:lower:]'

demo/docker-compose.yml

@@ -1,4 +1,3 @@
-version: '3'
 services:
   conjur:
     image: registry.tld/conjur-appliance-cuke-master:5.0-stable
@@ -9,7 +8,7 @@ services:
       - "4443:443"
 
 #  cli:
-#    image: cyberark/conjur-cli:5
+#    image: cyberark/conjur-cli:8
 #    volumes:
 #      - .:/demo
 

docker-compose.enterprise.yml

@@ -1,4 +1,3 @@
-version: '3'
 services:
   conjur-server:
     image: registry.tld/conjur-appliance:5.0-stable

docker-compose.oss.yml

@@ -1,4 +1,3 @@
-version: '3'
 services:
   database:
     image: postgres:10

docker-compose.yml

@@ -1,4 +1,3 @@
-version: '3'
 services:
   client:
     image: cyberark/conjur-cli:5

go.mod

@@ -1,5 +1,7 @@
 module github.com/cyberark/terraform-provider-conjur
 
+go 1.22.1
+
 require (
 	github.com/cyberark/conjur-api-go v0.10.1
 	github.com/hashicorp/terraform-plugin-sdk/v2 v2.23.0
@@ -49,8 +51,6 @@ require (
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 )
 
-go 1.19
-
 // Security fixes to ensure we don't have old vulnerable packages in our
 // dependency tree. We're often not vulnerable, but removing them to ensure
 // we never end up selecting them when other dependencies change.