Small stac changes #365

mishaschwartz · 2023-08-10T20:08:40Z

Overview

This PR includes some changes that were suggested in a review for #297. But because the PR was already merged I'm including them here:

removes extra block to include in docker compose files (no longer needed)
moves docker compose file in stac-public-access component to the correct location
uses PAVICS_FQDN_PUBLIC for public facing URLs in all places

Changes

Non-breaking changes

code reorganization

Breaking changes
None

Related Issue / Discussion

Related to Add STAC catalog #297

Additional Information

crim-jenkins-bot · 2023-08-10T21:43:39Z

E2E Test Results

DACCS-iac Pipeline Results

Build URL : http://daccs-jenkins.crim.ca:80/job/DACCS-iac-birdhouse/1940/
Result : failure

BIRDHOUSE_DEPLOY_BRANCH : stac-quick-fixes
DACCS_CONFIGS_BRANCH : master
PAVICS_E2E_WORKFLOW_TESTS_BRANCH : master
PAVICS_SDI_BRANCH : master

DESTROY_INFRA_ON_EXIT : true
PAVICS_HOST : https://host-140-35.rdext.crim.ca

PAVICS-e2e-workflow-tests Pipeline Results

Tests URL : http://daccs-jenkins.crim.ca:80/job/PAVICS-e2e-workflow-tests/job/master/1256/

NOTEBOOK TEST RESULTS

    
[2023-08-10T21:02:16.099Z] ============================= test session starts ==============================
[2023-08-10T21:02:16.099Z] platform linux -- Python 3.9.16, pytest-7.3.1, pluggy-1.0.0
[2023-08-10T21:02:16.099Z] rootdir: /home/jenkins/agent/workspace/PAVICS-e2e-workflow-tests_master
[2023-08-10T21:02:16.099Z] plugins: anyio-3.6.1, dash-2.10.0, nbval-0.9.6, tornasync-0.6.0.post2, xdist-3.3.1
[2023-08-10T21:02:16.099Z] collected 236 items
[2023-08-10T21:02:16.099Z] 
[2023-08-10T21:02:23.661Z] notebooks-auth/test_thredds.ipynb ...........                            [  4%]
[2023-08-10T21:02:33.076Z] pavics-sdi-master/docs/source/notebooks/WCS_example.ipynb .......        [  7%]
[2023-08-10T21:02:42.827Z] pavics-sdi-master/docs/source/notebooks/WFS_example.ipynb ......         [ 10%]
[2023-08-10T21:02:50.674Z] pavics-sdi-master/docs/source/notebooks/WMS_example.ipynb ........       [ 13%]
[2023-08-10T21:11:19.818Z] pavics-sdi-master/docs/source/notebooks/climex.ipynb ............        [ 18%]
[2023-08-10T21:12:27.587Z] pavics-sdi-master/docs/source/notebooks/eccc-geoapi-climate-stations.ipynb . [ 19%]
[2023-08-10T21:14:20.498Z] ...............                                                          [ 25%]
[2023-08-10T21:14:23.621Z] pavics-sdi-master/docs/source/notebooks/eccc-geoapi-xclim.ipynb .....    [ 27%]
[2023-08-10T21:14:31.838Z] pavics-sdi-master/docs/source/notebooks/esgf-dap.ipynb ......            [ 30%]
[2023-08-10T21:14:49.476Z] pavics-sdi-master/docs/source/notebooks/forecasts.ipynb ......           [ 32%]
[2023-08-10T21:14:50.872Z] pavics-sdi-master/docs/source/notebooks/jupyter_extensions.ipynb .       [ 33%]
[2023-08-10T21:14:57.802Z] pavics-sdi-master/docs/source/notebooks/opendap.ipynb .......            [ 36%]
[2023-08-10T21:15:02.574Z] pavics-sdi-master/docs/source/notebooks/pavics_thredds.ipynb .....       [ 38%]
[2023-08-10T21:18:33.547Z] pavics-sdi-master/docs/source/notebooks/regridding.ipynb ............... [ 44%]
[2023-08-10T21:19:53.370Z] .............                                                            [ 50%]
[2023-08-10T21:19:57.212Z] pavics-sdi-master/docs/source/notebooks/rendering.ipynb ....             [ 51%]
[2023-08-10T21:19:59.815Z] pavics-sdi-master/docs/source/notebooks/subset-user-input.ipynb ........ [ 55%]
[2023-08-10T21:20:17.582Z] .................                                                        [ 62%]
[2023-08-10T21:20:25.937Z] pavics-sdi-master/docs/source/notebooks/subsetting.ipynb ......          [ 64%]
[2023-08-10T21:20:27.327Z] pavics-sdi-master/docs/source/notebook-components/weaver_example.ipynb . [ 65%]
[2023-08-10T21:20:42.581Z] ..F......                                                                [ 69%]
[2023-08-10T21:20:52.045Z] finch-master/docs/source/notebooks/dap_subset.ipynb ...........          [ 73%]
[2023-08-10T21:21:01.691Z] finch-master/docs/source/notebooks/finch-usage.ipynb ......              [ 76%]
[2023-08-10T21:21:03.082Z] PAVICS-landing-master/content/notebooks/climate_indicators/PAVICStutorial_ClimateDataAnalysis-1DataAccess.ipynb . [ 76%]
[2023-08-10T21:21:06.390Z] ......                                                                   [ 79%]
[2023-08-10T21:21:14.552Z] PAVICS-landing-master/content/notebooks/climate_indicators/PAVICStutorial_ClimateDataAnalysis-2Subsetting.ipynb . [ 79%]
[2023-08-10T21:21:30.071Z] .............                                                            [ 85%]
[2023-08-10T21:21:40.103Z] PAVICS-landing-master/content/notebooks/climate_indicators/PAVICStutorial_ClimateDataAnalysis-3Climate-Indicators.ipynb . [ 85%]
[2023-08-10T21:22:19.517Z] ....s.                                                                   [ 88%]
[2023-08-10T21:22:29.551Z] PAVICS-landing-master/content/notebooks/climate_indicators/PAVICStutorial_ClimateDataAnalysis-4Ensembles.ipynb . [ 88%]
[2023-08-10T21:22:46.373Z] ...                                                                      [ 89%]
[2023-08-10T21:23:01.300Z] PAVICS-landing-master/content/notebooks/climate_indicators/PAVICStutorial_ClimateDataAnalysis-5Visualization.ipynb . [ 90%]
[2023-08-10T21:23:26.090Z] ......                                                                   [ 92%]
[2023-08-10T21:23:28.842Z] notebooks/hummingbird.ipynb ............                                 [ 97%]
[2023-08-10T21:26:33.330Z] notebooks/stress-tests.ipynb .....                                       [100%]
[2023-08-10T21:26:33.330Z] 
[2023-08-10T21:26:33.330Z] =================================== FAILURES ===================================

fmigneault · 2023-08-14T21:37:13Z

CHANGES.md

-[//]: # (list changes here, using '-' for each new entry, remove this when items are added)
+## Changes
+
+- Small stac changes


stac → STAC

fmigneault · 2023-08-14T21:37:48Z

CHANGES.md

+## Changes
+
+- Small stac changes
+  - This PR includes some changes that were suggested in a review for #297. But because the PR was already merged I'm including them here:


Avoid "I'm" in changes since we don't know who that is in docs.

fmigneault · 2023-08-14T21:39:44Z

birdhouse/config/twitcher/config/proxy/conf.extra-service.d/twitcher.conf.template

@@ -4,5 +4,5 @@
        proxy_set_header X-Forwarded-Proto $real_scheme;
        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
        proxy_set_header X-Forwarded-Host $host:$server_port;
-        proxy_set_header Forwarded "proto=https;host=${PAVICS_FQDN}";    # Helps the STAC component to craft URLs containing the full PAVICS_FQDN
+        proxy_set_header Forwarded "proto=https;host=${PAVICS_FQDN_PUBLIC}";    # Helps the STAC component to craft URLs containing the full PAVICS_FQDN


Need to adjust the comment still referring to the old variable.

birdhouse/components/stac/docker-compose-extra.yml

crim-jenkins-bot · 2023-08-15T14:18:30Z

E2E Test Results

DACCS-iac Pipeline Results

Build URL : http://daccs-jenkins.crim.ca:80/job/DACCS-iac-birdhouse/1948/
Result : failure

BIRDHOUSE_DEPLOY_BRANCH : stac-quick-fixes
DACCS_CONFIGS_BRANCH : master
PAVICS_E2E_WORKFLOW_TESTS_BRANCH : master
PAVICS_SDI_BRANCH : master

DESTROY_INFRA_ON_EXIT : true
PAVICS_HOST : https://host-140-67.rdext.crim.ca

PAVICS-e2e-workflow-tests Pipeline Results

Tests URL : http://daccs-jenkins.crim.ca:80/job/PAVICS-e2e-workflow-tests/job/master/1260/

NOTEBOOK TEST RESULTS

    
[2023-08-15T13:38:45.261Z] ============================= test session starts ==============================
[2023-08-15T13:38:45.261Z] platform linux -- Python 3.9.16, pytest-7.3.1, pluggy-1.0.0
[2023-08-15T13:38:45.261Z] rootdir: /home/jenkins/agent/workspace/PAVICS-e2e-workflow-tests_master
[2023-08-15T13:38:45.262Z] plugins: anyio-3.6.1, dash-2.10.0, nbval-0.9.6, tornasync-0.6.0.post2, xdist-3.3.1
[2023-08-15T13:38:45.262Z] collected 236 items
[2023-08-15T13:38:45.262Z] 
[2023-08-15T13:38:53.715Z] notebooks-auth/test_thredds.ipynb ...........                            [  4%]
[2023-08-15T13:39:01.973Z] pavics-sdi-master/docs/source/notebooks/WCS_example.ipynb .......        [  7%]
[2023-08-15T13:39:13.252Z] pavics-sdi-master/docs/source/notebooks/WFS_example.ipynb ......         [ 10%]
[2023-08-15T13:39:24.612Z] pavics-sdi-master/docs/source/notebooks/WMS_example.ipynb ........       [ 13%]
[2023-08-15T13:47:08.404Z] pavics-sdi-master/docs/source/notebooks/climex.ipynb ............        [ 18%]
[2023-08-15T13:47:10.319Z] pavics-sdi-master/docs/source/notebooks/eccc-geoapi-climate-stations.ipynb . [ 19%]
[2023-08-15T13:47:19.200Z] ...............                                                          [ 25%]
[2023-08-15T13:47:30.950Z] pavics-sdi-master/docs/source/notebooks/eccc-geoapi-xclim.ipynb .....    [ 27%]
[2023-08-15T13:47:38.228Z] pavics-sdi-master/docs/source/notebooks/esgf-dap.ipynb ......            [ 30%]
[2023-08-15T13:47:55.356Z] pavics-sdi-master/docs/source/notebooks/forecasts.ipynb ......           [ 32%]
[2023-08-15T13:47:56.741Z] pavics-sdi-master/docs/source/notebooks/jupyter_extensions.ipynb .       [ 33%]
[2023-08-15T13:48:02.575Z] pavics-sdi-master/docs/source/notebooks/opendap.ipynb .......            [ 36%]
[2023-08-15T13:48:07.397Z] pavics-sdi-master/docs/source/notebooks/pavics_thredds.ipynb .....       [ 38%]
[2023-08-15T13:52:56.558Z] pavics-sdi-master/docs/source/notebooks/regridding.ipynb ............... [ 44%]
[2023-08-15T13:54:18.483Z] .............                                                            [ 50%]
[2023-08-15T13:54:24.225Z] pavics-sdi-master/docs/source/notebooks/rendering.ipynb ....             [ 51%]
[2023-08-15T13:54:27.779Z] pavics-sdi-master/docs/source/notebooks/subset-user-input.ipynb ........ [ 55%]
[2023-08-15T13:54:46.283Z] .................                                                        [ 62%]
[2023-08-15T13:54:55.271Z] pavics-sdi-master/docs/source/notebooks/subsetting.ipynb ......          [ 64%]
[2023-08-15T13:54:56.659Z] pavics-sdi-master/docs/source/notebook-components/weaver_example.ipynb . [ 65%]
[2023-08-15T13:55:01.338Z] .FFFFFFFF                                                                [ 69%]
[2023-08-15T13:55:14.188Z] finch-master/docs/source/notebooks/dap_subset.ipynb ...........          [ 73%]
[2023-08-15T13:55:24.587Z] finch-master/docs/source/notebooks/finch-usage.ipynb ......              [ 76%]
[2023-08-15T13:55:25.984Z] PAVICS-landing-master/content/notebooks/climate_indicators/PAVICStutorial_ClimateDataAnalysis-1DataAccess.ipynb . [ 76%]
[2023-08-15T13:55:30.388Z] ......                                                                   [ 79%]
[2023-08-15T13:55:38.521Z] PAVICS-landing-master/content/notebooks/climate_indicators/PAVICStutorial_ClimateDataAnalysis-2Subsetting.ipynb . [ 79%]
[2023-08-15T13:55:55.756Z] .............                                                            [ 85%]
[2023-08-15T13:56:05.753Z] PAVICS-landing-master/content/notebooks/climate_indicators/PAVICStutorial_ClimateDataAnalysis-3Climate-Indicators.ipynb . [ 85%]
[2023-08-15T13:56:44.846Z] ....s.                                                                   [ 88%]
[2023-08-15T13:56:52.997Z] PAVICS-landing-master/content/notebooks/climate_indicators/PAVICStutorial_ClimateDataAnalysis-4Ensembles.ipynb . [ 88%]
[2023-08-15T13:57:08.521Z] ...                                                                      [ 89%]
[2023-08-15T13:57:26.644Z] PAVICS-landing-master/content/notebooks/climate_indicators/PAVICStutorial_ClimateDataAnalysis-5Visualization.ipynb . [ 90%]
[2023-08-15T13:57:49.125Z] ......                                                                   [ 92%]
[2023-08-15T13:57:53.303Z] notebooks/hummingbird.ipynb ............                                 [ 97%]
[2023-08-15T14:00:57.979Z] notebooks/stress-tests.ipynb .....                                       [100%]
[2023-08-15T14:00:57.979Z] 
[2023-08-15T14:00:57.979Z] =================================== FAILURES ===================================

mishaschwartz added 2 commits August 10, 2023 16:03

quick fixes as suggested in review in #297

2d27b1c

update changes.md

c821fc9

github-actions bot added component/magpie Related to https://github.com/Ouranosinc/Magpie component/twitcher Related to https://github.com/bird-house/twitcher documentation Improvements or additions to documentation labels Aug 10, 2023

mishaschwartz requested review from tlvu, fmigneault and matprov August 10, 2023 20:08

tlvu approved these changes Aug 10, 2023

View reviewed changes

fmigneault reviewed Aug 14, 2023

View reviewed changes

review updates

ae92afb

fmigneault approved these changes Aug 15, 2023

View reviewed changes

Bump version: 1.29.0 → 1.29.1

920497a

github-actions bot added the ci/operations Continuous Integration components label Aug 15, 2023

mishaschwartz merged commit 93ed91b into master Aug 15, 2023
3 checks passed

mishaschwartz deleted the stac-quick-fixes branch August 15, 2023 17:20

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Small stac changes #365

Small stac changes #365

mishaschwartz commented Aug 10, 2023

crim-jenkins-bot commented Aug 10, 2023

fmigneault Aug 14, 2023

fmigneault Aug 14, 2023

fmigneault Aug 14, 2023

crim-jenkins-bot commented Aug 15, 2023

Small stac changes #365

Small stac changes #365

Conversation

mishaschwartz commented Aug 10, 2023

Overview

Changes

Related Issue / Discussion

Additional Information

crim-jenkins-bot commented Aug 10, 2023

E2E Test Results

DACCS-iac Pipeline Results

PAVICS-e2e-workflow-tests Pipeline Results

fmigneault Aug 14, 2023

Choose a reason for hiding this comment

fmigneault Aug 14, 2023

Choose a reason for hiding this comment

fmigneault Aug 14, 2023

Choose a reason for hiding this comment

crim-jenkins-bot commented Aug 15, 2023

E2E Test Results

DACCS-iac Pipeline Results

PAVICS-e2e-workflow-tests Pipeline Results