From 8d2aa0bba4572bb3f9d6de0a45e675f99b47319d Mon Sep 17 00:00:00 2001 From: Aliaksandr Lubouski Date: Mon, 1 Feb 2021 14:20:45 +0300 Subject: [PATCH 1/4] GONRG-1643: search service testing branch with elastic 7 code --- .gitlab-ci.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7f418417..ac6784a7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -48,14 +48,14 @@ include: - project: "osdu/platform/ci-cd-pipelines" file: "scanners/gitlab-ultimate.yml" - - project: "osdu/platform/ci-cd-pipelines" - file: "cloud-providers/aws.yml" +# - project: "osdu/platform/ci-cd-pipelines" +# file: "cloud-providers/aws.yml" - - project: "osdu/platform/ci-cd-pipelines" - file: "cloud-providers/ibm.yml" +# - project: "osdu/platform/ci-cd-pipelines" +# file: "cloud-providers/ibm.yml" - - project: "osdu/platform/ci-cd-pipelines" - file: "cloud-providers/azure.yml" +# - project: "osdu/platform/ci-cd-pipelines" +# file: "cloud-providers/azure.yml" - project: 'osdu/platform/ci-cd-pipelines' file: 'cloud-providers/osdu-gcp-cloudrun.yml' -- GitLab From 2f3bdcded2409d1329f504dd7bdd5c8a3a36f3e4 Mon Sep 17 00:00:00 2001 From: Aliaksandr Lubouski Date: Mon, 1 Feb 2021 16:05:51 +0300 Subject: [PATCH 2/4] GONRG-1643: search service testing branch with elastic 7 code, fix --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ac6784a7..e3c3a994 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -60,8 +60,8 @@ include: - project: 'osdu/platform/ci-cd-pipelines' file: 'cloud-providers/osdu-gcp-cloudrun.yml' -aws-test-java: - tags: ['aws-internal-test'] +#aws-test-java: +# tags: ['aws-internal-test'] osdu-gcp-test: variables: -- GitLab From 998c7bd50d09f60c1709324bc067f06e6aea38cc Mon Sep 17 00:00:00 2001 From: Aliaksandr Lubouski Date: Tue, 2 Feb 2021 11:25:22 +0300 Subject: [PATCH 3/4] GONRG-1643: search service testing branch with elastic 7 code, testing --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e3c3a994..8f99c943 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -60,7 +60,7 @@ include: - project: 'osdu/platform/ci-cd-pipelines' file: 'cloud-providers/osdu-gcp-cloudrun.yml' -#aws-test-java: +##aws-test-java: # tags: ['aws-internal-test'] osdu-gcp-test: -- GitLab From 5aa2b07e8cef7557c7e587734e0e4c85127d4e62 Mon Sep 17 00:00:00 2001 From: Stanislav Riabokon Date: Tue, 2 Feb 2021 13:55:35 +0400 Subject: [PATCH 4/4] Added logs for Elastic --- .../org/opengroup/osdu/search/util/ElasticClientHandler.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/search-core/src/main/java/org/opengroup/osdu/search/util/ElasticClientHandler.java b/search-core/src/main/java/org/opengroup/osdu/search/util/ElasticClientHandler.java index a9096b24..49d66ed0 100644 --- a/search-core/src/main/java/org/opengroup/osdu/search/util/ElasticClientHandler.java +++ b/search-core/src/main/java/org/opengroup/osdu/search/util/ElasticClientHandler.java @@ -83,6 +83,8 @@ public class ElasticClientHandler { if (!clusterSettings.isTls()) { tls = "false"; } + + log.info("Elastic creds = "+ cluster + " "+ host +" " + port); String basicEncoded = Base64.getEncoder() .encodeToString(clusterSettings.getUserNameAndPassword().getBytes()); String basicAuthenticationHeaderVal = String.format("Basic %s", basicEncoded); -- GitLab