airbyte-faros-destination 0.23.5 → 0.23.6
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/converters/azurepipeline/common.d.ts +1 -1
- package/lib/converters/azurepipeline/common.js +6 -3
- package/lib/converters/azurepipeline/common.js.map +1 -1
- package/lib/converters/azurepipeline/runs.js +6 -6
- package/lib/converters/azurepipeline/runs.js.map +1 -1
- package/lib/sync.js +14 -3
- package/lib/sync.js.map +1 -1
- package/lib/tsconfig.tsbuildinfo +1 -1
- package/package.json +3 -3
|
@@ -19,7 +19,7 @@ export declare abstract class AzurePipelineConverter extends Converter {
|
|
|
19
19
|
protected azurePipelineConfig(ctx: StreamContext): AzurePipelineConfig;
|
|
20
20
|
protected applicationMapping(ctx: StreamContext): ApplicationMapping;
|
|
21
21
|
convertBuildState(result: string | undefined): CategoryDetail;
|
|
22
|
-
vcs_Repository(repo: BuildRepository): RepoKey | undefined;
|
|
22
|
+
vcs_Repository(repo: BuildRepository, ctx?: StreamContext): RepoKey | undefined;
|
|
23
23
|
getRepoUrl(repo: BuildRepository): string | undefined;
|
|
24
24
|
convertBuildStepState(result: string | undefined): CategoryDetail;
|
|
25
25
|
convertBuildStepType(type: string): CategoryDetail;
|
|
@@ -41,13 +41,16 @@ class AzurePipelineConverter extends converter_1.Converter {
|
|
|
41
41
|
return { category: cicd_1.BuildStateCategory.Custom, detail: result };
|
|
42
42
|
}
|
|
43
43
|
}
|
|
44
|
-
vcs_Repository(repo) {
|
|
44
|
+
vcs_Repository(repo, ctx) {
|
|
45
45
|
const repoType = (0, lodash_1.toLower)(repo.type);
|
|
46
46
|
if (repoType === 'tfsgit') {
|
|
47
|
-
const
|
|
48
|
-
if (!orgName || !projectName) {
|
|
47
|
+
const orgProject = (0, azure_devops_1.getVcsOrgProjectFromUrl)(repo.url);
|
|
48
|
+
if (!orgProject?.orgName || !orgProject?.projectName) {
|
|
49
|
+
ctx?.logger?.debug(`Could not resolve Azure Repos org/project from build repository ` +
|
|
50
|
+
`for repo id ${repo.id} (type: ${repo.type}, url: ${repo.url})`);
|
|
49
51
|
return undefined;
|
|
50
52
|
}
|
|
53
|
+
const { orgName, projectName } = orgProject;
|
|
51
54
|
const name = `${decodeURIComponent(projectName)}:${repo.name}`;
|
|
52
55
|
return {
|
|
53
56
|
uid: name,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"common.js","sourceRoot":"","sources":["../../../src/converters/azurepipeline/common.ts"],"names":[],"mappings":";;;AAEA,mCAA+B;AAE/B,yDAA+D;AAC/D,yCAA2E;AAG3E,4CAAsD;AAWtD,mCAAmC;AACnC,MAAsB,sBAAuB,SAAQ,qBAAS;IAA9D;;QACE,WAAM,GAAG,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"common.js","sourceRoot":"","sources":["../../../src/converters/azurepipeline/common.ts"],"names":[],"mappings":";;;AAEA,mCAA+B;AAE/B,yDAA+D;AAC/D,yCAA2E;AAG3E,4CAAsD;AAWtD,mCAAmC;AACnC,MAAsB,sBAAuB,SAAQ,qBAAS;IAA9D;;QACE,WAAM,GAAG,eAAe,CAAC;IA8H3B,CAAC;IA7HC,yDAAyD;IACzD,EAAE,CAAC,MAAqB;QACtB,OAAO,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,CAAC;IAClC,CAAC;IAES,mBAAmB,CAAC,GAAkB;QAC9C,OAAO,GAAG,CAAC,MAAM,EAAE,uBAAuB,EAAE,aAAa,CAAC;IAC5D,CAAC;IAES,kBAAkB,CAAC,GAAkB;QAC7C,OAAO,IAAI,CAAC,mBAAmB,CAAC,GAAG,CAAC,EAAE,mBAAmB,IAAI,EAAE,CAAC;IAClE,CAAC;IAED,iBAAiB,CAAC,MAA0B;QAC1C,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,OAAO;QACT,CAAC;QACD,4CAA4C;QAC5C,kHAAkH;QAClH,QAAQ,MAAM,EAAE,CAAC;YACf,KAAK,UAAU;gBACb,OAAO,EAAC,QAAQ,EAAE,yBAAkB,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAC,CAAC;YACjE,KAAK,QAAQ;gBACX,OAAO,EAAC,QAAQ,EAAE,yBAAkB,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAC,CAAC;YAC/D,KAAK,WAAW,CAAC;YACjB,KAAK,oBAAoB;gBACvB,OAAO,EAAC,QAAQ,EAAE,yBAAkB,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAC,CAAC;YAChE,KAAK,SAAS;gBACZ,OAAO,EAAC,QAAQ,EAAE,yBAAkB,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAC,CAAC;YAChE;gBACE,OAAO,EAAC,QAAQ,EAAE,yBAAkB,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAC,CAAC;QACjE,CAAC;IACH,CAAC;IAED,cAAc,CACZ,IAAqB,EACrB,GAAmB;QAEnB,MAAM,QAAQ,GAAG,IAAA,gBAAO,EAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAEpC,IAAI,QAAQ,KAAK,QAAQ,EAAE,CAAC;YAC1B,MAAM,UAAU,GAAG,IAAA,sCAAuB,EAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YAErD,IAAI,CAAC,UAAU,EAAE,OAAO,IAAI,CAAC,UAAU,EAAE,WAAW,EAAE,CAAC;gBACrD,GAAG,EAAE,MAAM,EAAE,KAAK,CAChB,kEAAkE;oBAChE,eAAe,IAAI,CAAC,EAAE,WAAW,IAAI,CAAC,IAAI,UAAU,IAAI,CAAC,GAAG,GAAG,CAClE,CAAC;gBACF,OAAO,SAAS,CAAC;YACnB,CAAC;YACD,MAAM,EAAC,OAAO,EAAE,WAAW,EAAC,GAAG,UAAU,CAAC;YAC1C,MAAM,IAAI,GAAG,GAAG,kBAAkB,CAAC,WAAW,CAAC,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;YAC/D,OAAO;gBACL,GAAG,EAAE,IAAI;gBACT,IAAI;gBACJ,YAAY,EAAE,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,aAAa,CAAC;aACrD,CAAC;QACJ,CAAC;QAED,IAAI,QAAQ,KAAK,QAAQ,EAAE,CAAC;YAC1B,MAAM,KAAK,GAAG,IAAI,CAAC,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YACjC,wDAAwD;YACxD,oCAAoC;YACpC,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACrB,OAAO,SAAS,CAAC;YACnB,CAAC;YACD,MAAM,IAAI,GAAG,IAAA,gBAAO,EAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;YAC/B,OAAO;gBACL,GAAG,EAAE,IAAI;gBACT,IAAI;gBACJ,YAAY,EAAE,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,QAAQ,CAAC;aACjD,CAAC;QACJ,CAAC;QAED,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,UAAU,CAAC,IAAqB;QAC9B,QAAQ,IAAI,CAAC,IAAI,EAAE,CAAC;YAClB,KAAK,WAAW;gBACd,OAAO,yBAAyB,IAAI,CAAC,EAAE,EAAE,CAAC;YAC5C,KAAK,QAAQ,CAAC;YACd,KAAK,kBAAkB;gBACrB,OAAO,sBAAsB,IAAI,CAAC,EAAE,EAAE,CAAC;YACzC,KAAK,QAAQ;gBACX,OAAO,sBAAsB,IAAI,CAAC,EAAE,EAAE,CAAC;YACzC,KAAK,QAAQ;gBACX,OAAO,IAAI,CAAC,GAAG,CAAC;YAClB;gBACE,OAAO,IAAI,CAAC,GAAG,CAAC;QACpB,CAAC;IACH,CAAC;IAED,qBAAqB,CAAC,MAA0B;QAC9C,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,OAAO,EAAC,QAAQ,EAAE,yBAAkB,CAAC,OAAO,EAAE,MAAM,EAAE,WAAW,EAAC,CAAC;QACrE,CAAC;QACD,iHAAiH;QACjH,QAAQ,MAAM,EAAE,CAAC;YACf,KAAK,WAAW,CAAC;YACjB,KAAK,UAAU;gBACb,OAAO,EAAC,QAAQ,EAAE,yBAAkB,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAC,CAAC;YACjE,KAAK,QAAQ;gBACX,OAAO,EAAC,QAAQ,EAAE,yBAAkB,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAC,CAAC;YAC/D,KAAK,WAAW,CAAC;YACjB,KAAK,qBAAqB;gBACxB,OAAO,EAAC,QAAQ,EAAE,yBAAkB,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAC,CAAC;YAChE;gBACE,OAAO,EAAC,QAAQ,EAAE,yBAAkB,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAC,CAAC;QACjE,CAAC;IACH,CAAC;IAED,oBAAoB,CAAC,IAAY;QAC/B,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,OAAO;QACT,CAAC;QACD,OAAO,EAAC,QAAQ,EAAE,kBAAW,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAC,CAAC;IACtD,CAAC;IAES,SAAS,CAAC,IAAY,EAAE,MAAe;QAC/C,OAAO;YACL,GAAG,EAAE,IAAI,CAAC,WAAW,EAAE;YACvB,MAAM,EAAE,MAAM,IAAI,IAAI,CAAC,UAAU,CAAC,MAAM;SACzC,CAAC;IACJ,CAAC;CACF;AA/HD,wDA+HC"}
|
|
@@ -30,7 +30,7 @@ class Runs extends common_1.AzurePipelineConverter {
|
|
|
30
30
|
pipeline,
|
|
31
31
|
};
|
|
32
32
|
res.push(...this.processTags(run.tags, runKey));
|
|
33
|
-
res.push(...this.processCommit(run, runKey));
|
|
33
|
+
res.push(...this.processCommit(run, runKey, ctx));
|
|
34
34
|
res.push(...this.processStages(run, runKey));
|
|
35
35
|
// Add build number revision???
|
|
36
36
|
const status = this.convertRunState(run.result);
|
|
@@ -95,7 +95,7 @@ class Runs extends common_1.AzurePipelineConverter {
|
|
|
95
95
|
}
|
|
96
96
|
const res = [];
|
|
97
97
|
const { sourceVersion, repository } = run;
|
|
98
|
-
const vcsRepository = this.vcs_Repository(repository);
|
|
98
|
+
const vcsRepository = this.vcs_Repository(repository, ctx);
|
|
99
99
|
const commitKey = {
|
|
100
100
|
uid: sourceVersion,
|
|
101
101
|
sha: sourceVersion,
|
|
@@ -128,9 +128,9 @@ class Runs extends common_1.AzurePipelineConverter {
|
|
|
128
128
|
},
|
|
129
129
|
});
|
|
130
130
|
}
|
|
131
|
-
for (const artifact of run.artifacts) {
|
|
131
|
+
for (const artifact of run.artifacts ?? []) {
|
|
132
132
|
const tags = [];
|
|
133
|
-
for (const [key, value] of Object.entries(artifact.resource
|
|
133
|
+
for (const [key, value] of Object.entries(artifact.resource?.properties ?? {})) {
|
|
134
134
|
tags.push({ name: key, value: String(value) });
|
|
135
135
|
}
|
|
136
136
|
const artifactKey = {
|
|
@@ -142,8 +142,8 @@ class Runs extends common_1.AzurePipelineConverter {
|
|
|
142
142
|
record: {
|
|
143
143
|
...artifactKey,
|
|
144
144
|
name: artifact.name,
|
|
145
|
-
url: artifact.resource
|
|
146
|
-
type: artifact.resource
|
|
145
|
+
url: artifact.resource?.url,
|
|
146
|
+
type: artifact.resource?.type,
|
|
147
147
|
createdAt: faros_js_client_1.Utils.toDate(run.finishedDate),
|
|
148
148
|
tags,
|
|
149
149
|
build: buildKey,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runs.js","sourceRoot":"","sources":["../../../src/converters/azurepipeline/runs.ts"],"names":[],"mappings":";;;AAGA,qDAAsC;AAEtC,yDAAuD;AACvD,yCAA4D;AAI5D,qCAAgD;AAEhD,MAAa,IAAK,SAAQ,+BAAsB;IAAhD;;QACmB,qBAAgB,GAAG,IAAI,GAAG,EAAU,CAAC;QACrC,aAAQ,GAAG,IAAI,GAAG,EAAU,CAAC;QAErC,sBAAiB,GAAoC,CAAC,YAAY,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"runs.js","sourceRoot":"","sources":["../../../src/converters/azurepipeline/runs.ts"],"names":[],"mappings":"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"}
|
package/lib/sync.js
CHANGED
|
@@ -2,9 +2,13 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
const faros_js_client_1 = require("faros-js-client");
|
|
4
4
|
const client_1 = require("faros-js-client/lib/client");
|
|
5
|
+
const lodash_1 = require("lodash");
|
|
5
6
|
const url_1 = require("url");
|
|
6
7
|
const verror_1 = require("verror");
|
|
7
8
|
const DEFAULT_ACCOUNT_TYPE = 'custom';
|
|
9
|
+
// These overlap with source-config messages. Persisting startup destination
|
|
10
|
+
// values for them can create false local account change churn.
|
|
11
|
+
const LOCAL_ACCOUNT_STARTUP_CONFIG_IGNORED_KEYS = ['debug', 'faros_source_id'];
|
|
8
12
|
class FarosSyncClient extends faros_js_client_1.FarosClient {
|
|
9
13
|
constructor(cfg, airbyteLogger, _axiosConfig) {
|
|
10
14
|
super(cfg, airbyteLogger?.asPino('info'), _axiosConfig);
|
|
@@ -51,7 +55,10 @@ class FarosSyncClient extends faros_js_client_1.FarosClient {
|
|
|
51
55
|
this.airbyteLogger?.debug(`Creating local account ${accountId}`);
|
|
52
56
|
return accountResult(await this.attemptRequest(this.request('POST', '/accounts', {
|
|
53
57
|
accountId,
|
|
54
|
-
params: {
|
|
58
|
+
params: {
|
|
59
|
+
...redactedConfig,
|
|
60
|
+
graphName,
|
|
61
|
+
},
|
|
55
62
|
type: type ?? DEFAULT_ACCOUNT_TYPE,
|
|
56
63
|
mode,
|
|
57
64
|
local: true,
|
|
@@ -82,15 +89,19 @@ class FarosSyncClient extends faros_js_client_1.FarosClient {
|
|
|
82
89
|
return accountResult(await this.attemptRequest(this.request('GET', `/accounts/${accountId}`)));
|
|
83
90
|
}
|
|
84
91
|
async getOrCreateAccount(accountId, graphName, redactedConfig) {
|
|
92
|
+
// getOrCreateAccount runs before source records are processed. Keep known
|
|
93
|
+
// source-config-owned keys out of this startup fallback write so they don't
|
|
94
|
+
// briefly overwrite source-config values and create false changelog events.
|
|
95
|
+
const startupAccountParams = (0, lodash_1.omit)(redactedConfig, LOCAL_ACCOUNT_STARTUP_CONFIG_IGNORED_KEYS);
|
|
85
96
|
const account = await this.getAccount(accountId);
|
|
86
97
|
if (account) {
|
|
87
98
|
if (account.local) {
|
|
88
99
|
this.airbyteLogger?.debug(`Account ${accountId} exists and is local, merging config`);
|
|
89
|
-
return this.updateAccountParams(accountId, graphName,
|
|
100
|
+
return this.updateAccountParams(accountId, graphName, startupAccountParams);
|
|
90
101
|
}
|
|
91
102
|
return account;
|
|
92
103
|
}
|
|
93
|
-
return this.createLocalAccount(accountId, graphName,
|
|
104
|
+
return this.createLocalAccount(accountId, graphName, startupAccountParams);
|
|
94
105
|
}
|
|
95
106
|
async updateAccountSync(accountId, syncId, props) {
|
|
96
107
|
return syncResult(await this.attemptRequest(this.request('PATCH', `/accounts/${accountId}/syncs/${syncId}`, {
|
package/lib/sync.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sync.js","sourceRoot":"","sources":["../src/sync.ts"],"names":[],"mappings":";;AAEA,qDAIyB;AACzB,uDAAgE;
|
|
1
|
+
{"version":3,"file":"sync.js","sourceRoot":"","sources":["../src/sync.ts"],"names":[],"mappings":"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"}
|