Skip to content

Commit

Permalink
Merge branch 'develop' into staging
Browse files Browse the repository at this point in the history
  • Loading branch information
msneddon committed Apr 13, 2017
2 parents dd8e107 + 000e129 commit 93e8e3f
Show file tree
Hide file tree
Showing 20 changed files with 1,502 additions and 90 deletions.
7 changes: 7 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,13 @@ develop: [![Build Status](https://travis-ci.org/kbase/catalog.svg?branch=develop
Code coverage: (develop branch)
[![Coverage Status](https://coveralls.io/repos/github/kbase/catalog/badge.svg?branch=develop)](https://coveralls.io/github/kbase/catalog?branch=develop)

#### v2.1.0 - 4/13/17
- No change from 2.0.7, but upgraded minor version number because many new features
now exist since the initial 2.0.x release.

#### v2.0.7 - 3/28/17
- Added job_id field to raw execution statistics
- Support for hidden configuration parameters

#### v2.0.6 - 12/7/16
- Bug is fixed in module registration related to docker client timeout happening
Expand Down
48 changes: 48 additions & 0 deletions catalog.spec
Original file line number Diff line number Diff line change
Expand Up @@ -635,6 +635,7 @@ module Catalog {
float exec_start_time;
float finish_time;
boolean is_error;
string job_id;
} LogExecStatsParams;
/*
Expand Down Expand Up @@ -783,4 +784,51 @@ module Catalog {
/* returns true (1) if the user is an admin, false (0) otherwise */
funcdef is_admin(string username) returns (boolean);
/*
version - optional version (commit hash, tag or semantic one) of module, if not set
then default "" value is used which means parameter is applied to any version;
is_password - optional flag meaning to hide this parameter's value in UI.
*/
typedef structure {
string module_name;
string version;
string param_name;
boolean is_password;
string param_value;
} SecureConfigParameter;
typedef structure {
list<SecureConfigParameter> data;
} ModifySecureConfigParamsInput;
/*
Only admins can use this function.
*/
funcdef set_secure_config_params(ModifySecureConfigParamsInput params)
returns () authentication required;
/*
Only admins can use this function.
*/
funcdef remove_secure_config_params(ModifySecureConfigParamsInput params)
returns () authentication required;
/*
version - optional version (commit hash, tag or semantic one) of module, if
not set then default "release" value is used;
load_all_versions - optional flag indicating that all parameter versions
should be loaded (version filter is not applied), default value is 0.
*/
typedef structure {
string module_name;
string version;
boolean load_all_versions;
} GetSecureConfigParamsInput;

/*
Only admins can use this function.
*/
funcdef get_secure_config_params(GetSecureConfigParamsInput params)
returns (list<SecureConfigParameter>) authentication required;

};
2 changes: 1 addition & 1 deletion deploy.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ mongodb-database = catalog
#mongodb-pwd = add password here

# The KBase auth server url.
auth-server-url = https://kbase.us/services/authorization/Sessions/Login
auth-service-url = https://kbase.us/services/authorization/Sessions/Login

# Path to docker socket/host
docker-base-url = unix://var/run/docker.sock
Expand Down
Loading

0 comments on commit 93e8e3f

Please sign in to comment.