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: 3 additions & 3 deletions plugins/argocd/src/functions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import type { ClusterObject, Environment, ListMinimumResources, Project, Reposit
import { parseError, uniqueResource } from '@cpn-console/hooks'
import { dump } from 'js-yaml'
import type { GitlabProjectApi } from '@cpn-console/gitlab-plugin/types/class.js'
import type { VaultProjectApi } from '@cpn-console/vault-plugin/types/class.js'
import type { VaultProjectApi } from '@cpn-console/vault-plugin/types/vault-project-api.js'
import { PatchUtils } from '@kubernetes/client-node'
import { inClusterLabel } from '@cpn-console/shared'
import { generateAppProjectName, generateApplicationName, getConfig, getCustomK8sApi } from './utils.js'
Expand Down Expand Up @@ -209,7 +209,7 @@ async function ensureInfraEnvValues(project: Project, environment: Environment,
const cluster = getCluster(project, environment)
const infraProject = await gitlabApi.getProjectById(repoId)
const valueFilePath = getValueFilePath(project, cluster, environment)
const vaultCredentials = await vaultApi.Project.getCredentials()
const vaultValues = await vaultApi.Project.getValues()
const repositories: ArgoRepoSource[] = await Promise.all([
...infraRepositories.map(async (repository) => {
const repoURL = await gitlabApi.getPublicRepoUrl(repository.internalRepoName)
Expand Down Expand Up @@ -258,7 +258,7 @@ async function ensureInfraEnvValues(project: Project, environment: Environment,
name: cluster.label,
},
autosync: environment.autosync,
vault: vaultCredentials,
vault: vaultValues,
repositories,
},
}
Expand Down
2 changes: 1 addition & 1 deletion plugins/gitlab/src/class.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { PluginApi, type Project, type UniqueRepo } from '@cpn-console/hooks'
import type { AccessTokenScopes, CommitAction, GroupSchema, GroupStatisticsSchema, MemberSchema, ProjectVariableSchema, VariableSchema } from '@gitbeaker/rest'
import type { AllRepositoryTreesOptions, CondensedProjectSchema, Gitlab, PaginationRequestOptions, ProjectSchema, RepositoryFileExpandedSchema, RepositoryTreeSchema } from '@gitbeaker/core'
import { AccessLevel } from '@gitbeaker/core'
import type { VaultProjectApi } from '@cpn-console/vault-plugin/types/class.js'
import type { VaultProjectApi } from '@cpn-console/vault-plugin/types/vault-project-api.js'
import { objectEntries } from '@cpn-console/shared'
import type { GitbeakerRequestError } from '@gitbeaker/requester-utils'
import { getApi, getGroupRootId, infraAppsRepoName, internalMirrorRepoName } from './utils.js'
Expand Down
2 changes: 1 addition & 1 deletion plugins/gitlab/src/repositories.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import type { Project, Repository } from '@cpn-console/hooks'
import type { VaultProjectApi } from '@cpn-console/vault-plugin/types/class.js'
import type { VaultProjectApi } from '@cpn-console/vault-plugin/types/vault-project-api.js'
import type { CondensedProjectSchema, ProjectSchema } from '@gitbeaker/rest'
import { shallowEqual } from '@cpn-console/shared'
import { type GitlabProjectApi, pluginManagedTopic } from './class.js'
Expand Down
2 changes: 1 addition & 1 deletion plugins/harbor/src/robot.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { VaultProjectApi } from '@cpn-console/vault-plugin/types/class.js'
import type { VaultProjectApi } from '@cpn-console/vault-plugin/types/vault-project-api.js'
import type { HarborApi } from './utils.js'
import { getConfig, toVaultSecret } from './utils.js'
import type { Access, Robot, RobotCreated } from './api/Api.js'
Expand Down
2 changes: 1 addition & 1 deletion plugins/sonarqube/src/functions.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { adminGroupPath } from '@cpn-console/shared'
import type { Project, StepCall } from '@cpn-console/hooks'
import { generateProjectKey, parseError } from '@cpn-console/hooks'
import type { VaultProjectApi } from '@cpn-console/vault-plugin/types/class.js'
import type { VaultProjectApi } from '@cpn-console/vault-plugin/types/vault-project-api.js'
import { ensureGroupExists, findGroupByName } from './group.js'
import type { VaultSonarSecret } from './tech.js'
import { getAxiosInstance } from './tech.js'
Expand Down
Loading
Loading