code improvements

Author: cwanjau

libraries/azure-app-configuration-importer/src/internal/parsers/defaultConfigurationSettingsConverter.ts

@@ -5,7 +5,6 @@ import {
   SetConfigurationSettingParam,
   featureFlagPrefix,
   featureFlagContentType,
-  ConfigurationSettingParam,
   SecretReferenceValue
 } from "@azure/app-configuration";
 import { SourceOptions } from "../../importOptions";
@@ -40,7 +39,7 @@ export class DefaultConfigurationSettingsConverter implements ConfigurationSetti
       SetConfigurationSettingParam<string | MsFeatureFlagValue>
     >();
 
-    let featureFlagsConfigSettings = new Array<ConfigurationSettingParam>();
+    let featureFlagsConfigSettings = new Array<SetConfigurationSettingParam<string>>();
     let foundMsFmSchema = false;
     let foundDotnetFmSchema = false;
     let dotnetFmSchemaKeyWord = "";
@@ -188,8 +187,8 @@ class FeatureFlagConfigurationSettingsConverter implements ConfigurationSettings
   Convert(
     config: object,
     options: SourceOptions
-  ): ConfigurationSettingParam[] {
-    const settings = new Array<ConfigurationSettingParam>();
+  ): SetConfigurationSettingParam<string>[] {
+    const settings = new Array<SetConfigurationSettingParam<string>>();
     const featureFlags = new Array<MsFeatureFlagValue>();
 
     if (this.dotnetFmSchemaKeyWord) {
@@ -256,8 +255,7 @@ class FeatureFlagConfigurationSettingsConverter implements ConfigurationSettings
         tags: options.tags
       };
 
-      const serializedSetting: ConfigurationSettingParam = serializeFeatureFlagToConfigurationSettingParam(setting);
-
+      const serializedSetting: SetConfigurationSettingParam<string> = serializeFeatureFlagToConfigurationSettingParam(setting);
       settings.push(serializedSetting);
     }
 

libraries/azure-app-configuration-importer/src/internal/utils.ts

@@ -6,11 +6,10 @@ import {
   SetConfigurationSettingParam, 
   FeatureFlagValue,
   featureFlagContentType,
-  SecretReferenceValue, 
-  ConfigurationSettingParam,
-  featureFlagPrefix} from "@azure/app-configuration";
+  SecretReferenceValue,
+  featureFlagPrefix } from "@azure/app-configuration";
 import { isEmpty, isEqual } from "lodash";
-import { Tags, FeatureFlagClientFilters } from "../models";
+import { Tags, FeatureFlagClientFilters, JsonFeatureFlagValue } from "../models";
 import { SourceOptions } from "../importOptions";
 import { ConfigurationFormat, ConfigurationProfile } from "../enums";
 import { ArgumentError, ArgumentNullError } from "../errors";
@@ -173,22 +172,24 @@ function toFeatureFlagValue(value: string): FeatureFlagValue {
   };
 }
 
-export function serializeFeatureFlagToConfigurationSettingParam(featureFlag: SetConfigurationSettingParam<MsFeatureFlagValue>): ConfigurationSettingParam {
+export function serializeFeatureFlagToConfigurationSettingParam(featureFlag: SetConfigurationSettingParam<MsFeatureFlagValue>): SetConfigurationSettingParam<string> {
   if (!featureFlag.value) {
     throw new TypeError(`FeatureFlag has an unexpected value - ${featureFlag.value}`);
   }
   let key = featureFlag.key;
+
   if (typeof featureFlag.key === "string" && !featureFlag.key.startsWith(featureFlagPrefix)) {
     key = featureFlagPrefix + featureFlag.key;
   }
-  const jsonFeatureFlagValue: MsFeatureFlagValue = {
+
+  const jsonFeatureFlagValue: JsonFeatureFlagValue = {
     id: featureFlag.value.id ?? key.replace(featureFlagPrefix, ""),
     enabled: featureFlag.value.enabled,
     description: featureFlag.value.description,
     conditions: {
-      clientFilters: featureFlag.value.conditions?.clientFilters
+      client_filters: featureFlag.value.conditions?.clientFilters
     },
-    displayName: featureFlag.value.displayName,
+    display_name: featureFlag.value.displayName,
     allocation: featureFlag.value.allocation,
     variants: featureFlag.value.variants,
     telemetry: featureFlag.value.telemetry

libraries/azure-app-configuration-importer/src/models.ts

@@ -13,6 +13,29 @@ export interface JsonSecretReferenceValue {
   uri: string;
 }
 
+/**
+ * @internal
+ */
+export type JsonFeatureFlagValue = {
+  conditions: {
+    client_filters: { name: string; parameters?: Record<string, unknown> }[];
+  };
+  description?: string;
+  enabled: boolean;
+  id?: string;
+  display_name?: string;
+  allocation?: {
+    user?: { variant: string; users: string[] }[];
+    group?: { variant: string; groups: string[] }[];
+    default_when_enabled?: string;
+    default_when_disabled?: string;
+    percentile?: { variant: string; from: number; to: number }[];
+    seed?: string;
+  };
+  variants?: { name: string; configuration_value?: string | number | object | boolean; status_override?: string }[];
+  telemetry?: { enabled?: boolean; metadata?: object };
+};
+
 /**
  * @internal
  */