Skip to content

Commit

Permalink
fix: prevents pre and post deployer from running into an error on spe…
Browse files Browse the repository at this point in the history 
…cific data-pack flxbl-io#115
  • Loading branch information
@Schuchie
Schuchie committed Aug 31, 2024
1 parent 9f1a48b commit 364d009
Show file tree
Hide file tree
Showing 12 changed files with 32 additions and 29 deletions.
5 changes: 3 additions & 2 deletions src/core/package/SfpPackageBuilder.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -120,15 +120,16 @@ export default class SfpPackageBuilder {

sfpPackage.isTriggerAllTests = this.isAllTestsToBeTriggered(sfpPackage, logger);

const isDataPackage = sfpPackage.packageType == PackageType.Data;
//Load component Set
let componentSet = ComponentSet.fromSource(
let componentSet = isDataPackage? undefined:ComponentSet.fromSource(
path.resolve(sfpPackage.workingDirectory, sfpPackage.projectDirectory, sfpPackage.packageDirectory)
);

//Run through all analyzers
let analyzers = AnalyzerRegistry.getAnalyzers();
for (const analyzer of analyzers) {
if (analyzer.isEnabled(sfpPackage, logger)) sfpPackage = await analyzer.analyze(sfpPackage,componentSet, logger);
if (analyzer.isEnabled(sfpPackage, logger)) sfpPackage = await analyzer.analyze(sfpPackage, logger, componentSet);
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/core/package/analyser/FHTAnalyzer.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ export default class FHTAnalyser implements PackageAnalyzer {



public async analyze(sfpPackage: SfpPackage, componentSet:ComponentSet, logger:Logger): Promise<SfpPackage> {
public async analyze(sfpPackage: SfpPackage, logger: Logger, componentSet: ComponentSet): Promise<SfpPackage> {
try {

let fhtFields: { [key: string]: Array<string> } = {};
Expand Down
2 changes: 1 addition & 1 deletion src/core/package/analyser/FTAnalyzer.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ export default class FTAnalyser implements PackageAnalyzer {
return "Feed Tracking Analyzer";
}

public async analyze(sfpPackage: SfpPackage, componentSet:ComponentSet, logger:Logger): Promise<SfpPackage> {
public async analyze(sfpPackage: SfpPackage, logger: Logger, componentSet: ComponentSet): Promise<SfpPackage> {
try {

let ftFields: { [key: string]: Array<string> } = {};
Expand Down
2 changes: 1 addition & 1 deletion src/core/package/analyser/PackageAnalyzer.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import SfpPackage from "../SfpPackage";
export interface PackageAnalyzer
{
getName();
analyze(sfpPackage: SfpPackage,componentSet:ComponentSet,logger:Logger): Promise<SfpPackage>
analyze(sfpPackage: SfpPackage, logger: Logger, componentSet?: ComponentSet): Promise<SfpPackage>
isEnabled(sfpPackage: SfpPackage,logger:Logger): Promise<boolean>


Expand Down
2 changes: 1 addition & 1 deletion src/core/package/analyser/PicklistAnalyzer.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ export default class PicklistAnalyzer implements PackageAnalyzer {



public async analyze(sfpPackage: SfpPackage, componentSet:ComponentSet, logger:Logger): Promise<SfpPackage> {
public async analyze(sfpPackage: SfpPackage, logger: Logger, componentSet: ComponentSet): Promise<SfpPackage> {
try {
let sourceComponents = componentSet.getSourceComponents().toArray();
let components = [];
Expand Down
4 changes: 2 additions & 2 deletions src/core/package/deploymentCustomizers/DeploymentCustomizer.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ export interface DeploymentCustomizer
getDeploymentOptions( target_org: string, waitTime: string, apiVersion: string):Promise<DeploymentOptions>
getName():string
execute(sfpPackage: SfpPackage,
componentSet: ComponentSet,
sfpOrg:SFPOrg,
logger: Logger,
deploymentContext:DeploymentContext
deploymentContext:DeploymentContext,
componentSet?: ComponentSet,
):Promise<DeploySourceResult>
}
4 changes: 2 additions & 2 deletions src/core/package/deploymentCustomizers/FlowActivator.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ const Table = require('cli-table');
export default class FlowActivator implements DeploymentCustomizer {
async execute(
sfpPackage: SfpPackage,
componentSet: ComponentSet,
sfpOrg: SFPOrg,
logger: Logger,
deploymentContext: DeploymentContext
deploymentContext: DeploymentContext,
componentSet: ComponentSet
): Promise<DeploySourceResult> {
let sourceComponents = componentSet.getSourceComponents().toArray();
let masterLabelsOfAllFlowsInPackage = [];
Expand Down
4 changes: 2 additions & 2 deletions src/core/package/deploymentCustomizers/MetadataDeploymentCustomizer.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ export abstract class MetdataDeploymentCustomizer implements DeploymentCustomize


async execute(sfpPackage: SfpPackage,
componentSet: ComponentSet,
sfpOrg:SFPOrg,
logger: Logger,
deploymentContext:DeploymentContext
deploymentContext:DeploymentContext,
componentSet: ComponentSet
):Promise<DeploySourceResult>
{
if (await this.isEnabled(sfpPackage, sfpOrg.getConnection(), logger)) {
Expand Down
4 changes: 2 additions & 2 deletions src/core/package/deploymentCustomizers/PicklistEnabler.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@ export default class PicklistEnabler implements DeploymentCustomizer {

async execute(
sfpPackage: SfpPackage,
componentSet: ComponentSet,
sfpOrg: SFPOrg,
logger: Logger,
deploymentContext: DeploymentContext
deploymentContext: DeploymentContext,
componentSet?: ComponentSet
): Promise<DeploySourceResult> {
try {
let sourceComponents = componentSet.getSourceComponents().toArray();
Expand Down
16 changes: 9 additions & 7 deletions src/core/package/packageInstallers/InstallPackage.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -309,8 +309,9 @@ export abstract class InstallPackage {
private async executePostDeployers() {
SFPLogger.log(`Executing Post Deployers`, LoggerLevel.INFO, this.logger);

const isDataPackage = this.sfpPackage.packageType == PackageType.Data;
//Gather componentSet
let componentSet = ComponentSet.fromSource(
let componentSet = isDataPackage? undefined:ComponentSet.fromSource(
path.join(this.sfpPackage.projectDirectory, this.sfpPackage.packageDirectory)
);

Expand All @@ -325,10 +326,10 @@ export abstract class InstallPackage {

await postDeployer.execute(
this.sfpPackage,
componentSet,
this.sfpOrg,
this.logger,
{apiVersion:this.options.apiVersion,waitTime:this.options.waitTime}
{apiVersion:this.options.apiVersion,waitTime:this.options.waitTime},
componentSet
);

} else {
Expand Down Expand Up @@ -356,8 +357,9 @@ export abstract class InstallPackage {
private async executePreDeployers() {
SFPLogger.log(`Executing Pre Deployers`, LoggerLevel.INFO, this.logger);

const isDataPackage = this.sfpPackage.packageType == PackageType.Data;
//Gather componentSet
let componentSet = ComponentSet.fromSource(
let componentSet = isDataPackage? undefined : ComponentSet.fromSource(
path.join(this.sfpPackage.projectDirectory, this.sfpPackage.packageDirectory)
);

Expand All @@ -366,7 +368,7 @@ export abstract class InstallPackage {
if(await analyzer.isEnabled(this.sfpPackage, this.logger))
{
SFPLogger.log(`Executing ${COLOR_KEY_MESSAGE(analyzer.getName())}`, LoggerLevel.INFO, this.logger);
this.sfpPackage = await analyzer.analyze(this.sfpPackage,componentSet, this.logger);
this.sfpPackage = await analyzer.analyze(this.sfpPackage, this.logger, componentSet);
}
else
{
Expand All @@ -385,10 +387,10 @@ export abstract class InstallPackage {

await preDeployer.execute(
this.sfpPackage,
componentSet,
this.sfpOrg,
this.logger,
{apiVersion:this.options.apiVersion,waitTime:this.options.waitTime}
{apiVersion:this.options.apiVersion,waitTime:this.options.waitTime},
componentSet
);

} else {
Expand Down
8 changes: 4 additions & 4 deletions tests/core/package/analysers/FHTAnalyzer.test.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ describe('FHT Analyzer', () => {
return '';
},
};
sfpPackage = await fhtAnalyzer.analyze(sfpPackage,set,new VoidLogger());
sfpPackage = await fhtAnalyzer.analyze(sfpPackage, new VoidLogger(), set);
expect(sfpPackage['isFHTFieldFound']).toBe(true);
expect(sfpPackage['fhtFields']).toBeDefined();
let fhtFields = sfpPackage['fhtFields'];
Expand Down Expand Up @@ -193,7 +193,7 @@ describe('FHT Analyzer', () => {
return '';
},
};
sfpPackage = await fhtAnalyzer.analyze(sfpPackage,set,new VoidLogger());
sfpPackage = await fhtAnalyzer.analyze(sfpPackage, new VoidLogger(), set);
expect(sfpPackage['isFHTFieldFound']).toBe(true);
expect(sfpPackage['fhtFields']).toBeDefined();
let fhtFields = sfpPackage['fhtFields'];
Expand Down Expand Up @@ -272,7 +272,7 @@ describe('FHT Analyzer', () => {
return '';
},
};
sfpPackage = await fhtAnalyzer.analyze(sfpPackage,set,new VoidLogger());
sfpPackage = await fhtAnalyzer.analyze(sfpPackage, new VoidLogger(), set);
expect(sfpPackage['isFHTFieldFound']).toBe(true);
expect(sfpPackage['fhtFields']).toBeDefined();
let fhtFields = sfpPackage['fhtFields'];
Expand Down Expand Up @@ -351,7 +351,7 @@ describe('FHT Analyzer', () => {
return '';
},
};
sfpPackage = await fhtAnalyzer.analyze(sfpPackage,set,new VoidLogger());
sfpPackage = await fhtAnalyzer.analyze(sfpPackage, new VoidLogger(), set);
expect(sfpPackage['isFHTFieldFound']).toBe(true);
expect(sfpPackage['fhtFields']).toBeDefined();
let fhtFields = sfpPackage['fhtFields'];
Expand Down
8 changes: 4 additions & 4 deletions tests/core/package/analysers/FTAnalyzer.test.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ describe('FT Analyzer', () => {
return '';
},
};
sfpPackage = await ftAnalyzer.analyze(sfpPackage,set,new VoidLogger());
sfpPackage = await ftAnalyzer.analyze(sfpPackage,new VoidLogger(),set);
expect(sfpPackage['isFTFieldFound']).toBe(true);
expect(sfpPackage['ftFields']).toBeDefined();
let ftFields = sfpPackage['ftFields'];
Expand Down Expand Up @@ -194,7 +194,7 @@ describe('FT Analyzer', () => {
return '';
},
};
sfpPackage = await ftAnalyzer.analyze(sfpPackage,set,new VoidLogger());
sfpPackage = await ftAnalyzer.analyze(sfpPackage, new VoidLogger(), set);
expect(sfpPackage['isFTFieldFound']).toBe(true);
expect(sfpPackage['ftFields']).toBeDefined();
let ftFields = sfpPackage['ftFields'];
Expand Down Expand Up @@ -274,7 +274,7 @@ describe('FT Analyzer', () => {
return '';
},
};
sfpPackage = await ftAnalyzer.analyze(sfpPackage,set,new VoidLogger());
sfpPackage = await ftAnalyzer.analyze(sfpPackage, new VoidLogger(), set);
expect(sfpPackage['isFTFieldFound']).toBe(true);
expect(sfpPackage['ftFields']).toBeDefined();
let ftFields = sfpPackage['ftFields'];
Expand Down Expand Up @@ -354,7 +354,7 @@ describe('FT Analyzer', () => {
return '';
},
};
sfpPackage = await ftAnalyzer.analyze(sfpPackage,set,new VoidLogger());
sfpPackage = await ftAnalyzer.analyze(sfpPackage, new VoidLogger(), set);
expect(sfpPackage['isFTFieldFound']).toBe(true);
expect(sfpPackage['ftFields']).toBeDefined();
let ftFields = sfpPackage['ftFields'];
Expand Down

0 comments on commit 364d009

Please sign in to comment.