Skip to content

Commit e73d509

Browse files
author
Chris Wiechmann
committed
#114 Apps/Orgs reseted on actual API to force recreation
Improved the integration test using applications from different organizations to simulate real world use-case.
1 parent 34ebb6a commit e73d509

2 files changed

Lines changed: 45 additions & 8 deletions

File tree

‎modules/apis/src/main/java/com/axway/apim/apiimport/actions/RepublishToUpdateAPI.java‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,18 @@
11
package com.axway.apim.apiimport.actions;
22

3+
import java.util.ArrayList;
4+
import java.util.List;
5+
36
import org.slf4j.Logger;
47
import org.slf4j.LoggerFactory;
58

69
import com.axway.apim.adapter.APIStatusManager;
710
import com.axway.apim.api.API;
11+
import com.axway.apim.api.model.Organization;
12+
import com.axway.apim.api.model.apps.ClientApplication;
813
import com.axway.apim.apiimport.APIChangeState;
14+
import com.axway.apim.lib.CoreParameters;
15+
import com.axway.apim.lib.CoreParameters.Mode;
916
import com.axway.apim.lib.errorHandling.AppException;
1017

1118
public class RepublishToUpdateAPI {
@@ -16,6 +23,21 @@ public void execute(APIChangeState changes) throws AppException {
1623

1724
API actualAPI = changes.getActualAPI();
1825

26+
Mode clientAppsMode = CoreParameters.getInstance().getClientAppsMode();
27+
Mode clientOrgsMode = CoreParameters.getInstance().getClientOrgsMode();
28+
// Get existing Orgs and Apps, as they will be lost when the API gets unpublished
29+
if(clientAppsMode==Mode.add && actualAPI.getApplications()!=null) {
30+
changes.getDesiredAPI().getApplications().addAll(actualAPI.getApplications());
31+
// Reset the applications to have them re-created
32+
actualAPI.setApplications(new ArrayList<ClientApplication>());
33+
}
34+
if(clientOrgsMode==Mode.add && actualAPI.getClientOrganizations()!=null) {
35+
// Take over existing organizations
36+
changes.getDesiredAPI().getClientOrganizations().addAll(actualAPI.getClientOrganizations());
37+
// Delete them, so that they are re-created
38+
actualAPI.setClientOrganizations(new ArrayList<Organization>());
39+
}
40+
1941
// 1. Create BE- and FE-API (API-Proxy) / Including updating all belonging props!
2042
// This also includes all CONFIGURED application subscriptions and client-orgs
2143
// But not potentially existing Subscriptions or manually created Client-Orgs

‎modules/apis/src/test/java/com/axway/apim/test/applications/ApplicationSubscriptionTestIT.java‎

Lines changed: 23 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,13 @@ public void run(@Optional @CitrusResource TestContext context) throws IOExceptio
105105

106106
echo("####### API has been created with ID: '${apiId}' #######");
107107

108+
echo("####### Validate API with ID: '${apiId}' is granted to Org2: ${orgName2} (${orgId2}) #######");
109+
http(builder -> builder.client("apiManager").send().get("/organizations/${orgId2}/apis").header("Content-Type", "application/json"));
110+
111+
http(builder -> builder.client("apiManager").receive().response(HttpStatus.OK).messageType(MessageType.JSON)
112+
.validate("$.[?(@.apiId=='${apiId}')].state", "approved")
113+
.validate("$.[?(@.apiId=='${apiId}')].enabled", "true"));
114+
108115
echo("####### Validate created application 3 has an active subscription to the API (Based on the name) #######");
109116
http(builder -> builder.client("apiManager").send().get("/applications/${consumingTestApp3Id}/apis").header("Content-Type", "application/json"));
110117

@@ -140,7 +147,7 @@ public void run(@Optional @CitrusResource TestContext context) throws IOExceptio
140147
.validate("$.[?(@.path=='${apiPath}')].name", "${apiName}")
141148
.validate("$.[?(@.path=='${apiPath}')].id", "${apiId}")); // Must be the same API-ID as before!
142149

143-
echo("####### Changin FE-API Settings only for: '${apiName}' - Mode: Unpublish/Publish and make sure subscriptions stay #######");
150+
echo("####### Changing FE-API Settings only for: '${apiName}' - Mode: Unpublish/Publish and make sure subscriptions stay #######");
144151
createVariable(ImportTestAction.API_DEFINITION, "/com/axway/apim/test/files/basic/petstore.json");
145152
createVariable(ImportTestAction.API_CONFIG, "/com/axway/apim/test/files/applications/1_api-with-1-org-some-apps.json");
146153
createVariable("state", "published");
@@ -156,6 +163,13 @@ public void run(@Optional @CitrusResource TestContext context) throws IOExceptio
156163
.validate("$.[?(@.id=='${apiId}')].name", "${apiName}")
157164
.validate("$.[?(@.id=='${apiId}')].state", "published"));
158165

166+
echo("####### Validate Re-Puslished API with ID: '${apiId}' is still granted to Org2: ${orgName2} (${orgId2}) #######");
167+
http(builder -> builder.client("apiManager").send().get("/organizations/${orgId2}/apis").header("Content-Type", "application/json"));
168+
169+
http(builder -> builder.client("apiManager").receive().response(HttpStatus.OK).messageType(MessageType.JSON)
170+
.validate("$.[?(@.apiId=='${apiId}')].state", "approved")
171+
.validate("$.[?(@.apiId=='${apiId}')].enabled", "true"));
172+
159173
echo("####### Validate Application 3 still has an active subscription to the API (Based on the name) #######");
160174
http(builder -> builder.client("apiManager").send().get("/applications/${consumingTestApp3Id}/apis").header("Content-Type", "application/json"));
161175

@@ -239,23 +253,24 @@ public void run(@Optional @CitrusResource TestContext context) throws IOExceptio
239253

240254
echo("####### API has been RE-CREATED with ID: '${newApiId}' #######");
241255

242-
echo("####### Validate created application 3 STILL has an active subscription to the API (Based on the name) #######");
243-
http(builder -> builder.client("apiManager").send().get("/applications/${consumingTestApp3Id}/apis").header("Content-Type", "application/json"));
256+
echo("####### Validate Application 1 STILL has an active subscription to the API (based on the API-Key) #######");
257+
http(builder -> builder.client("apiManager").send().get("/applications/${consumingTestApp1Id}/apis").header("Content-Type", "application/json"));
244258

245259
http(builder -> builder.client("apiManager").receive().response(HttpStatus.OK).messageType(MessageType.JSON)
246260
.validate("$.*.apiId", "${newApiId}"));
247261

248-
echo("####### Validate Application 1 STILL has an active subscription to the API (based on the API-Key) #######");
249-
http(builder -> builder.client("apiManager").send().get("/applications/${consumingTestApp1Id}/apis").header("Content-Type", "application/json"));
262+
// As the apps 3 & 2 now belong to a different organization the org-admin cannot see / re-subscribe them
263+
/*
264+
echo("####### Validate created application 3 STILL has an active subscription to the API (Based on the name) #######");
265+
http(builder -> builder.client("apiManager").send().get("/applications/${consumingTestApp3Id}/apis").header("Content-Type", "application/json"));
250266
251267
http(builder -> builder.client("apiManager").receive().response(HttpStatus.OK).messageType(MessageType.JSON)
252268
.validate("$.*.apiId", "${newApiId}"));
253-
254-
echo("####### Validate Application 2 STILL has an active subscription to the API (based on the Ext-Client-Id) #######");
269+
echo("####### Validate Application 2 STILL has an active subscription to the API (based on the Ext-Client-Id) #######");
255270
http(builder -> builder.client("apiManager").send().get("/applications/${consumingTestApp2Id}/apis")
256271
.header("Content-Type", "application/json"));
257272
258273
http(builder -> builder.client("apiManager").receive().response(HttpStatus.OK).messageType(MessageType.JSON)
259-
.validate("$.*.apiId", "${newApiId}"));
274+
.validate("$.*.apiId", "${newApiId}")); */
260275
}
261276
}

0 commit comments

Comments
 (0)