Skip to content

Commit af0330b

Browse files
authored
containerinstance-track1 (Azure#17866)
1 parent e3ca22d commit af0330b

File tree

7 files changed

+157
-33
lines changed

7 files changed

+157
-33
lines changed

sdk/containerinstance/arm-containerinstance/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "@azure/arm-containerinstance",
33
"author": "Microsoft Corporation",
44
"description": "ContainerInstanceManagementClient Library with typescript type definitions for node.js and browser.",
5-
"version": "6.3.0",
5+
"version": "7.0.0",
66
"dependencies": {
77
"@azure/ms-rest-azure-js": "^2.1.0",
88
"@azure/ms-rest-js": "^2.2.0",

sdk/containerinstance/arm-containerinstance/src/containerInstanceManagementClientContext.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import * as msRestAzure from "@azure/ms-rest-azure-js";
1313
import { TokenCredential } from "@azure/core-auth";
1414

1515
const packageName = "@azure/arm-containerinstance";
16-
const packageVersion = "6.3.0";
16+
const packageVersion = "7.0.0";
1717

1818
export class ContainerInstanceManagementClientContext extends msRestAzure.AzureServiceClient {
1919
credentials: msRest.ServiceClientCredentials | TokenCredential;
@@ -50,7 +50,7 @@ export class ContainerInstanceManagementClientContext extends msRestAzure.AzureS
5050

5151
super(credentials, options);
5252

53-
this.apiVersion = '2021-03-01';
53+
this.apiVersion = '2021-07-01';
5454
this.acceptLanguage = 'en-US';
5555
this.longRunningOperationRetryTimeout = 30;
5656
this.baseUri = options.baseUri || this.baseUri || "https://management.azure.com";

sdk/containerinstance/arm-containerinstance/src/models/containerGroupsMappers.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ export {
1717
ContainerGroupIdentity,
1818
ContainerGroupIdentityUserAssignedIdentitiesValue,
1919
ContainerGroupListResult,
20-
ContainerGroupNetworkProfile,
2120
ContainerGroupPropertiesInstanceView,
21+
ContainerGroupSubnetId,
2222
ContainerHttpGet,
2323
ContainerPort,
2424
ContainerProbe,
@@ -30,7 +30,7 @@ export {
3030
Event,
3131
GitRepoVolume,
3232
GpuResource,
33-
HttpHeaders,
33+
HttpHeader,
3434
ImageRegistryCredential,
3535
InitContainerDefinition,
3636
InitContainerPropertiesDefinitionInstanceView,

sdk/containerinstance/arm-containerinstance/src/models/index.ts

Lines changed: 41 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -229,9 +229,9 @@ export interface ContainerExec {
229229
}
230230

231231
/**
232-
* The HTTP headers.
232+
* The HTTP header.
233233
*/
234-
export interface HttpHeaders {
234+
export interface HttpHeader {
235235
/**
236236
* The header name.
237237
*/
@@ -261,7 +261,7 @@ export interface ContainerHttpGet {
261261
/**
262262
* The HTTP headers.
263263
*/
264-
httpHeaders?: HttpHeaders;
264+
httpHeaders?: HttpHeader[];
265265
}
266266

267267
/**
@@ -476,6 +476,14 @@ export interface ImageRegistryCredential {
476476
* The password for the private registry.
477477
*/
478478
password?: string;
479+
/**
480+
* The identity for the private registry.
481+
*/
482+
identity?: string;
483+
/**
484+
* The identity URL for the private registry.
485+
*/
486+
identityUrl?: string;
479487
}
480488

481489
/**
@@ -559,7 +567,7 @@ export interface LogAnalytics {
559567
/**
560568
* The workspace resource id for log analytics
561569
*/
562-
workspaceResourceId?: { [propertyName: string]: string };
570+
workspaceResourceId?: string;
563571
}
564572

565573
/**
@@ -573,13 +581,17 @@ export interface ContainerGroupDiagnostics {
573581
}
574582

575583
/**
576-
* Container group network profile information.
584+
* Container group subnet information.
577585
*/
578-
export interface ContainerGroupNetworkProfile {
586+
export interface ContainerGroupSubnetId {
579587
/**
580-
* The identifier for a network profile.
588+
* Resource ID of virtual network and subnet.
581589
*/
582590
id: string;
591+
/**
592+
* Friendly name for the subnet.
593+
*/
594+
name?: string;
583595
}
584596

585597
/**
@@ -756,9 +768,9 @@ export interface ContainerGroup extends Resource {
756768
*/
757769
diagnostics?: ContainerGroupDiagnostics;
758770
/**
759-
* The network profile information for a container group.
771+
* The subnet resource IDs for a container group.
760772
*/
761-
networkProfile?: ContainerGroupNetworkProfile;
773+
subnetIds?: ContainerGroupSubnetId[];
762774
/**
763775
* The DNS config information for a container group.
764776
*/
@@ -1289,6 +1301,26 @@ export type ContainerGroupsDeleteMethodResponse = ContainerGroup & {
12891301
};
12901302
};
12911303

1304+
/**
1305+
* Contains response data for the getOutboundNetworkDependenciesEndpoints operation.
1306+
*/
1307+
export type ContainerGroupsGetOutboundNetworkDependenciesEndpointsResponse = Array<string> & {
1308+
/**
1309+
* The underlying HTTP response.
1310+
*/
1311+
_response: msRest.HttpResponse & {
1312+
/**
1313+
* The response body as text (string format)
1314+
*/
1315+
bodyAsText: string;
1316+
1317+
/**
1318+
* The response body as parsed JSON or XML
1319+
*/
1320+
parsedBody: string[];
1321+
};
1322+
};
1323+
12921324
/**
12931325
* Contains response data for the beginCreateOrUpdate operation.
12941326
*/

sdk/containerinstance/arm-containerinstance/src/models/mappers.ts

Lines changed: 41 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -367,11 +367,11 @@ export const ContainerExec: msRest.CompositeMapper = {
367367
}
368368
};
369369

370-
export const HttpHeaders: msRest.CompositeMapper = {
371-
serializedName: "HttpHeaders",
370+
export const HttpHeader: msRest.CompositeMapper = {
371+
serializedName: "HttpHeader",
372372
type: {
373373
name: "Composite",
374-
className: "HttpHeaders",
374+
className: "HttpHeader",
375375
modelProperties: {
376376
name: {
377377
serializedName: "name",
@@ -417,8 +417,13 @@ export const ContainerHttpGet: msRest.CompositeMapper = {
417417
httpHeaders: {
418418
serializedName: "httpHeaders",
419419
type: {
420-
name: "Composite",
421-
className: "HttpHeaders"
420+
name: "Sequence",
421+
element: {
422+
type: {
423+
name: "Composite",
424+
className: "HttpHeader"
425+
}
426+
}
422427
}
423428
}
424429
}
@@ -790,6 +795,18 @@ export const ImageRegistryCredential: msRest.CompositeMapper = {
790795
type: {
791796
name: "String"
792797
}
798+
},
799+
identity: {
800+
serializedName: "identity",
801+
type: {
802+
name: "String"
803+
}
804+
},
805+
identityUrl: {
806+
serializedName: "identityUrl",
807+
type: {
808+
name: "String"
809+
}
793810
}
794811
}
795812
}
@@ -937,12 +954,7 @@ export const LogAnalytics: msRest.CompositeMapper = {
937954
workspaceResourceId: {
938955
serializedName: "workspaceResourceId",
939956
type: {
940-
name: "Dictionary",
941-
value: {
942-
type: {
943-
name: "String"
944-
}
945-
}
957+
name: "String"
946958
}
947959
}
948960
}
@@ -966,18 +978,24 @@ export const ContainerGroupDiagnostics: msRest.CompositeMapper = {
966978
}
967979
};
968980

969-
export const ContainerGroupNetworkProfile: msRest.CompositeMapper = {
970-
serializedName: "ContainerGroupNetworkProfile",
981+
export const ContainerGroupSubnetId: msRest.CompositeMapper = {
982+
serializedName: "ContainerGroupSubnetId",
971983
type: {
972984
name: "Composite",
973-
className: "ContainerGroupNetworkProfile",
985+
className: "ContainerGroupSubnetId",
974986
modelProperties: {
975987
id: {
976988
required: true,
977989
serializedName: "id",
978990
type: {
979991
name: "String"
980992
}
993+
},
994+
name: {
995+
serializedName: "name",
996+
type: {
997+
name: "String"
998+
}
981999
}
9821000
}
9831001
}
@@ -1301,11 +1319,16 @@ export const ContainerGroup: msRest.CompositeMapper = {
13011319
className: "ContainerGroupDiagnostics"
13021320
}
13031321
},
1304-
networkProfile: {
1305-
serializedName: "properties.networkProfile",
1322+
subnetIds: {
1323+
serializedName: "properties.subnetIds",
13061324
type: {
1307-
name: "Composite",
1308-
className: "ContainerGroupNetworkProfile"
1325+
name: "Sequence",
1326+
element: {
1327+
type: {
1328+
name: "Composite",
1329+
className: "ContainerGroupSubnetId"
1330+
}
1331+
}
13091332
}
13101333
},
13111334
dnsConfig: {

sdk/containerinstance/arm-containerinstance/src/operations/containerGroups.ts

Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -246,6 +246,40 @@ export class ContainerGroups {
246246
.then(lroPoller => lroPoller.pollUntilFinished());
247247
}
248248

249+
/**
250+
* Gets all the network dependencies for this container group to allow complete control of network
251+
* setting and configuration. For container groups, this will always be an empty list.
252+
* @summary Get all network dependencies for container group.
253+
* @param resourceGroupName The name of the resource group.
254+
* @param containerGroupName The name of the container group.
255+
* @param [options] The optional parameters
256+
* @returns Promise<Models.ContainerGroupsGetOutboundNetworkDependenciesEndpointsResponse>
257+
*/
258+
getOutboundNetworkDependenciesEndpoints(resourceGroupName: string, containerGroupName: string, options?: msRest.RequestOptionsBase): Promise<Models.ContainerGroupsGetOutboundNetworkDependenciesEndpointsResponse>;
259+
/**
260+
* @param resourceGroupName The name of the resource group.
261+
* @param containerGroupName The name of the container group.
262+
* @param callback The callback
263+
*/
264+
getOutboundNetworkDependenciesEndpoints(resourceGroupName: string, containerGroupName: string, callback: msRest.ServiceCallback<string[]>): void;
265+
/**
266+
* @param resourceGroupName The name of the resource group.
267+
* @param containerGroupName The name of the container group.
268+
* @param options The optional parameters
269+
* @param callback The callback
270+
*/
271+
getOutboundNetworkDependenciesEndpoints(resourceGroupName: string, containerGroupName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<string[]>): void;
272+
getOutboundNetworkDependenciesEndpoints(resourceGroupName: string, containerGroupName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<string[]>, callback?: msRest.ServiceCallback<string[]>): Promise<Models.ContainerGroupsGetOutboundNetworkDependenciesEndpointsResponse> {
273+
return this.client.sendOperationRequest(
274+
{
275+
resourceGroupName,
276+
containerGroupName,
277+
options
278+
},
279+
getOutboundNetworkDependenciesEndpointsOperationSpec,
280+
callback) as Promise<Models.ContainerGroupsGetOutboundNetworkDependenciesEndpointsResponse>;
281+
}
282+
249283
/**
250284
* Create or update container groups with specified configurations.
251285
* @summary Create or update container groups.
@@ -519,6 +553,41 @@ const stopOperationSpec: msRest.OperationSpec = {
519553
serializer
520554
};
521555

556+
const getOutboundNetworkDependenciesEndpointsOperationSpec: msRest.OperationSpec = {
557+
httpMethod: "GET",
558+
path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerInstance/containerGroups/{containerGroupName}/outboundNetworkDependenciesEndpoints",
559+
urlParameters: [
560+
Parameters.subscriptionId,
561+
Parameters.resourceGroupName,
562+
Parameters.containerGroupName
563+
],
564+
queryParameters: [
565+
Parameters.apiVersion
566+
],
567+
headerParameters: [
568+
Parameters.acceptLanguage
569+
],
570+
responses: {
571+
200: {
572+
bodyMapper: {
573+
serializedName: "parsedResponse",
574+
type: {
575+
name: "Sequence",
576+
element: {
577+
type: {
578+
name: "String"
579+
}
580+
}
581+
}
582+
}
583+
},
584+
default: {
585+
bodyMapper: Mappers.CloudError
586+
}
587+
},
588+
serializer
589+
};
590+
522591
const beginCreateOrUpdateOperationSpec: msRest.OperationSpec = {
523592
httpMethod: "PUT",
524593
path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerInstance/containerGroups/{containerGroupName}",

sdk/containerinstance/arm-containerinstance/src/operations/containers.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ const executeCommandOperationSpec: msRest.OperationSpec = {
209209

210210
const attachOperationSpec: msRest.OperationSpec = {
211211
httpMethod: "POST",
212-
path: "subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/Microsoft.ContainerInstance/containerGroups/{containerGroupName}/containers/{containerName}/attach",
212+
path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerInstance/containerGroups/{containerGroupName}/containers/{containerName}/attach",
213213
urlParameters: [
214214
Parameters.subscriptionId,
215215
Parameters.resourceGroupName,

0 commit comments

Comments
 (0)