honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use the correct domain to fix failing integration tests. (#519) 

This commit fixes a renaming issue (opensearch.co -> opensearch.org) which was causing few integration test failures.

Signed-off-by: Rabi Panda <adnapibar@gmail.com>
This commit is contained in:
Rabi Panda 2021-04-10 09:42:39 -07:00 committed by GitHub
parent 2a3ce0bb75
commit 8727afbcd3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
plugins/repository-gcs/src/test/java/org/opensearch/repositories/gcs/GoogleCloudStorageClientSettingsTests.java
View File

@ -153,10 +153,9 @@ public class GoogleCloudStorageClientSettingsTests extends OpenSearchTestCase {
secureSettings.setFile(CREDENTIALS_FILE_SETTING.getConcreteSettingForNamespace(clientName).getKey(), credentials.v2());
String endpoint;
// TODO: use openearch.co, will update once finalized
if (randomBoolean()) {
endpoint = randomFrom("http://www.opensearch.co", "http://metadata.google.com:88/oauth", "https://www.googleapis.com",
"https://www.opensearch.co:443", "http://localhost:8443", "https://www.googleapis.com/oauth/token");
endpoint = randomFrom("http://www.opensearch.org", "http://metadata.google.com:88/oauth", "https://www.googleapis.com",
"https://www.opensearch.org:443", "http://localhost:8443", "https://www.googleapis.com/oauth/token");
settings.put(ENDPOINT_SETTING.getConcreteSettingForNamespace(clientName).getKey(), endpoint);
} else {
endpoint = ENDPOINT_SETTING.getDefault(Settings.EMPTY);

3
plugins/repository-gcs/src/test/java/org/opensearch/repositories/gcs/GoogleCloudStorageServiceTests.java
View File

@ -62,9 +62,8 @@ public class GoogleCloudStorageServiceTests extends OpenSearchTestCase {
final TimeValue connectTimeValue = TimeValue.timeValueNanos(randomIntBetween(0, 2000000));
final TimeValue readTimeValue = TimeValue.timeValueNanos(randomIntBetween(0, 2000000));
final String applicationName = randomAlphaOfLength(randomIntBetween(1, 10)).toLowerCase(Locale.ROOT);
// TODO: use www.opensearch.co now, will update once finalized
final String endpoint = randomFrom("http://", "https://")
+ randomFrom("www.opensearch.co", "www.googleapis.com", "localhost/api", "google.com/oauth")
+ randomFrom("www.opensearch.org", "www.googleapis.com", "localhost/api", "google.com/oauth")
+ ":" + randomIntBetween(1, 65535);
final String projectIdName = randomAlphaOfLength(randomIntBetween(1, 10)).toLowerCase(Locale.ROOT);
final Settings settings = Settings.builder()

2
plugins/repository-hdfs/src/test/resources/rest-api-spec/test/secure_hdfs_repository/20_repository_create.yml
View File

@ -13,7 +13,7 @@
uri: "hdfs://localhost:9998"
path: "/user/opensearch/test/repository_create"
security:
principal: "opensearch@BUILD.OPENSEARCH.CO"
principal: "opensearch@BUILD.OPENSEARCH.ORG"
# Get repository
- do:

4
plugins/repository-hdfs/src/test/resources/rest-api-spec/test/secure_hdfs_repository/20_repository_delete.yml
View File

@ -13,7 +13,7 @@
uri: "hdfs://localhost:9998"
path: "/user/opensearch/foo/bar"
security:
principal: "opensearch@BUILD.OPENSEARCH.CO"
principal: "opensearch@BUILD.OPENSEARCH.ORG"
# Get repository
- do:
@ -44,7 +44,7 @@
uri: "hdfs://localhost:9998"
path: "/user/opensearch/foo/bar"
security:
principal: "opensearch@BUILD.OPENSEARCH.CO"
principal: "opensearch@BUILD.OPENSEARCH.ORG"
# Get repository again
- do:

2
plugins/repository-hdfs/src/test/resources/rest-api-spec/test/secure_hdfs_repository/20_repository_verify.yml
View File

@ -12,7 +12,7 @@
uri: "hdfs://localhost:9998"
path: "/user/opensearch/test/repository_verify"
security:
principal: "opensearch@BUILD.OPENSEARCH.CO"
principal: "opensearch@BUILD.OPENSEARCH.ORG"
# Verify repository
- do:

2
plugins/repository-hdfs/src/test/resources/rest-api-spec/test/secure_hdfs_repository/30_snapshot.yml
View File

@ -14,7 +14,7 @@
uri: "hdfs://localhost:9998"
path: "/user/opensearch/test/snapshot"
security:
principal: "opensearch@BUILD.OPENSEARCH.CO"
principal: "opensearch@BUILD.OPENSEARCH.ORG"
# Create index
- do:

2
plugins/repository-hdfs/src/test/resources/rest-api-spec/test/secure_hdfs_repository/30_snapshot_get.yml
View File

@ -14,7 +14,7 @@
uri: "hdfs://localhost:9998"
path: "/user/opensearch/test/snapshot_get"
security:
principal: "opensearch@BUILD.OPENSEARCH.CO"
principal: "opensearch@BUILD.OPENSEARCH.ORG"
# Create index
- do:

2
plugins/repository-hdfs/src/test/resources/rest-api-spec/test/secure_hdfs_repository/30_snapshot_readonly.yml
View File

@ -14,7 +14,7 @@
uri: "hdfs://localhost:9998"
path: "/user/opensearch/existing/readonly-repository"
security:
principal: "opensearch@BUILD.OPENSEARCH.CO"
principal: "opensearch@BUILD.OPENSEARCH.ORG"
readonly: true
# List snapshot info

2
plugins/repository-hdfs/src/test/resources/rest-api-spec/test/secure_hdfs_repository/40_restore.yml
View File

@ -15,7 +15,7 @@
uri: "hdfs://localhost:9998"
path: "/user/opensearch/test/restore"
security:
principal: "opensearch@BUILD.OPENSEARCH.CO"
principal: "opensearch@BUILD.OPENSEARCH.ORG"
# Create index
- do: