Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

optional-components/all-public-access: remove GeoServer route permissions #397

Merged
merged 3 commits into from
Nov 3, 2023

Conversation

fmigneault
Copy link
Collaborator

Overview

The type: route is invalid in that case, because the permission is applied on the service itself (not a child route resource). The type should be service, but can be omitted when no resource is specified, as in the case for all other permissions.

Changes

Non-breaking changes

  • Remove erroneous type: route for a Magpie permission set directly on the service.

Breaking changes

  • n/a

Related Issue / Discussion

@fmigneault fmigneault self-assigned this Nov 2, 2023
@github-actions github-actions bot added the component/geoserver Related to GeoServer or one of its underlying services label Nov 2, 2023
@crim-jenkins-bot
Copy link
Collaborator

E2E Test Results

DACCS-iac Pipeline Results

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

BIRDHOUSE_DEPLOY_BRANCH : remove-geoserver-route-perm
DACCS_CONFIGS_BRANCH : master
PAVICS_E2E_WORKFLOW_TESTS_BRANCH : master
PAVICS_SDI_BRANCH : master

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

PAVICS-e2e-workflow-tests Pipeline Results

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

NOTEBOOK TEST RESULTS
    
[2023-11-02T13:58:45.601Z] ============================= test session starts ==============================
[2023-11-02T13:58:45.601Z] platform linux -- Python 3.9.16, pytest-7.3.1, pluggy-1.0.0
[2023-11-02T13:58:45.601Z] rootdir: /home/jenkins/agent/workspace/PAVICS-e2e-workflow-tests_master
[2023-11-02T13:58:45.601Z] plugins: anyio-3.6.1, dash-2.10.0, nbval-0.9.6, tornasync-0.6.0.post2, xdist-3.3.1
[2023-11-02T13:58:45.601Z] collected 254 items
[2023-11-02T13:58:45.601Z] 
[2023-11-02T13:58:53.202Z] notebooks-auth/geoserver.ipynb .....FFFF....FFF.                         [  6%]
[2023-11-02T13:59:00.883Z] notebooks-auth/test_thredds.ipynb ...........                            [ 11%]
[2023-11-02T13:59:09.044Z] pavics-sdi-master/docs/source/notebooks/WCS_example.ipynb .......        [ 13%]
[2023-11-02T13:59:18.768Z] pavics-sdi-master/docs/source/notebooks/WFS_example.ipynb ......         [ 16%]
[2023-11-02T13:59:25.042Z] pavics-sdi-master/docs/source/notebooks/WMS_example.ipynb .F......       [ 19%]
[2023-11-02T14:07:22.005Z] pavics-sdi-master/docs/source/notebooks/climex.ipynb ............        [ 24%]
[2023-11-02T14:07:22.006Z] pavics-sdi-master/docs/source/notebooks/eccc-geoapi-climate-stations.ipynb . [ 24%]
[2023-11-02T14:07:29.166Z] ...............                                                          [ 30%]
[2023-11-02T14:07:38.212Z] pavics-sdi-master/docs/source/notebooks/eccc-geoapi-xclim.ipynb F.F..    [ 32%]
[2023-11-02T14:07:45.108Z] pavics-sdi-master/docs/source/notebooks/esgf-dap.ipynb ......            [ 34%]
[2023-11-02T14:08:01.439Z] pavics-sdi-master/docs/source/notebooks/forecasts.ipynb ......           [ 37%]
[2023-11-02T14:08:02.819Z] pavics-sdi-master/docs/source/notebooks/jupyter_extensions.ipynb .       [ 37%]
[2023-11-02T14:08:10.616Z] pavics-sdi-master/docs/source/notebooks/opendap.ipynb .......            [ 40%]
[2023-11-02T14:08:15.382Z] pavics-sdi-master/docs/source/notebooks/pavics_thredds.ipynb .....       [ 42%]
[2023-11-02T14:12:41.934Z] pavics-sdi-master/docs/source/notebooks/regridding.ipynb ............... [ 48%]
[2023-11-02T14:13:54.131Z] .............                                                            [ 53%]
[2023-11-02T14:13:58.325Z] pavics-sdi-master/docs/source/notebooks/rendering.ipynb ....             [ 54%]
[2023-11-02T14:14:00.640Z] pavics-sdi-master/docs/source/notebooks/subset-user-input.ipynb ........ [ 57%]
[2023-11-02T14:14:16.289Z] .................                                                        [ 64%]
[2023-11-02T14:14:23.814Z] pavics-sdi-master/docs/source/notebooks/subsetting.ipynb ......          [ 66%]
[2023-11-02T14:14:25.199Z] pavics-sdi-master/docs/source/notebook-components/weaver_example.ipynb . [ 67%]
[2023-11-02T14:14:48.864Z] ........F                                                                [ 70%]
[2023-11-02T14:14:57.312Z] finch-master/docs/source/notebooks/dap_subset.ipynb ...........          [ 75%]
[2023-11-02T14:15:06.468Z] finch-master/docs/source/notebooks/finch-usage.ipynb ......              [ 77%]
[2023-11-02T14:15:08.385Z] PAVICS-landing-master/content/notebooks/climate_indicators/PAVICStutorial_ClimateDataAnalysis-1DataAccess.ipynb . [ 77%]
[2023-11-02T14:15:11.195Z] ......                                                                   [ 80%]
[2023-11-02T14:15:21.214Z] PAVICS-landing-master/content/notebooks/climate_indicators/PAVICStutorial_ClimateDataAnalysis-2Subsetting.ipynb . [ 80%]
[2023-11-02T14:15:34.534Z] .............                                                            [ 85%]
[2023-11-02T14:15:44.529Z] PAVICS-landing-master/content/notebooks/climate_indicators/PAVICStutorial_ClimateDataAnalysis-3Climate-Indicators.ipynb . [ 86%]
[2023-11-02T14:16:19.246Z] ....s.                                                                   [ 88%]
[2023-11-02T14:16:27.389Z] PAVICS-landing-master/content/notebooks/climate_indicators/PAVICStutorial_ClimateDataAnalysis-4Ensembles.ipynb . [ 88%]
[2023-11-02T14:16:42.159Z] ...                                                                      [ 90%]
[2023-11-02T14:16:57.058Z] PAVICS-landing-master/content/notebooks/climate_indicators/PAVICStutorial_ClimateDataAnalysis-5Visualization.ipynb . [ 90%]
[2023-11-02T14:17:16.821Z] ......                                                                   [ 92%]
[2023-11-02T14:17:19.303Z] notebooks/hummingbird.ipynb ............                                 [ 97%]
[2023-11-02T14:19:53.427Z] notebooks/stress-tests.ipynb ......                                      [100%]
[2023-11-02T14:19:53.427Z] 
[2023-11-02T14:19:53.427Z] =================================== FAILURES ===================================
    
  

Copy link
Collaborator

@mishaschwartz mishaschwartz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this related to our discussion here? https://github.com/bird-house/birdhouse-deploy/pull/348/files/c4f8d68ca6e7ed5daf735786511dad6856468332#r1338846201

I guess I misunderstood your directions

Copy link
Collaborator

@tlvu tlvu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

One line change, the easiest PR approval ever, but did you forget CHANGES.md ? :D

It can never be one line :(

Approve the spirit since you know Magpie much better than me.

@tlvu tlvu changed the title remove GeoServer route permissions optional-components/all-public-access: remove GeoServer route permissions Nov 3, 2023
@tlvu
Copy link
Collaborator

tlvu commented Nov 3, 2023

By the way, I changed the PR title to clearly indicate this applies to the optional-components/all-public-access only.

My first impression with the original PR title is whoah, are we locking down further GeoServer by default? But then I realized it's not by default.

@fmigneault
Copy link
Collaborator Author

Is this related to our discussion here?

Yes.

@github-actions github-actions bot added ci/operations Continuous Integration components documentation Improvements or additions to documentation labels Nov 3, 2023
@fmigneault fmigneault merged commit 92087be into master Nov 3, 2023
3 of 5 checks passed
@fmigneault fmigneault deleted the remove-geoserver-route-perm branch November 3, 2023 16:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ci/operations Continuous Integration components component/geoserver Related to GeoServer or one of its underlying services documentation Improvements or additions to documentation
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants