Adjust resource manager to use CoreConfiguration for service account

marceljk · marceljk · commit 7e60121bb883 · 2025-08-01T17:36:54.000+02:00
diff --git a/core/src/main/java/cloud/stackit/sdk/core/KeyFlowAuthenticator.java b/core/src/main/java/cloud/stackit/sdk/core/KeyFlowAuthenticator.java
@@ -1,6 +1,6 @@
 package cloud.stackit.sdk.core;
 
-import cloud.stackit.sdk.core.config.Configuration;
+import cloud.stackit.sdk.core.config.CoreConfiguration;
 import cloud.stackit.sdk.core.model.ServiceAccountKey;
 import com.auth0.jwt.JWT;
 import com.auth0.jwt.algorithms.Algorithm;
@@ -66,7 +66,7 @@ public String getAccessToken() {
      * @throws InvalidKeySpecException Throws, when the private key in the service account can not be parsed
      * @throws IOException Throws, when on unexpected responses from the key flow
      */
-    public KeyFlowAuthenticator(Configuration cfg, ServiceAccountKey saKey) throws InvalidKeySpecException, IOException {
+    public KeyFlowAuthenticator(CoreConfiguration cfg, ServiceAccountKey saKey) throws InvalidKeySpecException, IOException {
         this.saKey = saKey;
         this.gson = new Gson();
         this.httpClient = new OkHttpClient.Builder()
diff --git a/core/src/main/java/cloud/stackit/sdk/core/auth/SetupAuth.java b/core/src/main/java/cloud/stackit/sdk/core/auth/SetupAuth.java
@@ -1,7 +1,7 @@
 package cloud.stackit.sdk.core.auth;
 
 import cloud.stackit.sdk.core.KeyFlowAuthenticator;
-import cloud.stackit.sdk.core.config.Configuration;
+import cloud.stackit.sdk.core.config.CoreConfiguration;
 import cloud.stackit.sdk.core.config.EnvironmentVariables;
 import cloud.stackit.sdk.core.KeyFlowInterceptor;
 import cloud.stackit.sdk.core.model.ServiceAccountKey;
@@ -37,7 +37,7 @@ public class SetupAuth {
      * @throws InvalidKeySpecException when the private key can not be parsed
      */
     public SetupAuth() throws IOException, InvalidKeySpecException, CredentialNotFoundException {
-        this(new Configuration.Builder().build());
+        this(new CoreConfiguration.Builder().build());
     }
 
     /**
@@ -47,9 +47,9 @@ public SetupAuth() throws IOException, InvalidKeySpecException, CredentialNotFou
      * @throws CredentialNotFoundException when no configuration is set or can be found
      * @throws InvalidKeySpecException when the private key can not be parsed
      */
-    public SetupAuth(Configuration cfg) throws IOException, CredentialNotFoundException, InvalidKeySpecException {
+    public SetupAuth(CoreConfiguration cfg) throws IOException, CredentialNotFoundException, InvalidKeySpecException {
         if (cfg == null) {
-            cfg = new Configuration.Builder().build();
+            cfg = new CoreConfiguration.Builder().build();
         }
 
         ServiceAccountKey saKey = setupKeyFlow(cfg);
@@ -93,7 +93,7 @@ public Interceptor getAuthHandler() {
      * @throws CredentialNotFoundException throws error when no service account key or private key can be found
      * @throws IOException throws an error if a file can not be found
      */
-    private ServiceAccountKey setupKeyFlow(Configuration cfg) throws CredentialNotFoundException, IOException {
+    private ServiceAccountKey setupKeyFlow(CoreConfiguration cfg) throws CredentialNotFoundException, IOException {
         // Explicit config in code
         if (cfg.getServiceAccountKey() != null && !cfg.getServiceAccountKey().trim().isEmpty()) {
             ServiceAccountKey saKey = ServiceAccountKey.loadFromJson(cfg.getServiceAccountKey());
@@ -135,7 +135,7 @@ private ServiceAccountKey setupKeyFlow(Configuration cfg) throws CredentialNotFo
         }
     }
 
-    private void loadPrivateKey(Configuration cfg, ServiceAccountKey saKey) throws CredentialNotFoundException {
+    private void loadPrivateKey(CoreConfiguration cfg, ServiceAccountKey saKey) throws CredentialNotFoundException {
         if (!saKey.getCredentials().isPrivateKeySet()) {
             try {
              String privateKey = getPrivateKey(cfg);
@@ -178,7 +178,7 @@ private void loadPrivateKey(Configuration cfg, ServiceAccountKey saKey) throws C
      * @throws CredentialNotFoundException throws if no private key could be found
      * @throws IOException throws if the provided path can not be found or the file within the pathKey can not be found
      */
-    private String getPrivateKey(Configuration cfg) throws CredentialNotFoundException, IOException {
+    private String getPrivateKey(CoreConfiguration cfg) throws CredentialNotFoundException, IOException {
         // Explicit code config
         // Set private key
         if (cfg.getPrivateKey() != null && !cfg.getPrivateKey().trim().isEmpty()) {
diff --git a/core/src/main/java/cloud/stackit/sdk/core/config/CoreConfiguration.java b/core/src/main/java/cloud/stackit/sdk/core/config/CoreConfiguration.java
@@ -2,7 +2,7 @@
 
 import java.util.Map;
 
-public class Configuration {
+public class CoreConfiguration {
     private final Map<String, String> defaultHeader;
     private final String serviceAccountKey;
     private final String serviceAccountKeyPath;
@@ -13,7 +13,7 @@ public class Configuration {
     private final String tokenCustomUrl;
     private final Long tokenExpirationLeeway;
 
-    Configuration(Builder builder) {
+    CoreConfiguration(Builder builder) {
         this.defaultHeader = builder.defaultHeader;
         this.serviceAccountKey = builder.serviceAccountKey;
         this.serviceAccountKeyPath = builder.serviceAccountKeyPath;
@@ -117,8 +117,8 @@ public Builder tokenExpirationLeeway(Long tokenExpirationLeeway) {
             return this;
         }
         
-        public Configuration build() {
-            return new Configuration(this);
+        public CoreConfiguration build() {
+            return new CoreConfiguration(this);
         }
     }
 }
diff --git a/services/resourcemanager/src/main/java/cloud/stackit/sdk/resourcemanager/ApiClient.java b/services/resourcemanager/src/main/java/cloud/stackit/sdk/resourcemanager/ApiClient.java
@@ -118,9 +118,25 @@ public ApiClient(OkHttpClient client) {
 		authentications = Collections.unmodifiableMap(authentications);
 	}
 
-	protected void initHttpClient() {
-		initHttpClient(Collections.<Interceptor>emptyList());
-	}
+	public ApiClient(CoreConfiguration config) throws IOException, InvalidKeySpecException, CredentialNotFoundException {
+        init();
+
+        if (config.getCustomEndpoint() != null && !config.getCustomEndpoint().trim().isEmpty()) {
+            basePath = config.getCustomEndpoint();
+        }
+        if (config.getDefaultHeader() != null) {
+            defaultHeaderMap = config.getDefaultHeader();
+        }
+        SetupAuth auth;
+        auth = new SetupAuth(config);
+        List<Interceptor> interceptors = new LinkedList<>();
+        interceptors.add(auth.getAuthHandler());
+        initHttpClient(interceptors);
+    }
+
+    protected void initHttpClient() {
+        initHttpClient(Collections.<Interceptor>emptyList());
+    }
 
 	protected void initHttpClient(List<Interceptor> interceptors) {
 		OkHttpClient.Builder builder = new OkHttpClient.Builder();
diff --git a/services/resourcemanager/src/main/java/cloud/stackit/sdk/resourcemanager/api/DefaultApi.java b/services/resourcemanager/src/main/java/cloud/stackit/sdk/resourcemanager/api/DefaultApi.java
@@ -12,6 +12,7 @@
 
 package cloud.stackit.sdk.resourcemanager.api;
 
+import cloud.stackit.sdk.core.config.CoreConfiguration;
 import cloud.stackit.sdk.resourcemanager.ApiCallback;
 import cloud.stackit.sdk.resourcemanager.ApiClient;
 import cloud.stackit.sdk.resourcemanager.ApiException;
@@ -26,12 +27,17 @@
 import cloud.stackit.sdk.resourcemanager.model.ListFoldersResponse;
 import cloud.stackit.sdk.resourcemanager.model.ListOrganizationsResponse;
 import cloud.stackit.sdk.resourcemanager.model.ListProjectsResponse;
+
+import java.security.spec.InvalidKeySpecException;
+import java.time.OffsetDateTime;
 import cloud.stackit.sdk.resourcemanager.model.OrganizationResponse;
 import cloud.stackit.sdk.resourcemanager.model.PartialUpdateFolderPayload;
 import cloud.stackit.sdk.resourcemanager.model.PartialUpdateOrganizationPayload;
 import cloud.stackit.sdk.resourcemanager.model.PartialUpdateProjectPayload;
 import cloud.stackit.sdk.resourcemanager.model.Project;
 import com.google.gson.reflect.TypeToken;
+
+import javax.security.auth.login.CredentialNotFoundException;
 import java.lang.reflect.Type;
 import java.math.BigDecimal;
 import java.time.OffsetDateTime;
@@ -53,9 +59,16 @@ public DefaultApi(ApiClient apiClient) {
 		this.localVarApiClient = apiClient;
 	}
 
-	public ApiClient getApiClient() {
-		return localVarApiClient;
-	}
+	public DefaultApi(CoreConfiguration config) throws IOException, InvalidKeySpecException, CredentialNotFoundException {
+        if (config.getCustomEndpoint() != null && !config.getCustomEndpoint().trim().isEmpty()) {
+            localCustomBaseUrl = config.getCustomEndpoint();
+        }
+        this.localVarApiClient = new ApiClient(config);
+    }
+
+    public ApiClient getApiClient() {
+        return localVarApiClient;
+    }
 
 	public void setApiClient(ApiClient apiClient) {
 		this.localVarApiClient = apiClient;
diff --git a/services/resourcemanager/src/main/java/cloud/stackit/sdk/resourcemanager/main.java b/services/resourcemanager/src/main/java/cloud/stackit/sdk/resourcemanager/main.java
@@ -0,0 +1,26 @@
+package cloud.stackit.sdk.resourcemanager;
+
+import cloud.stackit.sdk.core.config.CoreConfiguration;
+import cloud.stackit.sdk.resourcemanager.api.DefaultApi;
+import cloud.stackit.sdk.resourcemanager.model.ListOrganizationsResponse;
+
+import javax.security.auth.login.CredentialNotFoundException;
+import java.io.IOException;
+import java.security.spec.InvalidKeySpecException;
+
+public class main {
+    public static void main(String[] args) {
+        String SERVICE_ACCOUNT_KEY_PATH = "/path/to/your/sa/key.json";
+        String SERIVCE_ACCOUNT_MAIL = "name-1234@sa.stackit.cloud";
+
+        CoreConfiguration config = new CoreConfiguration
+                .Builder()
+                .serviceAccountKeyPath(SERVICE_ACCOUNT_KEY_PATH)
+                .build();
+        DefaultApi api = new DefaultApi(config);
+
+        ListOrganizationsResponse response = api.listOrganizations(null, SERIVCE_ACCOUNT_MAIL, null, null, null);
+
+        System.out.println(response);
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`
`3`	`3`	`import java.util.Map;`
`4`	`4`
`5`		`-public class Configuration {`
	`5`	`+public class CoreConfiguration {`
`6`	`6`	`private final Map<String, String> defaultHeader;`
`7`	`7`	`private final String serviceAccountKey;`
`8`	`8`	`private final String serviceAccountKeyPath;`
`@@ -13,7 +13,7 @@ public class Configuration {`
`13`	`13`	`private final String tokenCustomUrl;`
`14`	`14`	`private final Long tokenExpirationLeeway;`
`15`	`15`
`16`		`- Configuration(Builder builder) {`
	`16`	`+ CoreConfiguration(Builder builder) {`
`17`	`17`	`this.defaultHeader = builder.defaultHeader;`
`18`	`18`	`this.serviceAccountKey = builder.serviceAccountKey;`
`19`	`19`	`this.serviceAccountKeyPath = builder.serviceAccountKeyPath;`
`@@ -117,8 +117,8 @@ public Builder tokenExpirationLeeway(Long tokenExpirationLeeway) {`
`117`	`117`	`return this;`
`118`	`118`	`}`
`119`	`119`
`120`		`- public Configuration build() {`
`121`		`- return new Configuration(this);`
	`120`	`+ public CoreConfiguration build() {`
	`121`	`+ return new CoreConfiguration(this);`
`122`	`122`	`}`
`123`	`123`	`}`
`124`	`124`	`}`