fix(inbound): report health UP (#2413)

* fix(webhook): report health

* fix(kafka): report initial health

* fix(sns): report health

* fix(sqs): report health

* fix(sqs): report health

* fix(sqs): report health

* fix(sqs): report health

(cherry picked from commit ac7aba5)

connectors/aws/aws-sns/src/main/java/io/camunda/connector/sns/inbound/SnsWebhookExecutable.java

@@ -12,6 +12,7 @@
 import com.amazonaws.services.sns.message.SnsSubscriptionConfirmation;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import io.camunda.connector.api.annotation.InboundConnector;
+import io.camunda.connector.api.inbound.Health;
 import io.camunda.connector.api.inbound.InboundConnectorContext;
 import io.camunda.connector.api.inbound.webhook.MappedHttpRequest;
 import io.camunda.connector.api.inbound.webhook.WebhookConnectorExecutable;
@@ -72,6 +73,7 @@ public class SnsWebhookExecutable implements WebhookConnectorExecutable {
   private final ObjectMapper objectMapper;
   private final SnsClientSupplier snsClientSupplier;
 
+  private InboundConnectorContext context;
   private SnsWebhookConnectorProperties props;
 
   public SnsWebhookExecutable() {
@@ -142,9 +144,11 @@ public void activate(InboundConnectorContext context) throws Exception {
     if (context == null) {
       throw new Exception("Inbound connector context cannot be null");
     }
+    this.context = context;
     props =
         new SnsWebhookConnectorProperties(
             context.bindProperties(SnsWebhookConnectorPropertiesWrapper.class));
+    context.reportHealth(Health.up());
   }
 
   // Topic ARN header has a format arn:aws:sns:region-xyz:000011112222:TopicName, and
@@ -157,4 +161,9 @@ private String extractRegionFromTopicArnHeader(final Map<String, String> headers
                 () -> new Exception("SNS request did not contain header: " + TOPIC_ARN_HEADER));
     return topicArn.split(":")[3];
   }
+
+  @Override
+  public void deactivate() throws Exception {
+    context.reportHealth(Health.down());
+  }
 }

connectors/aws/aws-sqs/src/main/java/io/camunda/connector/inbound/SqsExecutable.java

@@ -8,6 +8,7 @@
 
 import com.amazonaws.services.sqs.AmazonSQS;
 import io.camunda.connector.api.annotation.InboundConnector;
+import io.camunda.connector.api.inbound.Health;
 import io.camunda.connector.api.inbound.InboundConnectorContext;
 import io.camunda.connector.api.inbound.InboundConnectorExecutable;
 import io.camunda.connector.aws.AwsUtils;
@@ -70,6 +71,7 @@ public class SqsExecutable implements InboundConnectorExecutable {
   private final ExecutorService executorService;
   private AmazonSQS amazonSQS;
   private SqsQueueConsumer sqsQueueConsumer;
+  private InboundConnectorContext context;
 
   public SqsExecutable() {
     this.sqsClientSupplier = new DefaultAmazonSQSClientSupplier();
@@ -90,6 +92,8 @@ public void activate(final InboundConnectorContext context) {
     SqsInboundProperties properties = context.bindProperties(SqsInboundProperties.class);
     LOGGER.info("Subscription activation requested by the Connector runtime: {}", properties);
 
+    this.context = context;
+
     var region =
         AwsUtils.extractRegionOrDefault(
             properties.getConfiguration(), properties.getQueue().region());
@@ -102,12 +106,15 @@ public void activate(final InboundConnectorContext context) {
     }
     executorService.execute(sqsQueueConsumer);
     LOGGER.debug("SQS queue consumer started successfully");
+    context.reportHealth(Health.up());
   }
 
   @Override
   public void deactivate() {
+
     sqsQueueConsumer.setQueueConsumerActive(false);
     LOGGER.debug("Deactivating subscription");
+    context.reportHealth(Health.down());
     if (executorService != null) {
       LOGGER.debug("Shutting down executor service");
       executorService.shutdown();

connectors/aws/aws-sqs/src/main/java/io/camunda/connector/inbound/SqsQueueConsumer.java

@@ -11,6 +11,7 @@
 import com.amazonaws.services.sqs.model.ReceiveMessageRequest;
 import com.amazonaws.services.sqs.model.ReceiveMessageResult;
 import io.camunda.connector.api.error.ConnectorInputException;
+import io.camunda.connector.api.inbound.Health;
 import io.camunda.connector.api.inbound.InboundConnectorContext;
 import io.camunda.connector.inbound.model.SqsInboundProperties;
 import java.util.List;
@@ -61,6 +62,7 @@ public void run() {
       }
     } while (queueConsumerActive.get());
     LOGGER.info("Stopping SQS consumer for queue {}", properties.getQueue().url());
+    context.reportHealth(Health.down());
   }
 
   private ReceiveMessageRequest createReceiveMessageRequest() {

connectors/aws/aws-sqs/src/test/java/io/camunda/connector/inbound/SqsExecutableTest.java

@@ -23,13 +23,15 @@
 import com.amazonaws.services.sqs.model.ReceiveMessageResult;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import io.camunda.connector.api.inbound.Health;
 import io.camunda.connector.api.inbound.InboundConnectorContext;
 import io.camunda.connector.api.inbound.InboundConnectorDefinition;
 import io.camunda.connector.api.inbound.ProcessElement;
 import io.camunda.connector.aws.ObjectMapperSupplier;
 import io.camunda.connector.common.suppliers.AmazonSQSClientSupplier;
 import io.camunda.connector.inbound.model.SqsInboundProperties;
 import io.camunda.connector.test.inbound.InboundConnectorContextBuilder;
+import io.camunda.connector.test.inbound.InboundConnectorContextBuilder.TestInboundConnectorContext;
 import io.camunda.connector.test.inbound.InboundConnectorDefinitionBuilder;
 import io.camunda.connector.validation.impl.DefaultValidationProvider;
 import java.io.File;
@@ -108,13 +110,26 @@ public void activateTest(Map<String, Object> properties) throws InterruptedExcep
   @Test
   public void deactivateTest() {
     // Given
-    consumer = new SqsQueueConsumer(sqsClient, null, null);
+    Map<String, Object> properties =
+        Map.of(
+            "authentication",
+            Map.of(
+                "secretKey", ACTUAL_SECRET_KEY,
+                "accessKey", ACTUAL_ACCESS_KEY),
+            "configuration",
+            Map.of("region", "us-east-1"),
+            "queue",
+            Map.of("url", ACTUAL_QUEUE_URL, "pollingWaitTime", "1"));
+    var context = createConnectorContext(properties, createDefinition());
+    consumer = new SqsQueueConsumer(sqsClient, new SqsInboundProperties(), context);
     consumer.setQueueConsumerActive(true);
     SqsExecutable sqsExecutable = new SqsExecutable(supplier, executorService, consumer);
     // When
+    sqsExecutable.activate(context);
     sqsExecutable.deactivate();
     // Then
     assertThat(consumer.isQueueConsumerActive()).isFalse();
+    assertThat(context.getHealth()).isEqualTo(Health.down());
     assertThat(executorService.isShutdown()).isTrue();
   }
 
@@ -123,7 +138,7 @@ private InboundConnectorDefinition createDefinition() {
     return InboundConnectorDefinitionBuilder.create().elements(element).type("type").build();
   }
 
-  private InboundConnectorContext createConnectorContext(
+  private TestInboundConnectorContext createConnectorContext(
       Map<String, Object> properties, InboundConnectorDefinition definition) {
     return InboundConnectorContextBuilder.create()
         .secret(AWS_SECRET_KEY, ACTUAL_SECRET_KEY)

connectors/aws/aws-sqs/src/test/java/io/camunda/connector/inbound/SqsQueueConsumerTest.java

@@ -10,13 +10,14 @@
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.atLeast;
 import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyNoInteractions;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
 import static org.mockito.Mockito.when;
 
 import com.amazonaws.services.sqs.AmazonSQS;
 import com.amazonaws.services.sqs.model.Message;
 import com.amazonaws.services.sqs.model.ReceiveMessageRequest;
 import com.amazonaws.services.sqs.model.ReceiveMessageResult;
+import io.camunda.connector.api.inbound.Health;
 import io.camunda.connector.api.inbound.InboundConnectorContext;
 import io.camunda.connector.inbound.model.SqsInboundProperties;
 import io.camunda.connector.inbound.model.SqsInboundQueueProperties;
@@ -136,6 +137,7 @@ void consumeRun_withNoResults() throws InterruptedException {
     consumer.setQueueConsumerActive(false);
     thread.join();
     // then
-    verifyNoInteractions(context);
+    verify(context).reportHealth(Health.down());
+    verifyNoMoreInteractions(context);
   }
 }

connectors/kafka/src/main/java/io/camunda/connector/kafka/inbound/KafkaConnectorConsumer.java

@@ -58,7 +58,7 @@ public class KafkaConnectorConsumer {
 
   KafkaConnectorProperties elementProps;
 
-  private Health consumerStatus = Health.up();
+  private Health consumerStatus = Health.unknown();
 
   public static ObjectMapper objectMapper =
       new ObjectMapper()

connectors/webhook/src/main/java/io/camunda/connector/inbound/HttpWebhookExecutable.java

@@ -11,6 +11,7 @@
 
 import io.camunda.connector.api.annotation.InboundConnector;
 import io.camunda.connector.api.inbound.Activity;
+import io.camunda.connector.api.inbound.Health;
 import io.camunda.connector.api.inbound.InboundConnectorContext;
 import io.camunda.connector.api.inbound.Severity;
 import io.camunda.connector.api.inbound.webhook.MappedHttpRequest;
@@ -102,6 +103,7 @@ public void activate(InboundConnectorContext context) {
     props = new WebhookConnectorProperties(wrappedProps);
     authChecker = WebhookAuthorizationHandler.getHandlerForAuth(props.auth());
     responseExpression = mapResponseExpression();
+    context.reportHealth(Health.up());
   }
 
   @Override
@@ -223,4 +225,10 @@ public WebhookHttpResponse verify(WebhookProcessingPayload payload) {
     }
     return result;
   }
+
+  @Override
+  public void deactivate() {
+    LOGGER.debug("Deactivating webhook connector");
+    context.reportHealth(Health.down());
+  }
 }