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

Copyright (c) 2020 Microsoft
Copyright (c) 2021 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
9 changes: 4 additions & 5 deletions sdk/containerinstance/arm-containerinstance/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ npm install @azure/arm-containerinstance

### How to use

#### nodejs - Authentication, client creation and list containerGroups as an example written in TypeScript.
#### nodejs - client creation and list containerGroups as an example written in TypeScript.

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

Expand All @@ -26,11 +26,10 @@ npm install @azure/ms-rest-nodeauth@"^3.0.0"

##### Sample code

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
```typescript
import * as msRest from "@azure/ms-rest-js";
import * as msRestAzure from "@azure/ms-rest-azure-js";
import * as msRestNodeAuth from "@azure/ms-rest-nodeauth";
import { ContainerInstanceManagementClient, ContainerInstanceManagementModels, ContainerInstanceManagementMappers } from "@azure/arm-containerinstance";
const msRestNodeAuth = require("@azure/ms-rest-nodeauth");
const { ContainerInstanceManagementClient } = require("@azure/arm-containerinstance");
const subscriptionId = process.env["AZURE_SUBSCRIPTION_ID"];

msRestNodeAuth.interactiveLogin().then((creds) => {
Expand Down
4 changes: 2 additions & 2 deletions sdk/containerinstance/arm-containerinstance/rollup.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ const config = {
"@azure/ms-rest-azure-js": "msRestAzure"
},
banner: `/*
* Copyright (c) Microsoft Corporation. All rights reserved.
* Licensed under the MIT License. See License.txt in the project root for license information.
* Copyright (c) Microsoft Corporation.
* Licensed under the MIT License.
*
* Code generated by Microsoft (R) AutoRest Code Generator.
* Changes may cause incorrect behavior and will be lost if the code is regenerated.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
/*
* Copyright (c) Microsoft Corporation. All rights reserved.
* Licensed under the MIT License. See License.txt in the project root for
* license information.
* Copyright (c) Microsoft Corporation.
* Licensed under the MIT License.
*
* Code generated by Microsoft (R) AutoRest Code Generator.
* Changes may cause incorrect behavior and will be lost if the code is
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
/*
* Copyright (c) Microsoft Corporation. All rights reserved.
* Licensed under the MIT License. See License.txt in the project root for
* license information.
* Copyright (c) Microsoft Corporation.
* Licensed under the MIT License.
*
* Code generated by Microsoft (R) AutoRest Code Generator.
* Changes may cause incorrect behavior and will be lost if the code is
Expand Down Expand Up @@ -45,7 +44,7 @@ export class ContainerInstanceManagementClientContext extends msRestAzure.AzureS

super(credentials, options);

this.apiVersion = '2019-12-01';
this.apiVersion = '2020-11-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
@@ -1,6 +1,6 @@
/*
* Copyright (c) Microsoft Corporation. All rights reserved.
* Licensed under the MIT License. See License.txt in the project root for license information.
* Copyright (c) Microsoft Corporation.
* Licensed under the MIT License.
*
* Code generated by Microsoft (R) AutoRest Code Generator.
* Changes may cause incorrect behavior and will be lost if the code is regenerated.
Expand Down Expand Up @@ -30,6 +30,7 @@ export {
Event,
GitRepoVolume,
GpuResource,
HttpHeaders,
ImageRegistryCredential,
InitContainerDefinition,
InitContainerPropertiesDefinitionInstanceView,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
/*
* Copyright (c) Microsoft Corporation. All rights reserved.
* Licensed under the MIT License. See License.txt in the project root for license information.
* Copyright (c) Microsoft Corporation.
* Licensed under the MIT License.
*
* Code generated by Microsoft (R) AutoRest Code Generator.
* Changes may cause incorrect behavior and will be lost if the code is regenerated.
*/

export {
CloudError,
ContainerAttachResponse,
ContainerExecRequest,
ContainerExecRequestTerminalSize,
ContainerExecResponse,
Expand Down
66 changes: 64 additions & 2 deletions sdk/containerinstance/arm-containerinstance/src/models/index.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* Copyright (c) Microsoft Corporation. All rights reserved.
* Licensed under the MIT License. See License.txt in the project root for license information.
* Copyright (c) Microsoft Corporation.
* Licensed under the MIT License.
*
* Code generated by Microsoft (R) AutoRest Code Generator.
* Changes may cause incorrect behavior and will be lost if the code is regenerated.
Expand Down Expand Up @@ -228,6 +228,20 @@ export interface ContainerExec {
command?: string[];
}

/**
* The HTTP headers.
*/
export interface HttpHeaders {
/**
* The header name.
*/
name?: string;
/**
* The header value.
*/
value?: string;
}

/**
* The container Http Get settings, for liveness or readiness probe
*/
Expand All @@ -244,6 +258,10 @@ export interface ContainerHttpGet {
* The scheme. Possible values include: 'http', 'https'
*/
scheme?: Scheme;
/**
* The HTTP headers.
*/
httpHeaders?: HttpHeaders;
}

/**
Expand Down Expand Up @@ -538,6 +556,10 @@ export interface LogAnalytics {
* Metadata for log analytics.
*/
metadata?: { [propertyName: string]: string };
/**
* The workspace resource id for log analytics
*/
workspaceResourceId?: { [propertyName: string]: string };
}

/**
Expand Down Expand Up @@ -893,6 +915,21 @@ export interface ContainerExecResponse {
password?: string;
}

/**
* The information for the output stream from container attach.
*/
export interface ContainerAttachResponse {
/**
* The uri for the output stream from the attach.
*/
webSocketUri?: string;
/**
* The password to the output stream from the attach. Send as an Authorization header value when
* connecting to the websocketUri.
*/
password?: string;
}

/**
* The cached image and OS type.
*/
Expand Down Expand Up @@ -973,6 +1010,11 @@ export interface ContainersListLogsOptionalParams extends msRest.RequestOptionsB
* available logs are shown up to 4mb.
*/
tail?: number;
/**
* If true, adds a timestamp at the beginning of every line of log output. If not provided,
* defaults to false.
*/
timestamps?: boolean;
}

/**
Expand Down Expand Up @@ -1506,3 +1548,23 @@ export type ContainersExecuteCommandResponse = ContainerExecResponse & {
parsedBody: ContainerExecResponse;
};
};

/**
* Contains response data for the attach operation.
*/
export type ContainersAttachResponse = ContainerAttachResponse & {
/**
* 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: ContainerAttachResponse;
};
};
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* Copyright (c) Microsoft Corporation. All rights reserved.
* Licensed under the MIT License. See License.txt in the project root for license information.
* Copyright (c) Microsoft Corporation.
* Licensed under the MIT License.
*
* Code generated by Microsoft (R) AutoRest Code Generator.
* Changes may cause incorrect behavior and will be lost if the code is regenerated.
Expand Down
66 changes: 64 additions & 2 deletions sdk/containerinstance/arm-containerinstance/src/models/mappers.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* Copyright (c) Microsoft Corporation. All rights reserved.
* Licensed under the MIT License. See License.txt in the project root for license information.
* Copyright (c) Microsoft Corporation.
* Licensed under the MIT License.
*
* Code generated by Microsoft (R) AutoRest Code Generator.
* Changes may cause incorrect behavior and will be lost if the code is regenerated.
Expand Down Expand Up @@ -367,6 +367,28 @@ export const ContainerExec: msRest.CompositeMapper = {
}
};

export const HttpHeaders: msRest.CompositeMapper = {
serializedName: "HttpHeaders",
type: {
name: "Composite",
className: "HttpHeaders",
modelProperties: {
name: {
serializedName: "name",
type: {
name: "String"
}
},
value: {
serializedName: "value",
type: {
name: "String"
}
}
}
}
};

export const ContainerHttpGet: msRest.CompositeMapper = {
serializedName: "ContainerHttpGet",
type: {
Expand All @@ -391,6 +413,13 @@ export const ContainerHttpGet: msRest.CompositeMapper = {
type: {
name: "String"
}
},
httpHeaders: {
serializedName: "httpHeaders",
type: {
name: "Composite",
className: "HttpHeaders"
}
}
}
}
Expand Down Expand Up @@ -904,6 +933,17 @@ export const LogAnalytics: msRest.CompositeMapper = {
}
}
}
},
workspaceResourceId: {
serializedName: "workspaceResourceId",
type: {
name: "Dictionary",
value: {
type: {
name: "String"
}
}
}
}
}
}
Expand Down Expand Up @@ -1521,6 +1561,28 @@ export const ContainerExecResponse: msRest.CompositeMapper = {
}
};

export const ContainerAttachResponse: msRest.CompositeMapper = {
serializedName: "ContainerAttachResponse",
type: {
name: "Composite",
className: "ContainerAttachResponse",
modelProperties: {
webSocketUri: {
serializedName: "webSocketUri",
type: {
name: "String"
}
},
password: {
serializedName: "password",
type: {
name: "String"
}
}
}
}
};

export const CachedImages: msRest.CompositeMapper = {
serializedName: "cachedImages",
type: {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* Copyright (c) Microsoft Corporation. All rights reserved.
* Licensed under the MIT License. See License.txt in the project root for license information.
* Copyright (c) Microsoft Corporation.
* Licensed under the MIT License.
*
* Code generated by Microsoft (R) AutoRest Code Generator.
* Changes may cause incorrect behavior and will be lost if the code is regenerated.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
/*
* Copyright (c) Microsoft Corporation. All rights reserved.
* Licensed under the MIT License. See License.txt in the project root for
* license information.
* Copyright (c) Microsoft Corporation.
* Licensed under the MIT License.
*
* Code generated by Microsoft (R) AutoRest Code Generator.
* Changes may cause incorrect behavior and will be lost if the code is
Expand Down Expand Up @@ -103,3 +102,15 @@ export const tail: msRest.OperationQueryParameter = {
}
}
};
export const timestamps: msRest.OperationQueryParameter = {
parameterPath: [
"options",
"timestamps"
],
mapper: {
serializedName: "timestamps",
type: {
name: "Boolean"
}
}
};
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
/*
* Copyright (c) Microsoft Corporation. All rights reserved.
* Licensed under the MIT License. See License.txt in the project root for
* license information.
* Copyright (c) Microsoft Corporation.
* Licensed under the MIT License.
*
* Code generated by Microsoft (R) AutoRest Code Generator.
* Changes may cause incorrect behavior and will be lost if the code is
Expand Down Expand Up @@ -635,6 +634,9 @@ const listNextOperationSpec: msRest.OperationSpec = {
urlParameters: [
Parameters.nextPageLink
],
queryParameters: [
Parameters.apiVersion
],
headerParameters: [
Parameters.acceptLanguage
],
Expand All @@ -656,6 +658,9 @@ const listByResourceGroupNextOperationSpec: msRest.OperationSpec = {
urlParameters: [
Parameters.nextPageLink
],
queryParameters: [
Parameters.apiVersion
],
headerParameters: [
Parameters.acceptLanguage
],
Expand Down
Loading