Skip to content

Commit

Permalink
Merge pull request #291 from pdowler/master
Browse files Browse the repository at this point in the history
icewind: fallback to anon if service does not support cert auth
  • Loading branch information
pdowler authored Sep 5, 2023
2 parents 8a3c456 + 3069846 commit 37162f7
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 3 deletions.
2 changes: 1 addition & 1 deletion caom2-repo/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ sourceCompatibility = 1.8

group = 'org.opencadc'

version = '1.4.6'
version = '1.4.7'

description = 'OpenCADC CAOM repository client library'
def git_url = 'https://github.com/opencadc/caom2db'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,13 @@ private void init() {
}
Interface iface = obs.findInterface(meth);
if (iface == null) {
throw new RuntimeException("observation list capability does not suppoort auth: " + meth.getValue());
iface = obs.findInterface(AuthMethod.ANON);
if (iface == null) {
throw new RuntimeException("observation list capability does not support auth: " + meth.getValue()
+ " or anon");
}
log.debug("observation list capability does not support auth: " + meth.getValue() + ": using anon");
meth = AuthMethod.ANON; // use same for deletion endpoint below
}
this.baseServiceURL = iface.getAccessURL().getURL();
log.debug("observation list URL: " + baseServiceURL.toString());
Expand Down
2 changes: 1 addition & 1 deletion icewind/VERSION
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
## deployable containers have a semantic and build tag
# semantic version tag: major.minor[.patch]
# build version tag: timestamp
VER=0.9.6
VER=0.9.7
TAGS="${VER} ${VER}-$(date --utc +"%Y%m%dT%H%M%S")"
unset VER

0 comments on commit 37162f7

Please sign in to comment.