From c4a5ee7b3eb5c99ab8cda4e46c74578d099a8f48 Mon Sep 17 00:00:00 2001
From: Maikel Poot <maikel.poot@topicus.nl>
Date: Fri, 28 Jun 2024 12:11:44 +0200
Subject: [PATCH] chore: Vaults and groups always uses latest as contract id
 and release of v1.3.5

---
 CHANGELOG.md |  5 +++++
 go.mod       |  1 +
 keyhub.go    | 16 ++++++++--------
 version.go   |  1 +
 4 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4f8ce31..11f094a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+
+## [1.3.5] - 2024-06-25
+### Changed
+- Issue # : Vaults and groups always uses latest as contract id
+
 ## [1.3.4] - 2024-06-25
 ### Fixed
 - Issue # : Fix incorrect check for no supported versions
diff --git a/go.mod b/go.mod
index cf2593f..3dafc01 100644
--- a/go.mod
+++ b/go.mod
@@ -6,6 +6,7 @@ retract (
 	v1.3.1
 	v1.3.2
 	v1.3.3
+	v1.3.4
 )
 
 
diff --git a/keyhub.go b/keyhub.go
index c385902..98cd6de 100644
--- a/keyhub.go
+++ b/keyhub.go
@@ -77,7 +77,7 @@ func NewClient(httpClient *http.Client, issuer string, clientID string, clientSe
 
 	var err error
 	var baseVersionedSupported bool
-	var newerVersionedSupported bool
+	var latestVersionedSupported bool
 
 	base := sling.New().Client(httpClient).Base(issuer)
 
@@ -97,14 +97,14 @@ func NewClient(httpClient *http.Client, issuer string, clientID string, clientSe
 	}
 
 	// Create sling for contract version 71
-	newerVersionedSling := base.New()
-	newerVersionedSupported, err = versionService.CheckAndUpdateVersionedSling(71, newerVersionedSling)
+	latestVersionedSling := base.New()
+	latestVersionedSupported, err = versionService.CheckAndUpdateVersionedSling(0, latestVersionedSling)
 	if err != nil {
 		newClient.VersionErrors = append(newClient.VersionErrors, err)
 	}
 
-	if !(baseVersionedSupported || newerVersionedSupported) {
-		return nil, fmt.Errorf("KeyHub %v does not support api contract versions 60 or 71", versionService.info.KeyhubVersion)
+	if !(baseVersionedSupported || latestVersionedSupported) {
+		return nil, fmt.Errorf("KeyHub %v does not support api contract versions 60 or Latest", versionService.info.KeyhubVersion)
 	}
 
 	ctx := oidc.ClientContext(context.Background(), httpClient)
@@ -138,9 +138,9 @@ func NewClient(httpClient *http.Client, issuer string, clientID string, clientSe
 		newClient.ServiceAccounts = NewServiceAccountService(oauth2Sling)
 	}
 
-	if newerVersionedSupported {
-		newClient.Groups = newGroupService(newerVersionedSling.New().Client(oauth2Client))
-		newClient.Vaults = newVaultService(newerVersionedSling.New().Client(vaultClient))
+	if latestVersionedSupported {
+		newClient.Groups = newGroupService(latestVersionedSling.New().Client(oauth2Client))
+		newClient.Vaults = newVaultService(latestVersionedSling.New().Client(vaultClient))
 	}
 
 	return newClient, nil
diff --git a/version.go b/version.go
index 250f48e..57bcd37 100644
--- a/version.go
+++ b/version.go
@@ -84,6 +84,7 @@ func (s *VersionService) CheckAndUpdateVersionedSling(version int, base *sling.S
 
 		headerVersion = fmt.Sprintf("%d", version)
 	} else {
+		isSupported = true
 		headerVersion = "latest"
 	}