Skip to content

Commit 8a715cd

Browse files
sandereggsanderegg
authored
Merge pull request #977 from ITISFoundation/freeze-master
Freeze master 07-22-2019
2 parents 64b7b1d + 8c43212 commit 8a715cd

File tree

125 files changed

+2769
-740
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

125 files changed

+2769
-740
lines changed

‎.env-devel‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# - Keep it alfphabetical order
2+
# - Keep it alfphabetical order and grouped by prefix
33
# - To expose: export $(grep -v '^#' .env | xargs -0)
44
#
55

@@ -8,6 +8,9 @@ BF_API_SECRET=none
88

99
DOCKER_IMAGE_TAG=latest
1010

11+
GF_SECURITY_ADMIN_PASSWORD=z43
12+
GF_SMTP_HOST=mail.speag.com:25
13+
1114
MAINTENANCE_PASSWORD=z43
1215

1316
PUBLISHED_HOST_NAME=localhost
@@ -19,6 +22,9 @@ POSTGRES_DB=simcoredb
1922
POSTGRES_HOST=postgres
2023
POSTGRES_PORT=5432
2124

25+
# ensure consistency with POSTGRES_ variables: postgresql+psycopg2://{user}:{password}@{host}:{port}/{database}
26+
POSTGRES_EXPORTER_DATA_SOURCE_NAME=postgresql://simcore:simcore@postgres:5432/simcoredb?sslmode=disable
27+
2228
RABBIT_HOST=rabbit
2329
RABBIT_PORT=5672
2430
RABBITMQ_USER=simcore
@@ -44,6 +50,5 @@ SMTP_HOST=mail.speag.com
4450
SMTP_PORT=25
4551

4652
WEBSERVER_LOGIN_REGISTRATION_INVITATION_REQUIRED=1
47-
4853
# python3 -c "from cryptography.fernet import Fernet; print(Fernet.generate_key())"
4954
WEBSERVER_SESSION_SECRET_KEY=REPLACE ME with a key of at least length 32.

‎Makefile‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -135,17 +135,15 @@ up-devel: up-swarm-devel
135135

136136
up-swarm: .env docker-swarm-check
137137
${DOCKER} swarm init
138-
${DOCKER_COMPOSE} -f services/docker-compose.yml \
139-
-f services/docker-compose-tools.yml \
140-
config > $(TEMPCOMPOSE).tmp-compose.yml ;
141-
${DOCKER} stack deploy -c $(TEMPCOMPOSE).tmp-compose.yml ${SWARM_STACK_NAME}
138+
${DOCKER_COMPOSE} -f services/docker-compose.yml -f services/docker-compose-tools.yml config > $(TEMPCOMPOSE).tmp-compose.yml ;
139+
@cat $(TEMPCOMPOSE).tmp-compose.yml
140+
@${DOCKER} stack deploy -c $(TEMPCOMPOSE).tmp-compose.yml ${SWARM_STACK_NAME}
142141

143142
up-swarm-devel: .env docker-swarm-check $(CLIENT_WEB_OUTPUT)
144143
${DOCKER} swarm init
145-
${DOCKER_COMPOSE} -f services/docker-compose.yml -f services/docker-compose.devel.yml \
146-
-f services/docker-compose-tools.yml \
147-
config > $(TEMPCOMPOSE).tmp-compose.yml
148-
${DOCKER} stack deploy -c $(TEMPCOMPOSE).tmp-compose.yml ${SWARM_STACK_NAME}
144+
${DOCKER_COMPOSE} -f services/docker-compose.yml -f services/docker-compose.devel.yml -f services/docker-compose-tools.yml config > $(TEMPCOMPOSE).tmp-compose.yml
145+
@cat $(TEMPCOMPOSE).tmp-compose.yml
146+
@${DOCKER} stack deploy -c $(TEMPCOMPOSE).tmp-compose.yml ${SWARM_STACK_NAME}
149147

150148
.PHONY: up-webclient-devel
151149
# target: up-webclient-devel: – init swarm and deploys all core and tool services up in development mode. Then it stops the webclient service and starts it again with the watcher attached.

‎api/specs/storage/v0/components/schemas/dataset_meta_data.yaml‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
components:
2+
schemas:
3+
DatasetMetaDataEnveloped:
4+
type: object
5+
required:
6+
- data
7+
- error
8+
properties:
9+
data:
10+
$ref: '#/components/schemas/DatasetMetaDataType'
11+
error:
12+
nullable: true
13+
default: null
14+
15+
DatasetMetaDataType:
16+
type: object
17+
properties:
18+
dataset_id:
19+
type: string
20+
display_name:
21+
type: string
22+
example:
23+
dataset_uuid: 'N:id-aaaa'
24+
display_name: "simcore-testing"
25+
26+
DatasetMetaDataArray:
27+
type: array
28+
items:
29+
$ref: './dataset_meta_data.yaml#/components/schemas/DatasetMetaDataType'

‎api/specs/storage/v0/components/schemas/dataset_meta_data_array.yaml‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
components:
2+
schemas:
3+
DatasetMetaDataArrayEnveloped:
4+
type: object
5+
required:
6+
- data
7+
- error
8+
properties:
9+
data:
10+
$ref: '#/components/schemas/DatasetMetaDataArrayType'
11+
error:
12+
nullable: true
13+
default: null
14+
15+
DatasetMetaDataArrayType:
16+
type: array
17+
items:
18+
$ref: './dataset_meta_data.yaml#/components/schemas/DatasetMetaDataType'

‎api/specs/storage/v0/components/schemas/file_meta_data.yaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,8 @@ components:
5151
type: string
5252
file_size:
5353
type: integer
54+
parent_id:
55+
type: string
5456
example:
5557
file_uuid: 'simcore-testing/105/1000/3'
5658
location_id: "0"
@@ -70,3 +72,4 @@ components:
7072
created_at: "2019-06-19T12:29:03.308611Z"
7173
last_modified: "2019-06-19T12:29:03.78852Z"
7274
file_size: 73
75+
parent_id: "N:collection:e263da07-2d89-45a6-8b0f-61061b913873"

‎api/specs/storage/v0/openapi.yaml‎

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,33 @@ paths:
100100
default:
101101
$ref: '#/components/responses/DefaultErrorResponse'
102102

103+
/locations/{location_id}/datasets:
104+
get:
105+
tags:
106+
- users
107+
summary: Get datasets metadata
108+
operationId: get_datasets_metadata
109+
parameters:
110+
- name: location_id
111+
in : path
112+
required: true
113+
schema:
114+
type: string
115+
- name: user_id
116+
in: query
117+
required: true
118+
schema:
119+
type: string
120+
responses:
121+
'200':
122+
description: 'list of dataset meta-datas'
123+
content:
124+
application/json:
125+
schema:
126+
$ref: './components/schemas/dataset_meta_data_array.yaml#/components/schemas/DatasetMetaDataArrayEnveloped'
127+
default:
128+
$ref: '#/components/responses/DefaultErrorResponse'
129+
103130
/locations/{location_id}/files/metadata:
104131
get:
105132
tags:
@@ -132,6 +159,38 @@ paths:
132159
default:
133160
$ref: '#/components/responses/DefaultErrorResponse'
134161

162+
/locations/{location_id}/datasets/{dataset_id}/metadata:
163+
get:
164+
tags:
165+
- users
166+
summary: Get Files Metadata
167+
operationId: get_files_metadata_dataset
168+
parameters:
169+
- name: location_id
170+
in : path
171+
required: true
172+
schema:
173+
type: string
174+
- name: dataset_id
175+
in: path
176+
required: true
177+
schema:
178+
type: string
179+
- name: user_id
180+
in: query
181+
required: true
182+
schema:
183+
type: string
184+
responses:
185+
'200':
186+
description: 'list of file meta-datas'
187+
content:
188+
application/json:
189+
schema:
190+
$ref: './components/schemas/file_meta_data_array.yaml#/components/schemas/FileMetaDataArrayEnveloped'
191+
default:
192+
$ref: '#/components/responses/DefaultErrorResponse'
193+
135194
/locations/{location_id}/files/{fileId}/metadata:
136195
get:
137196
tags:

‎api/specs/webserver/v0/components/schemas/datasets.yaml‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
DatasetMetaDataEnveloped:
2+
type: object
3+
required:
4+
- data
5+
properties:
6+
data:
7+
$ref: '#DatasetMetaData'
8+
error:
9+
nullable: true
10+
default: null
11+
12+
DatasetMetaData:
13+
type: object
14+
properties:
15+
dataset_id:
16+
type: string
17+
display_name:
18+
type: string
19+
example:
20+
dataset_uuid: 'N:id-aaaa'
21+
display_name: "simcore-testing"
22+
23+
DatasetMetaDataArray:
24+
type: array
25+
items:
26+
$ref: '#/DatasetMetaData'

‎api/specs/webserver/v0/components/schemas/files.yaml‎

Lines changed: 23 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,16 +31,28 @@ FileMetaData:
3131
type: string
3232
node_name:
3333
type: string
34-
file_id:
35-
type: string
3634
file_name:
3735
type: string
3836
user_id:
3937
type: string
4038
user_name:
4139
type: string
40+
file_id:
41+
type: string
42+
raw_file_path:
43+
type: string
44+
display_file_path:
45+
type: string
46+
created_at:
47+
type: string
48+
last_modified:
49+
type: string
50+
file_size:
51+
type: integer
52+
parent_id:
53+
type: string
4254
example:
43-
file_uuid: 'simcore.s3/simcore-testing/105/1000/3'
55+
file_uuid: 'simcore-testing/105/1000/3'
4456
location_id: "0"
4557
location_name: "simcore.s3"
4658
bucket_name: "simcore-testing"
@@ -49,10 +61,17 @@ FileMetaData:
4961
project_name: "futurology"
5062
node_id: "10000"
5163
node_name: "alpha"
52-
file_id: "3"
5364
file_name: "example.txt"
5465
user_id: "12"
5566
user_name: "dennis"
67+
file_id: "N:package:e263da07-2d89-45a6-8b0f-61061b913873"
68+
raw_file_path: "Curation/derivatives/subjects/sourcedata/docs/samples/sam_1/sam_1.csv"
69+
display_file_path: "Curation/derivatives/subjects/sourcedata/docs/samples/sam_1/sam_1.csv"
70+
created_at: "2019-06-19T12:29:03.308611Z"
71+
last_modified: "2019-06-19T12:29:03.78852Z"
72+
file_size: 73
73+
parent_id: "N:collection:e263da07-2d89-45a6-8b0f-61061b913873"
74+
5675

5776
FileMetaDataArray:
5877
type: array

‎api/specs/webserver/v0/openapi-storage.yaml‎

Lines changed: 44 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,27 @@ paths:
2222
default:
2323
$ref: './openapi.yaml#/components/responses/DefaultErrorResponse'
2424

25+
/storage/locations/{location_id}/datasets:
26+
get:
27+
summary: Get datasets metadata
28+
operationId: get_datasets_metadata
29+
parameters:
30+
- name: location_id
31+
in : path
32+
required: true
33+
schema:
34+
type: string
35+
responses:
36+
'200':
37+
description: 'list of dataset meta-datas'
38+
content:
39+
application/json:
40+
schema:
41+
$ref: './components/schemas/datasets.yaml#DatasetMetaDataArray'
42+
default:
43+
$ref: './openapi.yaml#/components/responses/DefaultErrorResponse'
44+
45+
2546
/storage/locations/{location_id}/files/metadata:
2647
get:
2748
summary: Get list of file meta data
@@ -32,9 +53,29 @@ paths:
3253
required: true
3354
schema:
3455
type: string
35-
- name: uuid_filter
36-
in: query
37-
required: false
56+
responses:
57+
'200':
58+
description: 'list of file meta-datas'
59+
content:
60+
application/json:
61+
schema:
62+
$ref: './components/schemas/files.yaml#FileMetaDataArray'
63+
default:
64+
$ref: './openapi.yaml#/components/responses/DefaultErrorResponse'
65+
66+
/storage/locations/{location_id}/datasets/{dataset_id}/metadata:
67+
get:
68+
summary: Get Files Metadata
69+
operationId: get_files_metadata_dataset
70+
parameters:
71+
- name: location_id
72+
in : path
73+
required: true
74+
schema:
75+
type: string
76+
- name: dataset_id
77+
in: path
78+
required: true
3879
schema:
3980
type: string
4081
responses:

‎api/specs/webserver/v0/openapi.yaml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,13 @@ paths:
8989
/storage/locations/{location_id}/files/{fileId}/metadata:
9090
$ref: './openapi-storage.yaml#/paths/~1storage~1locations~1{location_id}~1files~1{fileId}~1metadata'
9191

92+
/storage/locations/{location_id}/datasets/{dataset_id}/metadata:
93+
$ref: './openapi-storage.yaml#/paths/~1storage~1locations~1{location_id}~1datasets~1{dataset_id}~1metadata'
94+
95+
/storage/locations/{location_id}/datasets:
96+
$ref: './openapi-storage.yaml#/paths/~1storage~1locations~1{location_id}~1datasets'
97+
98+
9299
# SERVICES ------------------------------------------------------------------------
93100
/services:
94101
$ref: './openapi-services.yaml#/paths/~1services'

0 commit comments

Comments
 (0)