Skip to content
Merged
Show file tree
Hide file tree
Changes from 6 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,17 @@

import {
SetConfigurationSettingParam,
SecretReferenceValue,
featureFlagPrefix,
featureFlagContentType
featureFlagContentType,
SecretReferenceValue
} from "@azure/app-configuration";
import { SourceOptions } from "../../importOptions";
import { ConfigurationSettingsConverter } from "./configurationSettingsConverter";
import { AjvValidationError, ArgumentError } from "../../errors";
import { ClientFilter } from "../../models";
import * as flat from "flat";
import { ConfigurationFormat } from "../../enums";
import { isJsonContentType } from "../utils";
import { isJsonContentType, serializeFeatureFlagValue } from "../utils";
import { MsFeatureFlagValue, RequirementType } from "../../featureFlag";
import { Constants } from "../constants";
import { MsFeatureFlagValueSchema } from "../../MsFeatureFlagSchema";
Expand All @@ -34,17 +34,17 @@
public Convert(
config: object,
options: SourceOptions
): SetConfigurationSettingParam<string | MsFeatureFlagValue | SecretReferenceValue>[] {
): SetConfigurationSettingParam<string | SecretReferenceValue>[] {
let configurationSettings = new Array<
SetConfigurationSettingParam<string | MsFeatureFlagValue>
SetConfigurationSettingParam<string>
>();

let featureFlagsConfigSettings = new Array<SetConfigurationSettingParam<MsFeatureFlagValue>>();
let featureFlagsConfigSettings = new Array<SetConfigurationSettingParam<string>>();
let foundMsFmSchema = false;
let foundDotnetFmSchema = false;
let dotnetFmSchemaKeyWord = "";

const featureFlagsDict: any = {};

Check warning on line 47 in libraries/azure-app-configuration-importer/src/internal/parsers/defaultConfigurationSettingsConverter.ts

View workflow job for this annotation

GitHub Actions / build

Unexpected any. Specify a different type

if (options.format == ConfigurationFormat.Properties && !options.skipFeatureFlags) {
this.checkFeatureManagementExist(config);
Expand Down Expand Up @@ -187,8 +187,8 @@
Convert(
config: object,
options: SourceOptions
): SetConfigurationSettingParam<MsFeatureFlagValue>[] {
const settings = new Array<SetConfigurationSettingParam<MsFeatureFlagValue>>();
): SetConfigurationSettingParam<string>[] {
const settings = new Array<SetConfigurationSettingParam<string>>();
const featureFlags = new Array<MsFeatureFlagValue>();

if (this.dotnetFmSchemaKeyWord) {
Expand Down Expand Up @@ -247,10 +247,10 @@

const prefix: string = options.prefix ?? "";
for (const featureFlag of featureFlags) {
const setting: SetConfigurationSettingParam<MsFeatureFlagValue> = {
const setting: SetConfigurationSettingParam<string> = {
key: featureFlagPrefix + prefix + featureFlag.id,
label: options.label,
value: featureFlag,
value: serializeFeatureFlagValue(featureFlag),
contentType: featureFlagContentType,
tags: options.tags
};
Expand Down
25 changes: 24 additions & 1 deletion libraries/azure-app-configuration-importer/src/internal/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,12 @@ import {
featureFlagContentType,
SecretReferenceValue } 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";
import { Constants } from "../internal/constants";
import { MsFeatureFlagValue } from "../featureFlag";

/** @internal*/
export function isJsonContentType(contentType?: string): boolean {
Expand Down Expand Up @@ -169,3 +170,25 @@ function toFeatureFlagValue(value: string): FeatureFlagValue {
conditions: isEmpty(parsedJson.conditions) ? {clientFilters: []} : {clientFilters: parsedJson.conditions.client_filters}
};
}

export function serializeFeatureFlagValue(featureFlagValue: MsFeatureFlagValue): string {
if (!featureFlagValue) {
throw new TypeError(`FeatureFlag has an unexpected value - ${featureFlagValue}`);
}

const jsonFeatureFlagValue: JsonFeatureFlagValue = {
id: featureFlagValue.id,
enabled: featureFlagValue.enabled,
description: featureFlagValue.description,
conditions: {
client_filters: featureFlagValue.conditions?.clientFilters,
requirement_type: featureFlagValue.conditions?.requirementType
},
display_name: featureFlagValue.displayName,
allocation: featureFlagValue.allocation,
variants: featureFlagValue.variants,
telemetry: featureFlagValue.telemetry
};

return JSON.stringify(jsonFeatureFlagValue);
}
24 changes: 24 additions & 0 deletions libraries/azure-app-configuration-importer/src/models.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,30 @@ export interface JsonSecretReferenceValue {
uri: string;
}

/**
* @internal
*/
export type JsonFeatureFlagValue = {
conditions: {
client_filters: { name: string; parameters?: Record<string, unknown> }[];
requirement_type?: string;
};
enabled: boolean;
description?: string;
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
*/
Expand Down
Loading
Loading