github
/
portainer
mirror of https://github.com/portainer/portainer
1
0
Fork 0
Code Issues Releases Wiki Activity

fix(docker): fix extension spelling EE-5277 (#8956)

pull/8961/head
Prabhat Khera 2023-05-18 10:21:07 +12:00 committed by GitHub
parent b58cd1e87e
commit 14fa60f6e6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/datastore/init.go
View File

@ -60,7 +60,7 @@ func (store *Store) checkOrCreateDefaultSettings() error {
KubeconfigExpiry: portainer.DefaultKubeconfigExpiry, KubeconfigExpiry: portainer.DefaultKubeconfigExpiry,
KubectlShellImage: portainer.DefaultKubectlShellImage, KubectlShellImage: portainer.DefaultKubectlShellImage,
IsDockerDesktopExtention: isDDExtention, IsDockerDesktopExtension: isDDExtention,
} }
return store.SettingsService.UpdateSettings(defaultSettings) return store.SettingsService.UpdateSettings(defaultSettings)

6
api/datastore/migrator/migrate_dbversion100.go
View File

@ -9,9 +9,9 @@ import (
func (m *Migrator) migrateDockerDesktopExtentionSetting() error { func (m *Migrator) migrateDockerDesktopExtentionSetting() error {
log.Info().Msg("updating docker desktop extention flag in settings") log.Info().Msg("updating docker desktop extention flag in settings")
isDDExtention := false isDDExtension := false
if _, ok := os.LookupEnv("DOCKER_EXTENSION"); ok { if _, ok := os.LookupEnv("DOCKER_EXTENSION"); ok {
isDDExtention = true isDDExtension = true
} }
settings, err := m.settingsService.Settings() settings, err := m.settingsService.Settings()
@ -19,7 +19,7 @@ func (m *Migrator) migrateDockerDesktopExtentionSetting() error {
return err return err
} }
settings.IsDockerDesktopExtention = isDDExtention settings.IsDockerDesktopExtension = isDDExtension
err = m.settingsService.UpdateSettings(settings) err = m.settingsService.UpdateSettings(settings)
if err != nil { if err != nil {
return err return err

2
api/datastore/test_data/output_24_to_latest.json
View File

@ -606,7 +606,7 @@
"InternalAuthSettings": { "InternalAuthSettings": {
"RequiredPasswordLength": 12 "RequiredPasswordLength": 12
}, },
"IsDockerDesktopExtention": false, "IsDockerDesktopExtension": false,
"KubeconfigExpiry": "0", "KubeconfigExpiry": "0",
"KubectlShellImage": "portainer/kubectl-shell", "KubectlShellImage": "portainer/kubectl-shell",
"LDAPSettings": { "LDAPSettings": {

4
api/http/handler/settings/settings_public.go
View File

@ -50,7 +50,7 @@ type publicSettingsResponse struct {
CheckinInterval int `example:"60"` CheckinInterval int `example:"60"`
} }
IsDockerDesktopExtention bool `json:"IsDockerDesktopExtention" example:"false"` IsDockerDesktopExtension bool `json:"IsDockerDesktopExtension" example:"false"`
} }
// @id SettingsPublic // @id SettingsPublic
@ -91,7 +91,7 @@ func generatePublicSettings(appSettings *portainer.Settings) *publicSettingsResp
publicSettings.Edge.CommandInterval = appSettings.Edge.CommandInterval publicSettings.Edge.CommandInterval = appSettings.Edge.CommandInterval
publicSettings.Edge.CheckinInterval = appSettings.EdgeAgentCheckinInterval publicSettings.Edge.CheckinInterval = appSettings.EdgeAgentCheckinInterval
publicSettings.IsDockerDesktopExtention = appSettings.IsDockerDesktopExtention publicSettings.IsDockerDesktopExtension = appSettings.IsDockerDesktopExtension
//if OAuth authentication is on, compose the related fields from application settings //if OAuth authentication is on, compose the related fields from application settings
if publicSettings.AuthenticationMethod == portainer.AuthenticationOAuth { if publicSettings.AuthenticationMethod == portainer.AuthenticationOAuth {

2
api/jwt/jwt.go
View File

@ -173,7 +173,7 @@ func (service *Service) generateSignedToken(data *portainer.TokenData, expiresAt
return "", fmt.Errorf("failed fetching settings from db: %w", err) return "", fmt.Errorf("failed fetching settings from db: %w", err)
} }
if settings.IsDockerDesktopExtention { if settings.IsDockerDesktopExtension {
// Set expiration to 99 years for docker desktop extension. // Set expiration to 99 years for docker desktop extension.
log.Info().Msg("detected docker desktop extension mode") log.Info().Msg("detected docker desktop extension mode")
expiresAt = time.Now().Add(time.Hour * 8760 * 99).Unix() expiresAt = time.Now().Add(time.Hour * 8760 * 99).Unix()

2
api/portainer.go
View File

@ -968,7 +968,7 @@ type (
AllowDeviceMappingForRegularUsers bool `json:"AllowDeviceMappingForRegularUsers"` AllowDeviceMappingForRegularUsers bool `json:"AllowDeviceMappingForRegularUsers"`
AllowContainerCapabilitiesForRegularUsers bool `json:"AllowContainerCapabilitiesForRegularUsers"` AllowContainerCapabilitiesForRegularUsers bool `json:"AllowContainerCapabilitiesForRegularUsers"`
IsDockerDesktopExtention bool `json:"IsDockerDesktopExtention"` IsDockerDesktopExtension bool `json:"IsDockerDesktopExtension"`
} }
// SnapshotJob represents a scheduled job that can create environment(endpoint) snapshots // SnapshotJob represents a scheduled job that can create environment(endpoint) snapshots