Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
S
server
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Analyze
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
m-team
oidc
mytoken
server
Commits
1c793e71
Commit
1c793e71
authored
3 years ago
by
Gabriel Zachmann
Browse files
Options
Downloads
Patches
Plain Diff
fix password prompt for migratedb
parent
246596c5
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
CHANGELOG.md
+4
-0
4 additions, 0 deletions
CHANGELOG.md
cmd/mytoken-server/mytoken-migratedb/main.go
+4
-0
4 additions, 0 deletions
cmd/mytoken-server/mytoken-migratedb/main.go
internal/model/version/version.go
+1
-1
1 addition, 1 deletion
internal/model/version/version.go
with
9 additions
and
1 deletion
CHANGELOG.md
+
4
−
0
View file @
1c793e71
...
...
@@ -12,6 +12,10 @@
<!-- ### Dependencies -->
<!-- -->
## mytoken 0.3.2
-
Fixed password prompt for migratedb
## mytoken 0.3.1
-
Improved helper tools
...
...
This diff is collapsed.
Click to expand it.
cmd/mytoken-server/mytoken-migratedb/main.go
+
4
−
0
View file @
1c793e71
...
...
@@ -6,6 +6,7 @@ import (
"strings"
"time"
"github.com/Songmu/prompter"
log
"github.com/sirupsen/logrus"
"github.com/zachmann/cli/v2"
"golang.org/x/term"
...
...
@@ -107,6 +108,9 @@ var app = &cli.App{
}
else
if
!
force
{
return
fmt
.
Errorf
(
"No mytoken servers specified. Please provide mytoken servers or use '-f' to force database migration."
)
}
if
dbConfig
.
Password
==
""
{
dbConfig
.
Password
=
prompter
.
Password
(
"Enter password"
)
}
dbConfig
.
ReconnectInterval
=
60
dbConfig
.
DBConf
.
Hosts
=
dbConfig
.
Hosts
.
Value
()
db
.
ConnectConfig
(
dbConfig
.
DBConf
)
...
...
This diff is collapsed.
Click to expand it.
internal/model/version/version.go
+
1
−
1
View file @
1c793e71
...
...
@@ -8,7 +8,7 @@ import (
const
(
MAJOR
=
0
MINOR
=
3
FIX
=
1
FIX
=
2
DEV
=
false
)
...
...
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