Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
T
tsm-orchestration
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
UFZ TSM
tsm-orchestration
Commits
aa3ffa06
Commit
aa3ffa06
authored
1 month ago
by
Bert Palm
Browse files
Options
Downloads
Plain Diff
Merge branch 'storeSSHkey' into 'main'
store encrypted ssh key in DB See merge request
!263
parents
7f1e8d04
01a48755
No related branches found
No related tags found
1 merge request
!263
store encrypted ssh key in DB
Pipeline
#492898
passed
1 month ago
Stage: check
Stage: integration
Stage: end-to-end
Changes
2
Pipelines
5
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/run_configdb_updater.py
+0
-3
0 additions, 3 deletions
src/run_configdb_updater.py
src/timeio/configdb.py
+1
-1
1 addition, 1 deletion
src/timeio/configdb.py
with
1 addition
and
4 deletions
src/run_configdb_updater.py
+
0
−
3
View file @
aa3ffa06
...
...
@@ -46,9 +46,6 @@ def prepare_data_by_version(data: dict[str, Any]) -> dict[str, Any]:
parser
.
setdefault
(
"
name
"
,
"
no-parser-name
"
)
# missing
elif
data
[
"
version
"
]
==
5
:
# tsm-frontend/GL71
if
d
:
=
data
.
get
(
"
external_sftp
"
):
d
[
"
private_key
"
]
=
"
no-key-in-message-version-4
"
# always None
if
d
:
=
data
.
get
(
"
mqtt
"
):
d
.
pop
(
"
uri
"
,
None
)
# unused
if
d
:
=
data
.
get
(
"
database
"
):
...
...
This diff is collapsed.
Click to expand it.
src/timeio/configdb.py
+
1
−
1
View file @
aa3ffa06
...
...
@@ -336,7 +336,7 @@ def upsert_table_ext_sftp(conn: Connection, values: dict, extftp_id) -> int:
# "password": thing.ext_sftp_password or None
# "sync_interval": thing.ext_sftp_sync_interval,
# "public_key": thing.ext_sftp_public_key,
# "private_key":
None
,
# "private_key":
encrypted private ssh key or "" (empty string)
,
v
=
values
.
copy
()
id_
=
_upsert
(
conn
,
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
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!
Save comment
Cancel
Please
register
or
sign in
to comment