Skip to content

Commit 13e6ccc

Browse files
zhiyuanliang-mszhiyuanliang-ms
committed
merge preview
2 parents 16bf0c0 + 98f1a0a commit 13e6ccc

File tree

12 files changed

+143
-55
lines changed

12 files changed

+143
-55
lines changed

‎.github/workflows/codeql.yml‎

Lines changed: 92 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,92 @@
1+
# For most projects, this workflow file will not need changing; you simply need
2+
# to commit it to your repository.
3+
#
4+
# You may wish to alter this file to override the set of languages analyzed,
5+
# or to provide custom queries or build logic.
6+
#
7+
# ******** NOTE ********
8+
# We have attempted to detect the languages in your repository. Please check
9+
# the `language` matrix defined below to confirm you have the correct set of
10+
# supported CodeQL languages.
11+
#
12+
name: "CodeQL Advanced"
13+
14+
on:
15+
push:
16+
branches: [ "main", "Preview", "Release" ]
17+
pull_request:
18+
branches: [ "main", "Preview", "Release" ]
19+
schedule:
20+
- cron: '24 22 * * 4'
21+
22+
jobs:
23+
analyze:
24+
name: Analyze (${{ matrix.language }})
25+
# Runner size impacts CodeQL analysis time. To learn more, please see:
26+
# - https://gh.io/recommended-hardware-resources-for-running-codeql
27+
# - https://gh.io/supported-runners-and-hardware-resources
28+
# - https://gh.io/using-larger-runners (GitHub.com only)
29+
# Consider using larger runners or machines with greater resources for possible analysis time improvements.
30+
runs-on: ${{ (matrix.language == 'swift' && 'macos-latest') || 'ubuntu-latest' }}
31+
permissions:
32+
# required for all workflows
33+
security-events: write
34+
35+
# required to fetch internal or private CodeQL packs
36+
packages: read
37+
38+
# only required for workflows in private repositories
39+
actions: read
40+
contents: read
41+
42+
strategy:
43+
fail-fast: false
44+
matrix:
45+
include:
46+
- language: javascript-typescript
47+
build-mode: none
48+
# CodeQL supports the following values keywords for 'language': 'c-cpp', 'csharp', 'go', 'java-kotlin', 'javascript-typescript', 'python', 'ruby', 'swift'
49+
# Use `c-cpp` to analyze code written in C, C++ or both
50+
# Use 'java-kotlin' to analyze code written in Java, Kotlin or both
51+
# Use 'javascript-typescript' to analyze code written in JavaScript, TypeScript or both
52+
# To learn more about changing the languages that are analyzed or customizing the build mode for your analysis,
53+
# see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/customizing-your-advanced-setup-for-code-scanning.
54+
# If you are analyzing a compiled language, you can modify the 'build-mode' for that language to customize how
55+
# your codebase is analyzed, see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/codeql-code-scanning-for-compiled-languages
56+
steps:
57+
- name: Checkout repository
58+
uses: actions/checkout@v4
59+
60+
# Initializes the CodeQL tools for scanning.
61+
- name: Initialize CodeQL
62+
uses: github/codeql-action/init@v3
63+
with:
64+
languages: ${{ matrix.language }}
65+
build-mode: ${{ matrix.build-mode }}
66+
# If you wish to specify custom queries, you can do so here or in a config file.
67+
# By default, queries listed here will override any specified in a config file.
68+
# Prefix the list here with "+" to use these queries and those in the config file.
69+
70+
# For more details on CodeQL's query packs, refer to: https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
71+
# queries: security-extended,security-and-quality
72+
73+
# If the analyze step fails for one of the languages you are analyzing with
74+
# "We were unable to automatically build your code", modify the matrix above
75+
# to set the build mode to "manual" for that language. Then modify this step
76+
# to build your code.
77+
# ℹ️ Command-line programs to run using the OS shell.
78+
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
79+
- if: matrix.build-mode == 'manual'
80+
shell: bash
81+
run: |
82+
echo 'If you are using a "manual" build mode for one or more of the' \
83+
'languages you are analyzing, replace this with the commands to build' \
84+
'your code, for example:'
85+
echo ' make bootstrap'
86+
echo ' make release'
87+
exit 1
88+
89+
- name: Perform CodeQL Analysis
90+
uses: github/codeql-action/analyze@v3
91+
with:
92+
category: "/language:${{matrix.language}}"

‎package-lock.json‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@azure/app-configuration-provider",
3-
"version": "1.1.1",
3+
"version": "1.1.2",
44
"description": "The JavaScript configuration provider for Azure App Configuration",
55
"main": "dist/index.js",
66
"module": "./dist-esm/index.js",

‎server.cert‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
-----BEGIN CERTIFICATE-----
2+
MIIC8DCCAdigAwIBAgIJWz41hwnlFODkMA0GCSqGSIb3DQEBBQUAMBQxEjAQBgNV
3+
BAMTCWxvY2FsaG9zdDAeFw0yNDExMDUxNjI3NDVaFw0yNTExMDUxNjI3NDVaMBQx
4+
EjAQBgNVBAMTCWxvY2FsaG9zdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
5+
ggEBAOBEIu1gsfcnkDKkHFbdkmqodiXltftn8rTmq4qWjh1xnB7d0ZZpyvCNGo+K
6+
QuZ0L/yTbDOL+ijM1KjXHQmXP75fPn0VrCKy4jgc5dz1NgU+XzFQe1WyqYlsUAm9
7+
YaDiscYIVpC03xkXJdWkAHXsN/P46pLxGX1fMHVQsAi2PNTtuO7lBj6T/NHL5QbI
8+
610I76drBY6KL2B5Djmi6YsPZ6pmppylGr8KlHsaKzWGytHkKIPLPhg6hDvvFSko
9+
SsXhBjF2rZcauG7y91azfkkGTsB1PO4QZD62MNgeF+7Ly7KkYOVzOop14vOjZxFz
10+
mhETRNVpUsLqYwh7VzKGbheflKUCAwEAAaNFMEMwDAYDVR0TBAUwAwEB/zALBgNV
11+
HQ8EBAMCAvQwJgYDVR0RBB8wHYYbaHR0cDovL2V4YW1wbGUub3JnL3dlYmlkI21l
12+
MA0GCSqGSIb3DQEBBQUAA4IBAQAv5NwaNUAjKlg9u7WNARDD7eio+NpHEOFX0ayf
13+
3WyJR3AgMjP8M95cgjq+BZF/vpbCxDJHZjad0ZkPQYe848hfBu9d/jcuXOB1Z3Zl
14+
/8QOgaHk8+NqeUyAVUgaLFaChMLAeUE4e+hsfDUiXmEmpFMDAEM3fxPZ73yxK/Qs
15+
okXOxFDiImjO3NZjcyLvV+5T0UvH+PAPx1e8j1c3n8J+FpQivsK16GJU0F+SLn6t
16+
s+FPpb4rD3pG5soPHtM1G9Jr9V9ArgSvDHdEmnwZAwgBUu6pZC3b7S1HNjJYyTay
17+
gTn7XOciel8YdDGPOh0vNABrSOHuJwkeQnbFIqIflbiZjbnI
18+
-----END CERTIFICATE-----

‎server.key‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
-----BEGIN RSA PRIVATE KEY-----
2+
MIIEoAIBAAKCAQEA4EQi7WCx9yeQMqQcVt2Saqh2JeW1+2fytOaripaOHXGcHt3R
3+
lmnK8I0aj4pC5nQv/JNsM4v6KMzUqNcdCZc/vl8+fRWsIrLiOBzl3PU2BT5fMVB7
4+
VbKpiWxQCb1hoOKxxghWkLTfGRcl1aQAdew38/jqkvEZfV8wdVCwCLY81O247uUG
5+
PpP80cvlBsjrXQjvp2sFjoovYHkOOaLpiw9nqmamnKUavwqUexorNYbK0eQog8s+
6+
GDqEO+8VKShKxeEGMXatlxq4bvL3VrN+SQZOwHU87hBkPrYw2B4X7svLsqRg5XM6
7+
inXi86NnEXOaERNE1WlSwupjCHtXMoZuF5+UpQIDAQABAoIBABJ4pN8j+N8lno5V
8+
OaemmJcj/esxfX4nTx8QOq5vp7qMGh2UC92qzqtma9Aeb/6Bhlb0INQpYiF3Jsgr
9+
Q48qf8u4a4dWQCHG1bQPyUJG3hFWKaAAWXrdpsdp/jj3JLHhdLPzXtyMpoLEsc85
10+
XU0DzONRgVHjUsP35vVaqne6js3DXookFjfIerA5tK0Olai4cikh19ux5bboGSsl
11+
rxnhbKkpASMrgNO7vLPYGj5ofAqH7AVgiPEvmch6pMRXMyn6EW/FatUtzl2tkVHu
12+
qAt1SHNQtzvv/M3owmGcWzqRYrd8yk1YtU6XObshoNB1IUgqGswPvoCa+r21euH7
13+
8a8cd0ECgYEA83EovMsITETiXzORY/Z6p1wla/VDALBA5GNnUEbUo7ZXlNIqjCbb
14+
ym32ffDW5vNgzjQM8mhZ3tTymimy+KWYuS+GU4n6Y9eoMCtuuZf/2HS5+OuKuNa6
15+
qebAD6QHuqjkf9cQ9eT2bbUT+6YYfu4peT7Ukms20cGibgLUB397Z6ECgYEA69W+
16+
vG9c34pTFzzk9Qc1Npmq5z/0POLVD/Q+s4WbDhGnLPlMOru50KPGZIwZt3oxLxuO
17+
SPMUKRwQWS7/OIoAMWm7DCQQ8kLMEgogZrfvF9Vg/LJqkdcflMYYYONi+qKWuxnE
18+
BcbGHbOzylTWwE0Ab3BMTe72BOrMRHPJJkoR/oUCgYBT56Ce0Wueve832NI3nfBQ
19+
VpYfS304c4cqMIifRoprkqFFDdrUS2BduODIL4YiO6gV6iK8OfMftk2XjN++i3TD
20+
/vlRObEvUFkLoSyckyL/O9wNS0GYy4mynXF88pAnaaa32SxjU/MLhOnKRkkTFor8
21+
2wbxIDrYuOB/AkKKAwpJgQKBgFZwiLGei8bvd1ccHbtlwe5aUpbiDQ5IAdoQJu87
22+
+EIm3ESSt4sLhabgcHYoF8D1S5O9oOBCIFCVFbTqkedSRZHW9BUWHxP8wbmW9ptP
23+
rZXpwtu8NW1xEQVBumvAzGWbNG4tmniXi8QVOr/dar0fPBqcaYtjG89flDE+0ypy
24+
mbfVAn9UszXDlfJmWEu3AEhHPTiBRLOK01Zl6pJgABeRZOh4q1TCelA7Gksi/5Yz
25+
/pHxUETVwD98Lz61wbgtbwteGhUm4umFRc+mK2gliFs/GnuAuPUCtHmVp3lLP9uf
26+
r4kulWFhEWbDj7UzkUWwq7B6oGh1TQZPgqGWfX06IxFiXqkx
27+
-----END RSA PRIVATE KEY-----

‎src/AzureAppConfigurationImpl.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ export class AzureAppConfigurationImpl implements AzureAppConfiguration {
8787
this.#options = options;
8888

8989
// Enable request tracing if not opt-out
90-
this.#requestTracingEnabled = options?.requestTracingOptions?.enabled ?? requestTracingEnabled();
90+
this.#requestTracingEnabled = requestTracingEnabled();
9191

9292
if (options?.trimKeyPrefixes) {
9393
this.#sortedTrimKeyPrefixes = [...options.trimKeyPrefixes].sort((a, b) => b.localeCompare(a));

‎src/AzureAppConfigurationOptions.ts‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import { KeyVaultOptions } from "./keyvault/KeyVaultOptions.js";
66
import { RefreshOptions } from "./RefreshOptions.js";
77
import { SettingSelector } from "./types.js";
88
import { FeatureFlagOptions } from "./featureManagement/FeatureFlagOptions.js";
9-
import { RequestTracingOptions } from "./requestTracing/RequestTracingOptions.js";
109

1110
export const MaxRetries = 2;
1211
export const MaxRetryDelayInMs = 60000;
@@ -48,9 +47,4 @@ export interface AzureAppConfigurationOptions {
4847
* Specifies options used to configure feature flags.
4948
*/
5049
featureFlagOptions?: FeatureFlagOptions;
51-
52-
/**
53-
* Specifies options used to configure request tracing.
54-
*/
55-
requestTracingOptions?: RequestTracingOptions;
5650
}

‎src/index.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33

44
export { AzureAppConfiguration } from "./AzureAppConfiguration.js";
55
export { Disposable } from "./common/disposable.js";
6-
export { load, loadFromCdn } from "./load.js";
6+
export { load } from "./load.js";
77
export { KeyFilter, LabelFilter } from "./types.js";
88
export { VERSION } from "./version.js";

‎src/load.ts‎

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -82,23 +82,6 @@ export async function load(
8282
}
8383
}
8484

85-
/**
86-
* Loads the data from a CDN and returns an instance of AzureAppConfiguration.
87-
* @param cdnEndpoint The URL to the CDN.
88-
* @param appConfigOptions Optional parameters.
89-
*/
90-
export async function loadFromCdn(cdnEndpoint: URL | string, options?: AzureAppConfigurationOptions): Promise<AzureAppConfiguration>;
91-
92-
export async function loadFromCdn(
93-
cdnEndpoint: string | URL,
94-
appConfigOptions?: AzureAppConfigurationOptions
95-
): Promise<AzureAppConfiguration> {
96-
const emptyTokenCredential: TokenCredential = {
97-
getToken: async () => ({ token: "", expiresOnTimestamp: 0 })
98-
};
99-
return await load(cdnEndpoint, emptyTokenCredential, appConfigOptions);
100-
}
101-
10285
function instanceOfTokenCredential(obj: unknown) {
10386
return obj && typeof obj === "object" && "getToken" in obj && typeof obj.getToken === "function";
10487
}

‎src/requestTracing/RequestTracingOptions.ts‎

Lines changed: 0 additions & 12 deletions
This file was deleted.

0 commit comments

Comments
 (0)