From f9c1ff22ffc690a6a5ed29fab8b40d653b233859 Mon Sep 17 00:00:00 2001 From: Jason Frank Date: Fri, 29 Sep 2023 10:37:24 -0500 Subject: [PATCH 1/6] Prevent Redis from downloading the GeoIP database it does by default. This fix is slightly incomplete, the data is still in Redis, it just will stop querying for more. Current. the existing data cannot be deleted. --- docker/dev-stack.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/docker/dev-stack.yml b/docker/dev-stack.yml index 02c942f47..4ad8164ea 100644 --- a/docker/dev-stack.yml +++ b/docker/dev-stack.yml @@ -25,6 +25,7 @@ services: - "discovery.type=single-node" - "net=host" - "xpack.security.enabled=false" + - "ingest.geoip.downloader.enabled=false" ports: - "${ELASTICSEARCH_HTTP_PORT:-9200}:9200" - "${ELASTICSEARCH_TRANSPORT_PORT:-9300}:9300" From 75988c002cf7aabc5ff584d4d43faf07cb4644c6 Mon Sep 17 00:00:00 2001 From: Jason Frank Date: Fri, 29 Sep 2023 10:37:54 -0500 Subject: [PATCH 2/6] Maven 3.8.6 is no longer available. Use version 3.8.8 instead. --- docker/base-images/Dockerfile.osmt-build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/base-images/Dockerfile.osmt-build b/docker/base-images/Dockerfile.osmt-build index ff5556a54..b54191815 100644 --- a/docker/base-images/Dockerfile.osmt-build +++ b/docker/base-images/Dockerfile.osmt-build @@ -1,6 +1,6 @@ FROM wguopensource/osmt-base:latest as osmt-build -ENV M2_VERSION=3.8.6 +ENV M2_VERSION=3.8.8 ENV M2_HOME=/usr/local/maven ENV PATH=${M2_HOME}/bin:${PATH} From acaecb057791de35b01f9bb434f0eb39c7dd442f Mon Sep 17 00:00:00 2001 From: Jason Frank Date: Fri, 29 Sep 2023 10:42:15 -0500 Subject: [PATCH 3/6] Remove XXX with xxx so our osmt_cli.sh -v checks will detect that it's not updated correctly. --- test/osmt-apitest.env.example | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/osmt-apitest.env.example b/test/osmt-apitest.env.example index b109e3038..36eac4279 100644 --- a/test/osmt-apitest.env.example +++ b/test/osmt-apitest.env.example @@ -2,6 +2,6 @@ # DEBUG=1 # Provide your Okta endpoint and credentials here. This will be used to get a Bearer token for the API tests -OKTA_URL=https://dev-XXXXXXXX.okta.com -OKTA_USERNAME=XXX.XXX@example.com -OKTA_PASSWORD=XXX +OKTA_URL=https://dev-xxxxxxxx.okta.com +OKTA_USERNAME=xxx.xxx@example.com +OKTA_PASSWORD=xxx From 473d899d2ccb784f3544e37ef288fc5da5fd784c Mon Sep 17 00:00:00 2001 From: Jason Frank Date: Tue, 3 Oct 2023 16:26:32 -0500 Subject: [PATCH 4/6] Get rid of the parsing of the patch level of the docker minor version, because it's broken for recent versions, and doesn't work anyways. --- bin/lib/common.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/bin/lib/common.sh b/bin/lib/common.sh index f88e929a3..483e3d1b9 100755 --- a/bin/lib/common.sh +++ b/bin/lib/common.sh @@ -247,8 +247,6 @@ _validate_docker_version() { echo_debug "3 - ${tmp_minor}" det_docker_minor="${tmp_minor%.*}" echo_debug "4 - ${det_docker_minor}" - det_docker_patch="${det_docker_version##*.}" - echo_debug "5 - ${det_docker_patch}" if [[ "${det_docker_major}" -gt "${req_docker_major}" || \ ("${det_docker_major}" -eq "${req_docker_major}" && "${det_docker_minor}" -ge "${req_docker_minor}") || \ From 0f076716f15c12c43f035cadfded261ea29a2301 Mon Sep 17 00:00:00 2001 From: Jason Frank Date: Tue, 3 Oct 2023 16:27:48 -0500 Subject: [PATCH 5/6] Add in OKTA variable debugging, but leave it commented out for now. --- test/bin/pre_test_setup.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/test/bin/pre_test_setup.sh b/test/bin/pre_test_setup.sh index 3c3651695..05bfa079a 100755 --- a/test/bin/pre_test_setup.sh +++ b/test/bin/pre_test_setup.sh @@ -37,6 +37,7 @@ error_handler() { main() { # Sourcing API test env file + #echo OKTA variables are: ${OKTA_URL} ${OKTA_USERNAME} ${OKTA_PASSWORD} source_env_file_unless_provided_okta "${PROJECT_DIR}/test/osmt-apitest.env" source_env_file "${PROJECT_DIR}/test/bin/osmt-apitest.rc" From 900ad76f638691154823b7adf79933540ebb62cb Mon Sep 17 00:00:00 2001 From: Jason Frank Date: Tue, 3 Oct 2023 16:35:31 -0500 Subject: [PATCH 6/6] Revert changes until we figure out the breakage. --- test/osmt-apitest.env.example | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/osmt-apitest.env.example b/test/osmt-apitest.env.example index 36eac4279..2d05f3cfd 100644 --- a/test/osmt-apitest.env.example +++ b/test/osmt-apitest.env.example @@ -2,6 +2,6 @@ # DEBUG=1 # Provide your Okta endpoint and credentials here. This will be used to get a Bearer token for the API tests -OKTA_URL=https://dev-xxxxxxxx.okta.com -OKTA_USERNAME=xxx.xxx@example.com -OKTA_PASSWORD=xxx +OKTA_URL=https://dev-XXXXXXXX.okta.com +OKTA_USERNAME=XXXXXX@example.com +OKTA_PASSWORD=XXXXXX