WEBDIENSTE/huly-platform
1
0
Fork 0
mirror of https://github.com/hcengineering/platform.git synced 2026-09-29 13:05:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

UBERF-8282: Fix ws deps (#6735)

Browse Source 
+ Fix github integration removal

Signed-off-by: Andrey Sobolev <haiodo@gmail.com>
This commit is contained in:
Andrey Sobolev
2024-09-26 17:20:30 +07:00
committed by GitHub
parent cc67c2792e
commit 3951181958
22 changed files with 196 additions and 164 deletions
Download Patch File Download Diff File Expand all files Collapse all files
services/github/pod-github/src/platform.ts
+11 -23
View File
@@ -275,31 +275,19 @@ export class PlatformWorker {
async removeInstallation (ctx: MeasureContext, workspace: string, installationId: number): Promise<void> {
const installation = this.installations.get(installationId)
if (installation !== undefined) {
try {
await installation.octokit.rest.apps.deleteInstallation({
// Do not wait to github to process it
void installation.octokit.rest.apps
.deleteInstallation({
installation_id: installationId
})
} catch (err: any) {
if (err.status !== 404) {
// Already deleted.
ctx.error('error from github api', { error: err })
}
await this.handleInstallationEventDelete(installationId)
}
// Let's check if workspace somehow still have installation and remove it
const worker = this.clients.get(workspace) as GithubWorker
if (worker !== undefined) {
await GithubWorker.checkIntegrations(worker.client, this.installations)
} else {
let client: Client | undefined
try {
client = await createPlatformClient(workspace, 30000)
await GithubWorker.checkIntegrations(client, this.installations)
await client.close()
} catch (err: any) {
ctx.error('failed to clean installation from workspace', { workspace, installationId })
}
}
.catch((err) => {
if (err.status !== 404) {
// Already deleted.
ctx.error('error from github api', { error: err })
}
})
await this.handleInstallationEventDelete(installationId)
}
this.triggerCheckWorkspaces()
}
services/github/pod-github/src/worker.ts
+61 -53
View File
@@ -1403,62 +1403,70 @@ export class GithubWorker implements IntegrationManager {
async _performFullSync (): Promise<void> {
// Wait previous active sync
for (const integration of this.integrations.values()) {
await this.ctx.withLog('external sync', { installation: integration.installationName }, async () => {
if (!integration.enabled || integration.octokit === undefined) {
return
}
const upd: DocumentUpdate<GithubIntegration> = {}
if (integration.integration.byUser !== integration.login) {
upd.byUser = integration.login
}
if (integration.integration.type !== integration.type) {
upd.type = integration.type
}
if (integration.integration.clientId !== config.ClientID) {
upd.clientId = config.ClientID
}
if (integration.integration.name !== integration.installationName || !integration.integration.alive) {
upd.name = integration.installationName
upd.alive = true
}
if (Object.keys(upd).length > 0) {
await this._client.diffUpdate(integration.integration, upd, Date.now(), integration.integration.createdBy)
this.triggerUpdate()
}
const derivedClient = new TxOperations(this.client, core.account.System, true)
const { projects, repositories } = await this.collectActiveProjects()
const _projects = projects.filter((it) => it.integration === integration.integration._id)
const _prjIds = new Set(_projects.map((it) => it._id))
const _repositories = repositories.filter((it) => it.githubProject != null && _prjIds.has(it.githubProject))
// Cleanup broken synchronized documents
while (true) {
const withError = await derivedClient.findAll<any>(
github.class.DocSyncInfo,
{ error: { $ne: null }, url: null },
{ limit: 50 }
)
if (withError.length === 0) {
break
await this.ctx.withLog(
'external sync',
{ installation: integration.installationName, workspace: this.workspace.name },
async () => {
if (!integration.enabled || integration.octokit === undefined) {
return
}
const ops = derivedClient.apply()
for (const d of withError) {
await ops.remove(d)
}
await ops.commit()
}
for (const { _class, mapper } of this.mappers) {
await this.ctx.withLog('external sync', { _class: _class.join(', ') }, async () => {
await mapper.externalFullSync(integration, derivedClient, _projects, _repositories)
})
const upd: DocumentUpdate<GithubIntegration> = {}
if (integration.integration.byUser !== integration.login) {
upd.byUser = integration.login
}
if (integration.integration.type !== integration.type) {
upd.type = integration.type
}
if (integration.integration.clientId !== config.ClientID) {
upd.clientId = config.ClientID
}
if (integration.integration.name !== integration.installationName || !integration.integration.alive) {
upd.name = integration.installationName
upd.alive = true
}
if (Object.keys(upd).length > 0) {
await this._client.diffUpdate(integration.integration, upd, Date.now(), integration.integration.createdBy)
this.triggerUpdate()
}
const derivedClient = new TxOperations(this.client, core.account.System, true)
const { projects, repositories } = await this.collectActiveProjects()
const _projects = projects.filter((it) => it.integration === integration.integration._id)
const _prjIds = new Set(_projects.map((it) => it._id))
const _repositories = repositories.filter((it) => it.githubProject != null && _prjIds.has(it.githubProject))
// Cleanup broken synchronized documents
while (true) {
const withError = await derivedClient.findAll<any>(
github.class.DocSyncInfo,
{ error: { $ne: null }, url: null },
{ limit: 50 }
)
if (withError.length === 0) {
break
}
const ops = derivedClient.apply()
for (const d of withError) {
await ops.remove(d)
}
await ops.commit()
}
for (const { _class, mapper } of this.mappers) {
await this.ctx.withLog(
'external sync',
{ _class: _class.join(', '), workspace: this.workspace.name },
async () => {
await mapper.externalFullSync(integration, derivedClient, _projects, _repositories)
}
)
}
}
})
)
}
}