Skip to content

Commit 36c76fc

Browse files
maxceemmaxceem
committed
Merge branch 'develop' into feature/restful-invites
# Conflicts: # docs/Project API.postman_collection.json
2 parents 1f49f2c + 572507e commit 36c76fc

38 files changed

+989
-103
lines changed

‎config/custom-environment-variables.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@
1414
"timelineIndexName": "TIMELINES_ES_INDEX_NAME",
1515
"timelineDocType": "TIMELINES_ES_DOC_TYPE",
1616
"metadataIndexName": "METADATA_ES_INDEX_NAME",
17-
"metadataDocType": "METADATA_ES_DOC_TYPE"
17+
"metadataDocType": "METADATA_ES_DOC_TYPE",
18+
"metadataDocDefaultId": "METADATA_ES_DOC_DEFAULT_ID"
1819
},
1920
"rabbitmqURL": "RABBITMQ_URL",
2021
"pubsubQueueName": "PUBSUB_QUEUE_NAME",
@@ -55,6 +56,9 @@
5556
"pageSize": "PAGE_SIZE",
5657
"SSO_REFCODES": "SSO_REFCODES",
5758
"lookerConfig": {
59+
"EMBED_KEY": "LOOKER_EMBED_KEY",
60+
"LOOKER_HOST": "LOOKER_HOST",
61+
"SESSION_LENGTH": "SESSION_LENGTH",
5862
"BASE_URL": "LOOKER_API_BASE_URL",
5963
"CLIENT_ID": "LOOKER_API_CLIENT_ID",
6064
"CLIENT_SECRET": "LOOKER_API_CLIENT_SECRET",

‎config/default.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@
2525
"timelineIndexName": "timelines",
2626
"timelineDocType": "doc",
2727
"metadataIndexName": "metadata",
28-
"metadataDocType": "doc"
28+
"metadataDocType": "doc",
29+
"metadataDocDefaultId": 1
2930
},
3031
"connectProjectUrl":"",
3132
"dbConfig": {
@@ -60,6 +61,9 @@
6061
"VALID_STATUSES_BEFORE_PAUSED": "[\"active\"]",
6162
"SSO_REFCODES": "[]",
6263
"lookerConfig": {
64+
"EMBED_KEY": "FAKE_KEY",
65+
"LOOKER_HOST": "demo.looker.com",
66+
"SESSION_LENGTH": 86400,
6367
"BASE_URL": "",
6468
"CLIENT_ID": "",
6569
"CLIENT_SECRET": "",

‎docs/Project API.postman_collection.json

Lines changed: 246 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6031,6 +6031,252 @@
60316031
],
60326032
"protocolProfileBehavior": {}
60336033
},
6034+
{
6035+
"name": "Org Config",
6036+
"item": [
6037+
{
6038+
"name": "Create org config",
6039+
"event": [
6040+
{
6041+
"listen": "test",
6042+
"script": {
6043+
"id": "fbc45946-a3f2-433a-8ec5-0af82b69d2bd",
6044+
"exec": [
6045+
"pm.test(\"Status code is 201\", function () {",
6046+
" pm.response.to.have.status(201);",
6047+
" console.log(pm.response.json())",
6048+
" pm.environment.set(\"orgStrId\", pm.response.json().orgId);",
6049+
" pm.environment.set(\"orgConfigName\", pm.response.json().configName);",
6050+
" pm.environment.set(\"orgId\", pm.response.json().id);",
6051+
"});"
6052+
],
6053+
"type": "text/javascript"
6054+
}
6055+
}
6056+
],
6057+
"request": {
6058+
"method": "POST",
6059+
"header": [
6060+
{
6061+
"key": "Content-Type",
6062+
"value": "application/json"
6063+
},
6064+
{
6065+
"key": "Authorization",
6066+
"value": "Bearer {{jwt-token}}"
6067+
}
6068+
],
6069+
"body": {
6070+
"mode": "raw",
6071+
"raw": "{ \n\t\"orgId\": \"testStr Id\",\n \"configName\": \"project_catefory_url\",\n \"configValue\": \"http://localhost/url\"\n}"
6072+
},
6073+
"url": {
6074+
"raw": "{{api-url}}/projects/metadata/orgConfig",
6075+
"host": [
6076+
"{{api-url}}"
6077+
],
6078+
"path": [
6079+
"projects",
6080+
"metadata",
6081+
"orgConfig"
6082+
]
6083+
}
6084+
},
6085+
"response": []
6086+
},
6087+
{
6088+
"name": "List org configs without orgId",
6089+
"request": {
6090+
"method": "GET",
6091+
"header": [
6092+
{
6093+
"key": "Content-Type",
6094+
"value": "application/json"
6095+
},
6096+
{
6097+
"key": "Authorization",
6098+
"value": "Bearer {{jwt-token}}"
6099+
}
6100+
],
6101+
"url": {
6102+
"raw": "{{api-url}}/projects/metadata/orgConfig",
6103+
"host": [
6104+
"{{api-url}}"
6105+
],
6106+
"path": [
6107+
"projects",
6108+
"metadata",
6109+
"orgConfig"
6110+
]
6111+
}
6112+
},
6113+
"response": []
6114+
},
6115+
{
6116+
"name": "List org configs with only orgId",
6117+
"request": {
6118+
"method": "GET",
6119+
"header": [
6120+
{
6121+
"key": "Content-Type",
6122+
"value": "application/json"
6123+
},
6124+
{
6125+
"key": "Authorization",
6126+
"value": "Bearer {{jwt-token}}"
6127+
}
6128+
],
6129+
"url": {
6130+
"raw": "{{api-url}}/projects/metadata/orgConfig?orgId={{orgStrId}}",
6131+
"host": [
6132+
"{{api-url}}"
6133+
],
6134+
"path": [
6135+
"projects",
6136+
"metadata",
6137+
"orgConfig"
6138+
],
6139+
"query": [
6140+
{
6141+
"key": "orgId",
6142+
"value": "{{orgStrId}}",
6143+
"description": "orgId can be array with ',', 'id1,id2'"
6144+
}
6145+
]
6146+
}
6147+
},
6148+
"response": []
6149+
},
6150+
{
6151+
"name": "List org configs with orgId and configName",
6152+
"request": {
6153+
"method": "GET",
6154+
"header": [
6155+
{
6156+
"key": "Content-Type",
6157+
"value": "application/json"
6158+
},
6159+
{
6160+
"key": "Authorization",
6161+
"value": "Bearer {{jwt-token}}"
6162+
}
6163+
],
6164+
"url": {
6165+
"raw": "{{api-url}}/projects/metadata/orgConfig?orgId={{orgStrId}}&configName={{orgConfigName}}",
6166+
"host": [
6167+
"{{api-url}}"
6168+
],
6169+
"path": [
6170+
"projects",
6171+
"metadata",
6172+
"orgConfig"
6173+
],
6174+
"query": [
6175+
{
6176+
"key": "orgId",
6177+
"value": "{{orgStrId}}",
6178+
"description": "orgId can be array with ',', 'id1,id2'"
6179+
},
6180+
{
6181+
"key": "configName",
6182+
"value": "{{orgConfigName}}"
6183+
}
6184+
]
6185+
}
6186+
},
6187+
"response": []
6188+
},
6189+
{
6190+
"name": "Delete org config",
6191+
"request": {
6192+
"method": "DELETE",
6193+
"header": [
6194+
{
6195+
"key": "Content-Type",
6196+
"value": "application/json"
6197+
},
6198+
{
6199+
"key": "Authorization",
6200+
"value": "Bearer {{jwt-token}}"
6201+
}
6202+
],
6203+
"body": {
6204+
"mode": "raw",
6205+
"raw": ""
6206+
},
6207+
"url": {
6208+
"raw": "{{api-url}}/projects/metadata/orgConfig/{{orgId}}",
6209+
"host": [
6210+
"{{api-url}}"
6211+
],
6212+
"path": [
6213+
"projects",
6214+
"metadata",
6215+
"orgConfig",
6216+
"{{orgId}}"
6217+
]
6218+
}
6219+
},
6220+
"response": []
6221+
},
6222+
{
6223+
"name": "Update org config",
6224+
"request": {
6225+
"method": "PATCH",
6226+
"header": [
6227+
{
6228+
"key": "Content-Type",
6229+
"value": "application/json"
6230+
},
6231+
{
6232+
"key": "Authorization",
6233+
"value": "Bearer {{jwt-token}}"
6234+
}
6235+
],
6236+
"body": {
6237+
"mode": "raw",
6238+
"raw": "{ \n\t\"orgId\": \"another orgId\",\n \"configName\": \"project_catefory_url\",\n \"configValue\": \"http://localhost/url\"\n}"
6239+
},
6240+
"url": {
6241+
"raw": "{{api-url}}/projects/metadata/orgConfig/{{orgId}}",
6242+
"host": [
6243+
"{{api-url}}"
6244+
],
6245+
"path": [
6246+
"projects",
6247+
"metadata",
6248+
"orgConfig",
6249+
"{{orgId}}"
6250+
]
6251+
}
6252+
},
6253+
"response": []
6254+
}
6255+
],
6256+
"event": [
6257+
{
6258+
"listen": "prerequest",
6259+
"script": {
6260+
"id": "2e274cc9-22e6-4dd2-9eee-c4f1fd98253d",
6261+
"type": "text/javascript",
6262+
"exec": [
6263+
""
6264+
]
6265+
}
6266+
},
6267+
{
6268+
"listen": "test",
6269+
"script": {
6270+
"id": "9d171dbf-2a50-4483-b172-ce240ac09413",
6271+
"type": "text/javascript",
6272+
"exec": [
6273+
""
6274+
]
6275+
}
6276+
}
6277+
],
6278+
"protocolProfileBehavior": {}
6279+
},
60346280
{
60356281
"name": "Product Category",
60366282
"item": [

0 commit comments

Comments
 (0)