Skip to content

[WX-1393] Add Content Length to Curl request #7328

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 4, 2023
Merged

[WX-1393] Add Content Length to Curl request #7328

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1ee1825
add content length
THWiseman Dec 4, 2023
ae2ba49
fix unit test
THWiseman Dec 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions ...kends/tes/src/main/scala/cromwell/backend/impl/tes/TesAsyncBackendJobExecutionActor.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,11 +100,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%\\"}"
Expand All @@ -117,7 +117,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')
Expand Down
4 changes: 3 additions & 1 deletion ...s/tes/src/test/scala/cromwell/backend/impl/tes/TesAsyncBackendJobExecutionActorSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,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')"""
val echoCommandSubstring = s"""echo "Saving sas token: $${$mockEnvironmentVariableNameFromWom:0:4}**** to environment variable $mockEnvironmentVariableNameFromWom...""""
Expand Down