From 05674f7a74dc3d128f05e909b86c1bff0e79aa79 Mon Sep 17 00:00:00 2001
From: Sven Urbanski <sven.urbanski@freiheit.com>
Date: Thu, 15 Aug 2024 18:39:03 +0200
Subject: [PATCH 1/9] feat(db): handle group locks (#1880)

Group locks do not really need to be handled in the manifest-export,
because a group lock is just a list of locks for multiple envs, meaning
the cd-service creates separate events for each one.

Ref: SRX-KNBOC7
---
 .../pkg/cmd/server.go                         |  6 ++
 .../pkg/repository/transformer.go             | 56 +++++++++++++++++++
 2 files changed, 62 insertions(+)

diff --git a/services/manifest-repo-export-service/pkg/cmd/server.go b/services/manifest-repo-export-service/pkg/cmd/server.go
index 0aa61283c..1755b6ab0 100755
--- a/services/manifest-repo-export-service/pkg/cmd/server.go
+++ b/services/manifest-repo-export-service/pkg/cmd/server.go
@@ -505,6 +505,12 @@ func getTransformer(ctx context.Context, eslEventType db.EventType) (repository.
 	case db.EvtCreateUndeployApplicationVersion:
 		//exhaustruct:ignore
 		return &repository.CreateUndeployApplicationVersion{}, nil
+	case db.EvtCreateEnvironmentGroupLock:
+		//exhaustruct:ignore
+		return &repository.CreateEnvironmentGroupLock{}, nil
+	case db.EvtDeleteEnvironmentGroupLock:
+		//exhaustruct:ignore
+		return &repository.DeleteEnvironmentGroupLock{}, nil
 	case db.EvtUndeployApplication:
 		//exhaustruct:ignore
 		return &repository.UndeployApplication{}, nil
diff --git a/services/manifest-repo-export-service/pkg/repository/transformer.go b/services/manifest-repo-export-service/pkg/repository/transformer.go
index 0e84cdbd9..4d6cb2e86 100644
--- a/services/manifest-repo-export-service/pkg/repository/transformer.go
+++ b/services/manifest-repo-export-service/pkg/repository/transformer.go
@@ -1837,3 +1837,59 @@ func (u *UndeployApplication) Transform(
 	}
 	return fmt.Sprintf("application '%v' was deleted successfully", u.Application), nil
 }
+
+type CreateEnvironmentGroupLock struct {
+	Authentication        `json:"-"`
+	TransformerMetadata   `json:"metadata"`
+	TransformerEslVersion db.TransformerID `json:"-"` // Tags the transformer with EventSourcingLight eslVersion
+}
+
+func (c *CreateEnvironmentGroupLock) GetEslVersion() db.TransformerID {
+	return c.TransformerEslVersion
+}
+
+func (c *CreateEnvironmentGroupLock) SetEslVersion(eslVersion db.TransformerID) {
+	c.TransformerEslVersion = eslVersion
+}
+
+func (c *CreateEnvironmentGroupLock) GetDBEventType() db.EventType {
+	return db.EvtCreateEnvironmentGroupLock
+}
+
+func (c *CreateEnvironmentGroupLock) Transform(
+	_ context.Context,
+	_ *State,
+	_ TransformerContext,
+	_ *sql.Tx,
+) (string, error) {
+	// group locks are handled on the cd-service, and split into environment locks
+	return "empty commit for group lock creation", nil
+}
+
+type DeleteEnvironmentGroupLock struct {
+	Authentication        `json:"-"`
+	TransformerMetadata   `json:"metadata"`
+	TransformerEslVersion db.TransformerID `json:"-"` // Tags the transformer with EventSourcingLight eslVersion
+}
+
+func (c *DeleteEnvironmentGroupLock) GetEslVersion() db.TransformerID {
+	return c.TransformerEslVersion
+}
+
+func (c *DeleteEnvironmentGroupLock) SetEslVersion(eslVersion db.TransformerID) {
+	c.TransformerEslVersion = eslVersion
+}
+
+func (c *DeleteEnvironmentGroupLock) GetDBEventType() db.EventType {
+	return db.EvtDeleteEnvironmentGroupLock
+}
+
+func (c *DeleteEnvironmentGroupLock) Transform(
+	_ context.Context,
+	_ *State,
+	_ TransformerContext,
+	_ *sql.Tx,
+) (string, error) {
+	// group locks are handled on the cd-service, and split into environment locks
+	return "empty commit for group lock deletion", nil
+}

From dd680edab3a61117b922b3390c86c3d5290ddf42 Mon Sep 17 00:00:00 2001
From: Miguel Crespo <162333021+miguel-crespo-fdc@users.noreply.github.com>
Date: Fri, 16 Aug 2024 08:55:44 +0100
Subject: [PATCH 2/9] fix: team locks overview (#1876)

Upon overview recalculation, the team locks were being added to the app
locks. We fix this.

Ref: SRX-QMIIYB
---
 pkg/db/overview.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkg/db/overview.go b/pkg/db/overview.go
index ecb289b97..3749eadb2 100644
--- a/pkg/db/overview.go
+++ b/pkg/db/overview.go
@@ -44,7 +44,7 @@ func (h *DBHandler) UpdateOverviewTeamLock(ctx context.Context, transaction *sql
 		if app.Locks == nil {
 			app.Locks = map[string]*api.Lock{}
 		}
-		app.Locks[teamLock.LockID] = &api.Lock{
+		app.TeamLocks[teamLock.LockID] = &api.Lock{
 			Message:   teamLock.Metadata.Message,
 			LockId:    teamLock.LockID,
 			CreatedAt: timestamppb.New(teamLock.Created),
@@ -54,7 +54,7 @@ func (h *DBHandler) UpdateOverviewTeamLock(ctx context.Context, transaction *sql
 			},
 		}
 		if teamLock.Deleted {
-			delete(app.Locks, teamLock.LockID)
+			delete(app.TeamLocks, teamLock.LockID)
 		}
 	}
 	err = h.WriteOverviewCache(ctx, transaction, latestOverview)

From 23ef039a69b51330e9a4f1a7c73ddf80fd976956 Mon Sep 17 00:00:00 2001
From: Sven Urbanski <sven.urbanski@freiheit.com>
Date: Fri, 16 Aug 2024 09:56:42 +0200
Subject: [PATCH 3/9] chore: renaming pnpm scripts to be consistent (#1878)

now we have eslint-check/eslint-fix and scss-check/scss-lintlint

Ref: SRX-KNBOC7
---
 services/frontend-service/Earthfile    | 4 ++--
 services/frontend-service/Makefile     | 6 +++---
 services/frontend-service/package.json | 6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/services/frontend-service/Earthfile b/services/frontend-service/Earthfile
index ae76f3d43..32aa57833 100644
--- a/services/frontend-service/Earthfile
+++ b/services/frontend-service/Earthfile
@@ -67,8 +67,8 @@ node-modules:
 
 lint-ui:
     FROM +deps-ui
-    RUN pnpm eslint
-    RUN pnpm lint-scss
+    RUN pnpm eslint-check
+    RUN pnpm scss-check
 
 unit-test-ui:
     FROM +deps-ui
diff --git a/services/frontend-service/Makefile b/services/frontend-service/Makefile
index ec5488d11..bcd73aeef 100644
--- a/services/frontend-service/Makefile
+++ b/services/frontend-service/Makefile
@@ -95,12 +95,12 @@ test-go: $(ALL_GO_FILES) | proto
 	$(GO) test $(GO_TEST_ARGS) ./...
 
 test-ts: src/api/api.ts
-	pnpm eslint
+	pnpm eslint-check
 	# The extra '--' was added because of pnpm, Usage: pnpm test [-- <args>...]
 	pnpm test -- --watchAll=false
 
-lint-scss: deps
-	pnpm lint-scss
+scss-check: deps
+	pnpm scss-check
 
 docker:
 	$(EARTHLY) +docker --registry=$(IMAGE_REGISTRY) --tag=$(VERSION)
diff --git a/services/frontend-service/package.json b/services/frontend-service/package.json
index ea592a0df..225856dfb 100644
--- a/services/frontend-service/package.json
+++ b/services/frontend-service/package.json
@@ -37,11 +37,11 @@
     "build": "GENERATE_SOURCEMAP=false react-scripts build",
     "test": "TC=Europe/Berlin react-scripts test --color",
     "start": "WATCHPACK_POLLING=true CHOKIDAR_USEPOLLING=true react-scripts start",
-    "eslint": "eslint --cache --cache-location 'misc/.eslintcache' --ext .ts,.tsx src/",
+    "eslint-check": "eslint --cache --cache-location 'misc/.eslintcache' --ext .ts,.tsx src/",
     "eslint-fix": "eslint --fix --cache --cache-location 'misc/.eslintcache' --ext .ts,.tsx src/",
     "circular-check": "madge -c --extensions ts,tsx --ts-config tsconfig.json --no-spinner src/",
-    "lint-scss": "prettier -c --parser scss 'src/**/*.scss'",
-    "format-scss": "prettier --write --parser scss 'src/**/*.scss'"
+    "scss-check": "prettier -c --parser scss 'src/**/*.scss'",
+    "scss-fix": "prettier --write --parser scss 'src/**/*.scss'"
   },
   "devDependencies": {
     "@babel/core": "7.25.2",

From 194ab67bb464fa431da766276ad9e3324ddc44b9 Mon Sep 17 00:00:00 2001
From: Ahmed Nour <125875466+ahmed-nour-fdc@users.noreply.github.com>
Date: Fri, 16 Aug 2024 11:23:04 +0200
Subject: [PATCH 4/9] feat: Display logged-in user (#1879)

* Display a welcome message for the logged-in user.
* If the cookie `kuberpult.oauth` is not set, nothing is displayed.

Ref: SRX-Y5QM5R
---
 .../components/TopAppBar/TopAppBar.test.tsx   | 59 +++++++++++++++++++
 .../src/ui/components/TopAppBar/TopAppBar.tsx | 18 +++++-
 2 files changed, 76 insertions(+), 1 deletion(-)
 create mode 100644 services/frontend-service/src/ui/components/TopAppBar/TopAppBar.test.tsx

diff --git a/services/frontend-service/src/ui/components/TopAppBar/TopAppBar.test.tsx b/services/frontend-service/src/ui/components/TopAppBar/TopAppBar.test.tsx
new file mode 100644
index 000000000..84554e98e
--- /dev/null
+++ b/services/frontend-service/src/ui/components/TopAppBar/TopAppBar.test.tsx
@@ -0,0 +1,59 @@
+/*This file is part of kuberpult.
+
+Kuberpult is free software: you can redistribute it and/or modify
+it under the terms of the Expat(MIT) License as published by
+the Free Software Foundation.
+
+Kuberpult is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+MIT License for more details.
+
+You should have received a copy of the MIT License
+along with kuberpult. If not, see <https://directory.fsf.org/wiki/License:Expat>.
+
+Copyright freiheit.com*/
+import React from 'react';
+import { render } from '@testing-library/react';
+import { TopAppBar } from './TopAppBar';
+import { MemoryRouter } from 'react-router-dom';
+
+describe('TopAppBar', () => {
+    beforeEach(() => {
+        document.cookie = '';
+    });
+    interface dataEnvT {
+        name: string;
+        cookie: string;
+        welcomeMessage: string;
+    }
+    const sampleEnvData: dataEnvT[] = [
+        {
+            name: 'no cookie',
+            cookie: '',
+            welcomeMessage: '',
+        },
+        {
+            name: 'cookie defined with no user email',
+            cookie: 'kuberpult.oauth=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiaWF0IjoxNTE2MjM5MDIyLCJleHAiOjE3MjA2MjE5OTc3Nzd9.p3ApN5elnhhRhrh7DCOF-9suPIXYC36Nycf0nHfxuf8',
+            welcomeMessage: 'Welcome, Guest!',
+        },
+        {
+            name: 'cookie defined with a user email',
+            cookie: 'kuberpult.oauth=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiaWF0IjoxNTE2MjM5MDIyLCJlbWFpbCI6InRlc3QudGVzdEB0ZXN0LmNvbSJ9.wgoizCsQb6AuFsbINF5OHfmfipdj5MuEUwJjZaqsBOg',
+            welcomeMessage: 'Welcome, test.test@test.com!',
+        },
+    ];
+    describe.each(sampleEnvData)(`welcomeMessage`, (tc) => {
+        it(tc.name, () => {
+            document.cookie = tc.cookie;
+            const { container } = render(
+                <MemoryRouter>
+                    <TopAppBar showAppFilter={false} showTeamFilter={false} showWarningFilter={false} />
+                </MemoryRouter>
+            );
+            const message = container.getElementsByClassName('welcome-message');
+            tc.cookie === '' ? expect(message).toHaveLength(0) : expect(message[0].textContent).toBe(tc.welcomeMessage);
+        });
+    });
+});
diff --git a/services/frontend-service/src/ui/components/TopAppBar/TopAppBar.tsx b/services/frontend-service/src/ui/components/TopAppBar/TopAppBar.tsx
index 9a6ac41ad..8889e5573 100644
--- a/services/frontend-service/src/ui/components/TopAppBar/TopAppBar.tsx
+++ b/services/frontend-service/src/ui/components/TopAppBar/TopAppBar.tsx
@@ -13,6 +13,7 @@ You should have received a copy of the MIT License
 along with kuberpult. If not, see <https://directory.fsf.org/wiki/License:Expat>.
 
 Copyright freiheit.com*/
+import { jwtDecode } from 'jwt-decode';
 import { Textfield } from '../textfield';
 import React, { useCallback } from 'react';
 import { SideBar } from '../SideBar/SideBar';
@@ -47,6 +48,12 @@ export const TopAppBar: React.FC<TopAppBarProps> = (props) => {
     const teamsParam = (params.get('teams') || '').split(',').filter((val) => val !== '');
 
     const version = useKuberpultVersion() || '2.6.0';
+    const cookieValue = document.cookie
+        .split('; ')
+        .find((row) => row.startsWith('kuberpult.oauth='))
+        ?.split('=')[1];
+    const decodedToken: any = cookieValue ? jwtDecode(cookieValue) : undefined;
+    const loggedInUser = decodedToken?.email || 'Guest';
 
     const hideWithoutWarningsValue = hideWithoutWarnings(params);
     const allWarnings: Warning[] = useAllWarnings();
@@ -114,7 +121,15 @@ export const TopAppBar: React.FC<TopAppBarProps> = (props) => {
         ) : (
             <div className="mdc-top-app-bar__section top-app-bar--narrow-filter"></div>
         );
-
+    const renderedUser = cookieValue ? (
+        <div className="mdc-top-app-bar__section mdc-top-app-bar__section--align-end">
+            <span className="welcome-message">
+                Welcome, <strong>{loggedInUser}!</strong>
+            </span>
+        </div>
+    ) : (
+        <div className="mdc-top-app-bar__section mdc-top-app-bar__section--align-end"></div>
+    );
     return (
         <div className="mdc-top-app-bar">
             <div className="mdc-top-app-bar__row">
@@ -127,6 +142,7 @@ export const TopAppBar: React.FC<TopAppBarProps> = (props) => {
                 {renderedTeamsFilter}
                 {renderedWarningsFilter}
                 {renderedWarnings}
+                {renderedUser}
                 <div className="mdc-top-app-bar__section mdc-top-app-bar__section--align-end">
                     <strong className="sub-headline1">Planned Actions</strong>
                     <Button

From ab8a8e7eab85a9188f3632e95e2eb6a5998b43b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Correia?=
 <101414931+0lione@users.noreply.github.com>
Date: Fri, 16 Aug 2024 10:43:07 +0100
Subject: [PATCH 5/9] fix: Rename Releases page to Release History (#1877)

Ref: SRX-RXAQ2D
---
 services/frontend-service/src/ui/App/PageRoutes.tsx         | 6 +++---
 .../ReleaseHistoryPage.test.tsx}                            | 6 +++---
 .../ReleaseHistoryPage.tsx}                                 | 2 +-
 .../src/ui/components/Releases/Releases.tsx                 | 2 +-
 .../src/ui/components/ServiceLane/ServiceLane.tsx           | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)
 rename services/frontend-service/src/ui/Pages/{Releases/ReleasesPage.test.tsx => ReleaseHistory/ReleaseHistoryPage.test.tsx} (94%)
 rename services/frontend-service/src/ui/Pages/{Releases/ReleasesPage.tsx => ReleaseHistory/ReleaseHistoryPage.tsx} (95%)

diff --git a/services/frontend-service/src/ui/App/PageRoutes.tsx b/services/frontend-service/src/ui/App/PageRoutes.tsx
index 2d0f15d1e..9af6f6bc3 100644
--- a/services/frontend-service/src/ui/App/PageRoutes.tsx
+++ b/services/frontend-service/src/ui/App/PageRoutes.tsx
@@ -15,7 +15,7 @@ along with kuberpult. If not, see <https://directory.fsf.org/wiki/License:Expat>
 Copyright freiheit.com*/
 import { Home } from '../Pages/Home/Home';
 import { EnvironmentsPage } from '../Pages/Environments/EnvironmentsPage';
-import { ReleasesPage } from '../Pages/Releases/ReleasesPage';
+import { ReleaseHistoryPage } from '../Pages/ReleaseHistory/ReleaseHistoryPage';
 import { LocksPage } from '../Pages/Locks/LocksPage';
 import { Routes as ReactRoutes, Route, Navigate } from 'react-router-dom';
 import { ProductVersionPage } from '../Pages/ProductVersion/ProductVersionPage';
@@ -41,8 +41,8 @@ const routes = [
         element: <Home />,
     },
     {
-        path: `/ui/home/releases/:appName`,
-        element: <ReleasesPage />,
+        path: `/ui/home/releasehistory/:appName`,
+        element: <ReleaseHistoryPage />,
     },
     {
         path: `/ui/environments/productVersion/*`,
diff --git a/services/frontend-service/src/ui/Pages/Releases/ReleasesPage.test.tsx b/services/frontend-service/src/ui/Pages/ReleaseHistory/ReleaseHistoryPage.test.tsx
similarity index 94%
rename from services/frontend-service/src/ui/Pages/Releases/ReleasesPage.test.tsx
rename to services/frontend-service/src/ui/Pages/ReleaseHistory/ReleaseHistoryPage.test.tsx
index 645a6cd3b..7d2d6e8ed 100644
--- a/services/frontend-service/src/ui/Pages/Releases/ReleasesPage.test.tsx
+++ b/services/frontend-service/src/ui/Pages/ReleaseHistory/ReleaseHistoryPage.test.tsx
@@ -15,13 +15,13 @@ along with kuberpult. If not, see <https://directory.fsf.org/wiki/License:Expat>
 Copyright freiheit.com*/
 import { render } from '@testing-library/react';
 import { MemoryRouter } from 'react-router-dom';
-import { ReleasesPage } from './ReleasesPage';
+import { ReleaseHistoryPage } from './ReleaseHistoryPage';
 import { fakeLoadEverything, enableDexAuth } from '../../../setupTests';
 
 describe('LocksPage', () => {
     const getNode = (): JSX.Element | any => (
         <MemoryRouter>
-            <ReleasesPage />
+            <ReleaseHistoryPage />
         </MemoryRouter>
     );
     const getWrapper = () => render(getNode());
@@ -75,7 +75,7 @@ describe('LocksPage', () => {
         },
     ];
 
-    describe.each(sampleEnvData)(`Renders ReleasesPage`, (testcase) => {
+    describe.each(sampleEnvData)(`Renders ReleaseHistoryPage`, (testcase) => {
         it(testcase.name, () => {
             fakeLoadEverything(testcase.loaded);
             if (testcase.enableDex) {
diff --git a/services/frontend-service/src/ui/Pages/Releases/ReleasesPage.tsx b/services/frontend-service/src/ui/Pages/ReleaseHistory/ReleaseHistoryPage.tsx
similarity index 95%
rename from services/frontend-service/src/ui/Pages/Releases/ReleasesPage.tsx
rename to services/frontend-service/src/ui/Pages/ReleaseHistory/ReleaseHistoryPage.tsx
index c74271e22..04388d200 100644
--- a/services/frontend-service/src/ui/Pages/Releases/ReleasesPage.tsx
+++ b/services/frontend-service/src/ui/Pages/ReleaseHistory/ReleaseHistoryPage.tsx
@@ -18,7 +18,7 @@ import { useGlobalLoadingState } from '../../utils/store';
 import React from 'react';
 import { TopAppBar } from '../../components/TopAppBar/TopAppBar';
 
-export const ReleasesPage: React.FC = () => {
+export const ReleaseHistoryPage: React.FC = () => {
     const url = window.location.pathname.split('/');
     const app_name = url[url.length - 1];
 
diff --git a/services/frontend-service/src/ui/components/Releases/Releases.tsx b/services/frontend-service/src/ui/components/Releases/Releases.tsx
index 838203055..98fbdd58c 100644
--- a/services/frontend-service/src/ui/components/Releases/Releases.tsx
+++ b/services/frontend-service/src/ui/components/Releases/Releases.tsx
@@ -56,7 +56,7 @@ export const Releases: React.FC<ReleasesProps> = (props) => {
     const rel = getReleasesForAppGroupByDate(releases);
     return (
         <div className={classNames('timeline', className)}>
-            <h1 className={classNames('app_name', className)}>{'Application Locks | ' + app}</h1>
+            <h1 className={classNames('app_name', className)}>{'Current Application Locks | ' + app}</h1>
             <div className={classNames('app-locks-container', className)}>
                 {Object.values(displayAppLocks).map((displayAppLock) => (
                     <ApplicationLockChip
diff --git a/services/frontend-service/src/ui/components/ServiceLane/ServiceLane.tsx b/services/frontend-service/src/ui/components/ServiceLane/ServiceLane.tsx
index 0d5f6a537..89357e7ec 100644
--- a/services/frontend-service/src/ui/components/ServiceLane/ServiceLane.tsx
+++ b/services/frontend-service/src/ui/components/ServiceLane/ServiceLane.tsx
@@ -89,7 +89,7 @@ export const ServiceLane: React.FC<{ application: Application }> = (props) => {
     const { application } = props;
     const deployedReleases = useDeployedReleases(application.name);
     const allReleases = useVersionsForApp(application.name);
-    const { navCallback } = useNavigateWithSearchParams('releases/' + application.name);
+    const { navCallback } = useNavigateWithSearchParams('releasehistory/' + application.name);
     const prepareUndeployOrUndeployText = deriveUndeployMessage(application.undeploySummary);
 
     const prepareUndeployOrUndeploy = React.useCallback(() => {

From 0adc7bd855f5de5eae533fe1e7c32e27c6801a00 Mon Sep 17 00:00:00 2001
From: Miguel Crespo <162333021+miguel-crespo-fdc@users.noreply.github.com>
Date: Fri, 16 Aug 2024 13:35:26 +0100
Subject: [PATCH 6/9] feat: cli create env locks (#1885)

Added a command for creating environment locks to the CLI. Also moved
http code to cli_utils package, as it is used by more than the release
now.

Ref: SRX-QMIIYB

---------

Co-authored-by: Sven Urbanski <sven.urbanski@freiheit.com>
---
 cli/pkg/cli_utils/http.go              |  70 +++++++++
 cli/pkg/cmd/cli.go                     |   2 +
 cli/pkg/cmd/handlers.go                |  35 ++++-
 cli/pkg/locks/env_lock_parsing.go      | 103 +++++++++++++
 cli/pkg/locks/env_lock_parsing_test.go | 199 +++++++++++++++++++++++++
 cli/pkg/locks/lock.go                  | 120 +++++++++++++++
 cli/pkg/release/http.go                |  51 +------
 cli/pkg/release/release.go             |   3 +-
 8 files changed, 531 insertions(+), 52 deletions(-)
 create mode 100644 cli/pkg/cli_utils/http.go
 create mode 100644 cli/pkg/locks/env_lock_parsing.go
 create mode 100644 cli/pkg/locks/env_lock_parsing_test.go
 create mode 100644 cli/pkg/locks/lock.go

diff --git a/cli/pkg/cli_utils/http.go b/cli/pkg/cli_utils/http.go
new file mode 100644
index 000000000..18cc5d46e
--- /dev/null
+++ b/cli/pkg/cli_utils/http.go
@@ -0,0 +1,70 @@
+/*This file is part of kuberpult.
+
+Kuberpult is free software: you can redistribute it and/or modify
+it under the terms of the Expat(MIT) License as published by
+the Free Software Foundation.
+
+Kuberpult is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+MIT License for more details.
+
+You should have received a copy of the MIT License
+along with kuberpult. If not, see <https://directory.fsf.org/wiki/License:Expat>.
+
+Copyright freiheit.com*/
+
+package cli_utils
+
+import (
+	"fmt"
+	"io"
+	"log"
+	"net/http"
+	"time"
+)
+
+const (
+	HttpDefaultTimeout = 180
+)
+
+func doRequest(request *http.Request) (*http.Response, []byte, error) {
+	//exhaustruct:ignore
+	client := &http.Client{
+		Timeout: HttpDefaultTimeout * time.Second,
+	}
+
+	resp, err := client.Do(request)
+	if err != nil {
+		return nil, nil, fmt.Errorf("error issuing the HTTP request, error: %w", err)
+	}
+	defer resp.Body.Close()
+
+	body, err := io.ReadAll(resp.Body)
+	if err != nil {
+		return nil, nil, fmt.Errorf("unable to read response: %v with error: %w", resp, err)
+	}
+
+	return resp, body, nil
+}
+
+func IssueHttpRequest(req http.Request, retries uint64) error {
+	var i uint64
+	for i = 0; i < retries+1; i++ {
+		response, body, err := doRequest(&req)
+		if err != nil {
+			log.Printf("error issuing http request: %v\n", err)
+		} else if response.StatusCode != http.StatusCreated && response.StatusCode != http.StatusOK {
+			log.Printf("Recieved response code %d - %s from Kuberpult\nResponse body:\n%s\n", response.StatusCode, http.StatusText(response.StatusCode), string(body))
+		} else {
+			log.Printf("Success: %d - %s\nResponse body:\n%s\n", response.StatusCode, http.StatusText(response.StatusCode), string(body))
+			return nil
+		}
+		if i < retries {
+			backoff := time.Duration(i+1) * time.Second
+			log.Printf("Retrying in %v...\n", backoff)
+			time.Sleep(backoff)
+		}
+	}
+	return fmt.Errorf("could not perform a successful call to kuberpult")
+}
diff --git a/cli/pkg/cmd/cli.go b/cli/pkg/cmd/cli.go
index 410851a2e..6e6204723 100644
--- a/cli/pkg/cmd/cli.go
+++ b/cli/pkg/cmd/cli.go
@@ -67,6 +67,8 @@ func RunCLI() ReturnCode {
 		return ReturnCodeSuccess
 	case "release":
 		return handleRelease(*kpClientParams, subflags)
+	case "create-env-lock":
+		return handleCreateEnvLock(*kpClientParams, subflags)
 	default:
 		log.Printf("unknown subcommand %s\n", subcommand)
 		return ReturnCodeInvalidArguments
diff --git a/cli/pkg/cmd/handlers.go b/cli/pkg/cmd/handlers.go
index a3585ac5b..8ebd375b6 100644
--- a/cli/pkg/cmd/handlers.go
+++ b/cli/pkg/cmd/handlers.go
@@ -17,6 +17,8 @@ Copyright freiheit.com*/
 package cmd
 
 import (
+	"github.com/freiheit-com/kuberpult/cli/pkg/cli_utils"
+	"github.com/freiheit-com/kuberpult/cli/pkg/locks"
 	"log"
 
 	kutil "github.com/freiheit-com/kuberpult/cli/pkg/kuberpult_utils"
@@ -41,7 +43,7 @@ func handleRelease(kpClientParams kuberpultClientParameters, args []string) Retu
 	requestParameters := kutil.RequestParameters{
 		Url:         &kpClientParams.url,
 		Retries:     kpClientParams.retries,
-		HttpTimeout: rl.DefaultTimeout,
+		HttpTimeout: cli_utils.HttpDefaultTimeout,
 	}
 
 	if err = rl.Release(requestParameters, authParams, *parsedArgs); err != nil {
@@ -50,3 +52,34 @@ func handleRelease(kpClientParams kuberpultClientParameters, args []string) Retu
 	}
 	return ReturnCodeSuccess
 }
+
+func handleCreateEnvLock(kpClientParams kuberpultClientParameters, args []string) ReturnCode {
+	parsedArgs, err := locks.ParseArgsCreateEnvironmentLock(args)
+
+	if err != nil {
+		log.Printf("error while parsing command line args, error: %v", err)
+		return ReturnCodeInvalidArguments
+	}
+	return handleCreateLock(kpClientParams, parsedArgs)
+}
+
+func handleCreateLock(kpClientParams kuberpultClientParameters, parsedArgs locks.LockParameters) ReturnCode {
+	authParams := kutil.AuthenticationParameters{
+		IapToken:    kpClientParams.iapToken,
+		DexToken:    kpClientParams.dexToken,
+		AuthorName:  kpClientParams.authorName,
+		AuthorEmail: kpClientParams.authorEmail,
+	}
+
+	requestParameters := kutil.RequestParameters{
+		Url:         &kpClientParams.url,
+		Retries:     kpClientParams.retries,
+		HttpTimeout: cli_utils.HttpDefaultTimeout,
+	}
+
+	if err := locks.CreateLock(requestParameters, authParams, parsedArgs); err != nil {
+		log.Printf("error creating lock, error: %v", err)
+		return ReturnCodeFailure
+	}
+	return ReturnCodeSuccess
+}
diff --git a/cli/pkg/locks/env_lock_parsing.go b/cli/pkg/locks/env_lock_parsing.go
new file mode 100644
index 000000000..5c4df661d
--- /dev/null
+++ b/cli/pkg/locks/env_lock_parsing.go
@@ -0,0 +1,103 @@
+/*This file is part of kuberpult.
+
+Kuberpult is free software: you can redistribute it and/or modify
+it under the terms of the Expat(MIT) License as published by
+the Free Software Foundation.
+
+Kuberpult is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+MIT License for more details.
+
+You should have received a copy of the MIT License
+along with kuberpult. If not, see <https://directory.fsf.org/wiki/License:Expat>.
+
+Copyright freiheit.com*/
+
+package locks
+
+import (
+	"flag"
+	"fmt"
+	"github.com/freiheit-com/kuberpult/cli/pkg/cli_utils"
+	"strings"
+)
+
+type CreateEnvLockCommandLineArguments struct {
+	environment          cli_utils.RepeatedString
+	lockId               cli_utils.RepeatedString
+	message              cli_utils.RepeatedString
+	useDexAuthentication bool
+}
+
+func argsValidCreateEnvLock(cmdArgs *CreateEnvLockCommandLineArguments) (result bool, errorMessage string) {
+	if len(cmdArgs.lockId.Values) != 1 {
+		return false, "the --lockID arg must be set exactly once"
+	}
+	if len(cmdArgs.environment.Values) != 1 {
+		return false, "the --environment arg must be set exactly once"
+	}
+	if len(cmdArgs.message.Values) > 1 {
+		return false, "the --message arg must be set at most once"
+	}
+
+	return true, ""
+}
+
+// takes the raw command line flags and converts them to an intermediate represnetations for easy validation
+func readCreateEnvLockArgs(args []string) (*CreateEnvLockCommandLineArguments, error) {
+	cmdArgs := CreateEnvLockCommandLineArguments{} //exhaustruct:ignore
+
+	fs := flag.NewFlagSet("flag set", flag.ContinueOnError)
+
+	fs.Var(&cmdArgs.environment, "environment", "the environment to lock")
+	fs.Var(&cmdArgs.lockId, "lockID", "the ID of the lock you are trying to create")
+	fs.Var(&cmdArgs.message, "message", "lock message")
+	fs.BoolVar(&cmdArgs.useDexAuthentication, "use_dex_auth", false, "if set to true, the /api/* endpoint will be used. Dex must be enabled on the server side and a dex token must be provided, otherwise the request will be denied")
+
+	if err := fs.Parse(args); err != nil {
+		return nil, fmt.Errorf("error while parsing command line arguments, error: %w", err)
+	}
+
+	if len(fs.Args()) != 0 { // kuberpult-cli release does not accept any positional arguments, so this is an error
+		return nil, fmt.Errorf("these arguments are not recognized: \"%v\"", strings.Join(fs.Args(), " "))
+	}
+
+	if ok, msg := argsValidCreateEnvLock(&cmdArgs); !ok {
+		return nil, fmt.Errorf(msg)
+	}
+
+	return &cmdArgs, nil
+}
+
+// converts the intermediate representation of the command line flags into the final structure containing parameters for the create lock endpoint
+func convertToCreateEnvironmentLockParams(cmdArgs CreateEnvLockCommandLineArguments) (LockParameters, error) {
+	if ok, msg := argsValidCreateEnvLock(&cmdArgs); !ok {
+		// this should never happen, as the validation is already performed by the readArgs function
+		return nil, fmt.Errorf("the provided command line arguments structure is invalid, cause: %s", msg)
+	}
+
+	rp := EnvironmentLockParameters{
+		LockId:               cmdArgs.lockId.Values[0],
+		Environment:          cmdArgs.environment.Values[0],
+		UseDexAuthentication: cmdArgs.useDexAuthentication,
+		Message:              "",
+	}
+	if len(cmdArgs.message.Values) != 0 {
+		rp.Message = cmdArgs.message.Values[0]
+	}
+	return &rp, nil
+}
+
+func ParseArgsCreateEnvironmentLock(args []string) (LockParameters, error) {
+	cmdArgs, err := readCreateEnvLockArgs(args)
+	if err != nil {
+		return nil, fmt.Errorf("error while reading command line arguments for env locks, error: %w", err)
+	}
+	rp, err := convertToCreateEnvironmentLockParams(*cmdArgs)
+	if err != nil {
+		return nil, fmt.Errorf("error while creating parameters for creating an environment lock, error: %w", err)
+	}
+
+	return rp, nil
+}
diff --git a/cli/pkg/locks/env_lock_parsing_test.go b/cli/pkg/locks/env_lock_parsing_test.go
new file mode 100644
index 000000000..e3231846d
--- /dev/null
+++ b/cli/pkg/locks/env_lock_parsing_test.go
@@ -0,0 +1,199 @@
+/*This file is part of kuberpult.
+
+Kuberpult is free software: you can redistribute it and/or modify
+it under the terms of the Expat(MIT) License as published by
+the Free Software Foundation.
+
+Kuberpult is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+MIT License for more details.
+
+You should have received a copy of the MIT License
+along with kuberpult. If not, see <https://directory.fsf.org/wiki/License:Expat>.
+
+Copyright freiheit.com*/
+
+package locks
+
+import (
+	"testing"
+
+	"github.com/google/go-cmp/cmp"
+	"github.com/google/go-cmp/cmp/cmpopts"
+
+	"github.com/freiheit-com/kuberpult/cli/pkg/cli_utils"
+)
+
+// Used to compare two error message strings, needed because errors.Is(fmt.Errorf(text),fmt.Errorf(text)) == false
+type errMatcher struct {
+	msg string
+}
+
+func (e errMatcher) Error() string {
+	return e.msg
+}
+
+func (e errMatcher) Is(err error) bool {
+	return e.Error() == err.Error()
+}
+
+func TestReadArgs(t *testing.T) {
+	type testCase struct {
+		name            string
+		args            []string
+		expectedCmdArgs *CreateEnvLockCommandLineArguments
+		expectedError   error
+	}
+
+	tcs := []testCase{
+		{
+			name: "some unrecognized positional arguments",
+			args: []string{"potato", "tomato"},
+			expectedError: errMatcher{
+				msg: "these arguments are not recognized: \"potato tomato\"",
+			},
+		},
+		{
+			name: "some flags that don't exist",
+			args: []string{"--environment", "development", "--potato", "tomato"},
+			expectedError: errMatcher{
+				msg: "error while parsing command line arguments, error: flag provided but not defined: -potato",
+			},
+		},
+		{
+			name: "nothing provided",
+			args: []string{},
+			expectedError: errMatcher{
+				msg: "the --lockID arg must be set exactly once",
+			},
+		},
+		{
+			name: "only --environment is properly provided but without --lockID",
+			args: []string{"--environment", "potato"},
+			expectedError: errMatcher{
+				msg: "the --lockID arg must be set exactly once",
+			},
+		},
+		{
+			name: "only --lockID is properly provided but without --environment",
+			args: []string{"--lockID", "potato"},
+			expectedError: errMatcher{
+				msg: "the --environment arg must be set exactly once",
+			},
+		},
+		{
+			name: "--environment, lockID and message are are specified",
+			args: []string{"--environment", "development", "--lockID", "my-lock", "--message", "\"my message\""},
+			expectedCmdArgs: &CreateEnvLockCommandLineArguments{
+				environment: cli_utils.RepeatedString{
+					Values: []string{
+						"development",
+					},
+				},
+				lockId: cli_utils.RepeatedString{
+					Values: []string{
+						"my-lock",
+					},
+				},
+				message: cli_utils.RepeatedString{
+					Values: []string{
+						"\"my message\"",
+					},
+				},
+			},
+		},
+		{
+			name: "--environment, lockID are are specified, but not the message",
+			args: []string{"--environment", "development", "--lockID", "my-lock"},
+			expectedCmdArgs: &CreateEnvLockCommandLineArguments{
+				environment: cli_utils.RepeatedString{
+					Values: []string{
+						"development",
+					},
+				},
+				lockId: cli_utils.RepeatedString{
+					Values: []string{
+						"my-lock",
+					},
+				},
+				message: cli_utils.RepeatedString{},
+			},
+		},
+	}
+
+	for _, tc := range tcs {
+		tc := tc
+		t.Run(tc.name, func(t *testing.T) {
+			t.Parallel()
+
+			cmdArgs, err := readCreateEnvLockArgs(tc.args)
+			// check errors
+			if diff := cmp.Diff(tc.expectedError, err, cmpopts.EquateErrors()); diff != "" {
+				t.Fatalf("error mismatch (-want, +got):\n%s", diff)
+			}
+
+			if diff := cmp.Diff(cmdArgs, tc.expectedCmdArgs, cmp.AllowUnexported(CreateEnvLockCommandLineArguments{})); diff != "" {
+				t.Fatalf("expected args:\n  %v\n, got:\n  %v, diff:\n  %s\n", tc.expectedCmdArgs, cmdArgs, diff)
+			}
+		})
+	}
+}
+
+func TestParseArgs(t *testing.T) {
+	type testCase struct {
+		name           string
+		cmdArgs        []string
+		expectedParams LockParameters
+		expectedError  error
+	}
+
+	tcs := []testCase{
+		{
+			name:    "with environment and lockID and message",
+			cmdArgs: []string{"--environment", "development", "--lockID", "my-lock", "--message", "message"},
+			expectedParams: &EnvironmentLockParameters{
+				Environment: "development",
+				LockId:      "my-lock",
+				Message:     "message",
+			},
+		},
+		{
+			name:    "with environment and lockID and no message",
+			cmdArgs: []string{"--environment", "development", "--lockID", "my-lock"},
+			expectedParams: &EnvironmentLockParameters{
+				Environment: "development",
+				LockId:      "my-lock",
+				Message:     "",
+			},
+		},
+
+		{
+			name:    "with environment and lockID and multi word message message",
+			cmdArgs: []string{"--environment", "development", "--lockID", "my-lock", "--message", "this is a very long message"},
+			expectedParams: &EnvironmentLockParameters{
+				Environment: "development",
+				LockId:      "my-lock",
+				Message:     "this is a very long message",
+			},
+		},
+	}
+
+	for _, tc := range tcs {
+		tc := tc
+		t.Run(tc.name, func(t *testing.T) {
+			t.Parallel()
+
+			params, err := ParseArgsCreateEnvironmentLock(tc.cmdArgs)
+			// check errors
+			if diff := cmp.Diff(tc.expectedError, err, cmpopts.EquateErrors()); diff != "" {
+				t.Fatalf("error mismatch (-want, +got):\n%s", diff)
+			}
+
+			// check result
+			if diff := cmp.Diff(tc.expectedParams, params); diff != "" {
+				t.Fatalf("expected args:\n  %v\n, got:\n  %v\n, diff:\n  %s\n", tc.expectedParams, params, diff)
+			}
+		})
+	}
+}
diff --git a/cli/pkg/locks/lock.go b/cli/pkg/locks/lock.go
new file mode 100644
index 000000000..eba20fe3d
--- /dev/null
+++ b/cli/pkg/locks/lock.go
@@ -0,0 +1,120 @@
+/*This file is part of kuberpult.
+
+Kuberpult is free software: you can redistribute it and/or modify
+it under the terms of the Expat(MIT) License as published by
+the Free Software Foundation.
+
+Kuberpult is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+MIT License for more details.
+
+You should have received a copy of the MIT License
+along with kuberpult. If not, see <https://directory.fsf.org/wiki/License:Expat>.
+
+Copyright freiheit.com*/
+
+package locks
+
+import (
+	"bytes"
+	"encoding/base64"
+	"encoding/json"
+	"fmt"
+	"github.com/freiheit-com/kuberpult/cli/pkg/cli_utils"
+	kutil "github.com/freiheit-com/kuberpult/cli/pkg/kuberpult_utils"
+	"net/http"
+	urllib "net/url"
+)
+
+type LockParameters interface {
+	GetPath() string
+	FillForm() (*HttpFormDataInfo, error)
+}
+
+type EnvironmentLockParameters struct {
+	Environment          string
+	LockId               string
+	Message              string
+	UseDexAuthentication bool
+}
+
+type LockJsonData struct {
+	Message string `json:"message"`
+}
+
+type HttpFormDataInfo struct {
+	jsonData    []byte
+	ContentType string
+}
+
+func CreateLock(requestParams kutil.RequestParameters, authParams kutil.AuthenticationParameters, params LockParameters) error {
+	path := params.GetPath()
+	data, err := params.FillForm()
+	if err != nil {
+		return fmt.Errorf("error while preparing HTTP request. Could not fill form error: %w", err)
+	}
+	req, err := createHttpRequest(*requestParams.Url, path, authParams, data)
+
+	if err != nil {
+		return fmt.Errorf("error while preparing HTTP request, error: %w", err)
+	}
+	if err := cli_utils.IssueHttpRequest(*req, requestParams.Retries); err != nil {
+		return fmt.Errorf("error while issuing HTTP request, error: %v", err)
+	}
+	return nil
+}
+
+func (e *EnvironmentLockParameters) GetPath() string {
+	prefix := "environments"
+	if e.UseDexAuthentication {
+		prefix = "api/environments"
+	}
+
+	return fmt.Sprintf("%s/%s/locks/%s", prefix, e.Environment, e.LockId)
+}
+
+func (e *EnvironmentLockParameters) FillForm() (*HttpFormDataInfo, error) {
+	d := LockJsonData{
+		Message: e.Message,
+	}
+	var jsonData, err = json.Marshal(d)
+	if err != nil {
+		return nil, fmt.Errorf("Could not EnvironmentLockParameters data to json: %w\n", err)
+	}
+	return &HttpFormDataInfo{
+		jsonData:    jsonData,
+		ContentType: "application/json",
+	}, nil
+}
+
+func createHttpRequest(url string, path string, authParams kutil.AuthenticationParameters, requestInfo *HttpFormDataInfo) (*http.Request, error) {
+	urlStruct, err := urllib.Parse(url)
+	if err != nil {
+		return nil, fmt.Errorf("the provided url %s is invalid, error: %w", url, err)
+	}
+
+	req, err := http.NewRequest(http.MethodPut, urlStruct.JoinPath(path).String(), bytes.NewBuffer(requestInfo.jsonData))
+	if err != nil {
+		return nil, fmt.Errorf("error creating the HTTP request, error: %w", err)
+	}
+	req.Header.Set("Content-Type", requestInfo.ContentType)
+
+	if authParams.IapToken != nil {
+		req.Header.Add("Proxy-Authorization", "Bearer "+*authParams.IapToken)
+	}
+
+	if authParams.DexToken != nil {
+		req.Header.Add("Authorization", "Bearer "+*authParams.DexToken)
+	}
+
+	if authParams.AuthorName != nil {
+		req.Header.Add("author-name", base64.StdEncoding.EncodeToString([]byte(*authParams.AuthorName)))
+	}
+
+	if authParams.AuthorEmail != nil {
+		req.Header.Add("author-email", base64.StdEncoding.EncodeToString([]byte(*authParams.AuthorEmail)))
+	}
+
+	return req, nil
+}
diff --git a/cli/pkg/release/http.go b/cli/pkg/release/http.go
index 45a3c8af8..c5441aed7 100644
--- a/cli/pkg/release/http.go
+++ b/cli/pkg/release/http.go
@@ -20,18 +20,10 @@ import (
 	"bytes"
 	"encoding/base64"
 	"fmt"
-	"io"
-	"log"
+	kutil "github.com/freiheit-com/kuberpult/cli/pkg/kuberpult_utils"
 	"mime/multipart"
 	"net/http"
 	urllib "net/url"
-	"time"
-
-	kutil "github.com/freiheit-com/kuberpult/cli/pkg/kuberpult_utils"
-)
-
-const (
-	DefaultTimeout = 180
 )
 
 func prepareHttpRequest(url string, authParams kutil.AuthenticationParameters, parsedArgs ReleaseParameters) (*http.Request, error) {
@@ -142,44 +134,3 @@ func prepareHttpRequest(url string, authParams kutil.AuthenticationParameters, p
 
 	return req, nil
 }
-
-func doRequest(request *http.Request) (*http.Response, []byte, error) {
-	//exhaustruct:ignore
-	client := &http.Client{
-		Timeout: DefaultTimeout * time.Second,
-	}
-
-	resp, err := client.Do(request)
-	if err != nil {
-		return nil, nil, fmt.Errorf("error issuing the HTTP request, error: %w", err)
-	}
-	defer resp.Body.Close()
-
-	body, err := io.ReadAll(resp.Body)
-	if err != nil {
-		return nil, nil, fmt.Errorf("unable to read response: %v with error: %w", resp, err)
-	}
-
-	return resp, body, nil
-}
-
-func issueHttpRequest(req http.Request, retries uint64) error {
-	var i uint64
-	for i = 0; i < retries+1; i++ {
-		response, body, err := doRequest(&req)
-		if err != nil {
-			log.Printf("error issuing http request: %v\n", err)
-		} else if response.StatusCode != http.StatusCreated && response.StatusCode != http.StatusOK {
-			log.Printf("Recieved response code %d - %s from Kuberpult\nResponse body:\n%s\n", response.StatusCode, http.StatusText(response.StatusCode), string(body))
-		} else {
-			log.Printf("Success: %d - %s\nResponse body:\n%s\n", response.StatusCode, http.StatusText(response.StatusCode), string(body))
-			return nil
-		}
-		if i < retries {
-			backoff := time.Duration(i+1) * time.Second
-			log.Printf("Retrying in %v...\n", backoff)
-			time.Sleep(backoff)
-		}
-	}
-	return fmt.Errorf("could not perform a successful call to kuberpult")
-}
diff --git a/cli/pkg/release/release.go b/cli/pkg/release/release.go
index 31b3533b8..98975b128 100644
--- a/cli/pkg/release/release.go
+++ b/cli/pkg/release/release.go
@@ -18,6 +18,7 @@ package release
 
 import (
 	"fmt"
+	"github.com/freiheit-com/kuberpult/cli/pkg/cli_utils"
 
 	kutil "github.com/freiheit-com/kuberpult/cli/pkg/kuberpult_utils"
 )
@@ -44,7 +45,7 @@ func Release(requestParams kutil.RequestParameters, authParams kutil.Authenticat
 	if err != nil {
 		return fmt.Errorf("error while preparing HTTP request, error: %w", err)
 	}
-	if err := issueHttpRequest(*req, requestParams.Retries); err != nil {
+	if err := cli_utils.IssueHttpRequest(*req, requestParams.Retries); err != nil {
 		return fmt.Errorf("error while issuing HTTP request, error: %v", err)
 	}
 	return nil

From ea23f1bf595635476c6dfbe6ce0c4739d13c8093 Mon Sep 17 00:00:00 2001
From: Sven Urbanski <sven.urbanski@freiheit.com>
Date: Fri, 16 Aug 2024 14:36:02 +0200
Subject: [PATCH 7/9] feat(ui): Display app locks more prominently (#1875)

Ref: SRX-KNBOC7

This renders app locks on the main page with a orange-ish background
color, as part of the service lane header (where the app name appears on
the home page). This was done to make locks more obvious.

Also added tooltips to the app name and team name.

Before:
![Screenshot from 2024-08-14
16-53-03](https://github.com/user-attachments/assets/7d56f7c5-4330-49f1-a7b9-b0064bf09a6f)

Now:
![Screenshot from 2024-08-14
16-52-34](https://github.com/user-attachments/assets/4be21de2-c24d-42db-b9bf-df44f7d92e9c)
---
 .../src/assets/_variables.scss                |  2 +
 .../components/ServiceLane/ServiceLane.scss   | 13 ++-
 .../ServiceLane/ServiceLane.test.tsx          | 82 +++++++++++++++++--
 .../ui/components/ServiceLane/ServiceLane.tsx | 19 ++---
 .../components/chip/EnvironmentGroupChip.tsx  | 28 ++-----
 .../src/ui/components/chip/chip.scss          | 21 +++++
 6 files changed, 125 insertions(+), 40 deletions(-)

diff --git a/services/frontend-service/src/assets/_variables.scss b/services/frontend-service/src/assets/_variables.scss
index 0ea112900..4e3ae8ad5 100644
--- a/services/frontend-service/src/assets/_variables.scss
+++ b/services/frontend-service/src/assets/_variables.scss
@@ -146,6 +146,8 @@ $main-content-padding: ($top-app-bar-height + 0.5em) 1em 1em ($nav-bar-width + 1
 
 $warning-color: #e0d541;
 
+$warning-color-locked: #ff8c00;
+
 :root {
     // Colors
     --mdc-theme-primary: #2d70d6;
diff --git a/services/frontend-service/src/ui/components/ServiceLane/ServiceLane.scss b/services/frontend-service/src/ui/components/ServiceLane/ServiceLane.scss
index d34dc2923..e5355e5a1 100644
--- a/services/frontend-service/src/ui/components/ServiceLane/ServiceLane.scss
+++ b/services/frontend-service/src/ui/components/ServiceLane/ServiceLane.scss
@@ -13,18 +13,27 @@ You should have received a copy of the MIT License
 along with kuberpult. If not, see <https://directory.fsf.org/wiki/License:Expat>.
 
 Copyright freiheit.com*/
+
+@import '../../../assets/variables';
+
 .service-lane__header {
     background: var(--mdc-theme-primary);
     color: var(--mdc-theme-on-primary);
     display: flex;
     align-items: center;
     justify-content: space-between;
-    padding: $service-lane-header-padding;
+    // the padding here has to be big enough, so that
+    // the border-radius of the whole lane does not break
+    padding: 0 4px 0 0;
     border-radius: $border-radius-medium;
     height: $service-lane-header-height;
 
     white-space: nowrap;
-    .service__name {
+    .service-lane-name {
+        margin-left: 5px;
+    }
+
+    .service-lane-wrapper {
         overflow: hidden;
         @extend .sub-headline1;
         display: flex;
diff --git a/services/frontend-service/src/ui/components/ServiceLane/ServiceLane.test.tsx b/services/frontend-service/src/ui/components/ServiceLane/ServiceLane.test.tsx
index 14f5ba61d..0b79f2a26 100644
--- a/services/frontend-service/src/ui/components/ServiceLane/ServiceLane.test.tsx
+++ b/services/frontend-service/src/ui/components/ServiceLane/ServiceLane.test.tsx
@@ -529,7 +529,7 @@ type TestDataAppLockSummary = TestData & {
     expected: string | undefined;
 };
 const dataAppLockSummary: TestDataAppLockSummary[] = (() => {
-    const appWith1Lock: Environment_Application = {
+    const appWith1AppLock: Environment_Application = {
         name: 'test1',
         version: 123,
         queuedVersion: 0,
@@ -540,6 +540,30 @@ const dataAppLockSummary: TestDataAppLockSummary[] = (() => {
         teamLocks: {},
         team: 'test-team',
     };
+    const appWith1TeamLock: Environment_Application = {
+        name: 'test1',
+        version: 123,
+        queuedVersion: 0,
+        undeployVersion: false,
+        locks: {},
+        teamLocks: {
+            l1: { message: 'test team lock', lockId: 't-1000' },
+        },
+        team: 'test-team',
+    };
+    const appWith1TeamLock1AppLock: Environment_Application = {
+        name: 'test1',
+        version: 123,
+        queuedVersion: 0,
+        undeployVersion: false,
+        locks: {
+            l1: { message: 'test app lock', lockId: 'a-1' },
+        },
+        teamLocks: {
+            l1: { message: 'test team lock', lockId: 't-1000' },
+        },
+        team: 'test-team',
+    };
     const appWith2Locks: Environment_Application = {
         name: 'test1',
         version: 123,
@@ -580,7 +604,7 @@ const dataAppLockSummary: TestDataAppLockSummary[] = (() => {
             expected: undefined,
         },
         {
-            name: 'test one lock',
+            name: 'test one app lock',
             renderedApp: {
                 name: 'test1',
                 releases: [],
@@ -593,17 +617,17 @@ const dataAppLockSummary: TestDataAppLockSummary[] = (() => {
                 {
                     name: 'foo2',
                     applications: {
-                        foo2: appWith1Lock,
+                        foo2: appWith1AppLock,
                     },
                     distanceToUpstream: 0,
                     priority: Priority.UPSTREAM,
                     locks: {},
                 },
             ],
-            expected: '"test1" has 1 application lock. Click on a tile to see details.',
+            expected: '"test1" has 1 lock. Click on a tile to see details.',
         },
         {
-            name: 'test two locks',
+            name: 'test two app locks',
             renderedApp: {
                 name: 'test1',
                 releases: [],
@@ -623,7 +647,53 @@ const dataAppLockSummary: TestDataAppLockSummary[] = (() => {
                     locks: {},
                 },
             ],
-            expected: '"test1" has 2 application locks. Click on a tile to see details.',
+            expected: '"test1" has 2 locks. Click on a tile to see details.',
+        },
+        {
+            name: 'test one team lock',
+            renderedApp: {
+                name: 'test1',
+                releases: [],
+                sourceRepoUrl: 'http://test2.com',
+                team: 'test-team',
+                undeploySummary: UndeploySummary.NORMAL,
+                warnings: [],
+            },
+            envs: [
+                {
+                    name: 'foo2',
+                    applications: {
+                        foo2: appWith1TeamLock,
+                    },
+                    distanceToUpstream: 0,
+                    priority: Priority.UPSTREAM,
+                    locks: {},
+                },
+            ],
+            expected: '"test1" has 1 lock. Click on a tile to see details.',
+        },
+        {
+            name: 'test one team + one app lock',
+            renderedApp: {
+                name: 'test1',
+                releases: [],
+                sourceRepoUrl: 'http://test2.com',
+                team: 'test-team',
+                undeploySummary: UndeploySummary.NORMAL,
+                warnings: [],
+            },
+            envs: [
+                {
+                    name: 'foo2',
+                    applications: {
+                        foo2: appWith1TeamLock1AppLock,
+                    },
+                    distanceToUpstream: 0,
+                    priority: Priority.UPSTREAM,
+                    locks: {},
+                },
+            ],
+            expected: '"test1" has 2 locks. Click on a tile to see details.',
         },
     ];
     return result;
diff --git a/services/frontend-service/src/ui/components/ServiceLane/ServiceLane.tsx b/services/frontend-service/src/ui/components/ServiceLane/ServiceLane.tsx
index 89357e7ec..aba96cd52 100644
--- a/services/frontend-service/src/ui/components/ServiceLane/ServiceLane.tsx
+++ b/services/frontend-service/src/ui/components/ServiceLane/ServiceLane.tsx
@@ -29,7 +29,7 @@ import { ReleaseCard } from '../ReleaseCard/ReleaseCard';
 import { DeleteWhite, HistoryWhite } from '../../../images';
 import { Application, Environment, UndeploySummary } from '../../../api/api';
 import * as React from 'react';
-import { AppLockSummary, TeamLockSummary } from '../chip/EnvironmentGroupChip';
+import { AppLockSummary } from '../chip/EnvironmentGroupChip';
 import { WarningBoxes } from './Warnings';
 import { DotsMenu, DotsMenuButton } from './DotsMenu';
 import { useCallback, useState } from 'react';
@@ -211,19 +211,16 @@ export const ServiceLane: React.FC<{ application: Application }> = (props) => {
         <div className="service-lane">
             {dialog}
             <div className="service-lane__header">
-                <div className="service__name">
-                    {application.team ? application.team : '<No Team> '}
-                    {teamLocks.length >= 1 && (
+                <div className="service-lane-wrapper">
+                    {appLocks.length + teamLocks.length >= 1 && (
                         <div className={'test-app-lock-summary'}>
-                            <TeamLockSummary team={application.team} numLocks={teamLocks.length} />
-                        </div>
-                    )}
-                    {' | ' + application.name}
-                    {appLocks.length >= 1 && (
-                        <div className={'test-app-lock-summary'}>
-                            <AppLockSummary app={application.name} numLocks={appLocks.length} />
+                            <AppLockSummary app={application.name} numLocks={appLocks.length + teamLocks.length} />
                         </div>
                     )}
+                    <div className={'service-lane-name'}>
+                        <span title={'team name'}>{application.team ? application.team : '<No Team> '} </span>
+                        {' | '} <span title={'app name'}> {application.name}</span>
+                    </div>
                 </div>
                 <div className="service__actions__">{dotsMenu}</div>
             </div>
diff --git a/services/frontend-service/src/ui/components/chip/EnvironmentGroupChip.tsx b/services/frontend-service/src/ui/components/chip/EnvironmentGroupChip.tsx
index 26943ba6e..501a13554 100644
--- a/services/frontend-service/src/ui/components/chip/EnvironmentGroupChip.tsx
+++ b/services/frontend-service/src/ui/components/chip/EnvironmentGroupChip.tsx
@@ -33,28 +33,14 @@ export const AppLockSummary: React.FC<{
     const plural = numLocks === 1 ? 'lock' : 'locks';
     return (
         <div
+            className={'app-lock-summary'}
             key={'app-lock-hint-' + app}
-            title={'"' + app + '" has ' + numLocks + ' application ' + plural + '. Click on a tile to see details.'}>
-            <div>
-                &nbsp;
-                <LocksWhite className="env-card-env-lock-icon" width="16px" height="16px" />
-            </div>
-        </div>
-    );
-};
-
-export const TeamLockSummary: React.FC<{
-    team: string;
-    numLocks: number;
-}> = ({ team, numLocks }) => {
-    const plural = numLocks === 1 ? 'lock' : 'locks';
-    return (
-        <div
-            key={'app-lock-hint-' + team}
-            title={'"' + team + '" has ' + numLocks + ' team ' + plural + '. Click on an icon to see details.'}>
-            <div>
-                &nbsp;
-                <LocksWhite className="env-card-env-lock-icon" width="16px" height="16px" />
+            title={'"' + app + '" has ' + numLocks + ' ' + plural + '. Click on a tile to see details.'}>
+            <div className={'app-lock-summary-wrapper'}>
+                <div className={'app-lock-summary-lock'}>
+                    <LocksWhite className="env-card-env-lock-icon" width="20px" height="20px" />
+                </div>
+                <div className={'app-lock-summary-text'}>Locked</div>
             </div>
         </div>
     );
diff --git a/services/frontend-service/src/ui/components/chip/chip.scss b/services/frontend-service/src/ui/components/chip/chip.scss
index 1f3b56397..799d5689c 100644
--- a/services/frontend-service/src/ui/components/chip/chip.scss
+++ b/services/frontend-service/src/ui/components/chip/chip.scss
@@ -14,6 +14,7 @@ along with kuberpult. If not, see <https://directory.fsf.org/wiki/License:Expat>
 
 Copyright freiheit.com*/
 @use '@material/chips/styles';
+@import '../../../assets/variables';
 
 .mdc-evolution-chip {
     height: $env-chip-height;
@@ -71,3 +72,23 @@ Copyright freiheit.com*/
 .environment-priority-unrecognized {
     background-color: $env-color-unrecognized;
 }
+
+.app-lock-summary {
+    min-width: 4.5em;
+    background-color: $warning-color-locked;
+    border-radius: 6px;
+
+    .app-lock-summary-wrapper {
+        display: flex;
+        margin-left: 6px;
+        margin-right: 6px;
+    }
+
+    .app-lock-summary-text {
+        font-size: small;
+        line-height: 40px;
+    }
+    .app-lock-summary-lock {
+        margin-top: 8px;
+    }
+}

From 0b0c8e3a215481fa4fe3687a4785b7d4d6ead244 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Correia?=
 <101414931+0lione@users.noreply.github.com>
Date: Fri, 16 Aug 2024 14:15:48 +0100
Subject: [PATCH 8/9] feat(ui): Make commit bubble clickable (#1887)

BEFORE:


https://github.com/user-attachments/assets/6edd63e2-6b7d-4b90-a309-5c129fdfefa5

AFTER:


https://github.com/user-attachments/assets/f3269baf-3efd-4e72-8594-0e72ece6b75c


Ref: SRX-RXAQ2D
---
 .../ui/components/ServiceLane/ServiceLane.scss    | 14 ++++++++++++++
 .../components/ServiceLane/ServiceLane.test.tsx   | 12 ++++++++++--
 .../src/ui/components/ServiceLane/ServiceLane.tsx | 15 ++++++++++++---
 3 files changed, 36 insertions(+), 5 deletions(-)

diff --git a/services/frontend-service/src/ui/components/ServiceLane/ServiceLane.scss b/services/frontend-service/src/ui/components/ServiceLane/ServiceLane.scss
index e5355e5a1..9deb2a6f5 100644
--- a/services/frontend-service/src/ui/components/ServiceLane/ServiceLane.scss
+++ b/services/frontend-service/src/ui/components/ServiceLane/ServiceLane.scss
@@ -68,6 +68,7 @@ Copyright freiheit.com*/
     align-self: center;
     justify-content: space-evenly;
     width: $service-lane-diff-element-width;
+    opacity: 100%;
 
     .service-lane__diff--number {
         @extend .text-bold;
@@ -94,3 +95,16 @@ Copyright freiheit.com*/
         border-radius: $border-radius-large;
     }
 }
+.service-lane__diff--container:hover {
+    cursor: pointer;
+    opacity: 60%;
+    .service-lane__diff--number {
+        background-color: var(--mdc-theme-surface, #fff);
+    }
+}
+
+.service-lane__diff--container:active {
+    .service-lane__diff--number {
+        transform: translateY(4px);
+    }
+}
diff --git a/services/frontend-service/src/ui/components/ServiceLane/ServiceLane.test.tsx b/services/frontend-service/src/ui/components/ServiceLane/ServiceLane.test.tsx
index 0b79f2a26..a6b41d997 100644
--- a/services/frontend-service/src/ui/components/ServiceLane/ServiceLane.test.tsx
+++ b/services/frontend-service/src/ui/components/ServiceLane/ServiceLane.test.tsx
@@ -13,8 +13,8 @@ You should have received a copy of the MIT License
 along with kuberpult. If not, see <https://directory.fsf.org/wiki/License:Expat>.
 
 Copyright freiheit.com*/
-import { render } from '@testing-library/react';
-import { ServiceLane } from './ServiceLane';
+import { render, screen, fireEvent } from '@testing-library/react';
+import { ServiceLane, DiffElement } from './ServiceLane';
 import { UpdateOverview } from '../../utils/store';
 import { Spy } from 'spy4js';
 import {
@@ -731,3 +731,11 @@ describe('Service Lane AppLockSummary', () => {
         });
     });
 });
+
+test('Hidden commits button', () => {
+    const testClick = jest.fn();
+    render(<DiffElement diff={3} title="test" navCallback={testClick} />);
+    const button = screen.getAllByTestId('hidden-commits-button')[0];
+    fireEvent.click(button);
+    expect(testClick).toBeCalled();
+});
diff --git a/services/frontend-service/src/ui/components/ServiceLane/ServiceLane.tsx b/services/frontend-service/src/ui/components/ServiceLane/ServiceLane.tsx
index aba96cd52..664be8278 100644
--- a/services/frontend-service/src/ui/components/ServiceLane/ServiceLane.tsx
+++ b/services/frontend-service/src/ui/components/ServiceLane/ServiceLane.tsx
@@ -62,8 +62,16 @@ function getNumberOfReleasesBetween(releases: number[], higherVersion: number, l
     return releases.findIndex((ver) => ver === lowerVersion) - releases.findIndex((ver) => ver === higherVersion) - 1;
 }
 
-const DiffElement: React.FC<{ diff: number; title: string }> = ({ diff, title }) => (
-    <div className="service-lane__diff--container" title={title}>
+export const DiffElement: React.FC<{ diff: number; title: string; navCallback: () => void }> = ({
+    diff,
+    title,
+    navCallback,
+}) => (
+    <div
+        className="service-lane__diff--container"
+        title={title}
+        onClick={navCallback}
+        data-testid="hidden-commits-button">
         <div className="service-lane__diff--dot" />
         <div className="service-lane__diff--dot" />
         <div className="service-lane__diff--number">{diff}</div>
@@ -135,7 +143,8 @@ export const ServiceLane: React.FC<{ application: Application }> = (props) => {
                     {!!diff && (
                         <DiffElement
                             diff={diff}
-                            title={'There are ' + diff + ' more releases hidden. Click on History to view more'}
+                            title={'There are ' + diff + ' more releases hidden. Click me to view more.'}
+                            navCallback={navCallback}
                         />
                     )}
                 </div>

From 77403ebc7ec104452b25458cc38bc4d9e3a42c0b Mon Sep 17 00:00:00 2001
From: Miguel Crespo <162333021+miguel-crespo-fdc@users.noreply.github.com>
Date: Fri, 16 Aug 2024 14:36:12 +0100
Subject: [PATCH 9/9] feat(cli): cli create app locks (#1886)

App lock creation on CLI.

Ref: SRX-QMIIYB

---------

Co-authored-by: Sven Urbanski <sven.urbanski@freiheit.com>
---
 cli/pkg/cmd/cli.go                     |   2 +
 cli/pkg/cmd/handlers.go                |  10 ++
 cli/pkg/locks/app_lock_parsing.go      | 106 ++++++++++++++
 cli/pkg/locks/app_lock_parsing_test.go | 191 +++++++++++++++++++++++++
 cli/pkg/locks/lock.go                  |  39 ++++-
 5 files changed, 344 insertions(+), 4 deletions(-)
 create mode 100644 cli/pkg/locks/app_lock_parsing.go
 create mode 100644 cli/pkg/locks/app_lock_parsing_test.go

diff --git a/cli/pkg/cmd/cli.go b/cli/pkg/cmd/cli.go
index 6e6204723..6efd4638a 100644
--- a/cli/pkg/cmd/cli.go
+++ b/cli/pkg/cmd/cli.go
@@ -69,6 +69,8 @@ func RunCLI() ReturnCode {
 		return handleRelease(*kpClientParams, subflags)
 	case "create-env-lock":
 		return handleCreateEnvLock(*kpClientParams, subflags)
+	case "create-app-lock":
+		return handleCreateAppLock(*kpClientParams, subflags)
 	default:
 		log.Printf("unknown subcommand %s\n", subcommand)
 		return ReturnCodeInvalidArguments
diff --git a/cli/pkg/cmd/handlers.go b/cli/pkg/cmd/handlers.go
index 8ebd375b6..19f6be100 100644
--- a/cli/pkg/cmd/handlers.go
+++ b/cli/pkg/cmd/handlers.go
@@ -63,6 +63,16 @@ func handleCreateEnvLock(kpClientParams kuberpultClientParameters, args []string
 	return handleCreateLock(kpClientParams, parsedArgs)
 }
 
+func handleCreateAppLock(kpClientParams kuberpultClientParameters, args []string) ReturnCode {
+	parsedArgs, err := locks.ParseArgsCreateAppLock(args)
+
+	if err != nil {
+		log.Printf("error while parsing command line args, error: %v", err)
+		return ReturnCodeInvalidArguments
+	}
+	return handleCreateLock(kpClientParams, parsedArgs)
+}
+
 func handleCreateLock(kpClientParams kuberpultClientParameters, parsedArgs locks.LockParameters) ReturnCode {
 	authParams := kutil.AuthenticationParameters{
 		IapToken:    kpClientParams.iapToken,
diff --git a/cli/pkg/locks/app_lock_parsing.go b/cli/pkg/locks/app_lock_parsing.go
new file mode 100644
index 000000000..ffacbfdbc
--- /dev/null
+++ b/cli/pkg/locks/app_lock_parsing.go
@@ -0,0 +1,106 @@
+/*This file is part of kuberpult.
+
+Kuberpult is free software: you can redistribute it and/or modify
+it under the terms of the Expat(MIT) License as published by
+the Free Software Foundation.
+
+Kuberpult is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+MIT License for more details.
+
+You should have received a copy of the MIT License
+along with kuberpult. If not, see <https://directory.fsf.org/wiki/License:Expat>.
+
+Copyright freiheit.com*/
+
+package locks
+
+import (
+	"flag"
+	"fmt"
+	"strings"
+
+	"github.com/freiheit-com/kuberpult/cli/pkg/cli_utils"
+)
+
+type CreateAppLockCommandLineArguments struct {
+	environment          cli_utils.RepeatedString
+	lockId               cli_utils.RepeatedString
+	message              cli_utils.RepeatedString
+	application          cli_utils.RepeatedString
+	useDexAuthentication bool
+}
+
+func argsValidCreateAppLock(cmdArgs *CreateAppLockCommandLineArguments) (result bool, errorMessage string) {
+	if len(cmdArgs.lockId.Values) != 1 {
+		return false, "the --lockID arg must be set exactly once"
+	}
+	if len(cmdArgs.environment.Values) != 1 {
+		return false, "the --environment arg must be set exactly once"
+	}
+	if len(cmdArgs.application.Values) != 1 {
+		return false, "the --application arg must be set exactly once"
+	}
+	if len(cmdArgs.message.Values) > 1 {
+		return false, "the --message arg must be set at most once"
+	}
+
+	return true, ""
+}
+
+func readCreateAppLockArgs(args []string) (*CreateAppLockCommandLineArguments, error) {
+	cmdArgs := CreateAppLockCommandLineArguments{} //exhaustruct:ignore
+
+	fs := flag.NewFlagSet("flag set", flag.ContinueOnError)
+
+	fs.Var(&cmdArgs.lockId, "lockID", "the ID of the lock you are trying to create")
+	fs.Var(&cmdArgs.environment, "environment", "the environment to lock")
+	fs.Var(&cmdArgs.message, "message", "lock message")
+	fs.Var(&cmdArgs.application, "application", "application to lock")
+	fs.BoolVar(&cmdArgs.useDexAuthentication, "use_dex_auth", false, "if set to true, the /api/* endpoint will be used. Dex must be enabled on the server side and a dex token must be provided, otherwise the request will be denied")
+
+	if err := fs.Parse(args); err != nil {
+		return nil, fmt.Errorf("error while parsing command line arguments, error: %w", err)
+	}
+
+	if len(fs.Args()) != 0 { // kuberpult-cli release does not accept any positional arguments, so this is an error
+		return nil, fmt.Errorf("these arguments are not recognized: \"%v\"", strings.Join(fs.Args(), " "))
+	}
+
+	if ok, msg := argsValidCreateAppLock(&cmdArgs); !ok {
+		return nil, fmt.Errorf(msg)
+	}
+
+	return &cmdArgs, nil
+}
+
+func convertToCreateAppLockParams(cmdArgs CreateAppLockCommandLineArguments) (LockParameters, error) {
+	if ok, msg := argsValidCreateAppLock(&cmdArgs); !ok {
+		return nil, fmt.Errorf("the provided command line arguments structure is invalid, cause: %s", msg)
+	}
+
+	rp := AppLockParameters{
+		LockId:               cmdArgs.lockId.Values[0],
+		Environment:          cmdArgs.environment.Values[0],
+		Application:          cmdArgs.application.Values[0],
+		Message:              "",
+		UseDexAuthentication: cmdArgs.useDexAuthentication,
+	}
+	if len(cmdArgs.message.Values) != 0 {
+		rp.Message = cmdArgs.message.Values[0]
+	}
+	return &rp, nil
+}
+
+func ParseArgsCreateAppLock(args []string) (LockParameters, error) {
+	cmdArgs, err := readCreateAppLockArgs(args)
+	if err != nil {
+		return nil, fmt.Errorf("error while reading command line arguments for creating an app lock, error: %w", err)
+	}
+	rp, err := convertToCreateAppLockParams(*cmdArgs)
+	if err != nil {
+		return nil, fmt.Errorf("error while creating parameters for creating an application lock, error: %w", err)
+	}
+	return rp, nil
+}
diff --git a/cli/pkg/locks/app_lock_parsing_test.go b/cli/pkg/locks/app_lock_parsing_test.go
new file mode 100644
index 000000000..fd44a4a2a
--- /dev/null
+++ b/cli/pkg/locks/app_lock_parsing_test.go
@@ -0,0 +1,191 @@
+/*This file is part of kuberpult.
+
+Kuberpult is free software: you can redistribute it and/or modify
+it under the terms of the Expat(MIT) License as published by
+the Free Software Foundation.
+
+Kuberpult is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+MIT License for more details.
+
+You should have received a copy of the MIT License
+along with kuberpult. If not, see <https://directory.fsf.org/wiki/License:Expat>.
+
+Copyright freiheit.com*/
+
+package locks
+
+import (
+	"testing"
+
+	"github.com/google/go-cmp/cmp"
+	"github.com/google/go-cmp/cmp/cmpopts"
+
+	"github.com/freiheit-com/kuberpult/cli/pkg/cli_utils"
+)
+
+func TestReadArgsAppLock(t *testing.T) {
+	type testCase struct {
+		name            string
+		args            []string
+		expectedCmdArgs *CreateAppLockCommandLineArguments
+		expectedError   error
+	}
+
+	tcs := []testCase{
+		{
+			name: "some unrecognized positional arguments",
+			args: []string{"potato", "tomato"},
+			expectedError: errMatcher{
+				msg: "these arguments are not recognized: \"potato tomato\"",
+			},
+		},
+		{
+			name: "some flags that don't exist",
+			args: []string{"--environment", "development", "--potato", "tomato"},
+			expectedError: errMatcher{
+				msg: "error while parsing command line arguments, error: flag provided but not defined: -potato",
+			},
+		},
+		{
+			name: "nothing provided",
+			args: []string{},
+			expectedError: errMatcher{
+				msg: "the --lockID arg must be set exactly once",
+			},
+		},
+		{
+			name: "lockID is not provided",
+			args: []string{"--environment", "development", "--application", "my-app", "--message", "\"my message\""},
+			expectedError: errMatcher{
+				msg: "the --lockID arg must be set exactly once",
+			},
+		},
+		{
+			name: "environment is not provided",
+			args: []string{"--application", "my-app", "--lockID", "my-lock", "--message", "\"my message\""},
+			expectedError: errMatcher{
+				msg: "the --environment arg must be set exactly once",
+			},
+		},
+		{
+			name: "application is not provided",
+			args: []string{"--environment", "development", "--lockID", "my-lock", "--message", "\"my message\""},
+			expectedError: errMatcher{
+				msg: "the --application arg must be set exactly once",
+			},
+		},
+		{
+			name: "only --lockID is properly provided but without --environment",
+			args: []string{"--lockID", "potato"},
+			expectedError: errMatcher{
+				msg: "the --environment arg must be set exactly once",
+			},
+		},
+		{
+			name: "environment, lockID, application and message are are specified",
+			args: []string{"--environment", "development", "--application", "my-app", "--lockID", "my-lock", "--message", "\"my message\""},
+			expectedCmdArgs: &CreateAppLockCommandLineArguments{
+				environment: cli_utils.RepeatedString{
+					Values: []string{
+						"development",
+					},
+				},
+				lockId: cli_utils.RepeatedString{
+					Values: []string{
+						"my-lock",
+					},
+				},
+				message: cli_utils.RepeatedString{
+					Values: []string{
+						"\"my message\"",
+					},
+				},
+				application: cli_utils.RepeatedString{
+					Values: []string{
+						"my-app",
+					},
+				},
+			},
+		},
+	}
+
+	for _, tc := range tcs {
+		tc := tc
+		t.Run(tc.name, func(t *testing.T) {
+			t.Parallel()
+
+			cmdArgs, err := readCreateAppLockArgs(tc.args)
+			// check errors
+			if diff := cmp.Diff(tc.expectedError, err, cmpopts.EquateErrors()); diff != "" {
+				t.Fatalf("error mismatch (-want, +got):\n%s", diff)
+			}
+
+			if diff := cmp.Diff(cmdArgs, tc.expectedCmdArgs, cmp.AllowUnexported(CreateAppLockCommandLineArguments{})); diff != "" {
+				t.Fatalf("expected args:\n  %v\n, got:\n  %v, diff:\n  %s\n", tc.expectedCmdArgs, cmdArgs, diff)
+			}
+		})
+	}
+}
+
+func TestParseArgsCreateAppLock(t *testing.T) {
+	type testCase struct {
+		name           string
+		cmdArgs        []string
+		expectedParams LockParameters
+		expectedError  error
+	}
+
+	tcs := []testCase{
+		{
+			name:    "with environment and lockID and message",
+			cmdArgs: []string{"--environment", "development", "--application", "my-app", "--lockID", "my-lock", "--message", "message"},
+			expectedParams: &AppLockParameters{
+				Environment: "development",
+				LockId:      "my-lock",
+				Message:     "message",
+				Application: "my-app",
+			},
+		},
+		{
+			name:    "with environment, app and lockID and no message",
+			cmdArgs: []string{"--environment", "development", "--application", "my-app", "--lockID", "my-lock"},
+			expectedParams: &AppLockParameters{
+				Environment: "development",
+				LockId:      "my-lock",
+				Message:     "",
+				Application: "my-app",
+			},
+		},
+
+		{
+			name:    "with environment and lockID and multi word message message",
+			cmdArgs: []string{"--environment", "development", "--application", "my-app", "--lockID", "my-lock", "--message", "this is a very long message"},
+			expectedParams: &AppLockParameters{
+				Environment: "development",
+				LockId:      "my-lock",
+				Application: "my-app",
+				Message:     "this is a very long message",
+			},
+		},
+	}
+
+	for _, tc := range tcs {
+		tc := tc
+		t.Run(tc.name, func(t *testing.T) {
+			t.Parallel()
+
+			params, err := ParseArgsCreateAppLock(tc.cmdArgs)
+			// check errors
+			if diff := cmp.Diff(tc.expectedError, err, cmpopts.EquateErrors()); diff != "" {
+				t.Fatalf("error mismatch (-want, +got):\n%s", diff)
+			}
+
+			// check result
+			if diff := cmp.Diff(tc.expectedParams, params); diff != "" {
+				t.Fatalf("expected args:\n  %v\n, got:\n  %v\n, diff:\n  %s\n", tc.expectedParams, params, diff)
+			}
+		})
+	}
+}
diff --git a/cli/pkg/locks/lock.go b/cli/pkg/locks/lock.go
index eba20fe3d..7c41466b1 100644
--- a/cli/pkg/locks/lock.go
+++ b/cli/pkg/locks/lock.go
@@ -28,7 +28,7 @@ import (
 )
 
 type LockParameters interface {
-	GetPath() string
+	GetRestPath() string
 	FillForm() (*HttpFormDataInfo, error)
 }
 
@@ -39,6 +39,14 @@ type EnvironmentLockParameters struct {
 	UseDexAuthentication bool
 }
 
+type AppLockParameters struct {
+	Environment          string
+	LockId               string
+	Message              string
+	Application          string
+	UseDexAuthentication bool
+}
+
 type LockJsonData struct {
 	Message string `json:"message"`
 }
@@ -49,12 +57,12 @@ type HttpFormDataInfo struct {
 }
 
 func CreateLock(requestParams kutil.RequestParameters, authParams kutil.AuthenticationParameters, params LockParameters) error {
-	path := params.GetPath()
+	restPath := params.GetRestPath()
 	data, err := params.FillForm()
 	if err != nil {
 		return fmt.Errorf("error while preparing HTTP request. Could not fill form error: %w", err)
 	}
-	req, err := createHttpRequest(*requestParams.Url, path, authParams, data)
+	req, err := createHttpRequest(*requestParams.Url, restPath, authParams, data)
 
 	if err != nil {
 		return fmt.Errorf("error while preparing HTTP request, error: %w", err)
@@ -65,7 +73,7 @@ func CreateLock(requestParams kutil.RequestParameters, authParams kutil.Authenti
 	return nil
 }
 
-func (e *EnvironmentLockParameters) GetPath() string {
+func (e *EnvironmentLockParameters) GetRestPath() string {
 	prefix := "environments"
 	if e.UseDexAuthentication {
 		prefix = "api/environments"
@@ -88,6 +96,29 @@ func (e *EnvironmentLockParameters) FillForm() (*HttpFormDataInfo, error) {
 	}, nil
 }
 
+func (e *AppLockParameters) GetRestPath() string {
+	prefix := "environments"
+	if e.UseDexAuthentication {
+		prefix = "api/environments"
+	}
+
+	return fmt.Sprintf("%s/%s/applications/%s/locks/%s", prefix, e.Environment, e.Application, e.LockId)
+}
+
+func (e *AppLockParameters) FillForm() (*HttpFormDataInfo, error) {
+	d := LockJsonData{
+		Message: e.Message,
+	}
+	var jsonData, err = json.Marshal(d)
+	if err != nil {
+		return nil, fmt.Errorf("Could not marshal AppLockParameters data to json: %w\n", err)
+	}
+	return &HttpFormDataInfo{
+		jsonData:    jsonData,
+		ContentType: "application/json",
+	}, nil
+}
+
 func createHttpRequest(url string, path string, authParams kutil.AuthenticationParameters, requestInfo *HttpFormDataInfo) (*http.Request, error) {
 	urlStruct, err := urllib.Parse(url)
 	if err != nil {