[0.2.x] REP-64 Fix for itest timing issue

Jenkinsfile

@@ -1,5 +1,13 @@
-//"Jenkins Pipeline is a suite of plugins which supports implementing and integrating continuous delivery pipelines into Jenkins. Pipeline provides an extensible set of tools for modeling delivery pipelines "as code" via the Pipeline DSL."
-//More information can be found on the Jenkins Documentation page https://jenkins.io/doc/
+
+/*
+Jenkins Pipeline is a suite of plugins which supports implementing and integrating continuous delivery pipelines into Jenkins.
+Pipeline provides an extensible set of tools for modeling delivery pipelines "as code" via the Pipeline DSL.
+More information can be found on the Jenkins Documentation page https://jenkins.io/doc/
+*/
+
+library 'github-utils-shared-library@master'
+@Library('github.com/connexta/cx-pipeline-library@master') _
+
 pipeline {
     agent {
         node {
@@ -29,11 +37,17 @@ pipeline {
         LINUX_MVN_RANDOM = '-Djava.security.egd=file:/dev/./urandom'
         COVERAGE_EXCLUSIONS = '**/test/**/*,**/itests/**/*,**/*Test*,**/sdk/**/*,**/*.js,**/node_modules/**/*,**/jaxb/**/*,**/wsdl/**/*,**/nces/sws/**/*,**/*.adoc,**/*.txt,**/*.xml'
         DISABLE_DOWNLOAD_PROGRESS_OPTS = '-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn '
+        GITHUB_USERNAME = 'connexta'
+        GITHUB_REPONAME = 'replication'
     }
     stages {
         stage('Calculating build parameters'){
             steps {
                 script {
+                    withCredentials([usernameColonPassword(credentialsId: 'cxbot', variable: 'GITHUB_TOKEN')]) {
+                        slackSend color: 'good', message: "STARTED: ${JOB_NAME} ${BUILD_NUMBER} ${BUILD_URL}"
+                        postCommentIfPR("Internal build has been started. Your results will be available at completion. See build progress in [legacy Jenkins UI](${BUILD_URL}) or in [Blue Ocean UI](${BUILD_URL}display/redirect).", "${GITHUB_USERNAME}", "${GITHUB_REPONAME}", "${GITHUB_TOKEN}")
+                    }
                     if(params.RELEASE == true) {
                         if(params.RELEASE_VERSION != 'NA'){
                             env.RELEASE_VERSION = params.RELEASE_VERSION
@@ -73,8 +87,11 @@ pipeline {
                     steps {
                         // TODO: Maven downgraded to work around a linux build issue. Falling back to system java to work around a linux build issue. re-investigate upgrading later
                         withMaven(maven: 'Maven 3.5.3', jdk: 'jdk8-latest', globalMavenSettingsConfig: 'default-global-settings', mavenSettingsConfig: 'codice-maven-settings', mavenOpts: '${LINUX_MVN_RANDOM}') {
-                            sh 'mvn install -B -DskipStatic=true -DskipTests=true $DISABLE_DOWNLOAD_PROGRESS_OPTS'
-                            sh 'mvn install -B -Dgib.enabled=true -Dgib.referenceBranch=/refs/remotes/origin/$CHANGE_TARGET $DISABLE_DOWNLOAD_PROGRESS_OPTS'
+                            sh '''
+                                unset JAVA_TOOL_OPTIONS
+                                mvn install -B -DskipStatic=true -DskipTests=true $DISABLE_DOWNLOAD_PROGRESS_OPTS
+                                mvn install -B -Dgib.enabled=true -Dgib.referenceBranch=/refs/remotes/origin/$CHANGE_TARGET $DISABLE_DOWNLOAD_PROGRESS_OPTS
+                            '''
                         }
                     }
                 }
@@ -99,10 +116,16 @@ pipeline {
                         withMaven(maven: 'Maven 3.5.3', jdk: 'jdk8-latest', globalMavenSettingsConfig: 'default-global-settings', mavenSettingsConfig: 'codice-maven-settings', mavenOpts: '${LINUX_MVN_RANDOM}') {
                             script {
                                 if(params.RELEASE == true) {
-                                    sh "mvn -B -Dtag=${env.RELEASE_TAG} -DreleaseVersion=${env.RELEASE_VERSION} -DdevelopmentVersion=${env.NEXT_VERSION} release:prepare"
+                                    sh '''
+                                        unset JAVA_TOOL_OPTIONS
+                                        mvn -B -Dtag=${env.RELEASE_TAG} -DreleaseVersion=${env.RELEASE_VERSION} -DdevelopmentVersion=${env.NEXT_VERSION} release:prepare
+                                    '''
                                     env.RELEASE_COMMIT =  sh(returnStdout: true, script: 'git rev-parse HEAD').trim()
                                 } else {
-                                    sh 'mvn clean install -B $DISABLE_DOWNLOAD_PROGRESS_OPTS'
+                                    sh '''
+                                        unset JAVA_TOOL_OPTIONS
+                                        mvn clean install -B $DISABLE_DOWNLOAD_PROGRESS_OPTS
+                                    '''
                                 }
                             }
                         }
@@ -215,6 +238,27 @@ pipeline {
             }
         }
     }
+
+    post {
+        success {
+            slackSend color: 'good', message: "SUCCESS: ${JOB_NAME} ${BUILD_NUMBER}"
+            withCredentials([usernameColonPassword(credentialsId: 'cxbot', variable: 'GITHUB_TOKEN')]) {
+                postCommentIfPR("Build success! See the job results in [legacy Jenkins UI](${BUILD_URL}) or in [Blue Ocean UI](${BUILD_URL}display/redirect).", "${GITHUB_USERNAME}", "${GITHUB_REPONAME}", "${GITHUB_TOKEN}")
+            }
+        }
+        failure {
+            slackSend color: '#ea0017', message: "FAILURE: ${JOB_NAME} ${BUILD_NUMBER}. See the results here: ${BUILD_URL}"
+            withCredentials([usernameColonPassword(credentialsId: 'cxbot', variable: 'GITHUB_TOKEN')]) {
+                postCommentIfPR("Build failure. See the job results in [legacy Jenkins UI](${BUILD_URL}) or in [Blue Ocean UI](${BUILD_URL}display/redirect).", "${GITHUB_USERNAME}", "${GITHUB_REPONAME}", "${GITHUB_TOKEN}")
+            }
+        }
+        unstable {
+            slackSend color: '#ffb600', message: "UNSTABLE: ${JOB_NAME} ${BUILD_NUMBER}. See the results here: ${BUILD_URL}"
+            withCredentials([usernameColonPassword(credentialsId: 'cxbot', variable: 'GITHUB_TOKEN')]) {
+                postCommentIfPR("Build unstable. See the job results in [legacy Jenkins UI](${BUILD_URL}) or in [Blue Ocean UI](${BUILD_URL}display/redirect).", "${GITHUB_USERNAME}", "${GITHUB_REPONAME}", "${GITHUB_TOKEN}")
+            }
+        }
+    }
 }
 
 def getCurrentVersion() {

admin/pom.xml

@@ -16,7 +16,7 @@
     <parent>
         <artifactId>replication</artifactId>
         <groupId>replication</groupId>
-        <version>0.2.1-SNAPSHOT</version>
+        <version>0.2.2-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

admin/query/pom.xml

@@ -16,7 +16,7 @@
     <parent>
         <artifactId>replication-admin</artifactId>
         <groupId>replication</groupId>
-        <version>0.2.1-SNAPSHOT</version>
+        <version>0.2.2-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -90,17 +90,17 @@
                                         <limit implementation="org.codice.jacoco.LenientLimit">
                                             <counter>INSTRUCTION</counter>
                                             <value>COVEREDRATIO</value>
-                                            <minimum>0.71</minimum>
+                                            <minimum>0.75</minimum>
                                         </limit>
                                         <limit implementation="org.codice.jacoco.LenientLimit">
                                             <counter>BRANCH</counter>
                                             <value>COVEREDRATIO</value>
-                                            <minimum>0.68</minimum>
+                                            <minimum>0.74</minimum>
                                         </limit>
                                         <limit implementation="org.codice.jacoco.LenientLimit">
                                             <counter>COMPLEXITY</counter>
                                             <value>COVEREDRATIO</value>
-                                            <minimum>0.58</minimum>
+                                            <minimum>0.61</minimum>
                                         </limit>
                                     </limits>
                                 </rule>

admin/query/src/main/java/org/codice/ditto/replication/admin/query/ReplicationUtils.java

@@ -24,6 +24,7 @@
 import org.codice.ditto.replication.admin.query.replications.fields.ReplicationField;
 import org.codice.ditto.replication.admin.query.sites.fields.ReplicationSiteField;
 import org.codice.ditto.replication.api.ReplicationException;
+import org.codice.ditto.replication.api.ReplicationPersistenceException;
 import org.codice.ditto.replication.api.ReplicationStatus;
 import org.codice.ditto.replication.api.Replicator;
 import org.codice.ditto.replication.api.ReplicatorHistory;
@@ -32,10 +33,14 @@
 import org.codice.ditto.replication.api.data.ReplicatorConfig;
 import org.codice.ditto.replication.api.persistence.ReplicatorConfigManager;
 import org.codice.ditto.replication.api.persistence.SiteManager;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /** Utility class that does all the heavy lifting for the graphql operations */
 public class ReplicationUtils {
 
+  private static final Logger LOGGER = LoggerFactory.getLogger(ReplicationUtils.class);
+
   private static final long BYTES_PER_MB = 1024L * 1024L;
 
   private final SiteManager siteManager;
@@ -71,12 +76,7 @@ public boolean siteExists(String name) {
   }
 
   public boolean siteIdExists(String id) {
-    try {
-      siteManager.get(id);
-      return true;
-    } catch (NotFoundException e) {
-      return false;
-    }
+    return siteManager.exists(id);
   }
 
   public ReplicationSiteField updateSite(String id, String name, AddressField address) {
@@ -109,7 +109,7 @@ public boolean replicationConfigExists(String name) {
   }
 
   public boolean configExists(String id) {
-    return configManager.configExists(id);
+    return configManager.exists(id);
   }
 
   public ReplicationField createReplication(
@@ -215,12 +215,21 @@ private ReplicationField getReplicationFieldForConfig(ReplicatorConfig config) {
     return field;
   }
 
-  public boolean deleteConfig(String id) {
+  public boolean markConfigDeleted(String id, boolean deleteData) {
     try {
-      configManager.remove(id);
+      ReplicatorConfig config = configManager.get(id);
+      config.setDeleted(true);
+      config.setDeleteData(deleteData);
+      config.setSuspended(true);
+      configManager.save(config);
+      replicator.cancelSyncRequest(id);
       return true;
-    } catch (NotFoundException e) {
+    } catch (ReplicationPersistenceException e) {
+      LOGGER.debug("Unable to delete replicator configuration with id {}", id, e);
       return false;
+    } catch (NotFoundException e) {
+      LOGGER.debug("Config with id {}", id, e);
+      return true;
     }
   }
 
@@ -253,9 +262,18 @@ public ListField<ReplicationSiteField> getSites() {
     return siteFields;
   }
 
-  public ListField<ReplicationField> getReplications() {
+  public ListField<ReplicationField> getReplications(boolean filterDeleted) {
     ListField<ReplicationField> fields = new ReplicationField.ListImpl();
-    configManager.objects().map(this::getReplicationFieldForConfig).forEach(fields::add);
+
+    if (filterDeleted) {
+      configManager
+          .objects()
+          .filter(c -> !c.isDeleted())
+          .map(this::getReplicationFieldForConfig)
+          .forEach(fields::add);
+    } else {
+      configManager.objects().map(this::getReplicationFieldForConfig).forEach(fields::add);
+    }
     return fields;
   }
 }

admin/query/src/main/java/org/codice/ditto/replication/admin/query/replications/discover/GetReplications.java

@@ -41,7 +41,7 @@ public GetReplications(ReplicationUtils replicationUtils) {
 
   @Override
   public ListField<ReplicationField> performFunction() {
-    return replicationUtils.getReplications();
+    return replicationUtils.getReplications(true);
   }
 
   @Override

admin/query/src/main/java/org/codice/ditto/replication/admin/query/replications/persist/DeleteReplication.java

@@ -29,24 +29,32 @@ public class DeleteReplication extends BaseFunctionField<BooleanField> {
 
   public static final String FIELD_NAME = "deleteReplication";
 
-  public static final String DESCRIPTION = "Deletes a replication.";
+  public static final String DESCRIPTION =
+      "Deletes a Replication and its history (statistics). Optionally delete the data of the Replication. Deleting data will delete "
+          + "any local resources and metadata that were replicated by this Replication, but not any resources replicated to a remote Node.";
 
   public static final BooleanField RETURN_TYPE = new BooleanField();
 
   private PidField id;
 
+  private BooleanField deleteData;
+
   private ReplicationUtils replicationUtils;
 
   public DeleteReplication(ReplicationUtils replicationUtils) {
     super(FIELD_NAME, DESCRIPTION);
     this.replicationUtils = replicationUtils;
     id = new PidField("id");
+    deleteData = new BooleanField("deleteData");
+    deleteData.setValue(false);
+
+    id.isRequired();
   }
 
   @Override
   public BooleanField performFunction() {
     BooleanField successful = new BooleanField();
-    successful.setValue(replicationUtils.deleteConfig(id.getValue()));
+    successful.setValue(replicationUtils.markConfigDeleted(id.getValue(), deleteData.getValue()));
 
     return successful;
   }
@@ -70,7 +78,7 @@ public BooleanField getReturnType() {
 
   @Override
   public List<Field> getArguments() {
-    return ImmutableList.of(id);
+    return ImmutableList.of(id, deleteData);
   }
 
   @Override

admin/query/src/main/java/org/codice/ditto/replication/admin/query/sites/persist/DeleteReplicationSite.java

@@ -60,7 +60,7 @@ public void validate() {
       return;
     }
 
-    ListField<ReplicationField> repFields = replicationUtils.getReplications();
+    ListField<ReplicationField> repFields = replicationUtils.getReplications(true);
     String idToDelete = id.getValue();
     for (ReplicationField repField : repFields.getList()) {
       if (idToDelete.equals(repField.source().id())

admin/query/src/test/java/org/codice/ditto/replication/admin/query/ReplicationUtilsTest.java

@@ -33,6 +33,7 @@
 import org.codice.ditto.replication.admin.query.replications.fields.ReplicationField;
 import org.codice.ditto.replication.admin.query.sites.fields.ReplicationSiteField;
 import org.codice.ditto.replication.api.ReplicationException;
+import org.codice.ditto.replication.api.ReplicationPersistenceException;
 import org.codice.ditto.replication.api.ReplicationStatus;
 import org.codice.ditto.replication.api.Replicator;
 import org.codice.ditto.replication.api.ReplicatorHistory;
@@ -54,7 +55,7 @@
 @RunWith(MockitoJUnitRunner.class)
 public class ReplicationUtilsTest {
 
-  ReplicationUtils utils;
+  private ReplicationUtils utils;
 
   @Mock SiteManager siteManager;
 
@@ -292,18 +293,31 @@ public void updateReplicationActiveSyncRequest() {
   }
 
   @Test
-  public void deleteConfig() {
+  public void testMarkConfigDeleted() {
     ReplicatorConfigImpl config = new ReplicatorConfigImpl();
     config.setId("id");
     config.setName("name");
-    assertThat(utils.deleteConfig("id"), is(true));
-    verify(configManager).remove(anyString());
+
+    when(configManager.get("id")).thenReturn(config);
+
+    assertThat(utils.markConfigDeleted("id", true), is(true));
+    assertThat(config.shouldDeleteData(), is(true));
+    assertThat(config.isDeleted(), is(true));
+    assertThat(config.isSuspended(), is(true));
+    verify(replicator).cancelSyncRequest("id");
+    verify(configManager).save(config);
+  }
+
+  @Test
+  public void testMarkConfigDeletedNotFound() {
+    doThrow(new NotFoundException()).when(configManager).get("id");
+    assertThat(utils.markConfigDeleted("id", true), is(true));
   }
 
   @Test
-  public void deleteConfigFailed() {
-    doThrow(new NotFoundException()).when(configManager).remove(anyString());
-    assertThat(utils.deleteConfig("id"), is(false));
+  public void testMarkConfigDeletedErrorRetrievingConfig() {
+    doThrow(new ReplicationPersistenceException("")).when(configManager).get("id");
+    assertThat(utils.markConfigDeleted("id", true), is(false));
   }
 
   @Test
@@ -336,7 +350,7 @@ public void getReplications() throws Exception {
     config.setDestination("destId");
     config.setBidirectional(false);
     when(configManager.objects()).thenReturn(Stream.of(config));
-    ReplicationField field = utils.getReplications().getList().get(0);
+    ReplicationField field = utils.getReplications(false).getList().get(0);
     assertThat(field.name(), is("test"));
     assertThat(field.source().id(), is("srcId"));
     assertThat(field.destination().id(), is("destId"));
@@ -346,6 +360,15 @@ public void getReplications() throws Exception {
     assertThat(field.dataTransferred(), is("15 MB"));
   }
 
+  @Test
+  public void testGetReplicationsFilterDeleted() {
+    ReplicatorConfigImpl config = new ReplicatorConfigImpl();
+    config.setDeleted(true);
+
+    when(configManager.objects()).thenReturn(Stream.of(config));
+    assertThat(utils.getReplications(true).getList().size(), is(0));
+  }
+
   @Test
   public void cancelConfig() {
     assertThat(utils.cancelConfig("test"), is(true));
@@ -393,7 +416,7 @@ public void enableConfig() {
 
   @Test
   public void siteIdExists() {
-    when(siteManager.get(anyString())).thenReturn(new ReplicationSiteImpl());
+    when(siteManager.exists(anyString())).thenReturn(true);
     assertThat(utils.siteIdExists("id"), is(true));
   }