Adding Default Filters (#43935)

* Adding Default Filters

* Fixing Feature flag loading after both redesigns

* Fixing issues after just 2.0 schema and properties

* Clearing up feature return

* fixing usage of default min backoff

* Removed dead code + tests

* Update TargetingContextAccessorTestConfiguration.java

* Update FeatureManagementConfiguration.java

Author: mrm9084

sdk/spring/spring-cloud-azure-appconfiguration-config/src/main/java/com/azure/spring/cloud/appconfiguration/config/AppConfigurationWatchAutoConfiguration.java

@@ -17,14 +17,13 @@
 import com.azure.spring.cloud.appconfiguration.config.implementation.AppConfigurationReplicaClientFactory;
 import com.azure.spring.cloud.appconfiguration.config.implementation.autofailover.ReplicaLookUp;
 import com.azure.spring.cloud.appconfiguration.config.implementation.properties.AppConfigurationProperties;
-import com.azure.spring.cloud.appconfiguration.config.implementation.properties.AppConfigurationProviderProperties;
 
 /**
  * Setup AppConfigurationRefresh when <i>spring.cloud.azure.appconfiguration.enabled</i> is enabled.
  */
 @EnableAsync
 @ConditionalOnProperty(prefix = AppConfigurationProperties.CONFIG_PREFIX, name = "enabled", matchIfMissing = true)
-@EnableConfigurationProperties({ AppConfigurationProperties.class, AppConfigurationProviderProperties.class })
+@EnableConfigurationProperties({ AppConfigurationProperties.class })
 @AutoConfiguration
 @ConditionalOnClass(RefreshEndpoint.class)
 public class AppConfigurationWatchAutoConfiguration {
@@ -37,13 +36,12 @@ public AppConfigurationWatchAutoConfiguration() {
 
     @Bean
     @ConditionalOnMissingBean
-    AppConfigurationRefresh appConfigurationRefresh(AppConfigurationProperties properties,
-        AppConfigurationProviderProperties appProperties, BootstrapContext context) {
+    AppConfigurationRefresh appConfigurationRefresh(AppConfigurationProperties properties, BootstrapContext context) {
         AppConfigurationReplicaClientFactory clientFactory = context
             .get(AppConfigurationReplicaClientFactory.class);
         ReplicaLookUp replicaLookUp = context.get(ReplicaLookUp.class);
 
-        return new AppConfigurationPullRefresh(clientFactory, properties.getRefreshInterval(),
-            appProperties.getDefaultMinBackoff(), replicaLookUp, new AppConfigurationRefreshUtil());
+        return new AppConfigurationPullRefresh(clientFactory, properties.getRefreshInterval(), replicaLookUp,
+            new AppConfigurationRefreshUtil());
     }
 }

sdk/spring/spring-cloud-azure-appconfiguration-config/src/main/java/com/azure/spring/cloud/appconfiguration/config/implementation/AppConfigurationFeatureManagementPropertySource.java

@@ -2,8 +2,13 @@
 // Licensed under the MIT License.
 package com.azure.spring.cloud.appconfiguration.config.implementation;
 
+import java.util.List;
+
 import org.springframework.core.env.EnumerablePropertySource;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.json.JsonMapper;
+
 /**
  * Azure App Configuration PropertySource unique per Store Label(Profile) combo.
  *
@@ -19,21 +24,25 @@ class AppConfigurationFeatureManagementPropertySource extends EnumerableProperty
 
     private static final String FEATURE_FLAG_KEY = FEATURE_MANAGEMENT_KEY + ".feature_flags";
 
+    private static final ObjectMapper MAPPER = JsonMapper.builder().build();
+
     AppConfigurationFeatureManagementPropertySource(FeatureFlagClient featureFlagLoader) {
         super(FEATURE_MANAGEMENT_KEY, featureFlagLoader);
         this.featureFlagLoader = featureFlagLoader;
     }
 
     @Override
     public String[] getPropertyNames() {
-        String[] names = { FEATURE_FLAG_KEY };
-        return names;
+        if (featureFlagLoader != null && featureFlagLoader.getFeatureFlags().size() > 0) {
+            return new String[]{ FEATURE_FLAG_KEY };
+        }
+        return new String[0];
     }
 
     @Override
     public Object getProperty(String name) {
         if (FEATURE_FLAG_KEY.equals(name)) {
-            return featureFlagLoader.getProperties();
+            return MAPPER.convertValue(featureFlagLoader.getFeatureFlags(), List.class);
         }
         return null;
     }

sdk/spring/spring-cloud-azure-appconfiguration-config/src/main/java/com/azure/spring/cloud/appconfiguration/config/implementation/AppConfigurationKeyVaultClientFactory.java

@@ -23,27 +23,24 @@ class AppConfigurationKeyVaultClientFactory {
     private final boolean credentialsConfigured;
 
     private final boolean isConfigured;
-    
-    private final int timeout;
 
     AppConfigurationKeyVaultClientFactory(SecretClientCustomizer keyVaultClientProvider,
         KeyVaultSecretProvider keyVaultSecretProvider, SecretClientBuilderFactory secretClientFactory,
-        boolean credentialsConfigured, int timeout) {
+        boolean credentialsConfigured) {
         this.keyVaultClientProvider = keyVaultClientProvider;
         this.keyVaultSecretProvider = keyVaultSecretProvider;
         this.secretClientFactory = secretClientFactory;
         keyVaultClients = new HashMap<>();
         this.credentialsConfigured = credentialsConfigured;
         isConfigured = keyVaultClientProvider != null || credentialsConfigured;
-        this.timeout = timeout;
     }
 
     AppConfigurationSecretClientManager getClient(String host) {
         // Check if we already have a client for this key vault, if not we will make
         // one
         if (!keyVaultClients.containsKey(host)) {
             AppConfigurationSecretClientManager client = new AppConfigurationSecretClientManager(host,
-                keyVaultClientProvider, keyVaultSecretProvider, secretClientFactory, credentialsConfigured, timeout);
+                keyVaultClientProvider, keyVaultSecretProvider, secretClientFactory, credentialsConfigured);
             keyVaultClients.put(host, client);
         }
         return keyVaultClients.get(host);

sdk/spring/spring-cloud-azure-appconfiguration-config/src/main/java/com/azure/spring/cloud/appconfiguration/config/implementation/AppConfigurationPullRefresh.java

@@ -30,8 +30,8 @@ public class AppConfigurationPullRefresh implements AppConfigurationRefresh {
     private final AtomicBoolean running = new AtomicBoolean(false);
 
     private ApplicationEventPublisher publisher;
-
-    private final Long defaultMinBackoff;
+    
+    private final Long defaultMinBackoff = (long) 30;
 
     private final AppConfigurationReplicaClientFactory clientFactory;
 
@@ -46,11 +46,9 @@ public class AppConfigurationPullRefresh implements AppConfigurationRefresh {
      *
      * @param clientFactory Clients stores used to connect to App Configuration. * @param defaultMinBackoff default
      * @param refreshInterval time between refresh intervals
-     * @param defaultMinBackoff minimum time between backoff retries minimum backoff time
      */
     public AppConfigurationPullRefresh(AppConfigurationReplicaClientFactory clientFactory, Duration refreshInterval,
-        Long defaultMinBackoff, ReplicaLookUp replicaLookUp, AppConfigurationRefreshUtil refreshUtils) {
-        this.defaultMinBackoff = defaultMinBackoff;
+        ReplicaLookUp replicaLookUp, AppConfigurationRefreshUtil refreshUtils) {
         this.refreshInterval = refreshInterval;
         this.clientFactory = clientFactory;
         this.replicaLookUp = replicaLookUp;

sdk/spring/spring-cloud-azure-appconfiguration-config/src/main/java/com/azure/spring/cloud/appconfiguration/config/implementation/AppConfigurationReplicaClientsBuilder.java

@@ -78,11 +78,10 @@ public class AppConfigurationReplicaClientsBuilder {
 
     private final boolean credentialConfigured;
 
-    private final int defaultMaxRetries;
+    private final int defaultMaxRetries = 2;
 
-    AppConfigurationReplicaClientsBuilder(int defaultMaxRetries, ConfigurationClientBuilderFactory clientFactory,
+    AppConfigurationReplicaClientsBuilder(ConfigurationClientBuilderFactory clientFactory,
         ConfigurationClientCustomizer clientCustomizer, boolean credentialConfigured, boolean isKeyVaultConfigured) {
-        this.defaultMaxRetries = defaultMaxRetries;
         this.credentialConfigured = credentialConfigured;
         this.clientFactory = clientFactory;
         this.clientCustomizer = clientCustomizer;

sdk/spring/spring-cloud-azure-appconfiguration-config/src/main/java/com/azure/spring/cloud/appconfiguration/config/implementation/AzureAppConfigBoostrapRegistrar.java

@@ -4,7 +4,6 @@
 
 import org.springframework.boot.BootstrapRegistry.InstanceSupplier;
 import org.springframework.boot.context.config.ConfigDataLocationResolverContext;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.boot.context.properties.bind.Bindable;
 import org.springframework.boot.context.properties.bind.Binder;
 import org.springframework.util.StringUtils;
@@ -15,9 +14,9 @@
 import com.azure.spring.cloud.appconfiguration.config.SecretClientCustomizer;
 import com.azure.spring.cloud.appconfiguration.config.implementation.autofailover.ReplicaLookUp;
 import com.azure.spring.cloud.appconfiguration.config.implementation.properties.AppConfigurationProperties;
-import com.azure.spring.cloud.appconfiguration.config.implementation.properties.AppConfigurationProviderProperties;
 import com.azure.spring.cloud.autoconfigure.implementation.appconfiguration.AzureAppConfigurationProperties;
 import com.azure.spring.cloud.autoconfigure.implementation.context.properties.AzureGlobalProperties;
+import com.azure.spring.cloud.autoconfigure.implementation.keyvault.secrets.properties.AzureKeyVaultSecretProperties;
 import com.azure.spring.cloud.autoconfigure.implementation.properties.core.AbstractAzureHttpConfigurationProperties;
 import com.azure.spring.cloud.autoconfigure.implementation.properties.core.authentication.TokenCredentialConfigurationProperties;
 import com.azure.spring.cloud.autoconfigure.implementation.properties.utils.AzureGlobalPropertiesUtils;
@@ -26,12 +25,10 @@
 import com.azure.spring.cloud.service.implementation.appconfiguration.ConfigurationClientBuilderFactory;
 import com.azure.spring.cloud.service.implementation.keyvault.secrets.SecretClientBuilderFactory;
 
-@EnableConfigurationProperties(AppConfigurationProviderProperties.class)
 class AzureAppConfigurationBootstrapRegistrar {
 
     static void register(ConfigDataLocationResolverContext context, Binder binder,
-        AppConfigurationProperties properties, AppConfigurationProviderProperties appProperties,
-        ReplicaLookUp replicaLookup) {
+        AppConfigurationProperties properties, ReplicaLookUp replicaLookup) {
 
         AzureGlobalProperties globalProperties = binder
             .bind(AzureGlobalProperties.PREFIX, Bindable.of(AzureGlobalProperties.class))
@@ -46,9 +43,9 @@ static void register(ConfigDataLocationResolverContext context, Binder binder,
         boolean isCredentialConfigured = isCredentialConfigured(loadedProperties);
 
         AppConfigurationKeyVaultClientFactory keyVaultClientFactory = appConfigurationKeyVaultClientFactory(context,
-            isCredentialConfigured, appProperties.getMaxRetryTime());
-        AppConfigurationReplicaClientsBuilder replicaClientsBuilder = replicaClientBuilder(context, binder,
-            keyVaultClientFactory, loadedProperties, isCredentialConfigured, appProperties.getMaxRetries());
+            binder, isCredentialConfigured);
+        AppConfigurationReplicaClientsBuilder replicaClientsBuilder = replicaClientBuilder(context,
+            keyVaultClientFactory, loadedProperties, isCredentialConfigured);
 
         context.getBootstrapContext().registerIfAbsent(AppConfigurationKeyVaultClientFactory.class,
             InstanceSupplier.from(() -> keyVaultClientFactory));
@@ -57,17 +54,23 @@ static void register(ConfigDataLocationResolverContext context, Binder binder,
     }
 
     private static AppConfigurationKeyVaultClientFactory appConfigurationKeyVaultClientFactory(
-        ConfigDataLocationResolverContext context, boolean isCredentialConfigured, Integer maxRetryTime)
+        ConfigDataLocationResolverContext context, Binder binder, boolean isCredentialConfigured)
         throws IllegalArgumentException {
 
         SecretClientCustomizer customizer = context.getBootstrapContext().getOrElse(SecretClientCustomizer.class, null);
         KeyVaultSecretProvider secretProvider = context.getBootstrapContext().getOrElse(KeyVaultSecretProvider.class,
             null);
-        SecretClientBuilderFactory secretClientFactory = context.getBootstrapContext()
-            .getOrElse(SecretClientBuilderFactory.class, null);
 
-        return new AppConfigurationKeyVaultClientFactory(customizer, secretProvider, secretClientFactory,
-            isCredentialConfigured, maxRetryTime);
+        AzureKeyVaultSecretProperties secretClientProperties = binder
+            .bind(AzureKeyVaultSecretProperties.PREFIX, Bindable.of(AzureKeyVaultSecretProperties.class))
+            .orElseGet(AzureKeyVaultSecretProperties::new);
+        SecretClientBuilderFactory secretClientBuilderFactory = new SecretClientBuilderFactory(secretClientProperties);
+
+        context.getBootstrapContext().registerIfAbsent(SecretClientBuilderFactory.class,
+            InstanceSupplier.from(() -> secretClientBuilderFactory));
+
+        return new AppConfigurationKeyVaultClientFactory(customizer, secretProvider, secretClientBuilderFactory,
+            isCredentialConfigured);
     }
 
     private static AppConfigurationReplicaClientFactory buildClientFactory(
@@ -78,8 +81,8 @@ private static AppConfigurationReplicaClientFactory buildClientFactory(
 
     @SuppressWarnings("unchecked")
     private static AppConfigurationReplicaClientsBuilder replicaClientBuilder(ConfigDataLocationResolverContext context,
-        Binder binder, AppConfigurationKeyVaultClientFactory keyVaultClientFactory,
-        AzureAppConfigurationProperties properties, boolean isCredentialConfigured, Integer maxRetries) {
+        AppConfigurationKeyVaultClientFactory keyVaultClientFactory, AzureAppConfigurationProperties properties,
+        boolean isCredentialConfigured) {
 
         InstanceSupplier<AzureServiceClientBuilderCustomizer<ConfigurationClientBuilder>> customizer = context
             .getBootstrapContext()
@@ -108,8 +111,8 @@ private static AppConfigurationReplicaClientsBuilder replicaClientBuilder(Config
             clientCustomizer = configurationClientCustomizer.get(context.getBootstrapContext());
         }
 
-        return new AppConfigurationReplicaClientsBuilder(maxRetries, clientFactory, clientCustomizer,
-            isCredentialConfigured, keyVaultClientFactory.isConfigured());
+        return new AppConfigurationReplicaClientsBuilder(clientFactory, clientCustomizer, isCredentialConfigured,
+            keyVaultClientFactory.isConfigured());
     }
 
     private static boolean isCredentialConfigured(AbstractAzureHttpConfigurationProperties properties) {

sdk/spring/spring-cloud-azure-appconfiguration-config/src/main/java/com/azure/spring/cloud/appconfiguration/config/implementation/AzureAppConfigDataLoader.java

@@ -14,7 +14,6 @@
 import org.springframework.boot.context.config.ConfigDataLoader;
 import org.springframework.boot.context.config.ConfigDataLoaderContext;
 import org.springframework.boot.context.config.ConfigDataResourceNotFoundException;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.boot.logging.DeferredLog;
 import org.springframework.boot.logging.DeferredLogFactory;
 import org.springframework.core.env.EnumerablePropertySource;
@@ -24,12 +23,10 @@
 import com.azure.data.appconfiguration.models.ConfigurationSetting;
 import com.azure.spring.cloud.appconfiguration.config.implementation.feature.FeatureFlags;
 import com.azure.spring.cloud.appconfiguration.config.implementation.properties.AppConfigurationKeyValueSelector;
-import com.azure.spring.cloud.appconfiguration.config.implementation.properties.AppConfigurationProviderProperties;
 import com.azure.spring.cloud.appconfiguration.config.implementation.properties.AppConfigurationStoreMonitoring;
 import com.azure.spring.cloud.appconfiguration.config.implementation.properties.AppConfigurationStoreMonitoring.PushNotification;
 import com.azure.spring.cloud.appconfiguration.config.implementation.properties.FeatureFlagKeyValueSelector;
 
-@EnableConfigurationProperties(AppConfigurationProviderProperties.class)
 public class AzureAppConfigDataLoader implements ConfigDataLoader<AzureAppConfigDataResource> {
 
     private static Log logger = new DeferredLog();
@@ -46,6 +43,10 @@ public class AzureAppConfigDataLoader implements ConfigDataLoader<AzureAppConfig
 
     private Context requestContext;
 
+    private static final Instant START_DATE = Instant.now();
+
+    private static final Integer PREKILL_TIME = 5;
+
     public AzureAppConfigDataLoader(DeferredLogFactory logFactory) {
         logger = logFactory.getLog(getClass());
     }
@@ -200,8 +201,7 @@ private List<FeatureFlags> createFeatureFlags(AppConfigurationReplicaClient clie
 
     private void delayException() {
         Instant currentDate = Instant.now();
-        Instant preKillTIme = resource.getAppProperties().getStartDate()
-            .plusSeconds(resource.getAppProperties().getPrekillTime());
+        Instant preKillTIme = START_DATE.plusSeconds(PREKILL_TIME);
         if (currentDate.isBefore(preKillTIme)) {
             long diffInMillies = Math.abs(preKillTIme.toEpochMilli() - currentDate.toEpochMilli());
             try {