upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor synced 2024-09-20 20:35:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revise code with review comments

Browse Source 
Signed-off-by: stonezdj <stonezdj@gmail.com>
This commit is contained in:
stonezdj 2019-02-18 15:20:45 +08:00
parent 880051c08a
commit 7a5fbf718f
4 changed files with 20 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/common/dao/base.go
View File

@ -90,6 +90,20 @@ func InitDatabase(database *models.Database) error {
return nil
}
// InitAndUpgradeDatabase - init database and upgrade when required
func InitAndUpgradeDatabase(database *models.Database) error {
if err := InitDatabase(database); err != nil {
return err
}
if err := UpgradeSchema(database); err != nil {
return err
}
if err := CheckSchemaVersion(); err != nil {
return err
}
return nil
}
// CheckSchemaVersion checks that whether the schema version matches with the expected one
func CheckSchemaVersion() error {
version, err := GetSchemaVersion()

12
src/common/utils/test/database.go
View File

@ -64,17 +64,9 @@ func InitDatabaseFromEnv() {
log.Infof("POSTGRES_HOST: %s, POSTGRES_USR: %s, POSTGRES_PORT: %d, POSTGRES_PWD: %s\n", dbHost, dbUser, dbPort, dbPassword)
if err := dao.InitDatabase(database); err != nil {
log.Fatalf("failed to initialize database: %v", err)
if err := dao.InitAndUpgradeDatabase(database); err != nil {
log.Fatalf("failed to init and upgrade database : %v", err)
}
if err := dao.UpgradeSchema(database); err != nil {
log.Fatalf("failed to upgrade database schema: %v", err)
}
if err := dao.CheckSchemaVersion(); err != nil {
log.Fatalf("failed to check database schema version: %v", err)
}
if err := updateUserInitialPassword(1, adminPwd); err != nil {
log.Fatalf("failed to init password for admin: %v", err)
}

11
src/core/api/config.go
View File

@ -16,6 +16,9 @@ package api
import (
"fmt"
"net/http"
"strings"
"github.com/goharbor/harbor/src/common"
"github.com/goharbor/harbor/src/common/config"
"github.com/goharbor/harbor/src/common/config/metadata"
@ -25,8 +28,6 @@ import (
"github.com/goharbor/harbor/src/common/utils/log"
corecfg "github.com/goharbor/harbor/src/core/config"
"github.com/goharbor/harbor/src/core/filter"
"net/http"
"strings"
)
// ConfigAPI ...
@ -67,7 +68,6 @@ type value struct {
// Get returns configurations
func (c *ConfigAPI) Get() {
configs := c.cfgManager.GetUserCfgs()
log.Infof("current configs %+v", configs)
m, err := convertForGet(configs)
if err != nil {
log.Errorf("failed to convert configurations: %v", err)
@ -109,11 +109,6 @@ func (c *ConfigAPI) Put() {
log.Errorf("failed to upload configurations: %v", err)
c.CustomAbort(http.StatusInternalServerError, http.StatusText(http.StatusInternalServerError))
}
// Everything is ok, detect the configurations to confirm if the option we are caring is changed.
if err := watchConfigChanges(m); err != nil {
log.Errorf("Failed to watch configuration change with error: %s\n", err)
}
}
func (c *ConfigAPI) validateCfg(cfgs map[string]interface{}) (bool, error) {

9
src/core/main.go
View File

@ -93,16 +93,9 @@ func main() {
if err != nil {
log.Fatalf("failed to get database configuration: %v", err)
}
if err := dao.InitDatabase(database); err != nil {
if err := dao.InitAndUpgradeDatabase(database); err != nil {
log.Fatalf("failed to initialize database: %v", err)
}
if err := dao.UpgradeSchema(database); err != nil {
log.Fatalf("failed to upgrade schema: %v", err)
}
if err := dao.CheckSchemaVersion(); err != nil {
log.Fatalf("failed to check schema version: %v", err)
}
if err := config.Load(); err != nil {
log.Fatalf("failed to load config: %v", err)
}