Skip to content

Commit c47fe3c

Browse files
committed
3.0.2 updates for Aloe release to jobs service
1 parent 20cd107 commit c47fe3c

File tree

10 files changed

+30
-891
lines changed

10 files changed

+30
-891
lines changed

CHANGELOG.md

100644100755
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,17 @@
11
# Change Log
22
All notable changes to this project will be documented in this file.
33

4+
## 3.0.2 - 2019-06-25
5+
### ADDED
6+
- jobs-hide and jobs-unhide; this replaces jobs-delete and jobs-restore
7+
8+
### CHANGED
9+
- Updated jobs-submit and jobs-template to reflect the new jobs service API updates
10+
11+
### REMOVED
12+
- Depricated commands jobs-tail, jobs-delete (now jobs-hide), jobs-restore (now jobs-unhide), jobs-kick, jobs-run-this, and jobs-output
13+
14+
415
## 3.0.1 - 2019-04-23
516
### ADDED
617
- Updated documentation to reflect transition to api.tacc.utexas.edu

Dockerfile.public

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ LABEL org.label-schema.vendor = "Texas Advanced Computing Center"
44
LABEL org.label-schema.name = "TACC Tapis API CLI"
55
LABEL org.label-schema.vcs-url = "https://github.com/TACC-Cloud/home"
66
LABEL org.label-schema.vcs-ref = "master"
7-
LABEL org.label-schema.version = "3.0.1"
7+
LABEL org.label-schema.version = "3.0.2"
88
LABEL org.label-schema.organization=tacc.cloud
99
LABEL cloud.tacc.project="Tapis API CLI"
1010

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.0.1
1+
3.0.2

bin/jobs-delete renamed to bin/jobs-hide

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
#!/bin/bash
22
#
3-
# jobs-delete
3+
# jobs-hide
44
#
55
# author: opensource@tacc.cloud
66
#
77
# This script is part of the Agave API command line interface (CLI).
8-
# It deletes a job. If running the job will be stopped.
9-
#
8+
# It marks a job as invisible to most APIs like job listing or history calls.
9+
# This can only be done for jobs in a terminal state.
1010

1111
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
1212

@@ -22,7 +22,8 @@ interactive_opts=(apisecret apikey)
2222
usage() {
2323
echo -n "$(basename $0) [OPTION]... [JOB_ID]
2424
25-
Delete an existing job. If running, the job will be killed.
25+
Hide an existing job from most APIs, such as listing and history. If the job is
26+
still running, it cannot be hidden. It must be stopped first.
2627
2728
Options:
2829
-z, --access_token Access token
@@ -51,16 +52,16 @@ main() {
5152
#set -x
5253

5354
if [ -z "$args" ]; then
54-
err "Please specify a valid app id to delete"
55+
err "Please specify a valid app id to hide"
5556
else
5657

57-
cmd="curl -sk -H \"${authheader}\" -X DELETE '$hosturl$args?pretty=true'"
58+
cmd="curl -sk -H \"${authheader}\" -H \"Content-Type: application/json\" -X POST '$hosturl${args}/hide?pretty=true'"
5859

5960
if ((veryverbose)); then
6061
[ "$piped" -eq 0 ] && log "Calling $cmd"
6162
fi
6263

63-
response=`curl -sk -H "${authheader}" -X DELETE "$hosturl$args?pretty=true"`
64+
response=`curl -sk -H "${authheader}" -H "Content-Type: application/json" -X POST "$hosturl${args}/hide?pretty=true"`
6465

6566
if [[ $(jsonquery "$response" "status") = 'success' ]]; then
6667
result=$(format_api_json "$response")
@@ -80,7 +81,7 @@ format_api_json() {
8081
result=$(jsonquery "$1" "result" 1)
8182
json_prettyify "${result}"
8283
else
83-
echo "Successfully deleted job $args"
84+
echo "Successfully hid job $args"
8485
fi
8586
}
8687

bin/jobs-kick

Lines changed: 0 additions & 141 deletions
This file was deleted.

bin/jobs-output

Lines changed: 0 additions & 157 deletions
This file was deleted.

0 commit comments

Comments
 (0)