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

14895 Update tests instance type to ATLAS #15434

Merged
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
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,8 @@ static void setupConfig() throws IOException {
final JsonNode credentialsJson = Jsons.deserialize(credentialsJsonString);

final JsonNode instanceConfig = Jsons.jsonNode(ImmutableMap.builder()
.put("instance", MongoInstanceType.STANDALONE.getType())
.put(JdbcUtils.HOST_KEY, credentialsJson.get(JdbcUtils.HOST_KEY).asText())
.put(JdbcUtils.PORT_KEY, credentialsJson.get(JdbcUtils.PORT_KEY).asInt())
.put("instance", MongoInstanceType.ATLAS.getType())
.put("cluster_url", credentialsJson.get("cluster_url").asText())
.build());

final JsonNode authConfig = Jsons.jsonNode(ImmutableMap.builder()
Expand Down Expand Up @@ -105,11 +104,11 @@ protected List<JsonNode> retrieveRecords(final TestDestinationEnv testEnv,

@Override
protected void setup(final TestDestinationEnv testEnv) {
final String connectionString = String.format("mongodb://%s:%s@%s:%s/%s?authSource=admin&ssl=true",
config.get(AUTH_TYPE).get(JdbcUtils.USERNAME_KEY).asText(),
config.get(AUTH_TYPE).get(JdbcUtils.PASSWORD_KEY).asText(),
config.get(INSTANCE_TYPE).get(JdbcUtils.HOST_KEY).asText(),
config.get(INSTANCE_TYPE).get(JdbcUtils.PORT_KEY).asText(),
var credentials = String.format("%s:%s@", config.get(AUTH_TYPE).get(JdbcUtils.USERNAME_KEY).asText(),
config.get(AUTH_TYPE).get(JdbcUtils.PASSWORD_KEY).asText());
final String connectionString = String.format("mongodb+srv://%s%s/%s?retryWrites=true&w=majority&tls=true",
credentials,
config.get(INSTANCE_TYPE).get("cluster_url").asText(),
config.get(JdbcUtils.DATABASE_KEY).asText());

mongoDatabase = new MongoDatabase(connectionString, config.get(JdbcUtils.DATABASE_KEY).asText());
Expand Down