Skip to content

Commit df57515

Browse files
author
SDKAuto
committed
CodeGen from PR 25154 in Azure/azure-rest-api-specs
Merge 078a5e20b268e90b8544de2699946a1dc019d8f0 into 5372f410f6af3de9559b63defbd556a7b10c4e65
1 parent 84496e3 commit df57515

File tree

11 files changed

+148
-51
lines changed

11 files changed

+148
-51
lines changed

‎common/config/rush/pnpm-lock.yaml

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

‎sdk/dataprotection/arm-dataprotection/CHANGELOG.md

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,21 @@
11
# Release History
2+
3+
## 2.0.0 (2023-08-23)
4+
5+
**Features**
26

3-
## 1.2.1 (Unreleased)
4-
5-
### Features Added
6-
7-
### Breaking Changes
8-
9-
### Bugs Fixed
7+
- Added Interface DefaultResourceProperties
8+
- Added Type Alias BaseResourcePropertiesUnion
9+
- Added Type Alias ResourcePropertiesObjectType
10+
- Added Enum KnownResourcePropertiesObjectType
1011

11-
### Other Changes
12+
**Breaking Changes**
1213

14+
- Type of parameter objectType of interface BaseResourceProperties is changed from "BaseResourceProperties" to "DefaultResourceProperties"
15+
- Type of parameter resourceProperties of interface Datasource is changed from BaseResourceProperties to BaseResourcePropertiesUnion
16+
- Type of parameter resourceProperties of interface DatasourceSet is changed from BaseResourceProperties to BaseResourcePropertiesUnion
17+
18+
1319
## 1.2.0 (2023-07-10)
1420

1521
**Features**

‎sdk/dataprotection/arm-dataprotection/_meta.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
2-
"commit": "0f39a2d56070d2bc4251494525cb8af88583a938",
2+
"commit": "98beecab43f4c928c57b1023a40e6b606ca896c4",
33
"readme": "specification/dataprotection/resource-manager/readme.md",
4-
"autorest_command": "autorest --version=3.9.3 --typescript --modelerfour.lenient-model-deduplication --azure-arm --head-as-boolean=true --license-header=MICROSOFT_MIT_NO_VERSION --generate-test --typescript-sdks-folder=D:\\Git\\azure-sdk-for-js ..\\azure-rest-api-specs\\specification\\dataprotection\\resource-manager\\readme.md --use=@autorest/[email protected].5 --generate-sample=true",
4+
"autorest_command": "autorest --version=3.9.7 --typescript --modelerfour.lenient-model-deduplication --azure-arm --head-as-boolean=true --license-header=MICROSOFT_MIT_NO_VERSION --generate-test --typescript-sdks-folder=/mnt/vss/_work/1/s/azure-sdk-for-js ../azure-rest-api-specs/specification/dataprotection/resource-manager/readme.md --use=@autorest/typescript@^6.0.4",
55
"repository_url": "https://github.com/Azure/azure-rest-api-specs.git",
6-
"release_tool": "@azure-tools/[email protected].0",
7-
"use": "@autorest/[email protected].5"
6+
"release_tool": "@azure-tools/[email protected].2",
7+
"use": "@autorest/typescript@^6.0.4"
88
}

‎sdk/dataprotection/arm-dataprotection/package.json

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,17 @@
33
"sdk-type": "mgmt",
44
"author": "Microsoft Corporation",
55
"description": "A generated SDK for DataProtectionClient.",
6-
"version": "1.2.1",
6+
"version": "2.0.0",
77
"engines": {
88
"node": ">=14.0.0"
99
},
1010
"dependencies": {
11-
"@azure/core-lro": "^2.5.3",
11+
"@azure/core-lro": "^2.5.4",
1212
"@azure/abort-controller": "^1.0.0",
1313
"@azure/core-paging": "^1.2.0",
1414
"@azure/core-client": "^1.7.0",
1515
"@azure/core-auth": "^1.3.0",
16-
"@azure/core-rest-pipeline": "^1.8.0",
16+
"@azure/core-rest-pipeline": "^1.12.0",
1717
"tslib": "^2.2.0"
1818
},
1919
"keywords": [
@@ -48,6 +48,7 @@
4848
"chai": "^4.2.0",
4949
"cross-env": "^7.0.2",
5050
"@types/node": "^14.0.0",
51+
"ts-node": "^10.0.0",
5152
"@azure/dev-tool": "^1.0.0"
5253
},
5354
"repository": {
@@ -111,13 +112,5 @@
111112
]
112113
},
113114
"autoPublish": true,
114-
"homepage": "https://github.com/Azure/azure-sdk-for-js/tree/main/sdk/dataprotection/arm-dataprotection",
115-
"//sampleConfiguration": {
116-
"productName": "",
117-
"productSlugs": [
118-
"azure"
119-
],
120-
"disableDocsMs": true,
121-
"apiRefLink": "https://docs.microsoft.com/javascript/api/@azure/arm-dataprotection?view=azure-node-preview"
122-
}
123-
}
115+
"homepage": "https://github.com/Azure/azure-sdk-for-js/tree/main/sdk/dataprotection/arm-dataprotection"
116+
}

‎sdk/dataprotection/arm-dataprotection/review/arm-dataprotection.api.md

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -733,9 +733,12 @@ export type BasePolicyRuleUnion = BasePolicyRule | AzureBackupRule | AzureRetent
733733

734734
// @public
735735
export interface BaseResourceProperties {
736-
objectType: "BaseResourceProperties";
736+
objectType: "DefaultResourceProperties";
737737
}
738738

739+
// @public (undocumented)
740+
export type BaseResourcePropertiesUnion = BaseResourceProperties | DefaultResourceProperties;
741+
739742
// @public
740743
export interface BlobBackupDatasourceParameters extends BackupDatasourceParameters {
741744
containersList: string[];
@@ -934,7 +937,7 @@ export interface Datasource {
934937
resourceID: string;
935938
resourceLocation?: string;
936939
resourceName?: string;
937-
resourceProperties?: BaseResourceProperties;
940+
resourceProperties?: BaseResourcePropertiesUnion;
938941
resourceType?: string;
939942
resourceUri?: string;
940943
}
@@ -946,7 +949,7 @@ export interface DatasourceSet {
946949
resourceID: string;
947950
resourceLocation?: string;
948951
resourceName?: string;
949-
resourceProperties?: BaseResourceProperties;
952+
resourceProperties?: BaseResourcePropertiesUnion;
950953
resourceType?: string;
951954
resourceUri?: string;
952955
}
@@ -978,6 +981,11 @@ export interface Day {
978981
// @public
979982
export type DayOfWeek = string;
980983

984+
// @public
985+
export interface DefaultResourceProperties extends BaseResourceProperties {
986+
objectType: "DefaultResourceProperties";
987+
}
988+
981989
// @public
982990
export interface DeletedBackupInstance extends BackupInstance {
983991
readonly deletionInfo?: DeletionInfo;
@@ -1559,6 +1567,11 @@ export enum KnownResourceMoveState {
15591567
Unknown = "Unknown"
15601568
}
15611569

1570+
// @public
1571+
export enum KnownResourcePropertiesObjectType {
1572+
DefaultResourceProperties = "DefaultResourceProperties"
1573+
}
1574+
15621575
// @public
15631576
export enum KnownRestoreSourceDataStoreType {
15641577
ArchiveStore = "ArchiveStore",
@@ -2185,6 +2198,9 @@ export interface ResourceMoveDetails {
21852198
// @public
21862199
export type ResourceMoveState = string;
21872200

2201+
// @public
2202+
export type ResourcePropertiesObjectType = string;
2203+
21882204
// @public (undocumented)
21892205
export interface RestorableTimeRange {
21902206
endTime: string;

‎sdk/dataprotection/arm-dataprotection/src/dataProtectionClient.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ export class DataProtectionClient extends coreClient.ServiceClient {
102102
credential: credentials
103103
};
104104

105-
const packageDetails = `azsdk-js-arm-dataprotection/1.2.1`;
105+
const packageDetails = `azsdk-js-arm-dataprotection/2.0.0`;
106106
const userAgentPrefix =
107107
options.userAgentOptions && options.userAgentOptions.userAgentPrefix
108108
? `${options.userAgentOptions.userAgentPrefix} ${packageDetails}`

‎sdk/dataprotection/arm-dataprotection/src/models/index.ts

Lines changed: 27 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@ export type FeatureValidationResponseBaseUnion =
1818
| FeatureValidationResponseBase
1919
| FeatureValidationResponse;
2020
export type BaseBackupPolicyUnion = BaseBackupPolicy | BackupPolicy;
21+
export type BaseResourcePropertiesUnion =
22+
| BaseResourceProperties
23+
| DefaultResourceProperties;
2124
export type DataStoreParametersUnion =
2225
| DataStoreParameters
2326
| AzureOperationalStoreParameters;
@@ -532,13 +535,13 @@ export interface Datasource {
532535
/** Uri of the resource. */
533536
resourceUri?: string;
534537
/** Properties specific to data source */
535-
resourceProperties?: BaseResourceProperties;
538+
resourceProperties?: BaseResourcePropertiesUnion;
536539
}
537540

538541
/** Properties which are specific to datasource/datasourceSets */
539542
export interface BaseResourceProperties {
540543
/** Polymorphic discriminator, which specifies the different types this object can be */
541-
objectType: "BaseResourceProperties";
544+
objectType: "DefaultResourceProperties";
542545
}
543546

544547
/** DatasourceSet details of datasource to be backed up */
@@ -558,7 +561,7 @@ export interface DatasourceSet {
558561
/** Uri of the resource. */
559562
resourceUri?: string;
560563
/** Properties specific to data source set */
561-
resourceProperties?: BaseResourceProperties;
564+
resourceProperties?: BaseResourcePropertiesUnion;
562565
}
563566

564567
/** Policy Info in backupInstance */
@@ -1426,6 +1429,12 @@ export interface DeletedBackupInstance extends BackupInstance {
14261429
readonly deletionInfo?: DeletionInfo;
14271430
}
14281431

1432+
/** Default source properties */
1433+
export interface DefaultResourceProperties extends BaseResourceProperties {
1434+
/** Polymorphic discriminator, which specifies the different types this object can be */
1435+
objectType: "DefaultResourceProperties";
1436+
}
1437+
14291438
/** Parameters for Operational-Tier DataStore */
14301439
export interface AzureOperationalStoreParameters extends DataStoreParameters {
14311440
/** Polymorphic discriminator, which specifies the different types this object can be */
@@ -2152,6 +2161,21 @@ export enum KnownCreatedByType {
21522161
*/
21532162
export type CreatedByType = string;
21542163

2164+
/** Known values of {@link ResourcePropertiesObjectType} that the service accepts. */
2165+
export enum KnownResourcePropertiesObjectType {
2166+
/** DefaultResourceProperties */
2167+
DefaultResourceProperties = "DefaultResourceProperties"
2168+
}
2169+
2170+
/**
2171+
* Defines values for ResourcePropertiesObjectType. \
2172+
* {@link KnownResourcePropertiesObjectType} can be used interchangeably with ResourcePropertiesObjectType,
2173+
* this enum contains the known values that the service supports.
2174+
* ### Known values supported by the service
2175+
* **DefaultResourceProperties**
2176+
*/
2177+
export type ResourcePropertiesObjectType = string;
2178+
21552179
/** Known values of {@link DataStoreTypes} that the service accepts. */
21562180
export enum KnownDataStoreTypes {
21572181
/** OperationalStore */

‎sdk/dataprotection/arm-dataprotection/src/models/mappers.ts

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1172,7 +1172,6 @@ export const Datasource: coreClient.CompositeMapper = {
11721172
};
11731173

11741174
export const BaseResourceProperties: coreClient.CompositeMapper = {
1175-
serializedName: "BaseResourceProperties",
11761175
type: {
11771176
name: "Composite",
11781177
className: "BaseResourceProperties",
@@ -3671,6 +3670,20 @@ export const DeletedBackupInstance: coreClient.CompositeMapper = {
36713670
}
36723671
};
36733672

3673+
export const DefaultResourceProperties: coreClient.CompositeMapper = {
3674+
serializedName: "DefaultResourceProperties",
3675+
type: {
3676+
name: "Composite",
3677+
className: "DefaultResourceProperties",
3678+
uberParent: "BaseResourceProperties",
3679+
polymorphicDiscriminator:
3680+
BaseResourceProperties.type.polymorphicDiscriminator,
3681+
modelProperties: {
3682+
...BaseResourceProperties.type.modelProperties
3683+
}
3684+
}
3685+
};
3686+
36743687
export const AzureOperationalStoreParameters: coreClient.CompositeMapper = {
36753688
serializedName: "AzureOperationalStoreParameters",
36763689
type: {
@@ -5061,7 +5074,7 @@ export let discriminators = {
50615074
FeatureValidationRequestBase: FeatureValidationRequestBase,
50625075
FeatureValidationResponseBase: FeatureValidationResponseBase,
50635076
BaseBackupPolicy: BaseBackupPolicy,
5064-
"BaseResourceProperties.BaseResourceProperties": BaseResourceProperties,
5077+
BaseResourceProperties: BaseResourceProperties,
50655078
DataStoreParameters: DataStoreParameters,
50665079
BackupDatasourceParameters: BackupDatasourceParameters,
50675080
AuthCredentials: AuthCredentials,
@@ -5079,6 +5092,7 @@ export let discriminators = {
50795092
"FeatureValidationRequestBase.FeatureValidationRequest": FeatureValidationRequest,
50805093
"FeatureValidationResponseBase.FeatureValidationResponse": FeatureValidationResponse,
50815094
"BaseBackupPolicy.BackupPolicy": BackupPolicy,
5095+
"BaseResourceProperties.DefaultResourceProperties": DefaultResourceProperties,
50825096
"DataStoreParameters.AzureOperationalStoreParameters": AzureOperationalStoreParameters,
50835097
"BackupDatasourceParameters.KubernetesClusterBackupDatasourceParameters": KubernetesClusterBackupDatasourceParameters,
50845098
"BackupDatasourceParameters.BlobBackupDatasourceParameters": BlobBackupDatasourceParameters,

‎sdk/dataprotection/arm-dataprotection/src/operations/backupInstances.ts

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -448,7 +448,8 @@ export class BackupInstancesImpl implements BackupInstances {
448448
OperationState<BackupInstancesAdhocBackupResponse>
449449
>(lro, {
450450
restoreFrom: options?.resumeFrom,
451-
intervalInMs: options?.updateIntervalInMs
451+
intervalInMs: options?.updateIntervalInMs,
452+
resourceLocationConfig: "location"
452453
});
453454
await poller.poll();
454455
return poller;
@@ -546,7 +547,8 @@ export class BackupInstancesImpl implements BackupInstances {
546547
OperationState<BackupInstancesValidateForBackupResponse>
547548
>(lro, {
548549
restoreFrom: options?.resumeFrom,
549-
intervalInMs: options?.updateIntervalInMs
550+
intervalInMs: options?.updateIntervalInMs,
551+
resourceLocationConfig: "location"
550552
});
551553
await poller.poll();
552554
return poller;
@@ -782,7 +784,8 @@ export class BackupInstancesImpl implements BackupInstances {
782784
OperationState<BackupInstancesTriggerRestoreResponse>
783785
>(lro, {
784786
restoreFrom: options?.resumeFrom,
785-
intervalInMs: options?.updateIntervalInMs
787+
intervalInMs: options?.updateIntervalInMs,
788+
resourceLocationConfig: "location"
786789
});
787790
await poller.poll();
788791
return poller;
@@ -1338,7 +1341,8 @@ export class BackupInstancesImpl implements BackupInstances {
13381341
OperationState<BackupInstancesValidateForRestoreResponse>
13391342
>(lro, {
13401343
restoreFrom: options?.resumeFrom,
1341-
intervalInMs: options?.updateIntervalInMs
1344+
intervalInMs: options?.updateIntervalInMs,
1345+
resourceLocationConfig: "location"
13421346
});
13431347
await poller.poll();
13441348
return poller;

0 commit comments

Comments
 (0)