From baa9f8f06c9decd9a1f497b76cb21dbc53430239 Mon Sep 17 00:00:00 2001 From: Milis Date: Thu, 14 Dec 2017 13:11:17 -0800 Subject: [PATCH] Fix bug when retrieving container logs (#96) * Fix bug while retrieving container logs The corresponding REST API was changed and the order of some of the arguments was reversed. * Update for the sample test recording file * Update the 1.5 release notes --- .../containerinstance/ContainerGroups.java | 20 ++-- .../implementation/ContainerGroupImpl.java | 8 +- .../implementation/ContainerGroupsImpl.java | 16 +-- ...erInstanceWithMultipleContainerImages.json | 110 +++++++++--------- notes/prepare-for-1.5.0.md | 25 +++- 5 files changed, 105 insertions(+), 74 deletions(-) diff --git a/azure-mgmt-containerinstance/src/main/java/com/microsoft/azure/management/containerinstance/ContainerGroups.java b/azure-mgmt-containerinstance/src/main/java/com/microsoft/azure/management/containerinstance/ContainerGroups.java index 9696bb6a883..7bc67acb49a 100644 --- a/azure-mgmt-containerinstance/src/main/java/com/microsoft/azure/management/containerinstance/ContainerGroups.java +++ b/azure-mgmt-containerinstance/src/main/java/com/microsoft/azure/management/containerinstance/ContainerGroups.java @@ -46,47 +46,51 @@ public interface ContainerGroups extends * Get the log content for the specified container instance within a container group. * * @param resourceGroupName the Azure resource group name - * @param containerName the container instance name * @param containerGroupName the container group name + * @param containerName the container instance name * @throws IllegalArgumentException thrown if parameters fail the validation * @return all available log lines */ - String getLogContent(String resourceGroupName, String containerName, String containerGroupName); + @Beta(Beta.SinceVersion.V1_5_0) + String getLogContent(String resourceGroupName, String containerGroupName, String containerName); /** * Get the log content for the specified container instance within a container group. * * @param resourceGroupName the Azure resource group name - * @param containerName the container instance name * @param containerGroupName the container group name + * @param containerName the container instance name * @param tailLineCount only get the last log lines up to this * @throws IllegalArgumentException thrown if parameters fail the validation * @return the log lines from the end, up to the number specified */ - String getLogContent(String resourceGroupName, String containerName, String containerGroupName, int tailLineCount); + @Beta(Beta.SinceVersion.V1_5_0) + String getLogContent(String resourceGroupName, String containerGroupName, String containerName, int tailLineCount); /** * Get the log content for the specified container instance within a container group. * * @param resourceGroupName the Azure resource group name - * @param containerName the container instance name * @param containerGroupName the container group name + * @param containerName the container instance name * @throws IllegalArgumentException thrown if parameters fail the validation * @return a representation of the future computation of this call */ - Observable getLogContentAsync(String resourceGroupName, String containerName, String containerGroupName); + @Beta(Beta.SinceVersion.V1_5_0) + Observable getLogContentAsync(String resourceGroupName, String containerGroupName, String containerName); /** * Get the log content for the specified container instance within a container group. * * @param resourceGroupName the Azure resource group name - * @param containerName the container instance name * @param containerGroupName the container group name + * @param containerName the container instance name * @param tailLineCount only get the last log lines up to this * @throws IllegalArgumentException thrown if parameters fail the validation * @return a representation of the future computation of this call */ - Observable getLogContentAsync(String resourceGroupName, String containerName, String containerGroupName, int tailLineCount); + @Beta(Beta.SinceVersion.V1_5_0) + Observable getLogContentAsync(String resourceGroupName, String containerGroupName, String containerName, int tailLineCount); /** * Lists all operations for Azure Container Instance service. diff --git a/azure-mgmt-containerinstance/src/main/java/com/microsoft/azure/management/containerinstance/implementation/ContainerGroupImpl.java b/azure-mgmt-containerinstance/src/main/java/com/microsoft/azure/management/containerinstance/implementation/ContainerGroupImpl.java index 5ca1f2cfd0a..ac5910b832b 100644 --- a/azure-mgmt-containerinstance/src/main/java/com/microsoft/azure/management/containerinstance/implementation/ContainerGroupImpl.java +++ b/azure-mgmt-containerinstance/src/main/java/com/microsoft/azure/management/containerinstance/implementation/ContainerGroupImpl.java @@ -417,21 +417,21 @@ public Set events() { @Override public String getLogContent(String containerName) { - return this.manager().containerGroups().getLogContent(this.resourceGroupName(), containerName, this.name()); + return this.manager().containerGroups().getLogContent(this.resourceGroupName(), this.name(), containerName); } @Override public String getLogContent(String containerName, int tailLineCount) { - return this.manager().containerGroups().getLogContent(this.resourceGroupName(), containerName, this.name(), tailLineCount); + return this.manager().containerGroups().getLogContent(this.resourceGroupName(), this.name(), containerName, tailLineCount); } @Override public Observable getLogContentAsync(String containerName) { - return this.manager().containerGroups().getLogContentAsync(this.resourceGroupName(), containerName, this.name()); + return this.manager().containerGroups().getLogContentAsync(this.resourceGroupName(), this.name(), containerName); } @Override public Observable getLogContentAsync(String containerName, int tailLineCount) { - return this.manager().containerGroups().getLogContentAsync(this.resourceGroupName(), containerName, this.name(), tailLineCount); + return this.manager().containerGroups().getLogContentAsync(this.resourceGroupName(), this.name(), containerName, tailLineCount); } } diff --git a/azure-mgmt-containerinstance/src/main/java/com/microsoft/azure/management/containerinstance/implementation/ContainerGroupsImpl.java b/azure-mgmt-containerinstance/src/main/java/com/microsoft/azure/management/containerinstance/implementation/ContainerGroupsImpl.java index 846dbb0ae29..d1cf992af51 100644 --- a/azure-mgmt-containerinstance/src/main/java/com/microsoft/azure/management/containerinstance/implementation/ContainerGroupsImpl.java +++ b/azure-mgmt-containerinstance/src/main/java/com/microsoft/azure/management/containerinstance/implementation/ContainerGroupsImpl.java @@ -68,22 +68,22 @@ public ContainerGroup.DefinitionStages.Blank define(String name) { } @Override - public String getLogContent(String resourceGroupName, String containerName, String containerGroupName) { - LogsInner logsInner = this.manager().inner().containerLogs().list(resourceGroupName, containerName, containerGroupName); + public String getLogContent(String resourceGroupName, String containerGroupName, String containerName) { + LogsInner logsInner = this.manager().inner().containerLogs().list(resourceGroupName, containerGroupName, containerName); return logsInner != null ? logsInner.content() : null; } @Override - public String getLogContent(String resourceGroupName, String containerName, String containerGroupName, int tailLineCount) { - LogsInner logsInner = this.manager().inner().containerLogs().list(resourceGroupName, containerName, containerGroupName, tailLineCount); + public String getLogContent(String resourceGroupName, String containerGroupName, String containerName, int tailLineCount) { + LogsInner logsInner = this.manager().inner().containerLogs().list(resourceGroupName, containerGroupName, containerName, tailLineCount); return logsInner != null ? logsInner.content() : null; } @Override - public Observable getLogContentAsync(String resourceGroupName, String containerName, String containerGroupName) { - return this.manager().inner().containerLogs().listAsync(resourceGroupName, containerName, containerGroupName) + public Observable getLogContentAsync(String resourceGroupName, String containerGroupName, String containerName) { + return this.manager().inner().containerLogs().listAsync(resourceGroupName, containerGroupName, containerName) .map(new Func1() { @Override public String call(LogsInner logsInner) { @@ -93,8 +93,8 @@ public String call(LogsInner logsInner) { } @Override - public Observable getLogContentAsync(String resourceGroupName, String containerName, String containerGroupName, int tailLineCount) { - return this.manager().inner().containerLogs().listAsync(resourceGroupName, containerName, containerGroupName, tailLineCount) + public Observable getLogContentAsync(String resourceGroupName, String containerGroupName, String containerName, int tailLineCount) { + return this.manager().inner().containerLogs().listAsync(resourceGroupName, containerGroupName, containerName, tailLineCount) .map(new Func1() { @Override public String call(LogsInner logsInner) { diff --git a/azure-samples/src/test/resources/session-records/testManageContainerInstanceWithMultipleContainerImages.json b/azure-samples/src/test/resources/session-records/testManageContainerInstanceWithMultipleContainerImages.json index fc6138e3823..03cc45aa1cc 100644 --- a/azure-samples/src/test/resources/session-records/testManageContainerInstanceWithMultipleContainerImages.json +++ b/azure-samples/src/test/resources/session-records/testManageContainerInstanceWithMultipleContainerImages.json @@ -1,13 +1,13 @@ { "networkCallRecords" : [ { "Method" : "PUT", - "Uri" : "http://localhost:1234/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/rgaci4b6431085?api-version=2016-09-01", + "Uri" : "http://localhost:1234/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/rgaci05441618e?api-version=2016-09-01", "Headers" : { - "User-Agent" : "Azure-SDK-For-Java/null OS:Mac OS X/10.13.1 MacAddressHash:7d5ad3b8a5c7cfaac2ade402f3fde088e0a77865dd6aa079d0f2a963dc998578 Java:1.8.0_102 (ResourceManagementClient, 2016-09-01)", + "User-Agent" : "Azure-SDK-For-Java/null OS:Mac OS X/10.13.2 MacAddressHash:173fe2217ec9dce3c8d7df607684e4847d052946bb2c88cea16db5fb9df89a2f Java:1.8.0_102 (ResourceManagementClient, 2016-09-01)", "Content-Type" : "application/json; charset=utf-8" }, "Response" : { - "date" : "Fri, 08 Dec 2017 19:12:20 GMT", + "date" : "Wed, 13 Dec 2017 23:06:55 GMT", "content-length" : "181", "expires" : "-1", "x-ms-ratelimit-remaining-subscription-writes" : "1199", @@ -15,94 +15,98 @@ "StatusCode" : "201", "pragma" : "no-cache", "strict-transport-security" : "max-age=31536000; includeSubDomains", - "x-ms-correlation-request-id" : "f2249265-d806-43f4-b54c-25dc71000127", - "x-ms-routing-request-id" : "WESTUS2:20171208T191220Z:f2249265-d806-43f4-b54c-25dc71000127", + "x-ms-correlation-request-id" : "e0a1557b-7550-4d9d-bada-6347bde77d73", + "x-ms-routing-request-id" : "WESTUS2:20171213T230656Z:e0a1557b-7550-4d9d-bada-6347bde77d73", "content-type" : "application/json; charset=utf-8", "cache-control" : "no-cache", - "x-ms-request-id" : "f2249265-d806-43f4-b54c-25dc71000127", - "Body" : "{\"id\":\"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rgaci4b6431085\",\"name\":\"rgaci4b6431085\",\"location\":\"westus\",\"properties\":{\"provisioningState\":\"Succeeded\"}}" + "x-ms-request-id" : "e0a1557b-7550-4d9d-bada-6347bde77d73", + "Body" : "{\"id\":\"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rgaci05441618e\",\"name\":\"rgaci05441618e\",\"location\":\"westus\",\"properties\":{\"provisioningState\":\"Succeeded\"}}" } }, { "Method" : "PUT", - "Uri" : "http://localhost:1234/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rgaci4b6431085/providers/Microsoft.ContainerInstance/containerGroups/acisampledc796041b?api-version=2017-10-01-preview", + "Uri" : "http://localhost:1234/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rgaci05441618e/providers/Microsoft.ContainerInstance/containerGroups/acisamplec0d80305d?api-version=2017-10-01-preview", "Headers" : { - "User-Agent" : "Azure-SDK-For-Java/null OS:Mac OS X/10.13.1 MacAddressHash:7d5ad3b8a5c7cfaac2ade402f3fde088e0a77865dd6aa079d0f2a963dc998578 Java:1.8.0_102 (ContainerInstanceManagementClient, 2017-10-01-preview)", + "User-Agent" : "Azure-SDK-For-Java/null OS:Mac OS X/10.13.2 MacAddressHash:173fe2217ec9dce3c8d7df607684e4847d052946bb2c88cea16db5fb9df89a2f Java:1.8.0_102 (ContainerInstanceManagementClient, 2017-10-01-preview)", "Content-Type" : "application/json; charset=utf-8" }, "Response" : { - "date" : "Fri, 08 Dec 2017 19:12:22 GMT", - "content-length" : "876", + "date" : "Wed, 13 Dec 2017 23:06:57 GMT", + "content-length" : "875", "expires" : "-1", "x-ms-ratelimit-remaining-subscription-writes" : "1198", "retry-after" : "0", "StatusCode" : "201", "pragma" : "no-cache", "strict-transport-security" : "max-age=31536000; includeSubDomains", - "x-ms-correlation-request-id" : "334add07-d913-4391-991f-7da0bee51615", + "x-ms-correlation-request-id" : "80151dab-d823-412a-9154-3cd1ff292756", "x-ms-ratelimit-remaining-subscription-resource-requests-pt1h" : "59", "x-ms-ratelimit-remaining-subscription-resource-requests-pt5m" : "19", - "x-ms-routing-request-id" : "WESTUS2:20171208T191222Z:334add07-d913-4391-991f-7da0bee51615", + "x-ms-routing-request-id" : "WESTUS2:20171213T230658Z:80151dab-d823-412a-9154-3cd1ff292756", "content-type" : "application/json; charset=utf-8", "cache-control" : "no-cache", - "x-ms-request-id" : "westus:f8434d19-9d2e-4b52-8cce-ce507fd97a43", - "Body" : "{\"properties\":{\"provisioningState\":\"Creating\",\"containers\":[{\"name\":\"acisampledc796041b-1\",\"properties\":{\"image\":\"microsoft/aci-helloworld\",\"ports\":[{\"port\":80}],\"environmentVariables\":[],\"resources\":{\"requests\":{\"memoryInGB\":0.8,\"cpu\":0.5}}}},{\"name\":\"acisampledc796041b-2\",\"properties\":{\"image\":\"microsoft/aci-tutorial-sidecar\",\"ports\":[],\"environmentVariables\":[],\"resources\":{\"requests\":{\"memoryInGB\":0.8,\"cpu\":0.5}}}}],\"restartPolicy\":\"Never\",\"ipAddress\":{\"ports\":[{\"protocol\":\"TCP\",\"port\":80}],\"ip\":\"13.93.219.213\",\"type\":\"Public\"},\"osType\":\"Linux\",\"instanceView\":{\"events\":[],\"state\":\"Pending\"}},\"id\":\"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rgaci4b6431085/providers/Microsoft.ContainerInstance/containerGroups/acisampledc796041b\",\"name\":\"acisampledc796041b\",\"type\":\"Microsoft.ContainerInstance/containerGroups\",\"location\":\"westus\",\"tags\":{}}" + "x-ms-request-id" : "westus:f2d13a81-4db6-4e30-8e7b-0d47959e1fe2", + "Body" : "{\"properties\":{\"provisioningState\":\"Creating\",\"containers\":[{\"name\":\"acisamplec0d80305d-1\",\"properties\":{\"image\":\"microsoft/aci-helloworld\",\"ports\":[{\"port\":80}],\"environmentVariables\":[],\"resources\":{\"requests\":{\"memoryInGB\":0.8,\"cpu\":0.5}}}},{\"name\":\"acisamplec0d80305d-2\",\"properties\":{\"image\":\"microsoft/aci-tutorial-sidecar\",\"ports\":[],\"environmentVariables\":[],\"resources\":{\"requests\":{\"memoryInGB\":0.8,\"cpu\":0.5}}}}],\"restartPolicy\":\"Never\",\"ipAddress\":{\"ports\":[{\"protocol\":\"TCP\",\"port\":80}],\"ip\":\"13.64.147.81\",\"type\":\"Public\"},\"osType\":\"Linux\",\"instanceView\":{\"events\":[],\"state\":\"Pending\"}},\"id\":\"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rgaci05441618e/providers/Microsoft.ContainerInstance/containerGroups/acisamplec0d80305d\",\"name\":\"acisamplec0d80305d\",\"type\":\"Microsoft.ContainerInstance/containerGroups\",\"location\":\"westus\",\"tags\":{}}" } }, { "Method" : "GET", - "Uri" : "http://localhost:1234/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rgaci4b6431085/providers/Microsoft.ContainerInstance/containerGroups/acisampledc796041b-1/containers/acisampledc796041b/logs?api-version=2017-10-01-preview", + "Uri" : "http://localhost:1234/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rgaci05441618e/providers/Microsoft.ContainerInstance/containerGroups/acisamplec0d80305d/containers/acisamplec0d80305d-1/logs?api-version=2017-10-01-preview", "Headers" : { - "User-Agent" : "Azure-SDK-For-Java/null OS:Mac OS X/10.13.1 MacAddressHash:7d5ad3b8a5c7cfaac2ade402f3fde088e0a77865dd6aa079d0f2a963dc998578 Java:1.8.0_102 (ContainerInstanceManagementClient, 2017-10-01-preview)", + "User-Agent" : "Azure-SDK-For-Java/null OS:Mac OS X/10.13.2 MacAddressHash:173fe2217ec9dce3c8d7df607684e4847d052946bb2c88cea16db5fb9df89a2f Java:1.8.0_102 (ContainerInstanceManagementClient, 2017-10-01-preview)", "Content-Type" : "application/json; charset=utf-8" }, "Response" : { - "date" : "Fri, 08 Dec 2017 19:12:48 GMT", - "content-length" : "182", + "date" : "Wed, 13 Dec 2017 23:07:28 GMT", + "content-length" : "588", "expires" : "-1", + "transfer-encoding" : "chunked", + "vary" : "Accept-Encoding,Accept-Encoding", "retry-after" : "0", - "StatusCode" : "404", + "x-ms-ratelimit-remaining-subscription-reads" : "14998", + "StatusCode" : "200", "pragma" : "no-cache", "strict-transport-security" : "max-age=31536000; includeSubDomains", - "x-ms-correlation-request-id" : "616d1f47-063b-4f7b-a337-bc52779d7b74", - "x-ms-failure-cause" : "gateway", - "x-ms-routing-request-id" : "WESTUS2:20171208T191248Z:616d1f47-063b-4f7b-a337-bc52779d7b74", + "x-ms-correlation-request-id" : "c77565bf-044b-4217-9379-6a7af9501496", + "x-ms-routing-request-id" : "WESTUS2:20171213T230728Z:c77565bf-044b-4217-9379-6a7af9501496", "content-type" : "application/json; charset=utf-8", "cache-control" : "no-cache", - "x-ms-request-id" : "616d1f47-063b-4f7b-a337-bc52779d7b74", - "Body" : "{\"error\":{\"code\":\"ResourceNotFound\",\"message\":\"The Resource 'Microsoft.ContainerInstance/containerGroups/acisampledc796041b-1' under resource group 'rgaci4b6431085' was not found.\"}}" + "x-ms-request-id" : "westus:0084a81f-3d9b-4bac-a823-62af83994b54", + "Body" : "{\"content\":\"listening on port 80\\n::1 - - [13/Dec/2017:23:07:14 +0000] \\\"HEAD / HTTP/1.1\\\" 200 1663 \\\"-\\\" \\\"curl/7.54.0\\\"\\n::1 - - [13/Dec/2017:23:07:17 +0000] \\\"HEAD / HTTP/1.1\\\" 200 1663 \\\"-\\\" \\\"curl/7.54.0\\\"\\n::1 - - [13/Dec/2017:23:07:20 +0000] \\\"HEAD / HTTP/1.1\\\" 200 1663 \\\"-\\\" \\\"curl/7.54.0\\\"\\n::1 - - [13/Dec/2017:23:07:23 +0000] \\\"HEAD / HTTP/1.1\\\" 200 1663 \\\"-\\\" \\\"curl/7.54.0\\\"\\n::1 - - [13/Dec/2017:23:07:26 +0000] \\\"HEAD / HTTP/1.1\\\" 200 1663 \\\"-\\\" \\\"curl/7.54.0\\\"\\n::ffff:10.240.255.106 - - [13/Dec/2017:23:07:28 +0000] \\\"GET / HTTP/1.1\\\" 200 1663 \\\"-\\\" \\\"okhttp/3.6.0\\\"\\n\"}" } }, { "Method" : "GET", - "Uri" : "http://localhost:1234/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rgaci4b6431085/providers/Microsoft.ContainerInstance/containerGroups/acisampledc796041b-2/containers/acisampledc796041b/logs?api-version=2017-10-01-preview", + "Uri" : "http://localhost:1234/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rgaci05441618e/providers/Microsoft.ContainerInstance/containerGroups/acisamplec0d80305d/containers/acisamplec0d80305d-2/logs?api-version=2017-10-01-preview", "Headers" : { - "User-Agent" : "Azure-SDK-For-Java/null OS:Mac OS X/10.13.1 MacAddressHash:7d5ad3b8a5c7cfaac2ade402f3fde088e0a77865dd6aa079d0f2a963dc998578 Java:1.8.0_102 (ContainerInstanceManagementClient, 2017-10-01-preview)", + "User-Agent" : "Azure-SDK-For-Java/null OS:Mac OS X/10.13.2 MacAddressHash:173fe2217ec9dce3c8d7df607684e4847d052946bb2c88cea16db5fb9df89a2f Java:1.8.0_102 (ContainerInstanceManagementClient, 2017-10-01-preview)", "Content-Type" : "application/json; charset=utf-8" }, "Response" : { - "date" : "Fri, 08 Dec 2017 19:12:48 GMT", - "content-length" : "182", + "date" : "Wed, 13 Dec 2017 23:07:28 GMT", + "content-length" : "3709", "expires" : "-1", + "transfer-encoding" : "chunked", + "vary" : "Accept-Encoding,Accept-Encoding", "retry-after" : "0", - "StatusCode" : "404", + "x-ms-ratelimit-remaining-subscription-reads" : "14997", + "StatusCode" : "200", "pragma" : "no-cache", "strict-transport-security" : "max-age=31536000; includeSubDomains", - "x-ms-correlation-request-id" : "95acf9f8-525f-4d1a-8604-0a599729eb16", - "x-ms-failure-cause" : "gateway", - "x-ms-routing-request-id" : "WESTUS2:20171208T191248Z:95acf9f8-525f-4d1a-8604-0a599729eb16", + "x-ms-correlation-request-id" : "0920a8e7-3c6c-4dc8-a0a9-8306981ec6b8", + "x-ms-routing-request-id" : "WESTUS2:20171213T230729Z:0920a8e7-3c6c-4dc8-a0a9-8306981ec6b8", "content-type" : "application/json; charset=utf-8", "cache-control" : "no-cache", - "x-ms-request-id" : "95acf9f8-525f-4d1a-8604-0a599729eb16", - "Body" : "{\"error\":{\"code\":\"ResourceNotFound\",\"message\":\"The Resource 'Microsoft.ContainerInstance/containerGroups/acisampledc796041b-2' under resource group 'rgaci4b6431085' was not found.\"}}" + "x-ms-request-id" : "westus:3387d1b8-8f84-4f72-8cbd-3c550099878d", + "Body" : "{\"content\":\" % Total % Received % Xferd Average Speed Time Time Time Current\\n Dload Upload Total Spent Left Speed\\n\\u001b[H\\u001b[JEvery 3s: curl -I http://localhost 2017-12-13 23:07:14\\n\\nHTTP/1.1 200 OK\\r\\nX-Powered-By: Express\\r\\nAccept-Ranges: bytes\\r\\nCache-Control: public, max-age=0\\r\\nLast-Modified: Wed, 29 Nov 2017 06:40:40 GMT\\r\\nETag: W/\\\"67f-16006818640\\\"\\r\\nContent-Type: text/html; charset=UTF-8\\r\\nContent-Length: 1663\\r\\nDate: Wed, 13 Dec 2017 23:07:14 GMT\\r\\nConnection: keep-alive\\r\\n\\r\\n\\r 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0\\r 0 1663 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0\\n\\u001b[H\\u001b[JEvery 3s: curl -I http://localhost 2017-12-13 23:07:17\\n\\n % Total % Received % Xferd Average Speed Time Time Time Current\\n Dload Upload Total Spent Left Speed\\n\\r 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0\\r 0 1663 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0\\nHTTP/1.1 200 OK\\r\\nX-Powered-By: Express\\r\\nAccept-Ranges: bytes\\r\\nCache-Control: public, max-age=0\\r\\nLast-Modified: Wed, 29 Nov 2017 06:40:40 GMT\\r\\nETag: W/\\\"67f-16006818640\\\"\\r\\nContent-Type: text/html; charset=UTF-8\\r\\nContent-Length: 1663\\r\\nDate: Wed, 13 Dec 2017 23:07:17 GMT\\r\\nConnection: keep-alive\\r\\n\\r\\n\\u001b[H\\u001b[JEvery 3s: curl -I http://localhost 2017-12-13 23:07:20\\n\\n % Total % Received % Xferd Average Speed Time Time Time Current\\n Dload Upload Total Spent Left Speed\\nHTTP/1.1 200 OK\\r\\nX-Powered-By: Express\\r\\nAccept-Ranges: bytes\\r\\nCache-Control: public, max-age=0\\r\\nLast-Modified: Wed, 29 Nov 2017 06:40:40 GMT\\r\\nETag: W/\\\"67f-16006818640\\\"\\r\\nContent-Type: text/html; charset=UTF-8\\r\\nContent-Length: 1663\\r\\nDate: Wed, 13 Dec 2017 23:07:20 GMT\\r\\nConnection: keep-alive\\r\\n\\r\\n\\r 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0\\r 0 1663 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0\\n\\u001b[H\\u001b[JEvery 3s: curl -I http://localhost 2017-12-13 23:07:23\\n\\n % Total % Received % Xferd Average Speed Time Time Time Current\\n Dload Upload Total Spent Left Speed\\nHTTP/1.1 200 OK\\r\\nX-Powered-By: Express\\r\\nAccept-Ranges: bytes\\r\\nCache-Control: public, max-age=0\\r\\nLast-Modified: Wed, 29 Nov 2017 06:40:40 GMT\\r\\nETag: W/\\\"67f-16006818640\\\"\\r\\nContent-Type: text/html; charset=UTF-8\\r\\nContent-Length: 1663\\r\\nDate: Wed, 13 Dec 2017 23:07:23 GMT\\r\\nConnection: keep-alive\\r\\n\\r\\n\\r 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0\\r 0 1663 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0\\n\\u001b[H\\u001b[JEvery 3s: curl -I http://localhost 2017-12-13 23:07:26\\n\\n % Total % Received % Xferd Average Speed Time Time Time Current\\n Dload Upload Total Spent Left Speed\\nHTTP/1.1 200 OK\\r\\nX-Powered-By: Express\\r\\nAccept-Ranges: bytes\\r\\nCache-Control: public, max-age=0\\r\\nLast-Modified: Wed, 29 Nov 2017 06:40:40 GMT\\r\\nETag: W/\\\"67f-16006818640\\\"\\r\\nContent-Type: text/html; charset=UTF-8\\r\\nContent-Length: 1663\\r\\nDate: Wed, 13 Dec 2017 23:07:26 GMT\\r\\nConnection: keep-alive\\r\\n\\r\\n\\r 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0\\r 0 1663 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0\\n\"}" } }, { "Method" : "DELETE", - "Uri" : "http://localhost:1234/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rgaci4b6431085/providers/Microsoft.ContainerInstance/containerGroups/acisampledc796041b?api-version=2017-10-01-preview", + "Uri" : "http://localhost:1234/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rgaci05441618e/providers/Microsoft.ContainerInstance/containerGroups/acisamplec0d80305d?api-version=2017-10-01-preview", "Headers" : { - "User-Agent" : "Azure-SDK-For-Java/null OS:Mac OS X/10.13.1 MacAddressHash:7d5ad3b8a5c7cfaac2ade402f3fde088e0a77865dd6aa079d0f2a963dc998578 Java:1.8.0_102 (ContainerInstanceManagementClient, 2017-10-01-preview)", + "User-Agent" : "Azure-SDK-For-Java/null OS:Mac OS X/10.13.2 MacAddressHash:173fe2217ec9dce3c8d7df607684e4847d052946bb2c88cea16db5fb9df89a2f Java:1.8.0_102 (ContainerInstanceManagementClient, 2017-10-01-preview)", "Content-Type" : "application/json; charset=utf-8" }, "Response" : { - "date" : "Fri, 08 Dec 2017 19:12:48 GMT", - "content-length" : "2801", + "date" : "Wed, 13 Dec 2017 23:07:29 GMT", + "content-length" : "2800", "expires" : "-1", "transfer-encoding" : "chunked", "vary" : "Accept-Encoding,Accept-Encoding", @@ -111,24 +115,24 @@ "StatusCode" : "200", "pragma" : "no-cache", "strict-transport-security" : "max-age=31536000; includeSubDomains", - "x-ms-correlation-request-id" : "ef60d04d-4ad0-42db-8679-d9e56ef8a1de", - "x-ms-ratelimit-remaining-subscription-resource-requests-pt1h" : "147", - "x-ms-ratelimit-remaining-subscription-resource-requests-pt5m" : "47", - "x-ms-routing-request-id" : "WESTUS2:20171208T191248Z:ef60d04d-4ad0-42db-8679-d9e56ef8a1de", + "x-ms-correlation-request-id" : "cde632d6-edb1-4750-b4db-2e7e9cab7ef2", + "x-ms-ratelimit-remaining-subscription-resource-requests-pt1h" : "149", + "x-ms-ratelimit-remaining-subscription-resource-requests-pt5m" : "49", + "x-ms-routing-request-id" : "WESTUS2:20171213T230729Z:cde632d6-edb1-4750-b4db-2e7e9cab7ef2", "content-type" : "application/json; charset=utf-8", "cache-control" : "no-cache", - "x-ms-request-id" : "westus:10de85b1-90aa-4b41-9388-45d9d9da10e3", - "Body" : "{\"properties\":{\"provisioningState\":\"Succeeded\",\"containers\":[{\"name\":\"acisampledc796041b-1\",\"properties\":{\"image\":\"microsoft/aci-helloworld\",\"ports\":[{\"port\":80}],\"environmentVariables\":[],\"instanceView\":{\"restartCount\":0,\"currentState\":{\"state\":\"Running\",\"startTime\":\"2017-12-08T19:12:29Z\",\"detailStatus\":\"\"},\"events\":[{\"count\":1,\"firstTimestamp\":\"2017-12-08T19:12:24Z\",\"lastTimestamp\":\"2017-12-08T19:12:24Z\",\"name\":\"Pulling\",\"message\":\"pulling image \\\"microsoft/aci-helloworld\\\"\",\"type\":\"Normal\"},{\"count\":1,\"firstTimestamp\":\"2017-12-08T19:12:29Z\",\"lastTimestamp\":\"2017-12-08T19:12:29Z\",\"name\":\"Pulled\",\"message\":\"Successfully pulled image \\\"microsoft/aci-helloworld\\\"\",\"type\":\"Normal\"},{\"count\":1,\"firstTimestamp\":\"2017-12-08T19:12:29Z\",\"lastTimestamp\":\"2017-12-08T19:12:29Z\",\"name\":\"Created\",\"message\":\"Created container with id f91eccd82bc2ad3d3f70f29019285d6ad53465492c70005624e466f65b199464\",\"type\":\"Normal\"},{\"count\":1,\"firstTimestamp\":\"2017-12-08T19:12:29Z\",\"lastTimestamp\":\"2017-12-08T19:12:29Z\",\"name\":\"Started\",\"message\":\"Started container with id f91eccd82bc2ad3d3f70f29019285d6ad53465492c70005624e466f65b199464\",\"type\":\"Normal\"}]},\"resources\":{\"requests\":{\"memoryInGB\":0.8,\"cpu\":0.5}}}},{\"name\":\"acisampledc796041b-2\",\"properties\":{\"image\":\"microsoft/aci-tutorial-sidecar\",\"ports\":[],\"environmentVariables\":[],\"instanceView\":{\"restartCount\":0,\"currentState\":{\"state\":\"Running\",\"startTime\":\"2017-12-08T19:12:32Z\",\"detailStatus\":\"\"},\"events\":[{\"count\":1,\"firstTimestamp\":\"2017-12-08T19:12:29Z\",\"lastTimestamp\":\"2017-12-08T19:12:29Z\",\"name\":\"Pulling\",\"message\":\"pulling image \\\"microsoft/aci-tutorial-sidecar\\\"\",\"type\":\"Normal\"},{\"count\":1,\"firstTimestamp\":\"2017-12-08T19:12:32Z\",\"lastTimestamp\":\"2017-12-08T19:12:32Z\",\"name\":\"Pulled\",\"message\":\"Successfully pulled image \\\"microsoft/aci-tutorial-sidecar\\\"\",\"type\":\"Normal\"},{\"count\":1,\"firstTimestamp\":\"2017-12-08T19:12:32Z\",\"lastTimestamp\":\"2017-12-08T19:12:32Z\",\"name\":\"Created\",\"message\":\"Created container with id cc8b61baa4486b7ad457f9d5538d8e6a7e3ef3105a39f05901070867df5c8135\",\"type\":\"Normal\"},{\"count\":1,\"firstTimestamp\":\"2017-12-08T19:12:32Z\",\"lastTimestamp\":\"2017-12-08T19:12:32Z\",\"name\":\"Started\",\"message\":\"Started container with id cc8b61baa4486b7ad457f9d5538d8e6a7e3ef3105a39f05901070867df5c8135\",\"type\":\"Normal\"}]},\"resources\":{\"requests\":{\"memoryInGB\":0.8,\"cpu\":0.5}}}}],\"restartPolicy\":\"Never\",\"ipAddress\":{\"ports\":[{\"protocol\":\"TCP\",\"port\":80}],\"ip\":\"13.93.219.213\",\"type\":\"Public\"},\"osType\":\"Linux\",\"instanceView\":{\"events\":[],\"state\":\"Running\"}},\"id\":\"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rgaci4b6431085/providers/Microsoft.ContainerInstance/containerGroups/acisampledc796041b\",\"name\":\"acisampledc796041b\",\"type\":\"Microsoft.ContainerInstance/containerGroups\",\"location\":\"westus\",\"tags\":{}}" + "x-ms-request-id" : "westus:e29f88b7-b06a-4adb-be42-2170b73ddef7", + "Body" : "{\"properties\":{\"provisioningState\":\"Succeeded\",\"containers\":[{\"name\":\"acisamplec0d80305d-1\",\"properties\":{\"image\":\"microsoft/aci-helloworld\",\"ports\":[{\"port\":80}],\"environmentVariables\":[],\"instanceView\":{\"restartCount\":0,\"currentState\":{\"state\":\"Running\",\"startTime\":\"2017-12-13T23:07:11Z\",\"detailStatus\":\"\"},\"events\":[{\"count\":1,\"firstTimestamp\":\"2017-12-13T23:07:06Z\",\"lastTimestamp\":\"2017-12-13T23:07:06Z\",\"name\":\"Pulling\",\"message\":\"pulling image \\\"microsoft/aci-helloworld\\\"\",\"type\":\"Normal\"},{\"count\":1,\"firstTimestamp\":\"2017-12-13T23:07:11Z\",\"lastTimestamp\":\"2017-12-13T23:07:11Z\",\"name\":\"Pulled\",\"message\":\"Successfully pulled image \\\"microsoft/aci-helloworld\\\"\",\"type\":\"Normal\"},{\"count\":1,\"firstTimestamp\":\"2017-12-13T23:07:11Z\",\"lastTimestamp\":\"2017-12-13T23:07:11Z\",\"name\":\"Created\",\"message\":\"Created container with id c691a4b6a08d8750f0c03c2be020c63607edfac993127e688694f1ca21c05844\",\"type\":\"Normal\"},{\"count\":1,\"firstTimestamp\":\"2017-12-13T23:07:11Z\",\"lastTimestamp\":\"2017-12-13T23:07:11Z\",\"name\":\"Started\",\"message\":\"Started container with id c691a4b6a08d8750f0c03c2be020c63607edfac993127e688694f1ca21c05844\",\"type\":\"Normal\"}]},\"resources\":{\"requests\":{\"memoryInGB\":0.8,\"cpu\":0.5}}}},{\"name\":\"acisamplec0d80305d-2\",\"properties\":{\"image\":\"microsoft/aci-tutorial-sidecar\",\"ports\":[],\"environmentVariables\":[],\"instanceView\":{\"restartCount\":0,\"currentState\":{\"state\":\"Running\",\"startTime\":\"2017-12-13T23:07:14Z\",\"detailStatus\":\"\"},\"events\":[{\"count\":1,\"firstTimestamp\":\"2017-12-13T23:07:11Z\",\"lastTimestamp\":\"2017-12-13T23:07:11Z\",\"name\":\"Pulling\",\"message\":\"pulling image \\\"microsoft/aci-tutorial-sidecar\\\"\",\"type\":\"Normal\"},{\"count\":1,\"firstTimestamp\":\"2017-12-13T23:07:14Z\",\"lastTimestamp\":\"2017-12-13T23:07:14Z\",\"name\":\"Pulled\",\"message\":\"Successfully pulled image \\\"microsoft/aci-tutorial-sidecar\\\"\",\"type\":\"Normal\"},{\"count\":1,\"firstTimestamp\":\"2017-12-13T23:07:14Z\",\"lastTimestamp\":\"2017-12-13T23:07:14Z\",\"name\":\"Created\",\"message\":\"Created container with id d539fb2243eb57209a816580f23c63017d98dade294d31647b94e02c64608911\",\"type\":\"Normal\"},{\"count\":1,\"firstTimestamp\":\"2017-12-13T23:07:14Z\",\"lastTimestamp\":\"2017-12-13T23:07:14Z\",\"name\":\"Started\",\"message\":\"Started container with id d539fb2243eb57209a816580f23c63017d98dade294d31647b94e02c64608911\",\"type\":\"Normal\"}]},\"resources\":{\"requests\":{\"memoryInGB\":0.8,\"cpu\":0.5}}}}],\"restartPolicy\":\"Never\",\"ipAddress\":{\"ports\":[{\"protocol\":\"TCP\",\"port\":80}],\"ip\":\"13.64.147.81\",\"type\":\"Public\"},\"osType\":\"Linux\",\"instanceView\":{\"events\":[],\"state\":\"Running\"}},\"id\":\"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rgaci05441618e/providers/Microsoft.ContainerInstance/containerGroups/acisamplec0d80305d\",\"name\":\"acisamplec0d80305d\",\"type\":\"Microsoft.ContainerInstance/containerGroups\",\"location\":\"westus\",\"tags\":{}}" } }, { "Method" : "DELETE", - "Uri" : "http://localhost:1234/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/rgaci4b6431085?api-version=2016-09-01", + "Uri" : "http://localhost:1234/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/rgaci05441618e?api-version=2016-09-01", "Headers" : { - "User-Agent" : "Azure-SDK-For-Java/null OS:Mac OS X/10.13.1 MacAddressHash:7d5ad3b8a5c7cfaac2ade402f3fde088e0a77865dd6aa079d0f2a963dc998578 Java:1.8.0_102 (ResourceManagementClient, 2016-09-01)", + "User-Agent" : "Azure-SDK-For-Java/null OS:Mac OS X/10.13.2 MacAddressHash:173fe2217ec9dce3c8d7df607684e4847d052946bb2c88cea16db5fb9df89a2f Java:1.8.0_102 (ResourceManagementClient, 2016-09-01)", "Content-Type" : "application/json; charset=utf-8" }, "Response" : { - "date" : "Fri, 08 Dec 2017 19:12:49 GMT", + "date" : "Wed, 13 Dec 2017 23:07:30 GMT", "content-length" : "0", "expires" : "-1", "x-ms-ratelimit-remaining-subscription-writes" : "1196", @@ -136,13 +140,13 @@ "StatusCode" : "202", "pragma" : "no-cache", "strict-transport-security" : "max-age=31536000; includeSubDomains", - "x-ms-correlation-request-id" : "5f14f944-9aec-4a9c-8e3b-0f86b6156a8d", - "x-ms-routing-request-id" : "WESTUS2:20171208T191249Z:5f14f944-9aec-4a9c-8e3b-0f86b6156a8d", - "location" : "http://localhost:1234/subscriptions/00000000-0000-0000-0000-000000000000/operationresults/eyJqb2JJZCI6IlJFU09VUkNFR1JPVVBERUxFVElPTkpPQi1SR0FDSTRCNjQzMTA4NS1XRVNUVVMiLCJqb2JMb2NhdGlvbiI6Indlc3R1cyJ9?api-version=2016-09-01", + "x-ms-correlation-request-id" : "ab0b40cf-685f-42d9-bacc-cdd67906e53d", + "x-ms-routing-request-id" : "WESTUS2:20171213T230730Z:ab0b40cf-685f-42d9-bacc-cdd67906e53d", + "location" : "http://localhost:1234/subscriptions/00000000-0000-0000-0000-000000000000/operationresults/eyJqb2JJZCI6IlJFU09VUkNFR1JPVVBERUxFVElPTkpPQi1SR0FDSTA1NDQxNjE4RS1XRVNUVVMiLCJqb2JMb2NhdGlvbiI6Indlc3R1cyJ9?api-version=2016-09-01", "cache-control" : "no-cache", - "x-ms-request-id" : "5f14f944-9aec-4a9c-8e3b-0f86b6156a8d", + "x-ms-request-id" : "ab0b40cf-685f-42d9-bacc-cdd67906e53d", "Body" : "" } } ], - "variables" : [ "rgaci4b6431085", "acisampledc796041b", "a5ea7762-7acc-474c-9cfb-e229339740ca", "099c537e-b12e-4651-8f3d-81c427ecc526" ] + "variables" : [ "rgaci05441618e", "acisamplec0d80305d", "47d30807-ef92-4e1d-9389-caba9509ad3f", "be277c47-4657-462e-843c-b8baaf5eed64" ] } \ No newline at end of file diff --git a/notes/prepare-for-1.5.0.md b/notes/prepare-for-1.5.0.md index eb07bcd5643..10970167634 100644 --- a/notes/prepare-for-1.5.0.md +++ b/notes/prepare-for-1.5.0.md @@ -148,4 +148,27 @@ The following methods and/or types have been either renamed or removed in V1.5 c PR #92 - \ No newline at end of file + + +## Changes in Input Parameters Order ## + + + + + + + + + + + + + + + + + + + + +
AreaMethodRemarksRef
ContainerGroupsgetLogContent()Second argument containerName and third argument containerGroupName were swapped#85
ContainerGroupsgetLogContentAsync()Second argument containerName and third argument containerGroupName were swapped#85