-
Notifications
You must be signed in to change notification settings - Fork 7
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
update weaver 6.1.0 #489
base: master
Are you sure you want to change the base?
update weaver 6.1.0 #489
Conversation
@mishaschwartz For some reason, I could never get this variable to be detected (although set), and although everything else works fine:
Any idea? The definition seems to be as per usual, so I don't see what is wrong specifically in that case. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think the nginx config needs to be looked at again. When I test this out I run into all sorts of issues:
<my-test-url>/weaver/
-> nginx error:no resolver defined to resolve weaver while sending to client
<my-test-url>/weaver/api
-> same nginx error as above<my-test-url>/weaver/weaver
-> magpie permission rejected as the anonymous user (and same nginx error above when any user)<my-test-url>/weaver/weaver/api
-> magpie permission rejected as the anonymous user (and same nginx error above when any user)
birdhouse/components/weaver/config/proxy/conf.extra-service.d/weaver.conf.template
Outdated
Show resolved
Hide resolved
birdhouse/components/weaver/config/proxy/conf.extra-service.d/weaver.conf.template
Outdated
Show resolved
Hide resolved
birdhouse/components/weaver/config/proxy/conf.extra-service.d/weaver.conf.template
Outdated
Show resolved
Hide resolved
birdhouse/components/weaver/config/proxy/conf.extra-service.d/weaver.conf.template
Outdated
Show resolved
Hide resolved
birdhouse/components/weaver/config/proxy/conf.extra-service.d/weaver.conf.template
Outdated
Show resolved
Hide resolved
Do you mean it doesn't show up in the templated file? Or that alertmanager doesn't send emails to that address but everything else works ok. Can you copy here any error logs from the alertmanager or proxy service and also the part of your env.local file where you're overriding it? |
It doesn't reach that point. The birdhouse script complains that the required variable is "missing", although it is exported explicitly in the |
When I tested out 2.7.0 + this PR (with the ALERTMANAGER_ADMIN_EMAIL_RECEIVER set in env.local and the monitoring component enabled) everything starts up OK for me. Are you absolutely sure that there's no typo in the |
…er-proxy-weaver redirect to weaver alias
I restarted a fresh terminal, removed/re-added the component, and then no more issue about |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Everything looks good except that the weaver/post-docker-compose-up
script fails to register external WPS providers with the current configuration. See the changes below for a suggested fix.
Note that we only need to change 301 to 308 in one case since I don't believe that weaver supports POST requests for the root path
location = ${TWITCHER_PROTECTED_PATH}/${WEAVER_MANAGER_NAME} { | ||
return 301 /${WEAVER_MANAGER_NAME}/$is_args$args; | ||
} | ||
location ${TWITCHER_PROTECTED_PATH}/${WEAVER_MANAGER_NAME}/ { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
location ${TWITCHER_PROTECTED_PATH}/${WEAVER_MANAGER_NAME}/ { | |
location ~ ^${TWITCHER_PROTECTED_PATH}/${WEAVER_MANAGER_NAME}/(.*)$ { |
We need to match something in order to include the subpath in the redirect (see next comment)
return 301 /${WEAVER_MANAGER_NAME}/$is_args$args; | ||
} | ||
location ${TWITCHER_PROTECTED_PATH}/${WEAVER_MANAGER_NAME}/ { | ||
return 301 /${WEAVER_MANAGER_NAME}/$is_args$args; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
return 301 /${WEAVER_MANAGER_NAME}/$is_args$args; | |
return 308 /${WEAVER_MANAGER_NAME}/$1$is_args$args; |
Actually include the matched subpath in the redirect.
Also, this should be 308 so that clients don't change a POST request to GET when performing the redirect.
(This was discovered when running the weaver/post-docker-compose-up
script which still uses the twitcher proxy routes)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think Misha is more knowledgeable than me with Weaver. I'll let him review.
Overview
Apply latest Weaver to apply all updates and fixes since 5.6.1.
Changes
Non-breaking changes
Weaver: update
weaver
component default version to 6.1.0.Relevant changes
of input parameters and headers when submitting jobs to obtain alternate result representations and behavior.
Accept
headers orf
query parameter.Weaver
-specific definitions where applicable(see https://github.com/crim-ca/weaver/tree/master/weaver/schemas/cwl).
Weaver: modifications to
proxy
configurations forweaver
WEAVER_ALT_PREFIX
optional variable that auto-configuresWEAVER_ALT_PREFIX_PROXY_LOCATION
,which allows setting an alternate endpoint to redirect requests to
weaver
.It uses
/ogcapi
by default which is a very common expectation from servers supporting OGC standards.TWITCHER_VERIFY_PATH
approach to accelerate access ofweaver
resources authorization.Breaking changes
Related Issue / Discussion
Additional Information
Links to other issues or sources.
CI Operations
birdhouse_daccs_configs_branch: master
birdhouse_skip_ci: false