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.

Sign up for GitHub

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

Jump to bottom

Log Level Test Fix + Removed Direct HTTPs mode tests + Authorization Token Type Invalid Fix #23120

Merged
merged 5 commits into from
Jul 23, 2021
Merged

Log Level Test Fix + Removed Direct HTTPs mode tests + Authorization Token Type Invalid Fix #23120

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
222c91e
Updated log level test to test all logging levels
kushagraThapar Jul 21, 2021
f195ca3
Removed Direct HTTPs tests
kushagraThapar Jul 21, 2021
9b3562a
Removed Direct Https default support in TestSuiteBase
kushagraThapar Jul 22, 2021
de7ee09
Removed Direct Https support from CI and reverted clientBuilders name…
kushagraThapar Jul 22, 2021
e97df57
Updated AuthorizationTokenType to PrimaryMasterKey for credential
kushagraThapar Jul 22, 2021
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
5 changes: 2 additions & 3 deletions sdk/cosmos/azure-cosmos-encryption/src/test/java/com/azure/cosmos/rx/TestSuiteBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
import com.azure.cosmos.CosmosException;
import com.azure.cosmos.DirectConnectionConfig;
import com.azure.cosmos.GatewayConnectionConfig;
import com.azure.cosmos.encryption.TestNGLogListener;
import com.azure.cosmos.ThrottlingRetryOptions;
import com.azure.cosmos.encryption.TestNGLogListener;
import com.azure.cosmos.implementation.Configs;
import com.azure.cosmos.implementation.ConnectionPolicy;
import com.azure.cosmos.implementation.InternalObjectNode;
Expand Down Expand Up @@ -141,7 +141,7 @@ protected static CosmosAsyncContainer getSharedSinglePartitionCosmosContainer(Co
allEqualOrLowerConsistencies(accountConsistency)));
preferredLocations = immutableListOrNull(parsePreferredLocation(TestConfigurations.PREFERRED_LOCATIONS));
protocols = ObjectUtils.defaultIfNull(immutableListOrNull(parseProtocols(TestConfigurations.PROTOCOLS)),
ImmutableList.of(Protocol.HTTPS, Protocol.TCP));
ImmutableList.of(Protocol.TCP));

// Object mapper configurations
objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
Expand Down Expand Up @@ -846,7 +846,6 @@ public static Object[][] clientBuilders() {
@DataProvider
public static Object[][] clientBuildersWithSessionConsistency() {
return new Object[][]{
{createDirectRxDocumentClient(ConsistencyLevel.SESSION, Protocol.HTTPS, false, null, true)},
{createDirectRxDocumentClient(ConsistencyLevel.SESSION, Protocol.TCP, false, null, true)},
{createGatewayRxDocumentClient(ConsistencyLevel.SESSION, false, null, true)}
};
Expand Down
1 change: 1 addition & 0 deletions ...smos/azure-cosmos/src/main/java/com/azure/cosmos/implementation/RxDocumentClientImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,6 +307,7 @@ private RxDocumentClientImpl(URI serviceEndpoint,

if (this.credential != null) {
hasAuthKeyResourceToken = false;
this.authorizationTokenType = AuthorizationTokenType.PrimaryMasterKey;
this.authorizationTokenProvider = new BaseAuthorizationTokenProvider(this.credential);
} else if (masterKeyOrResourceToken != null && ResourceTokenAuthorizationHelper.isResourceToken(masterKeyOrResourceToken)) {
this.authorizationTokenProvider = null;
Expand Down
23 changes: 22 additions & 1 deletion ...s/azure-cosmos/src/main/java/com/azure/cosmos/implementation/http/ReactorNettyClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
/**
* HttpClient that is implemented using reactor-netty.
*/
class ReactorNettyClient implements HttpClient {
public class ReactorNettyClient implements HttpClient {

private static final String REACTOR_NETTY_REQUEST_RECORD_KEY = "reactorNettyRequestRecordKey";

Expand Down Expand Up @@ -379,4 +379,25 @@ private enum ReactorNettyResponseState {
CANCELLED,
ERROR;
}

/**
* DO NOT USE
*
* This API is only for testing purposes, don't use it anywhere else in the code.
* This changes the logging level of Reactor Netty Http Client.
*/
public void enableNetworkLogging() {
Logger logger = LoggerFactory.getLogger(REACTOR_NETWORK_LOG_CATEGORY);
if (logger.isTraceEnabled()) {
this.httpClient = this.httpClient.wiretap(REACTOR_NETWORK_LOG_CATEGORY, LogLevel.TRACE);
simplynaveen20 marked this conversation as resolved.
Show resolved Hide resolved
} else if (logger.isInfoEnabled()) {
this.httpClient = this.httpClient.wiretap(REACTOR_NETWORK_LOG_CATEGORY, LogLevel.INFO);
} else if (logger.isDebugEnabled()) {
this.httpClient = this.httpClient.wiretap(REACTOR_NETWORK_LOG_CATEGORY, LogLevel.DEBUG);
} else if (logger.isWarnEnabled()) {
this.httpClient = this.httpClient.wiretap(REACTOR_NETWORK_LOG_CATEGORY, LogLevel.WARN);
} else if (logger.isErrorEnabled()) {
this.httpClient = this.httpClient.wiretap(REACTOR_NETWORK_LOG_CATEGORY, LogLevel.ERROR);
}
}
}
6 changes: 0 additions & 6 deletions sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/AzureKeyCredentialTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
import org.testng.annotations.AfterClass;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Factory;
import org.testng.annotations.Test;
Expand Down Expand Up @@ -335,11 +334,6 @@ public void invalidSecondaryKey() throws Exception {
client.getDatabase(databaseDefinition.getId());
}

@BeforeMethod(groups = { "simple" }, timeOut = TIMEOUT)
public void beforeMethod() throws Exception {
Thread.sleep(TIMEOUT / 2);
}

@AfterMethod(groups = { "simple" }, timeOut = SETUP_TIMEOUT)
public void afterMethod() {
// Set back master getKey before every test
Expand Down
2 changes: 1 addition & 1 deletion ...os/src/test/java/com/azure/cosmos/implementation/GoneAndRetryPolicyWithSpyClientTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ public class GoneAndRetryPolicyWithSpyClientTest extends TestSuiteBase {

@DataProvider
public static Object[][] directClientBuilder() {
return new Object[][] { { createDCBuilder(Protocol.HTTPS) }, { createDCBuilder(Protocol.TCP) } };
return new Object[][] { { createDCBuilder(Protocol.TCP) } };
}

static Builder createDCBuilder(Protocol protocol) {
Expand Down
20 changes: 10 additions & 10 deletions sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/implementation/TestSuiteBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,31 +2,31 @@
// Licensed under the MIT License.
package com.azure.cosmos.implementation;

import com.azure.cosmos.ConsistencyLevel;
import com.azure.cosmos.CosmosException;
import com.azure.cosmos.DirectConnectionConfig;
import com.azure.cosmos.DocumentClientTest;
import com.azure.cosmos.GatewayConnectionConfig;
import com.azure.cosmos.TestNGLogListener;
import com.azure.cosmos.ThrottlingRetryOptions;
import com.azure.cosmos.implementation.AsyncDocumentClient.Builder;
import com.azure.cosmos.implementation.directconnectivity.Protocol;
import com.azure.cosmos.implementation.guava25.base.CaseFormat;
import com.azure.cosmos.implementation.guava25.collect.ImmutableList;
import com.azure.cosmos.models.CompositePath;
import com.azure.cosmos.models.CompositePathSortOrder;
import com.azure.cosmos.ConsistencyLevel;
import com.azure.cosmos.CosmosException;
import com.azure.cosmos.DocumentClientTest;
import com.azure.cosmos.models.CosmosQueryRequestOptions;
import com.azure.cosmos.models.FeedResponse;
import com.azure.cosmos.models.IncludedPath;
import com.azure.cosmos.models.IndexingPolicy;
import com.azure.cosmos.models.ModelBridgeInternal;
import com.azure.cosmos.models.PartitionKey;
import com.azure.cosmos.models.PartitionKeyDefinition;
import com.azure.cosmos.ThrottlingRetryOptions;
import com.azure.cosmos.models.SqlQuerySpec;
import com.azure.cosmos.TestNGLogListener;
import com.azure.cosmos.implementation.AsyncDocumentClient.Builder;
import com.azure.cosmos.implementation.directconnectivity.Protocol;
import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.DeserializationFeature;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.azure.cosmos.implementation.guava25.base.CaseFormat;
import com.azure.cosmos.implementation.guava25.collect.ImmutableList;
import io.reactivex.subscribers.TestSubscriber;
import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.StringUtils;
Expand Down Expand Up @@ -90,7 +90,7 @@ private static <T> ImmutableList<T> immutableListOrNull(List<T> list) {
allEqualOrLowerConsistencies(accountConsistency)));
preferredLocations = immutableListOrNull(parsePreferredLocation(TestConfigurations.PREFERRED_LOCATIONS));
protocols = ObjectUtils.defaultIfNull(immutableListOrNull(parseProtocols(TestConfigurations.PROTOCOLS)),
ImmutableList.of(Protocol.HTTPS, Protocol.TCP));
ImmutableList.of(Protocol.TCP));
kushagraThapar marked this conversation as resolved.
Show resolved Hide resolved
// Object mapper configuration
objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
objectMapper.configure(JsonParser.Feature.ALLOW_SINGLE_QUOTES, true);
Expand Down
2 changes: 1 addition & 1 deletion .../src/test/java/com/azure/cosmos/implementation/directconnectivity/DCDocumentCrudTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ public class DCDocumentCrudTest extends TestSuiteBase {

@DataProvider
public static Object[][] directClientBuilder() {
return new Object[][] { { createDCBuilder(Protocol.HTTPS) }, { createDCBuilder(Protocol.TCP) } };
return new Object[][] { { createDCBuilder(Protocol.TCP) } };
}

static Builder createDCBuilder(Protocol protocol) {
Expand Down
Loading