Skip to content

Commit

Permalink
CodeGen from PR 11549 in Azure/azure-rest-api-specs
Browse files Browse the repository at this point in the history
Api Management - make /tenant endpoints ARM compliant in 2020-06-01-preview version (Azure#11549)

* Adds base for updating Microsoft.ApiManagement from version stable/2019-12-01 to version 2020-06-01-preview

* Updates readme

* Updates API version in new specs and examples

* Add support in API Management for Availability Zones (Azure#10284)

* apim in azs

* fix prettier check

* PATCH should return 200 OK (Azure#10328)

* add support for PATCH returning 200 OK

* CI fixes

prettier fix

CI fixes part 2

* Password no longer a mandatory property when uploading Certificates

* add missing x-ms-odata extension for filter support

* +gatewayhostnameconfiguration protocol changes (Azure#10292)

* [2020-06-01-preview] Update Oauth Server secrets Contract (Azure#10602)

* Oauth server secrets contract

* fix azureMonitor enum

* API Management Service Deleted Services Resource (Azure#10607)

* API Management Service Deleted Services Resource

* Path fix

* Lint + custom-words fixes

* Location URI parameter for deletedservices Resource

* GET for deletedservices by service name

* Remove resourceGroupName from resource path

* fixes

* schema for purge operation

* perttier applied

* 204 response code added

Co-authored-by: REDMOND\glfeokti <glfeokti@microsoft.com>

* OperationNameFormat property added to Diagnostic contract (Azure#10641)

* OperationNameFormat property added to Diagnostic contract

* add azuremonitor to update contract

Co-authored-by: REDMOND\glfeokti <glfeokti@microsoft.com>

* [Microsoft.ApiManagement][2020-06-01-preview] Change Network Status response contract (Azure#10331)

* Change Network Status response contract

* Update examples for network status contract

* ApiManagement - tenant/settings endpoints

* ApiManagement - tenant/settings endpoints fix

* ApiManagement - tenant/settings endpoints fix prettier

* ApiManagement - tenant/settings endpoints fix 3

* ApiManagement - tenant/settings endpoints fix 4

* ApiManagement - tenant/settings endpoints fix 5

Co-authored-by: Samir Solanki <samirsolanki@outlook.com>
Co-authored-by: maksimkim <maksim.kim@gmail.com>
Co-authored-by: promoisha <feoktistovgg@gmail.com>
Co-authored-by: REDMOND\glfeokti <glfeokti@microsoft.com>
Co-authored-by: RupengLiu <rliu1211@terpmail.umd.edu>
Co-authored-by: vfedonkin <vifedo@microsoft.com>
  • Loading branch information
7 people committed Dec 30, 2020
1 parent 9031d2e commit 245b758
Show file tree
Hide file tree
Showing 146 changed files with 11,687 additions and 3,345 deletions.
9 changes: 4 additions & 5 deletions sdk/apimanagement/arm-apimanagement/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ npm install @azure/arm-apimanagement

### How to use

#### nodejs - Authentication, client creation and listByService api as an example written in TypeScript.
#### nodejs - client creation and listByService api as an example written in TypeScript.

##### Install @azure/ms-rest-nodeauth

Expand All @@ -26,11 +26,10 @@ npm install @azure/ms-rest-nodeauth@"^3.0.0"

##### Sample code

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
import * as msRest from "@azure/ms-rest-js";
import * as msRestAzure from "@azure/ms-rest-azure-js";
import * as msRestNodeAuth from "@azure/ms-rest-nodeauth";
import { ApiManagementClient, ApiManagementModels, ApiManagementMappers } from "@azure/arm-apimanagement";
const msRestNodeAuth = require("@azure/ms-rest-nodeauth");
const { ApiManagementClient } = require("@azure/arm-apimanagement");
const subscriptionId = process.env["AZURE_SUBSCRIPTION_ID"];

msRestNodeAuth.interactiveLogin().then((creds) => {
Expand Down
4 changes: 2 additions & 2 deletions sdk/apimanagement/arm-apimanagement/rollup.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
15 changes: 12 additions & 3 deletions sdk/apimanagement/arm-apimanagement/src/apiManagementClient.ts
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -37,6 +36,9 @@ class ApiManagementClient extends ApiManagementClientContext {
backend: operations.Backend;
cache: operations.Cache;
certificate: operations.Certificate;
contentType: operations.ContentType;
contentItem: operations.ContentItem;
deletedServices: operations.DeletedServices;
apiManagementOperations: operations.ApiManagementOperations;
apiManagementServiceSkus: operations.ApiManagementServiceSkus;
apiManagementService: operations.ApiManagementService;
Expand All @@ -58,6 +60,7 @@ class ApiManagementClient extends ApiManagementClientContext {
openIdConnectProvider: operations.OpenIdConnectProvider;
policy: operations.Policy;
policyDescription: operations.PolicyDescription;
portalRevision: operations.PortalRevision;
signInSettings: operations.SignInSettings;
signUpSettings: operations.SignUpSettings;
delegationSettings: operations.DelegationSettings;
Expand All @@ -70,6 +73,7 @@ class ApiManagementClient extends ApiManagementClientContext {
quotaByPeriodKeys: operations.QuotaByPeriodKeys;
region: operations.Region;
reports: operations.Reports;
tenantSettings: operations.TenantSettings;
subscription: operations.Subscription;
tagResource: operations.TagResource;
tenantAccess: operations.TenantAccess;
Expand Down Expand Up @@ -111,6 +115,9 @@ class ApiManagementClient extends ApiManagementClientContext {
this.backend = new operations.Backend(this);
this.cache = new operations.Cache(this);
this.certificate = new operations.Certificate(this);
this.contentType = new operations.ContentType(this);
this.contentItem = new operations.ContentItem(this);
this.deletedServices = new operations.DeletedServices(this);
this.apiManagementOperations = new operations.ApiManagementOperations(this);
this.apiManagementServiceSkus = new operations.ApiManagementServiceSkus(this);
this.apiManagementService = new operations.ApiManagementService(this);
Expand All @@ -132,6 +139,7 @@ class ApiManagementClient extends ApiManagementClientContext {
this.openIdConnectProvider = new operations.OpenIdConnectProvider(this);
this.policy = new operations.Policy(this);
this.policyDescription = new operations.PolicyDescription(this);
this.portalRevision = new operations.PortalRevision(this);
this.signInSettings = new operations.SignInSettings(this);
this.signUpSettings = new operations.SignUpSettings(this);
this.delegationSettings = new operations.DelegationSettings(this);
Expand All @@ -144,6 +152,7 @@ class ApiManagementClient extends ApiManagementClientContext {
this.quotaByPeriodKeys = new operations.QuotaByPeriodKeys(this);
this.region = new operations.Region(this);
this.reports = new operations.Reports(this);
this.tenantSettings = new operations.TenantSettings(this);
this.subscription = new operations.Subscription(this);
this.tagResource = new operations.TagResource(this);
this.tenantAccess = new operations.TenantAccess(this);
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -45,7 +44,7 @@ export class ApiManagementClientContext extends msRestAzure.AzureServiceClient {

super(credentials, options);

this.apiVersion = '2019-12-01';
this.apiVersion = '2020-06-01-preview';
this.acceptLanguage = 'en-US';
this.longRunningOperationRetryTimeout = 30;
this.baseUri = options.baseUri || this.baseUri || "https://management.azure.com";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,17 +1,19 @@
/*
* 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.
*/

export {
AccessInformationContract,
AdditionalLocation,
ApiContract,
ApiDiagnosticCreateOrUpdateHeaders,
ApiDiagnosticGetEntityTagHeaders,
ApiDiagnosticGetHeaders,
ApiDiagnosticUpdateHeaders,
ApiManagementServiceIdentity,
ApiManagementServiceResource,
ApiManagementServiceSkuProperties,
Expand Down Expand Up @@ -39,6 +41,11 @@ export {
CertificateConfiguration,
CertificateContract,
CertificateInformation,
ContentItemContract,
ContentTypeContract,
DataMasking,
DataMaskingEntity,
DeletedServiceContract,
DiagnosticCollection,
DiagnosticContract,
EmailTemplateContract,
Expand All @@ -56,6 +63,9 @@ export {
IssueAttachmentContract,
IssueCommentContract,
IssueContract,
KeyVaultContractCreateProperties,
KeyVaultContractProperties,
KeyVaultLastAccessStatusContractProperties,
LoggerContract,
NamedValueContract,
NamedValueCreateContract,
Expand All @@ -69,6 +79,7 @@ export {
PolicyContract,
PolicyDescriptionContract,
PortalDelegationSettings,
PortalRevisionContract,
PortalSigninSettings,
PortalSignupSettings,
ProductContract,
Expand All @@ -88,6 +99,7 @@ export {
SubscriptionsDelegationSettingsProperties,
TagContract,
TagDescriptionContract,
TenantSettingsContract,
TermsOfServiceProperties,
TokenBodyParameterContract,
UserContract,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +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 regenerated.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
/*
* 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.
*/

export {
AccessInformationContract,
AdditionalLocation,
ApiContract,
ApiIssueAttachmentCreateOrUpdateHeaders,
Expand Down Expand Up @@ -39,6 +40,11 @@ export {
CertificateConfiguration,
CertificateContract,
CertificateInformation,
ContentItemContract,
ContentTypeContract,
DataMasking,
DataMaskingEntity,
DeletedServiceContract,
DiagnosticContract,
EmailTemplateContract,
EmailTemplateParametersContractProperties,
Expand All @@ -56,6 +62,9 @@ export {
IssueAttachmentContract,
IssueCommentContract,
IssueContract,
KeyVaultContractCreateProperties,
KeyVaultContractProperties,
KeyVaultLastAccessStatusContractProperties,
LoggerContract,
NamedValueContract,
NamedValueCreateContract,
Expand All @@ -69,6 +78,7 @@ export {
PolicyContract,
PolicyDescriptionContract,
PortalDelegationSettings,
PortalRevisionContract,
PortalSigninSettings,
PortalSignupSettings,
ProductContract,
Expand All @@ -88,6 +98,7 @@ export {
SubscriptionsDelegationSettingsProperties,
TagContract,
TagDescriptionContract,
TenantSettingsContract,
TermsOfServiceProperties,
TokenBodyParameterContract,
UserContract,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
/*
* 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.
*/

export {
AccessInformationContract,
AdditionalLocation,
ApiContract,
ApiIssueCommentCreateOrUpdateHeaders,
Expand Down Expand Up @@ -39,6 +40,11 @@ export {
CertificateConfiguration,
CertificateContract,
CertificateInformation,
ContentItemContract,
ContentTypeContract,
DataMasking,
DataMaskingEntity,
DeletedServiceContract,
DiagnosticContract,
EmailTemplateContract,
EmailTemplateParametersContractProperties,
Expand All @@ -56,6 +62,9 @@ export {
IssueCommentCollection,
IssueCommentContract,
IssueContract,
KeyVaultContractCreateProperties,
KeyVaultContractProperties,
KeyVaultLastAccessStatusContractProperties,
LoggerContract,
NamedValueContract,
NamedValueCreateContract,
Expand All @@ -69,6 +78,7 @@ export {
PolicyContract,
PolicyDescriptionContract,
PortalDelegationSettings,
PortalRevisionContract,
PortalSigninSettings,
PortalSignupSettings,
ProductContract,
Expand All @@ -88,6 +98,7 @@ export {
SubscriptionsDelegationSettingsProperties,
TagContract,
TagDescriptionContract,
TenantSettingsContract,
TermsOfServiceProperties,
TokenBodyParameterContract,
UserContract,
Expand Down
16 changes: 14 additions & 2 deletions sdk/apimanagement/arm-apimanagement/src/models/apiIssueMappers.ts
Original file line number Diff line number Diff line change
@@ -1,17 +1,19 @@
/*
* 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.
*/

export {
AccessInformationContract,
AdditionalLocation,
ApiContract,
ApiIssueCreateOrUpdateHeaders,
ApiIssueGetEntityTagHeaders,
ApiIssueGetHeaders,
ApiIssueUpdateHeaders,
ApiManagementServiceIdentity,
ApiManagementServiceResource,
ApiManagementServiceSkuProperties,
Expand Down Expand Up @@ -39,6 +41,11 @@ export {
CertificateConfiguration,
CertificateContract,
CertificateInformation,
ContentItemContract,
ContentTypeContract,
DataMasking,
DataMaskingEntity,
DeletedServiceContract,
DiagnosticContract,
EmailTemplateContract,
EmailTemplateParametersContractProperties,
Expand All @@ -57,6 +64,9 @@ export {
IssueCommentContract,
IssueContract,
IssueUpdateContract,
KeyVaultContractCreateProperties,
KeyVaultContractProperties,
KeyVaultLastAccessStatusContractProperties,
LoggerContract,
NamedValueContract,
NamedValueCreateContract,
Expand All @@ -70,6 +80,7 @@ export {
PolicyContract,
PolicyDescriptionContract,
PortalDelegationSettings,
PortalRevisionContract,
PortalSigninSettings,
PortalSignupSettings,
ProductContract,
Expand All @@ -89,6 +100,7 @@ export {
SubscriptionsDelegationSettingsProperties,
TagContract,
TagDescriptionContract,
TenantSettingsContract,
TermsOfServiceProperties,
TokenBodyParameterContract,
UserContract,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +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 regenerated.
Expand Down

0 comments on commit 245b758

Please sign in to comment.