[AutoPR @azure/arm-dataprotection] Fixing BaseResourceProperties having discriminator but no derived object

sdk/dataprotection/arm-dataprotection/CHANGELOG.md

@@ -1,15 +1,21 @@
 # Release History
+
+## 2.0.0 (2023-08-23)
+
+**Features**
 
-## 1.2.1 (Unreleased)
-
-### Features Added
-
-### Breaking Changes
-
-### Bugs Fixed
+  - Added Interface DefaultResourceProperties
+  - Added Type Alias BaseResourcePropertiesUnion
+  - Added Type Alias ResourcePropertiesObjectType
+  - Added Enum KnownResourcePropertiesObjectType
 
-### Other Changes
+**Breaking Changes**
 
+  - Type of parameter objectType of interface BaseResourceProperties is changed from "BaseResourceProperties" to "DefaultResourceProperties"
+  - Type of parameter resourceProperties of interface Datasource is changed from BaseResourceProperties to BaseResourcePropertiesUnion
+  - Type of parameter resourceProperties of interface DatasourceSet is changed from BaseResourceProperties to BaseResourcePropertiesUnion
+
+
 ## 1.2.0 (2023-07-10)
 
 **Features**

sdk/dataprotection/arm-dataprotection/_meta.json

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

sdk/dataprotection/arm-dataprotection/package.json

@@ -3,17 +3,17 @@
   "sdk-type": "mgmt",
   "author": "Microsoft Corporation",
   "description": "A generated SDK for DataProtectionClient.",
-  "version": "1.2.1",
+  "version": "2.0.0",
   "engines": {
     "node": ">=14.0.0"
   },
   "dependencies": {
-    "@azure/core-lro": "^2.5.3",
+    "@azure/core-lro": "^2.5.4",
     "@azure/abort-controller": "^1.0.0",
     "@azure/core-paging": "^1.2.0",
     "@azure/core-client": "^1.7.0",
     "@azure/core-auth": "^1.3.0",
-    "@azure/core-rest-pipeline": "^1.8.0",
+    "@azure/core-rest-pipeline": "^1.12.0",
     "tslib": "^2.2.0"
   },
   "keywords": [
@@ -48,6 +48,7 @@
     "chai": "^4.2.0",
     "cross-env": "^7.0.2",
     "@types/node": "^14.0.0",
+    "ts-node": "^10.0.0",
     "@azure/dev-tool": "^1.0.0"
   },
   "repository": {
@@ -111,13 +112,5 @@
     ]
   },
   "autoPublish": true,
-  "homepage": "https://github.com/Azure/azure-sdk-for-js/tree/main/sdk/dataprotection/arm-dataprotection",
-  "//sampleConfiguration": {
-    "productName": "",
-    "productSlugs": [
-      "azure"
-    ],
-    "disableDocsMs": true,
-    "apiRefLink": "https://docs.microsoft.com/javascript/api/@azure/arm-dataprotection?view=azure-node-preview"
-  }
-}
+  "homepage": "https://github.com/Azure/azure-sdk-for-js/tree/main/sdk/dataprotection/arm-dataprotection"
+}

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

@@ -733,9 +733,12 @@ export type BasePolicyRuleUnion = BasePolicyRule | AzureBackupRule | AzureRetent
 
 // @public
 export interface BaseResourceProperties {
-    objectType: "BaseResourceProperties";
+    objectType: "DefaultResourceProperties";
 }
 
+// @public (undocumented)
+export type BaseResourcePropertiesUnion = BaseResourceProperties | DefaultResourceProperties;
+
 // @public
 export interface BlobBackupDatasourceParameters extends BackupDatasourceParameters {
     containersList: string[];
@@ -934,7 +937,7 @@ export interface Datasource {
     resourceID: string;
     resourceLocation?: string;
     resourceName?: string;
-    resourceProperties?: BaseResourceProperties;
+    resourceProperties?: BaseResourcePropertiesUnion;
     resourceType?: string;
     resourceUri?: string;
 }
@@ -946,7 +949,7 @@ export interface DatasourceSet {
     resourceID: string;
     resourceLocation?: string;
     resourceName?: string;
-    resourceProperties?: BaseResourceProperties;
+    resourceProperties?: BaseResourcePropertiesUnion;
     resourceType?: string;
     resourceUri?: string;
 }
@@ -978,6 +981,11 @@ export interface Day {
 // @public
 export type DayOfWeek = string;
 
+// @public
+export interface DefaultResourceProperties extends BaseResourceProperties {
+    objectType: "DefaultResourceProperties";
+}
+
 // @public
 export interface DeletedBackupInstance extends BackupInstance {
     readonly deletionInfo?: DeletionInfo;
@@ -1559,6 +1567,11 @@ export enum KnownResourceMoveState {
     Unknown = "Unknown"
 }
 
+// @public
+export enum KnownResourcePropertiesObjectType {
+    DefaultResourceProperties = "DefaultResourceProperties"
+}
+
 // @public
 export enum KnownRestoreSourceDataStoreType {
     ArchiveStore = "ArchiveStore",
@@ -2185,6 +2198,9 @@ export interface ResourceMoveDetails {
 // @public
 export type ResourceMoveState = string;
 
+// @public
+export type ResourcePropertiesObjectType = string;
+
 // @public (undocumented)
 export interface RestorableTimeRange {
     endTime: string;

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

@@ -102,7 +102,7 @@ export class DataProtectionClient extends coreClient.ServiceClient {
       credential: credentials
     };
 
-    const packageDetails = `azsdk-js-arm-dataprotection/1.2.1`;
+    const packageDetails = `azsdk-js-arm-dataprotection/2.0.0`;
     const userAgentPrefix =
       options.userAgentOptions && options.userAgentOptions.userAgentPrefix
         ? `${options.userAgentOptions.userAgentPrefix} ${packageDetails}`

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

@@ -18,6 +18,9 @@ export type FeatureValidationResponseBaseUnion =
   | FeatureValidationResponseBase
   | FeatureValidationResponse;
 export type BaseBackupPolicyUnion = BaseBackupPolicy | BackupPolicy;
+export type BaseResourcePropertiesUnion =
+  | BaseResourceProperties
+  | DefaultResourceProperties;
 export type DataStoreParametersUnion =
   | DataStoreParameters
   | AzureOperationalStoreParameters;
@@ -532,13 +535,13 @@ export interface Datasource {
   /** Uri of the resource. */
   resourceUri?: string;
   /** Properties specific to data source */
-  resourceProperties?: BaseResourceProperties;
+  resourceProperties?: BaseResourcePropertiesUnion;
 }
 
 /** Properties which are specific to datasource/datasourceSets */
 export interface BaseResourceProperties {
   /** Polymorphic discriminator, which specifies the different types this object can be */
-  objectType: "BaseResourceProperties";
+  objectType: "DefaultResourceProperties";
 }
 
 /** DatasourceSet details of datasource to be backed up */
@@ -558,7 +561,7 @@ export interface DatasourceSet {
   /** Uri of the resource. */
   resourceUri?: string;
   /** Properties specific to data source set */
-  resourceProperties?: BaseResourceProperties;
+  resourceProperties?: BaseResourcePropertiesUnion;
 }
 
 /** Policy Info in backupInstance */
@@ -1426,6 +1429,12 @@ export interface DeletedBackupInstance extends BackupInstance {
   readonly deletionInfo?: DeletionInfo;
 }
 
+/** Default source properties */
+export interface DefaultResourceProperties extends BaseResourceProperties {
+  /** Polymorphic discriminator, which specifies the different types this object can be */
+  objectType: "DefaultResourceProperties";
+}
+
 /** Parameters for Operational-Tier DataStore */
 export interface AzureOperationalStoreParameters extends DataStoreParameters {
   /** Polymorphic discriminator, which specifies the different types this object can be */
@@ -2152,6 +2161,21 @@ export enum KnownCreatedByType {
  */
 export type CreatedByType = string;
 
+/** Known values of {@link ResourcePropertiesObjectType} that the service accepts. */
+export enum KnownResourcePropertiesObjectType {
+  /** DefaultResourceProperties */
+  DefaultResourceProperties = "DefaultResourceProperties"
+}
+
+/**
+ * Defines values for ResourcePropertiesObjectType. \
+ * {@link KnownResourcePropertiesObjectType} can be used interchangeably with ResourcePropertiesObjectType,
+ *  this enum contains the known values that the service supports.
+ * ### Known values supported by the service
+ * **DefaultResourceProperties**
+ */
+export type ResourcePropertiesObjectType = string;
+
 /** Known values of {@link DataStoreTypes} that the service accepts. */
 export enum KnownDataStoreTypes {
   /** OperationalStore */

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

@@ -1172,7 +1172,6 @@ export const Datasource: coreClient.CompositeMapper = {
 };
 
 export const BaseResourceProperties: coreClient.CompositeMapper = {
-  serializedName: "BaseResourceProperties",
   type: {
     name: "Composite",
     className: "BaseResourceProperties",
@@ -3671,6 +3670,20 @@ export const DeletedBackupInstance: coreClient.CompositeMapper = {
   }
 };
 
+export const DefaultResourceProperties: coreClient.CompositeMapper = {
+  serializedName: "DefaultResourceProperties",
+  type: {
+    name: "Composite",
+    className: "DefaultResourceProperties",
+    uberParent: "BaseResourceProperties",
+    polymorphicDiscriminator:
+      BaseResourceProperties.type.polymorphicDiscriminator,
+    modelProperties: {
+      ...BaseResourceProperties.type.modelProperties
+    }
+  }
+};
+
 export const AzureOperationalStoreParameters: coreClient.CompositeMapper = {
   serializedName: "AzureOperationalStoreParameters",
   type: {
@@ -5061,7 +5074,7 @@ export let discriminators = {
   FeatureValidationRequestBase: FeatureValidationRequestBase,
   FeatureValidationResponseBase: FeatureValidationResponseBase,
   BaseBackupPolicy: BaseBackupPolicy,
-  "BaseResourceProperties.BaseResourceProperties": BaseResourceProperties,
+  BaseResourceProperties: BaseResourceProperties,
   DataStoreParameters: DataStoreParameters,
   BackupDatasourceParameters: BackupDatasourceParameters,
   AuthCredentials: AuthCredentials,
@@ -5079,6 +5092,7 @@ export let discriminators = {
   "FeatureValidationRequestBase.FeatureValidationRequest": FeatureValidationRequest,
   "FeatureValidationResponseBase.FeatureValidationResponse": FeatureValidationResponse,
   "BaseBackupPolicy.BackupPolicy": BackupPolicy,
+  "BaseResourceProperties.DefaultResourceProperties": DefaultResourceProperties,
   "DataStoreParameters.AzureOperationalStoreParameters": AzureOperationalStoreParameters,
   "BackupDatasourceParameters.KubernetesClusterBackupDatasourceParameters": KubernetesClusterBackupDatasourceParameters,
   "BackupDatasourceParameters.BlobBackupDatasourceParameters": BlobBackupDatasourceParameters,

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

@@ -448,7 +448,8 @@ export class BackupInstancesImpl implements BackupInstances {
       OperationState<BackupInstancesAdhocBackupResponse>
     >(lro, {
       restoreFrom: options?.resumeFrom,
-      intervalInMs: options?.updateIntervalInMs
+      intervalInMs: options?.updateIntervalInMs,
+      resourceLocationConfig: "location"
     });
     await poller.poll();
     return poller;
@@ -546,7 +547,8 @@ export class BackupInstancesImpl implements BackupInstances {
       OperationState<BackupInstancesValidateForBackupResponse>
     >(lro, {
       restoreFrom: options?.resumeFrom,
-      intervalInMs: options?.updateIntervalInMs
+      intervalInMs: options?.updateIntervalInMs,
+      resourceLocationConfig: "location"
     });
     await poller.poll();
     return poller;
@@ -782,7 +784,8 @@ export class BackupInstancesImpl implements BackupInstances {
       OperationState<BackupInstancesTriggerRestoreResponse>
     >(lro, {
       restoreFrom: options?.resumeFrom,
-      intervalInMs: options?.updateIntervalInMs
+      intervalInMs: options?.updateIntervalInMs,
+      resourceLocationConfig: "location"
     });
     await poller.poll();
     return poller;
@@ -1338,7 +1341,8 @@ export class BackupInstancesImpl implements BackupInstances {
       OperationState<BackupInstancesValidateForRestoreResponse>
     >(lro, {
       restoreFrom: options?.resumeFrom,
-      intervalInMs: options?.updateIntervalInMs
+      intervalInMs: options?.updateIntervalInMs,
+      resourceLocationConfig: "location"
     });
     await poller.poll();
     return poller;