Merge branch 'ado-release'

Co-authored-by: testA113 <42307911+aliharriss@users.noreply.github.com>

api/cli/cli.go

@@ -50,7 +50,7 @@ func (*Service) ParseFlags(version string) (*portainer.CLIFlags, error) {
 		SSLCert:                   kingpin.Flag("sslcert", "Path to the SSL certificate used to secure the Portainer instance").String(),
 		SSLKey:                    kingpin.Flag("sslkey", "Path to the SSL key used to secure the Portainer instance").String(),
 		Rollback:                  kingpin.Flag("rollback", "Rollback the database store to the previous version").Bool(),
-		SnapshotInterval:          kingpin.Flag("snapshot-interval", "Duration between each environment snapshot job").Default(defaultSnapshotInterval).String(),
+		SnapshotInterval:          kingpin.Flag("snapshot-interval", "Duration between each environment snapshot job").String(),
 		AdminPassword:             kingpin.Flag("admin-password", "Hashed admin password").String(),
 		AdminPasswordFile:         kingpin.Flag("admin-password-file", "Path to the file containing the password for the admin user").String(),
 		Labels:                    pairs(kingpin.Flag("hide-label", "Hide containers with a specific label in the UI").Short('l')),
@@ -129,7 +129,7 @@ func validateEndpointURL(endpointURL string) error {
 }
 
 func validateSnapshotInterval(snapshotInterval string) error {
-	if snapshotInterval != defaultSnapshotInterval {
+	if snapshotInterval != "" {
 		_, err := time.ParseDuration(snapshotInterval)
 		if err != nil {
 			return errInvalidSnapshotInterval

api/cli/defaults.go

@@ -16,11 +16,10 @@ const (
 	defaultTLSCertPath         = "/certs/cert.pem"
 	defaultTLSKeyPath          = "/certs/key.pem"
 	defaultHTTPDisabled        = "false"
-	defaultHTTPEnabled         = "true"
+	defaultHTTPEnabled         = "false"
 	defaultSSL                 = "false"
 	defaultSSLCertPath         = "/certs/portainer.crt"
 	defaultSSLKeyPath          = "/certs/portainer.key"
-	defaultSnapshotInterval    = "5m"
 	defaultBaseURL             = "/"
 	defaultSecretKeyName       = "portainer"
 )

api/cli/defaults_windows.go

@@ -13,7 +13,7 @@ const (
 	defaultTLSCertPath         = "C:\\certs\\cert.pem"
 	defaultTLSKeyPath          = "C:\\certs\\key.pem"
 	defaultHTTPDisabled        = "false"
-	defaultHTTPEnabled         = "true"
+	defaultHTTPEnabled         = "false"
 	defaultSSL                 = "false"
 	defaultSSLCertPath         = "C:\\certs\\portainer.crt"
 	defaultSSLKeyPath          = "C:\\certs\\portainer.key"

api/cmd/portainer/main.go

@@ -4,12 +4,13 @@ import (
 	"context"
 	"crypto/sha256"
 	"fmt"
-	"github.com/sirupsen/logrus"
 	"os"
 	"path"
 	"strconv"
 	"strings"
 
+	"github.com/sirupsen/logrus"
+
 	"github.com/portainer/libhelm"
 	portainer "github.com/portainer/portainer/api"
 	"github.com/portainer/portainer/api/apikey"
@@ -40,7 +41,6 @@ import (
 	"github.com/portainer/portainer/api/oauth"
 	"github.com/portainer/portainer/api/scheduler"
 	"github.com/portainer/portainer/api/stacks"
-	"github.com/sirupsen/logrus"
 )
 
 func initCLI() *portainer.CLIFlags {
@@ -96,7 +96,7 @@ func initDataStore(flags *portainer.CLIFlags, secretKey []byte, fileService port
 		return nil
 	}
 
-	// Init sets some defaults - its basically a migration
+	// Init sets some defaults - it's basically a migration
 	err = store.Init()
 	if err != nil {
 		logrus.Fatalf("Failed initializing data store: %v", err)
@@ -210,11 +210,11 @@ func initKubernetesClientFactory(signatureService portainer.DigitalSignatureServ
 	return kubecli.NewClientFactory(signatureService, reverseTunnelService, instanceID, dataStore)
 }
 
-func initSnapshotService(snapshotInterval string, dataStore dataservices.DataStore, dockerClientFactory *docker.ClientFactory, kubernetesClientFactory *kubecli.ClientFactory, shutdownCtx context.Context) (portainer.SnapshotService, error) {
+func initSnapshotService(snapshotIntervalFromFlag string, dataStore dataservices.DataStore, dockerClientFactory *docker.ClientFactory, kubernetesClientFactory *kubecli.ClientFactory, shutdownCtx context.Context) (portainer.SnapshotService, error) {
 	dockerSnapshotter := docker.NewSnapshotter(dockerClientFactory)
 	kubernetesSnapshotter := kubernetes.NewSnapshotter(kubernetesClientFactory)
 
-	snapshotService, err := snapshot.NewService(snapshotInterval, dataStore, dockerSnapshotter, kubernetesSnapshotter, shutdownCtx)
+	snapshotService, err := snapshot.NewService(snapshotIntervalFromFlag, dataStore, dockerSnapshotter, kubernetesSnapshotter, shutdownCtx)
 	if err != nil {
 		return nil, err
 	}
@@ -235,11 +235,17 @@ func updateSettingsFromFlags(dataStore dataservices.DataStore, flags *portainer.
 		return err
 	}
 
-	settings.LogoURL = *flags.Logo
-	settings.SnapshotInterval = *flags.SnapshotInterval
-	settings.EnableEdgeComputeFeatures = *flags.EnableEdgeComputeFeatures
-	settings.EnableTelemetry = true
-	settings.OAuthSettings.SSO = true
+	if *flags.SnapshotInterval != "" {
+		settings.SnapshotInterval = *flags.SnapshotInterval
+	}
+
+	if *flags.Logo != "" {
+		settings.LogoURL = *flags.Logo
+	}
+
+	if *flags.EnableEdgeComputeFeatures {
+		settings.EnableEdgeComputeFeatures = *flags.EnableEdgeComputeFeatures
+	}
 
 	if *flags.Templates != "" {
 		settings.TemplatesURL = *flags.Templates
@@ -261,8 +267,8 @@ func updateSettingsFromFlags(dataStore dataservices.DataStore, flags *portainer.
 
 	if *flags.HTTPDisabled {
 		sslSettings.HTTPEnabled = false
-	} else {
-		sslSettings.HTTPEnabled = *flags.HTTPEnabled || sslSettings.HTTPEnabled
+	} else if *flags.HTTPEnabled {
+		sslSettings.HTTPEnabled = true
 	}
 
 	err = dataStore.SSLSettings().UpdateSettings(sslSettings)

api/database/boltdb/json.go

@@ -37,7 +37,7 @@ func (connection *DbConnection) UnmarshalObject(data []byte, object interface{})
 	if connection.getEncryptionKey() != nil {
 		data, err = decrypt(data, connection.getEncryptionKey())
 		if err != nil {
-			errors.Wrapf(err, "Failed decrypting object")
+			return errors.Wrap(err, "Failed decrypting object")
 		}
 	}
 	e := json.Unmarshal(data, object)

api/datastore/init.go

@@ -7,6 +7,30 @@ import (
 
 // Init creates the default data set.
 func (store *Store) Init() error {
+	err := store.checkOrCreateInstanceID()
+	if err != nil {
+		return err
+	}
+
+	err = store.checkOrCreateDefaultSettings()
+	if err != nil {
+		return err
+	}
+
+	err = store.checkOrCreateDefaultSSLSettings()
+	if err != nil {
+		return err
+	}
+
+	err = store.checkOrCreateDefaultData()
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func (store *Store) checkOrCreateInstanceID() error {
 	instanceID, err := store.VersionService.InstanceID()
 	if store.IsErrObjectNotFound(err) {
 		uid, err := uuid.NewV4()
@@ -15,18 +39,17 @@ func (store *Store) Init() error {
 		}
 
 		instanceID = uid.String()
-		err = store.VersionService.StoreInstanceID(instanceID)
-		if err != nil {
-			return err
-		}
-	} else if err != nil {
-		return err
+		return store.VersionService.StoreInstanceID(instanceID)
 	}
+	return err
+}
 
+func (store *Store) checkOrCreateDefaultSettings() error {
 	// TODO: these need to also be applied when importing
 	settings, err := store.SettingsService.Settings()
 	if store.IsErrObjectNotFound(err) {
 		defaultSettings := &portainer.Settings{
+			EnableTelemetry:      true,
 			AuthenticationMethod: portainer.AuthenticationInternal,
 			BlackListedLabels:    make([]portainer.Pair, 0),
 			LDAPSettings: portainer.LDAPSettings{
@@ -40,8 +63,10 @@ func (store *Store) Init() error {
 					{},
 				},
 			},
-			OAuthSettings: portainer.OAuthSettings{},
-
+			OAuthSettings: portainer.OAuthSettings{
+				SSO: true,
+			},
+			SnapshotInterval:         portainer.DefaultSnapshotInterval,
 			EdgeAgentCheckinInterval: portainer.DefaultEdgeAgentCheckinIntervalInSeconds,
 			TemplatesURL:             portainer.DefaultTemplatesURL,
 			HelmRepositoryURL:        portainer.DefaultHelmRepositoryURL,
@@ -50,35 +75,33 @@ func (store *Store) Init() error {
 			KubectlShellImage:        portainer.DefaultKubectlShellImage,
 		}
 
-		err = store.SettingsService.UpdateSettings(defaultSettings)
-		if err != nil {
-			return err
-		}
-	} else if err != nil {
+		return store.SettingsService.UpdateSettings(defaultSettings)
+	}
+	if err != nil {
 		return err
-	} else if err == nil {
-		if settings.UserSessionTimeout == "" {
-			settings.UserSessionTimeout = portainer.DefaultUserSessionTimeout
-			store.Settings().UpdateSettings(settings)
-		}
 	}
 
-	_, err = store.SSLSettings().Settings()
-	if err != nil {
-		if !store.IsErrObjectNotFound(err) {
-			return err
-		}
+	if settings.UserSessionTimeout == "" {
+		settings.UserSessionTimeout = portainer.DefaultUserSessionTimeout
+		return store.Settings().UpdateSettings(settings)
+	}
+	return nil
+}
 
+func (store *Store) checkOrCreateDefaultSSLSettings() error {
+	_, err := store.SSLSettings().Settings()
+
+	if store.IsErrObjectNotFound(err) {
 		defaultSSLSettings := &portainer.SSLSettings{
 			HTTPEnabled: true,
 		}
 
-		err = store.SSLSettings().UpdateSettings(defaultSSLSettings)
-		if err != nil {
-			return err
-		}
+		return store.SSLSettings().UpdateSettings(defaultSSLSettings)
 	}
+	return err
+}
 
+func (store *Store) checkOrCreateDefaultData() error {
 	groups, err := store.EndpointGroupService.EndpointGroups()
 	if err != nil {
 		return err
@@ -99,6 +122,5 @@ func (store *Store) Init() error {
 			return err
 		}
 	}
-
 	return nil
 }

api/internal/snapshot/snapshot.go

@@ -23,21 +23,39 @@ type Service struct {
 }
 
 // NewService creates a new instance of a service
-func NewService(snapshotInterval string, dataStore dataservices.DataStore, dockerSnapshotter portainer.DockerSnapshotter, kubernetesSnapshotter portainer.KubernetesSnapshotter, shutdownCtx context.Context) (*Service, error) {
-	snapshotFrequency, err := time.ParseDuration(snapshotInterval)
+func NewService(snapshotIntervalFromFlag string, dataStore dataservices.DataStore, dockerSnapshotter portainer.DockerSnapshotter, kubernetesSnapshotter portainer.KubernetesSnapshotter, shutdownCtx context.Context) (*Service, error) {
+	snapshotFrequency, err := parseSnapshotFrequency(snapshotIntervalFromFlag, dataStore)
 	if err != nil {
 		return nil, err
 	}
 
 	return &Service{
 		dataStore:                 dataStore,
-		snapshotIntervalInSeconds: snapshotFrequency.Seconds(),
+		snapshotIntervalInSeconds: snapshotFrequency,
 		dockerSnapshotter:         dockerSnapshotter,
 		kubernetesSnapshotter:     kubernetesSnapshotter,
 		shutdownCtx:               shutdownCtx,
 	}, nil
 }
 
+func parseSnapshotFrequency(snapshotInterval string, dataStore dataservices.DataStore) (float64, error) {
+	if snapshotInterval == "" {
+		settings, err := dataStore.Settings().Settings()
+		if err != nil {
+			return 0, err
+		}
+		snapshotInterval = settings.SnapshotInterval
+		if snapshotInterval == "" {
+			snapshotInterval = portainer.DefaultSnapshotInterval
+		}
+	}
+	snapshotFrequency, err := time.ParseDuration(snapshotInterval)
+	if err != nil {
+		return 0, err
+	}
+	return snapshotFrequency.Seconds(), nil
+}
+
 // Start will start a background routine to execute periodic snapshots of environments(endpoints)
 func (service *Service) Start() {
 	if service.refreshSignal != nil {

api/portainer.go

@@ -1375,6 +1375,8 @@ const (
 	// PortainerAgentSignatureMessage represents the message used to create a digital signature
 	// to be used when communicating with an agent
 	PortainerAgentSignatureMessage = "Portainer-App"
+	// DefaultSnapshotInterval represents the default interval between each environment snapshot job
+	DefaultSnapshotInterval = "5m"
 	// DefaultEdgeAgentCheckinIntervalInSeconds represents the default interval (in seconds) used by Edge agents to checkin with the Portainer instance
 	DefaultEdgeAgentCheckinIntervalInSeconds = 5
 	// DefaultTemplatesURL represents the URL to the official templates supported by Portainer

app/docker/__module.js

@@ -1,8 +1,9 @@
 import angular from 'angular';
 
 import containersModule from './containers';
+import { componentsModule } from './components';
 
-angular.module('portainer.docker', ['portainer.app', containersModule]).config([
+angular.module('portainer.docker', ['portainer.app', containersModule, componentsModule]).config([
   '$stateRegistryProvider',
   function ($stateRegistryProvider) {
     'use strict';

app/docker/components/container-quick-actions/index.ts

@@ -1,7 +1,4 @@
-import angular from 'angular';
-
-import { ContainerQuickActionsAngular } from './ContainerQuickActions';
-
-angular
-  .module('portainer.docker')
-  .component('containerQuickActions', ContainerQuickActionsAngular);
+export {
+  ContainerQuickActions,
+  ContainerQuickActionsAngular,
+} from './ContainerQuickActions';

app/docker/components/index.ts

@@ -0,0 +1,7 @@
+import angular from 'angular';
+
+import { ContainerQuickActionsAngular } from './container-quick-actions';
+
+export const componentsModule = angular
+  .module('portainer.docker.components', [])
+  .component('containerQuickActions', ContainerQuickActionsAngular).name;

app/docker/services/containerService.js

@@ -199,8 +199,10 @@ function ContainerServiceFactory($q, Container, LogHelper, $timeout, EndpointPro
   return service;
 
   function withEndpointId(func) {
-    const endpointId = EndpointProvider.endpointID();
+    return function (...args) {
+      const endpointId = EndpointProvider.endpointID();
 
-    return func.bind(null, endpointId);
+      return func(endpointId, ...args);
+    };
   }
 }

app/portainer/components/Tip/Tooltip/Tooltip.module.css

@@ -11,6 +11,10 @@
   border: 1px solid var(--border-tooltip-color) !important;
   border-radius: 0.14285714rem !important;
   box-shadow: 0 2px 4px 0 rgba(34, 36, 38, 0.12), 0 2px 10px 0 rgba(34, 36, 38, 0.15) !important;
+  max-width: 200px;
+  text-align: center;
+  font-size: 12px !important;
+  font-weight: 400;
 }
 
 .icon {

app/portainer/components/datatables/components/ActionsMenu.module.css

@@ -9,6 +9,8 @@
 
 .table-actions-menu-list {
   padding: 0 10px 0 10px;
+  background: var(--bg-widget-color);
+  border: 1px solid var(--border-color);
 }
 
 .table-actions-menu-list [data-reach-menu-item] {

app/portainer/components/form-components/InputList/utils.test.ts

@@ -2,18 +2,7 @@ import { arrayMove } from './utils';
 
 it('moves items in an array', () => {
   expect(arrayMove(['a', 'b', 'c'], 2, 0)).toEqual(['c', 'a', 'b']);
-  expect(
-    arrayMove(
-      [
-        { name: 'Fred' },
-        { name: 'Barney' },
-        { name: 'Wilma' },
-        { name: 'Betty' },
-      ],
-      2,
-      1
-    )
-  ).toEqual([
+  expect(arrayMove([{ name: 'Fred' }, { name: 'Barney' }, { name: 'Wilma' }, { name: 'Betty' }], 2, 1)).toEqual([
     { name: 'Fred' },
     { name: 'Wilma' },
     { name: 'Barney' },

app/portainer/components/form-components/InputList/utils.ts

@@ -10,23 +10,13 @@ export function arrayMove<T>(array: Array<T>, from: number, to: number) {
 
   if (diff > 0) {
     // move left
-    return [
-      ...array.slice(0, to),
-      item,
-      ...array.slice(to, from),
-      ...array.slice(from + 1, length),
-    ];
+    return [...array.slice(0, to), item, ...array.slice(to, from), ...array.slice(from + 1, length)];
   }
 
   if (diff < 0) {
     // move right
     const targetIndex = to + 1;
-    return [
-      ...array.slice(0, from),
-      ...array.slice(from + 1, targetIndex),
-      item,
-      ...array.slice(targetIndex, length),
-    ];
+    return [...array.slice(0, from), ...array.slice(from + 1, targetIndex), item, ...array.slice(targetIndex, length)];
   }
 
   return [...array];

app/portainer/services/axios.ts

@@ -8,18 +8,16 @@ import {
   portainerAgentTargetHeader,
 } from './http-request.helper';
 
-const axiosApiInstance = axios.create({ baseURL: '/api' });
+const axiosApiInstance = axios.create({ baseURL: 'api' });
 
 export default axiosApiInstance;
 
 axiosApiInstance.interceptors.request.use(async (config) => {
-  const newConfig = { ...config };
+  const newConfig = { headers: config.headers || {}, ...config };
 
   const jwt = localStorageGet('JWT', '');
   if (jwt) {
-    newConfig.headers = {
-      Authorization: `Bearer ${jwt}`,
-    };
+    newConfig.headers.Authorization = `Bearer ${jwt}`;
   }
 
   return newConfig;
@@ -31,8 +29,11 @@ export function agentInterceptor(config: AxiosRequestConfig) {
   }
 
   const newConfig = { headers: config.headers || {}, ...config };
+  const target = portainerAgentTargetHeader();
+  if (target) {
+    newConfig.headers['X-PortainerAgent-Target'] = target;
+  }
 
-  newConfig.headers['X-PortainerAgent-Target'] = portainerAgentTargetHeader();
   if (portainerAgentManagerOperation()) {
     newConfig.headers['X-PortainerAgent-ManagerOperation'] = '1';
   }

app/portainer/views/devices/import/importDevice.html

@@ -45,7 +45,7 @@
             </div>
             <div class="form-group" ng-show="state.vouchersUploading">
               <div class="col-sm-12 small text-success">
-                <p>Connecting to Manufacturer's Rendezvous Server...</p>
+                <p>Connecting to the Owner service...</p>
               </div>
             </div>
             <div class="form-group" ng-show="state.vouchersUploaded">
@@ -136,7 +136,7 @@
                   ng-model="formValues.PortainerURL"
                   ng-required="state.vouchersUploaded"
                   ng-disabled="!state.vouchersUploaded"
-                  placeholder="e.g. http://10.0.0.10:9443"
+                  placeholder="e.g. https://10.0.0.10:9443"
                   required
                   data-cy="deviceImport-portainerServerUrlInput"
                 />

app/portainer/views/devices/import/importDeviceController.js

@@ -74,9 +74,11 @@ angular
           let suffix = $scope.formValues.Suffix;
 
           for (const deviceID of $scope.state.deviceIDs) {
+            let deviceName = $scope.formValues.DeviceName + suffix;
+
             try {
               var endpoint = await EndpointService.createRemoteEndpoint(
-                $scope.formValues.DeviceName + suffix,
+                deviceName,
                 PortainerEndpointCreationTypes.EdgeAgentEnvironment,
                 $scope.formValues.PortainerURL,
                 '',
@@ -102,7 +104,7 @@ angular
             const config = {
               edgeID: endpoint.EdgeID || uuidv4(),
               edgeKey: endpoint.EdgeKey,
-              name: $scope.formValues.DeviceName,
+              name: deviceName,
               profile: $scope.formValues.DeviceProfile,
             };