Do NOT disable faulty endpoints by default (RedHatInsights#2567)

gwenneg · Mar 19, 2024 · a285a8a · a285a8a
1 parent c331e4e
commit a285a8a
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 12 deletions.
diff --git a/.rhcicd/clowdapp-connector-google-chat.yaml b/.rhcicd/clowdapp-connector-google-chat.yaml
@@ -174,7 +174,7 @@ parameters:
   value: INFO
 - name: NOTIFICATIONS_CONNECTOR_HTTP_DISABLE_FAULTY_ENDPOINTS
   description: Add flags on connector response to let engine disable endpoint regarding HTTP error type
-  value: "true"
+  value: "false"
 - name: NOTIFICATIONS_UNLEASH_ENABLED
   value: "false"
 - name: QUARKUS_HTTP_PORT

diff --git a/.rhcicd/clowdapp-connector-microsoft-teams.yaml b/.rhcicd/clowdapp-connector-microsoft-teams.yaml
@@ -174,7 +174,7 @@ parameters:
   value: INFO
 - name: NOTIFICATIONS_CONNECTOR_HTTP_DISABLE_FAULTY_ENDPOINTS
   description: Add flags on connector response to let engine disable endpoint regarding HTTP error type
-  value: "true"
+  value: "false"
 - name: NOTIFICATIONS_UNLEASH_ENABLED
   value: "false"
 - name: QUARKUS_HTTP_PORT

diff --git a/.rhcicd/clowdapp-connector-servicenow.yaml b/.rhcicd/clowdapp-connector-servicenow.yaml
@@ -187,7 +187,7 @@ parameters:
   value: INFO
 - name: NOTIFICATIONS_CONNECTOR_HTTP_DISABLE_FAULTY_ENDPOINTS
   description: Add flags on connector response to let engine disable endpoint regarding HTTP error type
-  value: "true"
+  value: "false"
 - name: NOTIFICATIONS_UNLEASH_ENABLED
   value: "false"
 - name: QUARKUS_HTTP_PORT

diff --git a/.rhcicd/clowdapp-connector-splunk.yaml b/.rhcicd/clowdapp-connector-splunk.yaml
@@ -187,7 +187,7 @@ parameters:
   value: INFO
 - name: NOTIFICATIONS_CONNECTOR_HTTP_DISABLE_FAULTY_ENDPOINTS
   description: Add flags on connector response to let engine disable endpoint regarding HTTP error type
-  value: "true"
+  value: "false"
 - name: NOTIFICATIONS_UNLEASH_ENABLED
   value: "false"
 - name: QUARKUS_HTTP_PORT

diff --git a/.rhcicd/clowdapp-connector-webhook.yaml b/.rhcicd/clowdapp-connector-webhook.yaml
@@ -195,7 +195,7 @@ parameters:
   value: INFO
 - name: NOTIFICATIONS_CONNECTOR_HTTP_DISABLE_FAULTY_ENDPOINTS
   description: Add flags on connector response to let engine disable endpoint regarding HTTP error type
-  value: "true"
+  value: "false"
 - name: NOTIFICATIONS_UNLEASH_ENABLED
   value: "false"
 - name: QUARKUS_HTTP_PORT

diff --git a/...http/src/main/java/com/redhat/cloud/notifications/connector/http/HttpConnectorConfig.java b/...http/src/main/java/com/redhat/cloud/notifications/connector/http/HttpConnectorConfig.java
@@ -45,7 +45,7 @@ public class HttpConnectorConfig extends ConnectorConfig {
     @ConfigProperty(name = CONNECTIONS_PER_ROUTE, defaultValue = "20")
     int httpConnectionsPerRoute;
 
-    @ConfigProperty(name = DISABLE_FAULTY_ENDPOINTS, defaultValue = "true")
+    @ConfigProperty(name = DISABLE_FAULTY_ENDPOINTS, defaultValue = "false")
     @Deprecated(forRemoval = true, since = "To be removed when we're done migrating to Unleash in all environments")
     boolean disableFaultyEndpoints;
 
@@ -108,6 +108,11 @@ public boolean isDisableFaultyEndpoints() {
         }
     }
 
+    @Deprecated(forRemoval = true)
+    public void setDisableFaultyEndpoints(boolean disableFaultyEndpoints) {
+        this.disableFaultyEndpoints = disableFaultyEndpoints;
+    }
+
     public boolean isFollowRedirects() {
         return followRedirects;
     }

diff --git a/...est/java/com/redhat/cloud/notifications/connector/webhook/WebhookConnectorRoutesTest.java b/...est/java/com/redhat/cloud/notifications/connector/webhook/WebhookConnectorRoutesTest.java
@@ -4,10 +4,12 @@
 import com.redhat.cloud.notifications.connector.TestLifecycleManager;
 import com.redhat.cloud.notifications.connector.authentication.AuthenticationType;
 import com.redhat.cloud.notifications.connector.authentication.secrets.SecretsLoader;
+import com.redhat.cloud.notifications.connector.http.HttpConnectorConfig;
 import io.quarkus.test.InjectMock;
 import io.quarkus.test.common.QuarkusTestResource;
 import io.quarkus.test.junit.QuarkusTest;
 import io.vertx.core.json.JsonObject;
+import jakarta.inject.Inject;
 import org.apache.camel.Exchange;
 import org.apache.camel.Predicate;
 import org.apache.camel.component.mock.MockEndpoint;
@@ -40,6 +42,9 @@ class WebhookConnectorRoutesTest extends ConnectorRoutesTest {
     @InjectMock
     SecretsLoader secretsLoader;
 
+    @Inject
+    HttpConnectorConfig connectorConfig;
+
     @Override
     protected String getMockEndpointPattern() {
         return "https://foo.bar";
@@ -139,12 +144,17 @@ protected void testFailedNotificationError404() throws Exception {
     }
 
     private void testFailedNotificationAndReturnedFlagsToEngine(int httpReturnCode, String returnedBodyMessage, String flagNameThatShouldBeTrue, final int expectedRedeliveriesCount) throws Exception {
-        mockRemoteServerError(httpReturnCode, returnedBodyMessage);
-        JsonObject returnToEngine = super.testFailedNotification(expectedRedeliveriesCount);
-        JsonObject data = new JsonObject(returnToEngine.getString("data"));
-        assertTrue(data.getBoolean(flagNameThatShouldBeTrue));
-        JsonObject details = data.getJsonObject("details");
-        assertEquals(httpReturnCode, details.getInteger(HTTP_STATUS_CODE));
+        connectorConfig.setDisableFaultyEndpoints(true);
+        try {
+            mockRemoteServerError(httpReturnCode, returnedBodyMessage);
+            JsonObject returnToEngine = super.testFailedNotification(expectedRedeliveriesCount);
+            JsonObject data = new JsonObject(returnToEngine.getString("data"));
+            assertTrue(data.getBoolean(flagNameThatShouldBeTrue));
+            JsonObject details = data.getJsonObject("details");
+            assertEquals(httpReturnCode, details.getInteger(HTTP_STATUS_CODE));
+        } finally {
+            connectorConfig.setDisableFaultyEndpoints(false);
+        }
     }
 
     @Test