Merge branch 'develop' into test-with-7.7-20200130

Author: Chris Wiechmann

CHANGELOG.md

@@ -6,10 +6,25 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 ### Added
+- Search for APIs based on configured Inbound- and Outbound-Security (See issue [#86](https://github.com/Axway-API-Management-Plus/apim-cli/issues/86))
+- Added support for API-Manager Config/Alerts/Remote-Hosts (See issue [#68](https://github.com/Axway-API-Management-Plus/apim-cli/issues/68))
+- APIs now updated without Re-Creating them if possible (See issue [#95](https://github.com/Axway-API-Management-Plus/apim-cli/issues/95))
+
+### Fixed
+- Avoid NPE during API-Export if custom-properties config is inconsistent (See issue [#90](https://github.com/Axway-API-Management-Plus/apim-cli/issues/90))
+- Disabled applications not created as disabled (See issue [#89](https://github.com/Axway-API-Management-Plus/apim-cli/issues/89))
+- Support for special characters like an accent (See issue [#88](https://github.com/Axway-API-Management-Plus/apim-cli/issues/88))
+- Organizations now validated based on given stage (See issue [#58](https://github.com/Axway-API-Management-Plus/apim-cli/issues/58))
+- API-Import is now stopped if host and backendBasepath is missing (See issue [#53](https://github.com/Axway-API-Management-Plus/apim-cli/issues/53))
+
+## [1.2.3] 2020-09-24
+### Added
 - Search for APIs based on configured tags (See issue [#82](https://github.com/Axway-API-Management-Plus/apim-cli/issues/82))
 - Error handling improved if custom properties configuration is invalid (Switch or Select without configured options)
 - Added support to import application scopes (See PR [#77](https://github.com/Axway-API-Management-Plus/apim-cli/pull/77))
 - Leverage "com.axway.apimanager.api.model.disable.confidential.fields" option (See PR [#71](https://github.com/Axway-API-Management-Plus/apim-cli/pull/71))
+- Support for Stage-Config & Variable substitution for Orgs, Client-Apps and Users
+- Support to export & import API-Manager configuration
 
 ### Fixed
 - Changing an APIs fails due to a ClassCastException (See issue [#85](https://github.com/Axway-API-Management-Plus/apim-cli/issues/85))

README.md

@@ -20,8 +20,10 @@ The CLI is flexible and is extended with new functions via modules. These can be
 To get an overview about the groups just call `apim`:
 ```
 Available commands and options:
-apim app - Manage your applications
-apim api - Manage your APIs
+apim app             Manage your applications 
+apim org             Manage your organizations
+apim api             Manage your APIs 
+apim user            Manage your users 
 ```
 To get for instance a `wide` list of APIs on the stage: `prod` execute the following command:
 ```
@@ -51,12 +53,13 @@ The automated End-2-End test suite contains of __116__ different scenarios, whic
 
 | Version       | Branch               | Status | Comment | 
 | :---          | :---                 | :---:  | :--- |
-| 7.6.2 SP5     | develop  | [![Build Status](https://img.shields.io/travis/Axway-API-Management-Plus/apim-cli/develop)](https://travis-ci.org/Axway-API-Management-Plus/apim-cli/branches)||
-| 7.7.0 SP2     | test-with-7.7-SP2  | [![Build Status](https://img.shields.io/travis/Axway-API-Management-Plus/apim-cli/test-with-7.7-SP2)](https://travis-ci.org/Axway-API-Management-Plus/apim-cli/branches)||
-| 7.7-20200130    | test-with-7.7-20200130  | [![Build Status](https://img.shields.io/travis/Axway-API-Management-Plus/apim-cli/test-with-7.7-20200130)](https://travis-ci.org/Axway-API-Management-Plus/apim-cli/branches)||
-| 7.7-20200331    | test-with-7.7-20200331  | [![Build Status](https://img.shields.io/travis/Axway-API-Management-Plus/apim-cli/test-with-7.7-20200331)](https://travis-ci.org/Axway-API-Management-Plus/apim-cli/branches)||
-| 7.7-20200530    | test-with-7.7-20200530  | [![Build Status](https://img.shields.io/travis/Axway-API-Management-Plus/apim-cli/test-with-7.7-20200530)](https://travis-ci.org/Axway-API-Management-Plus/apim-cli/branches)||
-| 7.7-20200730    | test-with-7.7-20200730  | [![Build Status](https://img.shields.io/travis/Axway-API-Management-Plus/apim-cli/test-with-7.7-20200730)](https://travis-ci.org/Axway-API-Management-Plus/apim-cli/branches)||
+| 7.6.2 SP5     | develop  | [![Build Status](https://img.shields.io/travis/Axway-API-Management-Plus/apim-cli/develop)](https://travis-ci.com/Axway-API-Management-Plus/apim-cli/branches)||
+| 7.7.0 SP2     | test-with-7.7-SP2  | [![Build Status](https://img.shields.io/travis/Axway-API-Management-Plus/apim-cli/test-with-7.7-SP2)](https://travis-ci.comAxway-API-Management-Plus/apim-cli/branches)||
+| 7.7-20200130    | test-with-7.7-20200130  | [![Build Status](https://img.shields.io/travis/Axway-API-Management-Plus/apim-cli/test-with-7.7-20200130)](https://travis-ci.com/Axway-API-Management-Plus/apim-cli/branches)||
+| 7.7-20200331    | test-with-7.7-20200331  | [![Build Status](https://img.shields.io/travis/Axway-API-Management-Plus/apim-cli/test-with-7.7-20200331)](https://travis-ci.com/Axway-API-Management-Plus/apim-cli/branches)||
+| 7.7-20200530    | test-with-7.7-20200530  | [![Build Status](https://img.shields.io/travis/Axway-API-Management-Plus/apim-cli/test-with-7.7-20200530)](https://travis-ci.com/Axway-API-Management-Plus/apim-cli/branches)||
+| 7.7-20200730    | test-with-7.7-20200730  | [![Build Status](https://img.shields.io/travis/Axway-API-Management-Plus/apim-cli/test-with-7.7-20200730)](https://travis-ci.com/Axway-API-Management-Plus/apim-cli/branches)||
+| 7.7-20200930    | test-with-7.7-20200930  | [![Build Status](https://img.shields.io/travis/Axway-API-Management-Plus/apim-cli/test-with-7.7-20200930)](https://travis-ci.com/Axway-API-Management-Plus/apim-cli/branches)|Multi-Org is not yet supported|
 
 Version 7.5.3 is NOT supported. Version 7.6.2 SP3 is required.  
 

distribution/README.md

@@ -1,12 +1,12 @@
-# How to build a Swagger-Promote release package
+# How to build a APIM-CLI release package
 
 With that, Release-Package is created and Swagger-Promote-Core is deployed to Maven-Central.
 
 ### To create a new release use the following instructions:
 1. When the develop branch is stable and a new release should be created, merge everything from develop into master branch (e.g. using Pull-Request)  
 2. Checkout the master branch  
 3. Open the main project directory  
-`cd C:\workspaces\api-management\apimanager-swagger-promote`
+`cd C:\workspaces\apim-cli`
 4. Validate a clean state on master (no uncommited changes)  
 `git branch -avv`
 6. Prepare the release  
@@ -21,7 +21,7 @@ No need to run the tests, as they have been automatically executed already on Tr
 - Accept or change the proposed version numbers.  
 - The SCM-Release-Tag label should be the version number. E.g. `1.6.2`  
 Use the built Pre-Release from folder:  
-`apimanager-swagger-promote\modules\distribution\target`  
+`apim-cli\modules\distribution\target`  
 to perform some final tests.  
 If you are not happy with the actual build for any reason, you need to rollback the actual release prepare:
 `mvn release:rollback`  
@@ -42,8 +42,8 @@ Copy the generated checksum and insert it into the file: `tools\chocolateyinstal
 `choco pack`  
 Test the installation of this package:  
 `choco install axway-swagger-promote -s .`  
-Execute the Swagger-Promote as shown:  
-`api-import` or `api-export`  
+Execute the CLI as shown:  
+`apim api import` or `apim api get`  
 Finally push the package to Chocolatey:  
 `choco push --api-key <api-key-goes-here> axway-swagger-promote.1.6.2.nupkg`
 Lastly make sure to merge all changes from master branch back into develop  

distribution/assembly/dist-release.xml

@@ -17,6 +17,7 @@
         <include>com.github.axway-api-management-plus.apim-cli:apimcli-apps</include>
         <include>com.github.axway-api-management-plus.apim-cli:apimcli-organizations</include>
         <include>com.github.axway-api-management-plus.apim-cli:apimcli-users</include>
+		<include>com.github.axway-api-management-plus.apim-cli:apimcli-setup</include>
         <include>com.github.axway-api-management-plus.apim-cli:apimcli-tool</include>
       </includes>
       <binaries>

distribution/pom.xml

@@ -36,6 +36,10 @@
 			<groupId>com.github.axway-api-management-plus.apim-cli</groupId>
 			<artifactId>apimcli-users</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>com.github.axway-api-management-plus.apim-cli</groupId>
+			<artifactId>apimcli-setup</artifactId>
+		</dependency>
 	</dependencies>
 
 	<build>

modules/apim-adapter/assembly/conf/env.properties.sample

@@ -57,6 +57,10 @@ admin_password=changeme
 # API-Manager stays in a clean state. With that parameter you can turn off rollback if needed.
 # rollback=false
 
+# If an API is given with key remotehost by default the CLI validates this remote hosts exists. 
+# Use this toggle to turn off this validation.
+# validateRemoteHost=false
+
 # With this parameter you can map return-codes creates by Swagger-Promote into any return-code you 
 # want. 
 # The following example maps the return code 10 (NO_CHANGE) and 56 (UNKNOWN_API) into a SUCCESS.

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

@@ -36,11 +36,13 @@
 import com.axway.apim.adapter.apis.APIManagerAPIAccessAdapter;
 import com.axway.apim.adapter.apis.APIManagerAPIAdapter;
 import com.axway.apim.adapter.apis.APIManagerAPIMethodAdapter;
+import com.axway.apim.adapter.apis.APIManagerAlertsAdapter;
 import com.axway.apim.adapter.apis.APIManagerConfigAdapter;
 import com.axway.apim.adapter.apis.APIManagerOAuthClientProfilesAdapter;
 import com.axway.apim.adapter.apis.APIManagerOrganizationAdapter;
 import com.axway.apim.adapter.apis.APIManagerPoliciesAdapter;
 import com.axway.apim.adapter.apis.APIManagerQuotaAdapter;
+import com.axway.apim.adapter.apis.APIManagerRemoteHostsAdapter;
 import com.axway.apim.adapter.clientApps.APIMgrAppsAdapter;
 import com.axway.apim.adapter.user.APIManagerUserAdapter;
 import com.axway.apim.api.model.CaCert;
@@ -74,6 +76,7 @@ public class APIManagerAdapter {
 	private static APIManagerAdapter instance;
 
 	public static String apiManagerVersion = null;
+	public static String apiManagerName = null;
 
 	public static boolean initialized = false;
 
@@ -108,6 +111,8 @@ public static enum CUSTOM_PROP_TYPE {
 	private static CacheManager cacheManager;
 
 	public APIManagerConfigAdapter configAdapter;
+	public APIManagerAlertsAdapter alertsAdapter;
+	public APIManagerRemoteHostsAdapter remoteHostsAdapter;
 	public APIManagerAPIAdapter apiAdapter;
 	public APIManagerAPIMethodAdapter methodAdapter;
 	public APIManagerPoliciesAdapter policiesAdapter;
@@ -163,6 +168,8 @@ private APIManagerAdapter() throws AppException {
 		super();
 		this.cmd = CoreParameters.getInstance();
 		this.configAdapter = new APIManagerConfigAdapter();
+		this.alertsAdapter = new APIManagerAlertsAdapter();
+		this.remoteHostsAdapter = new APIManagerRemoteHostsAdapter();
 		this.apiAdapter = new APIManagerAPIAdapter();
 		this.methodAdapter = new APIManagerAPIMethodAdapter();
 		this.policiesAdapter = new APIManagerPoliciesAdapter();
@@ -182,7 +189,7 @@ private APIManagerAdapter() throws AppException {
 	}
 
 	public void loginToAPIManager(boolean useAdminClient) throws AppException {
-		URI uri;
+		URI uri = null;
 		if(cmd.isIgnoreAdminAccount() && useAdminClient) return;
 		if(hasAdminAccount && useAdminClient) return; // Already logged in with an Admin-Account.
 		HttpResponse httpResponse = null;
@@ -236,7 +243,7 @@ public void loginToAPIManager(boolean useAdminClient) throws AppException {
 				throw new AppException("Not supported user-role: "+user.getRole()+"", ErrorCode.API_MANAGER_COMMUNICATION);
 			}
 		} catch (Exception e) {
-			throw new AppException("Can't login to API-Manager", ErrorCode.API_MANAGER_COMMUNICATION, e);
+			throw new AppException("Can't login to API-Manager " + uri, ErrorCode.API_MANAGER_COMMUNICATION, e);
 		} finally {
 			try {
 				if(httpResponse!=null) 
@@ -527,10 +534,18 @@ public static String getApiManagerVersion() throws AppException {
 		if(APIManagerAdapter.apiManagerVersion!=null) {
 			return apiManagerVersion;
 		}
-		APIManagerAdapter.apiManagerVersion = APIManagerAdapter.getInstance().configAdapter.getApiManagerConfig("productVersion");
+		APIManagerAdapter.apiManagerVersion = APIManagerAdapter.getInstance().configAdapter.getConfig(false).getProductVersion();
 		return APIManagerAdapter.apiManagerVersion;
 	}
 
+	public static String getApiManagerName() throws AppException {
+		if(APIManagerAdapter.apiManagerName!=null) {
+			return apiManagerName;
+		}
+		APIManagerAdapter.apiManagerName = APIManagerAdapter.getInstance().configAdapter.getConfig(false).getPortalName();
+		return APIManagerAdapter.apiManagerName;
+	}
+	
 	public static Map<String, String> getAllConfiguredCustomProperties(CUSTOM_PROP_TYPE type) {
     	Map<String, String> allCustomProps = new HashMap<String, String>();
     	try {