chore: version bump 2.33.5 (#1448)

.eslintrc.yml

@@ -17,7 +17,7 @@ plugins:
   - import
 
 parserOptions:
-  ecmaVersion: latest
+  ecmaVersion: 2018
   sourceType: module
   project: './tsconfig.json'
   ecmaFeatures:
@@ -114,13 +114,7 @@ overrides:
       '@typescript-eslint/explicit-module-boundary-types': off
       '@typescript-eslint/no-unused-vars': 'error'
       '@typescript-eslint/no-explicit-any': 'error'
-      'jsx-a11y/label-has-associated-control':
-        - error
-        - assert: either
-          controlComponents:
-            - Input
-            - Checkbox
-      'jsx-a11y/control-has-associated-label': off
+      'jsx-a11y/label-has-associated-control': ['error', { 'assert': 'either', controlComponents: ['Input', 'Checkbox'] }]
       'react/function-component-definition': ['error', { 'namedComponents': 'function-declaration' }]
       'react/jsx-no-bind': off
       'no-await-in-loop': 'off'

.husky/pre-commit

@@ -1,4 +1,4 @@
 #!/usr/bin/env sh
 . "$(dirname -- "$0")/_/husky.sh"
 
-cd $(dirname -- "$0") && pnpm lint-staged
+cd $(dirname -- "$0") && yarn lint-staged

CONTRIBUTING.md

@@ -77,7 +77,7 @@ The feature request process is similar to the bug report process but has an extr
 
 ## Build and run Portainer locally
 
-Ensure you have Docker, Node.js, pnpm, and Golang installed in the correct versions.
+Ensure you have Docker, Node.js, yarn, and Golang installed in the correct versions.
 
 Install dependencies:
 

Makefile

@@ -26,7 +26,7 @@ all: tidy deps build-server build-client ## Build the client, server and downloa
 build-all: all ## Alias for the 'all' target (used by CI)
 
 build-client: init-dist ## Build the client
-	export NODE_ENV=$(ENV) && pnpm run build --config $(WEBPACK_CONFIG)
+	export NODE_ENV=$(ENV) && yarn build --config $(WEBPACK_CONFIG)
 
 build-server: init-dist ## Build the server binary
 	./build/build_binary.sh "$(PLATFORM)" "$(ARCH)"
@@ -35,7 +35,7 @@ build-image: build-all ## Build the Portainer image locally
 	docker buildx build --load -t portainerci/portainer-ce:$(TAG) -f build/linux/Dockerfile .
 
 build-storybook: ## Build and serve the storybook files
-	pnpm run storybook:build
+	yarn storybook:build
 
 devops: clean deps build-client ## Build the everything target specifically for CI
 	echo "Building the devops binary..."
@@ -49,7 +49,7 @@ server-deps: init-dist ## Download dependant server binaries
 	@./build/download_binaries.sh $(PLATFORM) $(ARCH)
 
 client-deps: ## Install client dependencies
-	pnpm install
+	yarn
 
 tidy: ## Tidy up the go.mod file
 	@go mod tidy
@@ -67,7 +67,7 @@ clean: ## Remove all build and download artifacts
 test: test-server test-client ## Run all tests
 
 test-client: ## Run client tests
-	pnpm run test $(ARGS) --coverage
+	yarn test $(ARGS) --coverage
 
 test-server:	## Run server tests
 	$(GOTESTSUM) --format pkgname-and-test-fails --format-hide-empty-pkg --hide-summary skipped -- -cover -covermode=atomic -coverprofile=coverage.out ./...
@@ -79,7 +79,7 @@ dev: ## Run both the client and server in development mode
 	make dev-client
 
 dev-client: ## Run the client in development mode
-	pnpm run dev
+	yarn dev
 
 dev-server: build-server ## Run the server in development mode
 	@./dev/run_container.sh
@@ -93,7 +93,7 @@ dev-server-podman: build-server ## Run the server in development mode
 format: format-client format-server ## Format all code
 
 format-client: ## Format client code
-	pnpm run format
+	yarn format
 
 format-server: ## Format server code
 	go fmt ./...
@@ -103,9 +103,9 @@ format-server: ## Format server code
 lint: lint-client lint-server ## Lint all code
 
 lint-client: ## Lint client code
-	pnpm run lint
+	yarn lint
 
-lint-server: tidy ## Lint server code
+lint-server: ## Lint server code
 	golangci-lint run --timeout=10m -c .golangci.yaml
 
 
@@ -118,12 +118,11 @@ dev-extension: build-server build-client ## Run the extension in development mod
 ##@ Docs
 .PHONY: docs-build docs-validate docs-clean docs-validate-clean
 docs-build: init-dist ## Build docs
-	go mod download -x
 	cd api && $(SWAG) init -o "../dist/docs" -ot "yaml" -g ./http/handler/handler.go --parseDependency --parseInternal --parseDepth 2 -p pascalcase --markdownFiles ./
 
 docs-validate: docs-build ## Validate docs
-	pnpm swagger2openapi --warnOnly dist/docs/swagger.yaml -o dist/docs/openapi.yaml
-	pnpm swagger-cli validate dist/docs/openapi.yaml
+	yarn swagger2openapi --warnOnly dist/docs/swagger.yaml -o dist/docs/openapi.yaml
+	yarn swagger-cli validate dist/docs/openapi.yaml
 
 ##@ Helpers
 .PHONY: help

api/cmd/portainer/main.go

@@ -630,7 +630,7 @@ func main() {
 			Str("build_number", build.BuildNumber).
 			Str("image_tag", build.ImageTag).
 			Str("nodejs_version", build.NodejsVersion).
-			Str("pnpm_version", build.PnpmVersion).
+			Str("yarn_version", build.YarnVersion).
 			Str("webpack_version", build.WebpackVersion).
 			Str("go_version", build.GoVersion).
 			Msg("starting Portainer")

api/datastore/test_data/output_24_to_latest.json

@@ -615,7 +615,7 @@
       "RequiredPasswordLength": 12
     },
     "KubeconfigExpiry": "0",
-    "KubectlShellImage": "portainer/kubectl-shell:2.33.7",
+    "KubectlShellImage": "portainer/kubectl-shell:2.33.5",
     "LDAPSettings": {
       "AnonymousMode": true,
       "AutoCreateUsers": true,
@@ -944,7 +944,7 @@
     }
   ],
   "version": {
-    "VERSION": "{\"SchemaVersion\":\"2.33.7\",\"MigratorCount\":0,\"Edition\":1,\"InstanceID\":\"463d5c47-0ea5-4aca-85b1-405ceefee254\"}"
+    "VERSION": "{\"SchemaVersion\":\"2.33.5\",\"MigratorCount\":0,\"Edition\":1,\"InstanceID\":\"463d5c47-0ea5-4aca-85b1-405ceefee254\"}"
   },
   "webhooks": null
 }

api/exec/swarm_stack.go

@@ -183,7 +183,7 @@ func (manager *SwarmStackManager) prepareDockerCommandAndArgs(binaryPath, config
 		if !endpoint.TLSConfig.TLSSkipVerify {
 			args = append(args, "--tlsverify", "--tlscacert", endpoint.TLSConfig.TLSCACertPath)
 		} else {
-			args = append(args, "--tlscacert", "")
+			args = append(args, "--tlscacert", "''")
 		}
 
 		if endpoint.TLSConfig.TLSCertPath != "" && endpoint.TLSConfig.TLSKeyPath != "" {

api/exec/swarm_stack_test.go

@@ -3,9 +3,7 @@ package exec
 import (
 	"testing"
 
-	portainer "github.com/portainer/portainer/api"
 	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
 )
 
 func TestConfigFilePaths(t *testing.T) {
@@ -15,29 +13,3 @@ func TestConfigFilePaths(t *testing.T) {
 	output := configureFilePaths(args, filePaths)
 	assert.ElementsMatch(t, expected, output, "wrong output file paths")
 }
-
-func TestPrepareDockerCommandAndArgs(t *testing.T) {
-	binaryPath := "/test/dist"
-	configPath := "/test/config"
-	manager := &SwarmStackManager{
-		binaryPath: binaryPath,
-		configPath: configPath,
-	}
-
-	endpoint := &portainer.Endpoint{
-		URL: "tcp://test:9000",
-		TLSConfig: portainer.TLSConfiguration{
-			TLS:           true,
-			TLSSkipVerify: true,
-		},
-	}
-
-	command, args, err := manager.prepareDockerCommandAndArgs(binaryPath, configPath, endpoint)
-	require.NoError(t, err)
-
-	expectedCommand := "/test/dist/docker"
-	expectedArgs := []string{"--config", "/test/config", "-H", "tcp://test:9000", "--tls", "--tlscacert", ""}
-
-	require.Equal(t, expectedCommand, command)
-	require.Equal(t, expectedArgs, args)
-}

api/filesystem/serialize.go

@@ -167,21 +167,3 @@ func DecodeDirEntries(dirEntries []DirEntry) error {
 
 	return nil
 }
-
-// GetDirEntriesByFilenames returns the dir entries that are files and match the provided filenames
-func GetDirEntriesByFilenames(dirEntries []DirEntry, names []string) []DirEntry {
-	var filteredDirEntries []DirEntry
-
-	for _, dirEntry := range dirEntries {
-		if !dirEntry.IsFile {
-			continue
-		}
-		for _, name := range names {
-			if dirEntry.Name == name {
-				filteredDirEntries = append(filteredDirEntries, dirEntry)
-			}
-		}
-	}
-
-	return filteredDirEntries
-}

api/filesystem/serialize_per_dev_configs.go

@@ -30,20 +30,6 @@ func MultiFilterDirForPerDevConfigs(dirEntries []DirEntry, configPath string, mu
 	return deduplicate(filteredDirEntries), envFiles
 }
 
-// MultiFilterDirForPerDevConfigsWithDefaults filers the given dirEntries with multiple filter args, returns the merged entries for the given device
-// and always includes the defaultFilenames
-func MultiFilterDirForPerDevConfigsWithDefaults(dirEntries []DirEntry, configPath string, multiFilterArgs MultiFilterArgs, defaultFilenames []string) ([]DirEntry, []string) {
-
-	filteredDirEntries, envFiles := MultiFilterDirForPerDevConfigs(dirEntries, configPath, multiFilterArgs)
-
-	// Add files that should always be included
-	// e.g. entrypoint files
-	defaultDirEntries := GetDirEntriesByFilenames(dirEntries, defaultFilenames)
-	filteredDirEntries = append(filteredDirEntries, defaultDirEntries...)
-
-	return deduplicate(filteredDirEntries), envFiles
-}
-
 func deduplicate(dirEntries []DirEntry) []DirEntry {
 	var deduplicatedDirEntries []DirEntry
 

api/filesystem/serialize_per_dev_configs_test.go

@@ -49,11 +49,8 @@ func TestMultiFilterDirForPerDevConfigs(t *testing.T) {
 	f(
 		baseDirEntries,
 		"configs",
-		MultiFilterArgs{
-			{"file1", portainer.PerDevConfigsTypeFile},
-			{"folder1", portainer.PerDevConfigsTypeDir},
-		},
-		[]DirEntry{baseDirEntries[0], baseDirEntries[1], baseDirEntries[2], baseDirEntries[3], baseDirEntries[5], baseDirEntries[6]},
+		MultiFilterArgs{{"folder1", portainer.PerDevConfigsTypeDir}},
+		[]DirEntry{baseDirEntries[0], baseDirEntries[1], baseDirEntries[2], baseDirEntries[5], baseDirEntries[6]},
 	)
 
 	// Filter file1 and file2
@@ -79,106 +76,6 @@ func TestMultiFilterDirForPerDevConfigs(t *testing.T) {
 	)
 }
 
-func TestMultiFilterDirForPerDevConfigsWithDefaults(t *testing.T) {
-	f := func(dirEntries []DirEntry, configPath string, multiFilterArgs MultiFilterArgs, defaultFilenames []string, wantDirEntries []DirEntry) {
-		t.Helper()
-
-		dirEntries, _ = MultiFilterDirForPerDevConfigsWithDefaults(dirEntries, configPath, multiFilterArgs, defaultFilenames)
-		require.Equal(t, wantDirEntries, dirEntries)
-	}
-
-	baseDirEntries := []DirEntry{
-		{".env", "", true, 420},
-		{"docker-compose.yaml", "", true, 420},
-		{"configs", "", false, 420},
-		{"configs/file1.conf", "", true, 420},
-		{"configs/file2.conf", "", true, 420},
-		{"configs/folder1", "", false, 420},
-		{"configs/folder1/config1", "", true, 420},
-		{"configs/folder2", "", false, 420},
-		{"configs/folder2/config2", "", true, 420},
-		{"configs/docker-compose-2.yaml", "", true, 420},
-		{"configs/folder2/docker-compose-3.yaml", "", true, 420},
-	}
-
-	// Filter file1
-	f(
-		baseDirEntries,
-		"configs",
-		MultiFilterArgs{{"file1", portainer.PerDevConfigsTypeFile}},
-		nil,
-		[]DirEntry{baseDirEntries[0], baseDirEntries[1], baseDirEntries[2], baseDirEntries[3]},
-	)
-
-	// Filter folder1
-	f(
-		baseDirEntries,
-		"configs",
-		MultiFilterArgs{{"folder1", portainer.PerDevConfigsTypeDir}},
-		nil,
-		[]DirEntry{baseDirEntries[0], baseDirEntries[1], baseDirEntries[2], baseDirEntries[5], baseDirEntries[6]},
-	)
-
-	// Filter file1 and folder1
-	f(
-		baseDirEntries,
-		"configs",
-		MultiFilterArgs{
-			{"file1", portainer.PerDevConfigsTypeFile},
-			{"folder1", portainer.PerDevConfigsTypeDir},
-		},
-		nil,
-		[]DirEntry{baseDirEntries[0], baseDirEntries[1], baseDirEntries[2], baseDirEntries[3], baseDirEntries[5], baseDirEntries[6]},
-	)
-
-	// Filter file1 and file2
-	f(
-		baseDirEntries,
-		"configs",
-		MultiFilterArgs{
-			{"file1", portainer.PerDevConfigsTypeFile},
-			{"file2", portainer.PerDevConfigsTypeFile},
-		},
-		nil,
-		[]DirEntry{baseDirEntries[0], baseDirEntries[1], baseDirEntries[2], baseDirEntries[3], baseDirEntries[4]},
-	)
-
-	// Filter folder1 and folder2
-	f(
-		baseDirEntries,
-		"configs",
-		MultiFilterArgs{
-			{"folder1", portainer.PerDevConfigsTypeDir},
-			{"folder2", portainer.PerDevConfigsTypeDir},
-		},
-		nil,
-		[]DirEntry{baseDirEntries[0], baseDirEntries[1], baseDirEntries[2], baseDirEntries[5], baseDirEntries[6], baseDirEntries[7], baseDirEntries[8], baseDirEntries[10]},
-	)
-
-	// Filter file1 and folder1 and docker-compose-2.yaml
-	f(
-		baseDirEntries,
-		"configs",
-		MultiFilterArgs{
-			{"file1", portainer.PerDevConfigsTypeFile},
-			{"folder1", portainer.PerDevConfigsTypeDir},
-		},
-		[]string{"configs/docker-compose-2.yaml"},
-		[]DirEntry{baseDirEntries[0], baseDirEntries[1], baseDirEntries[2], baseDirEntries[3], baseDirEntries[5], baseDirEntries[6], baseDirEntries[9]},
-	)
-
-	// Filter file1 and docker-compose-3.yaml
-	f(
-		baseDirEntries,
-		"configs",
-		MultiFilterArgs{
-			{"file1", portainer.PerDevConfigsTypeFile},
-		},
-		[]string{"configs/folder2/docker-compose-3.yaml"},
-		[]DirEntry{baseDirEntries[0], baseDirEntries[1], baseDirEntries[2], baseDirEntries[3], baseDirEntries[10]},
-	)
-}
-
 func TestMultiFilterDirForPerDevConfigsEnvFiles(t *testing.T) {
 	f := func(dirEntries []DirEntry, configPath string, multiFilterArgs MultiFilterArgs, wantEnvFiles []string) {
 		t.Helper()

api/http/handler/edgegroups/edgegroup_create.go

@@ -77,7 +77,8 @@ func (handler *Handler) edgeGroupCreate(w http.ResponseWriter, r *http.Request)
 		return httperror.BadRequest("Invalid request payload", err)
 	}
 
-	var shadowEdgeGroup shadowedEdgeGroup
+	var edgeGroup *portainer.EdgeGroup
+
 	err := handler.DataStore.UpdateTx(func(tx dataservices.DataStoreTx) error {
 		edgeGroups, err := tx.EdgeGroup().ReadAll()
 		if err != nil {
@@ -90,7 +91,7 @@ func (handler *Handler) edgeGroupCreate(w http.ResponseWriter, r *http.Request)
 			}
 		}
 
-		edgeGroup := &portainer.EdgeGroup{
+		edgeGroup = &portainer.EdgeGroup{
 			Name:         payload.Name,
 			Dynamic:      payload.Dynamic,
 			TagIDs:       []portainer.TagID{},
@@ -107,10 +108,8 @@ func (handler *Handler) edgeGroupCreate(w http.ResponseWriter, r *http.Request)
 			return httperror.InternalServerError("Unable to persist the Edge group inside the database", err)
 		}
 
-		shadowEdgeGroup = shadowedEdgeGroup{EdgeGroup: *edgeGroup}
-
 		return nil
 	})
 
-	return txResponse(w, shadowEdgeGroup, err)
+	return txResponse(w, shadowedEdgeGroup{EdgeGroup: *edgeGroup}, err)
 }

api/http/handler/edgegroups/edgegroup_create_test.go

@@ -60,22 +60,3 @@ func TestEdgeGroupCreateHandler(t *testing.T) {
 
 	require.ElementsMatch(t, []portainer.EndpointID{1, 2, 3}, responseGroup.Endpoints)
 }
-
-func TestEdgeGroupCreatePanic(t *testing.T) {
-	_, store := datastore.MustNewTestStore(t, true, true)
-
-	handler := NewHandler(testhelpers.NewTestRequestBouncer())
-	handler.DataStore = store
-
-	err := store.EdgeGroup().Create(&portainer.EdgeGroup{ID: 1, Name: "New Edge Group"})
-	require.NoError(t, err)
-
-	rr := httptest.NewRecorder()
-	req := httptest.NewRequest(http.MethodPost,
-		"/edge_groups",
-		strings.NewReader(`{"Name": "New Edge Group", "Endpoints": [1, 2, 3]}`),
-	)
-
-	handler.ServeHTTP(rr, req)
-	require.Equal(t, http.StatusBadRequest, rr.Result().StatusCode)
-}

api/http/handler/edgegroups/edgegroup_inspect.go

@@ -28,21 +28,15 @@ func (handler *Handler) edgeGroupInspect(w http.ResponseWriter, r *http.Request)
 		return httperror.BadRequest("Invalid Edge group identifier route variable", err)
 	}
 
-	var shadowEdgeGroup shadowedEdgeGroup
+	var edgeGroup *portainer.EdgeGroup
 	err = handler.DataStore.ViewTx(func(tx dataservices.DataStoreTx) error {
-		edgeGroup, err := getEdgeGroup(tx, portainer.EdgeGroupID(edgeGroupID))
-		if err != nil {
-			return err
-		}
-
-		edgeGroup.Endpoints = edgeGroup.EndpointIDs.ToSlice()
-
-		shadowEdgeGroup = shadowedEdgeGroup{EdgeGroup: *edgeGroup}
-
-		return nil
+		edgeGroup, err = getEdgeGroup(tx, portainer.EdgeGroupID(edgeGroupID))
+		return err
 	})
 
-	return txResponse(w, shadowEdgeGroup, err)
+	edgeGroup.Endpoints = edgeGroup.EndpointIDs.ToSlice()
+
+	return txResponse(w, shadowedEdgeGroup{EdgeGroup: *edgeGroup}, err)
 }
 
 func getEdgeGroup(tx dataservices.DataStoreTx, ID portainer.EdgeGroupID) (*portainer.EdgeGroup, error) {

api/http/handler/edgegroups/edgegroup_inspect_test.go

@@ -174,16 +174,3 @@ func TestDynamicEdgeGroupInspectHandler(t *testing.T) {
 
 	require.ElementsMatch(t, []portainer.EndpointID{1, 2, 3}, responseGroup.Endpoints)
 }
-
-func TestEdgeGroupInspectPanic(t *testing.T) {
-	_, store := datastore.MustNewTestStore(t, true, true)
-
-	handler := NewHandler(testhelpers.NewTestRequestBouncer())
-	handler.DataStore = store
-
-	rr := httptest.NewRecorder()
-	req := httptest.NewRequest(http.MethodGet, "/edge_groups/1", nil)
-
-	handler.ServeHTTP(rr, req)
-	require.Equal(t, http.StatusNotFound, rr.Result().StatusCode)
-}

api/http/handler/edgegroups/edgegroup_update.go

@@ -56,9 +56,9 @@ func (handler *Handler) edgeGroupUpdate(w http.ResponseWriter, r *http.Request)
 		return httperror.BadRequest("Invalid request payload", err)
 	}
 
-	var shadowEdgeGroup shadowedEdgeGroup
+	var edgeGroup *portainer.EdgeGroup
 	err = handler.DataStore.UpdateTx(func(tx dataservices.DataStoreTx) error {
-		edgeGroup, err := tx.EdgeGroup().Read(portainer.EdgeGroupID(edgeGroupID))
+		edgeGroup, err = tx.EdgeGroup().Read(portainer.EdgeGroupID(edgeGroupID))
 		if handler.DataStore.IsErrObjectNotFound(err) {
 			return httperror.NotFound("Unable to find an Edge group with the specified identifier inside the database", err)
 		} else if err != nil {
@@ -155,12 +155,10 @@ func (handler *Handler) edgeGroupUpdate(w http.ResponseWriter, r *http.Request)
 			}
 		}
 
-		shadowEdgeGroup = shadowedEdgeGroup{EdgeGroup: *edgeGroup}
-
 		return nil
 	})
 
-	return txResponse(w, shadowEdgeGroup, err)
+	return txResponse(w, shadowedEdgeGroup{EdgeGroup: *edgeGroup}, err)
 }
 
 func (handler *Handler) updateEndpointStacks(tx dataservices.DataStoreTx, endpoint *portainer.Endpoint, edgeGroups []portainer.EdgeGroup, edgeStacks []portainer.EdgeStack) error {

api/http/handler/edgegroups/edgegroup_update_test.go

@@ -68,16 +68,3 @@ func TestEdgeGroupUpdateHandler(t *testing.T) {
 
 	require.ElementsMatch(t, []portainer.EndpointID{1, 2, 3}, responseGroup.Endpoints)
 }
-
-func TestEdgeGroupUpdatePanic(t *testing.T) {
-	_, store := datastore.MustNewTestStore(t, true, true)
-
-	handler := NewHandler(testhelpers.NewTestRequestBouncer())
-	handler.DataStore = store
-
-	rr := httptest.NewRecorder()
-	req := httptest.NewRequest(http.MethodPut, "/edge_groups/1", strings.NewReader("{}"))
-
-	handler.ServeHTTP(rr, req)
-	require.Equal(t, http.StatusNotFound, rr.Result().StatusCode)
-}

api/http/handler/edgestacks/edgestack_status_update.go

@@ -74,7 +74,7 @@ func (handler *Handler) edgeStackStatusUpdate(w http.ResponseWriter, r *http.Req
 	}
 
 	if err := handler.requestBouncer.AuthorizedEdgeEndpointOperation(r, endpoint); err != nil {
-		return httperror.Forbidden("Permission denied to access environment", fmt.Errorf("unauthorized edge endpoint operation: %w. Environment ID: %d", err, payload.EndpointID))
+		return httperror.Forbidden("Permission denied to access environment", fmt.Errorf("unauthorized edge endpoint operation: %w. Environment name: %s", err, endpoint.Name))
 	}
 
 	var stack *portainer.EdgeStack

api/http/handler/endpointedge/endpointedge_job_logs.go

@@ -42,17 +42,17 @@ func (handler *Handler) endpointEdgeJobsLogs(w http.ResponseWriter, r *http.Requ
 	}
 
 	if err := handler.requestBouncer.AuthorizedEdgeEndpointOperation(r, endpoint); err != nil {
-		return httperror.Forbidden("Permission denied to access environment", fmt.Errorf("unauthorized edge endpoint operation: %w. Environment ID: %d", err, endpoint.ID))
+		return httperror.Forbidden("Permission denied to access environment", fmt.Errorf("unauthorized edge endpoint operation: %w. Environment name: %s", err, endpoint.Name))
 	}
 
 	edgeJobID, err := request.RetrieveNumericRouteVariableValue(r, "jobID")
 	if err != nil {
-		return httperror.BadRequest("Invalid edge job identifier route variable", fmt.Errorf("invalid Edge job route variable: %w. Environment ID: %d", err, endpoint.ID))
+		return httperror.BadRequest("Invalid edge job identifier route variable", fmt.Errorf("invalid Edge job route variable: %w. Environment name: %s", err, endpoint.Name))
 	}
 
 	var payload logsPayload
 	if err := request.DecodeAndValidateJSONPayload(r, &payload); err != nil {
-		return httperror.BadRequest("Invalid request payload", fmt.Errorf("invalid Edge job request payload: %w. Environment ID: %d", err, endpoint.ID))
+		return httperror.BadRequest("Invalid request payload", fmt.Errorf("invalid Edge job request payload: %w. Environment name: %s", err, endpoint.Name))
 	}
 
 	if err := handler.DataStore.UpdateTx(func(tx dataservices.DataStoreTx) error {
@@ -60,11 +60,11 @@ func (handler *Handler) endpointEdgeJobsLogs(w http.ResponseWriter, r *http.Requ
 	}); err != nil {
 		var httpErr *httperror.HandlerError
 		if errors.As(err, &httpErr) {
-			httpErr.Err = fmt.Errorf("edge polling error: %w. Environment ID: %d", httpErr.Err, endpoint.ID)
+			httpErr.Err = fmt.Errorf("edge polling error: %w. Environment name: %s", httpErr.Err, endpoint.Name)
 			return httpErr
 		}
 
-		return httperror.InternalServerError("Unexpected error", fmt.Errorf("edge polling error: %w. Environment ID: %d", err, endpoint.ID))
+		return httperror.InternalServerError("Unexpected error", fmt.Errorf("edge polling error: %w. Environment name: %s", err, endpoint.Name))
 	}
 
 	return response.JSON(w, nil)

api/http/handler/endpointedge/endpointedge_stack_inspect.go

@@ -40,18 +40,18 @@ func (handler *Handler) endpointEdgeStackInspect(w http.ResponseWriter, r *http.
 	}
 
 	if err := handler.requestBouncer.AuthorizedEdgeEndpointOperation(r, endpoint); err != nil {
-		return httperror.Forbidden("Permission denied to access environment", fmt.Errorf("unauthorized edge endpoint operation: %w. Environment ID: %d", err, endpoint.ID))
+		return httperror.Forbidden("Permission denied to access environment", fmt.Errorf("unauthorized edge endpoint operation: %w. Environment name: %s", err, endpoint.Name))
 	}
 
 	edgeStackID, err := request.RetrieveNumericRouteVariableValue(r, "stackId")
 	if err != nil {
-		return httperror.BadRequest("Invalid edge stack identifier route variable", fmt.Errorf("invalid Edge stack route variable: %w. Environment ID: %d", err, endpoint.ID))
+		return httperror.BadRequest("Invalid edge stack identifier route variable", fmt.Errorf("invalid Edge stack route variable: %w. Environment name: %s", err, endpoint.Name))
 	}
 
 	s, err, _ := edgeStackSingleFlightGroup.Do(strconv.Itoa(edgeStackID), func() (any, error) {
 		edgeStack, err := handler.DataStore.EdgeStack().EdgeStack(portainer.EdgeStackID(edgeStackID))
 		if handler.DataStore.IsErrObjectNotFound(err) {
-			return nil, httperror.NotFound("Unable to find an edge stack with the specified identifier inside the database", fmt.Errorf("unable to find the Edge stack from database: %w. Environment ID: %d", err, endpoint.ID))
+			return nil, httperror.NotFound("Unable to find an edge stack with the specified identifier inside the database", fmt.Errorf("unable to find the Edge stack from database: %w. Environment name: %s", err, endpoint.Name))
 		}
 
 		return edgeStack, err
@@ -62,7 +62,7 @@ func (handler *Handler) endpointEdgeStackInspect(w http.ResponseWriter, r *http.
 			return httpErr
 		}
 
-		return httperror.InternalServerError("Unable to find an edge stack with the specified identifier inside the database", fmt.Errorf("failed to find Edge stack from the database: %w. Environment ID: %d", err, endpoint.ID))
+		return httperror.InternalServerError("Unable to find an edge stack with the specified identifier inside the database", fmt.Errorf("failed to find Edge stack from the database: %w. Environment name: %s", err, endpoint.Name))
 	}
 
 	// WARNING: this variable must not be mutated
@@ -71,7 +71,7 @@ func (handler *Handler) endpointEdgeStackInspect(w http.ResponseWriter, r *http.
 	fileName := edgeStack.EntryPoint
 	if endpointutils.IsDockerEndpoint(endpoint) {
 		if fileName == "" {
-			return httperror.BadRequest("Docker is not supported by this stack", fmt.Errorf("no filename is provided for the Docker endpoint. Environment ID: %d", endpoint.ID))
+			return httperror.BadRequest("Docker is not supported by this stack", fmt.Errorf("no filename is provided for the Docker endpoint. Environment name: %s", endpoint.Name))
 		}
 	}
 
@@ -84,18 +84,18 @@ func (handler *Handler) endpointEdgeStackInspect(w http.ResponseWriter, r *http.
 		fileName = edgeStack.ManifestPath
 
 		if fileName == "" {
-			return httperror.BadRequest("Kubernetes is not supported by this stack", fmt.Errorf("no filename is provided for the Kubernetes endpoint. Environment ID: %d", endpoint.ID))
+			return httperror.BadRequest("Kubernetes is not supported by this stack", fmt.Errorf("no filename is provided for the Kubernetes endpoint. Environment name: %s", endpoint.Name))
 		}
 	}
 
 	dirEntries, err := filesystem.LoadDir(edgeStack.ProjectPath)
 	if err != nil {
-		return httperror.InternalServerError("Unable to load repository", fmt.Errorf("failed to load project directory: %w. Environment ID: %d", err, endpoint.ID))
+		return httperror.InternalServerError("Unable to load repository", fmt.Errorf("failed to load project directory: %w. Environment name: %s", err, endpoint.Name))
 	}
 
 	fileContent, err := filesystem.FilterDirForCompatibility(dirEntries, fileName, endpoint.Agent.Version)
 	if err != nil {
-		return httperror.InternalServerError("File not found", fmt.Errorf("unable to find file: %w. Environment ID: %d", err, endpoint.ID))
+		return httperror.InternalServerError("File not found", fmt.Errorf("unable to find file: %w. Environment name: %s", err, endpoint.Name))
 	}
 
 	dirEntries = filesystem.FilterDirForEntryFile(dirEntries, fileName)

api/http/handler/endpointedge/endpointedge_status_inspect.go

@@ -97,13 +97,13 @@ func (handler *Handler) endpointEdgeStatusInspect(w http.ResponseWriter, r *http
 	firstConn := endpoint.LastCheckInDate == 0
 
 	if err := handler.requestBouncer.AuthorizedEdgeEndpointOperation(r, endpoint); err != nil {
-		return httperror.Forbidden("Permission denied to access environment. The device has not been trusted yet", fmt.Errorf("unauthorized Edge endpoint operation: %w. Environment ID: %d", err, endpoint.ID))
+		return httperror.Forbidden("Permission denied to access environment. The device has not been trusted yet", fmt.Errorf("unauthorized Edge endpoint operation: %w. Environment name: %s", err, endpoint.Name))
 	}
 
 	handler.DataStore.Endpoint().UpdateHeartbeat(endpoint.ID)
 
 	if err := handler.requestBouncer.TrustedEdgeEnvironmentAccess(handler.DataStore, endpoint); err != nil {
-		return httperror.Forbidden("Permission denied to access environment. The device has not been trusted yet", fmt.Errorf("untrusted Edge environment access: %w. Environment ID: %d", err, endpoint.ID))
+		return httperror.Forbidden("Permission denied to access environment. The device has not been trusted yet", fmt.Errorf("untrusted Edge environment access: %w. Environment name: %s", err, endpoint.Name))
 	}
 
 	var statusResponse *endpointEdgeStatusInspectResponse
@@ -113,11 +113,11 @@ func (handler *Handler) endpointEdgeStatusInspect(w http.ResponseWriter, r *http
 	}); err != nil {
 		var httpErr *httperror.HandlerError
 		if errors.As(err, &httpErr) {
-			httpErr.Err = fmt.Errorf("edge polling error: %w. Environment ID: %d", httpErr.Err, endpoint.ID)
+			httpErr.Err = fmt.Errorf("edge polling error: %w. Environment name: %s", httpErr.Err, endpoint.Name)
 			return httpErr
 		}
 
-		return httperror.InternalServerError("Unexpected error", fmt.Errorf("edge polling error: %w. Environment ID: %d", err, endpoint.ID))
+		return httperror.InternalServerError("Unexpected error", fmt.Errorf("edge polling error: %w. Environment name: %s", err, endpoint.Name))
 	}
 
 	return cacheResponse(w, endpoint.ID, *statusResponse)

api/http/handler/handler.go

@@ -81,7 +81,7 @@ type Handler struct {
 }
 
 // @title PortainerCE API
-// @version 2.33.7
+// @version 2.33.5
 // @description.markdown api-description.md
 // @termsOfService
 

api/http/handler/stacks/stack_start.go

@@ -161,13 +161,7 @@ func (handler *Handler) startStack(
 			return handler.StackDeployer.StartRemoteComposeStack(stack, endpoint, filteredRegistries)
 		}
 
-		options := portainer.ComposeUpOptions{
-			ComposeOptions: portainer.ComposeOptions{
-				Registries: filteredRegistries,
-			},
-		}
-
-		return handler.ComposeStackManager.Up(context.TODO(), stack, endpoint, options)
+		return handler.ComposeStackManager.Up(context.TODO(), stack, endpoint, portainer.ComposeUpOptions{})
 	case portainer.DockerSwarmStack:
 		stack.Name = handler.SwarmStackManager.NormalizeStackName(stack.Name)
 

api/portainer.go

@@ -1782,7 +1782,7 @@ type (
 
 const (
 	// APIVersion is the version number of the Portainer API
-	APIVersion = "2.33.7"
+	APIVersion = "2.33.5"
 	// Support annotation for the API version ("STS" for Short-Term Support or "LTS" for Long-Term Support)
 	APIVersionSupport = "LTS"
 	// Edition is what this edition of Portainer is called

api/stacks/deployments/deployer_remote.go

@@ -55,11 +55,12 @@ func (d *stackDeployer) DeployRemoteComposeStack(
 	d.lock.Lock()
 	defer d.lock.Unlock()
 
-	options := portainer.ComposeOptions{Registries: registries}
+	d.swarmStackManager.Login(registries, endpoint)
+	defer d.swarmStackManager.Logout(endpoint)
 
 	// --force-recreate doesn't pull updated images
 	if forcePullImage {
-		if err := d.composeStackManager.Pull(context.TODO(), stack, endpoint, options); err != nil {
+		if err := d.composeStackManager.Pull(context.TODO(), stack, endpoint, portainer.ComposeOptions{}); err != nil {
 			return err
 		}
 	}

app/docker/views/services/edit/serviceController.js

@@ -720,7 +720,7 @@ angular.module('portainer.docker').controller('ServiceController', [
 
     $scope.onResetPorts = function (all = false) {
       $scope.$evalAsync(() => {
-        $scope.formValues.ports = portsMappingUtils.toViewModel($scope.service.Model.Spec.EndpointSpec?.Ports);
+        $scope.formValues.ports = portsMappingUtils.toViewModel($scope.service.Model.Spec.EndpointSpec.Ports);
 
         $scope.cancelChanges($scope.service, all ? undefined : ['Ports']);
       });
@@ -744,7 +744,7 @@ angular.module('portainer.docker').controller('ServiceController', [
             $scope.lastVersion = service.Version;
           }
 
-          $scope.formValues.ports = portsMappingUtils.toViewModel(service.Model.Spec.EndpointSpec?.Ports);
+          $scope.formValues.ports = portsMappingUtils.toViewModel(service.Model.Spec.EndpointSpec.Ports);
 
           transformResources(service);
           translateServiceArrays(service);

app/react/components/datatables/TableHeaderRow.tsx

@@ -1,4 +1,4 @@
-import { Header, flexRender, ColumnMeta } from '@tanstack/react-table';
+import { Header, flexRender } from '@tanstack/react-table';
 
 import { filterHOC } from './Filter';
 import { TableHeaderCell } from './TableHeaderCell';
@@ -17,9 +17,9 @@ export function TableHeaderRow<D extends DefaultType = DefaultType>({
     <tr>
       {headers.map((header) => {
         const sortDirection = header.column.getIsSorted();
-        const { className, filter, width } = parseMeta(
-          header.column.columnDef.meta
-        );
+        const {
+          meta: { className, width } = { className: '', width: undefined },
+        } = header.column.columnDef;
 
         return (
           <TableHeaderCell
@@ -43,9 +43,13 @@ export function TableHeaderRow<D extends DefaultType = DefaultType>({
             renderFilter={
               header.column.getCanFilter()
                 ? () =>
-                    flexRender(filter, {
-                      column: header.column,
-                    })
+                    flexRender(
+                      header.column.columnDef.meta?.filter ||
+                        filterHOC('Filter'),
+                      {
+                        column: header.column,
+                      }
+                    )
                 : undefined
             }
           />
@@ -54,28 +58,3 @@ export function TableHeaderRow<D extends DefaultType = DefaultType>({
     </tr>
   );
 }
-
-function parseMeta<D extends DefaultType = DefaultType>(
-  meta: ColumnMeta<D, unknown> | undefined
-) {
-  if (!meta) {
-    return {
-      className: '',
-      width: undefined,
-      filter: filterHOC('Filter'),
-    };
-  }
-
-  const className =
-    'className' in meta && typeof meta.className === 'string'
-      ? meta.className
-      : undefined;
-  const width =
-    'width' in meta && typeof meta.width === 'string' ? meta.width : undefined;
-  const filter =
-    'filter' in meta && typeof meta.filter === 'function'
-      ? meta.filter
-      : filterHOC('Filter');
-
-  return { className, width, filter };
-}

app/react/components/datatables/TableRow.tsx

@@ -1,4 +1,4 @@
-import { Cell, ColumnMeta, flexRender } from '@tanstack/react-table';
+import { Cell, flexRender } from '@tanstack/react-table';
 import clsx from 'clsx';
 
 import { DefaultType } from './types';
@@ -20,18 +20,10 @@ export function TableRow<D extends DefaultType = DefaultType>({
       onClick={onClick}
     >
       {cells.map((cell) => (
-        <td key={cell.id} className={getClassName(cell.column.columnDef.meta)}>
+        <td key={cell.id} className={cell.column.columnDef.meta?.className}>
           {flexRender(cell.column.columnDef.cell, cell.getContext())}
         </td>
       ))}
     </tr>
   );
 }
-
-function getClassName<D extends DefaultType = DefaultType>(
-  meta: ColumnMeta<D, unknown> | undefined
-) {
-  return !!meta && 'className' in meta && typeof meta.className === 'string'
-    ? meta.className
-    : '';
-}

app/react/docker/components/FilesTable/types.ts

@@ -22,5 +22,5 @@ export type FilesTableMeta = TableMeta<FileData> & {
 export function isFilesTableMeta(
   meta?: TableMeta<FileData>
 ): meta is FilesTableMeta {
-  return !!meta && 'table' in meta && meta.table === 'files';
+  return !!meta && meta.table === 'files';
 }

app/react/docker/containers/CreateView/NetworkTab/toRequest.test.ts

@@ -1,82 +0,0 @@
-import { describe, it, expect } from 'vitest';
-
-import { CreateContainerRequest } from '../types';
-
-import { toRequest } from './toRequest';
-import { Values } from './types';
-
-describe('toRequest', () => {
-  const mockOldConfig: CreateContainerRequest = {
-    Hostname: 'old-hostname',
-    Domainname: 'old-domain',
-    MacAddress: '02:42:ac:11:00:99',
-    HostConfig: {
-      NetworkMode: 'bridge',
-      Dns: ['1.1.1.1'],
-      ExtraHosts: [],
-    },
-    NetworkingConfig: {
-      EndpointsConfig: {
-        bridge: {
-          Aliases: [],
-        },
-      },
-    },
-  };
-
-  const mockValues: Values = {
-    networkMode: 'bridge',
-    hostname: 'new-hostname',
-    domain: 'new-domain',
-    macAddress: '02:42:ac:11:00:88',
-    ipv4Address: '172.17.0.5',
-    ipv6Address: 'fe80::42:acff:fe11:5',
-    primaryDns: '8.8.8.8',
-    secondaryDns: '8.8.4.4',
-    hostsFileEntries: ['host1:127.0.0.1'],
-    container: '',
-  };
-
-  it('should use MAC address from values, not from oldConfig', () => {
-    const oldMacAddress = '02:42:ac:11:00:99';
-    const macAddress = '02:42:ac:11:00:88';
-    const result = toRequest(
-      { ...mockOldConfig, MacAddress: oldMacAddress },
-      { ...mockValues, macAddress },
-      'container-123'
-    );
-
-    expect(result.MacAddress).toBe(macAddress);
-    expect(result.MacAddress).not.toBe(oldMacAddress);
-  });
-
-  it('should allow empty MAC address when duplicating containers', () => {
-    const valuesWithEmptyMac: Values = {
-      ...mockValues,
-      macAddress: '', // Empty MAC from toViewModel
-    };
-
-    const result = toRequest(
-      mockOldConfig,
-      valuesWithEmptyMac,
-      'container-123'
-    );
-
-    expect(result.MacAddress).toBe('');
-    expect(result.MacAddress).not.toBe(mockOldConfig.MacAddress);
-  });
-
-  it('should set other network properties from values', () => {
-    const result = toRequest(mockOldConfig, mockValues, 'container-123');
-
-    expect(result.Hostname).toBe('new-hostname');
-    expect(result.Domainname).toBe('new-domain');
-    expect(result.HostConfig.NetworkMode).toBe('bridge');
-    expect(result.HostConfig.Dns).toEqual(['8.8.8.8', '8.8.4.4']);
-    expect(result.HostConfig.ExtraHosts).toEqual(['host1:127.0.0.1']);
-    expect(result.NetworkingConfig.EndpointsConfig?.bridge.IPAMConfig).toEqual({
-      IPv4Address: '172.17.0.5',
-      IPv6Address: 'fe80::42:acff:fe11:5',
-    });
-  });
-});

app/react/docker/containers/CreateView/NetworkTab/toViewModel.test.ts

@@ -5,11 +5,7 @@ import { DockerNetwork } from '@/react/docker/networks/types';
 import { ContainerListViewModel } from '../../types';
 import { ContainerDetailsJSON } from '../../queries/useContainer';
 
-import {
-  getDefaultViewModel,
-  getNetworkMode,
-  toViewModel,
-} from './toViewModel';
+import { getDefaultViewModel, getNetworkMode } from './toViewModel';
 
 describe('getDefaultViewModel', () => {
   it('should return the correct default view model for Windows', () => {
@@ -149,86 +145,3 @@ describe('getNetworkMode', () => {
     expect(getNetworkMode(config, mockNetworks)).toEqual(['bridge']);
   });
 });
-
-describe('toViewModel', () => {
-  const mockNetworks: Array<DockerNetwork> = [
-    {
-      Name: 'bridge',
-      Id: 'bridge-id',
-      Driver: 'bridge',
-      Scope: 'local',
-      Attachable: false,
-      Internal: false,
-      IPAM: { Config: [], Driver: '', Options: {} },
-      Options: {},
-      Containers: {},
-    },
-  ];
-
-  it('should copy network settings while clearing mac address', () => {
-    const config: ContainerDetailsJSON = {
-      Config: {
-        Hostname: 'test-host',
-        Domainname: 'test-domain',
-      },
-      HostConfig: {
-        NetworkMode: 'bridge',
-        Dns: ['8.8.8.8', '8.8.4.4'],
-        ExtraHosts: ['host1:127.0.0.1'],
-      },
-      NetworkSettings: {
-        Networks: {
-          bridge: {
-            MacAddress: '02:42:ac:11:00:02',
-            IPAMConfig: {
-              IPv4Address: '172.17.0.2',
-              IPv6Address: 'fe80::42:acff:fe11:2',
-            },
-          },
-        },
-      },
-    };
-
-    const result = toViewModel(config, mockNetworks);
-
-    expect(result.macAddress).toBe('');
-    expect(result.hostname).toBe('test-host');
-    expect(result.domain).toBe('test-domain');
-    expect(result.ipv4Address).toBe('172.17.0.2');
-    expect(result.ipv6Address).toBe('fe80::42:acff:fe11:2');
-  });
-
-  it('should return empty MAC address for new containers', () => {
-    const config: ContainerDetailsJSON = {
-      Config: {},
-      HostConfig: { NetworkMode: 'bridge' },
-    };
-
-    const result = toViewModel(config, mockNetworks);
-
-    expect(result.macAddress).toBe('');
-  });
-
-  it('should not duplicate MAC address when duplicating containers', () => {
-    const config: ContainerDetailsJSON = {
-      Config: {
-        Hostname: 'original-container',
-      },
-      HostConfig: {
-        NetworkMode: 'bridge',
-      },
-      NetworkSettings: {
-        Networks: {
-          bridge: {
-            MacAddress: '02:42:ac:11:00:99',
-          },
-        },
-      },
-    };
-
-    const result = toViewModel(config, mockNetworks);
-
-    expect(result.macAddress).toBe('');
-    expect(result.hostname).toBe('original-container');
-  });
-});

app/react/docker/containers/CreateView/NetworkTab/toViewModel.ts

@@ -53,11 +53,13 @@ export function toViewModel(
     ipv6Address = networkSettings.IPAMConfig.IPv6Address || '';
   }
 
+  const macAddress = networkSettings?.MacAddress || '';
+
   return {
     networkMode,
     hostname: config.Config?.Hostname || '',
     domain: config.Config?.Domainname || '',
-    macAddress: '', // mac address is cleared between edit/duplicate
+    macAddress,
     ipv4Address,
     ipv6Address,
     primaryDns,

app/react/docker/containers/ItemView/ContainerNetworksDatatable/types.ts

@@ -11,5 +11,5 @@ export type ContainerNetworkTableMeta = TableMeta<TableNetwork> & {
 export function isContainerNetworkTableMeta(
   meta?: TableMeta<TableNetwork>
 ): meta is ContainerNetworkTableMeta {
-  return !!meta && 'table' in meta && meta.table === 'container-networks';
+  return !!meta && meta.table === 'container-networks';
 }

app/react/docker/containers/utils.test.ts

@@ -1,174 +0,0 @@
-import { describe, it, expect } from 'vitest';
-
-import { toListViewModel } from './utils';
-import { DockerContainerResponse } from './types/response';
-
-describe('toListViewModel', () => {
-  function createMockResponse(
-    overrides: Partial<DockerContainerResponse> = {}
-  ): DockerContainerResponse {
-    return {
-      Id: 'container123',
-      Names: ['/test-container'],
-      Image: 'nginx:latest',
-      ImageID: 'sha256:abc123',
-      Command: 'nginx -g daemon off;',
-      Created: 1234567890,
-      State: 'running',
-      Status: 'Up 2 hours',
-      Ports: [],
-      Labels: {},
-      SizeRw: 0,
-      SizeRootFs: 0,
-      HostConfig: { NetworkMode: 'bridge' },
-      NetworkSettings: { Networks: {} },
-      Mounts: [],
-      ...overrides,
-    };
-  }
-
-  describe('Names field handling', () => {
-    it('should remove leading slash from container names', () => {
-      const response = createMockResponse({
-        Names: ['/container1', '/container2'],
-      });
-
-      const result = toListViewModel(response);
-
-      expect(result.Names).toEqual(['container1', 'container2']);
-    });
-
-    it('should keep names without leading slash unchanged', () => {
-      const response = createMockResponse({
-        Names: ['container1', 'container2'],
-      });
-
-      const result = toListViewModel(response);
-
-      expect(result.Names).toEqual(['container1', 'container2']);
-    });
-
-    it('should handle mixed names with and without leading slashes', () => {
-      const response = createMockResponse({
-        Names: ['/container1', 'container2', '/container3'],
-      });
-
-      const result = toListViewModel(response);
-
-      expect(result.Names).toEqual(['container1', 'container2', 'container3']);
-    });
-
-    it('should handle empty string names', () => {
-      const response = createMockResponse({
-        Names: [''],
-      });
-
-      const result = toListViewModel(response);
-
-      expect(result.Names).toEqual(['']);
-    });
-
-    it('should handle names that are only a slash', () => {
-      const response = createMockResponse({
-        Names: ['/'],
-      });
-
-      const result = toListViewModel(response);
-
-      expect(result.Names).toEqual(['']);
-    });
-
-    it('should return default empty name when Names is undefined', () => {
-      const response = createMockResponse({
-        Names: undefined,
-      });
-
-      const result = toListViewModel(response);
-
-      expect(result.Names).toEqual(['<empty_name>']);
-    });
-
-    it('should return default empty name when Names is empty array', () => {
-      const response = createMockResponse({
-        Names: [],
-      });
-
-      const result = toListViewModel(response);
-
-      expect(result.Names).toEqual(['<empty_name>']);
-    });
-
-    it('should handle names with multiple leading slashes', () => {
-      const response = createMockResponse({
-        Names: ['//container1', '///container2'],
-      });
-
-      const result = toListViewModel(response);
-
-      // Note: The function only removes the first character if it's a slash
-      expect(result.Names).toEqual(['/container1', '//container2']);
-    });
-
-    it('should handle names with slashes in the middle', () => {
-      const response = createMockResponse({
-        Names: ['/container/name', 'another/container'],
-      });
-
-      const result = toListViewModel(response);
-
-      expect(result.Names).toEqual(['container/name', 'another/container']);
-    });
-  });
-
-  describe('Full integration tests', () => {
-    it('should transform complete response correctly', () => {
-      const response = createMockResponse({
-        Names: ['/my-container'],
-        Status: 'Up 5 minutes',
-        Labels: {
-          'com.docker.compose.project': 'my-stack',
-        },
-        NetworkSettings: {
-          Networks: {
-            bridge: {
-              IPAddress: '172.17.0.2',
-              Gateway: '172.17.0.1',
-            },
-          },
-        },
-        Ports: [
-          {
-            IP: '0.0.0.0',
-            PrivatePort: 80,
-            PublicPort: 8080,
-            Type: 'tcp',
-          },
-        ],
-        Portainer: {
-          ResourceControl: {
-            Id: 1,
-            ResourceId: 'container123',
-            Type: 1,
-            AdministratorsOnly: false,
-            Public: false,
-            System: false,
-            TeamAccesses: [],
-            UserAccesses: [],
-          },
-          Agent: {
-            NodeName: 'node1',
-          },
-        },
-      });
-
-      const result = toListViewModel(response);
-
-      expect(result.Names).toEqual(['my-container']);
-      expect(result.IP).toBe('172.17.0.2');
-      expect(result.StackName).toBe('my-stack');
-      expect(result.NodeName).toBe('node1');
-      expect(result.Ports).toHaveLength(1);
-      expect(result.StatusText).toBe('Up 5 minutes');
-    });
-  });
-});

app/react/docker/containers/utils.ts

@@ -43,15 +43,11 @@ export function toListViewModel(
     )
   );
 
-  let names = response.Names?.map((n) => {
+  const names = response.Names?.map((n) => {
     const nameWithoutSlash = n[0] === '/' ? n.slice(1) : n;
     return nameWithoutSlash;
   });
 
-  if (!names || names.length === 0) {
-    names = ['<empty_name>'];
-  }
-
   return {
     ...response,
     ResourceControl: resourceControl,

app/react/docker/swarm/SwarmView/NodesDatatable/types.ts

@@ -10,5 +10,5 @@ export type TableMeta = BaseTableMeta<NodeViewModel> & {
 export function isTableMeta(
   meta?: BaseTableMeta<NodeViewModel>
 ): meta is TableMeta {
-  return !!meta && 'table' in meta && meta.table === 'nodes';
+  return !!meta && meta.table === 'nodes';
 }

app/react/docker/volumes/ListView/VolumesDatatable/tableMeta.ts

@@ -8,7 +8,7 @@ interface TableMeta {
 }
 
 function isTableMeta(meta: BaseTableMeta<VolumeViewModel>): meta is TableMeta {
-  return !!meta && 'table' in meta && meta.table === 'volumes';
+  return meta.table === 'volumes';
 }
 
 export function getTableMeta(meta?: BaseTableMeta<VolumeViewModel>): TableMeta {

app/react/edge/edge-stacks/ItemView/EditEdgeStackForm/NonGitStackForm.tsx

@@ -76,8 +76,8 @@ export function NonGitStackForm({ edgeStack }: { edgeStack: EdgeStack }) {
     privateRegistryId: edgeStack.Registries?.[0],
     content: fileContent,
     useManifestNamespaces: edgeStack.UseManifestNamespaces,
-    prePullImage: edgeStack.PrePullImage ?? false,
-    retryDeploy: edgeStack.RetryDeploy ?? false,
+    prePullImage: edgeStack.PrePullImage,
+    retryDeploy: edgeStack.RetryDeploy,
     webhookEnabled: !!edgeStack.Webhook,
     envVars: edgeStack.EnvVars || [],
     rollbackTo: undefined,
@@ -119,7 +119,7 @@ export function NonGitStackForm({ edgeStack }: { edgeStack: EdgeStack }) {
 
     const updateVersion = !!(
       fileContent !== values.content ||
-      values.privateRegistryId !== edgeStack.Registries?.[0] ||
+      values.privateRegistryId !== edgeStack.Registries[0] ||
       values.useManifestNamespaces !== edgeStack.UseManifestNamespaces ||
       values.prePullImage !== edgeStack.PrePullImage ||
       values.retryDeploy !== edgeStack.RetryDeploy ||

app/react/edge/edge-stacks/types.ts

@@ -75,37 +75,35 @@ export enum DeploymentType {
   Kubernetes,
 }
 
-export type EdgeStack = Partial<RelativePathModel> & {
+export type EdgeStack = RelativePathModel & {
   Id: number;
   Name: string;
   Status: { [key: EnvironmentId]: EdgeStackStatus };
   CreationDate: number;
   EdgeGroups: Array<EdgeGroup['Id']>;
+  Registries: RegistryId[];
   ProjectPath: string;
   EntryPoint: string;
   Version: number;
   NumDeployments: number;
   ManifestPath: string;
   DeploymentType: DeploymentType;
+  EdgeUpdateID: number;
+  ScheduledTime: string;
   UseManifestNamespaces: boolean;
-} & Partial<{
-    // EE
-    Registries: RegistryId[];
-    EdgeUpdateID: number;
-    ScheduledTime: string;
-    PrePullImage: boolean;
-    RePullImage: boolean;
-    AutoUpdate?: AutoUpdateResponse;
-    GitConfig?: RepoConfigResponse;
-    Prune: boolean;
-    RetryDeploy: boolean;
-    Webhook: string;
-    StackFileVersion?: number;
-    PreviousDeploymentInfo: EdgeStackDeploymentInfo;
-    EnvVars?: EnvVar[];
-    StaggerConfig?: StaggerConfig;
-    SupportRelativePath: boolean;
-    FilesystemPath?: string;
-  }>;
+  PrePullImage: boolean;
+  RePullImage: boolean;
+  AutoUpdate?: AutoUpdateResponse;
+  GitConfig?: RepoConfigResponse;
+  Prune: boolean;
+  RetryDeploy: boolean;
+  Webhook: string;
+  StackFileVersion?: number;
+  PreviousDeploymentInfo: EdgeStackDeploymentInfo;
+  EnvVars?: EnvVar[];
+  StaggerConfig?: StaggerConfig;
+  SupportRelativePath: boolean;
+  FilesystemPath?: string;
+};
 
 export { DeploymentType as EditorType };

app/react/portainer/environments/wizard/EnvironmentsCreationView/WizardKubernetes/WizardKubernetes.test.tsx

@@ -59,8 +59,7 @@ describe('WizardKubernetes', () => {
     ).toBeInTheDocument();
   });
 
-  // Test fails on 2.33 after migration to pnpm. since it works on develop, we skip it here
-  test.skip('submits ContainerEngine as empty string for Kubernetes', async () => {
+  test('submits ContainerEngine as empty string for Kubernetes', async () => {
     let observedEntries: Array<[string, string]> = [];
 
     server.use(

app/react/portainer/gitops/RelativePathFieldset/utils.ts

@@ -4,12 +4,12 @@ import { GitFormModel, RelativePathModel } from '../types';
 
 export function parseRelativePathResponse(stack: EdgeStack): RelativePathModel {
   return {
-    SupportRelativePath: stack.SupportRelativePath ?? false,
-    FilesystemPath: stack.FilesystemPath ?? '',
-    SupportPerDeviceConfigs: stack.SupportPerDeviceConfigs ?? false,
-    PerDeviceConfigsMatchType: stack.PerDeviceConfigsMatchType ?? '',
-    PerDeviceConfigsGroupMatchType: stack.PerDeviceConfigsGroupMatchType ?? '',
-    PerDeviceConfigsPath: stack.PerDeviceConfigsPath ?? '',
+    SupportRelativePath: stack.SupportRelativePath,
+    FilesystemPath: stack.FilesystemPath,
+    SupportPerDeviceConfigs: stack.SupportPerDeviceConfigs,
+    PerDeviceConfigsMatchType: stack.PerDeviceConfigsMatchType,
+    PerDeviceConfigsGroupMatchType: stack.PerDeviceConfigsGroupMatchType,
+    PerDeviceConfigsPath: stack.PerDeviceConfigsPath,
   };
 }
 

app/react/portainer/licenses/license.service.ts

@@ -112,7 +112,7 @@ export function subscribe(listener: Listener) {
 }
 
 export function unsubscribe(listener: Listener) {
-  _.remove(store.listeners, listener);
+  _.remove<Listener>(store.listeners, listener);
 }
 
 function buildUrl(action = '') {

app/react/portainer/system/useSystemVersion.ts

@@ -19,7 +19,7 @@ export interface VersionResponse {
     BuildNumber: string;
     ImageTag: string;
     NodejsVersion: string;
-    PnpmVersion: string;
+    YarnVersion: string;
     WebpackVersion: string;
     GoVersion: string;
     GitCommit: string;

app/react/sidebar/Footer/BuildInfoModal.tsx

@@ -126,7 +126,7 @@ function BuildInfoModal({ closeModal }: { closeModal: () => void }) {
             <span className="text-muted small">
               Nodejs {Build.NodejsVersion}
             </span>
-            <span className="text-muted small">pnpm v{Build.PnpmVersion}</span>
+            <span className="text-muted small">Yarn v{Build.YarnVersion}</span>
             <span className="text-muted small">
               Webpack v{Build.WebpackVersion}
             </span>

binary-version.json

@@ -1,4 +1,4 @@
 {
-  "docker": "v29.1.5",
+  "docker": "v28.5.2",
   "mingit": "2.49.0.1"
 }

build/build_binary.sh

@@ -16,8 +16,8 @@ mkdir -p dist
 BUILDNUMBER=${BUILDNUMBER:-"N/A"}
 CONTAINER_IMAGE_TAG=${CONTAINER_IMAGE_TAG:-"N/A"}
 NODE_VERSION=${NODE_VERSION:-$(node -v)}
-PNPM_VERSION=${PNPM_VERSION:-$(pnpm -v)}
-WEBPACK_VERSION=${WEBPACK_VERSION:-$(pnpm list webpack --depth=0 | grep webpack | awk '{print $2}')}
+YARN_VERSION=${YARN_VERSION:-$(yarn --version)}
+WEBPACK_VERSION=${WEBPACK_VERSION:-$(yarn list webpack --depth=0 | grep webpack | awk -F@ '{print $2}')}
 GO_VERSION=${GO_VERSION:-$(go version | awk '{print $3}')}
 GIT_COMMIT_HASH=${GIT_COMMIT_HASH:-$(git rev-parse --short HEAD)}
 
@@ -48,7 +48,7 @@ ldflags="-s -X 'github.com/portainer/liblicense.LicenseServerBaseURL=https://api
 -X 'github.com/portainer/portainer/pkg/build.BuildNumber=${BUILDNUMBER}' \
 -X 'github.com/portainer/portainer/pkg/build.ImageTag=${CONTAINER_IMAGE_TAG}' \
 -X 'github.com/portainer/portainer/pkg/build.NodejsVersion=${NODE_VERSION}' \
--X 'github.com/portainer/portainer/pkg/build.PnpmVersion=${PNPM_VERSION}' \
+-X 'github.com/portainer/portainer/pkg/build.YarnVersion=${YARN_VERSION}' \
 -X 'github.com/portainer/portainer/pkg/build.WebpackVersion=${WEBPACK_VERSION}' \
 -X 'github.com/portainer/portainer/pkg/build.GitCommit=${GIT_COMMIT_HASH}' \
 -X 'github.com/portainer/portainer/pkg/build.GoVersion=${GO_VERSION}' \
@@ -59,24 +59,9 @@ ldflags="-s -X 'github.com/portainer/liblicense.LicenseServerBaseURL=https://api
 
 echo "$ldflags"
 
-
-# See: https://gist.github.com/asukakenji/f15ba7e588ac42795f421b48b8aede63
-# For a list of valid GOOS and GOARCH values
-PLATFORM=${1:-$(go env GOOS)}
-ARCH=${2:-$(go env GOARCH)}
-# if the default platform is darwin, set it to linux to allow it to run in the portainer/base image (which doesn't support darwin)
-if [ "$PLATFORM" = "darwin" ]; then
-  PLATFORM="linux"
-fi
-
-BINARY_NAME="portainer"
-if [ "$PLATFORM" = "windows" ]; then
-  BINARY_NAME="portainer.exe"
-fi
-
-GOOS=${PLATFORM} GOARCH=${ARCH} CGO_ENABLED=0 go build \
+GOOS=${1:-$(go env GOOS)} GOARCH=${2:-$(go env GOARCH)} CGO_ENABLED=0 go build \
 	-trimpath \
 	--installsuffix cgo \
 	--ldflags "$ldflags" \
-	-o "../dist/${BINARY_NAME}" \
+	-o "../dist/portainer" \
 	./cmd/portainer/

build/docker-extension/Makefile

@@ -29,4 +29,4 @@ multiarch:
 	docker buildx create --name=buildx-multi-arch --driver=docker-container --driver-opt=network=host
 
 portainer:
-	pnpm run build
+	yarn build

build/linux/dev-toolkit/run.sh

@@ -48,8 +48,8 @@ display_configuration() {
   /usr/local/go/bin/go version
   info "Node version"
   node -v
-  info "Pnpm version"
-  pnpm -v
+  info "Yarn version"
+  yarn -v
   info "Docker version"
   docker version
 }

build/linux/dev-toolkit/toolkit.Dockerfile

@@ -40,8 +40,10 @@ RUN curl -fsSL https://download.docker.com/linux/ubuntu/gpg | apt-key add - \
 RUN curl -fsSL https://deb.nodesource.com/setup_14.x | bash - \
 	&& apt-get install -y nodejs
 
-# Install Package manager
-RUN wget -qO- https://get.pnpm.io/install.sh | ENV="$HOME/.bashrc" SHELL="$(which bash)" bash -
+# Install Yarn
+RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \
+	&& echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list \
+	&& apt-get update && apt-get -y install yarn
 
 # Install Golang
 RUN cd /tmp \

go.mod

@@ -1,6 +1,6 @@
 module github.com/portainer/portainer
 
-go 1.24.13
+go 1.24.9
 
 require (
 	github.com/Masterminds/semver v1.5.0
@@ -13,12 +13,12 @@ require (
 	github.com/aws/aws-sdk-go-v2/service/ecr v1.24.1
 	github.com/aws/smithy-go v1.20.3
 	github.com/cbroglie/mustache v1.4.0
-	github.com/compose-spec/compose-go/v2 v2.9.1
+	github.com/compose-spec/compose-go/v2 v2.9.0
 	github.com/containers/image/v5 v5.30.1
 	github.com/coreos/go-semver v0.3.1
 	github.com/dchest/uniuri v0.0.0-20200228104902-7aecb25e1fe5
 	github.com/docker/cli v28.5.1+incompatible
-	github.com/docker/compose/v2 v2.40.3
+	github.com/docker/compose/v2 v2.40.2
 	github.com/docker/docker v28.5.1+incompatible
 	github.com/fvbommel/sortorder v1.1.0
 	github.com/g07cha/defender v0.0.0-20180505193036-5665c627c814
@@ -50,11 +50,11 @@ require (
 	github.com/urfave/negroni v1.0.0
 	github.com/viney-shih/go-lock v1.1.1
 	go.etcd.io/bbolt v1.4.3
-	golang.org/x/crypto v0.45.0
+	golang.org/x/crypto v0.43.0
 	golang.org/x/exp v0.0.0-20250408133849-7e4ce0ab07d0
-	golang.org/x/mod v0.29.0
+	golang.org/x/mod v0.28.0
 	golang.org/x/oauth2 v0.30.0
-	golang.org/x/sync v0.18.0
+	golang.org/x/sync v0.17.0
 	gopkg.in/yaml.v2 v2.4.0
 	gopkg.in/yaml.v3 v3.0.1
 	helm.sh/helm/v3 v3.18.5
@@ -292,10 +292,10 @@ require (
 	go.uber.org/mock v0.6.0 // indirect
 	go.yaml.in/yaml/v2 v2.4.2 // indirect
 	go.yaml.in/yaml/v3 v3.0.4 // indirect
-	golang.org/x/net v0.47.0 // indirect
-	golang.org/x/sys v0.38.0 // indirect
-	golang.org/x/term v0.37.0 // indirect
-	golang.org/x/text v0.31.0 // indirect
+	golang.org/x/net v0.45.0 // indirect
+	golang.org/x/sys v0.37.0 // indirect
+	golang.org/x/term v0.36.0 // indirect
+	golang.org/x/text v0.30.0 // indirect
 	golang.org/x/time v0.12.0 // indirect
 	google.golang.org/genproto/googleapis/api v0.0.0-20250528174236-200df99c418a // indirect
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20250528174236-200df99c418a // indirect

go.sum

@@ -137,8 +137,8 @@ github.com/cloudflare/circl v1.6.1 h1:zqIqSPIndyBh1bjLVVDHMPpVKqp8Su/V+6MeDzzQBQ
 github.com/cloudflare/circl v1.6.1/go.mod h1:uddAzsPgqdMAYatqJ0lsjX1oECcQLIlRpzZh3pJrofs=
 github.com/codahale/rfc6979 v0.0.0-20141003034818-6a90f24967eb h1:EDmT6Q9Zs+SbUoc7Ik9EfrFqcylYqgPZ9ANSbTAntnE=
 github.com/codahale/rfc6979 v0.0.0-20141003034818-6a90f24967eb/go.mod h1:ZjrT6AXHbDs86ZSdt/osfBi5qfexBrKUdONk989Wnk4=
-github.com/compose-spec/compose-go/v2 v2.9.1 h1:8UwI+ujNU+9Ffkf/YgAm/qM9/eU7Jn8nHzWG721W4rs=
-github.com/compose-spec/compose-go/v2 v2.9.1/go.mod h1:Oky9AZGTRB4E+0VbTPZTUu4Kp+oEMMuwZXZtPPVT1iE=
+github.com/compose-spec/compose-go/v2 v2.9.0 h1:UHSv/QHlo6QJtrT4igF1rdORgIUhDo1gWuyJUoiNNIM=
+github.com/compose-spec/compose-go/v2 v2.9.0/go.mod h1:Oky9AZGTRB4E+0VbTPZTUu4Kp+oEMMuwZXZtPPVT1iE=
 github.com/containerd/cgroups v1.1.0 h1:v8rEWFl6EoqHB+swVNjVoCJE8o3jX7e8nqBGPLaDFBM=
 github.com/containerd/cgroups/v3 v3.0.5 h1:44na7Ud+VwyE7LIoJ8JTNQOa549a8543BmzaJHo6Bzo=
 github.com/containerd/cgroups/v3 v3.0.5/go.mod h1:SA5DLYnXO8pTGYiAHXz94qvLQTKfVM5GEVisn4jpins=
@@ -214,8 +214,8 @@ github.com/docker/cli v28.5.1+incompatible h1:ESutzBALAD6qyCLqbQSEf1a/U8Ybms5agw
 github.com/docker/cli v28.5.1+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
 github.com/docker/cli-docs-tool v0.10.0 h1:bOD6mKynPQgojQi3s2jgcUWGp/Ebqy1SeCr9VfKQLLU=
 github.com/docker/cli-docs-tool v0.10.0/go.mod h1:5EM5zPnT2E7yCLERZmrDA234Vwn09fzRHP4aX1qwp1U=
-github.com/docker/compose/v2 v2.40.3 h1:XeYkQu1svDtyfZPv5nTwFryQ25ZJMkIlc4pz9HalMPI=
-github.com/docker/compose/v2 v2.40.3/go.mod h1:iNY1tvoHTyN3C3QHCuWAgj3OjR2T6mGkk/qxfbBF/4M=
+github.com/docker/compose/v2 v2.40.2 h1:h2bDBJkOuqmj93XvT2oI0ArPQonE0lGtWiILXdiXvbA=
+github.com/docker/compose/v2 v2.40.2/go.mod h1:CbSJpKGw20LInVsPjglZ8z7Squ3OBQOD7Ux5nkjGfIU=
 github.com/docker/distribution v2.7.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
 github.com/docker/distribution v2.8.3+incompatible h1:AtKxIZ36LoNK51+Z6RpzLpddBirtxJnzDrHLEKxTAYk=
 github.com/docker/distribution v2.8.3+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
@@ -865,8 +865,8 @@ golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliY
 golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU=
 golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8=
 golang.org/x/crypto v0.29.0/go.mod h1:+F4F4N5hv6v38hfeYwTdx20oUvLLc+QfrE9Ax9HtgRg=
-golang.org/x/crypto v0.45.0 h1:jMBrvKuj23MTlT0bQEOBcAE0mjg8mK9RXFhRH6nyF3Q=
-golang.org/x/crypto v0.45.0/go.mod h1:XTGrrkGJve7CYK7J8PEww4aY7gM3qMCElcJQ8n8JdX4=
+golang.org/x/crypto v0.43.0 h1:dduJYIi3A3KOfdGOHX8AVZ/jGiyPa3IbBozJ5kNuE04=
+golang.org/x/crypto v0.43.0/go.mod h1:BFbav4mRNlXJL4wNeejLpWxB7wMbc79PdRGhWKncxR0=
 golang.org/x/exp v0.0.0-20250408133849-7e4ce0ab07d0 h1:R84qjqJb5nVJMxqWYb3np9L5ZsaDtB+a39EqjV0JSUM=
 golang.org/x/exp v0.0.0-20250408133849-7e4ce0ab07d0/go.mod h1:S9Xr4PYopiDyqSyp5NjCrhFrqg6A5zA2E/iPHPhqnS8=
 golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
@@ -876,8 +876,8 @@ golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
 golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
 golang.org/x/mod v0.15.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
 golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
-golang.org/x/mod v0.29.0 h1:HV8lRxZC4l2cr3Zq1LvtOsi/ThTgWnUk/y64QSs8GwA=
-golang.org/x/mod v0.29.0/go.mod h1:NyhrlYXJ2H4eJiRy/WDBO6HMqZQ6q9nk4JzS3NuCK+w=
+golang.org/x/mod v0.28.0 h1:gQBtGhjxykdjY9YhZpSlZIsbnaE2+PgjfLWUQTnoZ1U=
+golang.org/x/mod v0.28.0/go.mod h1:yfB/L0NOf/kmEbXjzCPOx1iK1fRutOydrCMsqRhEBxI=
 golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
@@ -898,8 +898,8 @@ golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk=
 golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44=
 golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM=
 golang.org/x/net v0.31.0/go.mod h1:P4fl1q7dY2hnZFxEk4pPSkDHF+QqjitcnDjUQyMM+pM=
-golang.org/x/net v0.47.0 h1:Mx+4dIFzqraBXUugkia1OOvlD6LemFo1ALMHjrXDOhY=
-golang.org/x/net v0.47.0/go.mod h1:/jNxtkgq5yWUGYkaZGqo27cfGZ1c5Nen03aYrrKpVRU=
+golang.org/x/net v0.45.0 h1:RLBg5JKixCy82FtLJpeNlVM0nrSqpCRYzVU1n8kj0tM=
+golang.org/x/net v0.45.0/go.mod h1:ECOoLqd5U3Lhyeyo/QDCEVQ4sNgYsqvCZ722XogGieY=
 golang.org/x/oauth2 v0.6.0/go.mod h1:ycmewcwgD4Rpr3eZJLSB4Kyyljb3qDh40vJ8STE5HKw=
 golang.org/x/oauth2 v0.30.0 h1:dnDm7JmhM45NNpd8FDDeLhK6FwqbOf4MLCM9zb1BOHI=
 golang.org/x/oauth2 v0.30.0/go.mod h1:B++QgG3ZKulg6sRPGD/mqlHQs5rB3Ml9erfeDY7xKlU=
@@ -916,8 +916,8 @@ golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=
 golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
 golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
 golang.org/x/sync v0.9.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
-golang.org/x/sync v0.18.0 h1:kr88TuHDroi+UVf+0hZnirlk8o8T+4MrK6mr60WkH/I=
-golang.org/x/sync v0.18.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI=
+golang.org/x/sync v0.17.0 h1:l60nONMj9l5drqw6jlhIELNv9I0A4OFgRsG9k2oT9Ug=
+golang.org/x/sync v0.17.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI=
 golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -953,8 +953,8 @@ golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/sys v0.27.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/sys v0.38.0 h1:3yZWxaJjBmCWXqhN1qh02AkOnCQ1poK6oF+a7xWL6Gc=
-golang.org/x/sys v0.38.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
+golang.org/x/sys v0.37.0 h1:fdNQudmxPjkdUTPnLn5mdQv7Zwvbvpaxqs831goi9kQ=
+golang.org/x/sys v0.37.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
 golang.org/x/telemetry v0.0.0-20240228155512-f48c80bd79b2/go.mod h1:TeRTkGYfJXctD9OcfyVLyj2J3IxLnKwHJR8f4D8a3YE=
 golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
@@ -966,8 +966,8 @@ golang.org/x/term v0.12.0/go.mod h1:owVbMEjm3cBLCHdkQu9b1opXd4ETQWc3BhuQGKgXgvU=
 golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk=
 golang.org/x/term v0.20.0/go.mod h1:8UkIAJTvZgivsXaD6/pH6U9ecQzZ45awqEOzuCvwpFY=
 golang.org/x/term v0.26.0/go.mod h1:Si5m1o57C5nBNQo5z1iq+XDijt21BDBDp2bK0QI8e3E=
-golang.org/x/term v0.37.0 h1:8EGAD0qCmHYZg6J17DvsMy9/wJ7/D/4pV/wfnld5lTU=
-golang.org/x/term v0.37.0/go.mod h1:5pB4lxRNYYVZuTLmy8oR2BH8dflOR+IbTYFD8fi3254=
+golang.org/x/term v0.36.0 h1:zMPR+aF8gfksFprF/Nc/rd1wRS1EI6nDBGyWAvDzx2Q=
+golang.org/x/term v0.36.0/go.mod h1:Qu394IJq6V6dCBRgwqshf3mPF85AqzYEzofzRdZkWss=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
@@ -982,8 +982,8 @@ golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
 golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
 golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
 golang.org/x/text v0.20.0/go.mod h1:D4IsuqiFMhST5bX19pQ9ikHC2GsaKyk/oF+pn3ducp4=
-golang.org/x/text v0.31.0 h1:aC8ghyu4JhP8VojJ2lEHBnochRno1sgL6nEi9WGFGMM=
-golang.org/x/text v0.31.0/go.mod h1:tKRAlv61yKIjGGHX/4tP1LTbc13YSec1pxVEWXzfoeM=
+golang.org/x/text v0.30.0 h1:yznKA/E9zq54KzlzBEAWn1NXSQ8DIp/NYMy88xJjl4k=
+golang.org/x/text v0.30.0/go.mod h1:yDdHFIX9t+tORqspjENWgzaCVXgk0yYnYuSZ8UzzBVM=
 golang.org/x/time v0.12.0 h1:ScB/8o8olJvc+CQPWrK3fPZNfh7qgwCrY0zJmoEQLSE=
 golang.org/x/time v0.12.0/go.mod h1:CDIdPxbZBQxdj6cxyCIdrNogrJKMJ7pr37NYpMcMDSg=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
@@ -994,8 +994,8 @@ golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc
 golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
 golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58=
 golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk=
-golang.org/x/tools v0.38.0 h1:Hx2Xv8hISq8Lm16jvBZ2VQf+RLmbd7wVUsALibYI/IQ=
-golang.org/x/tools v0.38.0/go.mod h1:yEsQ/d/YK8cjh0L6rZlY8tgtlKiBNTL14pGDJPJpYQs=
+golang.org/x/tools v0.37.0 h1:DVSRzp7FwePZW356yEAChSdNcQo6Nsp+fex1SUW09lE=
+golang.org/x/tools v0.37.0/go.mod h1:MBN5QPQtLMHVdvsbtarmTNukZDdgwdwlO5qGacAzF0w=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=

lint-staged.config.js

@@ -1,6 +1,6 @@
 module.exports = {
-  '*.(js|ts){,x}': 'pnpm run lint',
+  '*.(js|ts){,x}': 'yarn lint',
   '*.(ts){,x}': () => 'tsc --noEmit',
-  '*.{js,ts,tsx,css,md,html,json}': 'pnpm run format',
+  '*.{js,ts,tsx,css,md,html,json}': 'yarn format',
   '*.go': () => 'make lint-server',
 };

package.json

@@ -2,7 +2,7 @@
   "author": "Portainer.io",
   "name": "portainer",
   "homepage": "http://portainer.io",
-  "version": "2.33.7",
+  "version": "2.33.5",
   "repository": {
     "type": "git",
     "url": "git@github.com:portainer/portainer.git"
@@ -23,17 +23,15 @@
     "format": "prettier --log-level warn --write \"**/*.{js,css,html,jsx,tsx,ts}\"",
     "lint": "eslint --cache --fix './**/*.{js,jsx,ts,tsx}'",
     "test": "vitest run",
-    "sb": "pnpm run storybook",
+    "sb": "yarn storybook",
     "storybook": "storybook dev -p 6006",
     "storybook:build": "storybook build -o ./dist/storybook",
     "analyze-webpack": "webpack --config ./webpack/webpack.analyze.js",
-    "prepare": "cd ../.. && husky install package/server-ce/.husky",
-    "typecheck": "tsc --noEmit"
+    "prepare": "cd ../.. && husky install package/server-ce/.husky"
   },
   "engines": {
     "node": ">= 16"
   },
-  "packageManager": "pnpm@10.26.2",
   "dependencies": {
     "@aws-crypto/sha256-js": "^2.0.0",
     "@codemirror/autocomplete": "^6.4.0",
@@ -81,7 +79,7 @@
     "angulartics": "^1.6.0",
     "axios": "^1.7",
     "axios-cache-interceptor": "^1.4.1",
-    "axios-progress-bar": "git://github.com/portainer/progress-bar-4-axios",
+    "axios-progress-bar": "portainer/progress-bar-4-axios",
     "babel-plugin-angularjs-annotate": "^0.10.0",
     "bootstrap": "^3.4.0",
     "buffer": "^6.0.3",
@@ -109,7 +107,6 @@
     "jsdom": "^24",
     "json-schema": "^0.4.0",
     "lodash": "^4.17.21",
-    "lodash-es": "npm:lodash@4.17.21",
     "lucide-react": "^0.468.0",
     "markdown-to-jsx": "^7.7.4",
     "moment": "^2.29.1",
@@ -161,14 +158,10 @@
     "@testing-library/user-event": "^14.5.2",
     "@types/angular": "^1.8.3",
     "@types/file-saver": "^2.0.4",
-    "@types/filesize": "^5.0.2",
     "@types/filesize-parser": "^1.5.1",
     "@types/jquery": "^3.5.10",
-    "@types/json-schema": "^7.0.15",
-    "@types/lodash": "^4.17.21",
     "@types/mustache": "^4.1.2",
     "@types/nprogress": "^0.2.0",
-    "@types/qs": "^6.9.17",
     "@types/react": "^17.0.37",
     "@types/react-datetime-picker": "^3.4.1",
     "@types/react-dom": "^17.0.11",
@@ -214,6 +207,7 @@
     "msw": "^2.0.11",
     "msw-storybook-addon": "2.0.0--canary.122.b3ed3b1.0",
     "ngtemplate-loader": "^2.1.0",
+    "plop": "^4.0.0",
     "postcss": "^8.4.33",
     "postcss-loader": "^7.3.3",
     "prettier": "^3.0.3",
@@ -240,27 +234,21 @@
     "webpack-dev-server": "^4.15.1",
     "webpack-merge": "^5.9.0"
   },
-  "pnpm": {
-    "overrides": {
-      "jquery": "^3.6.0",
-      "decompress": "^4.2.1",
-      "lodash": "^4.17.21",
-      "js-yaml": "^3.14.0",
-      "minimist": "^1.2.6",
-      "http-proxy": "^1.18.1",
-      "@uirouter/react": "^1.0.7",
-      "@uirouter/angularjs": "1.0.11",
-      "moment": "^2.21.0",
-      "msw>wrap-ansi": "^7.0.0",
-      "@types/react": "^17.0.37",
-      "@types/react-dom": "^17.0.11"
-    },
-    "configDependencies": {
-      "@pnpm/plugin-types-fixer": "0.1.0+sha512-bLww63gRHi7siYTqFJb5qNdcXadU0jv20Et6z5AryMZ7FlLolbEJOrXLpg8+amQZNHHNW1dfFUBGVw/9ezQbFg=="
-    }
+  "resolutions": {
+    "**/jquery": "^3.6.0",
+    "decompress": "^4.2.1",
+    "**/lodash": "^4.17.21",
+    "js-yaml": "^3.14.0",
+    "minimist": "^1.2.6",
+    "http-proxy": "^1.18.1",
+    "**/@uirouter/react": "^1.0.7",
+    "**/@uirouter/angularjs": "1.0.11",
+    "**/moment": "^2.21.0",
+    "msw/**/wrap-ansi": "^7.0.0"
   },
   "browserslist": "last 2 versions",
   "msw": {
     "workerDirectory": ".storybook/public"
-  }
+  },
+  "packageManager": "yarn@1.22.22+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e"
 }

pkg/build/info.go

@@ -24,8 +24,8 @@ var (
 	// NodejsVersion is the version of Node.js used in the build.
 	NodejsVersion string
 
-	// PnpmVersion is the version of pnpm used in the build.
-	PnpmVersion string
+	// YarnVersion is the version of Yarn used in the build.
+	YarnVersion string
 
 	// WebpackVersion is the version of Webpack used in the build.
 	WebpackVersion string
@@ -55,7 +55,7 @@ type (
 		BuildNumber    string
 		ImageTag       string
 		NodejsVersion  string
-		PnpmVersion    string
+		YarnVersion    string
 		WebpackVersion string
 		GoVersion      string
 		GitCommit      string
@@ -81,7 +81,7 @@ func GetBuildInfo() BuildInfo {
 		BuildNumber:    BuildNumber,
 		ImageTag:       ImageTag,
 		NodejsVersion:  NodejsVersion,
-		PnpmVersion:    PnpmVersion,
+		YarnVersion:    YarnVersion,
 		WebpackVersion: WebpackVersion,
 		GoVersion:      GoVersion,
 		GitCommit:      GitCommit,

pkg/libstack/compose/composeplugin.go

@@ -124,11 +124,7 @@ func (c *ComposeDeployer) Deploy(ctx context.Context, filePaths []string, option
 
 		project = project.WithoutUnnecessaryResources()
 
-		opts := api.UpOptions{
-			Start: api.StartOptions{
-				Project: project,
-			},
-		}
+		var opts api.UpOptions
 		if options.ForceRecreate {
 			opts.Create.Recreate = api.RecreateForce
 		}

pkg/libstack/compose/composeplugin_test.go

@@ -80,65 +80,6 @@ services:
 	require.False(t, containerExists(composeContainerName))
 }
 
-// Detect regression in container injections.
-// Ref BE-12432
-// Ref https://github.com/portainer/portainer/issues/12909
-func Test_UpAndDownWithInjection(t *testing.T) {
-	const content = `
-services:
-  test:
-    image: alpine:latest
-    container_name: "composetest_alpine"
-    command: ["sh", "-c", "cat /test.txt"]
-    configs:
-      - source: test-config
-        target: /test.txt
-
-configs:
-  test-config:
-    content: |
-      Hello from inline config!
-      This should appear in the container.
-`
-	const projectName = "composetest"
-	const containerName = "composetest_alpine"
-	w := NewComposeDeployer()
-
-	dir := t.TempDir()
-	ctx := context.Background()
-
-	filePath := createFile(t, dir, "docker-compose.yml", content)
-	filePaths := []string{filePath}
-
-	err := w.Validate(ctx, filePaths, libstack.Options{ProjectName: projectName})
-	require.NoError(t, err)
-
-	err = w.Pull(ctx, filePaths, libstack.Options{ProjectName: projectName})
-	require.NoError(t, err)
-
-	require.False(t, containerExists(containerName))
-
-	err = w.Deploy(ctx, filePaths, libstack.DeployOptions{
-		Options: libstack.Options{
-			ProjectName: projectName,
-		},
-	})
-	require.NoError(t, err)
-
-	require.True(t, containerExists(containerName))
-
-	waitResult := w.WaitForStatus(ctx, projectName, libstack.StatusCompleted)
-
-	require.Empty(t, waitResult.ErrorMsg)
-	require.Equal(t, libstack.StatusCompleted, waitResult.Status)
-
-	err = w.Remove(ctx, projectName, filePaths, libstack.RemoveOptions{})
-	require.NoError(t, err)
-
-	require.False(t, containerExists(containerName))
-
-}
-
 func TestRun(t *testing.T) {
 	w := NewComposeDeployer()
 

plop-templates/README.md

@@ -0,0 +1,16 @@
+# Plop generator
+
+We use [plop.js](https://plopjs.com/) to generate angular components in our app (in the future we might use it for other things).
+in order to create a component with the name `exampleComponent`, go in your terminal to the folder in which you want to create the component (for example, if I want to create it in the portainer module components, I'll go to `./app/portainer/components`). then execute the following line:
+
+```
+yarn plop exampleComponent
+```
+
+this will create the following files and folders:
+
+```
+example-component/index.js - the component file
+example-component/exampleComponent.html - the template file
+example-component/exampleComponentController.js - the component controller file
+```

plop-templates/component-controller.js.hbs

@@ -0,0 +1,6 @@
+class {{properCase name}}Controller {
+  /* @ngInject */
+  constructor() {}
+}
+
+export default {{properCase name}}Controller;

plop-templates/component.html.hbs

@@ -0,0 +1 @@
+{{name}}

plop-templates/component.js.hbs

@@ -0,0 +1,9 @@
+import angular from 'angular';
+import controller from './{{dashCase name}}.controller.js'
+
+export const {{camelCase name}} = {
+  templateUrl: './{{dashCase name}}.html',
+  controller,
+};
+
+angular.module('portainer.{{module}}').component('{{camelCase name}}', {{camelCase name}})

plopfile.js

@@ -0,0 +1,46 @@
+module.exports = function (plop) {
+  // use of INIT_CWD instead of process.cwd() because yarn changes the cwd
+  const cwd = process.env.INIT_CWD;
+  plop.addHelper('cwd', () => cwd);
+  plop.setGenerator('component', {
+    prompts: [
+      {
+        type: 'input',
+        name: 'name',
+        message: 'component name please',
+      },
+      {
+        type: 'input',
+        name: 'module',
+        message: 'module name please',
+        default: `${getCurrentPortainerModule(cwd)}`,
+        // when: false
+      },
+    ], // array of inquirer prompts
+    actions: [
+      {
+        type: 'add',
+        path: `{{cwd}}/{{dashCase name}}/index.js`,
+        templateFile: './plop-templates/component.js.hbs',
+      },
+      {
+        type: 'add',
+        path: `{{cwd}}/{{dashCase name}}/{{dashCase name}}.controller.js`,
+        templateFile: './plop-templates/component-controller.js.hbs',
+      },
+      {
+        type: 'add',
+        path: `{{cwd}}/{{dashCase name}}/{{dashCase name}}.html`,
+        templateFile: './plop-templates/component.html.hbs',
+      },
+    ], // array of actions
+  });
+};
+
+function getCurrentPortainerModule(cwd) {
+  const match = cwd.match(/\/app\/([^\/]*)(\/.*)?$/);
+  if (!match || !match.length || match[1] === 'portainer') {
+    return 'app';
+  }
+  return match[1];
+}

vitest.config.mts

@@ -1,4 +1,5 @@
-import { defineConfig } from 'vitest/config';
+/// <reference types="vitest" />
+import { defineConfig } from 'vite';
 import tsconfigPaths from 'vite-tsconfig-paths';
 import svgr from 'vite-plugin-svgr';