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

containerinstance-track1 #17866

Merged
merged 1 commit into from
Sep 29, 2021
Merged
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/containerinstance/arm-containerinstance/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "@azure/arm-containerinstance",
"author": "Microsoft Corporation",
"description": "ContainerInstanceManagementClient Library with typescript type definitions for node.js and browser.",
"version": "6.3.0",
"version": "7.0.0",
"dependencies": {
"@azure/ms-rest-azure-js": "^2.1.0",
"@azure/ms-rest-js": "^2.2.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import * as msRestAzure from "@azure/ms-rest-azure-js";
import { TokenCredential } from "@azure/core-auth";

const packageName = "@azure/arm-containerinstance";
const packageVersion = "6.3.0";
const packageVersion = "7.0.0";

export class ContainerInstanceManagementClientContext extends msRestAzure.AzureServiceClient {
credentials: msRest.ServiceClientCredentials | TokenCredential;
Expand Down Expand Up @@ -50,7 +50,7 @@ export class ContainerInstanceManagementClientContext extends msRestAzure.AzureS

super(credentials, options);

this.apiVersion = '2021-03-01';
this.apiVersion = '2021-07-01';
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
Expand Up @@ -17,8 +17,8 @@ export {
ContainerGroupIdentity,
ContainerGroupIdentityUserAssignedIdentitiesValue,
ContainerGroupListResult,
ContainerGroupNetworkProfile,
ContainerGroupPropertiesInstanceView,
ContainerGroupSubnetId,
ContainerHttpGet,
ContainerPort,
ContainerProbe,
Expand All @@ -30,7 +30,7 @@ export {
Event,
GitRepoVolume,
GpuResource,
HttpHeaders,
HttpHeader,
ImageRegistryCredential,
InitContainerDefinition,
InitContainerPropertiesDefinitionInstanceView,
Expand Down
50 changes: 41 additions & 9 deletions sdk/containerinstance/arm-containerinstance/src/models/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -229,9 +229,9 @@ export interface ContainerExec {
}

/**
* The HTTP headers.
* The HTTP header.
*/
export interface HttpHeaders {
export interface HttpHeader {
/**
* The header name.
*/
Expand Down Expand Up @@ -261,7 +261,7 @@ export interface ContainerHttpGet {
/**
* The HTTP headers.
*/
httpHeaders?: HttpHeaders;
httpHeaders?: HttpHeader[];
}

/**
Expand Down Expand Up @@ -476,6 +476,14 @@ export interface ImageRegistryCredential {
* The password for the private registry.
*/
password?: string;
/**
* The identity for the private registry.
*/
identity?: string;
/**
* The identity URL for the private registry.
*/
identityUrl?: string;
}

/**
Expand Down Expand Up @@ -559,7 +567,7 @@ export interface LogAnalytics {
/**
* The workspace resource id for log analytics
*/
workspaceResourceId?: { [propertyName: string]: string };
workspaceResourceId?: string;
}

/**
Expand All @@ -573,13 +581,17 @@ export interface ContainerGroupDiagnostics {
}

/**
* Container group network profile information.
* Container group subnet information.
*/
export interface ContainerGroupNetworkProfile {
export interface ContainerGroupSubnetId {
/**
* The identifier for a network profile.
* Resource ID of virtual network and subnet.
*/
id: string;
/**
* Friendly name for the subnet.
*/
name?: string;
}

/**
Expand Down Expand Up @@ -756,9 +768,9 @@ export interface ContainerGroup extends Resource {
*/
diagnostics?: ContainerGroupDiagnostics;
/**
* The network profile information for a container group.
* The subnet resource IDs for a container group.
*/
networkProfile?: ContainerGroupNetworkProfile;
subnetIds?: ContainerGroupSubnetId[];
/**
* The DNS config information for a container group.
*/
Expand Down Expand Up @@ -1289,6 +1301,26 @@ export type ContainerGroupsDeleteMethodResponse = ContainerGroup & {
};
};

/**
* Contains response data for the getOutboundNetworkDependenciesEndpoints operation.
*/
export type ContainerGroupsGetOutboundNetworkDependenciesEndpointsResponse = Array<string> & {
/**
* The underlying HTTP response.
*/
_response: msRest.HttpResponse & {
/**
* The response body as text (string format)
*/
bodyAsText: string;

/**
* The response body as parsed JSON or XML
*/
parsedBody: string[];
};
};

/**
* Contains response data for the beginCreateOrUpdate operation.
*/
Expand Down
59 changes: 41 additions & 18 deletions sdk/containerinstance/arm-containerinstance/src/models/mappers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -367,11 +367,11 @@ export const ContainerExec: msRest.CompositeMapper = {
}
};

export const HttpHeaders: msRest.CompositeMapper = {
serializedName: "HttpHeaders",
export const HttpHeader: msRest.CompositeMapper = {
serializedName: "HttpHeader",
type: {
name: "Composite",
className: "HttpHeaders",
className: "HttpHeader",
modelProperties: {
name: {
serializedName: "name",
Expand Down Expand Up @@ -417,8 +417,13 @@ export const ContainerHttpGet: msRest.CompositeMapper = {
httpHeaders: {
serializedName: "httpHeaders",
type: {
name: "Composite",
className: "HttpHeaders"
name: "Sequence",
element: {
type: {
name: "Composite",
className: "HttpHeader"
}
}
}
}
}
Expand Down Expand Up @@ -790,6 +795,18 @@ export const ImageRegistryCredential: msRest.CompositeMapper = {
type: {
name: "String"
}
},
identity: {
serializedName: "identity",
type: {
name: "String"
}
},
identityUrl: {
serializedName: "identityUrl",
type: {
name: "String"
}
}
}
}
Expand Down Expand Up @@ -937,12 +954,7 @@ export const LogAnalytics: msRest.CompositeMapper = {
workspaceResourceId: {
serializedName: "workspaceResourceId",
type: {
name: "Dictionary",
value: {
type: {
name: "String"
}
}
name: "String"
}
}
}
Expand All @@ -966,18 +978,24 @@ export const ContainerGroupDiagnostics: msRest.CompositeMapper = {
}
};

export const ContainerGroupNetworkProfile: msRest.CompositeMapper = {
serializedName: "ContainerGroupNetworkProfile",
export const ContainerGroupSubnetId: msRest.CompositeMapper = {
serializedName: "ContainerGroupSubnetId",
type: {
name: "Composite",
className: "ContainerGroupNetworkProfile",
className: "ContainerGroupSubnetId",
modelProperties: {
id: {
required: true,
serializedName: "id",
type: {
name: "String"
}
},
name: {
serializedName: "name",
type: {
name: "String"
}
}
}
}
Expand Down Expand Up @@ -1301,11 +1319,16 @@ export const ContainerGroup: msRest.CompositeMapper = {
className: "ContainerGroupDiagnostics"
}
},
networkProfile: {
serializedName: "properties.networkProfile",
subnetIds: {
serializedName: "properties.subnetIds",
type: {
name: "Composite",
className: "ContainerGroupNetworkProfile"
name: "Sequence",
element: {
type: {
name: "Composite",
className: "ContainerGroupSubnetId"
}
}
}
},
dnsConfig: {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -246,6 +246,40 @@ export class ContainerGroups {
.then(lroPoller => lroPoller.pollUntilFinished());
}

/**
* Gets all the network dependencies for this container group to allow complete control of network
* setting and configuration. For container groups, this will always be an empty list.
* @summary Get all network dependencies for container group.
* @param resourceGroupName The name of the resource group.
* @param containerGroupName The name of the container group.
* @param [options] The optional parameters
* @returns Promise<Models.ContainerGroupsGetOutboundNetworkDependenciesEndpointsResponse>
*/
getOutboundNetworkDependenciesEndpoints(resourceGroupName: string, containerGroupName: string, options?: msRest.RequestOptionsBase): Promise<Models.ContainerGroupsGetOutboundNetworkDependenciesEndpointsResponse>;
/**
* @param resourceGroupName The name of the resource group.
* @param containerGroupName The name of the container group.
* @param callback The callback
*/
getOutboundNetworkDependenciesEndpoints(resourceGroupName: string, containerGroupName: string, callback: msRest.ServiceCallback<string[]>): void;
/**
* @param resourceGroupName The name of the resource group.
* @param containerGroupName The name of the container group.
* @param options The optional parameters
* @param callback The callback
*/
getOutboundNetworkDependenciesEndpoints(resourceGroupName: string, containerGroupName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<string[]>): void;
getOutboundNetworkDependenciesEndpoints(resourceGroupName: string, containerGroupName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<string[]>, callback?: msRest.ServiceCallback<string[]>): Promise<Models.ContainerGroupsGetOutboundNetworkDependenciesEndpointsResponse> {
return this.client.sendOperationRequest(
{
resourceGroupName,
containerGroupName,
options
},
getOutboundNetworkDependenciesEndpointsOperationSpec,
callback) as Promise<Models.ContainerGroupsGetOutboundNetworkDependenciesEndpointsResponse>;
}

/**
* Create or update container groups with specified configurations.
* @summary Create or update container groups.
Expand Down Expand Up @@ -519,6 +553,41 @@ const stopOperationSpec: msRest.OperationSpec = {
serializer
};

const getOutboundNetworkDependenciesEndpointsOperationSpec: msRest.OperationSpec = {
httpMethod: "GET",
path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerInstance/containerGroups/{containerGroupName}/outboundNetworkDependenciesEndpoints",
urlParameters: [
Parameters.subscriptionId,
Parameters.resourceGroupName,
Parameters.containerGroupName
],
queryParameters: [
Parameters.apiVersion
],
headerParameters: [
Parameters.acceptLanguage
],
responses: {
200: {
bodyMapper: {
serializedName: "parsedResponse",
type: {
name: "Sequence",
element: {
type: {
name: "String"
}
}
}
}
},
default: {
bodyMapper: Mappers.CloudError
}
},
serializer
};

const beginCreateOrUpdateOperationSpec: msRest.OperationSpec = {
httpMethod: "PUT",
path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerInstance/containerGroups/{containerGroupName}",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ const executeCommandOperationSpec: msRest.OperationSpec = {

const attachOperationSpec: msRest.OperationSpec = {
httpMethod: "POST",
path: "subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/Microsoft.ContainerInstance/containerGroups/{containerGroupName}/containers/{containerName}/attach",
path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerInstance/containerGroups/{containerGroupName}/containers/{containerName}/attach",
urlParameters: [
Parameters.subscriptionId,
Parameters.resourceGroupName,
Expand Down