Upgrade Orchestrator to 3.33.0.2677

Author: Mark Rekveld

its/it-tests/pom.xml

@@ -27,7 +27,7 @@
     <dependency>
       <groupId>org.sonarsource.orchestrator</groupId>
       <artifactId>sonar-orchestrator</artifactId>
-      <version>3.30.0.2630</version>
+      <version>3.33.0.2677</version>
       <scope>test</scope>
       <exclusions>
         <exclusion>

its/it-tests/src/test/java/com/sonar/scanner/api/it/ProxyTest.java

@@ -74,7 +74,7 @@ public class ProxyTest {
 
   @Before
   public void deleteData() {
-    ORCHESTRATOR.resetData();
+    ScannerApiTestSuite.resetData(ORCHESTRATOR);
     seenByProxy.clear();
   }
 

its/it-tests/src/test/java/com/sonar/scanner/api/it/SSLTest.java

@@ -77,7 +77,7 @@ public class SSLTest {
 
   @Before
   public void deleteData() {
-    ORCHESTRATOR.resetData();
+    ScannerApiTestSuite.resetData(ORCHESTRATOR);
   }
 
   @After

its/it-tests/src/test/java/com/sonar/scanner/api/it/ScannerApiTestSuite.java

@@ -20,7 +20,12 @@
 package com.sonar.scanner.api.it;
 
 import com.sonar.orchestrator.Orchestrator;
+import com.sonar.orchestrator.http.HttpMethod;
 import com.sonar.orchestrator.locator.MavenLocation;
+import java.time.Instant;
+import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
+import java.time.temporal.ChronoUnit;
 import org.apache.commons.lang.StringUtils;
 import org.junit.ClassRule;
 import org.junit.runner.RunWith;
@@ -52,4 +57,21 @@ private static String getSystemPropertyOrFail(String orchestratorPropertiesSourc
     return propertyValue;
   }
 
+  public static void resetData(Orchestrator orchestrator) {
+    // We add one day to ensure that today's entries are deleted.
+    Instant instant = Instant.now().plus(1, ChronoUnit.DAYS);
+
+    // The expected format is yyyy-MM-dd.
+    String currentDateTime = DateTimeFormatter.ISO_LOCAL_DATE
+      .withZone(ZoneId.of("UTC"))
+      .format(instant);
+
+    orchestrator.getServer()
+      .newHttpCall("/api/projects/bulk_delete")
+      .setAdminCredentials()
+      .setMethod(HttpMethod.POST)
+      .setParams("analyzedBefore", currentDateTime)
+      .execute();
+  }
+
 }