feat: add support for new service version

Signed-off-by: Lídia Tarcza <100163235+diatrcz@users.noreply.github.com>

Author: diatrcz

src/main/java/com/ibm/cloud/sdk/core/security/AuthenticatorBase.java

@@ -37,6 +37,7 @@ public class AuthenticatorBase {
       "iamAccountId must be specified if and only if iamProfileName is specified";
   public static final String ERRORMSG_PROP_INVALID_BOOL =
           "The %s property must be a valid boolean but was '%s'. Valid values are 'true' and 'false'.";
+  public static final String ERRORMSG_INVALID_SERVICE_VERSION = "Invalid service version. Supported values are: %s";
 
   /**
    * Returns a "Basic" Authorization header value for the specified username and password.

src/main/java/com/ibm/cloud/sdk/core/security/VpcInstanceAuthenticator.java

@@ -13,6 +13,8 @@
 
 package com.ibm.cloud.sdk.core.security;
 
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Map;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -42,18 +44,22 @@ public class VpcInstanceAuthenticator
   private static final String defaultIMSEndpoint = "http://169.254.169.254";
   private static final String operationPathCreateAccessToken = "/instance_identity/v1/token";
   private static final String operationPathCreateIamToken = "/instance_identity/v1/iam_token";
+  private static final String operationPathCreateAccessToken2 = "/identity/v1/token";
+  private static final String operationPathCreateIamToken2 = "/identity/v1/iam_tokens";
   private static final String metadataFlavor = "ibm";
   private static final String metadataServiceVersion = "2022-03-01";
   private static final int instanceIdentityTokenLifetime = 300;
 
+  private ArrayList<String> defaultServiceSupportedVersions = new ArrayList<>(List.of("2022-03-01", "2025-08-26"));
+
+
   // Properties specific to a VpcInstanceAuthenticator.
   private String iamProfileCrn;
   private String iamProfileId;
   private String url;
   private String serviceVersion;
   private int tokenLifetime;
 
-
   /**
    * This Builder class is used to construct IamAuthenticator instances.
    */
@@ -204,6 +210,11 @@ public void validate() {
       throw new IllegalArgumentException(
           String.format(ERRORMSG_ATMOST_ONE_PROP_ERROR, "iamProfileCrn", "iamProfileId"));
     }
+
+    if (!this.defaultServiceSupportedVersions.contains(this.serviceVersion)) {
+      throw new IllegalArgumentException(
+        String.format(ERRORMSG_INVALID_SERVICE_VERSION, this.defaultServiceSupportedVersions));
+    }
   }
 
   /**
@@ -314,7 +325,7 @@ private String getImsEndpoint() {
    */
   public String getCreateAccessTokenPath() {
     if (this.serviceVersion.equals("2025-08-26")) {
-      return "/identity/v1/token";
+      return operationPathCreateAccessToken2;
     }
     return operationPathCreateAccessToken;
   }
@@ -326,7 +337,7 @@ public String getCreateAccessTokenPath() {
    */
   public String getCreateIamTokenPath() {
     if (this.serviceVersion.equals("2025-08-26")) {
-      return "/identity/v1/iam_tokens";
+      return operationPathCreateIamToken2;
     }
     return operationPathCreateIamToken;
   }
@@ -400,7 +411,7 @@ public IamToken retrieveIamAccessToken(String instanceIdentityToken) {
           RequestBuilder.post(RequestBuilder.resolveRequestUrl(getImsEndpoint(), this.getCreateIamTokenPath()));
 
       // Set the params and request body.
-      builder.query("version", this.getServiceVersion());
+      builder.query("version", this.serviceVersion);
       builder.header(HttpHeaders.ACCEPT, HttpMediaType.APPLICATION_JSON);
       builder.header(HttpHeaders.CONTENT_TYPE, HttpMediaType.APPLICATION_JSON);
       builder.header(HttpHeaders.AUTHORIZATION, "Bearer " + instanceIdentityToken);

src/test/java/com/ibm/cloud/sdk/core/test/security/VpcInstanceAuthenticatorTest.java

@@ -55,6 +55,11 @@ public class VpcInstanceAuthenticatorTest extends BaseServiceUnitTest {
   private static final String mockIamProfileCrn = "crn:iam-profile:123";
   private static final String mockIamProfileId = "iam-id-123";
 
+  private static final String operationPathCreateAccessToken = "/instance_identity/v1/token";
+  private static final String operationPathCreateIamToken = "/instance_identity/v1/iam_token";
+  private static final String operationPathCreateAccessToken2 = "/identity/v1/token";
+  private static final String operationPathCreateIamToken2 = "/identity/v1/iam_tokens";
+
   private static final String mockErrorResponseJson1 =
       "{\"errors\": [{\"message\": \"Your create_access_token request was bad.\", \"code\": \"invalid_parameter_value\"}]}";
   private static final String mockErrorResponseJson2 =
@@ -633,8 +638,8 @@ public void testVpcAuthServiceVersionDefaults() {
     assertEquals(authenticator.getServiceVersion(), "2022-03-01");
     assertEquals(authenticator.getTokenLifetime(), 300);
 
-    assertEquals("/instance_identity/v1/token", authenticator.getCreateAccessTokenPath());
-    assertEquals("/instance_identity/v1/iam_token", authenticator.getCreateIamTokenPath());
+    assertEquals(operationPathCreateAccessToken, authenticator.getCreateAccessTokenPath());
+    assertEquals(operationPathCreateIamToken, authenticator.getCreateIamTokenPath());
   }
 
   @Test
@@ -648,8 +653,8 @@ public void testVpcAuthServiceVersionBuilder() {
     assertEquals(authenticator.getServiceVersion(), "2025-08-26");
     assertEquals(authenticator.getTokenLifetime(), 600);
 
-    assertEquals("/identity/v1/token", authenticator.getCreateAccessTokenPath());
-    assertEquals("/identity/v1/iam_tokens", authenticator.getCreateIamTokenPath());
+    assertEquals(operationPathCreateAccessToken2, authenticator.getCreateAccessTokenPath());
+    assertEquals(operationPathCreateIamToken2, authenticator.getCreateIamTokenPath());
   }
 
   @Test
@@ -662,8 +667,8 @@ public void testVpcAuthServiceVersionFromMap() {
 
     assertEquals(authenticator.getServiceVersion(), "2025-08-26");
 
-    assertEquals("/identity/v1/token", authenticator.getCreateAccessTokenPath());
-    assertEquals("/identity/v1/iam_tokens", authenticator.getCreateIamTokenPath());
+    assertEquals(operationPathCreateAccessToken2, authenticator.getCreateAccessTokenPath());
+    assertEquals(operationPathCreateIamToken2, authenticator.getCreateIamTokenPath());
   }
 
   @Test
@@ -675,19 +680,19 @@ public void testVpcAuthServiceVersionOldVersion() {
 
     assertEquals(authenticator.getServiceVersion(), "2022-03-01");
 
-    assertEquals("/instance_identity/v1/token", authenticator.getCreateAccessTokenPath());
-    assertEquals("/instance_identity/v1/iam_token", authenticator.getCreateIamTokenPath());
+    assertEquals(operationPathCreateAccessToken, authenticator.getCreateAccessTokenPath());
+    assertEquals(operationPathCreateIamToken, authenticator.getCreateIamTokenPath());
   }
 
   @Test
   public void testVpcAuthServiceVersionCustomVersion() {
-    VpcInstanceAuthenticator authenticator = new VpcInstanceAuthenticator.Builder()
-        .serviceVersion("2024-01-01")
-        .build();
-    assertNotNull(authenticator);
-
-    assertEquals(authenticator.getServiceVersion(), "2024-01-01");
-    assertEquals("/instance_identity/v1/token", authenticator.getCreateAccessTokenPath());
-    assertEquals("/instance_identity/v1/iam_token", authenticator.getCreateIamTokenPath());
+    try {
+      new VpcInstanceAuthenticator.Builder()
+          .serviceVersion("2024-01-01")
+          .build();
+      fail("Expected build() to throw an exception!");
+    } catch (IllegalArgumentException e) {
+      assertEquals(e.getMessage(), "Invalid service version. Supported values are: [2022-03-01, 2025-08-26]");
+    }
   }
 }