From 6f30c163bcd368be15090ced03e98f3fa1668e6b Mon Sep 17 00:00:00 2001 From: Daniel Barnes Date: Thu, 4 May 2023 07:21:29 +0900 Subject: [PATCH] studio helper update (#753) * update studio payload * test update --- task/common/machine/machine-script.sh.tpl | 10 +++++----- .../common/machine/testdata/machine_script_full.golden | 10 +++++----- .../machine/testdata/machine_script_minimal.golden | 10 +++++----- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/task/common/machine/machine-script.sh.tpl b/task/common/machine/machine-script.sh.tpl index ce5a9217..b4697a9f 100755 --- a/task/common/machine/machine-script.sh.tpl +++ b/task/common/machine/machine-script.sh.tpl @@ -17,7 +17,7 @@ chmod u=rwx,g=rx,o=rx /usr/bin/tpi-task-shutdown sudo tee /usr/bin/tpi-task-studio-log << 'END' #!/bin/bash -URL="${STUDIO_ENDPOINT:-https://studio.iterative.ai/api/live}" +URL="${DVC_STUDIO_URL:-https://studio.iterative.ai}" STEP="${STUDIO_STEP:-`echo $(date +%s)`}" STATUS=$1 DATE_START="${TPI_TASK_DATE_START:-0}" @@ -40,11 +40,11 @@ if [ -n "$STUDIO_TOKEN" ]; then DATE_END=$(date +%s) fi - STUDIO_PARAMS="{\"task\": {\"id\": \"${TPI_TASK_IDENTIFIER}\", \"status\": \"${STATUS}\", \"cloud\": \"${TPI_TASK_CLOUD_PROVIDER}\", \"machine\": \"${TPI_MACHINE}\", \"region\": \"${TPI_REGION}\", \"diskSize\": \"${TPI_DISK_SIZE}\", \"dateStart\": ${DATE_START}, \"dateEnd\": ${DATE_END}}}" - STUDIO_PAYLOAD="{\"type\": \"data\", \"client\": \"dvclive\", \"repo_url\": \"${STUDIO_REPO_URL}\", \"baseline_sha\": \"${STUDIO_BASELINE_SHA}\", \"name\": \"${TPI_TASK_IDENTIFIER}\", \"step\":${STEP}, \"params\": ${STUDIO_PARAMS}}" - curl -X POST $URL \ + STUDIO_PARAMS="{\"id\": \"${TPI_TASK_IDENTIFIER}\", \"status\": \"${STATUS}\", \"cloud\": \"${TPI_TASK_CLOUD_PROVIDER}\", \"instance_type\": \"${TPI_MACHINE}\", \"region\": \"${TPI_REGION}\", \"diskSize\": \"${TPI_DISK_SIZE}\"}" + STUDIO_PAYLOAD="{\"type\": \"data\", \"client\": \"dvclive\", \"repo_url\": \"${STUDIO_REPO_URL}\", \"baseline_sha\": \"${STUDIO_BASELINE_SHA}\", \"name\": \"${TPI_TASK_IDENTIFIER}\", \"step\":${STEP}, \"machine\": ${STUDIO_PARAMS}}" + curl -X POST "$URL/api/live" \ -H "Content-Type: application/json" \ - -H "Authorization: token ${STUDIO_TOKEN}" \ + -H "Authorization: token ${DVC_STUDIO_TOKEN}" \ -d "${STUDIO_PAYLOAD}" fi END diff --git a/task/common/machine/testdata/machine_script_full.golden b/task/common/machine/testdata/machine_script_full.golden index abd42315..4d4fb99c 100644 --- a/task/common/machine/testdata/machine_script_full.golden +++ b/task/common/machine/testdata/machine_script_full.golden @@ -17,7 +17,7 @@ chmod u=rwx,g=rx,o=rx /usr/bin/tpi-task-shutdown sudo tee /usr/bin/tpi-task-studio-log << 'END' #!/bin/bash -URL="${STUDIO_ENDPOINT:-https://studio.iterative.ai/api/live}" +URL="${DVC_STUDIO_URL:-https://studio.iterative.ai}" STEP="${STUDIO_STEP:-`echo $(date +%s)`}" STATUS=$1 DATE_START="${TPI_TASK_DATE_START:-0}" @@ -40,11 +40,11 @@ if [ -n "$STUDIO_TOKEN" ]; then DATE_END=$(date +%s) fi - STUDIO_PARAMS="{\"task\": {\"id\": \"${TPI_TASK_IDENTIFIER}\", \"status\": \"${STATUS}\", \"cloud\": \"${TPI_TASK_CLOUD_PROVIDER}\", \"machine\": \"${TPI_MACHINE}\", \"region\": \"${TPI_REGION}\", \"diskSize\": \"${TPI_DISK_SIZE}\", \"dateStart\": ${DATE_START}, \"dateEnd\": ${DATE_END}}}" - STUDIO_PAYLOAD="{\"type\": \"data\", \"client\": \"dvclive\", \"repo_url\": \"${STUDIO_REPO_URL}\", \"baseline_sha\": \"${STUDIO_BASELINE_SHA}\", \"name\": \"${TPI_TASK_IDENTIFIER}\", \"step\":${STEP}, \"params\": ${STUDIO_PARAMS}}" - curl -X POST $URL \ + STUDIO_PARAMS="{\"id\": \"${TPI_TASK_IDENTIFIER}\", \"status\": \"${STATUS}\", \"cloud\": \"${TPI_TASK_CLOUD_PROVIDER}\", \"instance_type\": \"${TPI_MACHINE}\", \"region\": \"${TPI_REGION}\", \"diskSize\": \"${TPI_DISK_SIZE}\"}" + STUDIO_PAYLOAD="{\"type\": \"data\", \"client\": \"dvclive\", \"repo_url\": \"${STUDIO_REPO_URL}\", \"baseline_sha\": \"${STUDIO_BASELINE_SHA}\", \"name\": \"${TPI_TASK_IDENTIFIER}\", \"step\":${STEP}, \"machine\": ${STUDIO_PARAMS}}" + curl -X POST "$URL/api/live" \ -H "Content-Type: application/json" \ - -H "Authorization: token ${STUDIO_TOKEN}" \ + -H "Authorization: token ${DVC_STUDIO_TOKEN}" \ -d "${STUDIO_PAYLOAD}" fi END diff --git a/task/common/machine/testdata/machine_script_minimal.golden b/task/common/machine/testdata/machine_script_minimal.golden index 14c47dfb..44dafb46 100644 --- a/task/common/machine/testdata/machine_script_minimal.golden +++ b/task/common/machine/testdata/machine_script_minimal.golden @@ -17,7 +17,7 @@ chmod u=rwx,g=rx,o=rx /usr/bin/tpi-task-shutdown sudo tee /usr/bin/tpi-task-studio-log << 'END' #!/bin/bash -URL="${STUDIO_ENDPOINT:-https://studio.iterative.ai/api/live}" +URL="${DVC_STUDIO_URL:-https://studio.iterative.ai}" STEP="${STUDIO_STEP:-`echo $(date +%s)`}" STATUS=$1 DATE_START="${TPI_TASK_DATE_START:-0}" @@ -40,11 +40,11 @@ if [ -n "$STUDIO_TOKEN" ]; then DATE_END=$(date +%s) fi - STUDIO_PARAMS="{\"task\": {\"id\": \"${TPI_TASK_IDENTIFIER}\", \"status\": \"${STATUS}\", \"cloud\": \"${TPI_TASK_CLOUD_PROVIDER}\", \"machine\": \"${TPI_MACHINE}\", \"region\": \"${TPI_REGION}\", \"diskSize\": \"${TPI_DISK_SIZE}\", \"dateStart\": ${DATE_START}, \"dateEnd\": ${DATE_END}}}" - STUDIO_PAYLOAD="{\"type\": \"data\", \"client\": \"dvclive\", \"repo_url\": \"${STUDIO_REPO_URL}\", \"baseline_sha\": \"${STUDIO_BASELINE_SHA}\", \"name\": \"${TPI_TASK_IDENTIFIER}\", \"step\":${STEP}, \"params\": ${STUDIO_PARAMS}}" - curl -X POST $URL \ + STUDIO_PARAMS="{\"id\": \"${TPI_TASK_IDENTIFIER}\", \"status\": \"${STATUS}\", \"cloud\": \"${TPI_TASK_CLOUD_PROVIDER}\", \"instance_type\": \"${TPI_MACHINE}\", \"region\": \"${TPI_REGION}\", \"diskSize\": \"${TPI_DISK_SIZE}\"}" + STUDIO_PAYLOAD="{\"type\": \"data\", \"client\": \"dvclive\", \"repo_url\": \"${STUDIO_REPO_URL}\", \"baseline_sha\": \"${STUDIO_BASELINE_SHA}\", \"name\": \"${TPI_TASK_IDENTIFIER}\", \"step\":${STEP}, \"machine\": ${STUDIO_PARAMS}}" + curl -X POST "$URL/api/live" \ -H "Content-Type: application/json" \ - -H "Authorization: token ${STUDIO_TOKEN}" \ + -H "Authorization: token ${DVC_STUDIO_TOKEN}" \ -d "${STUDIO_PAYLOAD}" fi END