diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml index 8a8ad7d0ae18..71d7be65f7b4 100644 --- a/common/config/rush/pnpm-lock.yaml +++ b/common/config/rush/pnpm-lock.yaml @@ -731,6 +731,7 @@ packages: /@azure/ai-form-recognizer/3.1.0-beta.3: resolution: {integrity: sha512-+4QtFKNyxAmdqpcYjuAtmWKm/MuOe9kZsbpS9jA9h0YHzngNj5gc67AA4egV9BXOq9x+1phjYTNC/rxiOUr1uQ==} engines: {node: '>=8.0.0'} + deprecated: Please migrate to a supported (non-beta) version of this package dependencies: '@azure/core-auth': 1.4.0 '@azure/core-http': 1.2.6 @@ -12850,7 +12851,7 @@ packages: dev: false file:projects/arm-machinelearning.tgz: - resolution: {integrity: sha512-wPKog3eVj3ITymR1Ai+fgn6kN4Khpw0IY6ZdUNiZYlJp3LkrV1/mEGHgNM4fwykDMSyBHEIYJfHVONP6v3LqBw==, tarball: file:projects/arm-machinelearning.tgz} + resolution: {integrity: sha512-3Mvi4bnHo/aaCQwM+r2nLjRn0p9uzWO69V3PhC5hKQc+Mp4XRhTjKk/S6KOHr057tByLYzifGA3XyInaNDJCSw==, tarball: file:projects/arm-machinelearning.tgz} name: '@rush-temp/arm-machinelearning' version: 0.0.0 dependencies: @@ -12864,7 +12865,8 @@ packages: '@types/node': 14.18.38 chai: 4.3.7 cross-env: 7.0.3 - mkdirp: 1.0.4 + dotenv: 16.0.3 + mkdirp: 2.1.5 mocha: 7.2.0 rimraf: 3.0.2 rollup: 2.79.1 diff --git a/sdk/machinelearning/arm-machinelearning/CHANGELOG.md b/sdk/machinelearning/arm-machinelearning/CHANGELOG.md index 1a059d33be9a..fc9017a2e3a9 100644 --- a/sdk/machinelearning/arm-machinelearning/CHANGELOG.md +++ b/sdk/machinelearning/arm-machinelearning/CHANGELOG.md @@ -1,15 +1,91 @@ # Release History + +## 3.0.0 (2023-03-22) + +**Features** -## 2.1.2 (Unreleased) - -### Features Added - -### Breaking Changes - -### Bugs Fixed + - Added Interface Cron + - Added Interface IdleShutdownSetting + - Added Interface Recurrence + - Type of parameter triggerType of interface TriggerBase is changed from "Recurrence" | "Cron" to "Cron" | "Recurrence" -### Other Changes +**Breaking Changes** + - Interface BatchDeploymentsListNextOptionalParams no longer has parameter orderBy + - Interface BatchDeploymentsListNextOptionalParams no longer has parameter skip + - Interface BatchDeploymentsListNextOptionalParams no longer has parameter top + - Interface BatchEndpointsListNextOptionalParams no longer has parameter count + - Interface BatchEndpointsListNextOptionalParams no longer has parameter skip + - Interface CodeContainersListNextOptionalParams no longer has parameter skip + - Interface CodeVersionsListNextOptionalParams no longer has parameter orderBy + - Interface CodeVersionsListNextOptionalParams no longer has parameter skip + - Interface CodeVersionsListNextOptionalParams no longer has parameter top + - Interface ComponentContainersListNextOptionalParams no longer has parameter listViewType + - Interface ComponentContainersListNextOptionalParams no longer has parameter skip + - Interface ComponentVersionsListNextOptionalParams no longer has parameter listViewType + - Interface ComponentVersionsListNextOptionalParams no longer has parameter orderBy + - Interface ComponentVersionsListNextOptionalParams no longer has parameter skip + - Interface ComponentVersionsListNextOptionalParams no longer has parameter top + - Interface ComputeListNextOptionalParams no longer has parameter skip + - Interface DataContainersListNextOptionalParams no longer has parameter listViewType + - Interface DataContainersListNextOptionalParams no longer has parameter skip + - Interface DatastoresListNextOptionalParams no longer has parameter count + - Interface DatastoresListNextOptionalParams no longer has parameter isDefault + - Interface DatastoresListNextOptionalParams no longer has parameter names + - Interface DatastoresListNextOptionalParams no longer has parameter orderBy + - Interface DatastoresListNextOptionalParams no longer has parameter orderByAsc + - Interface DatastoresListNextOptionalParams no longer has parameter searchText + - Interface DatastoresListNextOptionalParams no longer has parameter skip + - Interface DataVersionsListNextOptionalParams no longer has parameter listViewType + - Interface DataVersionsListNextOptionalParams no longer has parameter orderBy + - Interface DataVersionsListNextOptionalParams no longer has parameter skip + - Interface DataVersionsListNextOptionalParams no longer has parameter tags + - Interface DataVersionsListNextOptionalParams no longer has parameter top + - Interface EnvironmentContainersListNextOptionalParams no longer has parameter listViewType + - Interface EnvironmentContainersListNextOptionalParams no longer has parameter skip + - Interface EnvironmentVersionsListNextOptionalParams no longer has parameter listViewType + - Interface EnvironmentVersionsListNextOptionalParams no longer has parameter orderBy + - Interface EnvironmentVersionsListNextOptionalParams no longer has parameter skip + - Interface EnvironmentVersionsListNextOptionalParams no longer has parameter top + - Interface JobsListNextOptionalParams no longer has parameter jobType + - Interface JobsListNextOptionalParams no longer has parameter listViewType + - Interface JobsListNextOptionalParams no longer has parameter skip + - Interface JobsListNextOptionalParams no longer has parameter tag + - Interface ModelContainersListNextOptionalParams no longer has parameter count + - Interface ModelContainersListNextOptionalParams no longer has parameter listViewType + - Interface ModelContainersListNextOptionalParams no longer has parameter skip + - Interface ModelVersionsListNextOptionalParams no longer has parameter description + - Interface ModelVersionsListNextOptionalParams no longer has parameter feed + - Interface ModelVersionsListNextOptionalParams no longer has parameter listViewType + - Interface ModelVersionsListNextOptionalParams no longer has parameter offset + - Interface ModelVersionsListNextOptionalParams no longer has parameter orderBy + - Interface ModelVersionsListNextOptionalParams no longer has parameter properties + - Interface ModelVersionsListNextOptionalParams no longer has parameter skip + - Interface ModelVersionsListNextOptionalParams no longer has parameter tags + - Interface ModelVersionsListNextOptionalParams no longer has parameter top + - Interface ModelVersionsListNextOptionalParams no longer has parameter version + - Interface OnlineDeploymentsListNextOptionalParams no longer has parameter orderBy + - Interface OnlineDeploymentsListNextOptionalParams no longer has parameter skip + - Interface OnlineDeploymentsListNextOptionalParams no longer has parameter top + - Interface OnlineDeploymentsListSkusNextOptionalParams no longer has parameter count + - Interface OnlineDeploymentsListSkusNextOptionalParams no longer has parameter skip + - Interface OnlineEndpointsListNextOptionalParams no longer has parameter computeType + - Interface OnlineEndpointsListNextOptionalParams no longer has parameter count + - Interface OnlineEndpointsListNextOptionalParams no longer has parameter name + - Interface OnlineEndpointsListNextOptionalParams no longer has parameter orderBy + - Interface OnlineEndpointsListNextOptionalParams no longer has parameter properties + - Interface OnlineEndpointsListNextOptionalParams no longer has parameter skip + - Interface OnlineEndpointsListNextOptionalParams no longer has parameter tags + - Interface SchedulesListNextOptionalParams no longer has parameter listViewType + - Interface SchedulesListNextOptionalParams no longer has parameter skip + - Interface WorkspaceConnectionsListNextOptionalParams no longer has parameter category + - Interface WorkspaceConnectionsListNextOptionalParams no longer has parameter target + - Interface WorkspacesListByResourceGroupNextOptionalParams no longer has parameter skip + - Interface WorkspacesListBySubscriptionNextOptionalParams no longer has parameter skip + - Type of parameter cron of interface ComputeStartStopSchedule is changed from CronTrigger to Cron + - Type of parameter recurrence of interface ComputeStartStopSchedule is changed from RecurrenceTrigger to Recurrence + + ## 2.1.1 (2022-11-28) **Features** diff --git a/sdk/machinelearning/arm-machinelearning/LICENSE b/sdk/machinelearning/arm-machinelearning/LICENSE index 5d1d36e0af80..3a1d9b6f24f7 100644 --- a/sdk/machinelearning/arm-machinelearning/LICENSE +++ b/sdk/machinelearning/arm-machinelearning/LICENSE @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) 2022 Microsoft +Copyright (c) 2023 Microsoft Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/sdk/machinelearning/arm-machinelearning/_meta.json b/sdk/machinelearning/arm-machinelearning/_meta.json index ed615b9d846a..4f6e27bb4849 100644 --- a/sdk/machinelearning/arm-machinelearning/_meta.json +++ b/sdk/machinelearning/arm-machinelearning/_meta.json @@ -1,8 +1,8 @@ { - "commit": "1fefe3f5cee88319b17c08a2dbf95e1e983a9f8c", + "commit": "6a76960feea5bacd120c795c7f9879cd41804fb4", "readme": "specification/machinelearningservices/resource-manager/readme.md", - "autorest_command": "autorest --version=3.8.4 --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\\machinelearningservices\\resource-manager\\readme.md --use=@autorest/typescript@6.0.0-rc.3.20221108.1 --generate-sample=true", + "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=/mnt/vss/_work/1/s/azure-sdk-for-js ../azure-rest-api-specs/specification/machinelearningservices/resource-manager/readme.md --use=@autorest/typescript@6.0.0-rc.10", "repository_url": "https://github.com/Azure/azure-rest-api-specs.git", - "release_tool": "@azure-tools/js-sdk-release-tools@2.4.2", - "use": "@autorest/typescript@6.0.0-rc.3.20221108.1" + "release_tool": "@azure-tools/js-sdk-release-tools@2.6.2", + "use": "@autorest/typescript@6.0.0-rc.10" } \ No newline at end of file diff --git a/sdk/machinelearning/arm-machinelearning/package.json b/sdk/machinelearning/arm-machinelearning/package.json index 64f1f822b8cc..5783fdbf56b8 100644 --- a/sdk/machinelearning/arm-machinelearning/package.json +++ b/sdk/machinelearning/arm-machinelearning/package.json @@ -3,15 +3,15 @@ "sdk-type": "mgmt", "author": "Microsoft Corporation", "description": "A generated SDK for AzureMachineLearningWorkspaces.", - "version": "2.1.2", + "version": "3.0.0", "engines": { "node": ">=14.0.0" }, "dependencies": { - "@azure/core-lro": "^2.2.0", + "@azure/core-lro": "^2.5.0", "@azure/abort-controller": "^1.0.0", "@azure/core-paging": "^1.2.0", - "@azure/core-client": "^1.6.1", + "@azure/core-client": "^1.7.0", "@azure/core-auth": "^1.3.0", "@azure/core-rest-pipeline": "^1.8.0", "tslib": "^2.2.0" @@ -33,12 +33,13 @@ "@rollup/plugin-json": "^6.0.0", "@rollup/plugin-multi-entry": "^6.0.0", "@rollup/plugin-node-resolve": "^13.1.3", - "mkdirp": "^1.0.4", + "mkdirp": "^2.1.2", "rollup": "^2.66.1", "rollup-plugin-sourcemaps": "^0.6.3", "typescript": "~4.8.0", "uglify-js": "^3.4.9", "rimraf": "^3.0.0", + "dotenv": "^16.0.0", "@azure/identity": "^2.0.1", "@azure-tools/test-recorder": "^3.0.0", "@azure-tools/test-credential": "^1.0.0", @@ -49,7 +50,6 @@ "@types/node": "^14.0.0", "@azure/dev-tool": "^1.0.0" }, - "homepage": "https://github.com/Azure/azure-sdk-for-js/tree/main/sdk/machinelearning/arm-machinelearning", "repository": { "type": "git", "url": "https://github.com/Azure/azure-sdk-for-js.git" @@ -111,12 +111,5 @@ ] }, "autoPublish": true, - "//sampleConfiguration": { - "productName": "", - "productSlugs": [ - "azure" - ], - "disableDocsMs": true, - "apiRefLink": "https://docs.microsoft.com/javascript/api/@azure/arm-machinelearning?view=azure-node-preview" - } -} + "homepage": "https://github.com/Azure/azure-sdk-for-js/tree/main/sdk/machinelearning/arm-machinelearning" +} \ No newline at end of file diff --git a/sdk/machinelearning/arm-machinelearning/review/arm-machinelearning.api.md b/sdk/machinelearning/arm-machinelearning/review/arm-machinelearning.api.md index 550802b181a7..a3846ba12031 100644 --- a/sdk/machinelearning/arm-machinelearning/review/arm-machinelearning.api.md +++ b/sdk/machinelearning/arm-machinelearning/review/arm-machinelearning.api.md @@ -6,9 +6,9 @@ import * as coreAuth from '@azure/core-auth'; import * as coreClient from '@azure/core-client'; +import { OperationState } from '@azure/core-lro'; import { PagedAsyncIterableIterator } from '@azure/core-paging'; -import { PollerLike } from '@azure/core-lro'; -import { PollOperationState } from '@azure/core-lro'; +import { SimplePollerLike } from '@azure/core-lro'; // @public export interface AccountKeyDatastoreCredentials extends DatastoreCredentials { @@ -404,11 +404,11 @@ export interface BatchDeploymentProperties extends EndpointDeploymentPropertiesB // @public export interface BatchDeployments { - beginCreateOrUpdate(resourceGroupName: string, workspaceName: string, endpointName: string, deploymentName: string, body: BatchDeployment, options?: BatchDeploymentsCreateOrUpdateOptionalParams): Promise, BatchDeploymentsCreateOrUpdateResponse>>; + beginCreateOrUpdate(resourceGroupName: string, workspaceName: string, endpointName: string, deploymentName: string, body: BatchDeployment, options?: BatchDeploymentsCreateOrUpdateOptionalParams): Promise, BatchDeploymentsCreateOrUpdateResponse>>; beginCreateOrUpdateAndWait(resourceGroupName: string, workspaceName: string, endpointName: string, deploymentName: string, body: BatchDeployment, options?: BatchDeploymentsCreateOrUpdateOptionalParams): Promise; - beginDelete(resourceGroupName: string, workspaceName: string, endpointName: string, deploymentName: string, options?: BatchDeploymentsDeleteOptionalParams): Promise, void>>; + beginDelete(resourceGroupName: string, workspaceName: string, endpointName: string, deploymentName: string, options?: BatchDeploymentsDeleteOptionalParams): Promise, void>>; beginDeleteAndWait(resourceGroupName: string, workspaceName: string, endpointName: string, deploymentName: string, options?: BatchDeploymentsDeleteOptionalParams): Promise; - beginUpdate(resourceGroupName: string, workspaceName: string, endpointName: string, deploymentName: string, body: PartialBatchDeploymentPartialMinimalTrackedResourceWithProperties, options?: BatchDeploymentsUpdateOptionalParams): Promise, BatchDeploymentsUpdateResponse>>; + beginUpdate(resourceGroupName: string, workspaceName: string, endpointName: string, deploymentName: string, body: PartialBatchDeploymentPartialMinimalTrackedResourceWithProperties, options?: BatchDeploymentsUpdateOptionalParams): Promise, BatchDeploymentsUpdateResponse>>; beginUpdateAndWait(resourceGroupName: string, workspaceName: string, endpointName: string, deploymentName: string, body: PartialBatchDeploymentPartialMinimalTrackedResourceWithProperties, options?: BatchDeploymentsUpdateOptionalParams): Promise; get(resourceGroupName: string, workspaceName: string, endpointName: string, deploymentName: string, options?: BatchDeploymentsGetOptionalParams): Promise; list(resourceGroupName: string, workspaceName: string, endpointName: string, options?: BatchDeploymentsListOptionalParams): PagedAsyncIterableIterator; @@ -451,9 +451,6 @@ export type BatchDeploymentsGetResponse = BatchDeployment; // @public export interface BatchDeploymentsListNextOptionalParams extends coreClient.OperationOptions { - orderBy?: string; - skip?: string; - top?: number; } // @public @@ -512,11 +509,11 @@ export interface BatchEndpointProperties extends EndpointPropertiesBase { // @public export interface BatchEndpoints { - beginCreateOrUpdate(resourceGroupName: string, workspaceName: string, endpointName: string, body: BatchEndpoint, options?: BatchEndpointsCreateOrUpdateOptionalParams): Promise, BatchEndpointsCreateOrUpdateResponse>>; + beginCreateOrUpdate(resourceGroupName: string, workspaceName: string, endpointName: string, body: BatchEndpoint, options?: BatchEndpointsCreateOrUpdateOptionalParams): Promise, BatchEndpointsCreateOrUpdateResponse>>; beginCreateOrUpdateAndWait(resourceGroupName: string, workspaceName: string, endpointName: string, body: BatchEndpoint, options?: BatchEndpointsCreateOrUpdateOptionalParams): Promise; - beginDelete(resourceGroupName: string, workspaceName: string, endpointName: string, options?: BatchEndpointsDeleteOptionalParams): Promise, void>>; + beginDelete(resourceGroupName: string, workspaceName: string, endpointName: string, options?: BatchEndpointsDeleteOptionalParams): Promise, void>>; beginDeleteAndWait(resourceGroupName: string, workspaceName: string, endpointName: string, options?: BatchEndpointsDeleteOptionalParams): Promise; - beginUpdate(resourceGroupName: string, workspaceName: string, endpointName: string, body: PartialMinimalTrackedResourceWithIdentity, options?: BatchEndpointsUpdateOptionalParams): Promise, BatchEndpointsUpdateResponse>>; + beginUpdate(resourceGroupName: string, workspaceName: string, endpointName: string, body: PartialMinimalTrackedResourceWithIdentity, options?: BatchEndpointsUpdateOptionalParams): Promise, BatchEndpointsUpdateResponse>>; beginUpdateAndWait(resourceGroupName: string, workspaceName: string, endpointName: string, body: PartialMinimalTrackedResourceWithIdentity, options?: BatchEndpointsUpdateOptionalParams): Promise; get(resourceGroupName: string, workspaceName: string, endpointName: string, options?: BatchEndpointsGetOptionalParams): Promise; list(resourceGroupName: string, workspaceName: string, options?: BatchEndpointsListOptionalParams): PagedAsyncIterableIterator; @@ -567,8 +564,6 @@ export type BatchEndpointsListKeysResponse = EndpointAuthKeys; // @public export interface BatchEndpointsListNextOptionalParams extends coreClient.OperationOptions { - count?: number; - skip?: string; } // @public @@ -733,7 +728,6 @@ export type CodeContainersGetResponse = CodeContainer; // @public export interface CodeContainersListNextOptionalParams extends coreClient.OperationOptions { - skip?: string; } // @public @@ -791,9 +785,6 @@ export type CodeVersionsGetResponse = CodeVersion; // @public export interface CodeVersionsListNextOptionalParams extends coreClient.OperationOptions { - orderBy?: string; - skip?: string; - top?: number; } // @public @@ -884,8 +875,6 @@ export type ComponentContainersGetResponse = ComponentContainer; // @public export interface ComponentContainersListNextOptionalParams extends coreClient.OperationOptions { - listViewType?: ListViewType; - skip?: string; } // @public @@ -944,10 +933,6 @@ export type ComponentVersionsGetResponse = ComponentVersion; // @public export interface ComponentVersionsListNextOptionalParams extends coreClient.OperationOptions { - listViewType?: ListViewType; - orderBy?: string; - skip?: string; - top?: number; } // @public @@ -1097,7 +1082,7 @@ export interface ComputeInstanceProperties { readonly errors?: ErrorResponse[]; readonly lastOperation?: ComputeInstanceLastOperation; personalComputeInstanceSettings?: PersonalComputeInstanceSettings; - readonly schedules?: ComputeSchedules; + schedules?: ComputeSchedules; setupScripts?: SetupScripts; sshSettings?: ComputeInstanceSshSettings; readonly state?: ComputeInstanceState; @@ -1136,7 +1121,6 @@ export type ComputeListKeysResponse = ComputeSecretsUnion; // @public export interface ComputeListNextOptionalParams extends coreClient.OperationOptions { - skip?: string; } // @public @@ -1166,17 +1150,17 @@ export type ComputeListResponse = PaginatedComputeResourcesList; // @public export interface ComputeOperations { - beginCreateOrUpdate(resourceGroupName: string, workspaceName: string, computeName: string, parameters: ComputeResource, options?: ComputeCreateOrUpdateOptionalParams): Promise, ComputeCreateOrUpdateResponse>>; + beginCreateOrUpdate(resourceGroupName: string, workspaceName: string, computeName: string, parameters: ComputeResource, options?: ComputeCreateOrUpdateOptionalParams): Promise, ComputeCreateOrUpdateResponse>>; beginCreateOrUpdateAndWait(resourceGroupName: string, workspaceName: string, computeName: string, parameters: ComputeResource, options?: ComputeCreateOrUpdateOptionalParams): Promise; - beginDelete(resourceGroupName: string, workspaceName: string, computeName: string, underlyingResourceAction: UnderlyingResourceAction, options?: ComputeDeleteOptionalParams): Promise, void>>; + beginDelete(resourceGroupName: string, workspaceName: string, computeName: string, underlyingResourceAction: UnderlyingResourceAction, options?: ComputeDeleteOptionalParams): Promise, void>>; beginDeleteAndWait(resourceGroupName: string, workspaceName: string, computeName: string, underlyingResourceAction: UnderlyingResourceAction, options?: ComputeDeleteOptionalParams): Promise; - beginRestart(resourceGroupName: string, workspaceName: string, computeName: string, options?: ComputeRestartOptionalParams): Promise, void>>; + beginRestart(resourceGroupName: string, workspaceName: string, computeName: string, options?: ComputeRestartOptionalParams): Promise, void>>; beginRestartAndWait(resourceGroupName: string, workspaceName: string, computeName: string, options?: ComputeRestartOptionalParams): Promise; - beginStart(resourceGroupName: string, workspaceName: string, computeName: string, options?: ComputeStartOptionalParams): Promise, void>>; + beginStart(resourceGroupName: string, workspaceName: string, computeName: string, options?: ComputeStartOptionalParams): Promise, void>>; beginStartAndWait(resourceGroupName: string, workspaceName: string, computeName: string, options?: ComputeStartOptionalParams): Promise; - beginStop(resourceGroupName: string, workspaceName: string, computeName: string, options?: ComputeStopOptionalParams): Promise, void>>; + beginStop(resourceGroupName: string, workspaceName: string, computeName: string, options?: ComputeStopOptionalParams): Promise, void>>; beginStopAndWait(resourceGroupName: string, workspaceName: string, computeName: string, options?: ComputeStopOptionalParams): Promise; - beginUpdate(resourceGroupName: string, workspaceName: string, computeName: string, parameters: ClusterUpdateParameters, options?: ComputeUpdateOptionalParams): Promise, ComputeUpdateResponse>>; + beginUpdate(resourceGroupName: string, workspaceName: string, computeName: string, parameters: ClusterUpdateParameters, options?: ComputeUpdateOptionalParams): Promise, ComputeUpdateResponse>>; beginUpdateAndWait(resourceGroupName: string, workspaceName: string, computeName: string, parameters: ClusterUpdateParameters, options?: ComputeUpdateOptionalParams): Promise; get(resourceGroupName: string, workspaceName: string, computeName: string, options?: ComputeGetOptionalParams): Promise; list(resourceGroupName: string, workspaceName: string, options?: ComputeListOptionalParams): PagedAsyncIterableIterator; @@ -1230,10 +1214,10 @@ export interface ComputeStartOptionalParams extends coreClient.OperationOptions // @public export interface ComputeStartStopSchedule { action?: ComputePowerAction; - cron?: CronTrigger; + cron?: Cron; readonly id?: string; readonly provisioningStatus?: ProvisioningStatus; - recurrence?: RecurrenceTrigger; + recurrence?: Recurrence; schedule?: ScheduleBase; status?: ScheduleStatus; triggerType?: TriggerType; @@ -1293,6 +1277,13 @@ export type CreatedByType = string; // @public export type CredentialsType = string; +// @public +export interface Cron { + expression?: string; + startTime?: string; + timeZone?: string; +} + // @public (undocumented) export interface CronTrigger extends TriggerBase { expression: string; @@ -1407,8 +1398,6 @@ export type DataContainersGetResponse = DataContainer; // @public export interface DataContainersListNextOptionalParams extends coreClient.OperationOptions { - listViewType?: ListViewType; - skip?: string; } // @public @@ -1518,13 +1507,6 @@ export type DatastoresGetResponse = Datastore; // @public export interface DatastoresListNextOptionalParams extends coreClient.OperationOptions { - count?: number; - isDefault?: boolean; - names?: string[]; - orderBy?: string; - orderByAsc?: boolean; - searchText?: string; - skip?: string; } // @public @@ -1605,11 +1587,6 @@ export type DataVersionsGetResponse = DataVersionBase; // @public export interface DataVersionsListNextOptionalParams extends coreClient.OperationOptions { - listViewType?: ListViewType; - orderBy?: string; - skip?: string; - tags?: string; - top?: number; } // @public @@ -1865,8 +1842,6 @@ export type EnvironmentContainersGetResponse = EnvironmentContainer; // @public export interface EnvironmentContainersListNextOptionalParams extends coreClient.OperationOptions { - listViewType?: ListViewType; - skip?: string; } // @public @@ -1934,10 +1909,6 @@ export type EnvironmentVersionsGetResponse = EnvironmentVersion; // @public export interface EnvironmentVersionsListNextOptionalParams extends coreClient.OperationOptions { - listViewType?: ListViewType; - orderBy?: string; - skip?: string; - top?: number; } // @public @@ -2137,6 +2108,11 @@ export interface IdentityForCmk { userAssignedIdentity?: string; } +// @public +export interface IdleShutdownSetting { + idleTimeBeforeShutdown?: string; +} + // @public export interface ImageClassification extends ImageClassificationBase, AutoMLVertical { primaryMetric?: ClassificationPrimaryMetrics; @@ -2412,9 +2388,9 @@ export interface JobResourceConfiguration extends ResourceConfiguration { // @public export interface Jobs { - beginCancel(resourceGroupName: string, workspaceName: string, id: string, options?: JobsCancelOptionalParams): Promise, void>>; + beginCancel(resourceGroupName: string, workspaceName: string, id: string, options?: JobsCancelOptionalParams): Promise, void>>; beginCancelAndWait(resourceGroupName: string, workspaceName: string, id: string, options?: JobsCancelOptionalParams): Promise; - beginDelete(resourceGroupName: string, workspaceName: string, id: string, options?: JobsDeleteOptionalParams): Promise, void>>; + beginDelete(resourceGroupName: string, workspaceName: string, id: string, options?: JobsDeleteOptionalParams): Promise, void>>; beginDeleteAndWait(resourceGroupName: string, workspaceName: string, id: string, options?: JobsDeleteOptionalParams): Promise; createOrUpdate(resourceGroupName: string, workspaceName: string, id: string, body: JobBase, options?: JobsCreateOrUpdateOptionalParams): Promise; get(resourceGroupName: string, workspaceName: string, id: string, options?: JobsGetOptionalParams): Promise; @@ -2480,10 +2456,6 @@ export type JobsGetResponse = JobBase; // @public export interface JobsListNextOptionalParams extends coreClient.OperationOptions { - jobType?: string; - listViewType?: ListViewType; - skip?: string; - tag?: string; } // @public @@ -3613,9 +3585,6 @@ export type ModelContainersGetResponse = ModelContainer; // @public export interface ModelContainersListNextOptionalParams extends coreClient.OperationOptions { - count?: number; - listViewType?: ListViewType; - skip?: string; } // @public @@ -3683,16 +3652,6 @@ export type ModelVersionsGetResponse = ModelVersion; // @public export interface ModelVersionsListNextOptionalParams extends coreClient.OperationOptions { - description?: string; - feed?: string; - listViewType?: ListViewType; - offset?: number; - orderBy?: string; - properties?: string; - skip?: string; - tags?: string; - top?: number; - version?: string; } // @public @@ -3847,11 +3806,11 @@ export type OnlineDeploymentPropertiesUnion = OnlineDeploymentProperties | Kuber // @public export interface OnlineDeployments { - beginCreateOrUpdate(resourceGroupName: string, workspaceName: string, endpointName: string, deploymentName: string, body: OnlineDeployment, options?: OnlineDeploymentsCreateOrUpdateOptionalParams): Promise, OnlineDeploymentsCreateOrUpdateResponse>>; + beginCreateOrUpdate(resourceGroupName: string, workspaceName: string, endpointName: string, deploymentName: string, body: OnlineDeployment, options?: OnlineDeploymentsCreateOrUpdateOptionalParams): Promise, OnlineDeploymentsCreateOrUpdateResponse>>; beginCreateOrUpdateAndWait(resourceGroupName: string, workspaceName: string, endpointName: string, deploymentName: string, body: OnlineDeployment, options?: OnlineDeploymentsCreateOrUpdateOptionalParams): Promise; - beginDelete(resourceGroupName: string, workspaceName: string, endpointName: string, deploymentName: string, options?: OnlineDeploymentsDeleteOptionalParams): Promise, void>>; + beginDelete(resourceGroupName: string, workspaceName: string, endpointName: string, deploymentName: string, options?: OnlineDeploymentsDeleteOptionalParams): Promise, void>>; beginDeleteAndWait(resourceGroupName: string, workspaceName: string, endpointName: string, deploymentName: string, options?: OnlineDeploymentsDeleteOptionalParams): Promise; - beginUpdate(resourceGroupName: string, workspaceName: string, endpointName: string, deploymentName: string, body: PartialMinimalTrackedResourceWithSku, options?: OnlineDeploymentsUpdateOptionalParams): Promise, OnlineDeploymentsUpdateResponse>>; + beginUpdate(resourceGroupName: string, workspaceName: string, endpointName: string, deploymentName: string, body: PartialMinimalTrackedResourceWithSku, options?: OnlineDeploymentsUpdateOptionalParams): Promise, OnlineDeploymentsUpdateResponse>>; beginUpdateAndWait(resourceGroupName: string, workspaceName: string, endpointName: string, deploymentName: string, body: PartialMinimalTrackedResourceWithSku, options?: OnlineDeploymentsUpdateOptionalParams): Promise; get(resourceGroupName: string, workspaceName: string, endpointName: string, deploymentName: string, options?: OnlineDeploymentsGetOptionalParams): Promise; getLogs(resourceGroupName: string, workspaceName: string, endpointName: string, deploymentName: string, body: DeploymentLogsRequest, options?: OnlineDeploymentsGetLogsOptionalParams): Promise; @@ -3903,9 +3862,6 @@ export type OnlineDeploymentsGetResponse = OnlineDeployment; // @public export interface OnlineDeploymentsListNextOptionalParams extends coreClient.OperationOptions { - orderBy?: string; - skip?: string; - top?: number; } // @public @@ -3923,8 +3879,6 @@ export type OnlineDeploymentsListResponse = OnlineDeploymentTrackedResourceArmPa // @public export interface OnlineDeploymentsListSkusNextOptionalParams extends coreClient.OperationOptions { - count?: number; - skip?: string; } // @public @@ -3981,13 +3935,13 @@ export interface OnlineEndpointProperties extends EndpointPropertiesBase { // @public export interface OnlineEndpoints { - beginCreateOrUpdate(resourceGroupName: string, workspaceName: string, endpointName: string, body: OnlineEndpoint, options?: OnlineEndpointsCreateOrUpdateOptionalParams): Promise, OnlineEndpointsCreateOrUpdateResponse>>; + beginCreateOrUpdate(resourceGroupName: string, workspaceName: string, endpointName: string, body: OnlineEndpoint, options?: OnlineEndpointsCreateOrUpdateOptionalParams): Promise, OnlineEndpointsCreateOrUpdateResponse>>; beginCreateOrUpdateAndWait(resourceGroupName: string, workspaceName: string, endpointName: string, body: OnlineEndpoint, options?: OnlineEndpointsCreateOrUpdateOptionalParams): Promise; - beginDelete(resourceGroupName: string, workspaceName: string, endpointName: string, options?: OnlineEndpointsDeleteOptionalParams): Promise, void>>; + beginDelete(resourceGroupName: string, workspaceName: string, endpointName: string, options?: OnlineEndpointsDeleteOptionalParams): Promise, void>>; beginDeleteAndWait(resourceGroupName: string, workspaceName: string, endpointName: string, options?: OnlineEndpointsDeleteOptionalParams): Promise; - beginRegenerateKeys(resourceGroupName: string, workspaceName: string, endpointName: string, body: RegenerateEndpointKeysRequest, options?: OnlineEndpointsRegenerateKeysOptionalParams): Promise, void>>; + beginRegenerateKeys(resourceGroupName: string, workspaceName: string, endpointName: string, body: RegenerateEndpointKeysRequest, options?: OnlineEndpointsRegenerateKeysOptionalParams): Promise, void>>; beginRegenerateKeysAndWait(resourceGroupName: string, workspaceName: string, endpointName: string, body: RegenerateEndpointKeysRequest, options?: OnlineEndpointsRegenerateKeysOptionalParams): Promise; - beginUpdate(resourceGroupName: string, workspaceName: string, endpointName: string, body: PartialMinimalTrackedResourceWithIdentity, options?: OnlineEndpointsUpdateOptionalParams): Promise, OnlineEndpointsUpdateResponse>>; + beginUpdate(resourceGroupName: string, workspaceName: string, endpointName: string, body: PartialMinimalTrackedResourceWithIdentity, options?: OnlineEndpointsUpdateOptionalParams): Promise, OnlineEndpointsUpdateResponse>>; beginUpdateAndWait(resourceGroupName: string, workspaceName: string, endpointName: string, body: PartialMinimalTrackedResourceWithIdentity, options?: OnlineEndpointsUpdateOptionalParams): Promise; get(resourceGroupName: string, workspaceName: string, endpointName: string, options?: OnlineEndpointsGetOptionalParams): Promise; getToken(resourceGroupName: string, workspaceName: string, endpointName: string, options?: OnlineEndpointsGetTokenOptionalParams): Promise; @@ -4046,13 +4000,6 @@ export type OnlineEndpointsListKeysResponse = EndpointAuthKeys; // @public export interface OnlineEndpointsListNextOptionalParams extends coreClient.OperationOptions { - computeType?: EndpointComputeType; - count?: number; - name?: string; - orderBy?: OrderString; - properties?: string; - skip?: string; - tags?: string; } // @public @@ -4429,6 +4376,15 @@ export interface RandomSamplingAlgorithm extends SamplingAlgorithm { // @public export type RandomSamplingAlgorithmRule = string; +// @public +export interface Recurrence { + frequency?: RecurrenceFrequency; + interval?: number; + schedule?: RecurrenceSchedule; + startTime?: string; + timeZone?: string; +} + // @public export type RecurrenceFrequency = string; @@ -4635,9 +4591,9 @@ export interface ScheduleResourceArmPaginatedResult { // @public export interface Schedules { - beginCreateOrUpdate(resourceGroupName: string, workspaceName: string, name: string, body: Schedule, options?: SchedulesCreateOrUpdateOptionalParams): Promise, SchedulesCreateOrUpdateResponse>>; + beginCreateOrUpdate(resourceGroupName: string, workspaceName: string, name: string, body: Schedule, options?: SchedulesCreateOrUpdateOptionalParams): Promise, SchedulesCreateOrUpdateResponse>>; beginCreateOrUpdateAndWait(resourceGroupName: string, workspaceName: string, name: string, body: Schedule, options?: SchedulesCreateOrUpdateOptionalParams): Promise; - beginDelete(resourceGroupName: string, workspaceName: string, name: string, options?: SchedulesDeleteOptionalParams): Promise, void>>; + beginDelete(resourceGroupName: string, workspaceName: string, name: string, options?: SchedulesDeleteOptionalParams): Promise, void>>; beginDeleteAndWait(resourceGroupName: string, workspaceName: string, name: string, options?: SchedulesDeleteOptionalParams): Promise; get(resourceGroupName: string, workspaceName: string, name: string, options?: SchedulesGetOptionalParams): Promise; list(resourceGroupName: string, workspaceName: string, options?: SchedulesListOptionalParams): PagedAsyncIterableIterator; @@ -4680,8 +4636,6 @@ export type SchedulesGetResponse = Schedule; // @public export interface SchedulesListNextOptionalParams extends coreClient.OperationOptions { - listViewType?: ScheduleListViewType; - skip?: string; } // @public @@ -5043,11 +4997,11 @@ export interface TriggerBase { endTime?: string; startTime?: string; timeZone?: string; - triggerType: "Recurrence" | "Cron"; + triggerType: "Cron" | "Recurrence"; } // @public (undocumented) -export type TriggerBaseUnion = TriggerBase | RecurrenceTrigger | CronTrigger; +export type TriggerBaseUnion = TriggerBase | CronTrigger | RecurrenceTrigger; // @public export type TriggerType = string; @@ -5387,8 +5341,6 @@ export interface WorkspaceConnectionSharedAccessSignature { // @public export interface WorkspaceConnectionsListNextOptionalParams extends coreClient.OperationOptions { - category?: string; - target?: string; } // @public @@ -5438,17 +5390,17 @@ export interface WorkspaceListResult { // @public export interface Workspaces { - beginCreateOrUpdate(resourceGroupName: string, workspaceName: string, parameters: Workspace, options?: WorkspacesCreateOrUpdateOptionalParams): Promise, WorkspacesCreateOrUpdateResponse>>; + beginCreateOrUpdate(resourceGroupName: string, workspaceName: string, parameters: Workspace, options?: WorkspacesCreateOrUpdateOptionalParams): Promise, WorkspacesCreateOrUpdateResponse>>; beginCreateOrUpdateAndWait(resourceGroupName: string, workspaceName: string, parameters: Workspace, options?: WorkspacesCreateOrUpdateOptionalParams): Promise; - beginDelete(resourceGroupName: string, workspaceName: string, options?: WorkspacesDeleteOptionalParams): Promise, void>>; + beginDelete(resourceGroupName: string, workspaceName: string, options?: WorkspacesDeleteOptionalParams): Promise, void>>; beginDeleteAndWait(resourceGroupName: string, workspaceName: string, options?: WorkspacesDeleteOptionalParams): Promise; - beginDiagnose(resourceGroupName: string, workspaceName: string, options?: WorkspacesDiagnoseOptionalParams): Promise, WorkspacesDiagnoseResponse>>; + beginDiagnose(resourceGroupName: string, workspaceName: string, options?: WorkspacesDiagnoseOptionalParams): Promise, WorkspacesDiagnoseResponse>>; beginDiagnoseAndWait(resourceGroupName: string, workspaceName: string, options?: WorkspacesDiagnoseOptionalParams): Promise; - beginPrepareNotebook(resourceGroupName: string, workspaceName: string, options?: WorkspacesPrepareNotebookOptionalParams): Promise, WorkspacesPrepareNotebookResponse>>; + beginPrepareNotebook(resourceGroupName: string, workspaceName: string, options?: WorkspacesPrepareNotebookOptionalParams): Promise, WorkspacesPrepareNotebookResponse>>; beginPrepareNotebookAndWait(resourceGroupName: string, workspaceName: string, options?: WorkspacesPrepareNotebookOptionalParams): Promise; - beginResyncKeys(resourceGroupName: string, workspaceName: string, options?: WorkspacesResyncKeysOptionalParams): Promise, void>>; + beginResyncKeys(resourceGroupName: string, workspaceName: string, options?: WorkspacesResyncKeysOptionalParams): Promise, void>>; beginResyncKeysAndWait(resourceGroupName: string, workspaceName: string, options?: WorkspacesResyncKeysOptionalParams): Promise; - beginUpdate(resourceGroupName: string, workspaceName: string, parameters: WorkspaceUpdateParameters, options?: WorkspacesUpdateOptionalParams): Promise, WorkspacesUpdateResponse>>; + beginUpdate(resourceGroupName: string, workspaceName: string, parameters: WorkspaceUpdateParameters, options?: WorkspacesUpdateOptionalParams): Promise, WorkspacesUpdateResponse>>; beginUpdateAndWait(resourceGroupName: string, workspaceName: string, parameters: WorkspaceUpdateParameters, options?: WorkspacesUpdateOptionalParams): Promise; get(resourceGroupName: string, workspaceName: string, options?: WorkspacesGetOptionalParams): Promise; listByResourceGroup(resourceGroupName: string, options?: WorkspacesListByResourceGroupOptionalParams): PagedAsyncIterableIterator; @@ -5500,7 +5452,6 @@ export type WorkspacesGetResponse = Workspace; // @public export interface WorkspacesListByResourceGroupNextOptionalParams extends coreClient.OperationOptions { - skip?: string; } // @public @@ -5516,7 +5467,6 @@ export type WorkspacesListByResourceGroupResponse = WorkspaceListResult; // @public export interface WorkspacesListBySubscriptionNextOptionalParams extends coreClient.OperationOptions { - skip?: string; } // @public diff --git a/sdk/machinelearning/arm-machinelearning/src/azureMachineLearningWorkspaces.ts b/sdk/machinelearning/arm-machinelearning/src/azureMachineLearningWorkspaces.ts index 141a281ef475..02c297757fad 100644 --- a/sdk/machinelearning/arm-machinelearning/src/azureMachineLearningWorkspaces.ts +++ b/sdk/machinelearning/arm-machinelearning/src/azureMachineLearningWorkspaces.ts @@ -106,7 +106,7 @@ export class AzureMachineLearningWorkspaces extends coreClient.ServiceClient { credential: credentials }; - const packageDetails = `azsdk-js-arm-machinelearning/2.1.2`; + const packageDetails = `azsdk-js-arm-machinelearning/3.0.0`; const userAgentPrefix = options.userAgentOptions && options.userAgentOptions.userAgentPrefix ? `${options.userAgentOptions.userAgentPrefix} ${packageDetails}` @@ -159,7 +159,7 @@ export class AzureMachineLearningWorkspaces extends coreClient.ServiceClient { // Assigning values to Constant parameters this.$host = options.$host || "https://management.azure.com"; - this.apiVersion = options.apiVersion || "2022-10-01"; + this.apiVersion = options.apiVersion || "2023-04-01"; this.operations = new OperationsImpl(this); this.workspaces = new WorkspacesImpl(this); this.usages = new UsagesImpl(this); diff --git a/sdk/machinelearning/arm-machinelearning/src/lroImpl.ts b/sdk/machinelearning/arm-machinelearning/src/lroImpl.ts index 518d5f053b4e..dd803cd5e28c 100644 --- a/sdk/machinelearning/arm-machinelearning/src/lroImpl.ts +++ b/sdk/machinelearning/arm-machinelearning/src/lroImpl.ts @@ -6,29 +6,37 @@ * Changes may cause incorrect behavior and will be lost if the code is regenerated. */ +// Copyright (c) Microsoft Corporation. +// Licensed under the MIT license. + +import { AbortSignalLike } from "@azure/abort-controller"; import { LongRunningOperation, LroResponse } from "@azure/core-lro"; -export class LroImpl implements LongRunningOperation { - constructor( - private sendOperationFn: (args: any, spec: any) => Promise>, - private args: Record, - private spec: { - readonly requestBody?: unknown; - readonly path?: string; - readonly httpMethod: string; - } & Record, - public requestPath: string = spec.path!, - public requestMethod: string = spec.httpMethod - ) {} - public async sendInitialRequest(): Promise> { - return this.sendOperationFn(this.args, this.spec); - } - public async sendPollRequest(path: string): Promise> { - const { requestBody, ...restSpec } = this.spec; - return this.sendOperationFn(this.args, { - ...restSpec, - path, - httpMethod: "GET" - }); - } +export function createLroSpec(inputs: { + sendOperationFn: (args: any, spec: any) => Promise>; + args: Record; + spec: { + readonly requestBody?: unknown; + readonly path?: string; + readonly httpMethod: string; + } & Record; +}): LongRunningOperation { + const { args, spec, sendOperationFn } = inputs; + return { + requestMethod: spec.httpMethod, + requestPath: spec.path!, + sendInitialRequest: () => sendOperationFn(args, spec), + sendPollRequest: ( + path: string, + options?: { abortSignal?: AbortSignalLike } + ) => { + const { requestBody, ...restSpec } = spec; + return sendOperationFn(args, { + ...restSpec, + httpMethod: "GET", + path, + abortSignal: options?.abortSignal + }); + } + }; } diff --git a/sdk/machinelearning/arm-machinelearning/src/models/index.ts b/sdk/machinelearning/arm-machinelearning/src/models/index.ts index bb0f66101d3d..bcbb561739b7 100644 --- a/sdk/machinelearning/arm-machinelearning/src/models/index.ts +++ b/sdk/machinelearning/arm-machinelearning/src/models/index.ts @@ -63,7 +63,7 @@ export type ScheduleActionBaseUnion = | ScheduleActionBase | EndpointScheduleAction | JobScheduleAction; -export type TriggerBaseUnion = TriggerBase | RecurrenceTrigger | CronTrigger; +export type TriggerBaseUnion = TriggerBase | CronTrigger | RecurrenceTrigger; export type ForecastHorizonUnion = | ForecastHorizon | AutoForecastHorizon @@ -1474,7 +1474,7 @@ export interface ScheduleActionBase { export interface TriggerBase { /** Polymorphic discriminator, which specifies the different types this object can be */ - triggerType: "Recurrence" | "Cron"; + triggerType: "Cron" | "Recurrence"; /** * Specifies end time of schedule in ISO 8601, but without a UTC offset. Refer https://en.wikipedia.org/wiki/ISO_8601. * Recommented format would be "2022-06-01T00:00:01" @@ -1797,11 +1797,8 @@ export interface ComputeInstanceProperties { * NOTE: This property will not be serialized. It can only be populated by the server. */ readonly lastOperation?: ComputeInstanceLastOperation; - /** - * The list of schedules to be applied on the computes. - * NOTE: This property will not be serialized. It can only be populated by the server. - */ - readonly schedules?: ComputeSchedules; + /** The list of schedules to be applied on the computes. */ + schedules?: ComputeSchedules; /** Enable or disable node public IP address provisioning. Possible values are: Possible values are: true - Indicates that the compute nodes will have public IPs provisioned. false - Indicates that the compute nodes will have a private endpoint and no public IPs. */ enableNodePublicIp?: boolean; /** @@ -1962,13 +1959,30 @@ export interface ComputeStartStopSchedule { /** [Required] The schedule trigger type. */ triggerType?: TriggerType; /** Required if triggerType is Recurrence. */ - recurrence?: RecurrenceTrigger; + recurrence?: Recurrence; /** Required if triggerType is Cron. */ - cron?: CronTrigger; + cron?: Cron; /** [Deprecated] Not used any more. */ schedule?: ScheduleBase; } +/** The workflow trigger recurrence for ComputeStartStop schedule type. */ +export interface Recurrence { + /** [Required] The frequency to trigger schedule. */ + frequency?: RecurrenceFrequency; + /** [Required] Specifies schedule interval in conjunction with frequency */ + interval?: number; + /** The start time in yyyy-MM-ddTHH:mm:ss format. */ + startTime?: string; + /** + * Specifies time zone in which the schedule runs. + * TimeZone should follow Windows time zone format. Refer: https://docs.microsoft.com/en-us/windows-hardware/manufacture/desktop/default-time-zones?view=windows-11 + */ + timeZone?: string; + /** [Required] The recurrence schedule. */ + schedule?: RecurrenceSchedule; +} + export interface RecurrenceSchedule { /** [Required] List of hours for the schedule. */ hours: number[]; @@ -1980,6 +1994,22 @@ export interface RecurrenceSchedule { weekDays?: WeekDay[]; } +/** The workflow trigger cron for ComputeStartStop schedule type. */ +export interface Cron { + /** The start time in yyyy-MM-ddTHH:mm:ss format. */ + startTime?: string; + /** + * Specifies time zone in which the schedule runs. + * TimeZone should follow Windows time zone format. Refer: https://docs.microsoft.com/en-us/windows-hardware/manufacture/desktop/default-time-zones?view=windows-11 + */ + timeZone?: string; + /** + * [Required] Specifies cron expression of schedule. + * The expression should follow NCronTab format. + */ + expression?: string; +} + export interface ScheduleBase { /** A system assigned id for the schedule. */ id?: string; @@ -2187,6 +2217,12 @@ export interface DatabricksComputeSecretsProperties { databricksAccessToken?: string; } +/** Stops compute instance after user defined period of inactivity. */ +export interface IdleShutdownSetting { + /** Time is defined in ISO8601 format. Minimum is 15 min, maximum is 3 days. */ + idleTimeBeforeShutdown?: string; +} + export interface WorkspaceConnectionUsernamePassword { username?: string; password?: string; @@ -3527,6 +3563,16 @@ export interface JobScheduleAction extends ScheduleActionBase { jobDefinition: JobBasePropertiesUnion; } +export interface CronTrigger extends TriggerBase { + /** Polymorphic discriminator, which specifies the different types this object can be */ + triggerType: "Cron"; + /** + * [Required] Specifies cron expression of schedule. + * The expression should follow NCronTab format. + */ + expression: string; +} + export interface RecurrenceTrigger extends TriggerBase { /** Polymorphic discriminator, which specifies the different types this object can be */ triggerType: "Recurrence"; @@ -3538,16 +3584,6 @@ export interface RecurrenceTrigger extends TriggerBase { schedule?: RecurrenceSchedule; } -export interface CronTrigger extends TriggerBase { - /** Polymorphic discriminator, which specifies the different types this object can be */ - triggerType: "Cron"; - /** - * [Required] Specifies cron expression of schedule. - * The expression should follow NCronTab format. - */ - expression: string; -} - export interface MLTableJobInput extends AssetJobInput, JobInput {} export interface CustomModelJobInput extends AssetJobInput, JobInput {} @@ -6892,9 +6928,9 @@ export enum KnownBlockedTransformers { CatTargetEncoder = "CatTargetEncoder", /** Tf-Idf stands for, term-frequency times inverse document-frequency. This is a common term weighting scheme for identifying information from documents. */ TfIdf = "TfIdf", - /** Weight of Evidence encoding is a technique used to encode categorical variables. It uses the natural log of the P(1)/P(0) to create weights. */ + /** Weight of Evidence encoding is a technique used to encode categorical variables. It uses the natural log of the P(1)\/P(0) to create weights. */ WoETargetEncoder = "WoETargetEncoder", - /** Label encoder converts labels/categorical variables in a numerical form. */ + /** Label encoder converts labels\/categorical variables in a numerical form. */ LabelEncoder = "LabelEncoder", /** Word embedding helps represents words or phrases as a vector, or a series of numbers. */ WordEmbedding = "WordEmbedding", @@ -7004,7 +7040,7 @@ export type FeatureLags = string; /** Known values of {@link ShortSeriesHandlingConfiguration} that the service accepts. */ export enum KnownShortSeriesHandlingConfiguration { - /** Represents no/null value. */ + /** Represents no\/null value. */ None = "None", /** Short series will be padded if there are no long series, otherwise short series will be dropped. */ Auto = "Auto", @@ -7121,11 +7157,11 @@ export enum KnownForecastingModels { /** Exponential smoothing is a time series forecasting method for univariate data that can be extended to support data with a systematic trend or seasonal component. */ ExponentialSmoothing = "ExponentialSmoothing", /** - * An Autoregressive Integrated Moving Average with Explanatory Variable (ARIMAX) model can be viewed as a multiple regression model with one or more autoregressive (AR) terms and/or one or more moving average (MA) terms. - * This method is suitable for forecasting when data is stationary/non stationary, and multivariate with any type of data pattern, i.e., level/trend /seasonality/cyclicity. + * An Autoregressive Integrated Moving Average with Explanatory Variable (ARIMAX) model can be viewed as a multiple regression model with one or more autoregressive (AR) terms and\/or one or more moving average (MA) terms. + * This method is suitable for forecasting when data is stationary\/non stationary, and multivariate with any type of data pattern, i.e., level\/trend \/seasonality\/cyclicity. */ Arimax = "Arimax", - /** TCNForecaster: Temporal Convolutional Networks Forecaster. //TODO: Ask forecasting team for brief intro. */ + /** TCNForecaster: Temporal Convolutional Networks Forecaster. \//TODO: Ask forecasting team for brief intro. */ TCNForecaster = "TCNForecaster", /** Elastic net is a popular type of regularized linear regression that combines two popular penalties, specifically the L1 and L2 penalty functions. */ ElasticNet = "ElasticNet", @@ -7640,20 +7676,14 @@ export type WorkspacesListOutboundNetworkDependenciesEndpointsResponse = Externa /** Optional parameters. */ export interface WorkspacesListByResourceGroupNextOptionalParams - extends coreClient.OperationOptions { - /** Continuation token for pagination. */ - skip?: string; -} + extends coreClient.OperationOptions {} /** Contains response data for the listByResourceGroupNext operation. */ export type WorkspacesListByResourceGroupNextResponse = WorkspaceListResult; /** Optional parameters. */ export interface WorkspacesListBySubscriptionNextOptionalParams - extends coreClient.OperationOptions { - /** Continuation token for pagination. */ - skip?: string; -} + extends coreClient.OperationOptions {} /** Contains response data for the listBySubscriptionNext operation. */ export type WorkspacesListBySubscriptionNextResponse = WorkspaceListResult; @@ -7788,10 +7818,7 @@ export interface ComputeRestartOptionalParams /** Optional parameters. */ export interface ComputeListNextOptionalParams - extends coreClient.OperationOptions { - /** Continuation token for pagination. */ - skip?: string; -} + extends coreClient.OperationOptions {} /** Contains response data for the listNext operation. */ export type ComputeListNextResponse = PaginatedComputeResourcesList; @@ -7867,12 +7894,7 @@ export type WorkspaceConnectionsListResponse = WorkspaceConnectionPropertiesV2Ba /** Optional parameters. */ export interface WorkspaceConnectionsListNextOptionalParams - extends coreClient.OperationOptions { - /** Target of the workspace connection. */ - target?: string; - /** Category of the workspace connection. */ - category?: string; -} + extends coreClient.OperationOptions {} /** Contains response data for the listNext operation. */ export type WorkspaceConnectionsListNextResponse = WorkspaceConnectionPropertiesV2BasicResourceArmPaginatedResult; @@ -7938,12 +7960,7 @@ export type BatchEndpointsListKeysResponse = EndpointAuthKeys; /** Optional parameters. */ export interface BatchEndpointsListNextOptionalParams - extends coreClient.OperationOptions { - /** Continuation token for pagination. */ - skip?: string; - /** Number of endpoints to be retrieved in a page of results. */ - count?: number; -} + extends coreClient.OperationOptions {} /** Contains response data for the listNext operation. */ export type BatchEndpointsListNextResponse = BatchEndpointTrackedResourceArmPaginatedResult; @@ -8004,14 +8021,7 @@ export type BatchDeploymentsCreateOrUpdateResponse = BatchDeployment; /** Optional parameters. */ export interface BatchDeploymentsListNextOptionalParams - extends coreClient.OperationOptions { - /** Continuation token for pagination. */ - skip?: string; - /** Ordering of list. */ - orderBy?: string; - /** Top of list. */ - top?: number; -} + extends coreClient.OperationOptions {} /** Contains response data for the listNext operation. */ export type BatchDeploymentsListNextResponse = BatchDeploymentTrackedResourceArmPaginatedResult; @@ -8046,10 +8056,7 @@ export type CodeContainersCreateOrUpdateResponse = CodeContainer; /** Optional parameters. */ export interface CodeContainersListNextOptionalParams - extends coreClient.OperationOptions { - /** Continuation token for pagination. */ - skip?: string; -} + extends coreClient.OperationOptions {} /** Contains response data for the listNext operation. */ export type CodeContainersListNextResponse = CodeContainerResourceArmPaginatedResult; @@ -8088,14 +8095,7 @@ export type CodeVersionsCreateOrUpdateResponse = CodeVersion; /** Optional parameters. */ export interface CodeVersionsListNextOptionalParams - extends coreClient.OperationOptions { - /** Continuation token for pagination. */ - skip?: string; - /** Ordering of list. */ - orderBy?: string; - /** Maximum number of records to return. */ - top?: number; -} + extends coreClient.OperationOptions {} /** Contains response data for the listNext operation. */ export type CodeVersionsListNextResponse = CodeVersionResourceArmPaginatedResult; @@ -8132,12 +8132,7 @@ export type ComponentContainersCreateOrUpdateResponse = ComponentContainer; /** Optional parameters. */ export interface ComponentContainersListNextOptionalParams - extends coreClient.OperationOptions { - /** Continuation token for pagination. */ - skip?: string; - /** View type for including/excluding (for example) archived entities. */ - listViewType?: ListViewType; -} + extends coreClient.OperationOptions {} /** Contains response data for the listNext operation. */ export type ComponentContainersListNextResponse = ComponentContainerResourceArmPaginatedResult; @@ -8178,16 +8173,7 @@ export type ComponentVersionsCreateOrUpdateResponse = ComponentVersion; /** Optional parameters. */ export interface ComponentVersionsListNextOptionalParams - extends coreClient.OperationOptions { - /** Continuation token for pagination. */ - skip?: string; - /** Ordering of list. */ - orderBy?: string; - /** Maximum number of records to return. */ - top?: number; - /** View type for including/excluding (for example) archived entities. */ - listViewType?: ListViewType; -} + extends coreClient.OperationOptions {} /** Contains response data for the listNext operation. */ export type ComponentVersionsListNextResponse = ComponentVersionResourceArmPaginatedResult; @@ -8224,12 +8210,7 @@ export type DataContainersCreateOrUpdateResponse = DataContainer; /** Optional parameters. */ export interface DataContainersListNextOptionalParams - extends coreClient.OperationOptions { - /** Continuation token for pagination. */ - skip?: string; - /** View type for including/excluding (for example) archived entities. */ - listViewType?: ListViewType; -} + extends coreClient.OperationOptions {} /** Contains response data for the listNext operation. */ export type DataContainersListNextResponse = DataContainerResourceArmPaginatedResult; @@ -8275,21 +8256,7 @@ export type DataVersionsCreateOrUpdateResponse = DataVersionBase; /** Optional parameters. */ export interface DataVersionsListNextOptionalParams - extends coreClient.OperationOptions { - /** Continuation token for pagination. */ - skip?: string; - /** Please choose OrderBy value from ['createdtime', 'modifiedtime'] */ - orderBy?: string; - /** - * Top count of results, top count cannot be greater than the page size. - * If topCount > page size, results with be default page size count will be returned - */ - top?: number; - /** [ListViewType.ActiveOnly, ListViewType.ArchivedOnly, ListViewType.All]View type for including/excluding (for example) archived entities. */ - listViewType?: ListViewType; - /** Comma-separated list of tag names (and optionally values). Example: tag1,tag2=value2 */ - tags?: string; -} + extends coreClient.OperationOptions {} /** Contains response data for the listNext operation. */ export type DataVersionsListNextResponse = DataVersionBaseResourceArmPaginatedResult; @@ -8346,22 +8313,7 @@ export type DatastoresListSecretsResponse = DatastoreSecretsUnion; /** Optional parameters. */ export interface DatastoresListNextOptionalParams - extends coreClient.OperationOptions { - /** Continuation token for pagination. */ - skip?: string; - /** Maximum number of results to return. */ - count?: number; - /** Filter down to the workspace default datastore. */ - isDefault?: boolean; - /** Names of datastores to return. */ - names?: string[]; - /** Text to search for in the datastore names. */ - searchText?: string; - /** Order by property (createdtime | modifiedtime | name). */ - orderBy?: string; - /** Order by property in ascending order. */ - orderByAsc?: boolean; -} + extends coreClient.OperationOptions {} /** Contains response data for the listNext operation. */ export type DatastoresListNextResponse = DatastoreResourceArmPaginatedResult; @@ -8398,12 +8350,7 @@ export type EnvironmentContainersCreateOrUpdateResponse = EnvironmentContainer; /** Optional parameters. */ export interface EnvironmentContainersListNextOptionalParams - extends coreClient.OperationOptions { - /** Continuation token for pagination. */ - skip?: string; - /** View type for including/excluding (for example) archived entities. */ - listViewType?: ListViewType; -} + extends coreClient.OperationOptions {} /** Contains response data for the listNext operation. */ export type EnvironmentContainersListNextResponse = EnvironmentContainerResourceArmPaginatedResult; @@ -8444,16 +8391,7 @@ export type EnvironmentVersionsCreateOrUpdateResponse = EnvironmentVersion; /** Optional parameters. */ export interface EnvironmentVersionsListNextOptionalParams - extends coreClient.OperationOptions { - /** Continuation token for pagination. */ - skip?: string; - /** Ordering of list. */ - orderBy?: string; - /** Maximum number of records to return. */ - top?: number; - /** View type for including/excluding (for example) archived entities. */ - listViewType?: ListViewType; -} + extends coreClient.OperationOptions {} /** Contains response data for the listNext operation. */ export type EnvironmentVersionsListNextResponse = EnvironmentVersionResourceArmPaginatedResult; @@ -8504,16 +8442,7 @@ export interface JobsCancelOptionalParams extends coreClient.OperationOptions { /** Optional parameters. */ export interface JobsListNextOptionalParams - extends coreClient.OperationOptions { - /** Continuation token for pagination. */ - skip?: string; - /** View type for including/excluding (for example) archived entities. */ - listViewType?: ListViewType; - /** Type of job to be returned. */ - jobType?: string; - /** Jobs returned will have this tag key. */ - tag?: string; -} + extends coreClient.OperationOptions {} /** Contains response data for the listNext operation. */ export type JobsListNextResponse = JobBaseResourceArmPaginatedResult; @@ -8552,14 +8481,7 @@ export type ModelContainersCreateOrUpdateResponse = ModelContainer; /** Optional parameters. */ export interface ModelContainersListNextOptionalParams - extends coreClient.OperationOptions { - /** Continuation token for pagination. */ - skip?: string; - /** Maximum number of results to return. */ - count?: number; - /** View type for including/excluding (for example) archived entities. */ - listViewType?: ListViewType; -} + extends coreClient.OperationOptions {} /** Contains response data for the listNext operation. */ export type ModelContainersListNextResponse = ModelContainerResourceArmPaginatedResult; @@ -8612,28 +8534,7 @@ export type ModelVersionsCreateOrUpdateResponse = ModelVersion; /** Optional parameters. */ export interface ModelVersionsListNextOptionalParams - extends coreClient.OperationOptions { - /** Continuation token for pagination. */ - skip?: string; - /** Ordering of list. */ - orderBy?: string; - /** Maximum number of records to return. */ - top?: number; - /** View type for including/excluding (for example) archived entities. */ - listViewType?: ListViewType; - /** Model version. */ - version?: string; - /** Model description. */ - description?: string; - /** Number of initial results to skip. */ - offset?: number; - /** Comma-separated list of tag names (and optionally values). Example: tag1,tag2=value2 */ - tags?: string; - /** Comma-separated list of property names (and optionally values). Example: prop1,prop2=value2 */ - properties?: string; - /** Name of the feed. */ - feed?: string; -} + extends coreClient.OperationOptions {} /** Contains response data for the listNext operation. */ export type ModelVersionsListNextResponse = ModelVersionResourceArmPaginatedResult; @@ -8725,22 +8626,7 @@ export type OnlineEndpointsGetTokenResponse = EndpointAuthToken; /** Optional parameters. */ export interface OnlineEndpointsListNextOptionalParams - extends coreClient.OperationOptions { - /** Continuation token for pagination. */ - skip?: string; - /** Number of endpoints to be retrieved in a page of results. */ - count?: number; - /** A set of tags with which to filter the returned models. It is a comma separated string of tags key or tags key=value. Example: tagKey1,tagKey2,tagKey3=value3 . */ - tags?: string; - /** A set of properties with which to filter the returned models. It is a comma separated string of properties key and/or properties key=value Example: propKey1,propKey2,propKey3=value3 . */ - properties?: string; - /** Name of the endpoint. */ - name?: string; - /** EndpointComputeType to be filtered by. */ - computeType?: EndpointComputeType; - /** The option to order the response. */ - orderBy?: OrderString; -} + extends coreClient.OperationOptions {} /** Contains response data for the listNext operation. */ export type OnlineEndpointsListNextResponse = OnlineEndpointTrackedResourceArmPaginatedResult; @@ -8820,26 +8706,14 @@ export type OnlineDeploymentsListSkusResponse = SkuResourceArmPaginatedResult; /** Optional parameters. */ export interface OnlineDeploymentsListNextOptionalParams - extends coreClient.OperationOptions { - /** Continuation token for pagination. */ - skip?: string; - /** Ordering of list. */ - orderBy?: string; - /** Top of list. */ - top?: number; -} + extends coreClient.OperationOptions {} /** Contains response data for the listNext operation. */ export type OnlineDeploymentsListNextResponse = OnlineDeploymentTrackedResourceArmPaginatedResult; /** Optional parameters. */ export interface OnlineDeploymentsListSkusNextOptionalParams - extends coreClient.OperationOptions { - /** Continuation token for pagination. */ - skip?: string; - /** Number of Skus to be retrieved in a page of results. */ - count?: number; -} + extends coreClient.OperationOptions {} /** Contains response data for the listSkusNext operation. */ export type OnlineDeploymentsListSkusNextResponse = SkuResourceArmPaginatedResult; @@ -8886,12 +8760,7 @@ export type SchedulesCreateOrUpdateResponse = Schedule; /** Optional parameters. */ export interface SchedulesListNextOptionalParams - extends coreClient.OperationOptions { - /** Continuation token for pagination. */ - skip?: string; - /** Status filter for schedule. */ - listViewType?: ScheduleListViewType; -} + extends coreClient.OperationOptions {} /** Contains response data for the listNext operation. */ export type SchedulesListNextResponse = ScheduleResourceArmPaginatedResult; diff --git a/sdk/machinelearning/arm-machinelearning/src/models/mappers.ts b/sdk/machinelearning/arm-machinelearning/src/models/mappers.ts index ef591872516f..0a1a12285980 100644 --- a/sdk/machinelearning/arm-machinelearning/src/models/mappers.ts +++ b/sdk/machinelearning/arm-machinelearning/src/models/mappers.ts @@ -2935,7 +2935,8 @@ export const BuildContext: coreClient.CompositeMapper = { modelProperties: { contextUri: { constraints: { - Pattern: new RegExp("[a-zA-Z0-9_]") + Pattern: new RegExp("[a-zA-Z0-9_]"), + MinLength: 1 }, serializedName: "contextUri", required: true, @@ -2991,7 +2992,8 @@ export const Route: coreClient.CompositeMapper = { modelProperties: { path: { constraints: { - Pattern: new RegExp("[a-zA-Z0-9_]") + Pattern: new RegExp("[a-zA-Z0-9_]"), + MinLength: 1 }, serializedName: "path", required: true, @@ -3511,7 +3513,8 @@ export const SkuSetting: coreClient.CompositeMapper = { modelProperties: { name: { constraints: { - Pattern: new RegExp("[a-zA-Z0-9_]") + Pattern: new RegExp("[a-zA-Z0-9_]"), + MinLength: 1 }, serializedName: "name", required: true, @@ -4846,14 +4849,14 @@ export const ComputeStartStopSchedule: coreClient.CompositeMapper = { serializedName: "recurrence", type: { name: "Composite", - className: "RecurrenceTrigger" + className: "Recurrence" } }, cron: { serializedName: "cron", type: { name: "Composite", - className: "CronTrigger" + className: "Cron" } }, schedule: { @@ -4867,6 +4870,48 @@ export const ComputeStartStopSchedule: coreClient.CompositeMapper = { } }; +export const Recurrence: coreClient.CompositeMapper = { + type: { + name: "Composite", + className: "Recurrence", + modelProperties: { + frequency: { + serializedName: "frequency", + type: { + name: "String" + } + }, + interval: { + serializedName: "interval", + type: { + name: "Number" + } + }, + startTime: { + serializedName: "startTime", + nullable: true, + type: { + name: "String" + } + }, + timeZone: { + defaultValue: "UTC", + serializedName: "timeZone", + type: { + name: "String" + } + }, + schedule: { + serializedName: "schedule", + type: { + name: "Composite", + className: "RecurrenceSchedule" + } + } + } + } +}; + export const RecurrenceSchedule: coreClient.CompositeMapper = { type: { name: "Composite", @@ -4924,6 +4969,35 @@ export const RecurrenceSchedule: coreClient.CompositeMapper = { } }; +export const Cron: coreClient.CompositeMapper = { + type: { + name: "Composite", + className: "Cron", + modelProperties: { + startTime: { + serializedName: "startTime", + nullable: true, + type: { + name: "String" + } + }, + timeZone: { + defaultValue: "UTC", + serializedName: "timeZone", + type: { + name: "String" + } + }, + expression: { + serializedName: "expression", + type: { + name: "String" + } + } + } + } +}; + export const ScheduleBase: coreClient.CompositeMapper = { type: { name: "Composite", @@ -5540,6 +5614,21 @@ export const DatabricksComputeSecretsProperties: coreClient.CompositeMapper = { } }; +export const IdleShutdownSetting: coreClient.CompositeMapper = { + type: { + name: "Composite", + className: "IdleShutdownSetting", + modelProperties: { + idleTimeBeforeShutdown: { + serializedName: "idleTimeBeforeShutdown", + type: { + name: "String" + } + } + } + } +}; + export const WorkspaceConnectionUsernamePassword: coreClient.CompositeMapper = { type: { name: "Composite", @@ -5625,7 +5714,8 @@ export const AssetJobInput: coreClient.CompositeMapper = { }, uri: { constraints: { - Pattern: new RegExp("[a-zA-Z0-9_]") + Pattern: new RegExp("[a-zA-Z0-9_]"), + MinLength: 1 }, serializedName: "uri", required: true, @@ -6987,7 +7077,8 @@ export const Objective: coreClient.CompositeMapper = { }, primaryMetric: { constraints: { - Pattern: new RegExp("[a-zA-Z0-9_]") + Pattern: new RegExp("[a-zA-Z0-9_]"), + MinLength: 1 }, serializedName: "primaryMetric", required: true, @@ -7031,7 +7122,8 @@ export const TrialComponent: coreClient.CompositeMapper = { }, environmentId: { constraints: { - Pattern: new RegExp("[a-zA-Z0-9_]") + Pattern: new RegExp("[a-zA-Z0-9_]"), + MinLength: 1 }, serializedName: "environmentId", required: true, @@ -8117,7 +8209,8 @@ export const IdAssetReference: coreClient.CompositeMapper = { ...AssetReferenceBase.type.modelProperties, assetId: { constraints: { - Pattern: new RegExp("[a-zA-Z0-9_]") + Pattern: new RegExp("[a-zA-Z0-9_]"), + MinLength: 1 }, serializedName: "assetId", required: true, @@ -8657,7 +8750,8 @@ export const CertificateDatastoreCredentials: coreClient.CompositeMapper = { }, thumbprint: { constraints: { - Pattern: new RegExp("[a-zA-Z0-9_]") + Pattern: new RegExp("[a-zA-Z0-9_]"), + MinLength: 1 }, serializedName: "thumbprint", required: true, @@ -8991,6 +9085,30 @@ export const JobScheduleAction: coreClient.CompositeMapper = { } }; +export const CronTrigger: coreClient.CompositeMapper = { + serializedName: "Cron", + type: { + name: "Composite", + className: "CronTrigger", + uberParent: "TriggerBase", + polymorphicDiscriminator: TriggerBase.type.polymorphicDiscriminator, + modelProperties: { + ...TriggerBase.type.modelProperties, + expression: { + constraints: { + Pattern: new RegExp("[a-zA-Z0-9_]"), + MinLength: 1 + }, + serializedName: "expression", + required: true, + type: { + name: "String" + } + } + } + } +}; + export const RecurrenceTrigger: coreClient.CompositeMapper = { serializedName: "Recurrence", type: { @@ -9025,29 +9143,6 @@ export const RecurrenceTrigger: coreClient.CompositeMapper = { } }; -export const CronTrigger: coreClient.CompositeMapper = { - serializedName: "Cron", - type: { - name: "Composite", - className: "CronTrigger", - uberParent: "TriggerBase", - polymorphicDiscriminator: TriggerBase.type.polymorphicDiscriminator, - modelProperties: { - ...TriggerBase.type.modelProperties, - expression: { - constraints: { - Pattern: new RegExp("[a-zA-Z0-9_]") - }, - serializedName: "expression", - required: true, - type: { - name: "String" - } - } - } - } -}; - export const MLTableJobInput: coreClient.CompositeMapper = { serializedName: "mltable", type: { @@ -9561,7 +9656,8 @@ export const LiteralJobInput: coreClient.CompositeMapper = { ...JobInput.type.modelProperties, value: { constraints: { - Pattern: new RegExp("[a-zA-Z0-9_]") + Pattern: new RegExp("[a-zA-Z0-9_]"), + MinLength: 1 }, serializedName: "value", required: true, @@ -10686,7 +10782,8 @@ export const DataVersionBaseProperties: coreClient.CompositeMapper = { }, dataUri: { constraints: { - Pattern: new RegExp("[a-zA-Z0-9_]") + Pattern: new RegExp("[a-zA-Z0-9_]"), + MinLength: 1 }, serializedName: "dataUri", required: true, @@ -10856,7 +10953,8 @@ export const AzureDataLakeGen1Datastore: coreClient.CompositeMapper = { }, storeName: { constraints: { - Pattern: new RegExp("[a-zA-Z0-9_]") + Pattern: new RegExp("[a-zA-Z0-9_]"), + MinLength: 1 }, serializedName: "storeName", required: true, @@ -10879,7 +10977,8 @@ export const AzureDataLakeGen2Datastore: coreClient.CompositeMapper = { ...DatastoreProperties.type.modelProperties, accountName: { constraints: { - Pattern: new RegExp("[a-zA-Z0-9_]") + Pattern: new RegExp("[a-zA-Z0-9_]"), + MinLength: 1 }, serializedName: "accountName", required: true, @@ -10896,7 +10995,8 @@ export const AzureDataLakeGen2Datastore: coreClient.CompositeMapper = { }, filesystem: { constraints: { - Pattern: new RegExp("[a-zA-Z0-9_]") + Pattern: new RegExp("[a-zA-Z0-9_]"), + MinLength: 1 }, serializedName: "filesystem", required: true, @@ -10932,7 +11032,8 @@ export const AzureFileDatastore: coreClient.CompositeMapper = { ...DatastoreProperties.type.modelProperties, accountName: { constraints: { - Pattern: new RegExp("[a-zA-Z0-9_]") + Pattern: new RegExp("[a-zA-Z0-9_]"), + MinLength: 1 }, serializedName: "accountName", required: true, @@ -10949,7 +11050,8 @@ export const AzureFileDatastore: coreClient.CompositeMapper = { }, fileShareName: { constraints: { - Pattern: new RegExp("[a-zA-Z0-9_]") + Pattern: new RegExp("[a-zA-Z0-9_]"), + MinLength: 1 }, serializedName: "fileShareName", required: true, @@ -11060,7 +11162,8 @@ export const CommandJob: coreClient.CompositeMapper = { }, environmentId: { constraints: { - Pattern: new RegExp("[a-zA-Z0-9_]") + Pattern: new RegExp("[a-zA-Z0-9_]"), + MinLength: 1 }, serializedName: "environmentId", required: true, @@ -11888,8 +11991,8 @@ export let discriminators = { "OnlineScaleSettings.TargetUtilization": TargetUtilizationScaleSettings, "ScheduleActionBase.InvokeBatchEndpoint": EndpointScheduleAction, "ScheduleActionBase.CreateJob": JobScheduleAction, - "TriggerBase.Recurrence": RecurrenceTrigger, "TriggerBase.Cron": CronTrigger, + "TriggerBase.Recurrence": RecurrenceTrigger, "AssetJobInput.mltable": MLTableJobInput, "AssetJobInput.custom_model": CustomModelJobInput, "AssetJobInput.mlflow_model": MLFlowModelJobInput, diff --git a/sdk/machinelearning/arm-machinelearning/src/models/parameters.ts b/sdk/machinelearning/arm-machinelearning/src/models/parameters.ts index 1774bcca03b6..01b427406f01 100644 --- a/sdk/machinelearning/arm-machinelearning/src/models/parameters.ts +++ b/sdk/machinelearning/arm-machinelearning/src/models/parameters.ts @@ -71,7 +71,7 @@ export const $host: OperationURLParameter = { export const apiVersion: OperationQueryParameter = { parameterPath: "apiVersion", mapper: { - defaultValue: "2022-10-01", + defaultValue: "2023-04-01", isConstant: true, serializedName: "api-version", type: { diff --git a/sdk/machinelearning/arm-machinelearning/src/operations/batchDeployments.ts b/sdk/machinelearning/arm-machinelearning/src/operations/batchDeployments.ts index 1e22d4ba5c63..1753468b232a 100644 --- a/sdk/machinelearning/arm-machinelearning/src/operations/batchDeployments.ts +++ b/sdk/machinelearning/arm-machinelearning/src/operations/batchDeployments.ts @@ -13,8 +13,12 @@ import * as coreClient from "@azure/core-client"; import * as Mappers from "../models/mappers"; import * as Parameters from "../models/parameters"; import { AzureMachineLearningWorkspaces } from "../azureMachineLearningWorkspaces"; -import { PollerLike, PollOperationState, LroEngine } from "@azure/core-lro"; -import { LroImpl } from "../lroImpl"; +import { + SimplePollerLike, + OperationState, + createHttpPoller +} from "@azure/core-lro"; +import { createLroSpec } from "../lroImpl"; import { BatchDeployment, BatchDeploymentsListNextOptionalParams, @@ -170,14 +174,14 @@ export class BatchDeploymentsImpl implements BatchDeployments { endpointName: string, deploymentName: string, options?: BatchDeploymentsDeleteOptionalParams - ): Promise, void>> { + ): Promise, void>> { const directSendOperation = async ( args: coreClient.OperationArguments, spec: coreClient.OperationSpec ): Promise => { return this.client.sendOperationRequest(args, spec); }; - const sendOperation = async ( + const sendOperationFn = async ( args: coreClient.OperationArguments, spec: coreClient.OperationSpec ) => { @@ -210,19 +214,19 @@ export class BatchDeploymentsImpl implements BatchDeployments { }; }; - const lro = new LroImpl( - sendOperation, - { + const lro = createLroSpec({ + sendOperationFn, + args: { resourceGroupName, workspaceName, endpointName, deploymentName, options }, - deleteOperationSpec - ); - const poller = new LroEngine(lro, { - resumeFrom: options?.resumeFrom, + spec: deleteOperationSpec + }); + const poller = await createHttpPoller>(lro, { + restoreFrom: options?.resumeFrom, intervalInMs: options?.updateIntervalInMs }); await poller.poll(); @@ -298,8 +302,8 @@ export class BatchDeploymentsImpl implements BatchDeployments { body: PartialBatchDeploymentPartialMinimalTrackedResourceWithProperties, options?: BatchDeploymentsUpdateOptionalParams ): Promise< - PollerLike< - PollOperationState, + SimplePollerLike< + OperationState, BatchDeploymentsUpdateResponse > > { @@ -309,7 +313,7 @@ export class BatchDeploymentsImpl implements BatchDeployments { ): Promise => { return this.client.sendOperationRequest(args, spec); }; - const sendOperation = async ( + const sendOperationFn = async ( args: coreClient.OperationArguments, spec: coreClient.OperationSpec ) => { @@ -342,9 +346,9 @@ export class BatchDeploymentsImpl implements BatchDeployments { }; }; - const lro = new LroImpl( - sendOperation, - { + const lro = createLroSpec({ + sendOperationFn, + args: { resourceGroupName, workspaceName, endpointName, @@ -352,10 +356,13 @@ export class BatchDeploymentsImpl implements BatchDeployments { body, options }, - updateOperationSpec - ); - const poller = new LroEngine(lro, { - resumeFrom: options?.resumeFrom, + spec: updateOperationSpec + }); + const poller = await createHttpPoller< + BatchDeploymentsUpdateResponse, + OperationState + >(lro, { + restoreFrom: options?.resumeFrom, intervalInMs: options?.updateIntervalInMs }); await poller.poll(); @@ -407,8 +414,8 @@ export class BatchDeploymentsImpl implements BatchDeployments { body: BatchDeployment, options?: BatchDeploymentsCreateOrUpdateOptionalParams ): Promise< - PollerLike< - PollOperationState, + SimplePollerLike< + OperationState, BatchDeploymentsCreateOrUpdateResponse > > { @@ -418,7 +425,7 @@ export class BatchDeploymentsImpl implements BatchDeployments { ): Promise => { return this.client.sendOperationRequest(args, spec); }; - const sendOperation = async ( + const sendOperationFn = async ( args: coreClient.OperationArguments, spec: coreClient.OperationSpec ) => { @@ -451,9 +458,9 @@ export class BatchDeploymentsImpl implements BatchDeployments { }; }; - const lro = new LroImpl( - sendOperation, - { + const lro = createLroSpec({ + sendOperationFn, + args: { resourceGroupName, workspaceName, endpointName, @@ -461,10 +468,13 @@ export class BatchDeploymentsImpl implements BatchDeployments { body, options }, - createOrUpdateOperationSpec - ); - const poller = new LroEngine(lro, { - resumeFrom: options?.resumeFrom, + spec: createOrUpdateOperationSpec + }); + const poller = await createHttpPoller< + BatchDeploymentsCreateOrUpdateResponse, + OperationState + >(lro, { + restoreFrom: options?.resumeFrom, intervalInMs: options?.updateIntervalInMs }); await poller.poll(); @@ -681,12 +691,6 @@ const listNextOperationSpec: coreClient.OperationSpec = { bodyMapper: Mappers.ErrorResponse } }, - queryParameters: [ - Parameters.apiVersion, - Parameters.skip, - Parameters.orderBy, - Parameters.top - ], urlParameters: [ Parameters.$host, Parameters.subscriptionId, diff --git a/sdk/machinelearning/arm-machinelearning/src/operations/batchEndpoints.ts b/sdk/machinelearning/arm-machinelearning/src/operations/batchEndpoints.ts index 6517735a2a32..d897c6d51f7e 100644 --- a/sdk/machinelearning/arm-machinelearning/src/operations/batchEndpoints.ts +++ b/sdk/machinelearning/arm-machinelearning/src/operations/batchEndpoints.ts @@ -13,8 +13,12 @@ import * as coreClient from "@azure/core-client"; import * as Mappers from "../models/mappers"; import * as Parameters from "../models/parameters"; import { AzureMachineLearningWorkspaces } from "../azureMachineLearningWorkspaces"; -import { PollerLike, PollOperationState, LroEngine } from "@azure/core-lro"; -import { LroImpl } from "../lroImpl"; +import { + SimplePollerLike, + OperationState, + createHttpPoller +} from "@azure/core-lro"; +import { createLroSpec } from "../lroImpl"; import { BatchEndpoint, BatchEndpointsListNextOptionalParams, @@ -151,14 +155,14 @@ export class BatchEndpointsImpl implements BatchEndpoints { workspaceName: string, endpointName: string, options?: BatchEndpointsDeleteOptionalParams - ): Promise, void>> { + ): Promise, void>> { const directSendOperation = async ( args: coreClient.OperationArguments, spec: coreClient.OperationSpec ): Promise => { return this.client.sendOperationRequest(args, spec); }; - const sendOperation = async ( + const sendOperationFn = async ( args: coreClient.OperationArguments, spec: coreClient.OperationSpec ) => { @@ -191,13 +195,13 @@ export class BatchEndpointsImpl implements BatchEndpoints { }; }; - const lro = new LroImpl( - sendOperation, - { resourceGroupName, workspaceName, endpointName, options }, - deleteOperationSpec - ); - const poller = new LroEngine(lro, { - resumeFrom: options?.resumeFrom, + const lro = createLroSpec({ + sendOperationFn, + args: { resourceGroupName, workspaceName, endpointName, options }, + spec: deleteOperationSpec + }); + const poller = await createHttpPoller>(lro, { + restoreFrom: options?.resumeFrom, intervalInMs: options?.updateIntervalInMs }); await poller.poll(); @@ -260,8 +264,8 @@ export class BatchEndpointsImpl implements BatchEndpoints { body: PartialMinimalTrackedResourceWithIdentity, options?: BatchEndpointsUpdateOptionalParams ): Promise< - PollerLike< - PollOperationState, + SimplePollerLike< + OperationState, BatchEndpointsUpdateResponse > > { @@ -271,7 +275,7 @@ export class BatchEndpointsImpl implements BatchEndpoints { ): Promise => { return this.client.sendOperationRequest(args, spec); }; - const sendOperation = async ( + const sendOperationFn = async ( args: coreClient.OperationArguments, spec: coreClient.OperationSpec ) => { @@ -304,13 +308,16 @@ export class BatchEndpointsImpl implements BatchEndpoints { }; }; - const lro = new LroImpl( - sendOperation, - { resourceGroupName, workspaceName, endpointName, body, options }, - updateOperationSpec - ); - const poller = new LroEngine(lro, { - resumeFrom: options?.resumeFrom, + const lro = createLroSpec({ + sendOperationFn, + args: { resourceGroupName, workspaceName, endpointName, body, options }, + spec: updateOperationSpec + }); + const poller = await createHttpPoller< + BatchEndpointsUpdateResponse, + OperationState + >(lro, { + restoreFrom: options?.resumeFrom, intervalInMs: options?.updateIntervalInMs }); await poller.poll(); @@ -357,8 +364,8 @@ export class BatchEndpointsImpl implements BatchEndpoints { body: BatchEndpoint, options?: BatchEndpointsCreateOrUpdateOptionalParams ): Promise< - PollerLike< - PollOperationState, + SimplePollerLike< + OperationState, BatchEndpointsCreateOrUpdateResponse > > { @@ -368,7 +375,7 @@ export class BatchEndpointsImpl implements BatchEndpoints { ): Promise => { return this.client.sendOperationRequest(args, spec); }; - const sendOperation = async ( + const sendOperationFn = async ( args: coreClient.OperationArguments, spec: coreClient.OperationSpec ) => { @@ -401,13 +408,16 @@ export class BatchEndpointsImpl implements BatchEndpoints { }; }; - const lro = new LroImpl( - sendOperation, - { resourceGroupName, workspaceName, endpointName, body, options }, - createOrUpdateOperationSpec - ); - const poller = new LroEngine(lro, { - resumeFrom: options?.resumeFrom, + const lro = createLroSpec({ + sendOperationFn, + args: { resourceGroupName, workspaceName, endpointName, body, options }, + spec: createOrUpdateOperationSpec + }); + const poller = await createHttpPoller< + BatchEndpointsCreateOrUpdateResponse, + OperationState + >(lro, { + restoreFrom: options?.resumeFrom, intervalInMs: options?.updateIntervalInMs }); await poller.poll(); @@ -651,7 +661,6 @@ const listNextOperationSpec: coreClient.OperationSpec = { bodyMapper: Mappers.ErrorResponse } }, - queryParameters: [Parameters.apiVersion, Parameters.skip, Parameters.count], urlParameters: [ Parameters.$host, Parameters.subscriptionId, diff --git a/sdk/machinelearning/arm-machinelearning/src/operations/codeContainers.ts b/sdk/machinelearning/arm-machinelearning/src/operations/codeContainers.ts index 67e964d179c1..a19e3f84f42c 100644 --- a/sdk/machinelearning/arm-machinelearning/src/operations/codeContainers.ts +++ b/sdk/machinelearning/arm-machinelearning/src/operations/codeContainers.ts @@ -319,7 +319,6 @@ const listNextOperationSpec: coreClient.OperationSpec = { bodyMapper: Mappers.ErrorResponse } }, - queryParameters: [Parameters.apiVersion, Parameters.skip], urlParameters: [ Parameters.$host, Parameters.subscriptionId, diff --git a/sdk/machinelearning/arm-machinelearning/src/operations/codeVersions.ts b/sdk/machinelearning/arm-machinelearning/src/operations/codeVersions.ts index aecb1bc79fd7..9062ec497d48 100644 --- a/sdk/machinelearning/arm-machinelearning/src/operations/codeVersions.ts +++ b/sdk/machinelearning/arm-machinelearning/src/operations/codeVersions.ts @@ -355,12 +355,6 @@ const listNextOperationSpec: coreClient.OperationSpec = { bodyMapper: Mappers.ErrorResponse } }, - queryParameters: [ - Parameters.apiVersion, - Parameters.skip, - Parameters.orderBy, - Parameters.top - ], urlParameters: [ Parameters.$host, Parameters.subscriptionId, diff --git a/sdk/machinelearning/arm-machinelearning/src/operations/componentContainers.ts b/sdk/machinelearning/arm-machinelearning/src/operations/componentContainers.ts index 26779c163b36..378155c47cb7 100644 --- a/sdk/machinelearning/arm-machinelearning/src/operations/componentContainers.ts +++ b/sdk/machinelearning/arm-machinelearning/src/operations/componentContainers.ts @@ -323,11 +323,6 @@ const listNextOperationSpec: coreClient.OperationSpec = { bodyMapper: Mappers.ErrorResponse } }, - queryParameters: [ - Parameters.apiVersion, - Parameters.skip, - Parameters.listViewType - ], urlParameters: [ Parameters.$host, Parameters.subscriptionId, diff --git a/sdk/machinelearning/arm-machinelearning/src/operations/componentVersions.ts b/sdk/machinelearning/arm-machinelearning/src/operations/componentVersions.ts index 4f84d94d01f1..521f5bc018b1 100644 --- a/sdk/machinelearning/arm-machinelearning/src/operations/componentVersions.ts +++ b/sdk/machinelearning/arm-machinelearning/src/operations/componentVersions.ts @@ -356,13 +356,6 @@ const listNextOperationSpec: coreClient.OperationSpec = { bodyMapper: Mappers.ErrorResponse } }, - queryParameters: [ - Parameters.apiVersion, - Parameters.skip, - Parameters.orderBy, - Parameters.top, - Parameters.listViewType - ], urlParameters: [ Parameters.$host, Parameters.subscriptionId, diff --git a/sdk/machinelearning/arm-machinelearning/src/operations/computeOperations.ts b/sdk/machinelearning/arm-machinelearning/src/operations/computeOperations.ts index 702e18d066aa..fdb46e8bce32 100644 --- a/sdk/machinelearning/arm-machinelearning/src/operations/computeOperations.ts +++ b/sdk/machinelearning/arm-machinelearning/src/operations/computeOperations.ts @@ -13,8 +13,12 @@ import * as coreClient from "@azure/core-client"; import * as Mappers from "../models/mappers"; import * as Parameters from "../models/parameters"; import { AzureMachineLearningWorkspaces } from "../azureMachineLearningWorkspaces"; -import { PollerLike, PollOperationState, LroEngine } from "@azure/core-lro"; -import { LroImpl } from "../lroImpl"; +import { + SimplePollerLike, + OperationState, + createHttpPoller +} from "@azure/core-lro"; +import { createLroSpec } from "../lroImpl"; import { ComputeResource, ComputeListNextOptionalParams, @@ -278,8 +282,8 @@ export class ComputeOperationsImpl implements ComputeOperations { parameters: ComputeResource, options?: ComputeCreateOrUpdateOptionalParams ): Promise< - PollerLike< - PollOperationState, + SimplePollerLike< + OperationState, ComputeCreateOrUpdateResponse > > { @@ -289,7 +293,7 @@ export class ComputeOperationsImpl implements ComputeOperations { ): Promise => { return this.client.sendOperationRequest(args, spec); }; - const sendOperation = async ( + const sendOperationFn = async ( args: coreClient.OperationArguments, spec: coreClient.OperationSpec ) => { @@ -322,13 +326,22 @@ export class ComputeOperationsImpl implements ComputeOperations { }; }; - const lro = new LroImpl( - sendOperation, - { resourceGroupName, workspaceName, computeName, parameters, options }, - createOrUpdateOperationSpec - ); - const poller = new LroEngine(lro, { - resumeFrom: options?.resumeFrom, + const lro = createLroSpec({ + sendOperationFn, + args: { + resourceGroupName, + workspaceName, + computeName, + parameters, + options + }, + spec: createOrUpdateOperationSpec + }); + const poller = await createHttpPoller< + ComputeCreateOrUpdateResponse, + OperationState + >(lro, { + restoreFrom: options?.resumeFrom, intervalInMs: options?.updateIntervalInMs }); await poller.poll(); @@ -378,7 +391,10 @@ export class ComputeOperationsImpl implements ComputeOperations { parameters: ClusterUpdateParameters, options?: ComputeUpdateOptionalParams ): Promise< - PollerLike, ComputeUpdateResponse> + SimplePollerLike< + OperationState, + ComputeUpdateResponse + > > { const directSendOperation = async ( args: coreClient.OperationArguments, @@ -386,7 +402,7 @@ export class ComputeOperationsImpl implements ComputeOperations { ): Promise => { return this.client.sendOperationRequest(args, spec); }; - const sendOperation = async ( + const sendOperationFn = async ( args: coreClient.OperationArguments, spec: coreClient.OperationSpec ) => { @@ -419,13 +435,22 @@ export class ComputeOperationsImpl implements ComputeOperations { }; }; - const lro = new LroImpl( - sendOperation, - { resourceGroupName, workspaceName, computeName, parameters, options }, - updateOperationSpec - ); - const poller = new LroEngine(lro, { - resumeFrom: options?.resumeFrom, + const lro = createLroSpec({ + sendOperationFn, + args: { + resourceGroupName, + workspaceName, + computeName, + parameters, + options + }, + spec: updateOperationSpec + }); + const poller = await createHttpPoller< + ComputeUpdateResponse, + OperationState + >(lro, { + restoreFrom: options?.resumeFrom, intervalInMs: options?.updateIntervalInMs }); await poller.poll(); @@ -473,14 +498,14 @@ export class ComputeOperationsImpl implements ComputeOperations { computeName: string, underlyingResourceAction: UnderlyingResourceAction, options?: ComputeDeleteOptionalParams - ): Promise, void>> { + ): Promise, void>> { const directSendOperation = async ( args: coreClient.OperationArguments, spec: coreClient.OperationSpec ): Promise => { return this.client.sendOperationRequest(args, spec); }; - const sendOperation = async ( + const sendOperationFn = async ( args: coreClient.OperationArguments, spec: coreClient.OperationSpec ) => { @@ -513,19 +538,19 @@ export class ComputeOperationsImpl implements ComputeOperations { }; }; - const lro = new LroImpl( - sendOperation, - { + const lro = createLroSpec({ + sendOperationFn, + args: { resourceGroupName, workspaceName, computeName, underlyingResourceAction, options }, - deleteOperationSpec - ); - const poller = new LroEngine(lro, { - resumeFrom: options?.resumeFrom, + spec: deleteOperationSpec + }); + const poller = await createHttpPoller>(lro, { + restoreFrom: options?.resumeFrom, intervalInMs: options?.updateIntervalInMs }); await poller.poll(); @@ -608,14 +633,14 @@ export class ComputeOperationsImpl implements ComputeOperations { workspaceName: string, computeName: string, options?: ComputeStartOptionalParams - ): Promise, void>> { + ): Promise, void>> { const directSendOperation = async ( args: coreClient.OperationArguments, spec: coreClient.OperationSpec ): Promise => { return this.client.sendOperationRequest(args, spec); }; - const sendOperation = async ( + const sendOperationFn = async ( args: coreClient.OperationArguments, spec: coreClient.OperationSpec ) => { @@ -648,13 +673,13 @@ export class ComputeOperationsImpl implements ComputeOperations { }; }; - const lro = new LroImpl( - sendOperation, - { resourceGroupName, workspaceName, computeName, options }, - startOperationSpec - ); - const poller = new LroEngine(lro, { - resumeFrom: options?.resumeFrom, + const lro = createLroSpec({ + sendOperationFn, + args: { resourceGroupName, workspaceName, computeName, options }, + spec: startOperationSpec + }); + const poller = await createHttpPoller>(lro, { + restoreFrom: options?.resumeFrom, intervalInMs: options?.updateIntervalInMs }); await poller.poll(); @@ -695,14 +720,14 @@ export class ComputeOperationsImpl implements ComputeOperations { workspaceName: string, computeName: string, options?: ComputeStopOptionalParams - ): Promise, void>> { + ): Promise, void>> { const directSendOperation = async ( args: coreClient.OperationArguments, spec: coreClient.OperationSpec ): Promise => { return this.client.sendOperationRequest(args, spec); }; - const sendOperation = async ( + const sendOperationFn = async ( args: coreClient.OperationArguments, spec: coreClient.OperationSpec ) => { @@ -735,13 +760,13 @@ export class ComputeOperationsImpl implements ComputeOperations { }; }; - const lro = new LroImpl( - sendOperation, - { resourceGroupName, workspaceName, computeName, options }, - stopOperationSpec - ); - const poller = new LroEngine(lro, { - resumeFrom: options?.resumeFrom, + const lro = createLroSpec({ + sendOperationFn, + args: { resourceGroupName, workspaceName, computeName, options }, + spec: stopOperationSpec + }); + const poller = await createHttpPoller>(lro, { + restoreFrom: options?.resumeFrom, intervalInMs: options?.updateIntervalInMs }); await poller.poll(); @@ -782,14 +807,14 @@ export class ComputeOperationsImpl implements ComputeOperations { workspaceName: string, computeName: string, options?: ComputeRestartOptionalParams - ): Promise, void>> { + ): Promise, void>> { const directSendOperation = async ( args: coreClient.OperationArguments, spec: coreClient.OperationSpec ): Promise => { return this.client.sendOperationRequest(args, spec); }; - const sendOperation = async ( + const sendOperationFn = async ( args: coreClient.OperationArguments, spec: coreClient.OperationSpec ) => { @@ -822,13 +847,13 @@ export class ComputeOperationsImpl implements ComputeOperations { }; }; - const lro = new LroImpl( - sendOperation, - { resourceGroupName, workspaceName, computeName, options }, - restartOperationSpec - ); - const poller = new LroEngine(lro, { - resumeFrom: options?.resumeFrom, + const lro = createLroSpec({ + sendOperationFn, + args: { resourceGroupName, workspaceName, computeName, options }, + spec: restartOperationSpec + }); + const poller = await createHttpPoller>(lro, { + restoreFrom: options?.resumeFrom, intervalInMs: options?.updateIntervalInMs }); await poller.poll(); @@ -1166,7 +1191,6 @@ const listNextOperationSpec: coreClient.OperationSpec = { bodyMapper: Mappers.ErrorResponse } }, - queryParameters: [Parameters.apiVersion, Parameters.skip], urlParameters: [ Parameters.$host, Parameters.subscriptionId, @@ -1188,7 +1212,6 @@ const listNodesNextOperationSpec: coreClient.OperationSpec = { bodyMapper: Mappers.ErrorResponse } }, - queryParameters: [Parameters.apiVersion], urlParameters: [ Parameters.$host, Parameters.subscriptionId, diff --git a/sdk/machinelearning/arm-machinelearning/src/operations/dataContainers.ts b/sdk/machinelearning/arm-machinelearning/src/operations/dataContainers.ts index 919fb4a2dcec..57c78f34fb88 100644 --- a/sdk/machinelearning/arm-machinelearning/src/operations/dataContainers.ts +++ b/sdk/machinelearning/arm-machinelearning/src/operations/dataContainers.ts @@ -323,11 +323,6 @@ const listNextOperationSpec: coreClient.OperationSpec = { bodyMapper: Mappers.ErrorResponse } }, - queryParameters: [ - Parameters.apiVersion, - Parameters.skip, - Parameters.listViewType - ], urlParameters: [ Parameters.$host, Parameters.subscriptionId, diff --git a/sdk/machinelearning/arm-machinelearning/src/operations/dataVersions.ts b/sdk/machinelearning/arm-machinelearning/src/operations/dataVersions.ts index 30559627d079..3f57aacdee9e 100644 --- a/sdk/machinelearning/arm-machinelearning/src/operations/dataVersions.ts +++ b/sdk/machinelearning/arm-machinelearning/src/operations/dataVersions.ts @@ -357,14 +357,6 @@ const listNextOperationSpec: coreClient.OperationSpec = { bodyMapper: Mappers.ErrorResponse } }, - queryParameters: [ - Parameters.apiVersion, - Parameters.skip, - Parameters.orderBy, - Parameters.top, - Parameters.listViewType, - Parameters.tags - ], urlParameters: [ Parameters.$host, Parameters.subscriptionId, diff --git a/sdk/machinelearning/arm-machinelearning/src/operations/datastores.ts b/sdk/machinelearning/arm-machinelearning/src/operations/datastores.ts index d7879f3d50ca..572a9d86aeab 100644 --- a/sdk/machinelearning/arm-machinelearning/src/operations/datastores.ts +++ b/sdk/machinelearning/arm-machinelearning/src/operations/datastores.ts @@ -372,16 +372,6 @@ const listNextOperationSpec: coreClient.OperationSpec = { bodyMapper: Mappers.ErrorResponse } }, - queryParameters: [ - Parameters.apiVersion, - Parameters.skip, - Parameters.count1, - Parameters.isDefault, - Parameters.names, - Parameters.searchText, - Parameters.orderBy1, - Parameters.orderByAsc - ], urlParameters: [ Parameters.$host, Parameters.subscriptionId, diff --git a/sdk/machinelearning/arm-machinelearning/src/operations/environmentContainers.ts b/sdk/machinelearning/arm-machinelearning/src/operations/environmentContainers.ts index 2dbf74f59490..e78e1038afee 100644 --- a/sdk/machinelearning/arm-machinelearning/src/operations/environmentContainers.ts +++ b/sdk/machinelearning/arm-machinelearning/src/operations/environmentContainers.ts @@ -323,11 +323,6 @@ const listNextOperationSpec: coreClient.OperationSpec = { bodyMapper: Mappers.ErrorResponse } }, - queryParameters: [ - Parameters.apiVersion, - Parameters.skip, - Parameters.listViewType - ], urlParameters: [ Parameters.$host, Parameters.subscriptionId, diff --git a/sdk/machinelearning/arm-machinelearning/src/operations/environmentVersions.ts b/sdk/machinelearning/arm-machinelearning/src/operations/environmentVersions.ts index eab18e455003..5dce32bdc7cf 100644 --- a/sdk/machinelearning/arm-machinelearning/src/operations/environmentVersions.ts +++ b/sdk/machinelearning/arm-machinelearning/src/operations/environmentVersions.ts @@ -356,13 +356,6 @@ const listNextOperationSpec: coreClient.OperationSpec = { bodyMapper: Mappers.ErrorResponse } }, - queryParameters: [ - Parameters.apiVersion, - Parameters.skip, - Parameters.orderBy, - Parameters.top, - Parameters.listViewType - ], urlParameters: [ Parameters.$host, Parameters.subscriptionId, diff --git a/sdk/machinelearning/arm-machinelearning/src/operations/jobs.ts b/sdk/machinelearning/arm-machinelearning/src/operations/jobs.ts index 36387941c513..ad0580f24bc8 100644 --- a/sdk/machinelearning/arm-machinelearning/src/operations/jobs.ts +++ b/sdk/machinelearning/arm-machinelearning/src/operations/jobs.ts @@ -13,8 +13,12 @@ import * as coreClient from "@azure/core-client"; import * as Mappers from "../models/mappers"; import * as Parameters from "../models/parameters"; import { AzureMachineLearningWorkspaces } from "../azureMachineLearningWorkspaces"; -import { PollerLike, PollOperationState, LroEngine } from "@azure/core-lro"; -import { LroImpl } from "../lroImpl"; +import { + SimplePollerLike, + OperationState, + createHttpPoller +} from "@azure/core-lro"; +import { createLroSpec } from "../lroImpl"; import { JobBase, JobsListNextOptionalParams, @@ -147,14 +151,14 @@ export class JobsImpl implements Jobs { workspaceName: string, id: string, options?: JobsDeleteOptionalParams - ): Promise, void>> { + ): Promise, void>> { const directSendOperation = async ( args: coreClient.OperationArguments, spec: coreClient.OperationSpec ): Promise => { return this.client.sendOperationRequest(args, spec); }; - const sendOperation = async ( + const sendOperationFn = async ( args: coreClient.OperationArguments, spec: coreClient.OperationSpec ) => { @@ -187,13 +191,13 @@ export class JobsImpl implements Jobs { }; }; - const lro = new LroImpl( - sendOperation, - { resourceGroupName, workspaceName, id, options }, - deleteOperationSpec - ); - const poller = new LroEngine(lro, { - resumeFrom: options?.resumeFrom, + const lro = createLroSpec({ + sendOperationFn, + args: { resourceGroupName, workspaceName, id, options }, + spec: deleteOperationSpec + }); + const poller = await createHttpPoller>(lro, { + restoreFrom: options?.resumeFrom, intervalInMs: options?.updateIntervalInMs }); await poller.poll(); @@ -274,14 +278,14 @@ export class JobsImpl implements Jobs { workspaceName: string, id: string, options?: JobsCancelOptionalParams - ): Promise, void>> { + ): Promise, void>> { const directSendOperation = async ( args: coreClient.OperationArguments, spec: coreClient.OperationSpec ): Promise => { return this.client.sendOperationRequest(args, spec); }; - const sendOperation = async ( + const sendOperationFn = async ( args: coreClient.OperationArguments, spec: coreClient.OperationSpec ) => { @@ -314,15 +318,15 @@ export class JobsImpl implements Jobs { }; }; - const lro = new LroImpl( - sendOperation, - { resourceGroupName, workspaceName, id, options }, - cancelOperationSpec - ); - const poller = new LroEngine(lro, { - resumeFrom: options?.resumeFrom, + const lro = createLroSpec({ + sendOperationFn, + args: { resourceGroupName, workspaceName, id, options }, + spec: cancelOperationSpec + }); + const poller = await createHttpPoller>(lro, { + restoreFrom: options?.resumeFrom, intervalInMs: options?.updateIntervalInMs, - lroResourceLocationConfig: "location" + resourceLocationConfig: "location" }); await poller.poll(); return poller; @@ -510,13 +514,6 @@ const listNextOperationSpec: coreClient.OperationSpec = { bodyMapper: Mappers.ErrorResponse } }, - queryParameters: [ - Parameters.apiVersion, - Parameters.skip, - Parameters.listViewType, - Parameters.jobType, - Parameters.tag - ], urlParameters: [ Parameters.$host, Parameters.subscriptionId, diff --git a/sdk/machinelearning/arm-machinelearning/src/operations/modelContainers.ts b/sdk/machinelearning/arm-machinelearning/src/operations/modelContainers.ts index 5500f5d4d643..9ddaaeea95f6 100644 --- a/sdk/machinelearning/arm-machinelearning/src/operations/modelContainers.ts +++ b/sdk/machinelearning/arm-machinelearning/src/operations/modelContainers.ts @@ -324,12 +324,6 @@ const listNextOperationSpec: coreClient.OperationSpec = { bodyMapper: Mappers.ErrorResponse } }, - queryParameters: [ - Parameters.apiVersion, - Parameters.skip, - Parameters.count, - Parameters.listViewType - ], urlParameters: [ Parameters.$host, Parameters.subscriptionId, diff --git a/sdk/machinelearning/arm-machinelearning/src/operations/modelVersions.ts b/sdk/machinelearning/arm-machinelearning/src/operations/modelVersions.ts index 966c9225da40..ffbd84ffcf63 100644 --- a/sdk/machinelearning/arm-machinelearning/src/operations/modelVersions.ts +++ b/sdk/machinelearning/arm-machinelearning/src/operations/modelVersions.ts @@ -362,19 +362,6 @@ const listNextOperationSpec: coreClient.OperationSpec = { bodyMapper: Mappers.ErrorResponse } }, - queryParameters: [ - Parameters.apiVersion, - Parameters.skip, - Parameters.orderBy, - Parameters.top, - Parameters.listViewType, - Parameters.version1, - Parameters.description, - Parameters.offset, - Parameters.tags1, - Parameters.properties1, - Parameters.feed - ], urlParameters: [ Parameters.$host, Parameters.subscriptionId, diff --git a/sdk/machinelearning/arm-machinelearning/src/operations/onlineDeployments.ts b/sdk/machinelearning/arm-machinelearning/src/operations/onlineDeployments.ts index 0d71a80f4298..6ec3ffa88419 100644 --- a/sdk/machinelearning/arm-machinelearning/src/operations/onlineDeployments.ts +++ b/sdk/machinelearning/arm-machinelearning/src/operations/onlineDeployments.ts @@ -13,8 +13,12 @@ import * as coreClient from "@azure/core-client"; import * as Mappers from "../models/mappers"; import * as Parameters from "../models/parameters"; import { AzureMachineLearningWorkspaces } from "../azureMachineLearningWorkspaces"; -import { PollerLike, PollOperationState, LroEngine } from "@azure/core-lro"; -import { LroImpl } from "../lroImpl"; +import { + SimplePollerLike, + OperationState, + createHttpPoller +} from "@azure/core-lro"; +import { createLroSpec } from "../lroImpl"; import { OnlineDeployment, OnlineDeploymentsListNextOptionalParams, @@ -280,14 +284,14 @@ export class OnlineDeploymentsImpl implements OnlineDeployments { endpointName: string, deploymentName: string, options?: OnlineDeploymentsDeleteOptionalParams - ): Promise, void>> { + ): Promise, void>> { const directSendOperation = async ( args: coreClient.OperationArguments, spec: coreClient.OperationSpec ): Promise => { return this.client.sendOperationRequest(args, spec); }; - const sendOperation = async ( + const sendOperationFn = async ( args: coreClient.OperationArguments, spec: coreClient.OperationSpec ) => { @@ -320,19 +324,19 @@ export class OnlineDeploymentsImpl implements OnlineDeployments { }; }; - const lro = new LroImpl( - sendOperation, - { + const lro = createLroSpec({ + sendOperationFn, + args: { resourceGroupName, workspaceName, endpointName, deploymentName, options }, - deleteOperationSpec - ); - const poller = new LroEngine(lro, { - resumeFrom: options?.resumeFrom, + spec: deleteOperationSpec + }); + const poller = await createHttpPoller>(lro, { + restoreFrom: options?.resumeFrom, intervalInMs: options?.updateIntervalInMs }); await poller.poll(); @@ -408,8 +412,8 @@ export class OnlineDeploymentsImpl implements OnlineDeployments { body: PartialMinimalTrackedResourceWithSku, options?: OnlineDeploymentsUpdateOptionalParams ): Promise< - PollerLike< - PollOperationState, + SimplePollerLike< + OperationState, OnlineDeploymentsUpdateResponse > > { @@ -419,7 +423,7 @@ export class OnlineDeploymentsImpl implements OnlineDeployments { ): Promise => { return this.client.sendOperationRequest(args, spec); }; - const sendOperation = async ( + const sendOperationFn = async ( args: coreClient.OperationArguments, spec: coreClient.OperationSpec ) => { @@ -452,9 +456,9 @@ export class OnlineDeploymentsImpl implements OnlineDeployments { }; }; - const lro = new LroImpl( - sendOperation, - { + const lro = createLroSpec({ + sendOperationFn, + args: { resourceGroupName, workspaceName, endpointName, @@ -462,10 +466,13 @@ export class OnlineDeploymentsImpl implements OnlineDeployments { body, options }, - updateOperationSpec - ); - const poller = new LroEngine(lro, { - resumeFrom: options?.resumeFrom, + spec: updateOperationSpec + }); + const poller = await createHttpPoller< + OnlineDeploymentsUpdateResponse, + OperationState + >(lro, { + restoreFrom: options?.resumeFrom, intervalInMs: options?.updateIntervalInMs }); await poller.poll(); @@ -517,8 +524,8 @@ export class OnlineDeploymentsImpl implements OnlineDeployments { body: OnlineDeployment, options?: OnlineDeploymentsCreateOrUpdateOptionalParams ): Promise< - PollerLike< - PollOperationState, + SimplePollerLike< + OperationState, OnlineDeploymentsCreateOrUpdateResponse > > { @@ -528,7 +535,7 @@ export class OnlineDeploymentsImpl implements OnlineDeployments { ): Promise => { return this.client.sendOperationRequest(args, spec); }; - const sendOperation = async ( + const sendOperationFn = async ( args: coreClient.OperationArguments, spec: coreClient.OperationSpec ) => { @@ -561,9 +568,9 @@ export class OnlineDeploymentsImpl implements OnlineDeployments { }; }; - const lro = new LroImpl( - sendOperation, - { + const lro = createLroSpec({ + sendOperationFn, + args: { resourceGroupName, workspaceName, endpointName, @@ -571,10 +578,13 @@ export class OnlineDeploymentsImpl implements OnlineDeployments { body, options }, - createOrUpdateOperationSpec - ); - const poller = new LroEngine(lro, { - resumeFrom: options?.resumeFrom, + spec: createOrUpdateOperationSpec + }); + const poller = await createHttpPoller< + OnlineDeploymentsCreateOrUpdateResponse, + OperationState + >(lro, { + restoreFrom: options?.resumeFrom, intervalInMs: options?.updateIntervalInMs }); await poller.poll(); @@ -928,12 +938,6 @@ const listNextOperationSpec: coreClient.OperationSpec = { bodyMapper: Mappers.ErrorResponse } }, - queryParameters: [ - Parameters.apiVersion, - Parameters.skip, - Parameters.orderBy, - Parameters.top - ], urlParameters: [ Parameters.$host, Parameters.subscriptionId, @@ -956,7 +960,6 @@ const listSkusNextOperationSpec: coreClient.OperationSpec = { bodyMapper: Mappers.ErrorResponse } }, - queryParameters: [Parameters.apiVersion, Parameters.skip, Parameters.count], urlParameters: [ Parameters.$host, Parameters.subscriptionId, diff --git a/sdk/machinelearning/arm-machinelearning/src/operations/onlineEndpoints.ts b/sdk/machinelearning/arm-machinelearning/src/operations/onlineEndpoints.ts index ec5c78271803..88b1439152c8 100644 --- a/sdk/machinelearning/arm-machinelearning/src/operations/onlineEndpoints.ts +++ b/sdk/machinelearning/arm-machinelearning/src/operations/onlineEndpoints.ts @@ -13,8 +13,12 @@ import * as coreClient from "@azure/core-client"; import * as Mappers from "../models/mappers"; import * as Parameters from "../models/parameters"; import { AzureMachineLearningWorkspaces } from "../azureMachineLearningWorkspaces"; -import { PollerLike, PollOperationState, LroEngine } from "@azure/core-lro"; -import { LroImpl } from "../lroImpl"; +import { + SimplePollerLike, + OperationState, + createHttpPoller +} from "@azure/core-lro"; +import { createLroSpec } from "../lroImpl"; import { OnlineEndpoint, OnlineEndpointsListNextOptionalParams, @@ -155,14 +159,14 @@ export class OnlineEndpointsImpl implements OnlineEndpoints { workspaceName: string, endpointName: string, options?: OnlineEndpointsDeleteOptionalParams - ): Promise, void>> { + ): Promise, void>> { const directSendOperation = async ( args: coreClient.OperationArguments, spec: coreClient.OperationSpec ): Promise => { return this.client.sendOperationRequest(args, spec); }; - const sendOperation = async ( + const sendOperationFn = async ( args: coreClient.OperationArguments, spec: coreClient.OperationSpec ) => { @@ -195,13 +199,13 @@ export class OnlineEndpointsImpl implements OnlineEndpoints { }; }; - const lro = new LroImpl( - sendOperation, - { resourceGroupName, workspaceName, endpointName, options }, - deleteOperationSpec - ); - const poller = new LroEngine(lro, { - resumeFrom: options?.resumeFrom, + const lro = createLroSpec({ + sendOperationFn, + args: { resourceGroupName, workspaceName, endpointName, options }, + spec: deleteOperationSpec + }); + const poller = await createHttpPoller>(lro, { + restoreFrom: options?.resumeFrom, intervalInMs: options?.updateIntervalInMs }); await poller.poll(); @@ -264,8 +268,8 @@ export class OnlineEndpointsImpl implements OnlineEndpoints { body: PartialMinimalTrackedResourceWithIdentity, options?: OnlineEndpointsUpdateOptionalParams ): Promise< - PollerLike< - PollOperationState, + SimplePollerLike< + OperationState, OnlineEndpointsUpdateResponse > > { @@ -275,7 +279,7 @@ export class OnlineEndpointsImpl implements OnlineEndpoints { ): Promise => { return this.client.sendOperationRequest(args, spec); }; - const sendOperation = async ( + const sendOperationFn = async ( args: coreClient.OperationArguments, spec: coreClient.OperationSpec ) => { @@ -308,13 +312,16 @@ export class OnlineEndpointsImpl implements OnlineEndpoints { }; }; - const lro = new LroImpl( - sendOperation, - { resourceGroupName, workspaceName, endpointName, body, options }, - updateOperationSpec - ); - const poller = new LroEngine(lro, { - resumeFrom: options?.resumeFrom, + const lro = createLroSpec({ + sendOperationFn, + args: { resourceGroupName, workspaceName, endpointName, body, options }, + spec: updateOperationSpec + }); + const poller = await createHttpPoller< + OnlineEndpointsUpdateResponse, + OperationState + >(lro, { + restoreFrom: options?.resumeFrom, intervalInMs: options?.updateIntervalInMs }); await poller.poll(); @@ -361,8 +368,8 @@ export class OnlineEndpointsImpl implements OnlineEndpoints { body: OnlineEndpoint, options?: OnlineEndpointsCreateOrUpdateOptionalParams ): Promise< - PollerLike< - PollOperationState, + SimplePollerLike< + OperationState, OnlineEndpointsCreateOrUpdateResponse > > { @@ -372,7 +379,7 @@ export class OnlineEndpointsImpl implements OnlineEndpoints { ): Promise => { return this.client.sendOperationRequest(args, spec); }; - const sendOperation = async ( + const sendOperationFn = async ( args: coreClient.OperationArguments, spec: coreClient.OperationSpec ) => { @@ -405,13 +412,16 @@ export class OnlineEndpointsImpl implements OnlineEndpoints { }; }; - const lro = new LroImpl( - sendOperation, - { resourceGroupName, workspaceName, endpointName, body, options }, - createOrUpdateOperationSpec - ); - const poller = new LroEngine(lro, { - resumeFrom: options?.resumeFrom, + const lro = createLroSpec({ + sendOperationFn, + args: { resourceGroupName, workspaceName, endpointName, body, options }, + spec: createOrUpdateOperationSpec + }); + const poller = await createHttpPoller< + OnlineEndpointsCreateOrUpdateResponse, + OperationState + >(lro, { + restoreFrom: options?.resumeFrom, intervalInMs: options?.updateIntervalInMs }); await poller.poll(); @@ -476,14 +486,14 @@ export class OnlineEndpointsImpl implements OnlineEndpoints { endpointName: string, body: RegenerateEndpointKeysRequest, options?: OnlineEndpointsRegenerateKeysOptionalParams - ): Promise, void>> { + ): Promise, void>> { const directSendOperation = async ( args: coreClient.OperationArguments, spec: coreClient.OperationSpec ): Promise => { return this.client.sendOperationRequest(args, spec); }; - const sendOperation = async ( + const sendOperationFn = async ( args: coreClient.OperationArguments, spec: coreClient.OperationSpec ) => { @@ -516,15 +526,15 @@ export class OnlineEndpointsImpl implements OnlineEndpoints { }; }; - const lro = new LroImpl( - sendOperation, - { resourceGroupName, workspaceName, endpointName, body, options }, - regenerateKeysOperationSpec - ); - const poller = new LroEngine(lro, { - resumeFrom: options?.resumeFrom, + const lro = createLroSpec({ + sendOperationFn, + args: { resourceGroupName, workspaceName, endpointName, body, options }, + spec: regenerateKeysOperationSpec + }); + const poller = await createHttpPoller>(lro, { + restoreFrom: options?.resumeFrom, intervalInMs: options?.updateIntervalInMs, - lroResourceLocationConfig: "location" + resourceLocationConfig: "location" }); await poller.poll(); return poller; @@ -825,16 +835,6 @@ const listNextOperationSpec: coreClient.OperationSpec = { bodyMapper: Mappers.ErrorResponse } }, - queryParameters: [ - Parameters.apiVersion, - Parameters.skip, - Parameters.count, - Parameters.tags1, - Parameters.properties1, - Parameters.name2, - Parameters.computeType, - Parameters.orderBy2 - ], urlParameters: [ Parameters.$host, Parameters.subscriptionId, diff --git a/sdk/machinelearning/arm-machinelearning/src/operations/quotas.ts b/sdk/machinelearning/arm-machinelearning/src/operations/quotas.ts index 8ba2d40e0eeb..2f4a88858241 100644 --- a/sdk/machinelearning/arm-machinelearning/src/operations/quotas.ts +++ b/sdk/machinelearning/arm-machinelearning/src/operations/quotas.ts @@ -202,7 +202,6 @@ const listNextOperationSpec: coreClient.OperationSpec = { bodyMapper: Mappers.ErrorResponse } }, - queryParameters: [Parameters.apiVersion], urlParameters: [ Parameters.$host, Parameters.subscriptionId, diff --git a/sdk/machinelearning/arm-machinelearning/src/operations/schedules.ts b/sdk/machinelearning/arm-machinelearning/src/operations/schedules.ts index e50c9ecb7227..d7702aead816 100644 --- a/sdk/machinelearning/arm-machinelearning/src/operations/schedules.ts +++ b/sdk/machinelearning/arm-machinelearning/src/operations/schedules.ts @@ -13,8 +13,12 @@ import * as coreClient from "@azure/core-client"; import * as Mappers from "../models/mappers"; import * as Parameters from "../models/parameters"; import { AzureMachineLearningWorkspaces } from "../azureMachineLearningWorkspaces"; -import { PollerLike, PollOperationState, LroEngine } from "@azure/core-lro"; -import { LroImpl } from "../lroImpl"; +import { + SimplePollerLike, + OperationState, + createHttpPoller +} from "@azure/core-lro"; +import { createLroSpec } from "../lroImpl"; import { Schedule, SchedulesListNextOptionalParams, @@ -146,14 +150,14 @@ export class SchedulesImpl implements Schedules { workspaceName: string, name: string, options?: SchedulesDeleteOptionalParams - ): Promise, void>> { + ): Promise, void>> { const directSendOperation = async ( args: coreClient.OperationArguments, spec: coreClient.OperationSpec ): Promise => { return this.client.sendOperationRequest(args, spec); }; - const sendOperation = async ( + const sendOperationFn = async ( args: coreClient.OperationArguments, spec: coreClient.OperationSpec ) => { @@ -186,13 +190,13 @@ export class SchedulesImpl implements Schedules { }; }; - const lro = new LroImpl( - sendOperation, - { resourceGroupName, workspaceName, name, options }, - deleteOperationSpec - ); - const poller = new LroEngine(lro, { - resumeFrom: options?.resumeFrom, + const lro = createLroSpec({ + sendOperationFn, + args: { resourceGroupName, workspaceName, name, options }, + spec: deleteOperationSpec + }); + const poller = await createHttpPoller>(lro, { + restoreFrom: options?.resumeFrom, intervalInMs: options?.updateIntervalInMs }); await poller.poll(); @@ -255,8 +259,8 @@ export class SchedulesImpl implements Schedules { body: Schedule, options?: SchedulesCreateOrUpdateOptionalParams ): Promise< - PollerLike< - PollOperationState, + SimplePollerLike< + OperationState, SchedulesCreateOrUpdateResponse > > { @@ -266,7 +270,7 @@ export class SchedulesImpl implements Schedules { ): Promise => { return this.client.sendOperationRequest(args, spec); }; - const sendOperation = async ( + const sendOperationFn = async ( args: coreClient.OperationArguments, spec: coreClient.OperationSpec ) => { @@ -299,13 +303,16 @@ export class SchedulesImpl implements Schedules { }; }; - const lro = new LroImpl( - sendOperation, - { resourceGroupName, workspaceName, name, body, options }, - createOrUpdateOperationSpec - ); - const poller = new LroEngine(lro, { - resumeFrom: options?.resumeFrom, + const lro = createLroSpec({ + sendOperationFn, + args: { resourceGroupName, workspaceName, name, body, options }, + spec: createOrUpdateOperationSpec + }); + const poller = await createHttpPoller< + SchedulesCreateOrUpdateResponse, + OperationState + >(lro, { + restoreFrom: options?.resumeFrom, intervalInMs: options?.updateIntervalInMs }); await poller.poll(); @@ -477,11 +484,6 @@ const listNextOperationSpec: coreClient.OperationSpec = { bodyMapper: Mappers.ErrorResponse } }, - queryParameters: [ - Parameters.apiVersion, - Parameters.skip, - Parameters.listViewType1 - ], urlParameters: [ Parameters.$host, Parameters.subscriptionId, diff --git a/sdk/machinelearning/arm-machinelearning/src/operations/usages.ts b/sdk/machinelearning/arm-machinelearning/src/operations/usages.ts index d3abf9d81047..f596cd1e87cf 100644 --- a/sdk/machinelearning/arm-machinelearning/src/operations/usages.ts +++ b/sdk/machinelearning/arm-machinelearning/src/operations/usages.ts @@ -161,7 +161,6 @@ const listNextOperationSpec: coreClient.OperationSpec = { bodyMapper: Mappers.ErrorResponse } }, - queryParameters: [Parameters.apiVersion], urlParameters: [ Parameters.$host, Parameters.subscriptionId, diff --git a/sdk/machinelearning/arm-machinelearning/src/operations/workspaceConnections.ts b/sdk/machinelearning/arm-machinelearning/src/operations/workspaceConnections.ts index ec30dfa77d23..8c4ad0eaf719 100644 --- a/sdk/machinelearning/arm-machinelearning/src/operations/workspaceConnections.ts +++ b/sdk/machinelearning/arm-machinelearning/src/operations/workspaceConnections.ts @@ -317,11 +317,6 @@ const listNextOperationSpec: coreClient.OperationSpec = { bodyMapper: Mappers.ErrorResponse } }, - queryParameters: [ - Parameters.apiVersion, - Parameters.target, - Parameters.category - ], urlParameters: [ Parameters.$host, Parameters.subscriptionId, diff --git a/sdk/machinelearning/arm-machinelearning/src/operations/workspaceFeatures.ts b/sdk/machinelearning/arm-machinelearning/src/operations/workspaceFeatures.ts index 2dfb2a4b8794..750ef26e7ae8 100644 --- a/sdk/machinelearning/arm-machinelearning/src/operations/workspaceFeatures.ts +++ b/sdk/machinelearning/arm-machinelearning/src/operations/workspaceFeatures.ts @@ -182,7 +182,6 @@ const listNextOperationSpec: coreClient.OperationSpec = { bodyMapper: Mappers.ErrorResponse } }, - queryParameters: [Parameters.apiVersion], urlParameters: [ Parameters.$host, Parameters.subscriptionId, diff --git a/sdk/machinelearning/arm-machinelearning/src/operations/workspaces.ts b/sdk/machinelearning/arm-machinelearning/src/operations/workspaces.ts index c9cbd5890ede..2a8271fa593d 100644 --- a/sdk/machinelearning/arm-machinelearning/src/operations/workspaces.ts +++ b/sdk/machinelearning/arm-machinelearning/src/operations/workspaces.ts @@ -13,8 +13,12 @@ import * as coreClient from "@azure/core-client"; import * as Mappers from "../models/mappers"; import * as Parameters from "../models/parameters"; import { AzureMachineLearningWorkspaces } from "../azureMachineLearningWorkspaces"; -import { PollerLike, PollOperationState, LroEngine } from "@azure/core-lro"; -import { LroImpl } from "../lroImpl"; +import { + SimplePollerLike, + OperationState, + createHttpPoller +} from "@azure/core-lro"; +import { createLroSpec } from "../lroImpl"; import { Workspace, WorkspacesListByResourceGroupNextOptionalParams, @@ -216,8 +220,8 @@ export class WorkspacesImpl implements Workspaces { parameters: Workspace, options?: WorkspacesCreateOrUpdateOptionalParams ): Promise< - PollerLike< - PollOperationState, + SimplePollerLike< + OperationState, WorkspacesCreateOrUpdateResponse > > { @@ -227,7 +231,7 @@ export class WorkspacesImpl implements Workspaces { ): Promise => { return this.client.sendOperationRequest(args, spec); }; - const sendOperation = async ( + const sendOperationFn = async ( args: coreClient.OperationArguments, spec: coreClient.OperationSpec ) => { @@ -260,13 +264,16 @@ export class WorkspacesImpl implements Workspaces { }; }; - const lro = new LroImpl( - sendOperation, - { resourceGroupName, workspaceName, parameters, options }, - createOrUpdateOperationSpec - ); - const poller = new LroEngine(lro, { - resumeFrom: options?.resumeFrom, + const lro = createLroSpec({ + sendOperationFn, + args: { resourceGroupName, workspaceName, parameters, options }, + spec: createOrUpdateOperationSpec + }); + const poller = await createHttpPoller< + WorkspacesCreateOrUpdateResponse, + OperationState + >(lro, { + restoreFrom: options?.resumeFrom, intervalInMs: options?.updateIntervalInMs }); await poller.poll(); @@ -305,14 +312,14 @@ export class WorkspacesImpl implements Workspaces { resourceGroupName: string, workspaceName: string, options?: WorkspacesDeleteOptionalParams - ): Promise, void>> { + ): Promise, void>> { const directSendOperation = async ( args: coreClient.OperationArguments, spec: coreClient.OperationSpec ): Promise => { return this.client.sendOperationRequest(args, spec); }; - const sendOperation = async ( + const sendOperationFn = async ( args: coreClient.OperationArguments, spec: coreClient.OperationSpec ) => { @@ -345,13 +352,13 @@ export class WorkspacesImpl implements Workspaces { }; }; - const lro = new LroImpl( - sendOperation, - { resourceGroupName, workspaceName, options }, - deleteOperationSpec - ); - const poller = new LroEngine(lro, { - resumeFrom: options?.resumeFrom, + const lro = createLroSpec({ + sendOperationFn, + args: { resourceGroupName, workspaceName, options }, + spec: deleteOperationSpec + }); + const poller = await createHttpPoller>(lro, { + restoreFrom: options?.resumeFrom, intervalInMs: options?.updateIntervalInMs }); await poller.poll(); @@ -390,8 +397,8 @@ export class WorkspacesImpl implements Workspaces { parameters: WorkspaceUpdateParameters, options?: WorkspacesUpdateOptionalParams ): Promise< - PollerLike< - PollOperationState, + SimplePollerLike< + OperationState, WorkspacesUpdateResponse > > { @@ -401,7 +408,7 @@ export class WorkspacesImpl implements Workspaces { ): Promise => { return this.client.sendOperationRequest(args, spec); }; - const sendOperation = async ( + const sendOperationFn = async ( args: coreClient.OperationArguments, spec: coreClient.OperationSpec ) => { @@ -434,13 +441,16 @@ export class WorkspacesImpl implements Workspaces { }; }; - const lro = new LroImpl( - sendOperation, - { resourceGroupName, workspaceName, parameters, options }, - updateOperationSpec - ); - const poller = new LroEngine(lro, { - resumeFrom: options?.resumeFrom, + const lro = createLroSpec({ + sendOperationFn, + args: { resourceGroupName, workspaceName, parameters, options }, + spec: updateOperationSpec + }); + const poller = await createHttpPoller< + WorkspacesUpdateResponse, + OperationState + >(lro, { + restoreFrom: options?.resumeFrom, intervalInMs: options?.updateIntervalInMs }); await poller.poll(); @@ -495,8 +505,8 @@ export class WorkspacesImpl implements Workspaces { workspaceName: string, options?: WorkspacesDiagnoseOptionalParams ): Promise< - PollerLike< - PollOperationState, + SimplePollerLike< + OperationState, WorkspacesDiagnoseResponse > > { @@ -506,7 +516,7 @@ export class WorkspacesImpl implements Workspaces { ): Promise => { return this.client.sendOperationRequest(args, spec); }; - const sendOperation = async ( + const sendOperationFn = async ( args: coreClient.OperationArguments, spec: coreClient.OperationSpec ) => { @@ -539,15 +549,18 @@ export class WorkspacesImpl implements Workspaces { }; }; - const lro = new LroImpl( - sendOperation, - { resourceGroupName, workspaceName, options }, - diagnoseOperationSpec - ); - const poller = new LroEngine(lro, { - resumeFrom: options?.resumeFrom, + const lro = createLroSpec({ + sendOperationFn, + args: { resourceGroupName, workspaceName, options }, + spec: diagnoseOperationSpec + }); + const poller = await createHttpPoller< + WorkspacesDiagnoseResponse, + OperationState + >(lro, { + restoreFrom: options?.resumeFrom, intervalInMs: options?.updateIntervalInMs, - lroResourceLocationConfig: "location" + resourceLocationConfig: "location" }); await poller.poll(); return poller; @@ -601,14 +614,14 @@ export class WorkspacesImpl implements Workspaces { resourceGroupName: string, workspaceName: string, options?: WorkspacesResyncKeysOptionalParams - ): Promise, void>> { + ): Promise, void>> { const directSendOperation = async ( args: coreClient.OperationArguments, spec: coreClient.OperationSpec ): Promise => { return this.client.sendOperationRequest(args, spec); }; - const sendOperation = async ( + const sendOperationFn = async ( args: coreClient.OperationArguments, spec: coreClient.OperationSpec ) => { @@ -641,13 +654,13 @@ export class WorkspacesImpl implements Workspaces { }; }; - const lro = new LroImpl( - sendOperation, - { resourceGroupName, workspaceName, options }, - resyncKeysOperationSpec - ); - const poller = new LroEngine(lro, { - resumeFrom: options?.resumeFrom, + const lro = createLroSpec({ + sendOperationFn, + args: { resourceGroupName, workspaceName, options }, + spec: resyncKeysOperationSpec + }); + const poller = await createHttpPoller>(lro, { + restoreFrom: options?.resumeFrom, intervalInMs: options?.updateIntervalInMs }); await poller.poll(); @@ -715,8 +728,8 @@ export class WorkspacesImpl implements Workspaces { workspaceName: string, options?: WorkspacesPrepareNotebookOptionalParams ): Promise< - PollerLike< - PollOperationState, + SimplePollerLike< + OperationState, WorkspacesPrepareNotebookResponse > > { @@ -726,7 +739,7 @@ export class WorkspacesImpl implements Workspaces { ): Promise => { return this.client.sendOperationRequest(args, spec); }; - const sendOperation = async ( + const sendOperationFn = async ( args: coreClient.OperationArguments, spec: coreClient.OperationSpec ) => { @@ -759,15 +772,18 @@ export class WorkspacesImpl implements Workspaces { }; }; - const lro = new LroImpl( - sendOperation, - { resourceGroupName, workspaceName, options }, - prepareNotebookOperationSpec - ); - const poller = new LroEngine(lro, { - resumeFrom: options?.resumeFrom, + const lro = createLroSpec({ + sendOperationFn, + args: { resourceGroupName, workspaceName, options }, + spec: prepareNotebookOperationSpec + }); + const poller = await createHttpPoller< + WorkspacesPrepareNotebookResponse, + OperationState + >(lro, { + restoreFrom: options?.resumeFrom, intervalInMs: options?.updateIntervalInMs, - lroResourceLocationConfig: "location" + resourceLocationConfig: "location" }); await poller.poll(); return poller; @@ -1236,7 +1252,6 @@ const listByResourceGroupNextOperationSpec: coreClient.OperationSpec = { bodyMapper: Mappers.ErrorResponse } }, - queryParameters: [Parameters.apiVersion, Parameters.skip], urlParameters: [ Parameters.$host, Parameters.subscriptionId, @@ -1257,7 +1272,6 @@ const listBySubscriptionNextOperationSpec: coreClient.OperationSpec = { bodyMapper: Mappers.ErrorResponse } }, - queryParameters: [Parameters.apiVersion, Parameters.skip], urlParameters: [ Parameters.$host, Parameters.subscriptionId, diff --git a/sdk/machinelearning/arm-machinelearning/src/operationsInterfaces/batchDeployments.ts b/sdk/machinelearning/arm-machinelearning/src/operationsInterfaces/batchDeployments.ts index 751f730b1a54..0decb41295c6 100644 --- a/sdk/machinelearning/arm-machinelearning/src/operationsInterfaces/batchDeployments.ts +++ b/sdk/machinelearning/arm-machinelearning/src/operationsInterfaces/batchDeployments.ts @@ -7,7 +7,7 @@ */ import { PagedAsyncIterableIterator } from "@azure/core-paging"; -import { PollerLike, PollOperationState } from "@azure/core-lro"; +import { SimplePollerLike, OperationState } from "@azure/core-lro"; import { BatchDeployment, BatchDeploymentsListOptionalParams, @@ -51,7 +51,7 @@ export interface BatchDeployments { endpointName: string, deploymentName: string, options?: BatchDeploymentsDeleteOptionalParams - ): Promise, void>>; + ): Promise, void>>; /** * Delete Batch Inference deployment (asynchronous). * @param resourceGroupName The name of the resource group. The name is case insensitive. @@ -99,8 +99,8 @@ export interface BatchDeployments { body: PartialBatchDeploymentPartialMinimalTrackedResourceWithProperties, options?: BatchDeploymentsUpdateOptionalParams ): Promise< - PollerLike< - PollOperationState, + SimplePollerLike< + OperationState, BatchDeploymentsUpdateResponse > >; @@ -138,8 +138,8 @@ export interface BatchDeployments { body: BatchDeployment, options?: BatchDeploymentsCreateOrUpdateOptionalParams ): Promise< - PollerLike< - PollOperationState, + SimplePollerLike< + OperationState, BatchDeploymentsCreateOrUpdateResponse > >; diff --git a/sdk/machinelearning/arm-machinelearning/src/operationsInterfaces/batchEndpoints.ts b/sdk/machinelearning/arm-machinelearning/src/operationsInterfaces/batchEndpoints.ts index 6b64fdacf732..a1f9d8279a85 100644 --- a/sdk/machinelearning/arm-machinelearning/src/operationsInterfaces/batchEndpoints.ts +++ b/sdk/machinelearning/arm-machinelearning/src/operationsInterfaces/batchEndpoints.ts @@ -7,7 +7,7 @@ */ import { PagedAsyncIterableIterator } from "@azure/core-paging"; -import { PollerLike, PollOperationState } from "@azure/core-lro"; +import { SimplePollerLike, OperationState } from "@azure/core-lro"; import { BatchEndpoint, BatchEndpointsListOptionalParams, @@ -49,7 +49,7 @@ export interface BatchEndpoints { workspaceName: string, endpointName: string, options?: BatchEndpointsDeleteOptionalParams - ): Promise, void>>; + ): Promise, void>>; /** * Delete Batch Inference Endpoint (asynchronous). * @param resourceGroupName The name of the resource group. The name is case insensitive. @@ -91,8 +91,8 @@ export interface BatchEndpoints { body: PartialMinimalTrackedResourceWithIdentity, options?: BatchEndpointsUpdateOptionalParams ): Promise< - PollerLike< - PollOperationState, + SimplePollerLike< + OperationState, BatchEndpointsUpdateResponse > >; @@ -126,8 +126,8 @@ export interface BatchEndpoints { body: BatchEndpoint, options?: BatchEndpointsCreateOrUpdateOptionalParams ): Promise< - PollerLike< - PollOperationState, + SimplePollerLike< + OperationState, BatchEndpointsCreateOrUpdateResponse > >; diff --git a/sdk/machinelearning/arm-machinelearning/src/operationsInterfaces/computeOperations.ts b/sdk/machinelearning/arm-machinelearning/src/operationsInterfaces/computeOperations.ts index 630c4eee8be1..42466732385c 100644 --- a/sdk/machinelearning/arm-machinelearning/src/operationsInterfaces/computeOperations.ts +++ b/sdk/machinelearning/arm-machinelearning/src/operationsInterfaces/computeOperations.ts @@ -7,7 +7,7 @@ */ import { PagedAsyncIterableIterator } from "@azure/core-paging"; -import { PollerLike, PollOperationState } from "@azure/core-lro"; +import { SimplePollerLike, OperationState } from "@azure/core-lro"; import { ComputeResource, ComputeListOptionalParams, @@ -87,8 +87,8 @@ export interface ComputeOperations { parameters: ComputeResource, options?: ComputeCreateOrUpdateOptionalParams ): Promise< - PollerLike< - PollOperationState, + SimplePollerLike< + OperationState, ComputeCreateOrUpdateResponse > >; @@ -125,7 +125,10 @@ export interface ComputeOperations { parameters: ClusterUpdateParameters, options?: ComputeUpdateOptionalParams ): Promise< - PollerLike, ComputeUpdateResponse> + SimplePollerLike< + OperationState, + ComputeUpdateResponse + > >; /** * Updates properties of a compute. This call will overwrite a compute if it exists. This is a @@ -158,7 +161,7 @@ export interface ComputeOperations { computeName: string, underlyingResourceAction: UnderlyingResourceAction, options?: ComputeDeleteOptionalParams - ): Promise, void>>; + ): Promise, void>>; /** * Deletes specified Machine Learning compute. * @param resourceGroupName The name of the resource group. The name is case insensitive. @@ -200,7 +203,7 @@ export interface ComputeOperations { workspaceName: string, computeName: string, options?: ComputeStartOptionalParams - ): Promise, void>>; + ): Promise, void>>; /** * Posts a start action to a compute instance * @param resourceGroupName The name of the resource group. The name is case insensitive. @@ -226,7 +229,7 @@ export interface ComputeOperations { workspaceName: string, computeName: string, options?: ComputeStopOptionalParams - ): Promise, void>>; + ): Promise, void>>; /** * Posts a stop action to a compute instance * @param resourceGroupName The name of the resource group. The name is case insensitive. @@ -252,7 +255,7 @@ export interface ComputeOperations { workspaceName: string, computeName: string, options?: ComputeRestartOptionalParams - ): Promise, void>>; + ): Promise, void>>; /** * Posts a restart action to a compute instance * @param resourceGroupName The name of the resource group. The name is case insensitive. diff --git a/sdk/machinelearning/arm-machinelearning/src/operationsInterfaces/jobs.ts b/sdk/machinelearning/arm-machinelearning/src/operationsInterfaces/jobs.ts index f86e352d466f..9ced2c7ca511 100644 --- a/sdk/machinelearning/arm-machinelearning/src/operationsInterfaces/jobs.ts +++ b/sdk/machinelearning/arm-machinelearning/src/operationsInterfaces/jobs.ts @@ -7,7 +7,7 @@ */ import { PagedAsyncIterableIterator } from "@azure/core-paging"; -import { PollerLike, PollOperationState } from "@azure/core-lro"; +import { SimplePollerLike, OperationState } from "@azure/core-lro"; import { JobBase, JobsListOptionalParams, @@ -45,7 +45,7 @@ export interface Jobs { workspaceName: string, id: string, options?: JobsDeleteOptionalParams - ): Promise, void>>; + ): Promise, void>>; /** * Deletes a Job (asynchronous). * @param resourceGroupName The name of the resource group. The name is case insensitive. @@ -99,7 +99,7 @@ export interface Jobs { workspaceName: string, id: string, options?: JobsCancelOptionalParams - ): Promise, void>>; + ): Promise, void>>; /** * Cancels a Job (asynchronous). * @param resourceGroupName The name of the resource group. The name is case insensitive. diff --git a/sdk/machinelearning/arm-machinelearning/src/operationsInterfaces/onlineDeployments.ts b/sdk/machinelearning/arm-machinelearning/src/operationsInterfaces/onlineDeployments.ts index 39d986af8bee..14b14b4cf456 100644 --- a/sdk/machinelearning/arm-machinelearning/src/operationsInterfaces/onlineDeployments.ts +++ b/sdk/machinelearning/arm-machinelearning/src/operationsInterfaces/onlineDeployments.ts @@ -7,7 +7,7 @@ */ import { PagedAsyncIterableIterator } from "@azure/core-paging"; -import { PollerLike, PollOperationState } from "@azure/core-lro"; +import { SimplePollerLike, OperationState } from "@azure/core-lro"; import { OnlineDeployment, OnlineDeploymentsListOptionalParams, @@ -71,7 +71,7 @@ export interface OnlineDeployments { endpointName: string, deploymentName: string, options?: OnlineDeploymentsDeleteOptionalParams - ): Promise, void>>; + ): Promise, void>>; /** * Delete Inference Endpoint Deployment (asynchronous). * @param resourceGroupName The name of the resource group. The name is case insensitive. @@ -119,8 +119,8 @@ export interface OnlineDeployments { body: PartialMinimalTrackedResourceWithSku, options?: OnlineDeploymentsUpdateOptionalParams ): Promise< - PollerLike< - PollOperationState, + SimplePollerLike< + OperationState, OnlineDeploymentsUpdateResponse > >; @@ -158,8 +158,8 @@ export interface OnlineDeployments { body: OnlineDeployment, options?: OnlineDeploymentsCreateOrUpdateOptionalParams ): Promise< - PollerLike< - PollOperationState, + SimplePollerLike< + OperationState, OnlineDeploymentsCreateOrUpdateResponse > >; diff --git a/sdk/machinelearning/arm-machinelearning/src/operationsInterfaces/onlineEndpoints.ts b/sdk/machinelearning/arm-machinelearning/src/operationsInterfaces/onlineEndpoints.ts index 20dac39f279f..d40f70fde572 100644 --- a/sdk/machinelearning/arm-machinelearning/src/operationsInterfaces/onlineEndpoints.ts +++ b/sdk/machinelearning/arm-machinelearning/src/operationsInterfaces/onlineEndpoints.ts @@ -7,7 +7,7 @@ */ import { PagedAsyncIterableIterator } from "@azure/core-paging"; -import { PollerLike, PollOperationState } from "@azure/core-lro"; +import { SimplePollerLike, OperationState } from "@azure/core-lro"; import { OnlineEndpoint, OnlineEndpointsListOptionalParams, @@ -53,7 +53,7 @@ export interface OnlineEndpoints { workspaceName: string, endpointName: string, options?: OnlineEndpointsDeleteOptionalParams - ): Promise, void>>; + ): Promise, void>>; /** * Delete Online Endpoint (asynchronous). * @param resourceGroupName The name of the resource group. The name is case insensitive. @@ -95,8 +95,8 @@ export interface OnlineEndpoints { body: PartialMinimalTrackedResourceWithIdentity, options?: OnlineEndpointsUpdateOptionalParams ): Promise< - PollerLike< - PollOperationState, + SimplePollerLike< + OperationState, OnlineEndpointsUpdateResponse > >; @@ -130,8 +130,8 @@ export interface OnlineEndpoints { body: OnlineEndpoint, options?: OnlineEndpointsCreateOrUpdateOptionalParams ): Promise< - PollerLike< - PollOperationState, + SimplePollerLike< + OperationState, OnlineEndpointsCreateOrUpdateResponse > >; @@ -177,7 +177,7 @@ export interface OnlineEndpoints { endpointName: string, body: RegenerateEndpointKeysRequest, options?: OnlineEndpointsRegenerateKeysOptionalParams - ): Promise, void>>; + ): Promise, void>>; /** * Regenerate EndpointAuthKeys for an Endpoint using Key-based authentication (asynchronous). * @param resourceGroupName The name of the resource group. The name is case insensitive. diff --git a/sdk/machinelearning/arm-machinelearning/src/operationsInterfaces/schedules.ts b/sdk/machinelearning/arm-machinelearning/src/operationsInterfaces/schedules.ts index aaa2ce6be834..71b7e146765d 100644 --- a/sdk/machinelearning/arm-machinelearning/src/operationsInterfaces/schedules.ts +++ b/sdk/machinelearning/arm-machinelearning/src/operationsInterfaces/schedules.ts @@ -7,7 +7,7 @@ */ import { PagedAsyncIterableIterator } from "@azure/core-paging"; -import { PollerLike, PollOperationState } from "@azure/core-lro"; +import { SimplePollerLike, OperationState } from "@azure/core-lro"; import { Schedule, SchedulesListOptionalParams, @@ -44,7 +44,7 @@ export interface Schedules { workspaceName: string, name: string, options?: SchedulesDeleteOptionalParams - ): Promise, void>>; + ): Promise, void>>; /** * Delete schedule. * @param resourceGroupName The name of the resource group. The name is case insensitive. @@ -86,8 +86,8 @@ export interface Schedules { body: Schedule, options?: SchedulesCreateOrUpdateOptionalParams ): Promise< - PollerLike< - PollOperationState, + SimplePollerLike< + OperationState, SchedulesCreateOrUpdateResponse > >; diff --git a/sdk/machinelearning/arm-machinelearning/src/operationsInterfaces/workspaces.ts b/sdk/machinelearning/arm-machinelearning/src/operationsInterfaces/workspaces.ts index 39e9d916b20b..129de10bbea0 100644 --- a/sdk/machinelearning/arm-machinelearning/src/operationsInterfaces/workspaces.ts +++ b/sdk/machinelearning/arm-machinelearning/src/operationsInterfaces/workspaces.ts @@ -7,7 +7,7 @@ */ import { PagedAsyncIterableIterator } from "@azure/core-paging"; -import { PollerLike, PollOperationState } from "@azure/core-lro"; +import { SimplePollerLike, OperationState } from "@azure/core-lro"; import { Workspace, WorkspacesListByResourceGroupOptionalParams, @@ -80,8 +80,8 @@ export interface Workspaces { parameters: Workspace, options?: WorkspacesCreateOrUpdateOptionalParams ): Promise< - PollerLike< - PollOperationState, + SimplePollerLike< + OperationState, WorkspacesCreateOrUpdateResponse > >; @@ -108,7 +108,7 @@ export interface Workspaces { resourceGroupName: string, workspaceName: string, options?: WorkspacesDeleteOptionalParams - ): Promise, void>>; + ): Promise, void>>; /** * Deletes a machine learning workspace. * @param resourceGroupName The name of the resource group. The name is case insensitive. @@ -133,8 +133,8 @@ export interface Workspaces { parameters: WorkspaceUpdateParameters, options?: WorkspacesUpdateOptionalParams ): Promise< - PollerLike< - PollOperationState, + SimplePollerLike< + OperationState, WorkspacesUpdateResponse > >; @@ -162,8 +162,8 @@ export interface Workspaces { workspaceName: string, options?: WorkspacesDiagnoseOptionalParams ): Promise< - PollerLike< - PollOperationState, + SimplePollerLike< + OperationState, WorkspacesDiagnoseResponse > >; @@ -201,7 +201,7 @@ export interface Workspaces { resourceGroupName: string, workspaceName: string, options?: WorkspacesResyncKeysOptionalParams - ): Promise, void>>; + ): Promise, void>>; /** * Resync all the keys associated with this workspace. This includes keys for the storage account, app * insights and password for container registry @@ -236,8 +236,8 @@ export interface Workspaces { workspaceName: string, options?: WorkspacesPrepareNotebookOptionalParams ): Promise< - PollerLike< - PollOperationState, + SimplePollerLike< + OperationState, WorkspacesPrepareNotebookResponse > >; diff --git a/sdk/machinelearning/arm-machinelearning/src/pagingHelper.ts b/sdk/machinelearning/arm-machinelearning/src/pagingHelper.ts index d85fc13bce1e..269a2b9814b5 100644 --- a/sdk/machinelearning/arm-machinelearning/src/pagingHelper.ts +++ b/sdk/machinelearning/arm-machinelearning/src/pagingHelper.ts @@ -13,11 +13,11 @@ export interface PageInfo { const pageMap = new WeakMap(); /** - * Given a result page from a pageable operation, returns a - * continuation token that can be used to begin paging from + * Given the last `.value` produced by the `byPage` iterator, + * returns a continuation token that can be used to begin paging from * that point later. - * @param page A result object from calling .byPage() on a paged operation. - * @returns The continuation token that can be passed into byPage(). + * @param page An object from accessing `value` on the IteratorResult from a `byPage` iterator. + * @returns The continuation token that can be passed into byPage() during future calls. */ export function getContinuationToken(page: unknown): string | undefined { if (typeof page !== "object" || page === null) { diff --git a/sdk/machinelearning/arm-machinelearning/tsconfig.json b/sdk/machinelearning/arm-machinelearning/tsconfig.json index c068b7a47837..3e6ae96443f3 100644 --- a/sdk/machinelearning/arm-machinelearning/tsconfig.json +++ b/sdk/machinelearning/arm-machinelearning/tsconfig.json @@ -15,17 +15,11 @@ ], "declaration": true, "outDir": "./dist-esm", - "importHelpers": true, - "paths": { - "@azure/arm-machinelearning": [ - "./src/index" - ] - } + "importHelpers": true }, "include": [ "./src/**/*.ts", - "./test/**/*.ts", - "samples-dev/**/*.ts" + "./test/**/*.ts" ], "exclude": [ "node_modules"