Skip to content

Commit

Permalink
optional-components/all-public-access: remove GeoServer route permiss…
Browse files Browse the repository at this point in the history
…ions (#397)

## 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

- Introduced by #348
  • Loading branch information
fmigneault authored Nov 3, 2023
2 parents 6cf2066 + 42b2471 commit 92087be
Show file tree
Hide file tree
Showing 8 changed files with 21 additions and 16 deletions.
6 changes: 3 additions & 3 deletions .bumpversion.cfg
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[bumpversion]
current_version = 1.37.0
current_version = 1.37.1
commit = True
tag = False
tag_name = {new_version}
Expand Down Expand Up @@ -30,11 +30,11 @@ search = {current_version}
replace = {new_version}

[bumpversion:file:RELEASE.txt]
search = {current_version} 2023-11-01T13:09:36Z
search = {current_version} 2023-11-03T16:43:09Z
replace = {new_version} {utcnow:%Y-%m-%dT%H:%M:%SZ}

[bumpversion:part:releaseTime]
values = 2023-11-01T13:09:36Z
values = 2023-11-03T16:43:09Z

[bumpversion:file(version):birdhouse/config/canarie-api/docker_configuration.py.template]
search = 'version': '{current_version}'
Expand Down
6 changes: 6 additions & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,12 @@

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

[1.37.1](https://github.com/bird-house/birdhouse-deploy/tree/1.37.1) (2023-11-03)
------------------------------------------------------------------------------------------------------------------

## Fixes
- `optional-components/all-public-access`: remove erroneous Magpie route permission properties for GeoServer.

[1.37.0](https://github.com/bird-house/birdhouse-deploy/tree/1.37.0) (2023-11-01)
------------------------------------------------------------------------------------------------------------------

Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Generic variables
override SHELL := bash
override APP_NAME := birdhouse-deploy
override APP_VERSION := 1.37.0
override APP_VERSION := 1.37.1

# utility to remove comments after value of an option variable
override clean_opt = $(shell echo "$(1)" | $(_SED) -r -e "s/[ '$'\t'']+$$//g")
Expand Down
8 changes: 4 additions & 4 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@ for a full-fledged production platform.
* - releases
- | |latest-version| |commits-since|

.. |commits-since| image:: https://img.shields.io/github/commits-since/bird-house/birdhouse-deploy/1.37.0.svg
.. |commits-since| image:: https://img.shields.io/github/commits-since/bird-house/birdhouse-deploy/1.37.1.svg
:alt: Commits since latest release
:target: https://github.com/bird-house/birdhouse-deploy/compare/1.37.0...master
:target: https://github.com/bird-house/birdhouse-deploy/compare/1.37.1...master

.. |latest-version| image:: https://img.shields.io/badge/tag-1.37.0-blue.svg?style=flat
.. |latest-version| image:: https://img.shields.io/badge/tag-1.37.1-blue.svg?style=flat
:alt: Latest Tag
:target: https://github.com/bird-house/birdhouse-deploy/tree/1.37.0
:target: https://github.com/bird-house/birdhouse-deploy/tree/1.37.1

.. |readthedocs| image:: https://readthedocs.org/projects/birdhouse-deploy/badge/?version=latest
:alt: ReadTheDocs Build Status (latest version)
Expand Down
2 changes: 1 addition & 1 deletion RELEASE.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.37.0 2023-11-01T13:09:36Z
1.37.1 2023-11-03T16:43:09Z
8 changes: 4 additions & 4 deletions birdhouse/config/canarie-api/docker_configuration.py.template
Original file line number Diff line number Diff line change
Expand Up @@ -109,8 +109,8 @@ SERVICES = {
# NOTE:
# Below version and release time auto-managed by 'make VERSION=x.y.z bump'.
# Do NOT modify it manually. See 'Tagging policy' in 'birdhouse/README.rst'.
'version': '1.37.0',
'releaseTime': '2023-11-01T13:09:36Z',
'version': '1.37.1',
'releaseTime': '2023-11-03T16:43:09Z',
'institution': 'Ouranos',
'researchSubject': 'Climatology',
'supportEmail': '${SUPPORT_EMAIL}',
Expand Down Expand Up @@ -142,8 +142,8 @@ PLATFORMS = {
# NOTE:
# Below version and release time auto-managed by 'make VERSION=x.y.z bump'.
# Do NOT modify it manually. See 'Tagging policy' in 'birdhouse/README.rst'.
'version': '1.37.0',
'releaseTime': '2023-11-01T13:09:36Z',
'version': '1.37.1',
'releaseTime': '2023-11-03T16:43:09Z',
'institution': 'Ouranos',
'researchSubject': 'Climatology',
'supportEmail': '${SUPPORT_EMAIL}',
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
permissions:
- service: geoserver
type: route
permission: read
group: anonymous
action: create
Expand Down
4 changes: 2 additions & 2 deletions docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -69,9 +69,9 @@
# built documents.
#
# The short X.Y version.
version = '1.37.0'
version = '1.37.1'
# The full version, including alpha/beta/rc tags.
release = '1.37.0'
release = '1.37.1'

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down

0 comments on commit 92087be

Please sign in to comment.