Merge pull request #108 from Venafi/contacts-support

fix for contacts support

Author: rvelaVenafi

src/main/java/com/venafi/vcert/sdk/connectors/cloud/CloudConnectorUtils.java

@@ -167,44 +167,36 @@ private static void addCitToApp(CertificateIssuingTemplate cit, Application appl
 									String apiKey, Cloud cloud) throws VCertException {
         Map<String, String> citAliasIdMap = null;
 
-        if ( application.certificateIssuingTemplateAliasIdMap() != null )
+        if ( application.certificateIssuingTemplateAliasIdMap() != null ) {
             citAliasIdMap = application.certificateIssuingTemplateAliasIdMap();
+        }
         else {
             citAliasIdMap = new HashMap<>();
             application.certificateIssuingTemplateAliasIdMap( citAliasIdMap );
         }
 
-		boolean updateApplication = false;
-
         //if the App doesn't contain the relation to the cit
         if ( !citAliasIdMap.containsKey(cit.name()) ) {
             //adding the reference to the cit
             citAliasIdMap.put(cit.name(), cit.id());
-            updateApplication = true;
         }
 
 		// Updating the owners list of the Application
 		List<Application.OwnerIdsAndType> ownersList =  CloudConnectorUtils.resolveUsersToCloudOwners(usersList, apiKey, cloud);
-		if (ownersList.size() > 0){
-//			application.ownerIdsAndTypes().addAll(ownersList);
-			List<Application.OwnerIdsAndType> newList = mergeOwnersList(application.ownerIdsAndTypes(), ownersList);
-			application.ownerIdsAndTypes(newList);
-			updateApplication = true;
-		}
+        application.ownerIdsAndTypes(ownersList);
 
-        if (updateApplication) {
-			//getting the appId because it will be used to invoke the API to update the related Application
-			String appId = application.id();
+		//getting the appId because it will be used to invoke the API to update the related Application
+		String appId = application.id();
 
-			//The id, companyId, fqDns and internalFqDns needs to be null in the request to update the Application,
-			//therefore these attributes are set to null
-			application.id(null);
-			application.companyId(null);
-			application.fqDns(null);
-			application.internalFqDns(null);
+		//The id, companyId, fqDns and internalFqDns needs to be null in the request to update the Application,
+		//therefore these attributes are set to null
+		application.id(null);
+		application.companyId(null);
+		application.fqDns(null);
+		application.internalFqDns(null);
+
+		cloud.updateApplication(application, appId, apiKey);
 
-			cloud.updateApplication(application, appId, apiKey);
-		}
 	}
 
 	private static List<Application.OwnerIdsAndType> resolveUsersToCloudOwners(String[] usersList, String apiKey, Cloud cloud) {

src/test/java/com/venafi/vcert/sdk/connectors/cloud/CloudConnectorPolicyAT.java

@@ -124,7 +124,7 @@ public void createAndGetPolicyContacts() throws VCertException {
 
 	@Test
 	@DisplayName("Cloud - Testing setting contacts that are duplicated on VaaS")
-	public void testPolicyContactsDuplicated() throws VCertException {
+	public void testPolicyContactsUpdated() throws VCertException {
 		CloudConnector connector = connectorResource.connector();
 		String policyName = CloudTestUtils.getRandomZone();
 		PolicySpecification policySpecification = CloudTestUtils.getPolicySpecification();
@@ -136,15 +136,12 @@ public void testPolicyContactsDuplicated() throws VCertException {
 		Assertions.assertEquals("pki-admin@opensource.qa.venafi.io", psReturned.users()[0]);
 		Assertions.assertEquals("resource-owner@opensource.qa.venafi.io", psReturned.users()[1]);
 
-		//Updating the Policy Specification to include the duplicated contacts
-
+		//Updating the Policy Specification to include just one owner
 		PolicySpecification ps2 = CloudTestUtils.getPolicySpecification();
-		ps2.users(new String[]{"pki-admin@opensource.qa.venafi.io"});
-		connector.setPolicy(policyName, policySpecification);
+		connector.setPolicy(policyName, ps2);
 		PolicySpecification psReturned2 = connector.getPolicy(policyName);
 
-		Assertions.assertEquals(2, psReturned2.users().length);
-		Assertions.assertEquals("pki-admin@opensource.qa.venafi.io", psReturned.users()[0]);
-		Assertions.assertEquals("resource-owner@opensource.qa.venafi.io", psReturned.users()[1]);
+		Assertions.assertEquals(1, psReturned2.users().length);
+		Assertions.assertEquals("jenkins@opensource.qa.venafi.io", psReturned2.users()[0]);
 	}
 }