Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions src/openapi/api.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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':
Expand Down Expand Up @@ -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:
Expand Down
31 changes: 29 additions & 2 deletions src/openapi/git.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@ AplGit:
platformAdmin:
- read-any
- update-any
teamAdmin:
- read-any
type: object
additionalProperties: false
properties:
Expand All @@ -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: Current git remote URL for the values repository.
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: Current configured git branch for the values repository.
required:
- repoUrl
- email
- branch

AplApiStatus:
x-acl:
platformAdmin:
Expand Down
4 changes: 2 additions & 2 deletions src/otomi-stack.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import {
ApiException,
CoreV1Api,
KubeConfig,
User as k8sUser,
KubeConfig,
V1ObjectReference,
V1Secret,
} from '@kubernetes/client-node'
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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
Expand Down
Loading