config = new TreeMap<>();
+ config.put(SINGLE_DAILY_DIGEST, isSingleDailyDigestEnabled());
+ config.put(UNLEASH, unleashEnabled);
+
+ Log.info("=== Startup configuration ===");
+ config.forEach((key, value) -> {
+ Log.infof("%s=%s", key, value);
+ });
+ }
+
+ public boolean isSingleDailyDigestEnabled() {
+ if (unleashEnabled) {
+ return unleash.isEnabled(SINGLE_DAILY_DIGEST, false);
+ } else {
+ return singleDailyDigestEnabled;
+ }
+ }
+}
diff --git a/aggregator/src/main/java/com/redhat/cloud/notifications/config/FeatureFlipper.java b/aggregator/src/main/java/com/redhat/cloud/notifications/config/FeatureFlipper.java
deleted file mode 100644
index 7b39d702ed..0000000000
--- a/aggregator/src/main/java/com/redhat/cloud/notifications/config/FeatureFlipper.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package com.redhat.cloud.notifications.config;
-
-import io.quarkus.logging.Log;
-import io.quarkus.runtime.StartupEvent;
-import io.quarkus.runtime.configuration.ProfileManager;
-import jakarta.enterprise.context.ApplicationScoped;
-import jakarta.enterprise.event.Observes;
-import org.eclipse.microprofile.config.inject.ConfigProperty;
-
-import static io.quarkus.runtime.LaunchMode.TEST;
-
-/**
- *
- * This class centralizes all configuration values used to enable or disable a feature.
- *
- *
- * Any config value used to flip a temporary or permanent feature can be added that way:
- *
- * @ApplicationScoped
- * public class FeatureFlipper {
- *
- * @ConfigProperty(name = "amazing-feature.enabled", defaultValue = "false")
- * boolean amazingFeatureEnabled;
- *
- * public boolean isAmazingFeatureEnabled() {
- * return amazingFeatureEnabled;
- * }
- *
- * public void setAmazingFeatureEnabled(boolean amazingFeatureEnabled) {
- * // Add this if the config value should only be overridden in TEST launch mode.
- * checkTestLaunchMode();
- * this.amazingFeatureEnabled = amazingFeatureEnabled;
- * }
- * }
- *
- *
- */
-@ApplicationScoped
-public class FeatureFlipper {
-
- @ConfigProperty(name = "notifications.bundle.level.digest.enabled", defaultValue = "false")
- boolean singleDailyDigestEnabled;
-
- void logFeaturesStatusAtStartup(@Observes StartupEvent event) {
- Log.infof("=== %s startup status ===", FeatureFlipper.class.getSimpleName());
- Log.infof("The daily digest at bundle level is %s", singleDailyDigestEnabled ? "enabled" : "disabled");
-
- }
-
- public boolean isSingleDailyDigestEnabled() {
- return singleDailyDigestEnabled;
- }
-
- public void setSingleDailyDigestEnabled(boolean singleDailyDigestEnabled) {
- checkTestLaunchMode();
- this.singleDailyDigestEnabled = singleDailyDigestEnabled;
- }
-
- /**
- * This method throws an {@link IllegalStateException} if it is invoked with a launch mode different from
- * {@link io.quarkus.runtime.LaunchMode#TEST TEST}. It should be added to methods that allow overriding a
- * config value from tests only, preventing doing so from runtime code.
- */
- private static void checkTestLaunchMode() {
- if (ProfileManager.getLaunchMode() != TEST) {
- throw new IllegalStateException("Illegal config value override detected");
- }
- }
-}
diff --git a/aggregator/src/main/resources/application.properties b/aggregator/src/main/resources/application.properties
index 9da22f374c..b0ff72a250 100644
--- a/aggregator/src/main/resources/application.properties
+++ b/aggregator/src/main/resources/application.properties
@@ -38,3 +38,7 @@ quarkus.log.cloudwatch.access-key-id=placeholder
quarkus.log.cloudwatch.access-key-secret=placeholder
%test.quarkus.flyway.migrate-at-start=true
+
+quarkus.unleash.active=false
+quarkus.unleash.synchronous-fetch-on-initialisation=true
+quarkus.unleash.url=http://localhost:4242
diff --git a/backend/src/main/java/com/redhat/cloud/notifications/config/BackendConfig.java b/backend/src/main/java/com/redhat/cloud/notifications/config/BackendConfig.java
new file mode 100644
index 0000000000..99693e27b0
--- /dev/null
+++ b/backend/src/main/java/com/redhat/cloud/notifications/config/BackendConfig.java
@@ -0,0 +1,133 @@
+package com.redhat.cloud.notifications.config;
+
+import io.getunleash.Unleash;
+import io.quarkus.logging.Log;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.event.Observes;
+import jakarta.enterprise.event.Startup;
+import jakarta.inject.Inject;
+import org.eclipse.microprofile.config.inject.ConfigProperty;
+
+import java.util.Map;
+import java.util.TreeMap;
+
+@ApplicationScoped
+public class BackendConfig {
+
+ /*
+ * Env vars configuration
+ */
+ private static final String DEFAULT_TEMPLATE = "notifications.use-default-template";
+ private static final String EMAILS_ONLY_MODE = "notifications.emails-only-mode.enabled";
+ private static final String INSTANT_EMAILS = "notifications.instant-emails.enabled";
+ private static final String UNLEASH = "notifications.unleash.enabled";
+
+ /*
+ * Unleash configuration
+ */
+ private static final String DRAWER = toggleName("drawer");
+ private static final String FORBID_SLACK_CHANNEL_USAGE = toggleName("forbid-slack-channel-usage");
+ private static final String UNIQUE_BG_NAME = toggleName("unique-bg-name");
+ private static final String UNIQUE_INTEGRATION_NAME = toggleName("unique-integration-name");
+
+ private static String toggleName(String feature) {
+ return String.format("notifications-backend.%s.enabled", feature);
+ }
+
+ @ConfigProperty(name = UNLEASH, defaultValue = "false")
+ @Deprecated(forRemoval = true, since = "To be removed when we're done migrating to Unleash in all environments")
+ boolean unleashEnabled;
+
+ @ConfigProperty(name = "notifications.enforce-bg-name-unicity", defaultValue = "false")
+ @Deprecated(forRemoval = true, since = "To be removed when we're done migrating to Unleash in all environments")
+ boolean enforceBehaviorGroupNameUnicity;
+
+ @ConfigProperty(name = "notifications.enforce-integration-name-unicity", defaultValue = "false")
+ @Deprecated(forRemoval = true, since = "To be removed when we're done migrating to Unleash in all environments")
+ boolean enforceIntegrationNameUnicity;
+
+ @ConfigProperty(name = "notifications.drawer.enabled", defaultValue = "false")
+ @Deprecated(forRemoval = true, since = "To be removed when we're done migrating to Unleash in all environments")
+ boolean drawerEnabled;
+
+ @ConfigProperty(name = "notifications.slack.forbid.channel.usage.enabled", defaultValue = "false")
+ @Deprecated(forRemoval = true, since = "To be removed when we're done migrating to Unleash in all environments")
+ boolean slackForbidChannelUsageEnabled;
+
+ // Only used in stage environments.
+ @ConfigProperty(name = DEFAULT_TEMPLATE, defaultValue = "false")
+ boolean defaultTemplateEnabled;
+
+ // Only used in special environments.
+ @ConfigProperty(name = EMAILS_ONLY_MODE, defaultValue = "false")
+ boolean emailsOnlyModeEnabled;
+
+ // Only used in special environments.
+ @ConfigProperty(name = INSTANT_EMAILS, defaultValue = "false")
+ boolean instantEmailsEnabled;
+
+ @Inject
+ Unleash unleash;
+
+ void logConfigAtStartup(@Observes Startup event) {
+
+ Map config = new TreeMap<>();
+ config.put(DEFAULT_TEMPLATE, isDefaultTemplateEnabled());
+ config.put(DRAWER, isDrawerEnabled());
+ config.put(EMAILS_ONLY_MODE, isEmailsOnlyModeEnabled());
+ config.put(INSTANT_EMAILS, isInstantEmailsEnabled());
+ config.put(FORBID_SLACK_CHANNEL_USAGE, isForbidSlackChannelUsage());
+ config.put(UNIQUE_BG_NAME, isUniqueBgNameEnabled());
+ config.put(UNIQUE_INTEGRATION_NAME, isUniqueIntegrationNameEnabled());
+ config.put(UNLEASH, unleashEnabled);
+
+ Log.info("=== Startup configuration ===");
+ config.forEach((key, value) -> {
+ Log.infof("%s=%s", key, value);
+ });
+ }
+
+ public boolean isDefaultTemplateEnabled() {
+ return defaultTemplateEnabled;
+ }
+
+ public boolean isDrawerEnabled() {
+ if (unleashEnabled) {
+ return unleash.isEnabled(DRAWER, false);
+ } else {
+ return drawerEnabled;
+ }
+ }
+
+ public boolean isEmailsOnlyModeEnabled() {
+ return emailsOnlyModeEnabled;
+ }
+
+ public boolean isForbidSlackChannelUsage() {
+ if (unleashEnabled) {
+ return unleash.isEnabled(FORBID_SLACK_CHANNEL_USAGE, false);
+ } else {
+ return slackForbidChannelUsageEnabled;
+ }
+ }
+
+ public boolean isInstantEmailsEnabled() {
+ return instantEmailsEnabled;
+ }
+
+ public boolean isUniqueBgNameEnabled() {
+ if (unleashEnabled) {
+ return unleash.isEnabled(UNIQUE_BG_NAME, false);
+ } else {
+ return enforceBehaviorGroupNameUnicity;
+ }
+ }
+
+ public boolean isUniqueIntegrationNameEnabled() {
+ if (unleashEnabled) {
+ return unleash.isEnabled(UNIQUE_INTEGRATION_NAME, false);
+ } else {
+ return enforceIntegrationNameUnicity;
+ }
+ }
+}
diff --git a/backend/src/main/java/com/redhat/cloud/notifications/db/repositories/BehaviorGroupRepository.java b/backend/src/main/java/com/redhat/cloud/notifications/db/repositories/BehaviorGroupRepository.java
index 8839a57f5d..c5cca9cfa2 100644
--- a/backend/src/main/java/com/redhat/cloud/notifications/db/repositories/BehaviorGroupRepository.java
+++ b/backend/src/main/java/com/redhat/cloud/notifications/db/repositories/BehaviorGroupRepository.java
@@ -1,6 +1,6 @@
package com.redhat.cloud.notifications.db.repositories;
-import com.redhat.cloud.notifications.config.FeatureFlipper;
+import com.redhat.cloud.notifications.config.BackendConfig;
import com.redhat.cloud.notifications.db.Query;
import com.redhat.cloud.notifications.models.BehaviorGroup;
import com.redhat.cloud.notifications.models.Bundle;
@@ -39,7 +39,7 @@ public class BehaviorGroupRepository {
EntityManager entityManager;
@Inject
- FeatureFlipper featureFlipper;
+ BackendConfig backendConfig;
/**
* Counts all the behavior groups by their org id and event type id.
@@ -207,7 +207,7 @@ void update(String orgId, BehaviorGroup behaviorGroup, boolean isDefaultBehavior
}
private void checkBehaviorGroupDisplayNameDuplicate(String orgId, BehaviorGroup behaviorGroup, boolean isDefaultBehaviorGroup) {
- if (!featureFlipper.isEnforceBehaviorGroupNameUnicity()) {
+ if (!backendConfig.isUniqueBgNameEnabled()) {
// The check is disabled from configuration.
return;
}
diff --git a/backend/src/main/java/com/redhat/cloud/notifications/db/repositories/EndpointRepository.java b/backend/src/main/java/com/redhat/cloud/notifications/db/repositories/EndpointRepository.java
index fce8892a3c..783f08f1e0 100644
--- a/backend/src/main/java/com/redhat/cloud/notifications/db/repositories/EndpointRepository.java
+++ b/backend/src/main/java/com/redhat/cloud/notifications/db/repositories/EndpointRepository.java
@@ -1,6 +1,6 @@
package com.redhat.cloud.notifications.db.repositories;
-import com.redhat.cloud.notifications.config.FeatureFlipper;
+import com.redhat.cloud.notifications.config.BackendConfig;
import com.redhat.cloud.notifications.db.Query;
import com.redhat.cloud.notifications.db.builder.QueryBuilder;
import com.redhat.cloud.notifications.db.builder.WhereBuilder;
@@ -41,10 +41,10 @@ public class EndpointRepository {
EntityManager entityManager;
@Inject
- FeatureFlipper featureFlipper;
+ BackendConfig backendConfig;
public void checkEndpointNameDuplicate(Endpoint endpoint) {
- if (!featureFlipper.isEnforceIntegrationNameUnicity()) {
+ if (!backendConfig.isUniqueIntegrationNameEnabled()) {
// Check disabled from configuration
return;
}
diff --git a/backend/src/main/java/com/redhat/cloud/notifications/db/repositories/SubscriptionRepository.java b/backend/src/main/java/com/redhat/cloud/notifications/db/repositories/SubscriptionRepository.java
index 380575db1c..4562010783 100644
--- a/backend/src/main/java/com/redhat/cloud/notifications/db/repositories/SubscriptionRepository.java
+++ b/backend/src/main/java/com/redhat/cloud/notifications/db/repositories/SubscriptionRepository.java
@@ -1,6 +1,6 @@
package com.redhat.cloud.notifications.db.repositories;
-import com.redhat.cloud.notifications.config.FeatureFlipper;
+import com.redhat.cloud.notifications.config.BackendConfig;
import com.redhat.cloud.notifications.models.EventType;
import com.redhat.cloud.notifications.models.EventTypeEmailSubscription;
import com.redhat.cloud.notifications.models.SubscriptionType;
@@ -23,7 +23,7 @@ public class SubscriptionRepository {
EntityManager entityManager;
@Inject
- FeatureFlipper featureFlipper;
+ BackendConfig backendConfig;
public void subscribe(String orgId, String username, UUID eventTypeId, SubscriptionType subscriptionType) {
updateSubscription(orgId, username, eventTypeId, subscriptionType, true);
@@ -93,7 +93,7 @@ public List getEmailSubscriptionsPerEventTypeForUser
}
private List getAvailableTypes() {
- if (featureFlipper.isDrawerEnabled()) {
+ if (backendConfig.isDrawerEnabled()) {
return List.of(INSTANT, DAILY, DRAWER);
} else {
return List.of(INSTANT, DAILY);
diff --git a/backend/src/main/java/com/redhat/cloud/notifications/db/repositories/TemplateRepository.java b/backend/src/main/java/com/redhat/cloud/notifications/db/repositories/TemplateRepository.java
index 78e418fdaa..a2bebb42f5 100644
--- a/backend/src/main/java/com/redhat/cloud/notifications/db/repositories/TemplateRepository.java
+++ b/backend/src/main/java/com/redhat/cloud/notifications/db/repositories/TemplateRepository.java
@@ -1,6 +1,6 @@
package com.redhat.cloud.notifications.db.repositories;
-import com.redhat.cloud.notifications.config.FeatureFlipper;
+import com.redhat.cloud.notifications.config.BackendConfig;
import com.redhat.cloud.notifications.models.AggregationEmailTemplate;
import com.redhat.cloud.notifications.models.Application;
import com.redhat.cloud.notifications.models.EventType;
@@ -29,7 +29,7 @@ public class TemplateRepository {
EntityManager entityManager;
@Inject
- FeatureFlipper featureFlipper;
+ BackendConfig backendConfig;
@Transactional
public Template createTemplate(Template template) {
@@ -317,7 +317,7 @@ private Template findTemplate(UUID id, String notFoundMessage) {
public boolean isEmailSubscriptionSupported(String bundleName, String appName, SubscriptionType subscriptionType) {
switch (subscriptionType) {
case INSTANT:
- if (featureFlipper.isUseDefaultTemplate()) {
+ if (backendConfig.isDefaultTemplateEnabled()) {
return true;
}
@@ -330,7 +330,7 @@ public boolean isEmailSubscriptionSupported(String bundleName, String appName, S
case DAILY:
return isEmailAggregationSupported(bundleName, appName, List.of(subscriptionType));
case DRAWER:
- return featureFlipper.isDrawerEnabled();
+ return backendConfig.isDrawerEnabled();
default:
return false;
}
diff --git a/backend/src/main/java/com/redhat/cloud/notifications/routers/EndpointResource.java b/backend/src/main/java/com/redhat/cloud/notifications/routers/EndpointResource.java
index c01eaa3de6..fc9b6d3ca3 100644
--- a/backend/src/main/java/com/redhat/cloud/notifications/routers/EndpointResource.java
+++ b/backend/src/main/java/com/redhat/cloud/notifications/routers/EndpointResource.java
@@ -4,7 +4,7 @@
import com.redhat.cloud.notifications.auth.ConsoleIdentityProvider;
import com.redhat.cloud.notifications.auth.principal.rhid.RhIdPrincipal;
import com.redhat.cloud.notifications.auth.rbac.RbacGroupValidator;
-import com.redhat.cloud.notifications.config.FeatureFlipper;
+import com.redhat.cloud.notifications.config.BackendConfig;
import com.redhat.cloud.notifications.db.Query;
import com.redhat.cloud.notifications.db.repositories.EndpointRepository;
import com.redhat.cloud.notifications.db.repositories.NotificationRepository;
@@ -100,7 +100,7 @@ public class EndpointResource {
RbacGroupValidator rbacGroupValidator;
@Inject
- FeatureFlipper featureFlipper;
+ BackendConfig backendConfig;
/**
* Used to create the secrets in Sources and update the endpoint's properties' IDs.
@@ -296,7 +296,7 @@ public Endpoint createEndpoint(@Context SecurityContext sec,
private void checkSlackChannel(CamelProperties camelProperties, CamelProperties previousCamelProperties) {
String channel = camelProperties.getExtras().get("channel");
- if (featureFlipper.isSlackForbidChannelUsageEnabled()) {
+ if (backendConfig.isForbidSlackChannelUsage()) {
// throw an exception if we receive a channel on endpoint creation
if (null == previousCamelProperties && channel != null) {
throw new BadRequestException(DEPRECATED_SLACK_CHANNEL_ERROR);
@@ -562,7 +562,7 @@ private static void checkSystemEndpoint(EndpointType endpointType) {
}
private boolean isEndpointTypeAllowed(EndpointType endpointType) {
- return !featureFlipper.isEmailsOnlyMode() || endpointType.isSystemEndpointType;
+ return !backendConfig.isEmailsOnlyModeEnabled() || endpointType.isSystemEndpointType;
}
/**
diff --git a/backend/src/main/java/com/redhat/cloud/notifications/routers/UserConfigResource.java b/backend/src/main/java/com/redhat/cloud/notifications/routers/UserConfigResource.java
index 73bd09d355..011f974fc7 100644
--- a/backend/src/main/java/com/redhat/cloud/notifications/routers/UserConfigResource.java
+++ b/backend/src/main/java/com/redhat/cloud/notifications/routers/UserConfigResource.java
@@ -3,7 +3,7 @@
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.redhat.cloud.notifications.Constants;
-import com.redhat.cloud.notifications.config.FeatureFlipper;
+import com.redhat.cloud.notifications.config.BackendConfig;
import com.redhat.cloud.notifications.db.repositories.ApplicationRepository;
import com.redhat.cloud.notifications.db.repositories.BundleRepository;
import com.redhat.cloud.notifications.db.repositories.EventTypeRepository;
@@ -66,7 +66,7 @@ public class UserConfigResource {
TemplateRepository templateRepository;
@Inject
- FeatureFlipper featureFlipper;
+ BackendConfig backendConfig;
@Path(Constants.API_NOTIFICATIONS_V_1_0 + "/user-config")
public static class V1 extends UserConfigResource {
@@ -92,7 +92,7 @@ public Response saveSettingsByEventType(@Context SecurityContext sec, @NotNull @
// If the instant emails are disabled, we need to check that the request
// does not contain any subscription with SubscriptionType.INSTANT.
- if (!featureFlipper.isInstantEmailsEnabled() && userSettings.bundles.values().stream()
+ if (!backendConfig.isInstantEmailsEnabled() && userSettings.bundles.values().stream()
.flatMap(bundleSettings -> bundleSettings.applications.values().stream())
.flatMap(appSettings -> appSettings.eventTypes.values().stream())
.flatMap(eventTypeSettings -> eventTypeSettings.emailSubscriptionTypes.keySet().stream())
@@ -218,7 +218,7 @@ private void addApplicationStructureDetails(final SettingsValuesByEventType sett
eventTypeSettingsValue.hasForcedEmail = withForcedEmails;
eventTypeSettingsValue.subscriptionLocked = eventType.isSubscriptionLocked();
for (SubscriptionType subscriptionType : SubscriptionType.values()) {
- if (featureFlipper.isInstantEmailsEnabled() || subscriptionType != INSTANT) {
+ if (backendConfig.isInstantEmailsEnabled() || subscriptionType != INSTANT) {
boolean supported = templateRepository.isEmailSubscriptionSupported(bundle.getName(), application.getName(), subscriptionType);
if (supported) {
boolean subscribedByDefault = subscriptionType.isSubscribedByDefault() || eventType.isSubscribedByDefault();
diff --git a/backend/src/main/java/com/redhat/cloud/notifications/routers/UserPreferencesForPolicy.java b/backend/src/main/java/com/redhat/cloud/notifications/routers/UserPreferencesForPolicy.java
index 066df696cc..2c336ade1e 100644
--- a/backend/src/main/java/com/redhat/cloud/notifications/routers/UserPreferencesForPolicy.java
+++ b/backend/src/main/java/com/redhat/cloud/notifications/routers/UserPreferencesForPolicy.java
@@ -1,7 +1,7 @@
package com.redhat.cloud.notifications.routers;
import com.redhat.cloud.notifications.Constants;
-import com.redhat.cloud.notifications.config.FeatureFlipper;
+import com.redhat.cloud.notifications.config.BackendConfig;
import com.redhat.cloud.notifications.db.repositories.SubscriptionRepository;
import com.redhat.cloud.notifications.models.EventTypeEmailSubscription;
import com.redhat.cloud.notifications.routers.models.UserConfigPreferences;
@@ -30,7 +30,7 @@ public class UserPreferencesForPolicy {
SubscriptionRepository subscriptionRepository;
@Inject
- FeatureFlipper featureFlipper;
+ BackendConfig backendConfig;
@Path(Constants.API_NOTIFICATIONS_V_1_0 + "/user-config")
public static class V1 extends UserPreferencesForPolicy {
@@ -64,7 +64,7 @@ public UserConfigPreferences getPreferences(
for (EventTypeEmailSubscription subscribedEvent : subscriptionTypes) {
if (DAILY == subscribedEvent.getType()) {
preferences.setDailyEmail(subscribedEvent.isSubscribed());
- } else if (featureFlipper.isInstantEmailsEnabled() && INSTANT == subscribedEvent.getType()) {
+ } else if (backendConfig.isInstantEmailsEnabled() && INSTANT == subscribedEvent.getType()) {
preferences.setInstantEmail(subscribedEvent.isSubscribed());
}
}
diff --git a/backend/src/main/resources/application.properties b/backend/src/main/resources/application.properties
index 18fe864dc3..8abba48978 100644
--- a/backend/src/main/resources/application.properties
+++ b/backend/src/main/resources/application.properties
@@ -97,3 +97,7 @@ quarkus.otel.service.name=notifications-backend
# is missing. In the case that you are using a real Sources application to test the integration, you will need to
# set this PSK in the SOURCES_PSKS environment variable on that end.
sources.psk=development-value-123
+
+quarkus.unleash.active=false
+quarkus.unleash.synchronous-fetch-on-initialisation=true
+quarkus.unleash.url=http://localhost:4242
diff --git a/backend/src/test/java/com/redhat/cloud/notifications/db/repositories/BehaviorGroupRepositoryTest.java b/backend/src/test/java/com/redhat/cloud/notifications/db/repositories/BehaviorGroupRepositoryTest.java
index 5ec30358b0..b1de2d8144 100644
--- a/backend/src/test/java/com/redhat/cloud/notifications/db/repositories/BehaviorGroupRepositoryTest.java
+++ b/backend/src/test/java/com/redhat/cloud/notifications/db/repositories/BehaviorGroupRepositoryTest.java
@@ -2,7 +2,7 @@
import com.redhat.cloud.notifications.TestHelpers;
import com.redhat.cloud.notifications.TestLifecycleManager;
-import com.redhat.cloud.notifications.config.FeatureFlipper;
+import com.redhat.cloud.notifications.config.BackendConfig;
import com.redhat.cloud.notifications.db.DbIsolatedTest;
import com.redhat.cloud.notifications.db.Query;
import com.redhat.cloud.notifications.db.ResourceHelpers;
@@ -13,6 +13,7 @@
import com.redhat.cloud.notifications.models.Endpoint;
import com.redhat.cloud.notifications.models.EventType;
import com.redhat.cloud.notifications.models.EventTypeBehavior;
+import io.quarkus.test.InjectMock;
import io.quarkus.test.common.QuarkusTestResource;
import io.quarkus.test.junit.QuarkusTest;
import jakarta.inject.Inject;
@@ -42,6 +43,7 @@
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.Mockito.when;
@QuarkusTest
@QuarkusTestResource(TestLifecycleManager.class)
@@ -58,49 +60,41 @@ public class BehaviorGroupRepositoryTest extends DbIsolatedTest {
@Inject
BehaviorGroupRepository behaviorGroupRepository;
- @Inject
- FeatureFlipper featureFlipper;
+ @InjectMock
+ BackendConfig backendConfig;
@Test
void shouldThrowExceptionWhenCreatingWithExistingDisplayNameAndSameOrgId() {
- try {
- featureFlipper.setEnforceBehaviorGroupNameUnicity(true);
- Bundle bundle = resourceHelpers.createBundle();
- BehaviorGroup behaviorGroup1 = resourceHelpers.createBehaviorGroup(DEFAULT_ACCOUNT_ID, DEFAULT_ORG_ID, "displayName", bundle.getId());
-
- BehaviorGroup behaviorGroup2 = new BehaviorGroup();
- behaviorGroup2.setAccountId(behaviorGroup1.getAccountId());
- behaviorGroup2.setOrgId(behaviorGroup1.getOrgId());
- behaviorGroup2.setDisplayName(behaviorGroup1.getDisplayName());
- behaviorGroup2.setBundleId(bundle.getId());
-
- BadRequestException e = assertThrows(BadRequestException.class, () -> {
- behaviorGroupRepository.create(behaviorGroup2.getAccountId(), behaviorGroup2.getOrgId(), behaviorGroup2);
- });
- assertEquals("A behavior group with display name [" + behaviorGroup1.getDisplayName() + "] already exists", e.getMessage());
- } finally {
- featureFlipper.setEnforceBehaviorGroupNameUnicity(false);
- }
+ when(backendConfig.isUniqueBgNameEnabled()).thenReturn(true);
+ Bundle bundle = resourceHelpers.createBundle();
+ BehaviorGroup behaviorGroup1 = resourceHelpers.createBehaviorGroup(DEFAULT_ACCOUNT_ID, DEFAULT_ORG_ID, "displayName", bundle.getId());
+
+ BehaviorGroup behaviorGroup2 = new BehaviorGroup();
+ behaviorGroup2.setAccountId(behaviorGroup1.getAccountId());
+ behaviorGroup2.setOrgId(behaviorGroup1.getOrgId());
+ behaviorGroup2.setDisplayName(behaviorGroup1.getDisplayName());
+ behaviorGroup2.setBundleId(bundle.getId());
+
+ BadRequestException e = assertThrows(BadRequestException.class, () -> {
+ behaviorGroupRepository.create(behaviorGroup2.getAccountId(), behaviorGroup2.getOrgId(), behaviorGroup2);
+ });
+ assertEquals("A behavior group with display name [" + behaviorGroup1.getDisplayName() + "] already exists", e.getMessage());
}
@Test
void shouldThrowExceptionWhenCreatingDefaultWithExistingDisplayName() {
- try {
- featureFlipper.setEnforceBehaviorGroupNameUnicity(true);
- Bundle bundle = resourceHelpers.createBundle();
- BehaviorGroup behaviorGroup1 = resourceHelpers.createDefaultBehaviorGroup("displayName", bundle.getId());
-
- BehaviorGroup behaviorGroup2 = new BehaviorGroup();
- behaviorGroup2.setDisplayName(behaviorGroup1.getDisplayName());
- behaviorGroup2.setBundleId(bundle.getId());
-
- BadRequestException e = assertThrows(BadRequestException.class, () -> {
- behaviorGroupRepository.createDefault(behaviorGroup2);
- });
- assertEquals("A behavior group with display name [" + behaviorGroup1.getDisplayName() + "] already exists", e.getMessage());
- } finally {
- featureFlipper.setEnforceBehaviorGroupNameUnicity(false);
- }
+ when(backendConfig.isUniqueBgNameEnabled()).thenReturn(true);
+ Bundle bundle = resourceHelpers.createBundle();
+ BehaviorGroup behaviorGroup1 = resourceHelpers.createDefaultBehaviorGroup("displayName", bundle.getId());
+
+ BehaviorGroup behaviorGroup2 = new BehaviorGroup();
+ behaviorGroup2.setDisplayName(behaviorGroup1.getDisplayName());
+ behaviorGroup2.setBundleId(bundle.getId());
+
+ BadRequestException e = assertThrows(BadRequestException.class, () -> {
+ behaviorGroupRepository.createDefault(behaviorGroup2);
+ });
+ assertEquals("A behavior group with display name [" + behaviorGroup1.getDisplayName() + "] already exists", e.getMessage());
}
@Test
@@ -119,38 +113,30 @@ void shouldNotThrowExceptionWhenCreatingWithExistingDisplayNameButDifferentOrgId
@Test
void shouldThrowExceptionWhenUpdatingToExistingDisplayNameAndSameOrgId() {
- try {
- featureFlipper.setEnforceBehaviorGroupNameUnicity(true);
- Bundle bundle = resourceHelpers.createBundle("name", "displayName");
- BehaviorGroup behaviorGroup1 = resourceHelpers.createBehaviorGroup(DEFAULT_ACCOUNT_ID, DEFAULT_ORG_ID, "displayName1", bundle.getId());
- BehaviorGroup behaviorGroup2 = resourceHelpers.createBehaviorGroup(behaviorGroup1.getAccountId(), behaviorGroup1.getOrgId(), "displayName2", bundle.getId());
- behaviorGroup2.setDisplayName(behaviorGroup1.getDisplayName());
-
- BadRequestException e = assertThrows(BadRequestException.class, () -> {
- behaviorGroupRepository.update(behaviorGroup2.getOrgId(), behaviorGroup2);
- });
- assertEquals("A behavior group with display name [" + behaviorGroup1.getDisplayName() + "] already exists", e.getMessage());
- } finally {
- featureFlipper.setEnforceBehaviorGroupNameUnicity(false);
- }
+ when(backendConfig.isUniqueBgNameEnabled()).thenReturn(true);
+ Bundle bundle = resourceHelpers.createBundle("name", "displayName");
+ BehaviorGroup behaviorGroup1 = resourceHelpers.createBehaviorGroup(DEFAULT_ACCOUNT_ID, DEFAULT_ORG_ID, "displayName1", bundle.getId());
+ BehaviorGroup behaviorGroup2 = resourceHelpers.createBehaviorGroup(behaviorGroup1.getAccountId(), behaviorGroup1.getOrgId(), "displayName2", bundle.getId());
+ behaviorGroup2.setDisplayName(behaviorGroup1.getDisplayName());
+
+ BadRequestException e = assertThrows(BadRequestException.class, () -> {
+ behaviorGroupRepository.update(behaviorGroup2.getOrgId(), behaviorGroup2);
+ });
+ assertEquals("A behavior group with display name [" + behaviorGroup1.getDisplayName() + "] already exists", e.getMessage());
}
@Test
void shouldThrowExceptionWhenUpdatingDefaultToExistingDisplayName() {
- try {
- featureFlipper.setEnforceBehaviorGroupNameUnicity(true);
- Bundle bundle = resourceHelpers.createBundle("name", "displayName");
- BehaviorGroup behaviorGroup1 = resourceHelpers.createDefaultBehaviorGroup("displayName1", bundle.getId());
- BehaviorGroup behaviorGroup2 = resourceHelpers.createDefaultBehaviorGroup("displayName2", bundle.getId());
- behaviorGroup2.setDisplayName(behaviorGroup1.getDisplayName());
-
- BadRequestException e = assertThrows(BadRequestException.class, () -> {
- behaviorGroupRepository.updateDefault(behaviorGroup2);
- });
- assertEquals("A behavior group with display name [" + behaviorGroup1.getDisplayName() + "] already exists", e.getMessage());
- } finally {
- featureFlipper.setEnforceBehaviorGroupNameUnicity(false);
- }
+ when(backendConfig.isUniqueBgNameEnabled()).thenReturn(true);
+ Bundle bundle = resourceHelpers.createBundle("name", "displayName");
+ BehaviorGroup behaviorGroup1 = resourceHelpers.createDefaultBehaviorGroup("displayName1", bundle.getId());
+ BehaviorGroup behaviorGroup2 = resourceHelpers.createDefaultBehaviorGroup("displayName2", bundle.getId());
+ behaviorGroup2.setDisplayName(behaviorGroup1.getDisplayName());
+
+ BadRequestException e = assertThrows(BadRequestException.class, () -> {
+ behaviorGroupRepository.updateDefault(behaviorGroup2);
+ });
+ assertEquals("A behavior group with display name [" + behaviorGroup1.getDisplayName() + "] already exists", e.getMessage());
}
@Test
diff --git a/backend/src/test/java/com/redhat/cloud/notifications/events/LifecycleITest.java b/backend/src/test/java/com/redhat/cloud/notifications/events/LifecycleITest.java
index 333da5bdf0..26c09425bf 100644
--- a/backend/src/test/java/com/redhat/cloud/notifications/events/LifecycleITest.java
+++ b/backend/src/test/java/com/redhat/cloud/notifications/events/LifecycleITest.java
@@ -4,7 +4,7 @@
import com.redhat.cloud.notifications.MockServerConfig;
import com.redhat.cloud.notifications.TestHelpers;
import com.redhat.cloud.notifications.TestLifecycleManager;
-import com.redhat.cloud.notifications.config.FeatureFlipper;
+import com.redhat.cloud.notifications.config.BackendConfig;
import com.redhat.cloud.notifications.db.DbIsolatedTest;
import com.redhat.cloud.notifications.models.Application;
import com.redhat.cloud.notifications.models.BehaviorGroup;
@@ -34,7 +34,6 @@
import jakarta.transaction.Transactional;
import org.eclipse.microprofile.config.inject.ConfigProperty;
import org.eclipse.microprofile.rest.client.inject.RestClient;
-import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
@@ -66,6 +65,7 @@
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.fail;
+import static org.mockito.Mockito.when;
@QuarkusTest
@QuarkusTestResource(TestLifecycleManager.class)
@@ -90,8 +90,8 @@ public class LifecycleITest extends DbIsolatedTest {
@ConfigProperty(name = "internal.admin-role")
String adminRole;
- @Inject
- FeatureFlipper featureFlipper;
+ @InjectMock
+ BackendConfig backendConfig;
/**
* We mock the sources service's REST client because there are a few tests
@@ -104,12 +104,7 @@ public class LifecycleITest extends DbIsolatedTest {
@BeforeEach
void beforeEach() {
- featureFlipper.setInstantEmailsEnabled(true);
- }
-
- @AfterEach
- void afterEach() {
- featureFlipper.setInstantEmailsEnabled(false);
+ when(backendConfig.isInstantEmailsEnabled()).thenReturn(true);
}
private Header initRbacMock(String accountId, String orgId, String username, RbacAccess access) {
@@ -120,7 +115,7 @@ private Header initRbacMock(String accountId, String orgId, String username, Rba
@Test
void shouldReturn400AndBadRequestExceptionWhenDisplayNameIsAlreadyPresent() {
- if (!featureFlipper.isEnforceBehaviorGroupNameUnicity()) {
+ if (!backendConfig.isUniqueBgNameEnabled()) {
// The check is disabled from configuration.
return;
}
@@ -546,14 +541,13 @@ private String createWebhookEndpoint(Header identityHeader, String secretToken)
// The SecretUtils class follows the "basic authentication", "secret
// token" and "bearer token" order, so that is why we make the returns
// in that order for the mock.
- Mockito
- .when(this.sourcesServiceMock.create(Mockito.anyString(), Mockito.anyString(), Mockito.any()))
+ when(this.sourcesServiceMock.create(Mockito.anyString(), Mockito.anyString(), Mockito.any()))
.thenReturn(secretTokenSecret);
// Make sure that when the secrets are loaded when we fetch the
// endpoint again for checking the assertions, we simulate fetching
// the secrets from Sources too.
- Mockito.when(this.sourcesServiceMock.getById(Mockito.anyString(), Mockito.anyString(), Mockito.eq(secretTokenSecret.id))).thenReturn(secretTokenSecret);
+ when(this.sourcesServiceMock.getById(Mockito.anyString(), Mockito.anyString(), Mockito.eq(secretTokenSecret.id))).thenReturn(secretTokenSecret);
String responseBody = given()
.basePath(API_INTEGRATIONS_V_1_0)
diff --git a/backend/src/test/java/com/redhat/cloud/notifications/routers/EmailsOnlyModeTest.java b/backend/src/test/java/com/redhat/cloud/notifications/routers/EmailsOnlyModeTest.java
index 5c21310046..65109aa8d5 100644
--- a/backend/src/test/java/com/redhat/cloud/notifications/routers/EmailsOnlyModeTest.java
+++ b/backend/src/test/java/com/redhat/cloud/notifications/routers/EmailsOnlyModeTest.java
@@ -5,7 +5,7 @@
import com.redhat.cloud.notifications.MockServerConfig;
import com.redhat.cloud.notifications.TestHelpers;
import com.redhat.cloud.notifications.TestLifecycleManager;
-import com.redhat.cloud.notifications.config.FeatureFlipper;
+import com.redhat.cloud.notifications.config.BackendConfig;
import com.redhat.cloud.notifications.db.DbIsolatedTest;
import com.redhat.cloud.notifications.db.repositories.EndpointRepository;
import com.redhat.cloud.notifications.models.Endpoint;
@@ -13,7 +13,6 @@
import io.quarkus.test.common.QuarkusTestResource;
import io.quarkus.test.junit.QuarkusTest;
import io.restassured.http.Header;
-import jakarta.inject.Inject;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.ValueSource;
@@ -34,8 +33,8 @@
@QuarkusTestResource(TestLifecycleManager.class)
public class EmailsOnlyModeTest extends DbIsolatedTest {
- @Inject
- FeatureFlipper featureFlipper;
+ @InjectMock
+ BackendConfig backendConfig;
@InjectMock
EndpointRepository endpointRepository;
@@ -43,149 +42,124 @@ public class EmailsOnlyModeTest extends DbIsolatedTest {
@ParameterizedTest
@ValueSource(strings = {Constants.API_INTEGRATIONS_V_1_0, Constants.API_INTEGRATIONS_V_2_0})
void testCreateUnsupportedEndpointType(String apiPath) {
- featureFlipper.setEmailsOnlyMode(true);
- try {
-
- String identityHeaderValue = TestHelpers.encodeRHIdentityInfo("account-id", "org-id", "username");
- Header identityHeader = TestHelpers.createRHIdentityHeader(identityHeaderValue);
- MockServerConfig.addMockRbacAccess(identityHeaderValue, FULL_ACCESS);
-
- Endpoint endpoint = new Endpoint();
- endpoint.setType(WEBHOOK);
- endpoint.setName("name");
- endpoint.setDescription("description");
-
- String responseBody = given()
- .basePath(apiPath)
- .header(identityHeader)
- .when()
- .contentType(JSON)
- .body(Json.encode(endpoint))
- .post("/endpoints")
- .then()
- .statusCode(400)
- .extract().asString();
- assertEquals(UNSUPPORTED_ENDPOINT_TYPE, responseBody);
-
- } finally {
- featureFlipper.setEmailsOnlyMode(false);
- }
+ when(backendConfig.isEmailsOnlyModeEnabled()).thenReturn(true);
+
+ String identityHeaderValue = TestHelpers.encodeRHIdentityInfo("account-id", "org-id", "username");
+ Header identityHeader = TestHelpers.createRHIdentityHeader(identityHeaderValue);
+ MockServerConfig.addMockRbacAccess(identityHeaderValue, FULL_ACCESS);
+
+ Endpoint endpoint = new Endpoint();
+ endpoint.setType(WEBHOOK);
+ endpoint.setName("name");
+ endpoint.setDescription("description");
+
+ String responseBody = given()
+ .basePath(apiPath)
+ .header(identityHeader)
+ .when()
+ .contentType(JSON)
+ .body(Json.encode(endpoint))
+ .post("/endpoints")
+ .then()
+ .statusCode(400)
+ .extract().asString();
+ assertEquals(UNSUPPORTED_ENDPOINT_TYPE, responseBody);
}
@ParameterizedTest
@ValueSource(strings = {Constants.API_INTEGRATIONS_V_1_0, Constants.API_INTEGRATIONS_V_2_0})
void testUpdateUnsupportedEndpointType(String apiPath) {
- featureFlipper.setEmailsOnlyMode(true);
- try {
-
- String identityHeaderValue = TestHelpers.encodeRHIdentityInfo("account-id", "org-id", "username");
- Header identityHeader = TestHelpers.createRHIdentityHeader(identityHeaderValue);
- MockServerConfig.addMockRbacAccess(identityHeaderValue, FULL_ACCESS);
-
- Endpoint endpoint = new Endpoint();
- endpoint.setType(WEBHOOK);
- endpoint.setName("name");
- endpoint.setDescription("description");
-
- String responseBody = given()
- .basePath(apiPath)
- .header(identityHeader)
- .pathParam("id", UUID.randomUUID().toString())
- .when()
- .contentType(JSON)
- .body(Json.encode(endpoint))
- .put("/endpoints/{id}")
- .then()
- .statusCode(400)
- .extract().asString();
- assertEquals(UNSUPPORTED_ENDPOINT_TYPE, responseBody);
-
- } finally {
- featureFlipper.setEmailsOnlyMode(false);
- }
+ when(backendConfig.isEmailsOnlyModeEnabled()).thenReturn(true);
+
+ String identityHeaderValue = TestHelpers.encodeRHIdentityInfo("account-id", "org-id", "username");
+ Header identityHeader = TestHelpers.createRHIdentityHeader(identityHeaderValue);
+ MockServerConfig.addMockRbacAccess(identityHeaderValue, FULL_ACCESS);
+
+ Endpoint endpoint = new Endpoint();
+ endpoint.setType(WEBHOOK);
+ endpoint.setName("name");
+ endpoint.setDescription("description");
+
+ String responseBody = given()
+ .basePath(apiPath)
+ .header(identityHeader)
+ .pathParam("id", UUID.randomUUID().toString())
+ .when()
+ .contentType(JSON)
+ .body(Json.encode(endpoint))
+ .put("/endpoints/{id}")
+ .then()
+ .statusCode(400)
+ .extract().asString();
+ assertEquals(UNSUPPORTED_ENDPOINT_TYPE, responseBody);
}
@ParameterizedTest
@ValueSource(strings = {Constants.API_INTEGRATIONS_V_1_0, Constants.API_INTEGRATIONS_V_2_0})
void testDeleteUnsupportedEndpointType(String apiPath) {
- featureFlipper.setEmailsOnlyMode(true);
- try {
-
- String identityHeaderValue = TestHelpers.encodeRHIdentityInfo("account-id", "org-id", "username");
- Header identityHeader = TestHelpers.createRHIdentityHeader(identityHeaderValue);
- MockServerConfig.addMockRbacAccess(identityHeaderValue, FULL_ACCESS);
-
- when(endpointRepository.getEndpointTypeById(anyString(), any(UUID.class))).thenReturn(CAMEL);
-
- String responseBody = given()
- .basePath(apiPath)
- .header(identityHeader)
- .pathParam("id", UUID.randomUUID().toString())
- .when()
- .delete("/endpoints/{id}")
- .then()
- .statusCode(400)
- .extract().asString();
- assertEquals(UNSUPPORTED_ENDPOINT_TYPE, responseBody);
-
- } finally {
- featureFlipper.setEmailsOnlyMode(false);
- }
+ when(backendConfig.isEmailsOnlyModeEnabled()).thenReturn(true);
+
+ String identityHeaderValue = TestHelpers.encodeRHIdentityInfo("account-id", "org-id", "username");
+ Header identityHeader = TestHelpers.createRHIdentityHeader(identityHeaderValue);
+ MockServerConfig.addMockRbacAccess(identityHeaderValue, FULL_ACCESS);
+
+ when(endpointRepository.getEndpointTypeById(anyString(), any(UUID.class))).thenReturn(CAMEL);
+
+ String responseBody = given()
+ .basePath(apiPath)
+ .header(identityHeader)
+ .pathParam("id", UUID.randomUUID().toString())
+ .when()
+ .delete("/endpoints/{id}")
+ .then()
+ .statusCode(400)
+ .extract().asString();
+ assertEquals(UNSUPPORTED_ENDPOINT_TYPE, responseBody);
}
@ParameterizedTest
@ValueSource(strings = {Constants.API_INTEGRATIONS_V_1_0, Constants.API_INTEGRATIONS_V_2_0})
void testEnableUnsupportedEndpointType(String apiPath) {
- featureFlipper.setEmailsOnlyMode(true);
- try {
-
- String identityHeaderValue = TestHelpers.encodeRHIdentityInfo("account-id", "org-id", "username");
- Header identityHeader = TestHelpers.createRHIdentityHeader(identityHeaderValue);
- MockServerConfig.addMockRbacAccess(identityHeaderValue, FULL_ACCESS);
-
- when(endpointRepository.getEndpointTypeById(anyString(), any(UUID.class))).thenReturn(CAMEL);
-
- String responseBody = given()
- .basePath(apiPath)
- .header(identityHeader)
- .pathParam("id", UUID.randomUUID().toString())
- .when()
- .put("/endpoints/{id}/enable")
- .then()
- .statusCode(400)
- .extract().asString();
- assertEquals(UNSUPPORTED_ENDPOINT_TYPE, responseBody);
-
- } finally {
- featureFlipper.setEmailsOnlyMode(false);
- }
+ when(backendConfig.isEmailsOnlyModeEnabled()).thenReturn(true);
+
+ String identityHeaderValue = TestHelpers.encodeRHIdentityInfo("account-id", "org-id", "username");
+ Header identityHeader = TestHelpers.createRHIdentityHeader(identityHeaderValue);
+ MockServerConfig.addMockRbacAccess(identityHeaderValue, FULL_ACCESS);
+
+ when(endpointRepository.getEndpointTypeById(anyString(), any(UUID.class))).thenReturn(CAMEL);
+
+ String responseBody = given()
+ .basePath(apiPath)
+ .header(identityHeader)
+ .pathParam("id", UUID.randomUUID().toString())
+ .when()
+ .put("/endpoints/{id}/enable")
+ .then()
+ .statusCode(400)
+ .extract().asString();
+ assertEquals(UNSUPPORTED_ENDPOINT_TYPE, responseBody);
}
@ParameterizedTest
@ValueSource(strings = {Constants.API_INTEGRATIONS_V_1_0, Constants.API_INTEGRATIONS_V_2_0})
void testDisableUnsupportedEndpointType(String apiPath) {
- featureFlipper.setEmailsOnlyMode(true);
- try {
-
- String identityHeaderValue = TestHelpers.encodeRHIdentityInfo("account-id", "org-id", "username");
- Header identityHeader = TestHelpers.createRHIdentityHeader(identityHeaderValue);
- MockServerConfig.addMockRbacAccess(identityHeaderValue, FULL_ACCESS);
-
- when(endpointRepository.getEndpointTypeById(anyString(), any(UUID.class))).thenReturn(CAMEL);
-
- String responseBody = given()
- .basePath(apiPath)
- .header(identityHeader)
- .pathParam("id", UUID.randomUUID().toString())
- .when()
- .delete("/endpoints/{id}/enable")
- .then()
- .statusCode(400)
- .extract().asString();
- assertEquals(UNSUPPORTED_ENDPOINT_TYPE, responseBody);
-
- } finally {
- featureFlipper.setEmailsOnlyMode(false);
- }
+ when(backendConfig.isEmailsOnlyModeEnabled()).thenReturn(true);
+
+ String identityHeaderValue = TestHelpers.encodeRHIdentityInfo("account-id", "org-id", "username");
+ Header identityHeader = TestHelpers.createRHIdentityHeader(identityHeaderValue);
+ MockServerConfig.addMockRbacAccess(identityHeaderValue, FULL_ACCESS);
+
+ when(endpointRepository.getEndpointTypeById(anyString(), any(UUID.class))).thenReturn(CAMEL);
+
+ String responseBody = given()
+ .basePath(apiPath)
+ .header(identityHeader)
+ .pathParam("id", UUID.randomUUID().toString())
+ .when()
+ .delete("/endpoints/{id}/enable")
+ .then()
+ .statusCode(400)
+ .extract().asString();
+ assertEquals(UNSUPPORTED_ENDPOINT_TYPE, responseBody);
}
}
diff --git a/backend/src/test/java/com/redhat/cloud/notifications/routers/EndpointResourceTest.java b/backend/src/test/java/com/redhat/cloud/notifications/routers/EndpointResourceTest.java
index f85a946e5e..709ca9fa6a 100644
--- a/backend/src/test/java/com/redhat/cloud/notifications/routers/EndpointResourceTest.java
+++ b/backend/src/test/java/com/redhat/cloud/notifications/routers/EndpointResourceTest.java
@@ -5,7 +5,7 @@
import com.redhat.cloud.notifications.TestConstants;
import com.redhat.cloud.notifications.TestHelpers;
import com.redhat.cloud.notifications.TestLifecycleManager;
-import com.redhat.cloud.notifications.config.FeatureFlipper;
+import com.redhat.cloud.notifications.config.BackendConfig;
import com.redhat.cloud.notifications.db.DbIsolatedTest;
import com.redhat.cloud.notifications.db.ResourceHelpers;
import com.redhat.cloud.notifications.db.repositories.EndpointRepository;
@@ -41,7 +41,6 @@
import jakarta.persistence.EntityManager;
import org.eclipse.microprofile.config.inject.ConfigProperty;
import org.eclipse.microprofile.rest.client.inject.RestClient;
-import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -99,12 +98,7 @@ public class EndpointResourceTest extends DbIsolatedTest {
@BeforeEach
void beforeEach() {
RestAssured.basePath = TestConstants.API_INTEGRATIONS_V_1_0;
- featureFlipper.setInstantEmailsEnabled(true);
- }
-
- @AfterEach
- void afterEach() {
- featureFlipper.setInstantEmailsEnabled(false);
+ when(backendConfig.isInstantEmailsEnabled()).thenReturn(true);
}
@Inject
@@ -113,8 +107,8 @@ void afterEach() {
@Inject
ResourceHelpers resourceHelpers;
- @Inject
- FeatureFlipper featureFlipper;
+ @InjectMock
+ BackendConfig backendConfig;
@Inject
EndpointRepository endpointRepository;
@@ -296,123 +290,119 @@ void testEndpointAdding() {
@Test
void testRepeatedEndpointName() {
- try {
- featureFlipper.setEnforceIntegrationNameUnicity(true);
- String orgId = "repeatEndpoint";
- String userName = "user";
+ when(backendConfig.isUniqueIntegrationNameEnabled()).thenReturn(true);
+ String orgId = "repeatEndpoint";
+ String userName = "user";
- String identityHeaderValue = TestHelpers.encodeRHIdentityInfo(orgId, orgId, userName);
- Header identityHeader = TestHelpers.createRHIdentityHeader(identityHeaderValue);
+ String identityHeaderValue = TestHelpers.encodeRHIdentityInfo(orgId, orgId, userName);
+ Header identityHeader = TestHelpers.createRHIdentityHeader(identityHeaderValue);
- MockServerConfig.addMockRbacAccess(identityHeaderValue, FULL_ACCESS);
+ MockServerConfig.addMockRbacAccess(identityHeaderValue, FULL_ACCESS);
- // Endpoint1
- WebhookProperties properties = new WebhookProperties();
- properties.setMethod(POST);
- properties.setDisableSslVerification(false);
- properties.setSecretToken("my-super-secret-token");
- properties.setUrl(getMockServerUrl());
+ // Endpoint1
+ WebhookProperties properties = new WebhookProperties();
+ properties.setMethod(POST);
+ properties.setDisableSslVerification(false);
+ properties.setSecretToken("my-super-secret-token");
+ properties.setUrl(getMockServerUrl());
- Endpoint endpoint1 = new Endpoint();
- endpoint1.setType(EndpointType.WEBHOOK);
- endpoint1.setName("Endpoint1");
- endpoint1.setDescription("needle in the haystack");
- endpoint1.setEnabled(true);
- endpoint1.setProperties(properties);
- endpoint1.setServerErrors(3);
+ Endpoint endpoint1 = new Endpoint();
+ endpoint1.setType(EndpointType.WEBHOOK);
+ endpoint1.setName("Endpoint1");
+ endpoint1.setDescription("needle in the haystack");
+ endpoint1.setEnabled(true);
+ endpoint1.setProperties(properties);
+ endpoint1.setServerErrors(3);
- mockSources(properties);
+ mockSources(properties);
- Response response = given()
- .header(identityHeader)
- .when()
- .contentType(JSON)
- .body(Json.encode(endpoint1))
- .post("/endpoints")
- .then()
- .statusCode(200)
- .extract().response();
+ Response response = given()
+ .header(identityHeader)
+ .when()
+ .contentType(JSON)
+ .body(Json.encode(endpoint1))
+ .post("/endpoints")
+ .then()
+ .statusCode(200)
+ .extract().response();
- String endpoint1Id = new JsonObject(response.getBody().asString()).getString("id");
- assertNotNull(endpoint1Id);
+ String endpoint1Id = new JsonObject(response.getBody().asString()).getString("id");
+ assertNotNull(endpoint1Id);
- // Trying to add the same endpoint name again results in a 400 error
- given()
- .header(identityHeader)
- .when()
- .contentType(JSON)
- .body(Json.encode(endpoint1))
- .post("/endpoints")
- .then()
- .statusCode(400);
+ // Trying to add the same endpoint name again results in a 400 error
+ given()
+ .header(identityHeader)
+ .when()
+ .contentType(JSON)
+ .body(Json.encode(endpoint1))
+ .post("/endpoints")
+ .then()
+ .statusCode(400);
- // Endpoint2
- Endpoint ep = new Endpoint();
- ep.setType(EndpointType.WEBHOOK);
- ep.setName("Endpoint2");
- ep.setDescription("needle in the haystack");
- ep.setEnabled(true);
- ep.setProperties(properties);
- ep.setServerErrors(3);
+ // Endpoint2
+ Endpoint ep = new Endpoint();
+ ep.setType(EndpointType.WEBHOOK);
+ ep.setName("Endpoint2");
+ ep.setDescription("needle in the haystack");
+ ep.setEnabled(true);
+ ep.setProperties(properties);
+ ep.setServerErrors(3);
- given()
- .header(identityHeader)
- .when()
- .contentType(JSON)
- .body(Json.encode(ep))
- .post("/endpoints")
- .then()
- .statusCode(200);
-
- // Different endpoint type with same name
- CamelProperties camelProperties = new CamelProperties();
- camelProperties.setBasicAuthentication(new BasicAuthentication());
- camelProperties.setExtras(Map.of());
- camelProperties.setSecretToken("secret");
- camelProperties.setUrl("http://nowhere");
-
- ep = new Endpoint();
- ep.setType(EndpointType.CAMEL);
- ep.setSubType("stuff");
- ep.setName("Endpoint1");
- ep.setDescription("needle in the haystack");
- ep.setEnabled(true);
- ep.setProperties(camelProperties);
- ep.setServerErrors(3);
+ given()
+ .header(identityHeader)
+ .when()
+ .contentType(JSON)
+ .body(Json.encode(ep))
+ .post("/endpoints")
+ .then()
+ .statusCode(200);
- given()
- .header(identityHeader)
- .when()
- .contentType(JSON)
- .body(Json.encode(ep))
- .post("/endpoints")
- .then()
- .statusCode(400);
+ // Different endpoint type with same name
+ CamelProperties camelProperties = new CamelProperties();
+ camelProperties.setBasicAuthentication(new BasicAuthentication());
+ camelProperties.setExtras(Map.of());
+ camelProperties.setSecretToken("secret");
+ camelProperties.setUrl("http://nowhere");
- // Updating endpoint1 name is possible
- endpoint1.setName("Endpoint1-updated");
- given()
- .header(identityHeader)
- .contentType(JSON)
- .body(Json.encode(endpoint1))
- .when()
- .put("/endpoints/" + endpoint1Id)
- .then()
- .statusCode(200);
+ ep = new Endpoint();
+ ep.setType(EndpointType.CAMEL);
+ ep.setSubType("stuff");
+ ep.setName("Endpoint1");
+ ep.setDescription("needle in the haystack");
+ ep.setEnabled(true);
+ ep.setProperties(camelProperties);
+ ep.setServerErrors(3);
- // Updating to the name of an already existing endpoint is not possible
- endpoint1.setName("Endpoint2");
- given()
- .header(identityHeader)
- .contentType(JSON)
- .body(Json.encode(endpoint1))
- .when()
- .put("/endpoints/" + endpoint1Id)
- .then()
- .statusCode(400);
- } finally {
- featureFlipper.setEnforceIntegrationNameUnicity(false);
- }
+ given()
+ .header(identityHeader)
+ .when()
+ .contentType(JSON)
+ .body(Json.encode(ep))
+ .post("/endpoints")
+ .then()
+ .statusCode(400);
+
+ // Updating endpoint1 name is possible
+ endpoint1.setName("Endpoint1-updated");
+ given()
+ .header(identityHeader)
+ .contentType(JSON)
+ .body(Json.encode(endpoint1))
+ .when()
+ .put("/endpoints/" + endpoint1Id)
+ .then()
+ .statusCode(200);
+
+ // Updating to the name of an already existing endpoint is not possible
+ endpoint1.setName("Endpoint2");
+ given()
+ .header(identityHeader)
+ .contentType(JSON)
+ .body(Json.encode(endpoint1))
+ .when()
+ .put("/endpoints/" + endpoint1Id)
+ .then()
+ .statusCode(400);
}
private JsonObject fetchSingle(String id, Header identityHeader) {
@@ -689,77 +679,73 @@ void testMissingSlackChannel() {
@Test
void testForbidSlackChannelUsage() {
- try {
- featureFlipper.setSlackForbidChannelUsageEnabled(true);
- String identityHeaderValue = TestHelpers.encodeRHIdentityInfo("account-id", "org-id", "user");
- Header identityHeader = TestHelpers.createRHIdentityHeader(identityHeaderValue);
- MockServerConfig.addMockRbacAccess(identityHeaderValue, FULL_ACCESS);
+ when(backendConfig.isForbidSlackChannelUsage()).thenReturn(true);
- Map extras = new HashMap<>(Map.of("channel", "")); // Having a channel value is invalid.
- CamelProperties camelProperties = new CamelProperties();
- camelProperties.setUrl("https://foo.com");
- camelProperties.setExtras(extras);
+ String identityHeaderValue = TestHelpers.encodeRHIdentityInfo("account-id", "org-id", "user");
+ Header identityHeader = TestHelpers.createRHIdentityHeader(identityHeaderValue);
+ MockServerConfig.addMockRbacAccess(identityHeaderValue, FULL_ACCESS);
- Endpoint endpoint = new Endpoint();
- endpoint.setType(EndpointType.CAMEL);
- endpoint.setSubType("slack");
- endpoint.setName("name");
- endpoint.setDescription("description");
- endpoint.setProperties(camelProperties);
+ Map extras = new HashMap<>(Map.of("channel", "")); // Having a channel value is invalid.
+ CamelProperties camelProperties = new CamelProperties();
+ camelProperties.setUrl("https://foo.com");
+ camelProperties.setExtras(extras);
- String responseBody = given()
- .header(identityHeader)
- .when()
- .contentType(JSON)
- .body(Json.encode(endpoint))
- .post("/endpoints")
- .then()
- .statusCode(400)
- .extract().asString();
+ Endpoint endpoint = new Endpoint();
+ endpoint.setType(EndpointType.CAMEL);
+ endpoint.setSubType("slack");
+ endpoint.setName("name");
+ endpoint.setDescription("description");
+ endpoint.setProperties(camelProperties);
- assertEquals(DEPRECATED_SLACK_CHANNEL_ERROR, responseBody);
+ String responseBody = given()
+ .header(identityHeader)
+ .when()
+ .contentType(JSON)
+ .body(Json.encode(endpoint))
+ .post("/endpoints")
+ .then()
+ .statusCode(400)
+ .extract().asString();
- extras.remove("channel");
+ assertEquals(DEPRECATED_SLACK_CHANNEL_ERROR, responseBody);
- String createdEndpoint = given()
- .header(identityHeader)
- .when()
- .contentType(JSON)
- .body(Json.encode(endpoint))
- .post("/endpoints")
- .then()
- .statusCode(200)
- .extract().asString();
+ extras.remove("channel");
- final JsonObject jsonResponse = new JsonObject(createdEndpoint);
- final String endpointUuidRaw = jsonResponse.getString("id");
+ String createdEndpoint = given()
+ .header(identityHeader)
+ .when()
+ .contentType(JSON)
+ .body(Json.encode(endpoint))
+ .post("/endpoints")
+ .then()
+ .statusCode(200)
+ .extract().asString();
- // try to update endpoint without channel
- given()
- .header(identityHeader)
- .contentType(JSON)
- .pathParam("id", endpointUuidRaw)
- .body(Json.encode(endpoint))
- .when()
- .put("/endpoints/{id}")
- .then()
- .statusCode(200);
+ final JsonObject jsonResponse = new JsonObject(createdEndpoint);
+ final String endpointUuidRaw = jsonResponse.getString("id");
- // try to update endpoint with channel
- extras.put("channel", "refused");
- given()
- .header(identityHeader)
- .contentType(JSON)
- .pathParam("id", endpointUuidRaw)
- .body(Json.encode(endpoint))
- .when()
- .put("/endpoints/{id}")
- .then()
- .statusCode(400);
+ // try to update endpoint without channel
+ given()
+ .header(identityHeader)
+ .contentType(JSON)
+ .pathParam("id", endpointUuidRaw)
+ .body(Json.encode(endpoint))
+ .when()
+ .put("/endpoints/{id}")
+ .then()
+ .statusCode(200);
- } finally {
- featureFlipper.setSlackForbidChannelUsageEnabled(false);
- }
+ // try to update endpoint with channel
+ extras.put("channel", "refused");
+ given()
+ .header(identityHeader)
+ .contentType(JSON)
+ .pathParam("id", endpointUuidRaw)
+ .body(Json.encode(endpoint))
+ .when()
+ .put("/endpoints/{id}")
+ .then()
+ .statusCode(400);
}
@Test
diff --git a/backend/src/test/java/com/redhat/cloud/notifications/routers/NotificationResourceTest.java b/backend/src/test/java/com/redhat/cloud/notifications/routers/NotificationResourceTest.java
index 231f0e98ea..d4f35fdd36 100644
--- a/backend/src/test/java/com/redhat/cloud/notifications/routers/NotificationResourceTest.java
+++ b/backend/src/test/java/com/redhat/cloud/notifications/routers/NotificationResourceTest.java
@@ -6,7 +6,7 @@
import com.redhat.cloud.notifications.TestConstants;
import com.redhat.cloud.notifications.TestHelpers;
import com.redhat.cloud.notifications.TestLifecycleManager;
-import com.redhat.cloud.notifications.config.FeatureFlipper;
+import com.redhat.cloud.notifications.config.BackendConfig;
import com.redhat.cloud.notifications.db.DbIsolatedTest;
import com.redhat.cloud.notifications.db.ResourceHelpers;
import com.redhat.cloud.notifications.db.repositories.ApplicationRepository;
@@ -21,6 +21,7 @@
import com.redhat.cloud.notifications.routers.models.behaviorgroup.CreateBehaviorGroupRequest;
import com.redhat.cloud.notifications.routers.models.behaviorgroup.CreateBehaviorGroupResponse;
import com.redhat.cloud.notifications.routers.models.behaviorgroup.UpdateBehaviorGroupRequest;
+import io.quarkus.test.InjectMock;
import io.quarkus.test.common.QuarkusTestResource;
import io.quarkus.test.junit.QuarkusTest;
import io.restassured.RestAssured;
@@ -31,7 +32,6 @@
import io.vertx.core.json.JsonObject;
import jakarta.inject.Inject;
import jakarta.validation.constraints.Size;
-import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -61,6 +61,7 @@
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.Mockito.when;
@QuarkusTest
@QuarkusTestResource(TestLifecycleManager.class)
@@ -86,19 +87,14 @@ public class NotificationResourceTest extends DbIsolatedTest {
@Inject
BehaviorGroupRepository behaviorGroupRepository;
- @Inject
- FeatureFlipper featureFlipper;
+ @InjectMock
+ BackendConfig backendConfig;
@BeforeEach
void beforeEach() {
RestAssured.basePath = TestConstants.API_NOTIFICATIONS_V_1_0;
MockServerConfig.clearRbac();
- featureFlipper.setEnforceBehaviorGroupNameUnicity(true);
- }
-
- @AfterEach
- void afterEach() {
- featureFlipper.setEnforceBehaviorGroupNameUnicity(false);
+ when(backendConfig.isUniqueBgNameEnabled()).thenReturn(true);
}
private Header initRbacMock(String accountId, String orgId, String username, RbacAccess access) {
@@ -934,52 +930,47 @@ void testBehaviorGroupsAffectedByRemovalOfUnknownEndpointId() {
@Test
void testBehaviorGroupSameName() {
- try {
- final String BEHAVIOR_GROUP_1_NAME = "BehaviorGroup1";
- final String BEHAVIOR_GROUP_2_NAME = "BehaviorGroup2";
+ final String BEHAVIOR_GROUP_1_NAME = "BehaviorGroup1";
+ final String BEHAVIOR_GROUP_2_NAME = "BehaviorGroup2";
- featureFlipper.setEnforceBehaviorGroupNameUnicity(true);
- Header identityHeader = initRbacMock("tenant", "sameBehaviorGroupName", "user", FULL_ACCESS);
+ when(backendConfig.isUniqueBgNameEnabled()).thenReturn(true);
+ Header identityHeader = initRbacMock("tenant", "sameBehaviorGroupName", "user", FULL_ACCESS);
- Bundle bundle1 = helpers.createBundle(TEST_BUNDLE_NAME, "Bundle1");
- Bundle bundle2 = helpers.createBundle(TEST_BUNDLE_2_NAME, "Bundle2");
+ Bundle bundle1 = helpers.createBundle(TEST_BUNDLE_NAME, "Bundle1");
+ Bundle bundle2 = helpers.createBundle(TEST_BUNDLE_2_NAME, "Bundle2");
- CreateBehaviorGroupRequest createBehaviorGroupRequest = new CreateBehaviorGroupRequest();
- createBehaviorGroupRequest.displayName = BEHAVIOR_GROUP_1_NAME;
- createBehaviorGroupRequest.bundleId = bundle1.getId();
+ CreateBehaviorGroupRequest createBehaviorGroupRequest = new CreateBehaviorGroupRequest();
+ createBehaviorGroupRequest.displayName = BEHAVIOR_GROUP_1_NAME;
+ createBehaviorGroupRequest.bundleId = bundle1.getId();
- UUID behaviorGroup1Id = createBehaviorGroup(identityHeader, createBehaviorGroupRequest, 200).get().id;
- assertNotNull(behaviorGroup1Id);
+ UUID behaviorGroup1Id = createBehaviorGroup(identityHeader, createBehaviorGroupRequest, 200).get().id;
+ assertNotNull(behaviorGroup1Id);
- // same display name in same bundle is not possible
- createBehaviorGroup(identityHeader, createBehaviorGroupRequest, 400);
+ // same display name in same bundle is not possible
+ createBehaviorGroup(identityHeader, createBehaviorGroupRequest, 400);
- // same display name in a different bundle is OK
- createBehaviorGroupRequest.bundleId = bundle2.getId();
- createBehaviorGroup(identityHeader, createBehaviorGroupRequest, 200);
+ // same display name in a different bundle is OK
+ createBehaviorGroupRequest.bundleId = bundle2.getId();
+ createBehaviorGroup(identityHeader, createBehaviorGroupRequest, 200);
- // Different display name in bundle1
- createBehaviorGroupRequest.bundleId = bundle1.getId();
- createBehaviorGroupRequest.displayName = BEHAVIOR_GROUP_2_NAME;
- createBehaviorGroup(identityHeader, createBehaviorGroupRequest, 200);
+ // Different display name in bundle1
+ createBehaviorGroupRequest.bundleId = bundle1.getId();
+ createBehaviorGroupRequest.displayName = BEHAVIOR_GROUP_2_NAME;
+ createBehaviorGroup(identityHeader, createBehaviorGroupRequest, 200);
- // Cannot update Behavior Group 1 name to "BehaviorGroup2" as it already exists
- UpdateBehaviorGroupRequest updateBehaviorGroupRequest = new UpdateBehaviorGroupRequest();
- updateBehaviorGroupRequest.displayName = BEHAVIOR_GROUP_2_NAME;
- updateBehaviorGroup(identityHeader, behaviorGroup1Id, updateBehaviorGroupRequest, 400);
+ // Cannot update Behavior Group 1 name to "BehaviorGroup2" as it already exists
+ UpdateBehaviorGroupRequest updateBehaviorGroupRequest = new UpdateBehaviorGroupRequest();
+ updateBehaviorGroupRequest.displayName = BEHAVIOR_GROUP_2_NAME;
+ updateBehaviorGroup(identityHeader, behaviorGroup1Id, updateBehaviorGroupRequest, 400);
- // Can update other properties without changing the name
- updateBehaviorGroupRequest.displayName = BEHAVIOR_GROUP_1_NAME;
- updateBehaviorGroupRequest.eventTypeIds = Set.of();
- updateBehaviorGroup(identityHeader, behaviorGroup1Id, updateBehaviorGroupRequest, 200);
+ // Can update other properties without changing the name
+ updateBehaviorGroupRequest.displayName = BEHAVIOR_GROUP_1_NAME;
+ updateBehaviorGroupRequest.eventTypeIds = Set.of();
+ updateBehaviorGroup(identityHeader, behaviorGroup1Id, updateBehaviorGroupRequest, 200);
- // Can use other name
- updateBehaviorGroupRequest.displayName = "OtherName";
- updateBehaviorGroup(identityHeader, behaviorGroup1Id, updateBehaviorGroupRequest, 200);
-
- } finally {
- featureFlipper.setEnforceBehaviorGroupNameUnicity(false);
- }
+ // Can use other name
+ updateBehaviorGroupRequest.displayName = "OtherName";
+ updateBehaviorGroup(identityHeader, behaviorGroup1Id, updateBehaviorGroupRequest, 200);
}
/**
diff --git a/backend/src/test/java/com/redhat/cloud/notifications/routers/UserConfigResourceTest.java b/backend/src/test/java/com/redhat/cloud/notifications/routers/UserConfigResourceTest.java
index 5b7dec84b6..0b380d8e59 100644
--- a/backend/src/test/java/com/redhat/cloud/notifications/routers/UserConfigResourceTest.java
+++ b/backend/src/test/java/com/redhat/cloud/notifications/routers/UserConfigResourceTest.java
@@ -6,7 +6,7 @@
import com.redhat.cloud.notifications.TestConstants;
import com.redhat.cloud.notifications.TestHelpers;
import com.redhat.cloud.notifications.TestLifecycleManager;
-import com.redhat.cloud.notifications.config.FeatureFlipper;
+import com.redhat.cloud.notifications.config.BackendConfig;
import com.redhat.cloud.notifications.db.DbIsolatedTest;
import com.redhat.cloud.notifications.db.repositories.ApplicationRepository;
import com.redhat.cloud.notifications.db.repositories.EventTypeRepository;
@@ -20,6 +20,7 @@
import com.redhat.cloud.notifications.routers.models.SettingsValueByEventTypeJsonForm;
import com.redhat.cloud.notifications.routers.models.SettingsValuesByEventType;
import com.redhat.cloud.notifications.routers.models.UserConfigPreferences;
+import io.quarkus.test.InjectMock;
import io.quarkus.test.common.QuarkusTestResource;
import io.quarkus.test.junit.QuarkusTest;
import io.quarkus.test.junit.mockito.InjectSpy;
@@ -32,7 +33,6 @@
import jakarta.transaction.Transactional;
import org.apache.commons.lang3.RandomStringUtils;
import org.eclipse.microprofile.config.inject.ConfigProperty;
-import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -70,16 +70,11 @@ public class UserConfigResourceTest extends DbIsolatedTest {
@BeforeEach
void beforeEach() {
RestAssured.basePath = TestConstants.API_NOTIFICATIONS_V_1_0;
- featureFlipper.setInstantEmailsEnabled(true);
+ when(backendConfig.isInstantEmailsEnabled()).thenReturn(true);
}
- @AfterEach
- void afterEach() {
- featureFlipper.setInstantEmailsEnabled(false);
- }
-
- @Inject
- FeatureFlipper featureFlipper;
+ @InjectMock
+ BackendConfig backendConfig;
@Inject
SubscriptionRepository subscriptionRepository;
@@ -128,7 +123,7 @@ private SettingsValuesByEventType createSettingsValue(String bundle, String appl
SettingsValuesByEventType.EventTypeSettingsValue eventTypeSettingsValue = new SettingsValuesByEventType.EventTypeSettingsValue();
eventTypeSettingsValue.emailSubscriptionTypes.put(DAILY, daily);
eventTypeSettingsValue.emailSubscriptionTypes.put(INSTANT, instant);
- if (featureFlipper.isDrawerEnabled()) {
+ if (backendConfig.isDrawerEnabled()) {
eventTypeSettingsValue.emailSubscriptionTypes.put(DRAWER, drawer);
}
@@ -151,12 +146,8 @@ void testLegacySettingsByEventType() {
@Test
void testSettingsByEventTypeWithDrawerEnabled() {
- try {
- featureFlipper.setDrawerEnabled(true);
- testSettingsByEventType();
- } finally {
- featureFlipper.setDrawerEnabled(false);
- }
+ when(backendConfig.isDrawerEnabled()).thenReturn(true);
+ testSettingsByEventType();
}
void testSettingsByEventType() {
@@ -216,21 +207,21 @@ void testSettingsByEventType() {
rhelPolicy = rhelPolicyForm(settingsValuesByEventType);
assertNotNull(rhelPolicy.eventTypes.get(0).fields.get(0).infoMessage);
- featureFlipper.setInstantEmailsEnabled(false);
+ when(backendConfig.isInstantEmailsEnabled()).thenReturn(false);
SettingsValuesByEventType settingsValues = createSettingsValue(bundle, application, eventType, true, true, false);
postPreferencesByEventType(path, identityHeader, settingsValues, 400);
- featureFlipper.setInstantEmailsEnabled(true);
+ when(backendConfig.isInstantEmailsEnabled()).thenReturn(true);
postPreferencesByEventType(path, identityHeader, settingsValues, 200);
- featureFlipper.setInstantEmailsEnabled(false);
+ when(backendConfig.isInstantEmailsEnabled()).thenReturn(false);
SettingsValueByEventTypeJsonForm settingsValue = getPreferencesByEventType(path, identityHeader);
rhelPolicy = rhelPolicyForm(settingsValue);
boolean instantEmailSettingsReturned = extractNotificationValues(rhelPolicy.eventTypes, bundle, application, eventType)
.keySet().stream().anyMatch(INSTANT::equals);
assertFalse(instantEmailSettingsReturned, "Instant email subscription settings should not be returned when instant emails are disabled");
- featureFlipper.setInstantEmailsEnabled(true);
+ when(backendConfig.isInstantEmailsEnabled()).thenReturn(true);
// Daily and Instant to false
updateAndCheckUserPreference(path, identityHeader, bundle, application, eventType, List.of(DRAWER), List.of(DRAWER));
@@ -253,7 +244,7 @@ void testSettingsByEventType() {
// Unsubscribing from everything should work this time.
updateAndCheckUserPreference(path, identityHeader, bundle, application, eventType, emptyList(), emptyList());
- if (featureFlipper.isDrawerEnabled()) {
+ if (backendConfig.isDrawerEnabled()) {
// Daily, Instant and drawer to false
updateAndCheckUserPreference(path, identityHeader, bundle, application, eventType, emptyList(), emptyList());
@@ -325,7 +316,7 @@ void testSettingsByEventType() {
Map notificationPreferenes = extractNotificationValues(rhelPolicy.eventTypes, bundle, application, eventType);
- if (featureFlipper.isDrawerEnabled()) {
+ if (backendConfig.isDrawerEnabled()) {
assertEquals(2, notificationPreferenes.size());
assertTrue(notificationPreferenes.containsKey(DRAWER));
} else {
@@ -343,7 +334,7 @@ void testSettingsByEventType() {
.contentType(JSON)
.extract().body().as(SettingsValueByEventTypeJsonForm.class);
rhelPolicy = rhelPolicyForm(settingsValueJsonForm);
- if (featureFlipper.isDrawerEnabled()) {
+ if (backendConfig.isDrawerEnabled()) {
// drawer type will be always supported
assertNotNull(rhelPolicy);
assertEquals(1, settingsValueJsonForm.bundles.size());
@@ -365,7 +356,7 @@ private void updateAndCheckUserPreference(String path, Header identityHeader, St
assertEquals(expectedResult.contains(DAILY), initialValues.get(DAILY));
assertEquals(expectedResult.contains(INSTANT), initialValues.get(INSTANT));
- if (featureFlipper.isDrawerEnabled()) {
+ if (backendConfig.isDrawerEnabled()) {
assertEquals(expectedResult.contains(DRAWER), initialValues.get(DRAWER));
}
@@ -381,7 +372,7 @@ private void updateAndCheckUserPreference(String path, Header identityHeader, St
Map notificationPreferenes = extractNotificationValues(preferences.eventTypes, bundle, application, eventType);
assertEquals(expectedResult.contains(DAILY), notificationPreferenes.get(DAILY));
assertEquals(expectedResult.contains(INSTANT), notificationPreferenes.get(INSTANT));
- if (featureFlipper.isDrawerEnabled()) {
+ if (backendConfig.isDrawerEnabled()) {
assertEquals(expectedResult.contains(DRAWER), notificationPreferenes.get(DRAWER));
}
}
diff --git a/common/pom.xml b/common/pom.xml
index aa71fb5b43..738bceb402 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -44,6 +44,13 @@
quarkus-smallrye-fault-tolerance