From cc1418bc46d0306a37f53a0044d9bc4787465819 Mon Sep 17 00:00:00 2001
From: dvankeke <dvankeke@akamai.com>
Date: Tue, 30 Jun 2026 14:47:32 +0200
Subject: [PATCH 1/3] fix: remove password field from git get request

---
 src/openapi/api.yaml |  6 ++++--
 src/openapi/git.yaml | 31 +++++++++++++++++++++++++++++--
 src/otomi-stack.ts   |  4 ++--
 3 files changed, 35 insertions(+), 6 deletions(-)

diff --git a/src/openapi/api.yaml b/src/openapi/api.yaml
index 055fdda9..6cde29fc 100644
--- a/src/openapi/api.yaml
+++ b/src/openapi/api.yaml
@@ -2037,14 +2037,14 @@ paths:
       x-eov-operation-handler: v2/git
       summary: Get Git settings
       description: Get the current Git configuration.
-      x-aclSchema: AplGit
+      x-aclSchema: GetGitSettings
       responses:
         '200':
           description: Current Git settings
           content:
             application/json:
               schema:
-                $ref: '#/components/schemas/AplGit'
+                $ref: '#/components/schemas/GetGitSettings'
         '401':
           description: Unauthorized
         '403':
@@ -2626,6 +2626,8 @@ components:
       $ref: 'git.yaml#/AplApiStatus'
     AplGit:
       $ref: 'git.yaml#/AplGit'
+    GetGitSettings:
+      $ref: 'git.yaml#/GetGitSettings'
     Build:
       $ref: 'build.yaml#/Build'
     Cloudtty:
diff --git a/src/openapi/git.yaml b/src/openapi/git.yaml
index 9aa83453..00265b4b 100644
--- a/src/openapi/git.yaml
+++ b/src/openapi/git.yaml
@@ -3,8 +3,6 @@ AplGit:
     platformAdmin:
       - read-any
       - update-any
-    teamAdmin:
-      - read-any
   type: object
   additionalProperties: false
   properties:
@@ -31,6 +29,35 @@ AplGit:
     - branch
     - password
 
+GetGitSettings:
+  x-acl:
+    platformAdmin:
+      - read-any
+      - update-any
+    teamAdmin:
+      - read-any
+  type: object
+  additionalProperties: false
+  properties:
+    repoUrl:
+      type: string
+      pattern: '^https?://.+'
+      description: URL of the new git remote to migrate the values repository to.
+    username:
+      type: string
+      description: Optional git username for authentication.
+    email:
+      type: string
+      format: email
+      description: Email address to use for git commits.
+    branch:
+      type: string
+      description: Git branch to push to on the new remote.
+  required:
+    - repoUrl
+    - email
+    - branch
+
 AplApiStatus:
   x-acl:
     platformAdmin:
diff --git a/src/otomi-stack.ts b/src/otomi-stack.ts
index 5f135743..cc2df8f9 100644
--- a/src/otomi-stack.ts
+++ b/src/otomi-stack.ts
@@ -1,8 +1,8 @@
 import {
   ApiException,
   CoreV1Api,
-  KubeConfig,
   User as k8sUser,
+  KubeConfig,
   V1ObjectReference,
   V1Secret,
 } from '@kubernetes/client-node'
@@ -132,6 +132,7 @@ import { parse as parseYaml, stringify as stringifyYaml } from 'yaml'
 import { getAIModels } from './ai/aiModelHandler'
 import { DatabaseCR } from './ai/DatabaseCR'
 import { getResourceFilePath } from './fileStore/file-map'
+import { getAuthenticatedUrl } from './git/connect'
 import {
   checkPodExists,
   getCloudttyActiveTime,
@@ -176,7 +177,6 @@ import {
 } from './utils/userUtils'
 import { defineClusterId, ObjectStorageClient } from './utils/wizardUtils'
 import { fetchWorkloadCatalog, isInteralGiteaURL } from './utils/workloadUtils'
-import { getAuthenticatedUrl } from './git/connect'
 
 interface ExcludedApp extends App {
   managed: boolean

From 96b14b4ef48c5314aa1ebbbe5b03c1c36283aeb9 Mon Sep 17 00:00:00 2001
From: Dennis van Kekem <38350840+dennisvankekem@users.noreply.github.com>
Date: Tue, 30 Jun 2026 15:06:49 +0200
Subject: [PATCH 2/3] Potential fix for pull request finding

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
---
 src/openapi/git.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/openapi/git.yaml b/src/openapi/git.yaml
index 00265b4b..6b95fba3 100644
--- a/src/openapi/git.yaml
+++ b/src/openapi/git.yaml
@@ -42,7 +42,7 @@ GetGitSettings:
     repoUrl:
       type: string
       pattern: '^https?://.+'
-      description: URL of the new git remote to migrate the values repository to.
+      description: Current git remote URL for the values repository.
     username:
       type: string
       description: Optional git username for authentication.

From 405de5d8ad23b8832b00f0035195af9d8fb43e6e Mon Sep 17 00:00:00 2001
From: Dennis van Kekem <38350840+dennisvankekem@users.noreply.github.com>
Date: Tue, 30 Jun 2026 15:06:56 +0200
Subject: [PATCH 3/3] Potential fix for pull request finding

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
---
 src/openapi/git.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/openapi/git.yaml b/src/openapi/git.yaml
index 6b95fba3..a124c4ab 100644
--- a/src/openapi/git.yaml
+++ b/src/openapi/git.yaml
@@ -52,7 +52,7 @@ GetGitSettings:
       description: Email address to use for git commits.
     branch:
       type: string
-      description: Git branch to push to on the new remote.
+      description: Current configured git branch for the values repository.
   required:
     - repoUrl
     - email