Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions sdk/features/arm-features/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ npm install @azure/ms-rest-nodeauth
##### Sample code

```typescript
import * as msRest from "@azure/ms-rest-js";
import * as msRestAzure from "@azure/ms-rest-azure-js";
import * as coreHttp from "@azure/core-http";
import * as coreArm from "@azure/core-arm";
import * as msRestNodeAuth from "@azure/ms-rest-nodeauth";
import { FeatureClient, FeatureModels, FeatureMappers } from "@azure/arm-features";
const subscriptionId = process.env["AZURE_SUBSCRIPTION_ID"];
Expand Down Expand Up @@ -61,8 +61,8 @@ See https://github.com/Azure/ms-rest-browserauth to learn how to authenticate to
<html lang="en">
<head>
<title>@azure/arm-features sample</title>
<script src="node_modules/@azure/ms-rest-js/dist/msRest.browser.js"></script>
<script src="node_modules/@azure/ms-rest-azure-js/dist/msRestAzure.js"></script>
<script src="node_modules/@azure/core-http/dist/coreHttp.browser.js"></script>
<script src="node_modules/@azure/core-arm/dist/coreArm.js"></script>
<script src="node_modules/@azure/ms-rest-browserauth/dist/msAuth.js"></script>
<script src="node_modules/@azure/arm-features/dist/arm-features.js"></script>
<script type="text/javascript">
Expand Down
4 changes: 2 additions & 2 deletions sdk/features/arm-features/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
"description": "FeatureClient Library with typescript type definitions for node.js and browser.",
"version": "1.0.3",
"dependencies": {
"@azure/ms-rest-azure-js": "^1.3.2",
"@azure/ms-rest-js": "^1.8.1",
"@azure/core-arm": "^1.0.0-preview.1",
"@azure/core-http": "^1.0.0-preview.1",
"tslib": "^1.9.3"
},
"keywords": [
Expand Down
8 changes: 4 additions & 4 deletions sdk/features/arm-features/rollup.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,17 @@ import sourcemaps from "rollup-plugin-sourcemaps";
const config = {
input: "./esm/featureClient.js",
external: [
"@azure/ms-rest-js",
"@azure/ms-rest-azure-js"
"@azure/core-http",
"@azure/core-arm"
],
output: {
file: "./dist/arm-features.js",
format: "umd",
name: "Azure.ArmFeatures",
sourcemap: true,
globals: {
"@azure/ms-rest-js": "msRest",
"@azure/ms-rest-azure-js": "msRestAzure"
"@azure/core-http": "coreHttp",
"@azure/core-arm": "coreArm"
},
banner: `/*
* Copyright (c) Microsoft Corporation. All rights reserved.
Expand Down
26 changes: 13 additions & 13 deletions sdk/features/arm-features/src/featureClient.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
* regenerated.
*/

import * as msRest from "@azure/ms-rest-js";
import * as coreHttp from "@azure/core-http";
import * as Models from "./models";
import * as Mappers from "./models/mappers";
import * as Parameters from "./models/parameters";
Expand All @@ -26,7 +26,7 @@ class FeatureClient extends FeatureClientContext {
* @param subscriptionId The ID of the target subscription.
* @param [options] The parameter options
*/
constructor(credentials: msRest.ServiceClientCredentials, subscriptionId: string, options?: Models.FeatureClientOptions) {
constructor(credentials: coreHttp.ServiceClientCredentials | coreHttp.TokenCredential, subscriptionId: string, options?: Models.FeatureClientOptions) {
super(credentials, subscriptionId, options);
this.features = new operations.Features(this);
}
Expand All @@ -36,17 +36,17 @@ class FeatureClient extends FeatureClientContext {
* @param [options] The optional parameters
* @returns Promise<Models.ListOperationsResponse>
*/
listOperations(options?: msRest.RequestOptionsBase): Promise<Models.ListOperationsResponse>;
listOperations(options?: coreHttp.RequestOptionsBase): Promise<Models.ListOperationsResponse>;
/**
* @param callback The callback
*/
listOperations(callback: msRest.ServiceCallback<Models.OperationListResult>): void;
listOperations(callback: coreHttp.ServiceCallback<Models.OperationListResult>): void;
/**
* @param options The optional parameters
* @param callback The callback
*/
listOperations(options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.OperationListResult>): void;
listOperations(options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.OperationListResult>, callback?: msRest.ServiceCallback<Models.OperationListResult>): Promise<Models.ListOperationsResponse> {
listOperations(options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.OperationListResult>): void;
listOperations(options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.OperationListResult>, callback?: coreHttp.ServiceCallback<Models.OperationListResult>): Promise<Models.ListOperationsResponse> {
return this.sendOperationRequest(
{
options
Expand All @@ -61,19 +61,19 @@ class FeatureClient extends FeatureClientContext {
* @param [options] The optional parameters
* @returns Promise<Models.ListOperationsNextResponse>
*/
listOperationsNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.ListOperationsNextResponse>;
listOperationsNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ListOperationsNextResponse>;
/**
* @param nextPageLink The NextLink from the previous successful call to List operation.
* @param callback The callback
*/
listOperationsNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.OperationListResult>): void;
listOperationsNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.OperationListResult>): void;
/**
* @param nextPageLink The NextLink from the previous successful call to List operation.
* @param options The optional parameters
* @param callback The callback
*/
listOperationsNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.OperationListResult>): void;
listOperationsNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.OperationListResult>, callback?: msRest.ServiceCallback<Models.OperationListResult>): Promise<Models.ListOperationsNextResponse> {
listOperationsNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.OperationListResult>): void;
listOperationsNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.OperationListResult>, callback?: coreHttp.ServiceCallback<Models.OperationListResult>): Promise<Models.ListOperationsNextResponse> {
return this.sendOperationRequest(
{
nextPageLink,
Expand All @@ -85,8 +85,8 @@ class FeatureClient extends FeatureClientContext {
}

// Operation Specifications
const serializer = new msRest.Serializer(Mappers);
const listOperationsOperationSpec: msRest.OperationSpec = {
const serializer = new coreHttp.Serializer(Mappers);
const listOperationsOperationSpec: coreHttp.OperationSpec = {
httpMethod: "GET",
path: "providers/Microsoft.Features/operations",
queryParameters: [
Expand All @@ -106,7 +106,7 @@ const listOperationsOperationSpec: msRest.OperationSpec = {
serializer
};

const listOperationsNextOperationSpec: msRest.OperationSpec = {
const listOperationsNextOperationSpec: coreHttp.OperationSpec = {
httpMethod: "GET",
baseUrl: "https://management.azure.com",
path: "{nextLink}",
Expand Down
12 changes: 6 additions & 6 deletions sdk/features/arm-features/src/featureClientContext.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@
*/

import * as Models from "./models";
import * as msRest from "@azure/ms-rest-js";
import * as msRestAzure from "@azure/ms-rest-azure-js";
import * as coreHttp from "@azure/core-http";
import * as coreArm from "@azure/core-arm";

const packageName = "@azure/arm-features";
const packageVersion = "1.0.3";

export class FeatureClientContext extends msRestAzure.AzureServiceClient {
credentials: msRest.ServiceClientCredentials;
export class FeatureClientContext extends coreArm.AzureServiceClient {
credentials: coreHttp.ServiceClientCredentials | coreHttp.TokenCredential;
subscriptionId: string;
apiVersion?: string;

Expand All @@ -26,7 +26,7 @@ export class FeatureClientContext extends msRestAzure.AzureServiceClient {
* @param subscriptionId The ID of the target subscription.
* @param [options] The parameter options
*/
constructor(credentials: msRest.ServiceClientCredentials, subscriptionId: string, options?: Models.FeatureClientOptions) {
constructor(credentials: coreHttp.ServiceClientCredentials | coreHttp.TokenCredential, subscriptionId: string, options?: Models.FeatureClientOptions) {
if (credentials == undefined) {
throw new Error('\'credentials\' cannot be null.');
}
Expand All @@ -38,7 +38,7 @@ export class FeatureClientContext extends msRestAzure.AzureServiceClient {
options = {};
}
if(!options.userAgent) {
const defaultUserAgent = msRestAzure.getDefaultUserAgentValue();
const defaultUserAgent = coreArm.getDefaultUserAgentValue();
options.userAgent = `${packageName}/${packageVersion} ${defaultUserAgent}`;
}

Expand Down
20 changes: 10 additions & 10 deletions sdk/features/arm-features/src/models/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
* Changes may cause incorrect behavior and will be lost if the code is regenerated.
*/

import { BaseResource, CloudError, AzureServiceClientOptions } from "@azure/ms-rest-azure-js";
import * as msRest from "@azure/ms-rest-js";
import { BaseResource, CloudError, AzureServiceClientOptions } from "@azure/core-arm";
import * as coreHttp from "@azure/core-http";

export { BaseResource, CloudError };

Expand Down Expand Up @@ -114,7 +114,7 @@ export type ListOperationsResponse = OperationListResult & {
/**
* The underlying HTTP response.
*/
_response: msRest.HttpResponse & {
_response: coreHttp.HttpResponse & {
/**
* The response body as text (string format)
*/
Expand All @@ -134,7 +134,7 @@ export type ListOperationsNextResponse = OperationListResult & {
/**
* The underlying HTTP response.
*/
_response: msRest.HttpResponse & {
_response: coreHttp.HttpResponse & {
/**
* The response body as text (string format)
*/
Expand All @@ -154,7 +154,7 @@ export type FeaturesListAllResponse = FeatureOperationsListResult & {
/**
* The underlying HTTP response.
*/
_response: msRest.HttpResponse & {
_response: coreHttp.HttpResponse & {
/**
* The response body as text (string format)
*/
Expand All @@ -174,7 +174,7 @@ export type FeaturesListResponse = FeatureOperationsListResult & {
/**
* The underlying HTTP response.
*/
_response: msRest.HttpResponse & {
_response: coreHttp.HttpResponse & {
/**
* The response body as text (string format)
*/
Expand All @@ -194,7 +194,7 @@ export type FeaturesGetResponse = FeatureResult & {
/**
* The underlying HTTP response.
*/
_response: msRest.HttpResponse & {
_response: coreHttp.HttpResponse & {
/**
* The response body as text (string format)
*/
Expand All @@ -214,7 +214,7 @@ export type FeaturesRegisterResponse = FeatureResult & {
/**
* The underlying HTTP response.
*/
_response: msRest.HttpResponse & {
_response: coreHttp.HttpResponse & {
/**
* The response body as text (string format)
*/
Expand All @@ -234,7 +234,7 @@ export type FeaturesListAllNextResponse = FeatureOperationsListResult & {
/**
* The underlying HTTP response.
*/
_response: msRest.HttpResponse & {
_response: coreHttp.HttpResponse & {
/**
* The response body as text (string format)
*/
Expand All @@ -254,7 +254,7 @@ export type FeaturesListNextResponse = FeatureOperationsListResult & {
/**
* The underlying HTTP response.
*/
_response: msRest.HttpResponse & {
_response: coreHttp.HttpResponse & {
/**
* The response body as text (string format)
*/
Expand Down
16 changes: 8 additions & 8 deletions sdk/features/arm-features/src/models/mappers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@
* Changes may cause incorrect behavior and will be lost if the code is regenerated.
*/

import { CloudErrorMapper, BaseResourceMapper } from "@azure/ms-rest-azure-js";
import * as msRest from "@azure/ms-rest-js";
import { CloudErrorMapper, BaseResourceMapper } from "@azure/core-arm";
import * as coreHttp from "@azure/core-http";

export const CloudError = CloudErrorMapper;
export const BaseResource = BaseResourceMapper;

export const FeatureProperties: msRest.CompositeMapper = {
export const FeatureProperties: coreHttp.CompositeMapper = {
serializedName: "FeatureProperties",
type: {
name: "Composite",
Expand All @@ -28,7 +28,7 @@ export const FeatureProperties: msRest.CompositeMapper = {
}
};

export const FeatureResult: msRest.CompositeMapper = {
export const FeatureResult: coreHttp.CompositeMapper = {
serializedName: "FeatureResult",
type: {
name: "Composite",
Expand Down Expand Up @@ -63,7 +63,7 @@ export const FeatureResult: msRest.CompositeMapper = {
}
};

export const OperationDisplay: msRest.CompositeMapper = {
export const OperationDisplay: coreHttp.CompositeMapper = {
serializedName: "Operation_display",
type: {
name: "Composite",
Expand Down Expand Up @@ -91,7 +91,7 @@ export const OperationDisplay: msRest.CompositeMapper = {
}
};

export const Operation: msRest.CompositeMapper = {
export const Operation: coreHttp.CompositeMapper = {
serializedName: "Operation",
type: {
name: "Composite",
Expand All @@ -114,7 +114,7 @@ export const Operation: msRest.CompositeMapper = {
}
};

export const OperationListResult: msRest.CompositeMapper = {
export const OperationListResult: coreHttp.CompositeMapper = {
serializedName: "OperationListResult",
type: {
name: "Composite",
Expand Down Expand Up @@ -142,7 +142,7 @@ export const OperationListResult: msRest.CompositeMapper = {
}
};

export const FeatureOperationsListResult: msRest.CompositeMapper = {
export const FeatureOperationsListResult: coreHttp.CompositeMapper = {
serializedName: "FeatureOperationsListResult",
type: {
name: "Composite",
Expand Down
14 changes: 7 additions & 7 deletions sdk/features/arm-features/src/models/parameters.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
* regenerated.
*/

import * as msRest from "@azure/ms-rest-js";
import * as coreHttp from "@azure/core-http";

export const acceptLanguage: msRest.OperationParameter = {
export const acceptLanguage: coreHttp.OperationParameter = {
parameterPath: "acceptLanguage",
mapper: {
serializedName: "accept-language",
Expand All @@ -20,7 +20,7 @@ export const acceptLanguage: msRest.OperationParameter = {
}
}
};
export const apiVersion: msRest.OperationQueryParameter = {
export const apiVersion: coreHttp.OperationQueryParameter = {
parameterPath: "apiVersion",
mapper: {
required: true,
Expand All @@ -30,7 +30,7 @@ export const apiVersion: msRest.OperationQueryParameter = {
}
}
};
export const featureName: msRest.OperationURLParameter = {
export const featureName: coreHttp.OperationURLParameter = {
parameterPath: "featureName",
mapper: {
required: true,
Expand All @@ -40,7 +40,7 @@ export const featureName: msRest.OperationURLParameter = {
}
}
};
export const nextPageLink: msRest.OperationURLParameter = {
export const nextPageLink: coreHttp.OperationURLParameter = {
parameterPath: "nextPageLink",
mapper: {
required: true,
Expand All @@ -51,7 +51,7 @@ export const nextPageLink: msRest.OperationURLParameter = {
},
skipEncoding: true
};
export const resourceProviderNamespace: msRest.OperationURLParameter = {
export const resourceProviderNamespace: coreHttp.OperationURLParameter = {
parameterPath: "resourceProviderNamespace",
mapper: {
required: true,
Expand All @@ -61,7 +61,7 @@ export const resourceProviderNamespace: msRest.OperationURLParameter = {
}
}
};
export const subscriptionId: msRest.OperationURLParameter = {
export const subscriptionId: coreHttp.OperationURLParameter = {
parameterPath: "subscriptionId",
mapper: {
required: true,
Expand Down
Loading