Skip to content

Commit 7af971e

Browse files
author
SDKAuto
committed
CodeGen from PR 16961 in Azure/azure-rest-api-specs
Merge 27b62ab4c6667006a92373d96c057f3644b9aa3f into b7ceedcb657cac760383b17627cd2c1f47dd1521
1 parent af3834e commit 7af971e

File tree

15 files changed

+444
-333
lines changed

15 files changed

+444
-333
lines changed

common/config/rush/pnpm-lock.yaml

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

sdk/batch/arm-batch/CHANGELOG.md

Lines changed: 19 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,23 @@
11
# Release History
2-
3-
## 7.0.1 (Unreleased)
4-
5-
### Features Added
6-
7-
### Breaking Changes
8-
9-
### Bugs Fixed
10-
11-
### Other Changes
12-
2+
3+
## 7.1.0 (2022-02-15)
4+
5+
**Features**
6+
7+
- Added operation BatchAccountOperations.getDetector
8+
- Added operation BatchAccountOperations.listDetectors
9+
- Added Interface BatchAccountGetDetectorOptionalParams
10+
- Added Interface BatchAccountListDetectorsNextOptionalParams
11+
- Added Interface BatchAccountListDetectorsOptionalParams
12+
- Added Interface DetectorListResult
13+
- Added Type Alias BatchAccountGetDetectorResponse
14+
- Added Type Alias BatchAccountListDetectorsNextResponse
15+
- Added Type Alias BatchAccountListDetectorsResponse
16+
- Added Type Alias DetectorResponse
17+
- Added Type Alias DynamicVNetAssignmentScope
18+
- Interface NetworkConfiguration has a new optional parameter dynamicVNetAssignmentScope
19+
20+
1321
## 7.0.0 (2021-12-24)
1422

1523
The package of @azure/arm-batch is using our next generation design principles since version 7.0.0, which contains breaking changes.

sdk/batch/arm-batch/LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
The MIT License (MIT)
22

3-
Copyright (c) 2021 Microsoft
3+
Copyright (c) 2022 Microsoft
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

sdk/batch/arm-batch/_meta.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
2-
"commit": "698ebc782f3cc4650f6df1d765f6a38a6695ad50",
2+
"commit": "5f120c7da26b228e37241a53a2e0cddd81ea215a",
33
"readme": "specification/batch/resource-manager/readme.md",
4-
"autorest_command": "autorest --version=3.1.3 --typescript --modelerfour.lenient-model-deduplication --head-as-boolean=true --license-header=MICROSOFT_MIT_NO_VERSION --generate-test --typescript-sdks-folder=D:\\mydev\\azure-sdk-for-js ../azure-rest-api-specs/specification/batch/resource-manager/readme.md --use=@autorest/[email protected].20211217.1",
4+
"autorest_command": "autorest --version=3.7.3 --typescript --modelerfour.lenient-model-deduplication --head-as-boolean=true --license-header=MICROSOFT_MIT_NO_VERSION --generate-test --typescript-sdks-folder=/home/vsts/work/1/s/azure-sdk-for-js ../azure-rest-api-specs/specification/batch/resource-manager/readme.md --use=@autorest/[email protected].20220105.1",
55
"repository_url": "https://github.com/Azure/azure-rest-api-specs.git",
6-
"use": "@autorest/[email protected].20211217.1"
6+
"use": "@autorest/[email protected].20220105.1"
77
}
Lines changed: 19 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,31 @@
11
{
22
"$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
33
"mainEntryPointFilePath": "./dist-esm/src/index.d.ts",
4-
"docModel": { "enabled": true },
5-
"apiReport": { "enabled": true, "reportFolder": "./review" },
4+
"docModel": {
5+
"enabled": true
6+
},
7+
"apiReport": {
8+
"enabled": true,
9+
"reportFolder": "./review"
10+
},
611
"dtsRollup": {
712
"enabled": true,
813
"untrimmedFilePath": "",
914
"publicTrimmedFilePath": "./types/arm-batch.d.ts"
1015
},
1116
"messages": {
12-
"tsdocMessageReporting": { "default": { "logLevel": "none" } },
17+
"tsdocMessageReporting": {
18+
"default": {
19+
"logLevel": "none"
20+
}
21+
},
1322
"extractorMessageReporting": {
14-
"ae-missing-release-tag": { "logLevel": "none" },
15-
"ae-unresolved-link": { "logLevel": "none" }
23+
"ae-missing-release-tag": {
24+
"logLevel": "none"
25+
},
26+
"ae-unresolved-link": {
27+
"logLevel": "none"
28+
}
1629
}
1730
}
18-
}
31+
}

sdk/batch/arm-batch/package.json

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"sdk-type": "mgmt",
44
"author": "Microsoft Corporation",
55
"description": "A generated SDK for BatchManagementClient.",
6-
"version": "7.0.1",
6+
"version": "7.1.0",
77
"engines": {
88
"node": ">=12.0.0"
99
},
@@ -29,21 +29,20 @@
2929
"types": "./types/arm-batch.d.ts",
3030
"devDependencies": {
3131
"@microsoft/api-extractor": "^7.18.11",
32-
"@rollup/plugin-commonjs": "^21.0.1",
32+
"@rollup/plugin-commonjs": "11.0.2",
3333
"@rollup/plugin-json": "^4.0.0",
3434
"@rollup/plugin-multi-entry": "^3.0.0",
3535
"@rollup/plugin-node-resolve": "^8.0.0",
3636
"mkdirp": "^1.0.4",
37-
"rollup": "^2.0.0",
37+
"rollup": "^1.16.3",
3838
"rollup-plugin-sourcemaps": "^0.4.2",
3939
"typescript": "~4.2.0",
4040
"uglify-js": "^3.4.9",
4141
"rimraf": "^3.0.0",
4242
"@azure/identity": "^2.0.1",
4343
"@azure-tools/test-recorder": "^1.0.0",
4444
"mocha": "^7.1.1",
45-
"cross-env": "^7.0.2",
46-
"@azure/arm-storage": "^17.0.0"
45+
"cross-env": "^7.0.2"
4746
},
4847
"homepage": "https://github.com/Azure/azure-sdk-for-js/tree/main/sdk/batch/arm-batch",
4948
"repository": {
@@ -100,4 +99,4 @@
10099
},
101100
"sideEffects": false,
102101
"autoPublish": true
103-
}
102+
}

sdk/batch/arm-batch/review/arm-batch.api.md

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -274,6 +274,13 @@ export interface BatchAccountDeleteOptionalParams extends coreClient.OperationOp
274274
updateIntervalInMs?: number;
275275
}
276276

277+
// @public
278+
export interface BatchAccountGetDetectorOptionalParams extends coreClient.OperationOptions {
279+
}
280+
281+
// @public
282+
export type BatchAccountGetDetectorResponse = DetectorResponse;
283+
277284
// @public
278285
export interface BatchAccountGetKeysOptionalParams extends coreClient.OperationOptions {
279286
}
@@ -319,6 +326,20 @@ export interface BatchAccountListByResourceGroupOptionalParams extends coreClien
319326
// @public
320327
export type BatchAccountListByResourceGroupResponse = BatchAccountListResult;
321328

329+
// @public
330+
export interface BatchAccountListDetectorsNextOptionalParams extends coreClient.OperationOptions {
331+
}
332+
333+
// @public
334+
export type BatchAccountListDetectorsNextResponse = DetectorListResult;
335+
336+
// @public
337+
export interface BatchAccountListDetectorsOptionalParams extends coreClient.OperationOptions {
338+
}
339+
340+
// @public
341+
export type BatchAccountListDetectorsResponse = DetectorListResult;
342+
322343
// @public
323344
export interface BatchAccountListNextOptionalParams extends coreClient.OperationOptions {
324345
}
@@ -360,9 +381,11 @@ export interface BatchAccountOperations {
360381
beginDelete(resourceGroupName: string, accountName: string, options?: BatchAccountDeleteOptionalParams): Promise<PollerLike<PollOperationState<void>, void>>;
361382
beginDeleteAndWait(resourceGroupName: string, accountName: string, options?: BatchAccountDeleteOptionalParams): Promise<void>;
362383
get(resourceGroupName: string, accountName: string, options?: BatchAccountGetOptionalParams): Promise<BatchAccountGetResponse>;
384+
getDetector(resourceGroupName: string, accountName: string, detectorId: string, options?: BatchAccountGetDetectorOptionalParams): Promise<BatchAccountGetDetectorResponse>;
363385
getKeys(resourceGroupName: string, accountName: string, options?: BatchAccountGetKeysOptionalParams): Promise<BatchAccountGetKeysResponse>;
364386
list(options?: BatchAccountListOptionalParams): PagedAsyncIterableIterator<BatchAccount>;
365387
listByResourceGroup(resourceGroupName: string, options?: BatchAccountListByResourceGroupOptionalParams): PagedAsyncIterableIterator<BatchAccount>;
388+
listDetectors(resourceGroupName: string, accountName: string, options?: BatchAccountListDetectorsOptionalParams): PagedAsyncIterableIterator<DetectorResponse>;
366389
listOutboundNetworkDependenciesEndpoints(resourceGroupName: string, accountName: string, options?: BatchAccountListOutboundNetworkDependenciesEndpointsOptionalParams): PagedAsyncIterableIterator<OutboundEnvironmentEndpoint>;
367390
regenerateKey(resourceGroupName: string, accountName: string, parameters: BatchAccountRegenerateKeyParameters, options?: BatchAccountRegenerateKeyOptionalParams): Promise<BatchAccountRegenerateKeyResponse>;
368391
synchronizeAutoStorageKeys(resourceGroupName: string, accountName: string, options?: BatchAccountSynchronizeAutoStorageKeysOptionalParams): Promise<void>;
@@ -706,6 +729,17 @@ export interface DeploymentConfiguration {
706729
virtualMachineConfiguration?: VirtualMachineConfiguration;
707730
}
708731

732+
// @public
733+
export interface DetectorListResult {
734+
nextLink?: string;
735+
value?: DetectorResponse[];
736+
}
737+
738+
// @public
739+
export type DetectorResponse = ProxyResource & {
740+
value?: string;
741+
};
742+
709743
// @public
710744
export interface DiffDiskSettings {
711745
placement?: "CacheDisk";
@@ -719,6 +753,9 @@ export interface DiskEncryptionConfiguration {
719753
// @public
720754
export type DiskEncryptionTarget = "OsDisk" | "TemporaryDisk";
721755

756+
// @public
757+
export type DynamicVNetAssignmentScope = "none" | "job";
758+
722759
// @public
723760
export type ElevationLevel = "NonAdmin" | "Admin";
724761

@@ -920,6 +957,7 @@ export type NameAvailabilityReason = "Invalid" | "AlreadyExists";
920957

921958
// @public
922959
export interface NetworkConfiguration {
960+
dynamicVNetAssignmentScope?: DynamicVNetAssignmentScope;
923961
endpointConfiguration?: PoolEndpointConfiguration;
924962
publicIPAddressConfiguration?: PublicIPAddressConfiguration;
925963
subnetId?: string;

sdk/batch/arm-batch/src/batchManagementClient.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ export class BatchManagementClient extends coreClient.ServiceClient {
6565
credential: credentials
6666
};
6767

68-
const packageDetails = `azsdk-js-arm-batch/7.0.0`;
68+
const packageDetails = `azsdk-js-arm-batch/7.1.0`;
6969
const userAgentPrefix =
7070
options.userAgentOptions && options.userAgentOptions.userAgentPrefix
7171
? `${options.userAgentOptions.userAgentPrefix} ${packageDetails}`
@@ -88,7 +88,7 @@ export class BatchManagementClient extends coreClient.ServiceClient {
8888

8989
// Assigning values to Constant parameters
9090
this.$host = options.$host || "https://management.azure.com";
91-
this.apiVersion = options.apiVersion || "2021-06-01";
91+
this.apiVersion = options.apiVersion || "2022-01-01";
9292
this.batchAccountOperations = new BatchAccountOperationsImpl(this);
9393
this.applicationPackageOperations = new ApplicationPackageOperationsImpl(
9494
this

sdk/batch/arm-batch/src/models/index.ts

Lines changed: 43 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -426,6 +426,14 @@ export interface CertificateBaseProperties {
426426
format?: CertificateFormat;
427427
}
428428

429+
/** Values returned by the List operation. */
430+
export interface DetectorListResult {
431+
/** The collection of Batch account detectors returned by the listing operation. */
432+
value?: DetectorResponse[];
433+
/** The URL to get the next set of results. */
434+
nextLink?: string;
435+
}
436+
429437
/** Values returned by the List operation. */
430438
export interface ListPrivateLinkResourcesResult {
431439
/** The collection of returned private link resources. */
@@ -502,7 +510,7 @@ export interface ImageReference {
502510
publisher?: string;
503511
/** For example, UbuntuServer or WindowsServer. */
504512
offer?: string;
505-
/** For example, 18.04-LTS or 2019-Datacenter. */
513+
/** For example, 18.04-LTS or 2022-datacenter. */
506514
sku?: string;
507515
/** A value of 'latest' can be specified to select the latest version of an image. If omitted, the default is 'latest'. */
508516
version?: string;
@@ -659,6 +667,8 @@ export interface AutoScaleRunError {
659667
export interface NetworkConfiguration {
660668
/** The virtual network must be in the same region and subscription as the Azure Batch account. The specified subnet should have enough free IP addresses to accommodate the number of nodes in the pool. If the subnet doesn't have enough free IP addresses, the pool will partially allocate compute nodes and a resize error will occur. The 'MicrosoftAzureBatch' service principal must have the 'Classic Virtual Machine Contributor' Role-Based Access Control (RBAC) role for the specified VNet. The specified subnet must allow communication from the Azure Batch service to be able to schedule tasks on the compute nodes. This can be verified by checking if the specified VNet has any associated Network Security Groups (NSG). If communication to the compute nodes in the specified subnet is denied by an NSG, then the Batch service will set the state of the compute nodes to unusable. If the specified VNet has any associated Network Security Groups (NSG), then a few reserved system ports must be enabled for inbound communication. For pools created with a virtual machine configuration, enable ports 29876 and 29877, as well as port 22 for Linux and port 3389 for Windows. For pools created with a cloud service configuration, enable ports 10100, 20100, and 30100. Also enable outbound connections to Azure Storage on port 443. For cloudServiceConfiguration pools, only 'classic' VNETs are supported. For more details see: https://docs.microsoft.com/en-us/azure/batch/batch-api-basics#virtual-network-vnet-and-firewall-configuration */
661669
subnetId?: string;
670+
/** The scope of dynamic vnet assignment. */
671+
dynamicVNetAssignmentScope?: DynamicVNetAssignmentScope;
662672
/** Pool endpoint configuration is only supported on pools with the virtualMachineConfiguration property. */
663673
endpointConfiguration?: PoolEndpointConfiguration;
664674
/** This property is only supported on Pools with the virtualMachineConfiguration property. */
@@ -703,7 +713,7 @@ export interface NetworkSecurityGroupRule {
703713
export interface PublicIPAddressConfiguration {
704714
/** The default value is BatchManaged */
705715
provision?: IPAddressProvisioningType;
706-
/** The number of IPs specified here limits the maximum size of the Pool - 100 dedicated nodes or 100 low-priority nodes can be allocated for each public IP. For example, a pool needing 250 dedicated VMs would need at least 3 public IPs specified. Each element of this collection is of the form: /subscriptions/{subscription}/resourceGroups/{group}/providers/Microsoft.Network/publicIPAddresses/{ip}. */
716+
/** The number of IPs specified here limits the maximum size of the Pool - 100 dedicated nodes or 100 Spot/low-priority nodes can be allocated for each public IP. For example, a pool needing 250 dedicated VMs would need at least 3 public IPs specified. Each element of this collection is of the form: /subscriptions/{subscription}/resourceGroups/{group}/providers/Microsoft.Network/publicIPAddresses/{ip}. */
707717
ipAddressIds?: string[];
708718
}
709719

@@ -847,7 +857,7 @@ export interface ApplicationPackageReference {
847857
export interface ResizeOperationStatus {
848858
/** The desired number of dedicated compute nodes in the pool. */
849859
targetDedicatedNodes?: number;
850-
/** The desired number of low-priority compute nodes in the pool. */
860+
/** The desired number of Spot/low-priority compute nodes in the pool. */
851861
targetLowPriorityNodes?: number;
852862
/** The default value is 15 minutes. The minimum value is 5 minutes. If you specify a value less than 5 minutes, the Batch service returns an error; if you are calling the REST API directly, the HTTP status code is 400 (Bad Request). */
853863
resizeTimeout?: string;
@@ -1107,6 +1117,12 @@ export type CertificateCreateOrUpdateParameters = ProxyResource & {
11071117
password?: string;
11081118
};
11091119

1120+
/** Contains the information for a detector. */
1121+
export type DetectorResponse = ProxyResource & {
1122+
/** A base64 encoded string that represents the content of a detector. */
1123+
value?: string;
1124+
};
1125+
11101126
/** Contains information about a private link resource. */
11111127
export type PrivateLinkResource = ProxyResource & {
11121128
/**
@@ -1172,7 +1188,7 @@ export type Pool = ProxyResource & {
11721188
*/
11731189
readonly currentDedicatedNodes?: number;
11741190
/**
1175-
* The number of low-priority compute nodes currently in the pool.
1191+
* The number of Spot/low-priority compute nodes currently in the pool.
11761192
* NOTE: This property will not be serialized. It can only be populated by the server.
11771193
*/
11781194
readonly currentLowPriorityNodes?: number;
@@ -1492,6 +1508,8 @@ export type ComputeNodeDeallocationOption =
14921508
| "RetainedData";
14931509
/** Defines values for InterNodeCommunicationState. */
14941510
export type InterNodeCommunicationState = "Enabled" | "Disabled";
1511+
/** Defines values for DynamicVNetAssignmentScope. */
1512+
export type DynamicVNetAssignmentScope = "none" | "job";
14951513
/** Defines values for InboundEndpointProtocol. */
14961514
export type InboundEndpointProtocol = "TCP" | "UDP";
14971515
/** Defines values for NetworkSecurityGroupRuleAccess. */
@@ -1587,6 +1605,20 @@ export interface BatchAccountGetKeysOptionalParams
15871605
/** Contains response data for the getKeys operation. */
15881606
export type BatchAccountGetKeysResponse = BatchAccountKeys;
15891607

1608+
/** Optional parameters. */
1609+
export interface BatchAccountListDetectorsOptionalParams
1610+
extends coreClient.OperationOptions {}
1611+
1612+
/** Contains response data for the listDetectors operation. */
1613+
export type BatchAccountListDetectorsResponse = DetectorListResult;
1614+
1615+
/** Optional parameters. */
1616+
export interface BatchAccountGetDetectorOptionalParams
1617+
extends coreClient.OperationOptions {}
1618+
1619+
/** Contains response data for the getDetector operation. */
1620+
export type BatchAccountGetDetectorResponse = DetectorResponse;
1621+
15901622
/** Optional parameters. */
15911623
export interface BatchAccountListOutboundNetworkDependenciesEndpointsOptionalParams
15921624
extends coreClient.OperationOptions {}
@@ -1608,6 +1640,13 @@ export interface BatchAccountListByResourceGroupNextOptionalParams
16081640
/** Contains response data for the listByResourceGroupNext operation. */
16091641
export type BatchAccountListByResourceGroupNextResponse = BatchAccountListResult;
16101642

1643+
/** Optional parameters. */
1644+
export interface BatchAccountListDetectorsNextOptionalParams
1645+
extends coreClient.OperationOptions {}
1646+
1647+
/** Contains response data for the listDetectorsNext operation. */
1648+
export type BatchAccountListDetectorsNextResponse = DetectorListResult;
1649+
16111650
/** Optional parameters. */
16121651
export interface BatchAccountListOutboundNetworkDependenciesEndpointsNextOptionalParams
16131652
extends coreClient.OperationOptions {}

0 commit comments

Comments
 (0)