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
8 changes: 7 additions & 1 deletion src/commands/project/retrieve/start.ts
Original file line number Diff line number Diff line change
Expand Up @@ -423,7 +423,11 @@ const buildRetrieveAndDeleteTargets = async (
}
return result;
} else {
const retrieveFromOrg = flags.metadata?.some(isRegexMatch) ? flags['target-org'].getUsername() : undefined;
const hasPseudoType = flags.metadata?.some(isPseudoType);
const hasRegexMatch = flags.metadata?.some(isRegexMatch);
// Deliberately using logical or
// eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
const retrieveFromOrg = hasRegexMatch || hasPseudoType ? flags['target-org'].getUsername() : undefined;
if (format === 'source' && (await flags['target-org'].supportsSourceTracking())) {
await SourceTracking.create({
org: flags['target-org'],
Expand Down Expand Up @@ -503,3 +507,5 @@ const isRegexMatch = (mdEntry: string): boolean => {
const mdName = mdEntry.split(':')[1];
return mdName?.includes('*') && mdName?.length > 1 && !mdName?.includes('.*');
};

const isPseudoType = (mdEntry: string): boolean => mdEntry.split(':')[0] === 'Agent';
34 changes: 34 additions & 0 deletions test/commands/retrieve/start.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -193,6 +193,40 @@ describe('project retrieve start', () => {
ensureRetrieveArgs({ format: 'source' });
});

it('should pass along metadata and org for pseudo-type matching', async () => {
const metadata = ['Agent:My_Agent'];
const result = await RetrieveMetadata.run(['--metadata', metadata[0], '--json']);
expect(result).to.deep.equal(expectedResults);
ensureCreateComponentSetArgs({
metadata: {
metadataEntries: metadata,
directoryPaths: [expectedDirectoryPath],
},
org: {
username: testOrg.username,
exclude: [],
},
});
ensureRetrieveArgs({ format: 'source' });
});

it('should pass along metadata and org for pseudo-type wildcard matching', async () => {
const metadata = ['ApexClass', 'Agent'];
const result = await RetrieveMetadata.run(['--metadata', metadata[0], '--metadata', metadata[1], '--json']);
expect(result).to.deep.equal(expectedResults);
ensureCreateComponentSetArgs({
metadata: {
metadataEntries: metadata,
directoryPaths: [expectedDirectoryPath],
},
org: {
username: testOrg.username,
exclude: [],
},
});
ensureRetrieveArgs({ format: 'source' });
});

it('should pass along manifest', async () => {
const manifest = 'package.xml';
const result = await RetrieveMetadata.run(['--manifest', manifest, '--json']);
Expand Down
Loading