Skip to content
Open
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
12 changes: 11 additions & 1 deletion src/services/transitive-resolver.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,16 @@ const NAMED_VALUE_PATTERN = /\{\{([^}]+)\}\}/g;
const BACKEND_PATTERN = /<set-backend-service\s+backend-id="([^"]+)"/g;
const FRAGMENT_PATTERN = /<include-fragment\s+fragment-id="([^"]+)"/g;

function isLiteralBackendId(value: string): boolean {
const backendId = value.trim();
return (
backendId.length > 0 &&
!backendId.includes('{{') &&
!backendId.startsWith('@(') &&
!backendId.startsWith('@{')
);
}

/**
* Represents a discovered transitive dependency.
*/
Expand Down Expand Up @@ -60,7 +70,7 @@ export function scanPolicyReferences(policyXml: string): TransitiveDependency[]

// Backend references
for (const match of policyXml.matchAll(BACKEND_PATTERN)) {
if (match[1]) {
if (match[1] && isLiteralBackendId(match[1])) {
dependencies.push({
type: ResourceType.Backend,
name: match[1].trim(),
Expand Down
33 changes: 33 additions & 0 deletions tests/unit/services/transitive-extractor.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -244,4 +244,37 @@ describe('transitive-extractor', () => {
expect(result.extractedDescriptors).toEqual([]);
});
});

describe('backend named-value references (#331)', () => {
it('should extract the named value without requesting a backend for its placeholder', async () => {
const client = createMockClient();
client.listResources = namedValueList({ name: 'demo-backend-id', displayName: 'demo-backend-id' });
client.getResource.mockImplementation(async (_ctx, descriptor: ResourceDescriptor) => {
if (descriptor.type === ResourceType.NamedValue && descriptor.nameParts[0] === 'demo-backend-id') {
return {
name: 'demo-backend-id',
properties: { displayName: 'demo-backend-id', secret: false, value: 'backend-xyz' },
};
}
return undefined;
});
const store = createMockStore();
const policies = new Map([
['api-1', '<policies><inbound><set-backend-service backend-id="{{demo-backend-id}}" /></inbound></policies>'],
]);

const result = await extractTransitiveDependencies(
client, store, testContext, '/output', policies, new Map(), [], []
);

expect(result.errorCount).toBe(0);
expect(result.extractedDescriptors).toContainEqual(
expect.objectContaining({ type: ResourceType.NamedValue, nameParts: ['demo-backend-id'] })
);
expect(client.getResource).not.toHaveBeenCalledWith(
testContext,
expect.objectContaining({ type: ResourceType.Backend, nameParts: ['{{demo-backend-id}}'] })
);
});
});
});
15 changes: 15 additions & 0 deletions tests/unit/services/transitive-resolver.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,21 @@ describe('transitive-resolver', () => {
});
});

it('should not treat named values or policy expressions as backend names', () => {
const policy = `
<set-backend-service backend-id="{{demo-backend-id}}" />
<set-backend-service backend-id="@(context.Request.Url.Host)" />
<set-backend-service backend-id="@{ return context.Request.Url.Host; }" />
`;
const refs = scanPolicyReferences(policy);

expect(refs).toContainEqual({
type: ResourceType.NamedValue,
name: 'demo-backend-id',
});
expect(refs.filter((ref) => ref.type === ResourceType.Backend)).toHaveLength(0);
});

it('should detect policy fragment references', () => {
const policy = '<policies><inbound><include-fragment fragment-id="my-fragment" /></inbound></policies>';
const refs = scanPolicyReferences(policy);
Expand Down