Docker/portainer
Docker/portainer
1
0
Fork 0
mirror of https://github.com/portainer/portainer.git synced 2025-07-25 00:09:40 +02:00
Code Issues Releases Activity

chore(code): reduce divergence with EE EE-4344 (#7748)

Browse source
This commit is contained in:
andres-portainer 2022-09-28 14:56:32 -03:00 • committed by GitHub
parent e9384a6987
commit cb79dc18f8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
102 changed files with 259 additions and 180 deletions
Download patch file Download diff file Expand all files Collapse all files

1
api/datastore/datastore.go
View file

@ -156,6 +156,7 @@ func (store *Store) encryptDB() error {
if err != nil {
// Remove the new encrypted file that we failed to import
os.Remove(store.connection.GetDatabaseFilePath())
log.Fatal().Err(portainerErrors.ErrDBImportFailed).Msg("")
}

3
api/datastore/init.go
View file

@ -36,6 +36,7 @@ func (store *Store) checkOrCreateInstanceID() error {
instanceID := uid.String()
return store.VersionService.StoreInstanceID(instanceID)
}
return err
}
@ -88,7 +89,6 @@ func (store *Store) checkOrCreateDefaultSettings() error {
func (store *Store) checkOrCreateDefaultSSLSettings() error {
_, err := store.SSLSettings().Settings()
if store.IsErrObjectNotFound(err) {
defaultSSLSettings := &portainer.SSLSettings{
HTTPEnabled: true,
@ -96,6 +96,7 @@ func (store *Store) checkOrCreateDefaultSSLSettings() error {
return store.SSLSettings().UpdateSettings(defaultSSLSettings)
}
return err
}

2
api/datastore/migrate_data_test.go
View file

@ -259,7 +259,7 @@ func migrateDBTestHelper(t *testing.T, srcPath, wantPath string) error {
return fmt.Errorf("stat on %s failed: %s", databasePath, err)
}
gotJSON, err := con.ExportJson(databasePath, false)
gotJSON, err := con.ExportJSON(databasePath, false)
if err != nil {
t.Logf(
"failed re-exporting database %s to JSON: %v",

5
api/datastore/migrator/migrate_ce.go
View file

@ -1,13 +1,12 @@
package migrator
import (
"errors"
"reflect"
"runtime"
portainer "github.com/portainer/portainer/api"
werrors "github.com/pkg/errors"
"github.com/pkg/errors"
"github.com/rs/zerolog/log"
)
@ -17,7 +16,7 @@ type migration struct {
}
func migrationError(err error, context string) error {
return werrors.Wrap(err, "failed in "+context)
return errors.Wrap(err, "failed in "+context)
}
func newMigration(dbversion int, migrate func() error) migration {

1
api/datastore/migrator/migrate_dbversion19.go
View file

@ -15,6 +15,7 @@ func (m *Migrator) updateUsersToDBVersion20() error {
}
func (m *Migrator) updateSettingsToDBVersion20() error {
log.Info().Msg("updating settings")
legacySettings, err := m.settingsService.Settings()
if err != nil {
return err

1
api/datastore/migrator/migrate_dbversion22.go
View file

@ -22,6 +22,7 @@ func (m *Migrator) updateTagsToDBVersion23() error {
return err
}
}
return nil
}

1
api/datastore/migrator/migrate_dbversion29.go
View file

@ -19,5 +19,6 @@ func (m *Migrator) MigrateSettingsToDB30() error {
legacySettings.OAuthSettings.SSO = false
legacySettings.OAuthSettings.LogoutURI = ""
return m.settingsService.UpdateSettings(legacySettings)
}

1
api/datastore/migrator/migrate_dbversion32.go
View file

@ -13,6 +13,7 @@ func (m *Migrator) migrateDBVersionToDB33() error {
}
func (m *Migrator) migrateSettingsToDB33() error {
log.Info().Msg("setting default kubctl shell")
settings, err := m.settingsService.Settings()
if err != nil {
return err

2
api/datastore/migrator/migrate_dbversion35.go
View file

@ -14,6 +14,8 @@ func (m *Migrator) migrateDBVersionToDB36() error {
}
func (m *Migrator) migrateUsersToDB36() error {
log.Info().Msg("updating user authorizations")
users, err := m.userService.Users()
if err != nil {
return err

1
api/datastore/migrator/migrate_dbversion70.go
View file

@ -2,6 +2,7 @@ package migrator
import (
portainer "github.com/portainer/portainer/api"
"github.com/rs/zerolog/log"
)

4
api/datastore/services.go
View file

@ -518,7 +518,7 @@ func (store *Store) Export(filename string) (err error) {
if snapshot, err := store.Snapshot().Snapshots(); err != nil {
if !store.IsErrObjectNotFound(err) {
log.Err(err).Msg("Exporting Snapshots")
log.Error().Err(err).Msg("exporting Snapshots")
}
} else {
backup.Snapshot = snapshot
@ -707,7 +707,7 @@ func (store *Store) Import(filename string) (err error) {
for _, user := range backup.User {
if err := store.User().UpdateUser(user.ID, &user); err != nil {
log.Debug().Str("user", fmt.Sprintf("%+v", user)).Err(err).Msg("user: failed to Update Database")
log.Debug().Str("user", fmt.Sprintf("%+v", user)).Err(err).Msg("failed to update the user in the database")
}
}