Skip to content
Merged
Show file tree
Hide file tree
Changes from all 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
File renamed without changes.
22 changes: 11 additions & 11 deletions src/AzureAppConfigurationImpl.ts → src/appConfigurationImpl.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@ import {
KnownSnapshotComposition
} from "@azure/app-configuration";
import { isRestError } from "@azure/core-rest-pipeline";
import { AzureAppConfiguration, ConfigurationObjectConstructionOptions } from "./AzureAppConfiguration.js";
import { AzureAppConfigurationOptions } from "./AzureAppConfigurationOptions.js";
import { IKeyValueAdapter } from "./IKeyValueAdapter.js";
import { JsonKeyValueAdapter } from "./JsonKeyValueAdapter.js";
import { DEFAULT_STARTUP_TIMEOUT_IN_MS } from "./StartupOptions.js";
import { AzureAppConfiguration, ConfigurationObjectConstructionOptions } from "./appConfiguration.js";
import { AzureAppConfigurationOptions } from "./appConfigurationOptions.js";
import { IKeyValueAdapter } from "./keyValueAdapter.js";
import { JsonKeyValueAdapter } from "./jsonKeyValueAdapter.js";
import { DEFAULT_STARTUP_TIMEOUT_IN_MS } from "./startupOptions.js";
import { DEFAULT_REFRESH_INTERVAL_IN_MS, MIN_REFRESH_INTERVAL_IN_MS } from "./refresh/refreshOptions.js";
import { MIN_SECRET_REFRESH_INTERVAL_IN_MS } from "./keyvault/KeyVaultOptions.js";
import { MIN_SECRET_REFRESH_INTERVAL_IN_MS } from "./keyvault/keyVaultOptions.js";
import { Disposable } from "./common/disposable.js";
import {
FEATURE_FLAGS_KEY_NAME,
Expand All @@ -41,8 +41,8 @@ import {
} from "./featureManagement/constants.js";
import { FM_PACKAGE_NAME, AI_MIME_PROFILE, AI_CHAT_COMPLETION_MIME_PROFILE } from "./requestTracing/constants.js";
import { parseContentType, isJsonContentType, isFeatureFlagContentType, isSecretReferenceContentType } from "./common/contentType.js";
import { AzureKeyVaultKeyValueAdapter } from "./keyvault/AzureKeyVaultKeyValueAdapter.js";
import { RefreshTimer } from "./refresh/RefreshTimer.js";
import { AzureKeyVaultKeyValueAdapter } from "./keyvault/keyVaultKeyValueAdapter.js";
import { RefreshTimer } from "./refresh/refreshTimer.js";
import {
RequestTracingOptions,
getConfigurationSettingWithTrace,
Expand All @@ -51,10 +51,10 @@ import {
listConfigurationSettingsForSnapshotWithTrace,
requestTracingEnabled
} from "./requestTracing/utils.js";
import { FeatureFlagTracingOptions } from "./requestTracing/FeatureFlagTracingOptions.js";
import { AIConfigurationTracingOptions } from "./requestTracing/AIConfigurationTracingOptions.js";
import { FeatureFlagTracingOptions } from "./requestTracing/featureFlagTracingOptions.js";
import { AIConfigurationTracingOptions } from "./requestTracing/aiConfigurationTracingOptions.js";
import { KeyFilter, LabelFilter, SettingSelector } from "./types.js";
import { ConfigurationClientManager } from "./ConfigurationClientManager.js";
import { ConfigurationClientManager } from "./configurationClientManager.js";
import { getFixedBackoffDuration, getExponentialBackoffDuration } from "./common/backoffUtils.js";
import { InvalidOperationError, ArgumentError, isFailoverableError, isInputError } from "./common/error.js";

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
// Licensed under the MIT license.

import { AppConfigurationClientOptions } from "@azure/app-configuration";
import { KeyVaultOptions } from "./keyvault/KeyVaultOptions.js";
import { KeyVaultOptions } from "./keyvault/keyVaultOptions.js";
import { RefreshOptions } from "./refresh/refreshOptions.js";
import { SettingSelector } from "./types.js";
import { FeatureFlagOptions } from "./featureManagement/FeatureFlagOptions.js";
import { StartupOptions } from "./StartupOptions.js";
import { StartupOptions } from "./startupOptions.js";

export interface AzureAppConfigurationOptions {
/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
// Licensed under the MIT license.

import { AppConfigurationClient, AppConfigurationClientOptions } from "@azure/app-configuration";
import { ConfigurationClientWrapper } from "./ConfigurationClientWrapper.js";
import { ConfigurationClientWrapper } from "./configurationClientWrapper.js";
import { TokenCredential } from "@azure/identity";
import { AzureAppConfigurationOptions } from "./AzureAppConfigurationOptions.js";
import { AzureAppConfigurationOptions } from "./appConfigurationOptions.js";
import { isBrowser, isWebWorker } from "./requestTracing/utils.js";
import * as RequestTracing from "./requestTracing/constants.js";
import { shuffleList, instanceOfTokenCredential } from "./common/utils.js";
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion src/index.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Copyright (c) Microsoft Corporation.
// Licensed under the MIT license.

export { AzureAppConfiguration } from "./AzureAppConfiguration.js";
export { AzureAppConfiguration } from "./appConfiguration.js";
export { Disposable } from "./common/disposable.js";
export { load } from "./load.js";
export { KeyFilter, LabelFilter } from "./types.js";
Expand Down
2 changes: 1 addition & 1 deletion src/JsonKeyValueAdapter.ts → src/jsonKeyValueAdapter.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import { ConfigurationSetting, featureFlagContentType, secretReferenceContentType } from "@azure/app-configuration";
import { stripComments } from "jsonc-parser";
import { parseContentType, isJsonContentType } from "./common/contentType.js";
import { IKeyValueAdapter } from "./IKeyValueAdapter.js";
import { IKeyValueAdapter } from "./keyValueAdapter.js";

export class JsonKeyValueAdapter implements IKeyValueAdapter {
static readonly #ExcludedJsonContentTypes: string[] = [
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
// Licensed under the MIT license.

import { ConfigurationSetting, isSecretReference, parseSecretReference } from "@azure/app-configuration";
import { IKeyValueAdapter } from "../IKeyValueAdapter.js";
import { AzureKeyVaultSecretProvider } from "./AzureKeyVaultSecretProvider.js";
import { KeyVaultOptions } from "./KeyVaultOptions.js";
import { RefreshTimer } from "../refresh/RefreshTimer.js";
import { IKeyValueAdapter } from "../keyValueAdapter.js";
import { AzureKeyVaultSecretProvider } from "./keyVaultSecretProvider.js";
import { KeyVaultOptions } from "./keyVaultOptions.js";
import { RefreshTimer } from "../refresh/refreshTimer.js";
import { ArgumentError, KeyVaultReferenceError } from "../common/error.js";
import { KeyVaultSecretIdentifier, parseKeyVaultSecretIdentifier } from "@azure/keyvault-secrets";
import { isRestError } from "@azure/core-rest-pipeline";
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
// Copyright (c) Microsoft Corporation.
// Licensed under the MIT license.

import { KeyVaultOptions } from "./KeyVaultOptions.js";
import { RefreshTimer } from "../refresh/RefreshTimer.js";
import { KeyVaultOptions } from "./keyVaultOptions.js";
import { RefreshTimer } from "../refresh/refreshTimer.js";
import { ArgumentError } from "../common/error.js";
import { SecretClient, KeyVaultSecretIdentifier } from "@azure/keyvault-secrets";

Expand Down
8 changes: 4 additions & 4 deletions src/load.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
// Licensed under the MIT license.

import { TokenCredential } from "@azure/identity";
import { AzureAppConfiguration } from "./AzureAppConfiguration.js";
import { AzureAppConfigurationImpl } from "./AzureAppConfigurationImpl.js";
import { AzureAppConfigurationOptions } from "./AzureAppConfigurationOptions.js";
import { ConfigurationClientManager } from "./ConfigurationClientManager.js";
import { AzureAppConfiguration } from "./appConfiguration.js";
import { AzureAppConfigurationImpl } from "./appConfigurationImpl.js";
import { AzureAppConfigurationOptions } from "./appConfigurationOptions.js";
import { ConfigurationClientManager } from "./configurationClientManager.js";
import { instanceOfTokenCredential } from "./common/utils.js";

const MIN_DELAY_FOR_UNHANDLED_ERROR_IN_MS: number = 5_000;
Expand Down
2 changes: 1 addition & 1 deletion src/refresh/refreshOptions.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Copyright (c) Microsoft Corporation.
// Licensed under the MIT license.

import { WatchedSetting } from "../WatchedSetting.js";
import { WatchedSetting } from "../watchedSetting.js";

export const DEFAULT_REFRESH_INTERVAL_IN_MS = 30_000;
export const MIN_REFRESH_INTERVAL_IN_MS = 1_000;
Expand Down
File renamed without changes.
15 changes: 11 additions & 4 deletions src/requestTracing/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,17 @@
// Licensed under the MIT license.

import { OperationOptions } from "@azure/core-client";
import { AppConfigurationClient, ConfigurationSettingId, GetConfigurationSettingOptions, ListConfigurationSettingsOptions, GetSnapshotOptions, ListConfigurationSettingsForSnapshotOptions } from "@azure/app-configuration";
import { AzureAppConfigurationOptions } from "../AzureAppConfigurationOptions.js";
import { FeatureFlagTracingOptions } from "./FeatureFlagTracingOptions.js";
import { AIConfigurationTracingOptions } from "./AIConfigurationTracingOptions.js";
import {
AppConfigurationClient,
ConfigurationSettingId,
GetConfigurationSettingOptions,
ListConfigurationSettingsOptions,
GetSnapshotOptions,
ListConfigurationSettingsForSnapshotOptions
} from "@azure/app-configuration";
import { AzureAppConfigurationOptions } from "../appConfigurationOptions.js";
import { FeatureFlagTracingOptions } from "./featureFlagTracingOptions.js";
import { AIConfigurationTracingOptions } from "./aiConfigurationTracingOptions.js";
import {
AZURE_FUNCTION_ENV_VAR,
AZURE_WEB_APP_ENV_VAR,
Expand Down
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion test/failover.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ chai.use(chaiAsPromised);
const expect = chai.expect;
import { load } from "./exportedApi";
import { MAX_TIME_OUT, createMockedConnectionString, createMockedFeatureFlag, createMockedKeyValue, mockConfigurationManagerGetClients, restoreMocks } from "./utils/testHelper";
import { getValidDomain, isValidEndpoint } from "../src/ConfigurationClientManager";
import { getValidDomain, isValidEndpoint } from "../src/configurationClientManager";

const mockedKVs = [{
key: "app.settings.fontColor",
Expand Down
2 changes: 1 addition & 1 deletion test/loadBalance.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ const expect = chai.expect;
import { load } from "./exportedApi.js";
import { MAX_TIME_OUT, restoreMocks, createMockedConnectionString, sleepInMs, createMockedEndpoint, mockConfigurationManagerGetClients, mockAppConfigurationClientLoadBalanceMode } from "./utils/testHelper.js";
import { AppConfigurationClient } from "@azure/app-configuration";
import { ConfigurationClientWrapper } from "../src/ConfigurationClientWrapper.js";
import { ConfigurationClientWrapper } from "../src/configurationClientWrapper.js";

const fakeEndpoint_1 = createMockedEndpoint("fake_1");
const fakeEndpoint_2 = createMockedEndpoint("fake_2");
Expand Down
2 changes: 1 addition & 1 deletion test/requestTracing.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import * as chaiAsPromised from "chai-as-promised";
chai.use(chaiAsPromised);
const expect = chai.expect;
import { MAX_TIME_OUT, HttpRequestHeadersPolicy, createMockedConnectionString, createMockedKeyValue, createMockedFeatureFlag, createMockedTokenCredential, mockAppConfigurationClientListConfigurationSettings, restoreMocks, sinon, sleepInMs } from "./utils/testHelper.js";
import { ConfigurationClientManager } from "../src/ConfigurationClientManager.js";
import { ConfigurationClientManager } from "../src/configurationClientManager.js";
import { load } from "./exportedApi.js";

const CORRELATION_CONTEXT_HEADER_NAME = "Correlation-Context";
Expand Down
4 changes: 2 additions & 2 deletions test/utils/testHelper.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import { RestError } from "@azure/core-rest-pipeline";
import { promisify } from "util";
const sleepInMs = promisify(setTimeout);
import * as crypto from "crypto";
import { ConfigurationClientManager } from "../../src/ConfigurationClientManager.js";
import { ConfigurationClientWrapper } from "../../src/ConfigurationClientWrapper.js";
import { ConfigurationClientManager } from "../../src/configurationClientManager.js";
import { ConfigurationClientWrapper } from "../../src/configurationClientWrapper.js";

const MAX_TIME_OUT = 100_000;

Expand Down