From f5bdaf32ff67c525304e4eb8f9edc23d94958e19 Mon Sep 17 00:00:00 2001 From: Adrian Damian Date: Thu, 11 Jul 2024 16:24:08 -0700 Subject: [PATCH 1/6] Updated int test README file --- argus/build.gradle | 6 +- argus/src/intTest/README.md | 80 +++++++++++++++++++++++++++ argus/src/main/webapp/WEB-INF/web.xml | 1 + 3 files changed, 84 insertions(+), 3 deletions(-) diff --git a/argus/build.gradle b/argus/build.gradle index d5f7d78..2126837 100644 --- a/argus/build.gradle +++ b/argus/build.gradle @@ -12,7 +12,7 @@ repositories { apply from: '../opencadc.gradle' -sourceCompatibility = 1.8 +sourceCompatibility = 1.11 group = 'org.opencadc' @@ -31,9 +31,9 @@ sourceSets.test { } dependencies { - compile 'org.opencadc:cadc-util:[1.6.1,2.0)' + compile 'org.opencadc:cadc-util:[1.11.3,2.0)' compile 'org.opencadc:cadc-registry:[1.5.0,)' - compile 'org.opencadc:cadc-gms:[1.0.0,)' + compile 'org.opencadc:cadc-gms:[1.0.13,)' compile 'org.opencadc:cadc-dali:[1.2.12,)' compile 'org.opencadc:cadc-uws-server:[1.2.8,)' compile 'org.opencadc:cadc-tap-schema:[1.1.22,)' diff --git a/argus/src/intTest/README.md b/argus/src/intTest/README.md index 1409d76..905baa2 100644 --- a/argus/src/intTest/README.md +++ b/argus/src/intTest/README.md @@ -10,3 +10,83 @@ for a CADC staff member to run. Required certificates: The _auth_ identity has to be the (CADC) staff member's personal certificate because the test tries to output to `vos://cadc.nrc.ca~vault/{user.name}/test/some-file-name`. The _noauth_ identity should be cadcregtest1. +An example of a minimum local configuration required for the `argus` service to run locally consists of the +following containers: +- `haproxy` (image: `cadc-haproxy-dev`) - for https termination +- `postgress` (`cadc-postgresql-dev`) - database container +- `reg` (`reg`) - local registry entries +- `icewind` (`icewind`) - to create the `caom2` schema and tables +- `argus` (`argus`) - the service itself + +The configuration for the required services is documented in their GitHub repo. For `arugs` the minimum +configuration that successfully run most of the integration tests consists of the following files in `/config`: +- `argus.properties`: + ``` + org.opencadc.argus.VosiCapabilitiesTest > testTokenAuth` + ``` +- `cadc-registry.properties`: + ``` + # local authority map to find the service that provides + # the local implementation of an API (standardID) + # + # configure RegistryClient bootstrap + ca.nrc.cadc.reg.client.RegistryClient.baseURL = + # configure LocalAuthority lookups + # = + ivo://ivoa.net/std/GMS#search-1.0 = ivo://cadc.nrc.ca/gms + ivo://ivoa.net/std/GMS#groups-0.1 = ivo://cadc.nrc.ca/gms + + ivo://ivoa.net/std/GMS#search-0.1 = ivo://cadc.nrc.ca/gms + ivo://ivoa.net/std/UMS#users-0.1 = ivo://cadc.nrc.ca/gms + ivo://ivoa.net/std/UMS#login-0.1 = ivo://cadc.nrc.ca/gms + + ivo://ivoa.net/sso#tls-with-password = https://ska-iam.stfc.ac.uk/ + ivo://ivoa.net/sso#OpenID = https://ws-cadc.canfar.net/ac + + ivo://ivoa.net/std/CDP#delegate-1.0 = ivo://cadc.nrc.ca/cred + ivo://ivoa.net/std/CDP#proxy-1.0 = ivo://cadc.nrc.ca/cred + ``` + +- `cadc-tap-tmp.properties` (temporary storage in the container): + ``` + org.opencadc.tap.tmp.StorageManager = org.opencadc.tap.tmp.TempStorageManager + org.opencadc.tap.tmp.TempStorageManager.baseURL = https:///argus/results + org.opencadc.tap.tmp.TempStorageManager.baseStorageDir = /var/tmp/argus + ``` + +- `catalina.properties`: + ``` + # tomcat-base + tomcat.connector.secure=true + tomcat.connector.scheme=https + tomcat.connector.proxyName= + tomcat.connector.proxyPort=443 + # enable support for haproxy SSL termination + pass client cert + ca.nrc.cadc.auth.PrincipalExtractor.enableClientCertHeader=true + # force all registry lookups local + ca.nrc.cadc.reg.client.RegistryClient.host= + # database connection pools + # tapadm - assuming pgdev:5432 is where the database is deployed + org.opencadc.argus.tapadm.maxActive=2 + org.opencadc.argus.tapadm.username=tapadm + org.opencadc.argus.tapadm.password=pw-tapadm + org.opencadc.argus.tapadm.url=jdbc:postgresql://pgdev:5432/cadctest + # async + org.opencadc.argus.uws.maxActive=1 + org.opencadc.argus.uws.username=tapadm + org.opencadc.argus.uws.password=pw-tapadm + org.opencadc.argus.uws.url=jdbc:postgresql://pgdev:5432/cadctest + + org.opencadc.argus.query.maxActive=1 + # optional: config for separate query pool + org.opencadc.argus.query.username=tapuser + org.opencadc.argus.query.password=pw-tapuser + org.opencadc.argus.query.url=jdbc:postgresql://pgdev:5432/cadctest + + # enable support for haproxy SSL termination + pass client cert + ca.nrc.cadc.auth.PrincipalExtractor.enableClientCertHeader=true + + ca.nrc.cadc.auth.IdentityManager=ca.nrc.cadc.ac.ACIdentityManager + # or ca.nrc.cadc.auth.IdentityManager=org.opencadc.auth.StandardIdentityManager + ``` + diff --git a/argus/src/main/webapp/WEB-INF/web.xml b/argus/src/main/webapp/WEB-INF/web.xml index 5d03f7c..d829f30 100644 --- a/argus/src/main/webapp/WEB-INF/web.xml +++ b/argus/src/main/webapp/WEB-INF/web.xml @@ -20,6 +20,7 @@ logLevelPackages org.opencadc.argus + org.opencadc.auth ca.nrc.cadc.db.version ca.nrc.cadc.reg ca.nrc.cadc.rest From e5be489025bea03f66c8fbe601d862ad340709a4 Mon Sep 17 00:00:00 2001 From: Adrian Damian Date: Fri, 12 Jul 2024 10:53:09 -0700 Subject: [PATCH 2/6] A few updates --- argus/src/intTest/README.md | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/argus/src/intTest/README.md b/argus/src/intTest/README.md index 905baa2..362f743 100644 --- a/argus/src/intTest/README.md +++ b/argus/src/intTest/README.md @@ -10,7 +10,7 @@ for a CADC staff member to run. Required certificates: The _auth_ identity has to be the (CADC) staff member's personal certificate because the test tries to output to `vos://cadc.nrc.ca~vault/{user.name}/test/some-file-name`. The _noauth_ identity should be cadcregtest1. -An example of a minimum local configuration required for the `argus` service to run locally consists of the +An example of a minimum configuration required for the `argus` service to run on a local machine consists of the following containers: - `haproxy` (image: `cadc-haproxy-dev`) - for https termination - `postgress` (`cadc-postgresql-dev`) - database container @@ -18,8 +18,9 @@ following containers: - `icewind` (`icewind`) - to create the `caom2` schema and tables - `argus` (`argus`) - the service itself -The configuration for the required services is documented in their GitHub repo. For `arugs` the minimum -configuration that successfully run most of the integration tests consists of the following files in `/config`: +The configuration for the required services is documented in their corresponding GitHub repos. For `arugs` the +minimum configuration that successfully run most of the integration tests consists of the following files in +`/config`: - `argus.properties`: ``` org.opencadc.argus.VosiCapabilitiesTest > testTokenAuth` @@ -54,7 +55,7 @@ configuration that successfully run most of the integration tests consists of th org.opencadc.tap.tmp.TempStorageManager.baseStorageDir = /var/tmp/argus ``` -- `catalina.properties`: +- `catalina.properties` (with default pgdev container accounts): ``` # tomcat-base tomcat.connector.secure=true From 847e63a3fd2734e9c6e5910f165bb1bcd96cb414 Mon Sep 17 00:00:00 2001 From: Adrian Damian Date: Fri, 12 Jul 2024 10:55:18 -0700 Subject: [PATCH 3/6] Reverted dependencies --- argus/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/argus/build.gradle b/argus/build.gradle index 2126837..8d6d939 100644 --- a/argus/build.gradle +++ b/argus/build.gradle @@ -31,9 +31,9 @@ sourceSets.test { } dependencies { - compile 'org.opencadc:cadc-util:[1.11.3,2.0)' + compile 'org.opencadc:cadc-util:[1.6.1,2.0)' compile 'org.opencadc:cadc-registry:[1.5.0,)' - compile 'org.opencadc:cadc-gms:[1.0.13,)' + compile 'org.opencadc:cadc-gms:[1.0,)' compile 'org.opencadc:cadc-dali:[1.2.12,)' compile 'org.opencadc:cadc-uws-server:[1.2.8,)' compile 'org.opencadc:cadc-tap-schema:[1.1.22,)' From 0e37f03a85ab6e090cc0d580cf908f2e88904f18 Mon Sep 17 00:00:00 2001 From: Adrian Damian Date: Fri, 12 Jul 2024 11:01:11 -0700 Subject: [PATCH 4/6] Fixed datalink ci --- .github/workflows/gradle.yml | 2 +- caom2-datalink-server/build.gradle | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 7213e8c..db21486 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -23,7 +23,7 @@ jobs: - name: build and test caom2-tap-server run: cd caom2-tap-server && ../gradlew clean build javadoc install - - name: build and test caom2-daralink-server + - name: build and test caom2-datalink-server run: cd caom2-datalink-server && ../gradlew clean build javadoc install - name: build and test caom2-meta-server diff --git a/caom2-datalink-server/build.gradle b/caom2-datalink-server/build.gradle index 390dfad..ade6284 100644 --- a/caom2-datalink-server/build.gradle +++ b/caom2-datalink-server/build.gradle @@ -9,7 +9,7 @@ repositories { mavenLocal() } -sourceCompatibility = 1.8 +sourceCompatibility = 1.11 group = 'org.opencadc' From e7cd303d915657277fb69edc1b889f283021fa28 Mon Sep 17 00:00:00 2001 From: Adrian Damian Date: Fri, 12 Jul 2024 11:03:42 -0700 Subject: [PATCH 5/6] Fixed datalink ci --- .github/workflows/gradle.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index db21486..80f9821 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -11,10 +11,10 @@ jobs: steps: - uses: actions/checkout@v2 - - name: Set up JDK 1.8 + - name: Set up JDK 1.11 uses: actions/setup-java@v1 with: - java-version: 1.8 + java-version: 1.11 - name: build and test caom2-tap From 6df5f1a7e5d6dd0a7b9570c4a956039f14553128 Mon Sep 17 00:00:00 2001 From: Adrian Damian Date: Fri, 12 Jul 2024 14:47:59 -0700 Subject: [PATCH 6/6] Small corrections --- argus/src/intTest/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/argus/src/intTest/README.md b/argus/src/intTest/README.md index 362f743..4881f7e 100644 --- a/argus/src/intTest/README.md +++ b/argus/src/intTest/README.md @@ -41,8 +41,8 @@ minimum configuration that successfully run most of the integration tests consis ivo://ivoa.net/std/UMS#users-0.1 = ivo://cadc.nrc.ca/gms ivo://ivoa.net/std/UMS#login-0.1 = ivo://cadc.nrc.ca/gms - ivo://ivoa.net/sso#tls-with-password = https://ska-iam.stfc.ac.uk/ - ivo://ivoa.net/sso#OpenID = https://ws-cadc.canfar.net/ac + ivo://ivoa.net/sso#tls-with-password = ivo://cadc.nrc.ca/gms + ivo://ivoa.net/sso#OpenID = ivo://cadc.nrc.ca/gms ivo://ivoa.net/std/CDP#delegate-1.0 = ivo://cadc.nrc.ca/cred ivo://ivoa.net/std/CDP#proxy-1.0 = ivo://cadc.nrc.ca/cred