diff --git a/supportedBackends/google/batch/src/main/scala/cromwell/backend/google/batch/actors/GcpBatchAsyncBackendJobExecutionActor.scala b/supportedBackends/google/batch/src/main/scala/cromwell/backend/google/batch/actors/GcpBatchAsyncBackendJobExecutionActor.scala index 3e1ea8ff266..eba54bdc4c3 100644 --- a/supportedBackends/google/batch/src/main/scala/cromwell/backend/google/batch/actors/GcpBatchAsyncBackendJobExecutionActor.scala +++ b/supportedBackends/google/batch/src/main/scala/cromwell/backend/google/batch/actors/GcpBatchAsyncBackendJobExecutionActor.scala @@ -25,14 +25,6 @@ import cromwell.filesystems.gcs.GcsPathBuilder import cromwell.filesystems.gcs.GcsPathBuilder.ValidFullGcsPath import java.io.FileNotFoundException -<<<<<<< HEAD -import cromwell.backend.standard.{ - StandardAdHocValue, - StandardAsyncExecutionActor, - StandardAsyncExecutionActorParams, - StandardAsyncJob -} -======= import cromwell.backend.standard.{ ScriptPreambleData, StandardAdHocValue, @@ -40,7 +32,6 @@ import cromwell.backend.standard.{ StandardAsyncExecutionActorParams, StandardAsyncJob } ->>>>>>> develop import cromwell.core._ import cromwell.core.io.IoCommandBuilder import cromwell.core.path.{DefaultPathBuilder, Path} diff --git a/supportedBackends/google/pipelines/common/src/main/scala/cromwell/backend/google/pipelines/common/PipelinesApiAsyncBackendJobExecutionActor.scala b/supportedBackends/google/pipelines/common/src/main/scala/cromwell/backend/google/pipelines/common/PipelinesApiAsyncBackendJobExecutionActor.scala index 68b11261fb0..fa079ea86b2 100644 --- a/supportedBackends/google/pipelines/common/src/main/scala/cromwell/backend/google/pipelines/common/PipelinesApiAsyncBackendJobExecutionActor.scala +++ b/supportedBackends/google/pipelines/common/src/main/scala/cromwell/backend/google/pipelines/common/PipelinesApiAsyncBackendJobExecutionActor.scala @@ -36,14 +36,6 @@ import cromwell.backend.google.pipelines.common.errors.FailedToDelocalizeFailure import cromwell.backend.google.pipelines.common.io._ import cromwell.backend.google.pipelines.common.monitoring.{CheckpointingConfiguration, MonitoringImage} import cromwell.backend.io.DirectoryFunctions -<<<<<<< HEAD -import cromwell.backend.standard.{ - StandardAdHocValue, - StandardAsyncExecutionActor, - StandardAsyncExecutionActorParams, - StandardAsyncJob -} -======= import cromwell.backend.standard.{ ScriptPreambleData, StandardAdHocValue, @@ -51,7 +43,6 @@ import cromwell.backend.standard.{ StandardAsyncExecutionActorParams, StandardAsyncJob } ->>>>>>> develop import cromwell.core._ import cromwell.core.io.IoCommandBuilder import cromwell.core.path.{DefaultPathBuilder, Path} diff --git a/supportedBackends/tes/src/main/scala/cromwell/backend/impl/tes/TesAsyncBackendJobExecutionActor.scala b/supportedBackends/tes/src/main/scala/cromwell/backend/impl/tes/TesAsyncBackendJobExecutionActor.scala index aeac572fea2..d7a19685cd8 100644 --- a/supportedBackends/tes/src/main/scala/cromwell/backend/impl/tes/TesAsyncBackendJobExecutionActor.scala +++ b/supportedBackends/tes/src/main/scala/cromwell/backend/impl/tes/TesAsyncBackendJobExecutionActor.scala @@ -113,11 +113,11 @@ object TesAsyncBackendJobExecutionActor { | exit 1 | fi |fi - | + |curl --version + |jq --version |# Acquire bearer token, relying on the User Assigned Managed Identity of this VM. |echo Acquiring Bearer Token using User Assigned Managed Identity... |BEARER_TOKEN=$$(curl 'http://169.254.169.254/metadata/identity/oauth2/token?api-version=2018-02-01&resource=https%3A%2F%2Fmanagement.azure.com%2F' -H Metadata:true -s | jq .access_token) - | |# Remove the leading and trailing quotes |BEARER_TOKEN="$${BEARER_TOKEN#\\"}" |BEARER_TOKEN="$${BEARER_TOKEN%\\"}" @@ -130,7 +130,9 @@ object TesAsyncBackendJobExecutionActor { | -X POST "$getSasWsmEndpoint" \\ | -H "Content-Type: application/json" \\ | -H "accept: */*" \\ - | -H "Authorization: Bearer $${BEARER_TOKEN}") + | -H "Authorization: Bearer $${BEARER_TOKEN}" \\ + | -H "Content-Length: 0" \\ + | -d "") | |# Store token as environment variable |export $environmentVariableName=$$(echo "$${sas_response_json}" | jq -r '.token') diff --git a/supportedBackends/tes/src/test/scala/cromwell/backend/impl/tes/TesAsyncBackendJobExecutionActorSpec.scala b/supportedBackends/tes/src/test/scala/cromwell/backend/impl/tes/TesAsyncBackendJobExecutionActorSpec.scala index 5a8e4ca751a..53ba95606d0 100644 --- a/supportedBackends/tes/src/test/scala/cromwell/backend/impl/tes/TesAsyncBackendJobExecutionActorSpec.scala +++ b/supportedBackends/tes/src/test/scala/cromwell/backend/impl/tes/TesAsyncBackendJobExecutionActorSpec.scala @@ -156,7 +156,9 @@ class TesAsyncBackendJobExecutionActorSpec extends AnyFlatSpec with Matchers wit | -X POST "$expectedEndpoint" \\ | -H "Content-Type: application/json" \\ | -H "accept: */*" \\ - | -H "Authorization: Bearer $${BEARER_TOKEN}") + | -H "Authorization: Bearer $${BEARER_TOKEN}" \\ + | -H "Content-Length: 0" \\ + | -d "") |""".stripMargin val exportCommandSubstring = s"""export $mockEnvironmentVariableNameFromWom=$$(echo "$${sas_response_json}" | jq -r '.token')"""