Skip to content
GitLab
Explore
Projects
Groups
Snippets
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Martin Dinov
POD
Commits
323b4d5e
Commit
323b4d5e
authored
4 years ago
by
Bijun Li
Browse files
Options
Download
Plain Diff
Merge branch 'dev' into action-api
parents
1c1d6246
30525fa6
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
res/autogenerated_database_schema.json
+101
-21
res/autogenerated_database_schema.json
src/services_api.rs
+12
-3
src/services_api.rs
with
113 additions
and
24 deletions
+113
-24
res/autogenerated_database_schema.json
+
101
-
21
View file @
323b4d5e
...
...
@@ -1388,6 +1388,11 @@
"dbtype"
:
"Text"
,
"indexed"
:
false
},
{
"name"
:
"service"
,
"dbtype"
:
"Text"
,
"indexed"
:
false
},
{
"name"
:
"starred"
,
"dbtype"
:
"Bool"
,
...
...
@@ -2118,6 +2123,11 @@
"dbtype"
:
"Text"
,
"indexed"
:
false
},
{
"name"
:
"repository"
,
"dbtype"
:
"Text"
,
"indexed"
:
false
},
{
"name"
:
"starred"
,
"dbtype"
:
"Bool"
,
...
...
@@ -2198,6 +2208,11 @@
"dbtype"
:
"Integer"
,
"indexed"
:
false
},
{
"name"
:
"repository"
,
"dbtype"
:
"Text"
,
"indexed"
:
false
},
{
"name"
:
"starred"
,
"dbtype"
:
"Bool"
,
...
...
@@ -2288,6 +2303,11 @@
"dbtype"
:
"Text"
,
"indexed"
:
false
},
{
"name"
:
"repository"
,
"dbtype"
:
"Text"
,
"indexed"
:
false
},
{
"name"
:
"runDestination"
,
"dbtype"
:
"Text"
,
...
...
@@ -2368,6 +2388,11 @@
"dbtype"
:
"Text"
,
"indexed"
:
false
},
{
"name"
:
"repository"
,
"dbtype"
:
"Text"
,
"indexed"
:
false
},
{
"name"
:
"starred"
,
"dbtype"
:
"Bool"
,
...
...
@@ -2455,6 +2480,76 @@
}
]
},
{
"name"
:
"Integrator"
,
"properties"
:
[
{
"name"
:
"dateAccessed"
,
"dbtype"
:
"DateTime"
,
"indexed"
:
false
},
{
"name"
:
"dateCreated"
,
"dbtype"
:
"DateTime"
,
"indexed"
:
false
},
{
"name"
:
"dateModified"
,
"dbtype"
:
"DateTime"
,
"indexed"
:
false
},
{
"name"
:
"deleted"
,
"dbtype"
:
"Bool"
,
"indexed"
:
false
},
{
"name"
:
"externalId"
,
"dbtype"
:
"Text"
,
"indexed"
:
false
},
{
"name"
:
"genericType"
,
"dbtype"
:
"Text"
,
"indexed"
:
false
},
{
"name"
:
"importJson"
,
"dbtype"
:
"Text"
,
"indexed"
:
false
},
{
"name"
:
"itemDescription"
,
"dbtype"
:
"Text"
,
"indexed"
:
false
},
{
"name"
:
"name"
,
"dbtype"
:
"Text"
,
"indexed"
:
false
},
{
"name"
:
"repository"
,
"dbtype"
:
"Text"
,
"indexed"
:
false
},
{
"name"
:
"starred"
,
"dbtype"
:
"Bool"
,
"indexed"
:
false
},
{
"name"
:
"uid"
,
"dbtype"
:
"Integer"
,
"indexed"
:
false
},
{
"name"
:
"version"
,
"dbtype"
:
"Integer"
,
"indexed"
:
false
}
]
},
{
"name"
:
"Invoice"
,
"properties"
:
[
...
...
@@ -3113,6 +3208,11 @@
"dbtype"
:
"Text"
,
"indexed"
:
false
},
{
"name"
:
"service"
,
"dbtype"
:
"Text"
,
"indexed"
:
false
},
{
"name"
:
"starred"
,
"dbtype"
:
"Bool"
,
...
...
@@ -3138,11 +3238,6 @@
"dbtype"
:
"Text"
,
"indexed"
:
false
},
{
"name"
:
"type"
,
"dbtype"
:
"Text"
,
"indexed"
:
false
},
{
"name"
:
"uid"
,
"dbtype"
:
"Integer"
,
...
...
@@ -4143,16 +4238,6 @@
"dbtype"
:
"Text"
,
"indexed"
:
false
},
{
"name"
:
"enablePresence"
,
"dbtype"
:
"Bool"
,
"indexed"
:
false
},
{
"name"
:
"enableReceipts"
,
"dbtype"
:
"Bool"
,
"indexed"
:
false
},
{
"name"
:
"externalId"
,
"dbtype"
:
"Text"
,
...
...
@@ -4188,11 +4273,6 @@
"dbtype"
:
"Text"
,
"indexed"
:
false
},
{
"name"
:
"nameQuality"
,
"dbtype"
:
"Integer"
,
"indexed"
:
false
},
{
"name"
:
"role"
,
"dbtype"
:
"Text"
,
...
...
@@ -6451,4 +6531,4 @@
]
}
]
}
}
\ No newline at end of file
This diff is collapsed.
Click to expand it.
src/services_api.rs
+
12
-
3
View file @
323b4d5e
...
...
@@ -74,10 +74,19 @@ pub fn run_importer(
let
path
=
env
::
current_dir
()
?
;
let
parent
=
path
.parent
()
.expect
(
"Failed to get parent directory"
);
let
w
a
_volume
=
format!
(
let
w
hatsapp
_volume
=
format!
(
"--volume={}/importers/data-synapse:/usr/src/importers/data-synapse"
,
parent
.display
()
.to_string
()
);
let
docker_image
=
result
.first
()
.expect
(
"Failed to get ImporterRun item"
)
.as_object
()
.expect
(
"Failed to get value"
)
.get
(
"repository"
)
.expect
(
"Failed to get repository for docker image"
)
.as_str
()
.expect
(
"Failed to get string"
);
let
mut
args
:
Vec
<
String
>
=
Vec
::
new
();
args
.push
(
"run"
.to_string
());
for
arg
in
docker_arguments
(
cli_options
)
{
...
...
@@ -90,8 +99,8 @@ pub fn run_importer(
args
.push
(
"--rm"
.to_string
());
args
.push
(
"--name=memri-importers_1"
.to_string
());
args
.push
(
format!
(
"--env=RUN_UID={}"
,
payload
.uid
));
args
.push
(
w
a
_volume
);
args
.push
(
"memri-importers:latest"
.to_string
(
));
args
.push
(
w
hatsapp
_volume
);
args
.push
(
format!
(
"{}:latest"
,
docker_image
));
log
::
debug!
(
"Starting importer docker command {:?}"
,
args
);
let
command
=
Command
::
new
(
"docker"
)
.args
(
&
args
)
.spawn
();
match
command
{
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment
Menu
Explore
Projects
Groups
Snippets