initial implementation

yoyama · Apr 21, 2020 · ad2d6a6 · ad2d6a6
1 parent 7495f63
commit ad2d6a6
Show file tree

Hide file tree

Showing 6 changed files with 124 additions and 22 deletions.
diff --git a/.gitignore b/.gitignore
@@ -23,6 +23,9 @@ docker/bootstrap/requirements.txt
 *.iws
 *.idea
 
+# VSCode
+.project
+
 # generated self-signed cert
 littleproxy_cert
 littleproxy_keystore.jks
diff --git a/digdag-cli/src/main/java/io/digdag/cli/client/ShowAttempt.java b/digdag-cli/src/main/java/io/digdag/cli/client/ShowAttempt.java
@@ -44,16 +44,6 @@ public SystemExitException usage(String error)
     }
 
     private void printAttempt(RestSessionAttempt attempt) {
-        String status;
-        if (attempt.getSuccess()) {
-            status = "success";
-        }
-        else if (attempt.getDone()) {
-            status = "error";
-        }
-        else {
-            status = "running";
-        }
         ln("  session id: %s", attempt.getSessionId());
         ln("  attempt id: %s", attempt.getId());
         ln("  uuid: %s", attempt.getSessionUuid());
@@ -65,7 +55,7 @@ else if (attempt.getDone()) {
         ln("  created at: %s", TimeUtil.formatTime(attempt.getCreatedAt()));
         ln("  finished at: %s", attempt.getFinishedAt().transform(TimeUtil::formatTime).or(""));
         ln("  kill requested: %s", attempt.getCancelRequested());
-        ln("  status: %s", status);
+        ln("  status: %s", attempt.getStatus());
         ln("");
     }
 }
diff --git a/digdag-cli/src/main/java/io/digdag/cli/client/ShowAttempts.java b/digdag-cli/src/main/java/io/digdag/cli/client/ShowAttempts.java
@@ -74,16 +74,6 @@ private void showAttempts(Id sessionId)
     }
 
     private void printAttempt(RestSessionAttempt attempt) {
-        String status;
-        if (attempt.getSuccess()) {
-            status = "success";
-        }
-        else if (attempt.getDone()) {
-            status = "error";
-        }
-        else {
-            status = "running";
-        }
         ln("  session id: %s", attempt.getSessionId());
         ln("  attempt id: %s", attempt.getId());
         ln("  uuid: %s", attempt.getSessionUuid());
@@ -95,7 +85,7 @@ else if (attempt.getDone()) {
         ln("  created at: %s", TimeUtil.formatTime(attempt.getCreatedAt()));
         ln("  finished at: %s", attempt.getFinishedAt().transform(TimeUtil::formatTime).or(""));
         ln("  kill requested: %s", attempt.getCancelRequested());
-        ln("  status: %s", status);
+        ln("  status: %s", attempt.getStatus());
         ln("");
     }
 }
diff --git a/digdag-client/src/main/java/io/digdag/client/api/RestSessionAttempt.java b/digdag-client/src/main/java/io/digdag/client/api/RestSessionAttempt.java
@@ -48,6 +48,19 @@ default int getIndex()
 
     Optional<Instant> getFinishedAt();
 
+    default String getStatus() {
+        if (this.getCancelRequested()) {
+            return "KILLED";
+        }
+        if (this.getSuccess()) {
+            return "SUCCESS";
+        }
+        if (!this.getSuccess() && this.getDone()) {
+            return "ERROR";
+        }
+        return "RUNNING";
+    }
+
     static ImmutableRestSessionAttempt.Builder builder()
     {
         return ImmutableRestSessionAttempt.builder();

diff --git a/digdag-client/src/test/java/io/digdag/client/api/ModelCompatibilityTest.java b/digdag-client/src/test/java/io/digdag/client/api/ModelCompatibilityTest.java
@@ -67,4 +67,96 @@ private String removeField(String json, String field)
         assertThat(node.remove(field) == null, is(false));
         return mapper.writeValueAsString(node);
     }
+
+    @Test
+    public void testSessionAttemptStatusSuccess()
+            throws Exception
+    {
+        RestSessionAttempt attempt = RestSessionAttempt.builder()
+            .id(Id.of("1"))
+            .index(3)
+            .project(IdAndName.of(Id.of("1"), "p"))
+            .workflow(NameOptionalId.of("w", Optional.of(Id.of("1"))))
+            .sessionId(Id.of("1"))
+            .sessionUuid(UUID.randomUUID())
+            .sessionTime(OffsetDateTime.now(ZoneId.of("UTC")))
+            .retryAttemptName(Optional.absent())
+            .done(false)
+            .success(true)
+            .cancelRequested(false)
+            .params(newConfig())
+            .createdAt(Instant.now())
+            .finishedAt(Optional.absent())
+            .build();
+        assertThat(attempt.getStatus(), is("SUCCESS"));
+    }
+
+    @Test
+    public void testSessionAttemptStatusError()
+            throws Exception
+    {
+        RestSessionAttempt attempt = RestSessionAttempt.builder()
+            .id(Id.of("1"))
+            .index(3)
+            .project(IdAndName.of(Id.of("1"), "p"))
+            .workflow(NameOptionalId.of("w", Optional.of(Id.of("1"))))
+            .sessionId(Id.of("1"))
+            .sessionUuid(UUID.randomUUID())
+            .sessionTime(OffsetDateTime.now(ZoneId.of("UTC")))
+            .retryAttemptName(Optional.absent())
+            .done(true)
+            .success(false)
+            .cancelRequested(false)
+            .params(newConfig())
+            .createdAt(Instant.now())
+            .finishedAt(Optional.absent())
+            .build();
+        assertThat(attempt.getStatus(), is("ERROR"));
+    }
+
+    @Test
+    public void testSessionAttemptStatusKilled()
+            throws Exception
+    {
+        RestSessionAttempt attempt = RestSessionAttempt.builder()
+            .id(Id.of("1"))
+            .index(3)
+            .project(IdAndName.of(Id.of("1"), "p"))
+            .workflow(NameOptionalId.of("w", Optional.of(Id.of("1"))))
+            .sessionId(Id.of("1"))
+            .sessionUuid(UUID.randomUUID())
+            .sessionTime(OffsetDateTime.now(ZoneId.of("UTC")))
+            .retryAttemptName(Optional.absent())
+            .done(false)
+            .success(false)
+            .cancelRequested(true)
+            .params(newConfig())
+            .createdAt(Instant.now())
+            .finishedAt(Optional.absent())
+            .build();
+        assertThat(attempt.getStatus(), is("KILLED"));
+    }
+
+    @Test
+    public void testSessionAttemptStatusRunning()
+            throws Exception
+    {
+        RestSessionAttempt attempt = RestSessionAttempt.builder()
+            .id(Id.of("1"))
+            .index(3)
+            .project(IdAndName.of(Id.of("1"), "p"))
+            .workflow(NameOptionalId.of("w", Optional.of(Id.of("1"))))
+            .sessionId(Id.of("1"))
+            .sessionUuid(UUID.randomUUID())
+            .sessionTime(OffsetDateTime.now(ZoneId.of("UTC")))
+            .retryAttemptName(Optional.absent())
+            .done(false)
+            .success(false)
+            .cancelRequested(false)
+            .params(newConfig())
+            .createdAt(Instant.now())
+            .finishedAt(Optional.absent())
+            .build();
+        assertThat(attempt.getStatus(), is("RUNNING"));
+    }
 }
diff --git a/digdag-docs/src/_extra/api/swagger.yaml b/digdag-docs/src/_extra/api/swagger.yaml
@@ -1239,6 +1239,13 @@ definitions:
       cancelRequested:
         type: "boolean"
         default: false
+      status:
+        type: "string"
+        enum:
+        - "SUCCESS"
+        - "ERROR"
+        - "KILLED"
+        - "RUNNING"
   RestLogFilePutResult:
     type: "object"
     properties:
@@ -1582,6 +1589,13 @@ definitions:
       index:
         type: "integer"
         format: "int32"
+      status:
+        type: "string"
+        enum:
+        - "SUCCESS"
+        - "ERROR"
+        - "KILLED"
+        - "RUNNING"
   OffsetDateTime:
     type: "object"
     properties: