Updates for Zeebe changes

.github/workflows/build.yml

@@ -192,7 +192,6 @@ jobs:
   native_linux_amd64:
     needs: 
       - build
-      - windows_test
     runs-on: ubuntu-latest
     if: github.ref_type == 'tag' || github.event_name == 'pull_request'
     permissions:
@@ -311,7 +310,6 @@ jobs:
   e2e:
     needs:
       - build
-      - windows_test
       - native_linux_amd64
     if: github.ref_type == 'tag' || github.event_name == 'pull_request'
     runs-on: ubuntu-latest

rpa-worker-application/src/functionalTest/groovy/io/camunda/rpa/worker/zeebe/AbstractZeebeFunctionalSpec.groovy

@@ -92,20 +92,19 @@ abstract class AbstractZeebeFunctionalSpec extends AbstractFunctionalSpec {
 	protected ActivatedJob anRpaJob(Map<String, Object> variables = [:], String scriptKey = "existing_1", Map additionalHeaders = [:], int jobNum = 0) {
 		return Stub(ActivatedJob) {
 			getCustomHeaders() >> [
-					(ZeebeJobService.LINKED_RESOURCES_HEADER_NAME): JsonOutput.toJson(
-							new ZeebeLinkedResources([
-									new ZeebeLinkedResources.ZeebeLinkedResource(
-											scriptKey,
-											ZeebeBindingType.latest,
-											"RPA",
-											"?",
-											ZeebeJobService.MAIN_SCRIPT_LINK_NAME,
-											scriptKey)
-							])),
+					(ZeebeJobService.LINKED_RESOURCES_HEADER_NAME): JsonOutput.toJson([
+							new ZeebeLinkedResource(
+									scriptKey,
+									ZeebeBindingType.latest,
+									"RPA",
+									"?",
+									ZeebeJobService.MAIN_SCRIPT_LINK_NAME,
+									scriptKey)
+					]),
 
 					*: additionalHeaders
 			]
-			
+
 			getKey() >> { jobNum }
 			getVariablesAsMap() >> variables
 			getBpmnProcessId() >> "123"
@@ -122,36 +121,35 @@ abstract class AbstractZeebeFunctionalSpec extends AbstractFunctionalSpec {
 
 		return Stub(ActivatedJob) {
 			getCustomHeaders() >> [(ZeebeJobService.LINKED_RESOURCES_HEADER_NAME): JsonOutput.toJson(
-					new ZeebeLinkedResources(
-							preScripts.collect { s ->
-								new ZeebeLinkedResources.ZeebeLinkedResource(
+					preScripts.collect { s ->
+						new ZeebeLinkedResource(
+								s,
+								ZeebeBindingType.latest,
+								"RPA",
+								"?",
+								ZeebeJobService.BEFORE_SCRIPT_LINK_NAME,
+								s)
+							}
+							+
+							[
+									new ZeebeLinkedResource(
+											mainScript,
+											ZeebeBindingType.latest,
+											"RPA",
+											"?",
+											ZeebeJobService.MAIN_SCRIPT_LINK_NAME,
+											mainScript)
+							]
+							+
+							postScripts.collect { s ->
+								new ZeebeLinkedResource(
 										s,
 										ZeebeBindingType.latest,
 										"RPA",
 										"?",
-										ZeebeJobService.BEFORE_SCRIPT_LINK_NAME,
+										ZeebeJobService.AFTER_SCRIPT_LINK_NAME,
 										s)
-							}
-									+
-									[
-											new ZeebeLinkedResources.ZeebeLinkedResource(
-													mainScript,
-													ZeebeBindingType.latest,
-													"RPA",
-													"?",
-													ZeebeJobService.MAIN_SCRIPT_LINK_NAME,
-													mainScript)
-									]
-									+
-									postScripts.collect { s ->
-										new ZeebeLinkedResources.ZeebeLinkedResource(
-												s,
-												ZeebeBindingType.latest,
-												"RPA",
-												"?",
-												ZeebeJobService.AFTER_SCRIPT_LINK_NAME,
-												s)
-									}))]
+							})]
 
 			getVariablesAsMap() >> inputVariables
 		}

rpa-worker-application/src/main/java/io/camunda/rpa/worker/zeebe/ZeebeJobService.java

@@ -1,5 +1,6 @@
 package io.camunda.rpa.worker.zeebe;
 
+import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import io.camunda.rpa.worker.pexec.ProcessTimeoutException;
 import io.camunda.rpa.worker.robot.ExecutionResults;
@@ -23,6 +24,7 @@
 import reactor.core.publisher.Mono;
 
 import java.time.Duration;
+import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 import java.util.NoSuchElementException;
@@ -36,7 +38,7 @@ class ZeebeJobService implements ApplicationListener<ZeebeReadyEvent> {
 
 	public static final String ZEEBE_JOB_WORKSPACE_PROPERTY = "ZEEBE_JOB";
 
-	static final String LINKED_RESOURCES_HEADER_NAME = "camunda::linkedResources";
+	static final String LINKED_RESOURCES_HEADER_NAME = "linkedResources";
 	static final String TIMEOUT_HEADER_NAME = "camunda::timeout";
 	static final String MAIN_SCRIPT_LINK_NAME = "RPAScript";
 	static final String BEFORE_SCRIPT_LINK_NAME = "Before";
@@ -71,7 +73,6 @@ ZeebeJobService doInit() {
 								.kv("jobType", jobType)
 								.log("Polling for job"))
 						.flatMapIterable(ActivateJobsResponse::getJobs)
-						.doOnNext(_ -> log.atInfo().log("GOT JOB!")) // TODO
 						.flatMap(this::handleJob), zeebeProperties.maxConcurrentJobs())
 				.subscribe();
 
@@ -181,16 +182,21 @@ public void beforeScriptExecution(Workspace workspace, Duration timeout) {
 	}
 
 	private Flux<String> getScriptKeys(ActivatedJob job, String linkName) {
-		List<ZeebeLinkedResources.ZeebeLinkedResource> linkedResources = Optional.ofNullable(
+		List<ZeebeLinkedResource> linkedResources = Optional.ofNullable(
 						job.getCustomHeaders().get(LINKED_RESOURCES_HEADER_NAME))
-				.map(rawHeader -> Try.of(() -> objectMapper.readValue(rawHeader, ZeebeLinkedResources.class)).get())
+				.map(rawHeader -> Try.of(() -> objectMapper.readValue(rawHeader,
+						new TypeReference<List<ZeebeLinkedResource>>() {})).get())
 				.stream()
-				.flatMap(rs -> rs.linkedResources().stream())
+				.flatMap(Collection::stream)
 				.filter(r -> r.resourceType().equals("RPA"))
 				.filter(r -> r.linkName().equals(linkName))
 				.toList();
 
-		return Flux.fromStream(linkedResources.stream().map(ZeebeLinkedResources.ZeebeLinkedResource::key));
+		return Flux.fromStream(linkedResources.stream().map(ZeebeLinkedResource::resourceKey))
+				.doOnNext(resourceKey -> log.atInfo()
+						.kv("linkName", linkName)
+						.kv("resourceKey", resourceKey)
+						.log("Identified resource key for script"));
 	}
 
 	@SuppressWarnings("unchecked")

rpa-worker-application/src/main/java/io/camunda/rpa/worker/zeebe/ZeebeLinkedResource.java

@@ -0,0 +1,12 @@
+package io.camunda.rpa.worker.zeebe;
+
+import io.camunda.zeebe.model.bpmn.instance.zeebe.ZeebeBindingType;
+
+record ZeebeLinkedResource(
+		String resourceId,
+		ZeebeBindingType bindingType,
+		String resourceType,
+		String versionTag,
+		String linkName,
+		String resourceKey) {
+}