Skip to content

Commit f1425bf

Browse files
author
SDKAuto
committed
CodeGen from PR 25517 in Azure/azure-rest-api-specs
Merge 63933c0c0625c1fe8d421b79144e5aa658b2e1b3 into 9cff12e5e7e09f9f4479de7b626b856da501d665
1 parent 2dfe32b commit f1425bf

File tree

6 files changed

+59
-46
lines changed

6 files changed

+59
-46
lines changed
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
2-
"commit": "a7db288cbce8b520781be6b23444fc895c4d6c81",
2+
"commit": "60818fc41949189bba28772e764d7633c4bb35b9",
33
"readme": "specification/redis/resource-manager/readme.md",
4-
"autorest_command": "autorest --version=3.9.3 --typescript --modelerfour.lenient-model-deduplication --azure-arm --head-as-boolean=true --license-header=MICROSOFT_MIT_NO_VERSION --generate-test --typescript-sdks-folder=F:\\azure-sdk-for-js ..\\azure-rest-api-specs\\specification\\redis\\resource-manager\\readme.md --use=@autorest/typescript@6.0.2 --generate-sample=true",
4+
"autorest_command": "autorest --version=3.9.7 --typescript --modelerfour.lenient-model-deduplication --azure-arm --head-as-boolean=true --license-header=MICROSOFT_MIT_NO_VERSION --generate-test --typescript-sdks-folder=/mnt/vss/_work/1/s/azure-sdk-for-js ../azure-rest-api-specs/specification/redis/resource-manager/readme.md --use=@autorest/typescript@^6.0.4",
55
"repository_url": "https://github.com/Azure/azure-rest-api-specs.git",
6-
"release_tool": "@azure-tools/js-sdk-release-tools@2.7.0",
7-
"use": "@autorest/typescript@6.0.2"
6+
"release_tool": "@azure-tools/js-sdk-release-tools@2.7.2",
7+
"use": "@autorest/typescript@^6.0.4"
88
}

sdk/redis/arm-rediscache/package.json

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@
88
"node": ">=14.0.0"
99
},
1010
"dependencies": {
11-
"@azure/core-lro": "^2.5.3",
11+
"@azure/core-lro": "^2.5.4",
1212
"@azure/abort-controller": "^1.0.0",
1313
"@azure/core-paging": "^1.2.0",
1414
"@azure/core-client": "^1.7.0",
1515
"@azure/core-auth": "^1.3.0",
16-
"@azure/core-rest-pipeline": "^1.8.0",
16+
"@azure/core-rest-pipeline": "^1.12.0",
1717
"tslib": "^2.2.0"
1818
},
1919
"keywords": [
@@ -48,9 +48,8 @@
4848
"chai": "^4.2.0",
4949
"cross-env": "^7.0.2",
5050
"@types/node": "^14.0.0",
51-
"@azure/dev-tool": "^1.0.0",
52-
"@azure/arm-network": "^26.0.0",
53-
"ts-node": "^10.0.0"
51+
"ts-node": "^10.0.0",
52+
"@azure/dev-tool": "^1.0.0"
5453
},
5554
"repository": {
5655
"type": "git",
@@ -113,13 +112,5 @@
113112
]
114113
},
115114
"autoPublish": true,
116-
"homepage": "https://github.com/Azure/azure-sdk-for-js/tree/main/sdk/redis/arm-rediscache",
117-
"//sampleConfiguration": {
118-
"productName": "",
119-
"productSlugs": [
120-
"azure"
121-
],
122-
"disableDocsMs": true,
123-
"apiRefLink": "https://docs.microsoft.com/javascript/api/@azure/arm-rediscache?view=azure-node-preview"
124-
}
125-
}
115+
"homepage": "https://github.com/Azure/azure-sdk-for-js/tree/main/sdk/redis/arm-rediscache"
116+
}

sdk/redis/arm-rediscache/src/models/index.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ export interface RedisCreateParameters {
152152
shardCount?: number;
153153
/** Optional: requires clients to use a specified TLS version (or higher) to connect (e,g, '1.0', '1.1', '1.2') */
154154
minimumTlsVersion?: TlsVersion;
155-
/** Whether or not public endpoint access is allowed for this cache. Value is optional but if passed in, must be 'Enabled' or 'Disabled'. If 'Disabled', private endpoints are the exclusive access method. Default value is 'Enabled' */
155+
/** Whether or not public endpoint access is allowed for this cache. Value is optional, but if passed in, must be 'Enabled' or 'Disabled'. If 'Disabled', private endpoints are the exclusive access method. Default value is 'Enabled'. Note: This setting is important for caches with private endpoints. It has *no effect* on caches that are joined to, or injected into, a virtual network subnet. */
156156
publicNetworkAccess?: PublicNetworkAccess;
157157
/** The SKU of the Redis cache to deploy. */
158158
sku: Sku;
@@ -190,7 +190,7 @@ export interface RedisCommonProperties {
190190
shardCount?: number;
191191
/** Optional: requires clients to use a specified TLS version (or higher) to connect (e,g, '1.0', '1.1', '1.2') */
192192
minimumTlsVersion?: TlsVersion;
193-
/** Whether or not public endpoint access is allowed for this cache. Value is optional but if passed in, must be 'Enabled' or 'Disabled'. If 'Disabled', private endpoints are the exclusive access method. Default value is 'Enabled' */
193+
/** Whether or not public endpoint access is allowed for this cache. Value is optional, but if passed in, must be 'Enabled' or 'Disabled'. If 'Disabled', private endpoints are the exclusive access method. Default value is 'Enabled'. Note: This setting is important for caches with private endpoints. It has *no effect* on caches that are joined to, or injected into, a virtual network subnet. */
194194
publicNetworkAccess?: PublicNetworkAccess;
195195
}
196196

@@ -392,7 +392,7 @@ export interface RedisUpdateParameters {
392392
shardCount?: number;
393393
/** Optional: requires clients to use a specified TLS version (or higher) to connect (e,g, '1.0', '1.1', '1.2') */
394394
minimumTlsVersion?: TlsVersion;
395-
/** Whether or not public endpoint access is allowed for this cache. Value is optional but if passed in, must be 'Enabled' or 'Disabled'. If 'Disabled', private endpoints are the exclusive access method. Default value is 'Enabled' */
395+
/** Whether or not public endpoint access is allowed for this cache. Value is optional, but if passed in, must be 'Enabled' or 'Disabled'. If 'Disabled', private endpoints are the exclusive access method. Default value is 'Enabled'. Note: This setting is important for caches with private endpoints. It has *no effect* on caches that are joined to, or injected into, a virtual network subnet. */
396396
publicNetworkAccess?: PublicNetworkAccess;
397397
/** The SKU of the Redis cache to deploy. */
398398
sku?: Sku;
@@ -742,7 +742,7 @@ export interface RedisResource extends TrackedResource {
742742
shardCount?: number;
743743
/** Optional: requires clients to use a specified TLS version (or higher) to connect (e,g, '1.0', '1.1', '1.2') */
744744
minimumTlsVersion?: TlsVersion;
745-
/** Whether or not public endpoint access is allowed for this cache. Value is optional but if passed in, must be 'Enabled' or 'Disabled'. If 'Disabled', private endpoints are the exclusive access method. Default value is 'Enabled' */
745+
/** Whether or not public endpoint access is allowed for this cache. Value is optional, but if passed in, must be 'Enabled' or 'Disabled'. If 'Disabled', private endpoints are the exclusive access method. Default value is 'Enabled'. Note: This setting is important for caches with private endpoints. It has *no effect* on caches that are joined to, or injected into, a virtual network subnet. */
746746
publicNetworkAccess?: PublicNetworkAccess;
747747
/** The SKU of the Redis cache to deploy. */
748748
sku: Sku;

sdk/redis/arm-rediscache/src/models/mappers.ts

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -372,11 +372,6 @@ export const RedisCreateParameters: coreClient.CompositeMapper = {
372372
}
373373
},
374374
subnetId: {
375-
constraints: {
376-
Pattern: new RegExp(
377-
"^\\/subscriptions\\/[^/]*\\/resourceGroups\\/[^/]*\\/providers\\/Microsoft.(ClassicNetwork|Network)\\/virtualNetworks\\/[^/]*\\/subnets\\/[^/]*$"
378-
)
379-
},
380375
serializedName: "properties.subnetId",
381376
type: {
382377
name: "String"
@@ -1488,11 +1483,6 @@ export const RedisCreateProperties: coreClient.CompositeMapper = {
14881483
}
14891484
},
14901485
subnetId: {
1491-
constraints: {
1492-
Pattern: new RegExp(
1493-
"^\\/subscriptions\\/[^/]*\\/resourceGroups\\/[^/]*\\/providers\\/Microsoft.(ClassicNetwork|Network)\\/virtualNetworks\\/[^/]*\\/subnets\\/[^/]*$"
1494-
)
1495-
},
14961486
serializedName: "subnetId",
14971487
type: {
14981488
name: "String"
@@ -1841,11 +1831,6 @@ export const RedisResource: coreClient.CompositeMapper = {
18411831
}
18421832
},
18431833
subnetId: {
1844-
constraints: {
1845-
Pattern: new RegExp(
1846-
"^\\/subscriptions\\/[^/]*\\/resourceGroups\\/[^/]*\\/providers\\/Microsoft.(ClassicNetwork|Network)\\/virtualNetworks\\/[^/]*\\/subnets\\/[^/]*$"
1847-
)
1848-
},
18491834
serializedName: "properties.subnetId",
18501835
type: {
18511836
name: "String"
Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
/*
2+
* Copyright (c) Microsoft Corporation.
3+
* Licensed under the MIT License.
4+
*
5+
* Code generated by Microsoft (R) AutoRest Code Generator.
6+
* Changes may cause incorrect behavior and will be lost if the code is regenerated.
7+
*/
8+
9+
import {
10+
Recorder,
11+
RecorderStartOptions,
12+
env
13+
} from "@azure-tools/test-recorder";
14+
import { assert } from "chai";
15+
import { Context } from "mocha";
16+
17+
const replaceableVariables: Record<string, string> = {
18+
AZURE_CLIENT_ID: "azure_client_id",
19+
AZURE_CLIENT_SECRET: "azure_client_secret",
20+
AZURE_TENANT_ID: "88888888-8888-8888-8888-888888888888",
21+
SUBSCRIPTION_ID: "azure_subscription_id"
22+
};
23+
24+
const recorderOptions: RecorderStartOptions = {
25+
envSetupForPlayback: replaceableVariables
26+
};
27+
28+
describe("My test", () => {
29+
let recorder: Recorder;
30+
31+
beforeEach(async function(this: Context) {
32+
recorder = new Recorder(this.currentTest);
33+
await recorder.start(recorderOptions);
34+
});
35+
36+
afterEach(async function() {
37+
await recorder.stop();
38+
});
39+
40+
it("sample test", async function() {
41+
console.log("Hi, I'm a test!");
42+
});
43+
});

sdk/redis/arm-rediscache/tsconfig.json

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,11 @@
1515
],
1616
"declaration": true,
1717
"outDir": "./dist-esm",
18-
"importHelpers": true,
19-
"paths": {
20-
"@azure/arm-rediscache": [
21-
"./src/index"
22-
]
23-
}
18+
"importHelpers": true
2419
},
2520
"include": [
2621
"./src/**/*.ts",
27-
"./test/**/*.ts",
28-
"samples-dev/**/*.ts"
22+
"./test/**/*.ts"
2923
],
3024
"exclude": [
3125
"node_modules"

0 commit comments

Comments
 (0)