Add optional fields CheckId and Name to check during registration (#444)

rickfast · Jun 6, 2021 · 52c40a8 · 52c40a8
1 parent 67f8449
commit 52c40a8
Show file tree

Hide file tree

Showing 2 changed files with 72 additions and 0 deletions.
diff --git a/src/itest/java/com/orbitz/consul/AgentITest.java b/src/itest/java/com/orbitz/consul/AgentITest.java
@@ -125,6 +125,72 @@ public void shouldRegisterGrpcCheck() throws UnknownHostException, InterruptedEx
         assertTrue(found);
     }
 
+    @Test
+    @Ignore
+    public void shouldRegisterCheckWithId() throws UnknownHostException, InterruptedException {
+        String serviceName = UUID.randomUUID().toString();
+        String serviceId = UUID.randomUUID().toString();
+        String checkId = UUID.randomUUID().toString();
+
+        Registration registration = ImmutableRegistration.builder()
+                .name(serviceName)
+                .id(serviceId)
+                .addChecks(ImmutableRegCheck.builder()
+                        .id(checkId)
+                        .ttl("10s")
+                        .build())
+                .build();
+
+        client.agentClient().register(registration);
+
+        Synchroniser.pause(Duration.ofMillis(100));
+
+        boolean found = false;
+
+        for (ServiceHealth health : client.healthClient().getAllServiceInstances(serviceName).getResponse()) {
+            if (health.getService().getId().equals(serviceId)) {
+                found = true;
+                assertThat(health.getChecks().size(), is(2));
+                assertTrue(health.getChecks().stream().anyMatch(check -> check.getCheckId().equals(checkId)));
+            }
+        }
+
+        assertTrue(found);
+    }
+
+    @Test
+    @Ignore
+    public void shouldRegisterCheckWithName() throws UnknownHostException, InterruptedException {
+        String serviceName = UUID.randomUUID().toString();
+        String serviceId = UUID.randomUUID().toString();
+        String checkName = UUID.randomUUID().toString();
+
+        Registration registration = ImmutableRegistration.builder()
+                .name(serviceName)
+                .id(serviceId)
+                .addChecks(ImmutableRegCheck.builder()
+                        .name(checkName)
+                        .ttl("10s")
+                        .build())
+                .build();
+
+        client.agentClient().register(registration);
+
+        Synchroniser.pause(Duration.ofMillis(100));
+
+        boolean found = false;
+
+        for (ServiceHealth health : client.healthClient().getAllServiceInstances(serviceName).getResponse()) {
+            if (health.getService().getId().equals(serviceId)) {
+                found = true;
+                assertThat(health.getChecks().size(), is(2));
+                assertTrue(health.getChecks().stream().anyMatch(check -> check.getName().equals(checkName)));
+            }
+        }
+
+        assertTrue(found);
+    }
+
     @Test
     @Ignore
     public void shouldRegisterMultipleChecks() throws UnknownHostException, InterruptedException, MalformedURLException {

diff --git a/src/main/java/com/orbitz/consul/model/agent/Registration.java b/src/main/java/com/orbitz/consul/model/agent/Registration.java
@@ -60,6 +60,12 @@ public abstract class Registration {
     @JsonInclude(JsonInclude.Include.NON_NULL)
     public abstract static class RegCheck {
 
+        @JsonProperty("CheckID")
+        public abstract Optional<String> getId();
+
+        @JsonProperty("Name")
+        public abstract Optional<String> getName();
+
         @JsonProperty("Args")
         public abstract Optional<List<String>> getArgs();