Merge branch 'release/1.0.1'

BD2KGenomics · Jun 7, 2017 · 6aed349 · 6aed349
2 parents efe9690 + c5c69f1
commit 6aed349
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/redwood/cli/migrations/metadata-migration-2017-06-02.sh b/redwood/cli/migrations/metadata-migration-2017-06-02.sh
@@ -10,7 +10,7 @@ if [[ -z ${_REDWOOD_ROOT} ]]; then
     echo 'not running within redwood cli: you need to manually run `redwood project create TREEHOUSE SU2C PROTECT_NBL`'
 else
     echo "adding projects"
-    "${_REDWOOD_ROOT}/bin/redwood" project create TREEHOUSE SU2C PROTECT_NBL
+    "${_REDWOOD_ROOT}/bin/redwood" project create Treehouse SU2C PROTECT_NBL Quake_Brain_scRNA-Seq
 fi
 
 function mapping_for() {

diff --git a/redwood/cli/modules/project/libexec/project-list b/redwood/cli/modules/project/libexec/project-list
@@ -20,5 +20,5 @@ while getopts ":s:" opt; do
 done
 shift "$((OPTIND - 1))"
 
-docker exec -it redwood-auth-db psql -t -d dcc -U dcc_auth -c "select scope from oauth_client_details where client_id='mgmt';" | tr ',' "\n" | tr -d ' \t' | grep -e "^${site}" | sed "s/^${site}\.//" | sed 's/\.download$//' | sed 's/\.upload$//' | grep -v download | grep -v upload | uniq | sort
+docker exec -it redwood-auth-db psql -tqA -d dcc -U dcc_auth -c "select replace(scope, ',', E'\n') from oauth_client_details where client_id='mgmt';" | cut -d'.' -f 2 | grep -v download | grep -v upload | sort | uniq
 # TODO: this will fail for external databases
diff --git a/redwood/conf/auth-1-bootstrap-postgresql.sh b/redwood/conf/auth-1-bootstrap-postgresql.sh
@@ -99,7 +99,7 @@ GRANT SELECT, INSERT, UPDATE, DELETE ON ALL TABLES IN SCHEMA public TO dcc_auth;
 INSERT INTO users (username, password, enabled) VALUES ('mgmt', '${MGMT_CLIENT_SECRET}', true);
 INSERT INTO authorities (username, authority) VALUES ('mgmt', 'ROLE_MANAGEMENT');
 
-INSERT INTO oauth_client_details (client_id, resource_ids, client_secret, scope, authorized_grant_types, web_server_redirect_uri, authorities, access_token_validity, refresh_token_validity, additional_information, autoapprove) VALUES ('mgmt', '', '${MGMT_CLIENT_SECRET}', 'aws.DEV.upload,aws.DEV.download,aws.upload,aws.download', 'password', '', 'ROLE_MANAGEMENT', 31536000, NULL, '{}', '');
+INSERT INTO oauth_client_details (client_id, resource_ids, client_secret, scope, authorized_grant_types, web_server_redirect_uri, authorities, access_token_validity, refresh_token_validity, additional_information, autoapprove) VALUES ('mgmt', '', '${MGMT_CLIENT_SECRET}', 'aws.DEV.upload,aws.DEV.download,aws.TEST.upload,aws.TEST.download,aws.upload,aws.download', 'password', '', 'ROLE_MANAGEMENT', 31536000, NULL, '{}', '');
 -- INSERT INTO oauth_client_details (client_id, resource_ids, client_secret, scope, authorized_grant_types, web_server_redirect_uri, authorities, access_token_validity, refresh_token_validity, additional_information, autoapprove) VALUES ('resource', '', 'pass', 'deny_resource_servers_to_generate_tokens_with_valid_scope', '', '', 'ROLE_RESOURCE', 0, NULL, '{}', '');
 INSERT INTO oauth_client_details (client_id, resource_ids, client_secret, scope, authorized_grant_types, web_server_redirect_uri, authorities, access_token_validity, refresh_token_validity, additional_information, autoapprove) VALUES ('storage', '', '${STORAGE_CLIENT_SECRET}', 'deny_resource_servers_to_generate_tokens_with_valid_scope', '', '', 'ROLE_RESOURCE', 0, NULL, '{}', '');
 INSERT INTO oauth_client_details (client_id, resource_ids, client_secret, scope, authorized_grant_types, web_server_redirect_uri, authorities, access_token_validity, refresh_token_validity, additional_information, autoapprove) VALUES ('metadata', '', '${METADATA_CLIENT_SECRET}', 'deny_resource_servers_to_generate_tokens_with_valid_scope', '', '', 'ROLE_RESOURCE', 0, NULL, '{}', '');

diff --git a/redwood/prod.yml b/redwood/prod.yml
@@ -14,7 +14,7 @@ services:
     - LETSENCRYPT_HOST=metadata.${base_url}
     - LETSENCRYPT_EMAIL=${email}
   redwood-storage-server:
-    image: quay.io/ucsc_cgl/redwood-storage-server:r1.0.25
+    image: quay.io/ucsc_cgl/redwood-storage-server:r1.0.26
     environment:
     - LETSENCRYPT_HOST=storage.${base_url}
     - LETSENCRYPT_EMAIL=${email}