Skip to content

Add kcpPath to Luigi context configuration and processing #98

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 19 commits into from
Nov 4, 2025
Merged

Add kcpPath to Luigi context configuration and processing #98

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
0ebae56
Add `entityName` and `accountPath` to Luigi context configuration and…
gkrajniaksap Oct 28, 2025
0ea15dd
Add `entityName` and `accountPath` to Luigi context configuration and…
gkrajniaksap Oct 28, 2025
64fbc29
Add kcpPath to node context
gkrajniaksap Oct 29, 2025
3c1e7f3
Merge remote-tracking branch 'origin/main' into feat/extend-luigi-con…
gkrajniaksap Oct 29, 2025
23e43d4
Add kcpPath to node context
gkrajniaksap Oct 29, 2025
685bce8
Add kcpPath to node context
gkrajniaksap Oct 29, 2025
8eae74f
fix tests
gkrajniaksap Oct 29, 2025
2fef084
fix tests
gkrajniaksap Oct 29, 2025
80101e8
Merge remote-tracking branch 'origin/main' into feat/extend-luigi-con…
gkrajniaksap Oct 29, 2025
1e02be7
Adjust kcp path calculation
gkrajniaksap Oct 29, 2025
c6faa87
fix tests
gkrajniaksap Oct 29, 2025
61e8866
Merge remote-tracking branch 'origin/main' into feat/extend-luigi-con…
gkrajniaksap Oct 31, 2025
7c0081d
Add kcpPath to Luigi context configuration and processing
gkrajniaksap Oct 31, 2025
779353a
Merge remote-tracking branch 'origin/main' into feat/extend-luigi-con…
gkrajniaksap Nov 3, 2025
de5f47e
Adjust kcp path calculation
gkrajniaksap Nov 3, 2025
f91c9fe
Merge branch 'main' into feat/extend-luigi-context
gkrajniak Nov 4, 2025
c099caf
Merge branch 'main' into feat/extend-luigi-context
gkrajniak Nov 4, 2025
8f137b8
fix tests
gkrajniaksap Nov 4, 2025
f274288
Merge remote-tracking branch 'origin/feat/extend-luigi-context' into …
gkrajniaksap Nov 4, 2025
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
2 changes: 2 additions & 0 deletions projects/lib/portal-options/models/luigi-context.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,9 @@ export interface PortalNodeContext extends NodeContext {
kcpPath?: string;
translationTable?: any;
namespaceId?: string;
accountPath?: string;
Copy link
Contributor

@nexus49 nexus49 Oct 28, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

where is the difference between kcpPath and accountPath?

Copy link
Collaborator Author

@gkrajniak gkrajniak Oct 28, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I will make and approach to tackle this duality

Copy link
Collaborator Author

@gkrajniak gkrajniak Oct 29, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done, and left only the kcpPath

entity?: Resource;
entityName?: string;
entityId?: string;
entityContext?: PortalEntityContext;
}
2 changes: 2 additions & 0 deletions projects/lib/portal-options/services/luigi-extended-global-context-config.service.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,9 @@ describe('LuigiExtendedGlobalContextConfigServiceImpl', () => {
organizationId: 'originClusterId/test-org',
kcpCA: 'dW5kZWZpbmVk',
organization: 'test-org',
accountPath: 'root:orgs:test-org',
entityId: 'originClusterId/test-org',
entityName: 'test-org',
});

expect(mockResourceService.readAccountInfo).toHaveBeenCalledWith({
Expand Down
2 changes: 2 additions & 0 deletions projects/lib/portal-options/services/luigi-extended-global-context-config.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,9 @@ export class LuigiExtendedGlobalContextConfigServiceImpl
organization: entityId,
organizationId: `${organizationOriginClusterId}/${entityId}`,
kcpCA: btoa(accountInfo?.spec?.clusterInfo?.ca),
accountPath: `root:orgs:${entityId}`,
entityId: `${organizationOriginClusterId}/${entityId}`, // if no entity selected the entityId is the same as the organizationId
entityName: entityId,
};
} catch (e) {
console.error(`Failed to read entity ${entityId} from ${operation}`, e);
Expand Down
17 changes: 11 additions & 6 deletions projects/lib/portal-options/services/node-context-processing.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
import { PortalNodeContext } from '../models/luigi-context';
import { PortalLuigiNode } from '../models/luigi-node';
import { CrdGatewayKcpPatchResolver } from './crd-gateway-kcp-patch-resolver.service';
import { Injectable, inject } from '@angular/core';
import {
NodeContextProcessingService,
} from '@openmfp/portal-ui-lib';
import { NodeContextProcessingService } from '@openmfp/portal-ui-lib';
import { ResourceService } from '@platform-mesh/portal-ui-lib/services';
import { replaceDotsAndHyphensWithUnderscores } from '@platform-mesh/portal-ui-lib/utils';
import { firstValueFrom } from 'rxjs';
import { PortalNodeContext } from '../models/luigi-context';
import { PortalLuigiNode } from '../models/luigi-node';
import { CrdGatewayKcpPatchResolver } from './crd-gateway-kcp-patch-resolver.service';

@Injectable({
providedIn: 'root',
Expand Down Expand Up @@ -67,11 +65,18 @@ export class NodeContextProcessingServiceImpl
);

// update the current already calculated by Luigi context for a node
ctx.accountPath =
ctx.resourceDefinition?.kind === 'Account'
? `${ctx.accountPath}:${entityId}`
: ctx.accountPath;
ctx.entity = entity;
ctx.entityName = entityId;
ctx.entityId = `${entity.metadata?.annotations?.['kcp.io/cluster']}/${entityId}`;
// update the node context of sa node to contain the entity for future context calculations
entityNode.context.entity = entity;
entityNode.context.entityName = ctx.entityName;
entityNode.context.entityId = ctx.entityId;
entityNode.context.accountPath = ctx.accountPath;
} catch (e) {
console.error(`Not able to read entity ${entityId} from ${operation}`);
}
Expand Down