feat: new build page

src/api/v1/repoBranches.ts

@@ -0,0 +1,19 @@
+import Debug from 'debug'
+import { Operation, OperationHandlerArray } from 'express-openapi'
+import { OpenApiRequestExt } from 'src/otomi-models'
+
+const debug = Debug('otomi:api:repoBranches')
+
+export default function (): OperationHandlerArray {
+  const get: Operation = [
+    async ({ otomi, query }: OpenApiRequestExt, res): Promise<void> => {
+      debug(`getRepoBranches`, query)
+      const { codeRepoName, teamId }: { codeRepoName: string; teamId: string } = query as any
+      res.json(await otomi.getRepoBranches(codeRepoName, teamId))
+    },
+  ]
+  const api = {
+    get,
+  }
+  return api
+}

src/openapi/api.yaml

@@ -2247,10 +2247,36 @@ paths:
               schema:
                 $ref: '#/components/schemas/SettingsInfo'
 
+  /v1/repoBranches:
+    get:
+      operationId: getRepoBranches
+      description: Get repo branches from the git providers.
+      x-aclSchema: RepoBranches
+      parameters:
+        - name: codeRepoName
+          in: query
+          description: Name of the code repository
+          schema:
+            type: string
+        - name: teamId
+          in: query
+          description: Id of the team
+          schema:
+            type: string
+      responses:
+        '200':
+          description: The request is successful.
+          content:
+            application/json:
+              schema:
+                type: array
+                items:
+                  type: string
+
   /v1/testRepoConnect:
     get:
       operationId: getTestRepoConnect
-      description: Get settings information from the 'settings.yaml' file.
+      description: Get test repo connect information from the git providers.
       x-aclSchema: TestRepoConnect
       parameters:
         - name: url
@@ -2912,6 +2938,8 @@ components:
       $ref: 'settings.yaml#/Settings'
     SettingsInfo:
       $ref: 'settingsinfo.yaml#/SettingsInfo'
+    RepoBranches:
+      $ref: 'repobranches.yaml#/RepoBranches'
     TestRepoConnect:
       $ref: 'testrepoconnect.yaml#/TestRepoConnect'
     InternalRepoUrls:

src/openapi/build.yaml

@@ -26,6 +26,9 @@ Build:
       title: Name
       $ref: 'definitions.yaml#/idName'
       description: Results in image name harbor.<your-domain>/<team-name>/name.
+    imageName:
+      title: Image name
+      $ref: 'definitions.yaml#/idName'
     tag:
       $ref: 'definitions.yaml#/imageTag'
       default: latest
@@ -53,6 +56,9 @@ Build:
 AplBuildSpec:
   type: object
   properties:
+    imageName:
+      title: Image name
+      $ref: 'definitions.yaml#/idName'
     tag:
       $ref: 'definitions.yaml#/imageTag'
       default: latest

src/openapi/repobranches.yaml

@@ -0,0 +1,7 @@
+RepoBranches:
+  x-acl:
+    platformAdmin: [read-any]
+    teamAdmin: [read-any]
+    teamMember: [read]
+  properties: {}
+  type: object

src/otomi-models.ts

@@ -30,6 +30,7 @@ export type Session = components['schemas']['Session']
 export type ObjWizard = components['schemas']['ObjWizard']
 export type Settings = components['schemas']['Settings']
 export type SettingsInfo = components['schemas']['SettingsInfo']
+export type RepoBranches = components['schemas']['RepoBranches']
 export type TestRepoConnect = components['schemas']['TestRepoConnect']
 export type InternalRepoUrls = components['schemas']['InternalRepoUrls']
 export type Team = components['schemas']['Team']

src/otomi-stack.ts

@@ -105,15 +105,17 @@ import { TeamConfigService } from './services/TeamConfigService'
 import { validateBackupFields } from './utils/backupUtils'
 import {
   getGiteaRepoUrls,
+  getPrivateRepoBranches,
+  getPublicRepoBranches,
   normalizeRepoUrl,
   testPrivateRepoConnect,
   testPublicRepoConnect,
 } from './utils/codeRepoUtils'
+import { getAplObjectFromV1, getV1MergeObject, getV1ObjectFromApl, getV1SealedSecretFromApl } from './utils/manifests'
 import { getEncryptedData, sealedSecretManifest, SealedSecretManifestType } from './utils/sealedSecretUtils'
 import { getKeycloakUsers, isValidUsername } from './utils/userUtils'
 import { ObjectStorageClient } from './utils/wizardUtils'
 import { fetchChartYaml, fetchWorkloadCatalog, NewHelmChartValues, sparseCloneChart } from './utils/workloadUtils'
-import { getAplObjectFromV1, getV1MergeObject, getV1ObjectFromApl, getV1SealedSecretFromApl } from './utils/manifests'
 
 interface ExcludedApp extends App {
   managed: boolean
@@ -1275,8 +1277,11 @@ export default class OtomiStack {
   }
 
   async createAplCodeRepo(teamId: string, data: AplCodeRepoRequest): Promise<AplCodeRepoResponse> {
+    const allRepoUrls = this.getAllAplCodeRepos().map((repo) => repo.spec.repositoryUrl) || []
+    if (allRepoUrls.includes(data.spec.repositoryUrl)) throw new AlreadyExists('Code repository URL already exists')
+    if (!data.spec.private) unset(data.spec, 'secret')
+    if (data.spec.gitService === 'gitea') unset(data.spec, 'private')
     try {
-      if (!data.spec.private) unset(data.spec, 'secret')
       const codeRepo = this.repoService.getTeamConfigService(teamId).createCodeRepo(data)
       await this.saveTeamConfigItem(codeRepo)
       await this.doTeamDeployment(
@@ -1288,7 +1293,9 @@ export default class OtomiStack {
       )
       return codeRepo
     } catch (err) {
-      if (err.code === 409) err.publicMessage = 'Code repo label already exists'
+      if (err.code === 409) {
+        err.publicMessage = 'Code repo name already exists'
+      }
       throw err
     }
   }
@@ -1314,6 +1321,7 @@ export default class OtomiStack {
     patch = false,
   ): Promise<AplCodeRepoResponse> {
     if (!data.spec?.private) unset(data.spec, 'secret')
+    if (data.spec?.gitService === 'gitea') unset(data.spec, 'private')
     const codeRepo = patch
       ? this.repoService.getTeamConfigService(teamId).patchCodeRepo(name, data)
       : this.repoService.getTeamConfigService(teamId).updateCodeRepo(name, data as AplCodeRepoRequest)
@@ -1341,7 +1349,10 @@ export default class OtomiStack {
     )
   }
 
-  async getTestRepoConnect(url: string, teamId: string, secretName: string): Promise<TestRepoConnect> {
+  async getRepoBranches(codeRepoName: string, teamId: string): Promise<string[]> {
+    if (!codeRepoName) return ['HEAD']
+    const coderepo = this.getCodeRepo(teamId, codeRepoName)
+    const { repositoryUrl, secret: secretName } = coderepo
     try {
       let sshPrivateKey = '',
         username = '',
@@ -1355,6 +1366,38 @@ export default class OtomiStack {
       }
 
       const isPrivate = !!secretName
+      const isSSH = !!sshPrivateKey
+      const repoUrl = repositoryUrl.startsWith('https://gitea')
+        ? repositoryUrl
+        : normalizeRepoUrl(repositoryUrl, isPrivate, isSSH)
+
+      if (!repoUrl) return ['HEAD']
+
+      if (isPrivate) return await getPrivateRepoBranches(repoUrl, sshPrivateKey, username, accessToken)
+
+      return await getPublicRepoBranches(repoUrl)
+    } catch (error) {
+      const errorMessage = error.response?.data?.message || error?.message || 'Failed to get repo branches'
+      debug('Error getting branches:', errorMessage)
+      return []
+    }
+  }
+
+  async getTestRepoConnect(url: string, teamId: string, secretName: string): Promise<TestRepoConnect> {
+    try {
+      let sshPrivateKey = '',
+        username = '',
+        accessToken = ''
+
+      const isPrivate = !!secretName
+
+      if (isPrivate) {
+        const secret = await getSecretValues(secretName, `team-${teamId}`)
+        sshPrivateKey = secret?.['ssh-privatekey'] || ''
+        username = secret?.username || ''
+        accessToken = secret?.password || ''
+      }
+
       const isSSH = !!sshPrivateKey
       const repoUrl = normalizeRepoUrl(url, isPrivate, isSSH)
 
@@ -1422,6 +1465,12 @@ export default class OtomiStack {
   }
 
   async createAplBuild(teamId: string, data: AplBuildRequest): Promise<AplBuildResponse> {
+    const buildName = `${data?.spec?.imageName}-${data?.spec?.tag}`
+    if (buildName.length > 128)
+      throw new HttpError(
+        400,
+        'Invalid container image name, the combined image name and tag must not exceed 128 characters.',
+      )
     try {
       const build = this.repoService.getTeamConfigService(teamId).createBuild(data)
       await this.saveTeamConfigItem(build)
@@ -1434,7 +1483,8 @@ export default class OtomiStack {
       )
       return build
     } catch (err) {
-      if (err.code === 409) err.publicMessage = 'Build name already exists'
+      if (err.code === 409)
+        err.publicMessage = 'Container image name already exists, the combined image name and tag must be unique.'
       throw err
     }
   }

src/services/TeamConfigService.ts

@@ -35,6 +35,7 @@ function mergeCustomizer(prev, next) {
 
 export class TeamConfigService {
   constructor(private teamConfig: TeamConfig) {
+    this.teamConfig.codeRepos ??= []
     this.teamConfig.builds ??= []
     this.teamConfig.workloads ??= []
     this.teamConfig.services ??= []