Merge branch 'develop'

Author: axway

.github/workflows/integration-test.yml

@@ -3,11 +3,11 @@ name: APIM CLI Integration Tests
 on: [push]
 
 env:
-  CASSANDRA_DOCKER_IMAGE: cassandra:4.1.6
-  APIM_DOCKER_IMAGE: docker.repository.axway.com/apigateway-docker-prod/7.7/gateway:7.7.0.20240830-4-BN0145-ubi9
-  CACHE_FILE_APIM: api-manager_7_7_20240830.cache.tar
-  CACHE_FILE_CASSANDRA: cassandra_4_1_6.cache.tar
-  FED_FILE: swagger-promote-7.7-20240830.fed
+  CASSANDRA_DOCKER_IMAGE: cassandra:4.1.9
+  APIM_DOCKER_IMAGE: docker.repository.axway.com/apigateway-docker-prod/7.7/gateway:7.7.0.20250228-3-BN0214-ubi9
+  CACHE_FILE_APIM: api-manager_7_7_20250228.cache.tar
+  CACHE_FILE_CASSANDRA: cassandra_4_1_9.cache.tar
+  FED_FILE: swagger-promote-7.7-20250228.fed
   LOG_LEVEL: debug
 
 jobs:

CHANGELOG.md

@@ -5,6 +5,17 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
 
+# [1.14.11]  2025-08-25
+
+### Fixed
+- Exporting multiple APIs with the same path overwrites configuration files in the same target directory (See issue [#534](https://github.com/Axway-API-Management-Plus/apim-cli/issues/545))
+- apim api get doesn't give the list of APIs (See issue [#534](https://github.com/Axway-API-Management-Plus/apim-cli/issues/543))
+
+### Added
+- Full export API in JSON file (See issue [#534](https://github.com/Axway-API-Management-Plus/apim-cli/issues/559))
+- Support may 2025 APIM release (See issue [#534](https://github.com/Axway-API-Management-Plus/apim-cli/issues/562))
+- Support OpenAPI 3.1.x (See issue [#534](https://github.com/Axway-API-Management-Plus/apim-cli/issues/537))
+
 # [1.14.11]  2025-02-26
 
 ### Fixed

modules/apim-adapter/src/main/java/com/axway/apim/adapter/APIManagerAdapter.java

@@ -4,10 +4,7 @@
 import com.axway.apim.adapter.client.apps.APIMgrAppsAdapter;
 import com.axway.apim.adapter.custom.properties.APIManagerCustomPropertiesAdapter;
 import com.axway.apim.adapter.user.APIManagerUserAdapter;
-import com.axway.apim.api.model.CaCert;
-import com.axway.apim.api.model.Config;
-import com.axway.apim.api.model.Image;
-import com.axway.apim.api.model.User;
+import com.axway.apim.api.model.*;
 import com.axway.apim.api.model.apps.ClientApplication;
 import com.axway.apim.lib.APIMCLICacheManager;
 import com.axway.apim.lib.CoreParameters;
@@ -232,19 +229,42 @@ public void loginToAPIManager() throws AppException {
             }
             User user = getCurrentUser();
             String role = getHigherRole(user);
-            if (role.equals(ADMIN)) {
-                hasAdminAccount = true;
-                // Also register this client as an Admin-Client
-            } else if (role.equals(OADMIN)) {
-                usingOrgAdmin = true;
-            }
+            assignRoles(role);
         } catch (IOException | URISyntaxException e) {
             throw new AppException("Can't login to API-Manager", ErrorCode.API_MANAGER_COMMUNICATION, e);
         } catch (InterruptedException e) {
             Thread.currentThread().interrupt();
         }
     }
 
+    public void assignRoles(String role) {
+        if (role.equals(ADMIN)) {
+            hasAdminAccount = true;
+            // Also register this client as an Admin-Client
+        } else if (role.equals(OADMIN)) {
+            usingOrgAdmin = true;
+        }
+    }
+
+    public void switchOrgAndRole(User user, String targetOrgName) {
+        Map<String, String> organizationsIdToName = user.getOrgs2Name();
+        if (organizationsIdToName == null)
+            return;
+
+        for (Map.Entry<String,String> entry : organizationsIdToName.entrySet()) {
+            String orgName = entry.getValue();
+            if (orgName.equals(targetOrgName)) {
+                String role = user.getOrgs2Role().get(entry.getKey());
+                // Reset roles
+                hasAdminAccount = false;
+                usingOrgAdmin = false;
+                // Assign roles
+                assignRoles(role);
+            }
+        }
+
+    }
+
     public String getHigherRole(User user) {
         String role = user.getRole();
         Map<String, String> organizations2Role = user.getOrgs2Role();

modules/apim-adapter/src/main/java/com/axway/apim/adapter/apis/APIFilter.java

@@ -67,6 +67,7 @@ public enum FILTER_OP {
     private List<String> customProperties;
     private boolean deprecated;
     private boolean retired;
+    private String organizationId; // To support multi org
 
     private METHOD_TRANSLATION translateMethodMode = METHOD_TRANSLATION.NONE;
 
@@ -923,4 +924,14 @@ private static boolean isPolicyUsed(API api, String policyName) {
         }
         return false;
     }
+
+    public String getOrganizationId() {
+        return organizationId;
+    }
+
+    public void setOrganizationId(String organizationId) {
+        this.organizationId = organizationId;
+        if (organizationId == null) return;
+        filters.add(new BasicNameValuePair("organizationId", organizationId));
+    }
 }

modules/apim-adapter/src/main/java/com/axway/apim/adapter/apis/APIManagerAPIAdapter.java

@@ -13,6 +13,7 @@
 import com.axway.apim.api.specification.APISpecification.APISpecType;
 import com.axway.apim.api.specification.APISpecificationFactory;
 import com.axway.apim.lib.CoreParameters;
+import com.axway.apim.lib.EnvironmentProperties;
 import com.axway.apim.lib.error.AppException;
 import com.axway.apim.lib.error.ErrorCode;
 import com.axway.apim.lib.utils.Constants;
@@ -104,8 +105,9 @@ public List<API> getAPIs(APIFilter filter, boolean logProgress) throws AppExcept
                 addImageFromAPIM(api, filter.isIncludeImage());
                 addRemoteHost(api, filter.isIncludeRemoteHost());
                 addMethods(api, filter.isIncludeMethods());
-                if (logProgress && apis.size() > 5)
+                if (logProgress && apis.size() > 5 && !EnvironmentProperties.PRINT_CONFIG_CONSOLE) {
                     Utils.progressPercentage(i, apis.size(), "Loading details of " + apis.size() + " APIs");
+                }
             }
             Utils.addCustomPropertiesForEntity(apis, this.apiManagerResponse.get(filter), filter);
             if (logProgress && apis.size() > 5) Console.print("\n");
@@ -223,6 +225,7 @@ public String getVersion(APIFilter apiFilter) {
     }
 
     private List<API> filterAPIs(APIFilter filter) throws IOException {
+        LOG.debug("Filtering APIs based on filter path: {}", filter);
         List<API> apis = mapper.readValue(this.apiManagerResponse.get(filter), new TypeReference<>() {
         });
         apis.removeIf(filter::filter);
@@ -616,16 +619,16 @@ public String[] getSerializeAllExcept() throws AppException {
         } else {
             serializeAllExcept = new String[]{"queryStringPassThrough", "apiDefinition", "certFile", "useForInbound", "useForOutbound", "organization", "applications", "image", "clientOrganizations", "applicationQuota", "systemQuota", "backendBasepath", "remoteHost"};
         }
-        LOG.debug("serializeAllExcept={}",  Arrays.asList(serializeAllExcept));
+        LOG.debug("serializeAllExcept={}", Arrays.asList(serializeAllExcept));
         return serializeAllExcept;
     }
 
     private boolean isAPIManagerVersionGreaterThan7720220530(String apiManagerVersion) {
         try {
             apiManagerVersion = apiManagerVersion.replace("7.7.", "");
-            LOG.debug("apiManagerVersion for conversion: {}",apiManagerVersion);
+            LOG.debug("apiManagerVersion for conversion: {}", apiManagerVersion);
             return (Integer.parseInt(apiManagerVersion) >= 20220530);
-        } catch (NumberFormatException nfe){
+        } catch (NumberFormatException nfe) {
             LOG.warn("Failed to convert API Manager version to integer: {}, returning false", apiManagerVersion);
             return false;
         }