CodeGen from PR 12281 in Azure/azure-rest-api-specs

Merge 3cd5abdb85f8771c26bb9b8dcd946c8de259e43c into ffc5119f58e1e302748bd21aff7bc01acd2b6d13
AzureSDKAutomation · Jan 11, 2021 · 18da49d · 18da49d
1 parent 6e03f88
commit 18da49d
Show file tree

Hide file tree

Showing 25 changed files with 2,892 additions and 2,190 deletions.
diff --git a/sdk/reservations/arm-reservations/LICENSE.txt b/sdk/reservations/arm-reservations/LICENSE.txt
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2020 Microsoft
+Copyright (c) 2021 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/reservations/arm-reservations/README.md b/sdk/reservations/arm-reservations/README.md
@@ -15,7 +15,7 @@ npm install @azure/arm-reservations
 
 ### How to use
 
-#### nodejs - Authentication, client creation and get quota as an example written in TypeScript.
+#### nodejs - client creation and list reservation as an example written in TypeScript.
 
 ##### Install @azure/ms-rest-nodeauth
 
@@ -26,17 +26,16 @@ npm install @azure/ms-rest-nodeauth@"^3.0.0"
 
 ##### Sample code
 
-```javascript
+While the below sample uses the interactive login, other authentication options can be found in the [README.md file of @azure/ms-rest-nodeauth](https://www.npmjs.com/package/@azure/ms-rest-nodeauth) package
+```typescript
+const msRestNodeAuth = require("@azure/ms-rest-nodeauth");
 const { AzureReservationAPI } = require("@azure/arm-reservations");
-const { interactiveLogin } = require("@azure/ms-rest-nodeauth");
-
-interactiveLogin().then((creds) => {
-  const client = new AzureReservationAPI(creds);
-  const subscriptionId = "testsubscriptionId";
-  const providerId = "testproviderId";
-  const location = "westus";
-  const resourceName = "testresourceName";
-  client.quota.get(subscriptionId, providerId, location, resourceName).then((result) => {
+const subscriptionId = process.env["AZURE_SUBSCRIPTION_ID"];
+
+msRestNodeAuth.interactiveLogin().then((creds) => {
+  const client = new AzureReservationAPI(creds, subscriptionId);
+  const reservationOrderId = "testreservationOrderId";
+  client.reservation.list(reservationOrderId).then((result) => {
     console.log("The result is:");
     console.log(result);
   });
@@ -45,7 +44,7 @@ interactiveLogin().then((creds) => {
 });
 ```
 
-#### browser - Authentication, client creation and get quota as an example written in JavaScript.
+#### browser - Authentication, client creation and list reservation as an example written in JavaScript.
 
 ##### Install @azure/ms-rest-browserauth
 
@@ -68,6 +67,7 @@ See https://github.com/Azure/ms-rest-browserauth to learn how to authenticate to
     <script src="node_modules/@azure/ms-rest-browserauth/dist/msAuth.js"></script>
     <script src="node_modules/@azure/arm-reservations/dist/arm-reservations.js"></script>
     <script type="text/javascript">
+      const subscriptionId = "<Subscription_Id>";
       const authManager = new msAuth.AuthManager({
         clientId: "<client id for your Azure AD app>",
         tenant: "<optional tenant for your organization>"
@@ -77,12 +77,9 @@ See https://github.com/Azure/ms-rest-browserauth to learn how to authenticate to
           // may cause redirects
           authManager.login();
         }
-        const client = new Azure.ArmReservations.AzureReservationAPI(res.creds);
-        const subscriptionId = "testsubscriptionId";
-        const providerId = "testproviderId";
-        const location = "westus";
-        const resourceName = "testresourceName";
-        client.quota.get(subscriptionId, providerId, location, resourceName).then((result) => {
+        const client = new Azure.ArmReservations.AzureReservationAPI(res.creds, subscriptionId);
+        const reservationOrderId = "testreservationOrderId";
+        client.reservation.list(reservationOrderId).then((result) => {
           console.log("The result is:");
           console.log(result);
         }).catch((err) => {

diff --git a/sdk/reservations/arm-reservations/rollup.config.js b/sdk/reservations/arm-reservations/rollup.config.js
@@ -21,8 +21,8 @@ const config = {
       "@azure/ms-rest-azure-js": "msRestAzure"
     },
     banner: `/*
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for license information.
+ * Copyright (c) Microsoft Corporation.
+ * Licensed under the MIT License.
  *
  * Code generated by Microsoft (R) AutoRest Code Generator.
  * Changes may cause incorrect behavior and will be lost if the code is regenerated.

diff --git a/sdk/reservations/arm-reservations/src/azureReservationAPI.ts b/sdk/reservations/arm-reservations/src/azureReservationAPI.ts
@@ -1,7 +1,6 @@
 /*
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
+ * Copyright (c) Microsoft Corporation.
+ * Licensed under the MIT License.
  *
  * Code generated by Microsoft (R) AutoRest Code Generator.
  * Changes may cause incorrect behavior and will be lost if the code is
@@ -18,12 +17,13 @@ import { AzureReservationAPIContext } from "./azureReservationAPIContext";
 
 class AzureReservationAPI extends AzureReservationAPIContext {
   // Operation groups
-  quota: operations.Quota;
-  quotaRequestStatus: operations.QuotaRequestStatus;
-  autoQuotaIncrease: operations.AutoQuotaIncrease;
   reservation: operations.Reservation;
   reservationOrder: operations.ReservationOrder;
   operation: operations.Operation;
+  calculateExchange: operations.CalculateExchange;
+  exchange: operations.Exchange;
+  quota: operations.Quota;
+  quotaRequestStatus: operations.QuotaRequestStatus;
 
   /**
    * Initializes a new instance of the AzureReservationAPI class.
@@ -32,12 +32,13 @@ class AzureReservationAPI extends AzureReservationAPIContext {
    */
   constructor(credentials: msRest.ServiceClientCredentials, options?: Models.AzureReservationAPIOptions) {
     super(credentials, options);
-    this.quota = new operations.Quota(this);
-    this.quotaRequestStatus = new operations.QuotaRequestStatus(this);
-    this.autoQuotaIncrease = new operations.AutoQuotaIncrease(this);
     this.reservation = new operations.Reservation(this);
     this.reservationOrder = new operations.ReservationOrder(this);
     this.operation = new operations.Operation(this);
+    this.calculateExchange = new operations.CalculateExchange(this);
+    this.exchange = new operations.Exchange(this);
+    this.quota = new operations.Quota(this);
+    this.quotaRequestStatus = new operations.QuotaRequestStatus(this);
   }
 
   /**
@@ -113,9 +114,9 @@ const getCatalogOperationSpec: msRest.OperationSpec = {
     Parameters.subscriptionId
   ],
   queryParameters: [
-    Parameters.apiVersion1,
+    Parameters.apiVersion0,
     Parameters.reservedResourceType,
-    Parameters.location1
+    Parameters.location0
   ],
   headerParameters: [
     Parameters.acceptLanguage
@@ -149,7 +150,7 @@ const getAppliedReservationListOperationSpec: msRest.OperationSpec = {
     Parameters.subscriptionId
   ],
   queryParameters: [
-    Parameters.apiVersion1
+    Parameters.apiVersion0
   ],
   headerParameters: [
     Parameters.acceptLanguage

diff --git a/sdk/reservations/arm-reservations/src/azureReservationAPIContext.ts b/sdk/reservations/arm-reservations/src/azureReservationAPIContext.ts
@@ -1,7 +1,6 @@
 /*
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
+ * Copyright (c) Microsoft Corporation.
+ * Licensed under the MIT License.
  *
  * Code generated by Microsoft (R) AutoRest Code Generator.
  * Changes may cause incorrect behavior and will be lost if the code is

diff --git a/sdk/reservations/arm-reservations/src/models/autoQuotaIncreaseMappers.ts b/sdk/reservations/arm-reservations/src/models/autoQuotaIncreaseMappers.ts
diff --git a/sdk/reservations/arm-reservations/src/models/calculateExchangeMappers.ts b/sdk/reservations/arm-reservations/src/models/calculateExchangeMappers.ts
@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) Microsoft Corporation.
+ * Licensed under the MIT License.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ * Changes may cause incorrect behavior and will be lost if the code is regenerated.
+ */
+
+export {
+  BillingInformation,
+  CalculateExchangeOperationResultResponse,
+  CalculateExchangePostHeaders,
+  CalculateExchangeRequest,
+  CalculateExchangeRequestProperties,
+  CalculateExchangeResponseProperties,
+  ErrorModel,
+  ExchangePolicyError,
+  ExchangePolicyErrors,
+  ExtendedErrorInfo,
+  OperationResultError,
+  Price,
+  PurchaseRequest,
+  PurchaseRequestPropertiesReservedResourceProperties,
+  ReservationToExchange,
+  ReservationToPurchaseCalculateExchange,
+  ReservationToReturn,
+  SkuName
+} from "../models/mappers";
diff --git a/sdk/reservations/arm-reservations/src/models/exchangeMappers.ts b/sdk/reservations/arm-reservations/src/models/exchangeMappers.ts
@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) Microsoft Corporation.
+ * Licensed under the MIT License.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ * Changes may cause incorrect behavior and will be lost if the code is regenerated.
+ */
+
+export {
+  BillingInformation,
+  ErrorModel,
+  ExchangeOperationResultResponse,
+  ExchangePolicyError,
+  ExchangePolicyErrors,
+  ExchangePostHeaders,
+  ExchangeRequest,
+  ExchangeRequestProperties,
+  ExchangeResponseProperties,
+  ExtendedErrorInfo,
+  OperationResultError,
+  Price,
+  PurchaseRequest,
+  PurchaseRequestPropertiesReservedResourceProperties,
+  ReservationToPurchaseExchange,
+  ReservationToReturnForExchange,
+  SkuName
+} from "../models/mappers";