From 3859d836a72b6b983ace8747fcf8941793a9d5c6 Mon Sep 17 00:00:00 2001 From: Sima Zhu <48036328+sima-zhu@users.noreply.github.com> Date: Tue, 26 Nov 2019 18:36:31 -0800 Subject: [PATCH 1/3] Hide secret info from log info (#6555) * Hide secret info from log info --- .../core/http/policy/HttpLoggingPolicy.java | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/sdk/core/azure-core/src/main/java/com/azure/core/http/policy/HttpLoggingPolicy.java b/sdk/core/azure-core/src/main/java/com/azure/core/http/policy/HttpLoggingPolicy.java index 78916a4b2072..958a88324356 100644 --- a/sdk/core/azure-core/src/main/java/com/azure/core/http/policy/HttpLoggingPolicy.java +++ b/sdk/core/azure-core/src/main/java/com/azure/core/http/policy/HttpLoggingPolicy.java @@ -17,7 +17,6 @@ import com.fasterxml.jackson.databind.SerializationFeature; import reactor.core.publisher.Mono; -import java.net.MalformedURLException; import java.net.URL; import java.nio.charset.StandardCharsets; import java.util.Locale; @@ -83,13 +82,9 @@ public Mono process(HttpPipelineCallContext context, HttpPipelineN private Mono logRequest(final ClientLogger logger, final HttpRequest request) { final HttpLogDetailLevel httpLogLevel = httpLogOptions.getLogLevel(); if (httpLogLevel.shouldLogUrl()) { - try { - UrlBuilder requestUrl = UrlBuilder.parse(request.getUrl()); - requestUrl.setQuery(getAllowedQueryString(request.getUrl().getQuery())); - logger.info("--> {} {}", request.getHttpMethod(), requestUrl.toUrl()); - } catch (MalformedURLException ex) { - return Mono.error(logger.logExceptionAsWarning(new IllegalStateException("Invalid request URL."))); - } + UrlBuilder requestUrl = UrlBuilder.parse(request.getUrl()); + requestUrl.setQuery(getAllowedQueryString(request.getUrl().getQuery())); + logger.info("--> {} {}", request.getHttpMethod(), requestUrl.toString()); } if (httpLogLevel.shouldLogHeaders()) { @@ -196,9 +191,11 @@ private Function> logResponseDelegate(final Cli bodySize = contentLengthString + "-byte"; } HttpLogDetailLevel httpLogLevel = httpLogOptions.getLogLevel(); - // HttpResponseStatus responseStatus = HttpResponseStatus.valueOf(response.statusCode()); if (httpLogLevel.shouldLogUrl()) { - logger.info("<-- {} {} ({} ms, {} body)", response.getStatusCode(), url, tookMs, bodySize); + UrlBuilder requestUrl = UrlBuilder.parse(url); + requestUrl.setQuery(getAllowedQueryString(url.getQuery())); + logger.info("<-- {} {} ({} ms, {} body)", response.getStatusCode(), requestUrl.toString(), tookMs, + bodySize); } if (httpLogLevel.shouldLogHeaders()) { From b963c957a1833d20d51edad7985ef70869999b72 Mon Sep 17 00:00:00 2001 From: alzimmermsft <48699787+alzimmermsft@users.noreply.github.com> Date: Tue, 3 Dec 2019 16:57:04 -0800 Subject: [PATCH 2/3] Update pom versions and Azure Core README --- eng/jacoco-test-coverage/pom.xml | 2 +- eng/spotbugs-aggregate-report/pom.xml | 2 +- eng/versioning/version_client.txt | 2 +- sdk/appconfiguration/azure-data-appconfiguration/pom.xml | 2 +- sdk/core/azure-core-amqp/pom.xml | 2 +- sdk/core/azure-core-http-netty/pom.xml | 4 ++-- sdk/core/azure-core-http-okhttp/pom.xml | 4 ++-- sdk/core/azure-core-management/pom.xml | 2 +- sdk/core/azure-core-test/pom.xml | 2 +- sdk/core/azure-core-tracing-opencensus/pom.xml | 2 +- sdk/core/azure-core-tracing-opentelemetry/pom.xml | 2 +- sdk/core/azure-core/README.md | 2 +- sdk/core/azure-core/pom.xml | 2 +- sdk/eventhubs/azure-messaging-eventhubs/pom.xml | 2 +- sdk/identity/azure-identity/pom.xml | 2 +- sdk/keyvault/azure-security-keyvault-certificates/pom.xml | 2 +- sdk/keyvault/azure-security-keyvault-keys/pom.xml | 2 +- sdk/keyvault/azure-security-keyvault-secrets/pom.xml | 2 +- sdk/storage/azure-storage-blob-batch/pom.xml | 2 +- sdk/storage/azure-storage-blob/pom.xml | 2 +- sdk/storage/azure-storage-common/pom.xml | 2 +- sdk/storage/azure-storage-file-datalake/pom.xml | 2 +- sdk/storage/azure-storage-file-share/pom.xml | 2 +- sdk/storage/azure-storage-queue/pom.xml | 2 +- sdk/template/azure-sdk-template/pom.xml | 2 +- 25 files changed, 27 insertions(+), 27 deletions(-) diff --git a/eng/jacoco-test-coverage/pom.xml b/eng/jacoco-test-coverage/pom.xml index d252c556578e..4f9bd6da73c8 100644 --- a/eng/jacoco-test-coverage/pom.xml +++ b/eng/jacoco-test-coverage/pom.xml @@ -39,7 +39,7 @@ com.azure azure-core - 1.1.0 + 1.1.1 com.azure diff --git a/eng/spotbugs-aggregate-report/pom.xml b/eng/spotbugs-aggregate-report/pom.xml index 4d616ae4e111..da64cbddde23 100644 --- a/eng/spotbugs-aggregate-report/pom.xml +++ b/eng/spotbugs-aggregate-report/pom.xml @@ -144,7 +144,7 @@ com.azure azure-core - 1.1.0 + 1.1.1 com.azure diff --git a/eng/versioning/version_client.txt b/eng/versioning/version_client.txt index 52d0793b5158..c7ed5861c130 100644 --- a/eng/versioning/version_client.txt +++ b/eng/versioning/version_client.txt @@ -3,7 +3,7 @@ com.azure:azure-sdk-parent;1.6.0;1.6.0 com.azure:azure-client-sdk-parent;1.7.0;1.7.0 -com.azure:azure-core;1.1.0;1.1.0 +com.azure:azure-core;1.1.1;1.1.1 com.azure:azure-core-amqp;1.0.0-beta.8;1.0.0-beta.8 com.azure:azure-core-http-netty;1.1.0;1.1.0 com.azure:azure-core-http-okhttp;1.1.0-beta.1;1.1.0-beta.1 diff --git a/sdk/appconfiguration/azure-data-appconfiguration/pom.xml b/sdk/appconfiguration/azure-data-appconfiguration/pom.xml index 56c420d8992d..5ba3b6a07446 100644 --- a/sdk/appconfiguration/azure-data-appconfiguration/pom.xml +++ b/sdk/appconfiguration/azure-data-appconfiguration/pom.xml @@ -36,7 +36,7 @@ com.azure azure-core - 1.1.0 + 1.1.1 org.slf4j diff --git a/sdk/core/azure-core-amqp/pom.xml b/sdk/core/azure-core-amqp/pom.xml index 176b0b0a73ab..86836ba8d0c4 100644 --- a/sdk/core/azure-core-amqp/pom.xml +++ b/sdk/core/azure-core-amqp/pom.xml @@ -57,7 +57,7 @@ com.azure azure-core - 1.1.0 + 1.1.1 com.microsoft.azure diff --git a/sdk/core/azure-core-http-netty/pom.xml b/sdk/core/azure-core-http-netty/pom.xml index 92a8fc2abb83..7f9b75a23278 100644 --- a/sdk/core/azure-core-http-netty/pom.xml +++ b/sdk/core/azure-core-http-netty/pom.xml @@ -58,7 +58,7 @@ com.azure azure-core - 1.1.0 + 1.1.1 @@ -109,7 +109,7 @@ com.azure azure-core - 1.1.0 + 1.1.1 test-jar test diff --git a/sdk/core/azure-core-http-okhttp/pom.xml b/sdk/core/azure-core-http-okhttp/pom.xml index 1161f46d0e18..85328910d682 100644 --- a/sdk/core/azure-core-http-okhttp/pom.xml +++ b/sdk/core/azure-core-http-okhttp/pom.xml @@ -59,7 +59,7 @@ com.azure azure-core - 1.1.0 + 1.1.1 @@ -72,7 +72,7 @@ com.azure azure-core - 1.1.0 + 1.1.1 test-jar test diff --git a/sdk/core/azure-core-management/pom.xml b/sdk/core/azure-core-management/pom.xml index d07b1b640436..1206099811fd 100644 --- a/sdk/core/azure-core-management/pom.xml +++ b/sdk/core/azure-core-management/pom.xml @@ -57,7 +57,7 @@ com.azure azure-core - 1.1.0 + 1.1.1 diff --git a/sdk/core/azure-core-test/pom.xml b/sdk/core/azure-core-test/pom.xml index 7b8789f9786e..2c7c100a0f10 100644 --- a/sdk/core/azure-core-test/pom.xml +++ b/sdk/core/azure-core-test/pom.xml @@ -38,7 +38,7 @@ com.azure azure-core - 1.1.0 + 1.1.1 diff --git a/sdk/core/azure-core-tracing-opencensus/pom.xml b/sdk/core/azure-core-tracing-opencensus/pom.xml index ed3bb8a2a8e3..0e38d277e02a 100644 --- a/sdk/core/azure-core-tracing-opencensus/pom.xml +++ b/sdk/core/azure-core-tracing-opencensus/pom.xml @@ -35,7 +35,7 @@ com.azure azure-core - 1.1.0 + 1.1.1 io.opencensus diff --git a/sdk/core/azure-core-tracing-opentelemetry/pom.xml b/sdk/core/azure-core-tracing-opentelemetry/pom.xml index 8f668db15ec1..aa366086471a 100644 --- a/sdk/core/azure-core-tracing-opentelemetry/pom.xml +++ b/sdk/core/azure-core-tracing-opentelemetry/pom.xml @@ -40,7 +40,7 @@ com.azure azure-core - 1.1.0 + 1.1.1 diff --git a/sdk/core/azure-core/README.md b/sdk/core/azure-core/README.md index 9d3e946a097a..b5c345c12219 100644 --- a/sdk/core/azure-core/README.md +++ b/sdk/core/azure-core/README.md @@ -15,7 +15,7 @@ Typically, you will not need to install or specifically depend on Azure Core, in com.azure azure-core - 1.0.0 + 1.1.1 ``` [//]: # ({x-version-update-end}) diff --git a/sdk/core/azure-core/pom.xml b/sdk/core/azure-core/pom.xml index 28ff43d3d3a2..ecdb614bec93 100644 --- a/sdk/core/azure-core/pom.xml +++ b/sdk/core/azure-core/pom.xml @@ -14,7 +14,7 @@ com.azure azure-core jar - 1.1.0 + 1.1.1 Microsoft Azure Java Core Library This package contains core types for Azure Java clients. diff --git a/sdk/eventhubs/azure-messaging-eventhubs/pom.xml b/sdk/eventhubs/azure-messaging-eventhubs/pom.xml index 79ebeb999013..b21fc2fd841a 100644 --- a/sdk/eventhubs/azure-messaging-eventhubs/pom.xml +++ b/sdk/eventhubs/azure-messaging-eventhubs/pom.xml @@ -37,7 +37,7 @@ com.azure azure-core - 1.1.0 + 1.1.1 com.azure diff --git a/sdk/identity/azure-identity/pom.xml b/sdk/identity/azure-identity/pom.xml index e930a9a15b19..a175c16ceb1a 100644 --- a/sdk/identity/azure-identity/pom.xml +++ b/sdk/identity/azure-identity/pom.xml @@ -23,7 +23,7 @@ com.azure azure-core - 1.1.0 + 1.1.1 org.slf4j diff --git a/sdk/keyvault/azure-security-keyvault-certificates/pom.xml b/sdk/keyvault/azure-security-keyvault-certificates/pom.xml index f213d4c4228f..5398ae931984 100644 --- a/sdk/keyvault/azure-security-keyvault-certificates/pom.xml +++ b/sdk/keyvault/azure-security-keyvault-certificates/pom.xml @@ -36,7 +36,7 @@ com.azure azure-core - 1.1.0 + 1.1.1 diff --git a/sdk/keyvault/azure-security-keyvault-keys/pom.xml b/sdk/keyvault/azure-security-keyvault-keys/pom.xml index dbc410381df2..20fe8fd92bbb 100644 --- a/sdk/keyvault/azure-security-keyvault-keys/pom.xml +++ b/sdk/keyvault/azure-security-keyvault-keys/pom.xml @@ -36,7 +36,7 @@ com.azure azure-core - 1.1.0 + 1.1.1 diff --git a/sdk/keyvault/azure-security-keyvault-secrets/pom.xml b/sdk/keyvault/azure-security-keyvault-secrets/pom.xml index 17ae014949ab..3a9d6b55fb26 100644 --- a/sdk/keyvault/azure-security-keyvault-secrets/pom.xml +++ b/sdk/keyvault/azure-security-keyvault-secrets/pom.xml @@ -34,7 +34,7 @@ com.azure azure-core - 1.1.0 + 1.1.1 diff --git a/sdk/storage/azure-storage-blob-batch/pom.xml b/sdk/storage/azure-storage-blob-batch/pom.xml index aba14e520dcc..b92e5ac59ca1 100644 --- a/sdk/storage/azure-storage-blob-batch/pom.xml +++ b/sdk/storage/azure-storage-blob-batch/pom.xml @@ -55,7 +55,7 @@ com.azure azure-core - 1.1.0 + 1.1.1 com.azure diff --git a/sdk/storage/azure-storage-blob/pom.xml b/sdk/storage/azure-storage-blob/pom.xml index 34558cf48cf6..ed8eb3526b7b 100644 --- a/sdk/storage/azure-storage-blob/pom.xml +++ b/sdk/storage/azure-storage-blob/pom.xml @@ -55,7 +55,7 @@ com.azure azure-core - 1.1.0 + 1.1.1 com.azure diff --git a/sdk/storage/azure-storage-common/pom.xml b/sdk/storage/azure-storage-common/pom.xml index c73af5bdb5ef..b035d1477a50 100644 --- a/sdk/storage/azure-storage-common/pom.xml +++ b/sdk/storage/azure-storage-common/pom.xml @@ -36,7 +36,7 @@ com.azure azure-core - 1.1.0 + 1.1.1 org.slf4j diff --git a/sdk/storage/azure-storage-file-datalake/pom.xml b/sdk/storage/azure-storage-file-datalake/pom.xml index f13cef9f9e09..8a86b1364573 100644 --- a/sdk/storage/azure-storage-file-datalake/pom.xml +++ b/sdk/storage/azure-storage-file-datalake/pom.xml @@ -60,7 +60,7 @@ com.azure azure-core - 1.1.0 + 1.1.1 + 1.1.1 com.azure diff --git a/sdk/storage/azure-storage-queue/pom.xml b/sdk/storage/azure-storage-queue/pom.xml index dc775c0e4127..0a981be97f9e 100644 --- a/sdk/storage/azure-storage-queue/pom.xml +++ b/sdk/storage/azure-storage-queue/pom.xml @@ -36,7 +36,7 @@ com.azure azure-core - 1.1.0 + 1.1.1 com.azure diff --git a/sdk/template/azure-sdk-template/pom.xml b/sdk/template/azure-sdk-template/pom.xml index d61131d1e5f9..a36649f6bd4e 100644 --- a/sdk/template/azure-sdk-template/pom.xml +++ b/sdk/template/azure-sdk-template/pom.xml @@ -31,7 +31,7 @@ com.azure azure-core - 1.1.0 + 1.1.1 junit From a6d83bf67ff48ab52149569d3e869ed1d714dc5c Mon Sep 17 00:00:00 2001 From: alzimmermsft <48699787+alzimmermsft@users.noreply.github.com> Date: Thu, 5 Dec 2019 10:24:01 -0800 Subject: [PATCH 3/3] Reverted dependency versions --- eng/versioning/version_client.txt | 2 +- sdk/appconfiguration/azure-data-appconfiguration/pom.xml | 2 +- sdk/core/azure-core-test/pom.xml | 2 +- sdk/core/azure-core-tracing-opencensus/pom.xml | 2 +- sdk/core/azure-core-tracing-opentelemetry/pom.xml | 2 +- sdk/eventhubs/azure-messaging-eventhubs/pom.xml | 2 +- sdk/identity/azure-identity/pom.xml | 2 +- sdk/keyvault/azure-security-keyvault-certificates/pom.xml | 2 +- sdk/keyvault/azure-security-keyvault-keys/pom.xml | 2 +- sdk/keyvault/azure-security-keyvault-secrets/pom.xml | 2 +- sdk/storage/azure-storage-blob-batch/pom.xml | 2 +- sdk/storage/azure-storage-blob/pom.xml | 2 +- sdk/storage/azure-storage-common/pom.xml | 2 +- sdk/storage/azure-storage-file-datalake/pom.xml | 2 +- sdk/storage/azure-storage-file-share/pom.xml | 2 +- sdk/storage/azure-storage-queue/pom.xml | 2 +- sdk/template/azure-sdk-template/pom.xml | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/eng/versioning/version_client.txt b/eng/versioning/version_client.txt index c7ed5861c130..1614648a27b4 100644 --- a/eng/versioning/version_client.txt +++ b/eng/versioning/version_client.txt @@ -3,7 +3,7 @@ com.azure:azure-sdk-parent;1.6.0;1.6.0 com.azure:azure-client-sdk-parent;1.7.0;1.7.0 -com.azure:azure-core;1.1.1;1.1.1 +com.azure:azure-core;1.1.0;1.1.1 com.azure:azure-core-amqp;1.0.0-beta.8;1.0.0-beta.8 com.azure:azure-core-http-netty;1.1.0;1.1.0 com.azure:azure-core-http-okhttp;1.1.0-beta.1;1.1.0-beta.1 diff --git a/sdk/appconfiguration/azure-data-appconfiguration/pom.xml b/sdk/appconfiguration/azure-data-appconfiguration/pom.xml index 5ba3b6a07446..56c420d8992d 100644 --- a/sdk/appconfiguration/azure-data-appconfiguration/pom.xml +++ b/sdk/appconfiguration/azure-data-appconfiguration/pom.xml @@ -36,7 +36,7 @@ com.azure azure-core - 1.1.1 + 1.1.0 org.slf4j diff --git a/sdk/core/azure-core-test/pom.xml b/sdk/core/azure-core-test/pom.xml index 2c7c100a0f10..7b8789f9786e 100644 --- a/sdk/core/azure-core-test/pom.xml +++ b/sdk/core/azure-core-test/pom.xml @@ -38,7 +38,7 @@ com.azure azure-core - 1.1.1 + 1.1.0 diff --git a/sdk/core/azure-core-tracing-opencensus/pom.xml b/sdk/core/azure-core-tracing-opencensus/pom.xml index 0e38d277e02a..ed3bb8a2a8e3 100644 --- a/sdk/core/azure-core-tracing-opencensus/pom.xml +++ b/sdk/core/azure-core-tracing-opencensus/pom.xml @@ -35,7 +35,7 @@ com.azure azure-core - 1.1.1 + 1.1.0 io.opencensus diff --git a/sdk/core/azure-core-tracing-opentelemetry/pom.xml b/sdk/core/azure-core-tracing-opentelemetry/pom.xml index aa366086471a..8f668db15ec1 100644 --- a/sdk/core/azure-core-tracing-opentelemetry/pom.xml +++ b/sdk/core/azure-core-tracing-opentelemetry/pom.xml @@ -40,7 +40,7 @@ com.azure azure-core - 1.1.1 + 1.1.0 diff --git a/sdk/eventhubs/azure-messaging-eventhubs/pom.xml b/sdk/eventhubs/azure-messaging-eventhubs/pom.xml index b21fc2fd841a..79ebeb999013 100644 --- a/sdk/eventhubs/azure-messaging-eventhubs/pom.xml +++ b/sdk/eventhubs/azure-messaging-eventhubs/pom.xml @@ -37,7 +37,7 @@ com.azure azure-core - 1.1.1 + 1.1.0 com.azure diff --git a/sdk/identity/azure-identity/pom.xml b/sdk/identity/azure-identity/pom.xml index a175c16ceb1a..e930a9a15b19 100644 --- a/sdk/identity/azure-identity/pom.xml +++ b/sdk/identity/azure-identity/pom.xml @@ -23,7 +23,7 @@ com.azure azure-core - 1.1.1 + 1.1.0 org.slf4j diff --git a/sdk/keyvault/azure-security-keyvault-certificates/pom.xml b/sdk/keyvault/azure-security-keyvault-certificates/pom.xml index 5398ae931984..f213d4c4228f 100644 --- a/sdk/keyvault/azure-security-keyvault-certificates/pom.xml +++ b/sdk/keyvault/azure-security-keyvault-certificates/pom.xml @@ -36,7 +36,7 @@ com.azure azure-core - 1.1.1 + 1.1.0 diff --git a/sdk/keyvault/azure-security-keyvault-keys/pom.xml b/sdk/keyvault/azure-security-keyvault-keys/pom.xml index 20fe8fd92bbb..dbc410381df2 100644 --- a/sdk/keyvault/azure-security-keyvault-keys/pom.xml +++ b/sdk/keyvault/azure-security-keyvault-keys/pom.xml @@ -36,7 +36,7 @@ com.azure azure-core - 1.1.1 + 1.1.0 diff --git a/sdk/keyvault/azure-security-keyvault-secrets/pom.xml b/sdk/keyvault/azure-security-keyvault-secrets/pom.xml index 3a9d6b55fb26..17ae014949ab 100644 --- a/sdk/keyvault/azure-security-keyvault-secrets/pom.xml +++ b/sdk/keyvault/azure-security-keyvault-secrets/pom.xml @@ -34,7 +34,7 @@ com.azure azure-core - 1.1.1 + 1.1.0 diff --git a/sdk/storage/azure-storage-blob-batch/pom.xml b/sdk/storage/azure-storage-blob-batch/pom.xml index b92e5ac59ca1..aba14e520dcc 100644 --- a/sdk/storage/azure-storage-blob-batch/pom.xml +++ b/sdk/storage/azure-storage-blob-batch/pom.xml @@ -55,7 +55,7 @@ com.azure azure-core - 1.1.1 + 1.1.0 com.azure diff --git a/sdk/storage/azure-storage-blob/pom.xml b/sdk/storage/azure-storage-blob/pom.xml index ed8eb3526b7b..34558cf48cf6 100644 --- a/sdk/storage/azure-storage-blob/pom.xml +++ b/sdk/storage/azure-storage-blob/pom.xml @@ -55,7 +55,7 @@ com.azure azure-core - 1.1.1 + 1.1.0 com.azure diff --git a/sdk/storage/azure-storage-common/pom.xml b/sdk/storage/azure-storage-common/pom.xml index b035d1477a50..c73af5bdb5ef 100644 --- a/sdk/storage/azure-storage-common/pom.xml +++ b/sdk/storage/azure-storage-common/pom.xml @@ -36,7 +36,7 @@ com.azure azure-core - 1.1.1 + 1.1.0 org.slf4j diff --git a/sdk/storage/azure-storage-file-datalake/pom.xml b/sdk/storage/azure-storage-file-datalake/pom.xml index 8a86b1364573..f13cef9f9e09 100644 --- a/sdk/storage/azure-storage-file-datalake/pom.xml +++ b/sdk/storage/azure-storage-file-datalake/pom.xml @@ -60,7 +60,7 @@ com.azure azure-core - 1.1.1 + 1.1.0 + 1.1.0 com.azure diff --git a/sdk/storage/azure-storage-queue/pom.xml b/sdk/storage/azure-storage-queue/pom.xml index 0a981be97f9e..dc775c0e4127 100644 --- a/sdk/storage/azure-storage-queue/pom.xml +++ b/sdk/storage/azure-storage-queue/pom.xml @@ -36,7 +36,7 @@ com.azure azure-core - 1.1.1 + 1.1.0 com.azure diff --git a/sdk/template/azure-sdk-template/pom.xml b/sdk/template/azure-sdk-template/pom.xml index a36649f6bd4e..d61131d1e5f9 100644 --- a/sdk/template/azure-sdk-template/pom.xml +++ b/sdk/template/azure-sdk-template/pom.xml @@ -31,7 +31,7 @@ com.azure azure-core - 1.1.1 + 1.1.0 junit