Revert "fix: drop support of command GatlingEnterpriseUpload"

This reverts commit b7d8d6b.

Author: slandelle

build.gradle

@@ -22,7 +22,7 @@ repositories {
 }
 
 dependencies {
-  implementation "io.gatling:gatling-enterprise-plugin-commons:1.17.0"
+  implementation "io.gatling:gatling-enterprise-plugin-commons:1.16.3"
   implementation "io.gatling:gatling-shared-cli:0.0.6"
 
   testImplementation('org.spockframework:spock-core:2.3-groovy-3.0') {

src/main/groovy/io/gatling/gradle/GatlingEnterpriseUploadTask.groovy

@@ -0,0 +1,33 @@
+package io.gatling.gradle
+
+import io.gatling.plugin.BatchEnterprisePlugin
+import io.gatling.plugin.ConfigurationConstants
+import org.gradle.api.DefaultTask
+import org.gradle.api.InvalidUserDataException
+import org.gradle.api.tasks.CacheableTask
+import org.gradle.api.tasks.TaskAction
+
+@CacheableTask
+class GatlingEnterpriseUploadTask extends DefaultTask {
+
+    @TaskAction
+    void publish() {
+        def gatling = project.extensions.getByType(GatlingPluginExtension)
+        RecoverEnterprisePluginException.handle(logger) {
+            BatchEnterprisePlugin enterprisePlugin = gatling.enterprise.initBatchEnterprisePlugin(logger)
+            UUID packageUUID = gatling.enterprise.packageId
+
+            if (packageUUID) {
+                logger.lifecycle("Uploading package with packageId " + packageUUID)
+                enterprisePlugin.uploadPackage(packageUUID, inputs.files.singleFile)
+            } else if (gatling.enterprise.simulationId) {
+                logger.lifecycle("Uploading package belonging to the simulation " + gatling.enterprise.simulationId)
+                enterprisePlugin.uploadPackageWithSimulationId(gatling.enterprise.simulationId, inputs.files.singleFile)
+            } else {
+                throw new InvalidUserDataException("You need to either configure gatling.enterprise.packageId (or pass it with '-D${ConfigurationConstants.UploadOptions.PackageId.SYS_PROP}=<PACKAGE_ID>') " +
+                    "or gatling.enterprise.simulationId (or pass it with '-D${ConfigurationConstants.UploadOptions.SimulationId.SYS_PROP}=<SIMULATION_ID>') to upload a package." +
+                    "Please see https://docs.gatling.io/reference/integrations/build-tools/gradle-plugin/#running-your-simulations-on-gatling-enterprise-cloud for more information.")
+            }
+        }
+    }
+}

src/main/groovy/io/gatling/gradle/GatlingPlugin.groovy

@@ -14,6 +14,8 @@ final class GatlingPlugin implements Plugin<Project> {
 
     public static def ENTERPRISE_PACKAGE_TASK_NAME = "gatlingEnterprisePackage"
 
+    public static def ENTERPRISE_UPLOAD_TASK_NAME = "gatlingEnterpriseUpload"
+
     public static def ENTERPRISE_START_TASK_NAME = "gatlingEnterpriseStart"
 
     public static def ENTERPRISE_DEPLOY_TASK_NAME = "gatlingEnterpriseDeploy"
@@ -33,10 +35,18 @@ final class GatlingPlugin implements Plugin<Project> {
         }
 
         def gatlingEnterprisePackageTask = registerEnterprisePackageTask(project)
+        registerEnterpriseUploadTask(project, gatlingEnterprisePackageTask)
         registerEnterpriseDeployTask(project, gatlingEnterprisePackageTask)
         registerEnterpriseStartTask(project, gatlingEnterprisePackageTask)
     }
 
+    private void registerEnterpriseUploadTask(Project project, TaskProvider<GatlingEnterprisePackageTask> gatlingEnterprisePackageTask) {
+        project.tasks.register(ENTERPRISE_UPLOAD_TASK_NAME, GatlingEnterpriseUploadTask.class) {
+            inputs.files gatlingEnterprisePackageTask
+            dependsOn(gatlingEnterprisePackageTask)
+        }
+    }
+
     private TaskProvider<GatlingEnterpriseDeployTask> registerEnterpriseDeployTask(Project project, TaskProvider<GatlingEnterprisePackageTask> gatlingEnterprisePackageTask) {
         project.tasks.register(ENTERPRISE_DEPLOY_TASK_NAME, GatlingEnterpriseDeployTask.class) {
             inputs.files gatlingEnterprisePackageTask

src/main/groovy/io/gatling/gradle/GatlingPluginExtension.groovy

@@ -130,6 +130,13 @@ class GatlingPluginExtension {
             setPackageDescriptorFilename(packageDescriptorFilename)
         }
 
+        @Input
+        @Optional
+        UUID getSimulationId() {
+            var str = ConfigurationConstants.UploadOptions.SimulationId.valueOf(simulationId)
+            str ? UUID.fromString(str) : null
+        }
+
         @Input
         @Optional
         String getSimulationName() {
@@ -152,6 +159,13 @@ class GatlingPluginExtension {
             ConfigurationConstants.ApiToken.valueOf(apiToken)
         }
 
+        @Input
+        @Optional
+        UUID getPackageId() {
+            var str = ConfigurationConstants.UploadOptions.PackageId.valueOf(packageId)
+            str ? UUID.fromString(str) : null
+        }
+
         @Input
         @Optional
         URL getApiUrl() {