whoops missed conflicts

broadinstitute · Dec 4, 2023 · 3d86736 · 3d86736
2 parents bf9b5fe + 408bc29
commit 3d86736
Showing 4 changed files with 8 additions and 22 deletions.
diff --git a/...in/scala/cromwell/backend/google/batch/actors/GcpBatchAsyncBackendJobExecutionActor.scala b/...in/scala/cromwell/backend/google/batch/actors/GcpBatchAsyncBackendJobExecutionActor.scala
@@ -25,22 +25,13 @@ 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,
   StandardAsyncExecutionActor,
   StandardAsyncExecutionActorParams,
   StandardAsyncJob
 }
->>>>>>> develop
 import cromwell.core._
 import cromwell.core.io.IoCommandBuilder
 import cromwell.core.path.{DefaultPathBuilder, Path}

diff --git a/.../cromwell/backend/google/pipelines/common/PipelinesApiAsyncBackendJobExecutionActor.scala b/.../cromwell/backend/google/pipelines/common/PipelinesApiAsyncBackendJobExecutionActor.scala
@@ -36,22 +36,13 @@ 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,
   StandardAsyncExecutionActor,
   StandardAsyncExecutionActorParams,
   StandardAsyncJob
 }
->>>>>>> develop
 import cromwell.core._
 import cromwell.core.io.IoCommandBuilder
 import cromwell.core.path.{DefaultPathBuilder, Path}

diff --git a/...kends/tes/src/main/scala/cromwell/backend/impl/tes/TesAsyncBackendJobExecutionActor.scala b/...kends/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/...s/tes/src/test/scala/cromwell/backend/impl/tes/TesAsyncBackendJobExecutionActorSpec.scala b/...s/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')"""