Skip to content

Commit b11667d

Browse files
author
SDKAuto
committed
CodeGen from PR 11669 in Azure/azure-rest-api-specs
Merge 8ca705121a02efc689365b127ac92189673771cc into 48e7415267518cc2b92f6e6002466f676bdef1a5
1 parent 13d712a commit b11667d

20 files changed

+2346
-2826
lines changed

sdk/containerservice/arm-containerservice/README.md

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ npm install @azure/arm-containerservice
1515

1616
### How to use
1717

18-
#### nodejs - Authentication, client creation and list openShiftManagedClusters as an example written in TypeScript.
18+
#### nodejs - client creation and list operations as an example written in TypeScript.
1919

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

@@ -26,16 +26,15 @@ npm install @azure/ms-rest-nodeauth@"^3.0.0"
2626

2727
##### Sample code
2828

29+
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
2930
```typescript
30-
import * as msRest from "@azure/ms-rest-js";
31-
import * as msRestAzure from "@azure/ms-rest-azure-js";
32-
import * as msRestNodeAuth from "@azure/ms-rest-nodeauth";
33-
import { ContainerServiceClient, ContainerServiceModels, ContainerServiceMappers } from "@azure/arm-containerservice";
31+
const msRestNodeAuth = require("@azure/ms-rest-nodeauth");
32+
const { ContainerServiceClient } = require("@azure/arm-containerservice");
3433
const subscriptionId = process.env["AZURE_SUBSCRIPTION_ID"];
3534

3635
msRestNodeAuth.interactiveLogin().then((creds) => {
3736
const client = new ContainerServiceClient(creds, subscriptionId);
38-
client.openShiftManagedClusters.list().then((result) => {
37+
client.operations.list().then((result) => {
3938
console.log("The result is:");
4039
console.log(result);
4140
});
@@ -44,7 +43,7 @@ msRestNodeAuth.interactiveLogin().then((creds) => {
4443
});
4544
```
4645

47-
#### browser - Authentication, client creation and list openShiftManagedClusters as an example written in JavaScript.
46+
#### browser - Authentication, client creation and list operations as an example written in JavaScript.
4847

4948
##### Install @azure/ms-rest-browserauth
5049

@@ -78,7 +77,7 @@ See https://github.com/Azure/ms-rest-browserauth to learn how to authenticate to
7877
authManager.login();
7978
}
8079
const client = new Azure.ArmContainerservice.ContainerServiceClient(res.creds, subscriptionId);
81-
client.openShiftManagedClusters.list().then((result) => {
80+
client.operations.list().then((result) => {
8281
console.log("The result is:");
8382
console.log(result);
8483
}).catch((err) => {

sdk/containerservice/arm-containerservice/rollup.config.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ const config = {
2121
"@azure/ms-rest-azure-js": "msRestAzure"
2222
},
2323
banner: `/*
24-
* Copyright (c) Microsoft Corporation. All rights reserved.
25-
* Licensed under the MIT License. See License.txt in the project root for license information.
24+
* Copyright (c) Microsoft Corporation.
25+
* Licensed under the MIT License.
2626
*
2727
* Code generated by Microsoft (R) AutoRest Code Generator.
2828
* Changes may cause incorrect behavior and will be lost if the code is regenerated.

sdk/containerservice/arm-containerservice/src/containerServiceClient.ts

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
/*
2-
* Copyright (c) Microsoft Corporation. All rights reserved.
3-
* Licensed under the MIT License. See License.txt in the project root for
4-
* license information.
2+
* Copyright (c) Microsoft Corporation.
3+
* Licensed under the MIT License.
54
*
65
* Code generated by Microsoft (R) AutoRest Code Generator.
76
* Changes may cause incorrect behavior and will be lost if the code is
@@ -17,12 +16,12 @@ import { ContainerServiceClientContext } from "./containerServiceClientContext";
1716

1817
class ContainerServiceClient extends ContainerServiceClientContext {
1918
// Operation groups
20-
openShiftManagedClusters: operations.OpenShiftManagedClusters;
21-
containerServices: operations.ContainerServices;
2219
operations: operations.Operations;
2320
managedClusters: operations.ManagedClusters;
2421
agentPools: operations.AgentPools;
2522
privateEndpointConnections: operations.PrivateEndpointConnections;
23+
privateLinkResources: operations.PrivateLinkResources;
24+
resolvePrivateLinkServiceId: operations.ResolvePrivateLinkServiceId;
2625

2726
/**
2827
* Initializes a new instance of the ContainerServiceClient class.
@@ -33,12 +32,12 @@ class ContainerServiceClient extends ContainerServiceClientContext {
3332
*/
3433
constructor(credentials: msRest.ServiceClientCredentials, subscriptionId: string, options?: Models.ContainerServiceClientOptions) {
3534
super(credentials, subscriptionId, options);
36-
this.openShiftManagedClusters = new operations.OpenShiftManagedClusters(this);
37-
this.containerServices = new operations.ContainerServices(this);
3835
this.operations = new operations.Operations(this);
3936
this.managedClusters = new operations.ManagedClusters(this);
4037
this.agentPools = new operations.AgentPools(this);
4138
this.privateEndpointConnections = new operations.PrivateEndpointConnections(this);
39+
this.privateLinkResources = new operations.PrivateLinkResources(this);
40+
this.resolvePrivateLinkServiceId = new operations.ResolvePrivateLinkServiceId(this);
4241
}
4342
}
4443

sdk/containerservice/arm-containerservice/src/containerServiceClientContext.ts

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
/*
2-
* Copyright (c) Microsoft Corporation. All rights reserved.
3-
* Licensed under the MIT License. See License.txt in the project root for
4-
* license information.
2+
* Copyright (c) Microsoft Corporation.
3+
* Licensed under the MIT License.
54
*
65
* Code generated by Microsoft (R) AutoRest Code Generator.
76
* Changes may cause incorrect behavior and will be lost if the code is
@@ -18,6 +17,7 @@ const packageVersion = "11.2.0";
1817
export class ContainerServiceClientContext extends msRestAzure.AzureServiceClient {
1918
credentials: msRest.ServiceClientCredentials;
2019
subscriptionId: string;
20+
apiVersion?: string;
2121

2222
/**
2323
* Initializes a new instance of the ContainerServiceClient class.
@@ -37,24 +37,25 @@ export class ContainerServiceClientContext extends msRestAzure.AzureServiceClien
3737
if (!options) {
3838
options = {};
3939
}
40-
if (!options.userAgent) {
40+
if(!options.userAgent) {
4141
const defaultUserAgent = msRestAzure.getDefaultUserAgentValue();
4242
options.userAgent = `${packageName}/${packageVersion} ${defaultUserAgent}`;
4343
}
4444

4545
super(credentials, options);
4646

47+
this.apiVersion = '2020-11-01';
4748
this.acceptLanguage = 'en-US';
4849
this.longRunningOperationRetryTimeout = 30;
4950
this.baseUri = options.baseUri || this.baseUri || "https://management.azure.com";
5051
this.requestContentType = "application/json; charset=utf-8";
5152
this.credentials = credentials;
5253
this.subscriptionId = subscriptionId;
5354

54-
if (options.acceptLanguage !== null && options.acceptLanguage !== undefined) {
55+
if(options.acceptLanguage !== null && options.acceptLanguage !== undefined) {
5556
this.acceptLanguage = options.acceptLanguage;
5657
}
57-
if (options.longRunningOperationRetryTimeout !== null && options.longRunningOperationRetryTimeout !== undefined) {
58+
if(options.longRunningOperationRetryTimeout !== null && options.longRunningOperationRetryTimeout !== undefined) {
5859
this.longRunningOperationRetryTimeout = options.longRunningOperationRetryTimeout;
5960
}
6061
}
Lines changed: 11 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
/*
2-
* Copyright (c) Microsoft Corporation. All rights reserved.
3-
* Licensed under the MIT License. See License.txt in the project root for license information.
2+
* Copyright (c) Microsoft Corporation.
3+
* Licensed under the MIT License.
44
*
55
* Code generated by Microsoft (R) AutoRest Code Generator.
66
* Changes may cause incorrect behavior and will be lost if the code is regenerated.
77
*/
88

99
export {
10-
discriminators,
1110
AgentPool,
1211
AgentPoolAvailableVersions,
1312
AgentPoolAvailableVersionsPropertiesAgentPoolVersionsItem,
@@ -17,20 +16,12 @@ export {
1716
AgentPoolUpgradeSettings,
1817
BaseResource,
1918
CloudError,
20-
ContainerService,
21-
ContainerServiceAgentPoolProfile,
22-
ContainerServiceCustomProfile,
23-
ContainerServiceDiagnosticsProfile,
2419
ContainerServiceLinuxProfile,
25-
ContainerServiceMasterProfile,
2620
ContainerServiceNetworkProfile,
27-
ContainerServiceOrchestratorProfile,
28-
ContainerServiceServicePrincipalProfile,
2921
ContainerServiceSshConfiguration,
3022
ContainerServiceSshPublicKey,
31-
ContainerServiceVMDiagnostics,
32-
ContainerServiceWindowsProfile,
33-
KeyVaultSecretRef,
23+
KubeletConfig,
24+
LinuxOSConfig,
3425
ManagedCluster,
3526
ManagedClusterAADProfile,
3627
ManagedClusterAccessProfile,
@@ -39,32 +30,29 @@ export {
3930
ManagedClusterAgentPoolProfile,
4031
ManagedClusterAgentPoolProfileProperties,
4132
ManagedClusterAPIServerAccessProfile,
33+
ManagedClusterAutoUpgradeProfile,
4234
ManagedClusterIdentity,
4335
ManagedClusterIdentityUserAssignedIdentitiesValue,
4436
ManagedClusterLoadBalancerProfile,
4537
ManagedClusterLoadBalancerProfileManagedOutboundIPs,
4638
ManagedClusterLoadBalancerProfileOutboundIPPrefixes,
4739
ManagedClusterLoadBalancerProfileOutboundIPs,
40+
ManagedClusterPodIdentity,
41+
ManagedClusterPodIdentityException,
42+
ManagedClusterPodIdentityProfile,
43+
ManagedClusterPodIdentityProvisioningInfo,
4844
ManagedClusterPropertiesAutoScalerProfile,
4945
ManagedClusterPropertiesIdentityProfileValue,
5046
ManagedClusterServicePrincipalProfile,
5147
ManagedClusterSKU,
5248
ManagedClusterWindowsProfile,
53-
NetworkProfile,
54-
OpenShiftManagedCluster,
55-
OpenShiftManagedClusterAADIdentityProvider,
56-
OpenShiftManagedClusterAgentPoolProfile,
57-
OpenShiftManagedClusterAuthProfile,
58-
OpenShiftManagedClusterBaseIdentityProvider,
59-
OpenShiftManagedClusterIdentityProvider,
60-
OpenShiftManagedClusterMasterPoolProfile,
61-
OpenShiftRouterProfile,
49+
PowerState,
6250
PrivateEndpoint,
6351
PrivateEndpointConnection,
6452
PrivateLinkServiceConnectionState,
65-
PurchasePlan,
6653
Resource,
6754
ResourceReference,
6855
SubResource,
56+
SysctlConfig,
6957
UserAssignedIdentity
7058
} from "../models/mappers";

0 commit comments

Comments
 (0)