Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[ReleasePR @azure/arm-cdn] Make origin a ProxyResource instead of TrackedResource #10110

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
2 changes: 1 addition & 1 deletion sdk/cdn/arm-cdn/LICENSE.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The MIT License (MIT)

Copyright (c) 2019 Microsoft
Copyright (c) 2020 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
Expand Down
6 changes: 3 additions & 3 deletions sdk/cdn/arm-cdn/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,9 @@ npm install @azure/arm-cdn

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

- Please install minimum version of `"@azure/ms-rest-nodeauth": "^3.0.0"`.
```bash
npm install @azure/ms-rest-nodeauth
npm install @azure/ms-rest-nodeauth@"^3.0.0"
```

##### Sample code
Expand Down Expand Up @@ -95,5 +96,4 @@ See https://github.com/Azure/ms-rest-browserauth to learn how to authenticate to

- [Microsoft Azure SDK for Javascript](https://github.com/Azure/azure-sdk-for-js)


![Impressions](https://azure-sdk-impressions.azurewebsites.net/api/impressions/azure-sdk-for-js%2Fsdk%2Fcdn%2Farm-cdn%2FREADME.png)
![Impressions](https://azure-sdk-impressions.azurewebsites.net/api/impressions/azure-sdk-for-js/sdk/cdn/arm-cdn/README.png)
20 changes: 10 additions & 10 deletions sdk/cdn/arm-cdn/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
"description": "CdnManagementClient Library with typescript type definitions for node.js and browser.",
"version": "4.2.0",
"dependencies": {
"@azure/ms-rest-azure-js": "^1.3.2",
"@azure/ms-rest-js": "^1.6.0",
"tslib": "^1.9.3"
"@azure/ms-rest-azure-js": "^2.0.1",
"@azure/ms-rest-js": "^2.0.4",
"tslib": "^1.10.0"
},
"keywords": [
"node",
Expand All @@ -20,19 +20,19 @@
"module": "./esm/cdnManagementClient.js",
"types": "./esm/cdnManagementClient.d.ts",
"devDependencies": {
"typescript": "^3.1.1",
"rollup": "^0.66.2",
"rollup-plugin-node-resolve": "^3.4.0",
"typescript": "^3.5.3",
"rollup": "^1.18.0",
"rollup-plugin-node-resolve": "^5.2.0",
"rollup-plugin-sourcemaps": "^0.4.2",
"uglify-js": "^3.4.9"
"uglify-js": "^3.6.0"
},
"homepage": "https://github.com/azure/azure-sdk-for-js/tree/master/sdk/cdn/arm-cdn",
"homepage": "https://github.com/Azure/azure-sdk-for-js/tree/master/sdk/cdn/arm-cdn",
"repository": {
"type": "git",
"url": "https://github.com/azure/azure-sdk-for-js.git"
"url": "https://github.com/Azure/azure-sdk-for-js.git"
},
"bugs": {
"url": "https://github.com/azure/azure-sdk-for-js/issues"
"url": "https://github.com/Azure/azure-sdk-for-js/issues"
},
"files": [
"dist/**/*.js",
Expand Down
2 changes: 1 addition & 1 deletion sdk/cdn/arm-cdn/rollup.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ const config = {
*/`
},
plugins: [
nodeResolve({ module: true }),
nodeResolve({ mainFields: ['module', 'main'] }),
sourcemaps()
]
};
Expand Down
13 changes: 11 additions & 2 deletions sdk/cdn/arm-cdn/src/cdnManagementClient.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,26 +21,35 @@ class CdnManagementClient extends CdnManagementClientContext {
profiles: operations.Profiles;
endpoints: operations.Endpoints;
origins: operations.Origins;
originGroups: operations.OriginGroups;
customDomains: operations.CustomDomains;
resourceUsage: operations.ResourceUsageOperations;
operations: operations.Operations;
edgeNodes: operations.EdgeNodes;
policies: operations.Policies;
managedRuleSets: operations.ManagedRuleSets;

/**
* Initializes a new instance of the CdnManagementClient class.
* @param credentials Credentials needed for the client to connect to Azure.
* @param subscriptionId Azure Subscription ID.
* @param subscriptionId1 Azure Subscription ID.
* @param apiVersion1 Version of the API to be used with the client request. Current version is
* 2017-04-02.
* @param [options] The parameter options
*/
constructor(credentials: msRest.ServiceClientCredentials, subscriptionId: string, options?: Models.CdnManagementClientOptions) {
super(credentials, subscriptionId, options);
constructor(credentials: msRest.ServiceClientCredentials, subscriptionId: string, subscriptionId1: string, apiVersion1: string, options?: Models.CdnManagementClientOptions) {
super(credentials, subscriptionId, subscriptionId1, apiVersion1, options);
this.profiles = new operations.Profiles(this);
this.endpoints = new operations.Endpoints(this);
this.origins = new operations.Origins(this);
this.originGroups = new operations.OriginGroups(this);
this.customDomains = new operations.CustomDomains(this);
this.resourceUsage = new operations.ResourceUsageOperations(this);
this.operations = new operations.Operations(this);
this.edgeNodes = new operations.EdgeNodes(this);
this.policies = new operations.Policies(this);
this.managedRuleSets = new operations.ManagedRuleSets(this);
}

/**
Expand Down
17 changes: 15 additions & 2 deletions sdk/cdn/arm-cdn/src/cdnManagementClientContext.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,20 +19,31 @@ export class CdnManagementClientContext extends msRestAzure.AzureServiceClient {
credentials: msRest.ServiceClientCredentials;
subscriptionId: string;
apiVersion?: string;
subscriptionId1: string;
apiVersion1: string;

/**
* Initializes a new instance of the CdnManagementClient class.
* @param credentials Credentials needed for the client to connect to Azure.
* @param subscriptionId Azure Subscription ID.
* @param subscriptionId1 Azure Subscription ID.
* @param apiVersion1 Version of the API to be used with the client request. Current version is
* 2017-04-02.
* @param [options] The parameter options
*/
constructor(credentials: msRest.ServiceClientCredentials, subscriptionId: string, options?: Models.CdnManagementClientOptions) {
constructor(credentials: msRest.ServiceClientCredentials, subscriptionId: string, subscriptionId1: string, apiVersion1: string, options?: Models.CdnManagementClientOptions) {
if (credentials == undefined) {
throw new Error('\'credentials\' cannot be null.');
}
if (subscriptionId == undefined) {
throw new Error('\'subscriptionId\' cannot be null.');
}
if (subscriptionId1 == undefined) {
throw new Error('\'subscriptionId1\' cannot be null.');
}
if (apiVersion1 == undefined) {
throw new Error('\'apiVersion1\' cannot be null.');
}

if (!options) {
options = {};
Expand All @@ -44,13 +55,15 @@ export class CdnManagementClientContext extends msRestAzure.AzureServiceClient {

super(credentials, options);

this.apiVersion = '2017-10-12';
this.apiVersion = '2020-04-15';
this.acceptLanguage = 'en-US';
this.longRunningOperationRetryTimeout = 30;
this.baseUri = options.baseUri || this.baseUri || "https://management.azure.com";
this.requestContentType = "application/json; charset=utf-8";
this.credentials = credentials;
this.subscriptionId = subscriptionId;
this.subscriptionId1 = subscriptionId1;
this.apiVersion1 = apiVersion1;

if(options.acceptLanguage !== null && options.acceptLanguage !== undefined) {
this.acceptLanguage = options.acceptLanguage;
Expand Down
63 changes: 61 additions & 2 deletions sdk/cdn/arm-cdn/src/models/customDomainsMappers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,37 +10,96 @@ export {
discriminators,
BaseResource,
CacheExpirationActionParameters,
CacheKeyQueryStringActionParameters,
CdnCertificateSourceParameters,
CdnEndpoint,
CdnManagedHttpsParameters,
CdnWebApplicationFirewallPolicy,
CdnWebApplicationFirewallPolicyPatchParameters,
CidrIpAddress,
CookiesMatchConditionParameters,
CustomDomain,
CustomDomainHttpsParameters,
CustomDomainListResult,
CustomDomainParameters,
CustomRule,
CustomRuleList,
DeepCreatedOrigin,
DeepCreatedOriginGroup,
DeliveryRule,
DeliveryRuleAction,
DeliveryRuleCacheExpirationAction,
DeliveryRuleCacheKeyQueryStringAction,
DeliveryRuleCondition,
DeliveryRuleCookiesCondition,
DeliveryRuleHttpVersionCondition,
DeliveryRuleIsDeviceCondition,
DeliveryRulePostArgsCondition,
DeliveryRuleQueryStringCondition,
DeliveryRuleRemoteAddressCondition,
DeliveryRuleRequestBodyCondition,
DeliveryRuleRequestHeaderAction,
DeliveryRuleRequestHeaderCondition,
DeliveryRuleRequestMethodCondition,
DeliveryRuleRequestSchemeCondition,
DeliveryRuleRequestUriCondition,
DeliveryRuleResponseHeaderAction,
DeliveryRuleUrlFileExtensionCondition,
DeliveryRuleUrlFileNameCondition,
DeliveryRuleUrlPathCondition,
EdgeNode,
Endpoint,
EndpointPropertiesUpdateParametersDeliveryPolicy,
EndpointPropertiesUpdateParametersWebApplicationFirewallPolicyLink,
EndpointUpdateParameters,
ErrorResponse,
GeoFilter,
HeaderActionParameters,
HealthProbeParameters,
HttpErrorRangeParameters,
HttpVersionMatchConditionParameters,
IpAddressGroup,
IsDeviceMatchConditionParameters,
KeyVaultCertificateSourceParameters,
KeyVaultSigningKeyParameters,
ManagedRuleDefinition,
ManagedRuleGroupDefinition,
ManagedRuleGroupOverride,
ManagedRuleOverride,
ManagedRuleSet,
ManagedRuleSetDefinition,
ManagedRuleSetList,
MatchCondition,
Origin,
OriginGroup,
OriginGroupUpdateParameters,
OriginUpdateParameters,
PolicySettings,
PostArgsMatchConditionParameters,
Profile,
ProfileUpdateParameters,
ProxyResource,
QueryStringMatchConditionParameters,
RateLimitRule,
RateLimitRuleList,
RemoteAddressMatchConditionParameters,
RequestBodyMatchConditionParameters,
RequestHeaderMatchConditionParameters,
RequestMethodMatchConditionParameters,
RequestSchemeMatchConditionParameters,
RequestUriMatchConditionParameters,
Resource,
ResourceReference,
ResponseBasedOriginErrorDetectionParameters,
Sku,
TrackedResource,
UrlFileExtensionConditionParameters,
UrlPathConditionParameters,
UrlFileExtensionMatchConditionParameters,
UrlFileNameMatchConditionParameters,
UrlPathMatchConditionParameters,
UrlRedirectAction,
UrlRedirectActionParameters,
UrlRewriteAction,
UrlRewriteActionParameters,
UrlSigningKey,
UserManagedHttpsParameters
} from "../models/mappers";
63 changes: 61 additions & 2 deletions sdk/cdn/arm-cdn/src/models/edgeNodesMappers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,31 +10,90 @@ export {
discriminators,
BaseResource,
CacheExpirationActionParameters,
CacheKeyQueryStringActionParameters,
CdnEndpoint,
CdnWebApplicationFirewallPolicy,
CdnWebApplicationFirewallPolicyPatchParameters,
CidrIpAddress,
CookiesMatchConditionParameters,
CustomDomain,
CustomRule,
CustomRuleList,
DeepCreatedOrigin,
DeepCreatedOriginGroup,
DeliveryRule,
DeliveryRuleAction,
DeliveryRuleCacheExpirationAction,
DeliveryRuleCacheKeyQueryStringAction,
DeliveryRuleCondition,
DeliveryRuleCookiesCondition,
DeliveryRuleHttpVersionCondition,
DeliveryRuleIsDeviceCondition,
DeliveryRulePostArgsCondition,
DeliveryRuleQueryStringCondition,
DeliveryRuleRemoteAddressCondition,
DeliveryRuleRequestBodyCondition,
DeliveryRuleRequestHeaderAction,
DeliveryRuleRequestHeaderCondition,
DeliveryRuleRequestMethodCondition,
DeliveryRuleRequestSchemeCondition,
DeliveryRuleRequestUriCondition,
DeliveryRuleResponseHeaderAction,
DeliveryRuleUrlFileExtensionCondition,
DeliveryRuleUrlFileNameCondition,
DeliveryRuleUrlPathCondition,
EdgeNode,
EdgenodeResult,
Endpoint,
EndpointPropertiesUpdateParametersDeliveryPolicy,
EndpointPropertiesUpdateParametersWebApplicationFirewallPolicyLink,
EndpointUpdateParameters,
ErrorResponse,
GeoFilter,
HeaderActionParameters,
HealthProbeParameters,
HttpErrorRangeParameters,
HttpVersionMatchConditionParameters,
IpAddressGroup,
IsDeviceMatchConditionParameters,
KeyVaultSigningKeyParameters,
ManagedRuleDefinition,
ManagedRuleGroupDefinition,
ManagedRuleGroupOverride,
ManagedRuleOverride,
ManagedRuleSet,
ManagedRuleSetDefinition,
ManagedRuleSetList,
MatchCondition,
Origin,
OriginGroup,
OriginGroupUpdateParameters,
OriginUpdateParameters,
PolicySettings,
PostArgsMatchConditionParameters,
Profile,
ProfileUpdateParameters,
ProxyResource,
QueryStringMatchConditionParameters,
RateLimitRule,
RateLimitRuleList,
RemoteAddressMatchConditionParameters,
RequestBodyMatchConditionParameters,
RequestHeaderMatchConditionParameters,
RequestMethodMatchConditionParameters,
RequestSchemeMatchConditionParameters,
RequestUriMatchConditionParameters,
Resource,
ResourceReference,
ResponseBasedOriginErrorDetectionParameters,
Sku,
TrackedResource,
UrlFileExtensionConditionParameters,
UrlPathConditionParameters
UrlFileExtensionMatchConditionParameters,
UrlFileNameMatchConditionParameters,
UrlPathMatchConditionParameters,
UrlRedirectAction,
UrlRedirectActionParameters,
UrlRewriteAction,
UrlRewriteActionParameters,
UrlSigningKey
} from "../models/mappers";
Loading