FISS v0.16.36

Hotfix: the old billing API is being removed, HL and LL updated to use the new one; Makefile updated to ensure image is built for linux/amd64; Dockerfile updated to use latest Python-3.10. (#183)
broadinstitute · Nov 4, 2023 · e973cbd · e973cbd
1 parent 0cb8dbb
commit e973cbd
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 8 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM python:3.10.5-slim
+FROM python:3.10-slim
 
 COPY . /fiss
 

diff --git a/Makefile b/Makefile
@@ -84,7 +84,7 @@ publish: clean
 	rm -rf build dist *.egg-info
 
 image:
-	docker build -t broadgdac/fiss .
+	docker build --platform=linux/amd64 -t broadgdac/fiss .
 
 clean:
 	rm -rf build dist .eggs *.egg-info *~ */*~ *.pyc */*.pyc

diff --git a/changelog.txt b/changelog.txt
@@ -3,6 +3,10 @@ Change Log for FISSFC: the (Fi)recloud (S)ervice (S)elector
 ================================================================================
 Terms used below:  HL = high level interface, LL = low level interface
 
+v0.16.36 - Hotfix: the old billing API is being removed, HL and LL updated to
+           use the new one; Makefile updated to ensure image is built for
+           linux/amd64; Dockerfile updated to use latest Python-3.10.
+
 v0.16.35 - Hotfix: mop returned errors in Python 2 when trying to read the
            workspace bucket - bucket listing updated to use the workspace
            billing project, and the error report was cleaned up.

diff --git a/firecloud/__about__.py b/firecloud/__about__.py
@@ -1,2 +1,2 @@
 # Package version
-__version__ = "0.16.35"
+__version__ = "0.16.36"
diff --git a/firecloud/api.py b/firecloud/api.py
@@ -1126,12 +1126,12 @@ def get_api_methods_definitions():
 #################
 
 def list_billing_projects():
-    """Get activation information for the logged-in user.
+    """list billing projects for a user.
 
     Swagger:
-        https://api.firecloud.org/#!/Profile/billing
+        https://api.firecloud.org/#/BillingV2/listUserBillingProjectsV2
     """
-    return __get("profile/billing")
+    return __get("billing/v2")
 
 def get_proxy_group(email=None):
     """Returns the proxy group email for the current user

diff --git a/firecloud/fiss.py b/firecloud/fiss.py
@@ -1729,9 +1729,9 @@ def proj_list(args):
     projects = fapi.list_billing_projects()
     fapi._check_response_code(projects, 200)
     projects = sorted(projects.json(), key=lambda d: d['projectName'])
-    l = map(lambda p: '{0}\t{1}'.format(p['projectName'], p['role']), projects)
+    l = map(lambda p: '{0}\t{1}'.format(p['projectName'], ', '.join(sorted(p['roles']))), projects)
     # FIXME: add username col to output, for when iterating over multiple users
-    return ["Project\tRole"] + list(l)
+    return ["Project\tRole(s)"] + list(l)
 
 @fiss_cmd
 def config_validate(args):