[AutoPR @azure/arm-batch] Resolve conflicts with the main branch

sdk/batch/arm-batch/CHANGELOG.md

@@ -1,15 +1,22 @@
 # Release History
+
+## 9.1.0 (2023-12-15)
+
+**Features**
 
-## 9.0.1 (Unreleased)
-
-### Features Added
-
-### Breaking Changes
-
-### Bugs Fixed
-
-### Other Changes
-
+  - Added Interface ManagedDisk
+  - Added Interface SecurityProfile
+  - Added Interface ServiceArtifactReference
+  - Added Interface UefiSettings
+  - Interface OSDisk has a new optional parameter caching
+  - Interface OSDisk has a new optional parameter diskSizeGB
+  - Interface OSDisk has a new optional parameter managedDisk
+  - Interface OSDisk has a new optional parameter writeAcceleratorEnabled
+  - Interface Pool has a new optional parameter resourceTags
+  - Interface VirtualMachineConfiguration has a new optional parameter securityProfile
+  - Interface VirtualMachineConfiguration has a new optional parameter serviceArtifactReference
+
+
 ## 9.0.0 (2023-06-30)
 
 **Features**
@@ -117,4 +124,4 @@ To understand the detail of the change, please refer to [Changelog](https://aka.
 
 To migrate the existing applications to the latest version, please refer to [Migration Guide](https://aka.ms/js-track2-migration-guide).
 
-To learn more, please refer to our documentation [Quick Start](https://aka.ms/azsdk/js/mgmt/quickstart ).
+To learn more, please refer to our documentation [Quick Start](https://aka.ms/js-track2-quickstart).

sdk/batch/arm-batch/_meta.json

@@ -1,8 +1,8 @@
 {
-  "commit": "64efc48302878a07d1d1231eaed0ca9cadfaf037",
+  "commit": "ab9a77a2eb0aeb756931bf8a1e467d2ea4af6f65",
   "readme": "specification/batch/resource-manager/readme.md",
-  "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=D:\\Git\\azure-sdk-for-js ..\\azure-rest-api-specs\\specification\\batch\\resource-manager\\readme.md --use=@autorest/typescript@6.0.5 --generate-sample=true",
+  "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/batch/resource-manager/readme.md --use=@autorest/typescript@^6.0.12",
   "repository_url": "https://github.com/Azure/azure-rest-api-specs.git",
-  "release_tool": "@azure-tools/js-sdk-release-tools@2.7.0",
-  "use": "@autorest/typescript@6.0.5"
+  "release_tool": "@azure-tools/js-sdk-release-tools@2.7.4",
+  "use": "@autorest/typescript@^6.0.12"
 }

sdk/batch/arm-batch/package.json

@@ -3,17 +3,17 @@
   "sdk-type": "mgmt",
   "author": "Microsoft Corporation",
   "description": "A generated SDK for BatchManagementClient.",
-  "version": "9.0.1",
+  "version": "9.1.0",
   "engines": {
     "node": ">=18.0.0"
   },
   "dependencies": {
-    "@azure/core-lro": "^2.5.3",
+    "@azure/core-lro": "^2.5.4",
     "@azure/abort-controller": "^1.0.0",
     "@azure/core-paging": "^1.2.0",
     "@azure/core-client": "^1.7.0",
     "@azure/core-auth": "^1.3.0",
-    "@azure/core-rest-pipeline": "^1.8.0",
+    "@azure/core-rest-pipeline": "^1.12.0",
     "tslib": "^2.2.0"
   },
   "keywords": [
@@ -32,18 +32,19 @@
     "mkdirp": "^2.1.2",
     "typescript": "~5.2.0",
     "uglify-js": "^3.4.9",
-    "rimraf": "^3.0.0",
+    "rimraf": "^5.0.0",
     "dotenv": "^16.0.0",
+    "@azure/dev-tool": "^1.0.0",
     "@azure/identity": "^3.3.0",
     "@azure-tools/test-recorder": "^3.0.0",
     "@azure-tools/test-credential": "^1.0.0",
     "mocha": "^10.0.0",
+    "@types/mocha": "^10.0.0",
+    "esm": "^3.2.18",
     "@types/chai": "^4.2.8",
     "chai": "^4.2.0",
     "cross-env": "^7.0.2",
     "@types/node": "^18.0.0",
-    "@azure/dev-tool": "^1.0.0",
-    "@azure/arm-storage": "^18.0.0",
     "ts-node": "^10.0.0"
   },
   "repository": {
@@ -78,7 +79,7 @@
     "extract-api": "api-extractor run --local",
     "lint": "echo skipped",
     "audit": "echo skipped",
-    "clean": "rimraf dist dist-browser dist-esm test-dist temp types *.tgz *.log",
+    "clean": "rimraf --glob dist dist-browser dist-esm test-dist temp types *.tgz *.log",
     "build:node": "echo skipped",
     "build:browser": "echo skipped",
     "build:test": "echo skipped",
@@ -106,13 +107,5 @@
     ]
   },
   "autoPublish": true,
-  "homepage": "https://github.com/Azure/azure-sdk-for-js/tree/main/sdk/batch/arm-batch",
-  "//sampleConfiguration": {
-    "productName": "",
-    "productSlugs": [
-      "azure"
-    ],
-    "disableDocsMs": true,
-    "apiRefLink": "https://docs.microsoft.com/javascript/api/@azure/arm-batch?view=azure-node-preview"
-  }
-}
+  "homepage": "https://github.com/Azure/azure-sdk-for-js/tree/main/sdk/batch/arm-batch"
+}

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

@@ -961,6 +961,11 @@ export type LocationListSupportedVirtualMachineSkusResponse = SupportedSkusResul
 // @public
 export type LoginMode = "Batch" | "Interactive";
 
+// @public (undocumented)
+export interface ManagedDisk {
+    storageAccountType?: StorageAccountType;
+}
+
 // @public
 export interface MetadataItem {
     name: string;
@@ -1066,7 +1071,12 @@ export type OperationsListResponse = OperationListResult;
 
 // @public
 export interface OSDisk {
+    caching?: CachingType;
+    diskSizeGB?: number;
     ephemeralOSDiskSettings?: DiffDiskSettings;
+    // (undocumented)
+    managedDisk?: ManagedDisk;
+    writeAcceleratorEnabled?: boolean;
 }
 
 // @public
@@ -1107,6 +1117,9 @@ export interface Pool extends ProxyResource {
     readonly provisioningState?: PoolProvisioningState;
     readonly provisioningStateTransitionTime?: Date;
     readonly resizeOperationStatus?: ResizeOperationStatus;
+    resourceTags?: {
+        [propertyName: string]: string;
+    };
     scaleSettings?: ScaleSettings;
     startTask?: StartTask;
     targetNodeCommunicationMode?: NodeCommunicationMode;
@@ -1426,6 +1439,18 @@ export interface ScaleSettings {
     fixedScale?: FixedScaleSettings;
 }
 
+// @public
+export interface SecurityProfile {
+    encryptionAtHost?: boolean;
+    securityType?: "trustedLaunch";
+    uefiSettings?: UefiSettings;
+}
+
+// @public
+export interface ServiceArtifactReference {
+    id: string;
+}
+
 // @public
 export interface SkuCapability {
     readonly name?: string;
@@ -1444,7 +1469,7 @@ export interface StartTask {
 }
 
 // @public
-export type StorageAccountType = "Standard_LRS" | "Premium_LRS";
+export type StorageAccountType = "Standard_LRS" | "Premium_LRS" | "StandardSSD_LRS";
 
 // @public
 export interface SupportedSku {
@@ -1472,6 +1497,12 @@ export interface TaskSchedulingPolicy {
     nodeFillType: ComputeNodeFillType;
 }
 
+// @public
+export interface UefiSettings {
+    secureBootEnabled?: boolean;
+    vTpmEnabled?: boolean;
+}
+
 // @public
 export interface UserAccount {
     elevationLevel?: ElevationLevel;
@@ -1504,6 +1535,8 @@ export interface VirtualMachineConfiguration {
     nodeAgentSkuId: string;
     nodePlacementConfiguration?: NodePlacementConfiguration;
     osDisk?: OSDisk;
+    securityProfile?: SecurityProfile;
+    serviceArtifactReference?: ServiceArtifactReference;
     windowsConfiguration?: WindowsConfiguration;
 }
 

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

@@ -71,7 +71,7 @@ export class BatchManagementClient extends coreClient.ServiceClient {
       credential: credentials
     };
 
-    const packageDetails = `azsdk-js-arm-batch/9.0.1`;
+    const packageDetails = `azsdk-js-arm-batch/9.1.0`;
     const userAgentPrefix =
       options.userAgentOptions && options.userAgentOptions.userAgentPrefix
         ? `${options.userAgentOptions.userAgentPrefix} ${packageDetails}`
@@ -124,7 +124,7 @@ export class BatchManagementClient extends coreClient.ServiceClient {
 
     // Assigning values to Constant parameters
     this.$host = options.$host || "https://management.azure.com";
-    this.apiVersion = options.apiVersion || "2023-05-01";
+    this.apiVersion = options.apiVersion || "2023-11-01";
     this.batchAccountOperations = new BatchAccountOperationsImpl(this);
     this.applicationPackageOperations = new ApplicationPackageOperationsImpl(
       this