Skip to content

fix: rollback to tenantId() method #114

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

Closed
mgabelle wants to merge 1 commit into from
Closed

fix: rollback to tenantId() method #114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 4 additions & 4 deletions src/main/java/io/kestra/plugin/git/SyncFlows.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ protected Flow simulateResourceWrite(RunContext runContext, String renderedNames
return null;
}

return flowService(runContext).importFlow(runContext.flowInfo().tenantId(), SyncFlows.replaceNamespace(renderedNamespace, uri, inputStream), true);
return flowService(runContext).importFlow(runContext.tenantId(), SyncFlows.replaceNamespace(renderedNamespace, uri, inputStream), true);
}

@Override
Expand All @@ -218,7 +218,7 @@ protected Flow writeResource(RunContext runContext, String renderedNamespace, UR

String flowSource = SyncFlows.replaceNamespace(renderedNamespace, uri, inputStream);

return flowService(runContext).importFlow(runContext.flowInfo().tenantId(), flowSource);
return flowService(runContext).importFlow(runContext.tenantId(), flowSource);
}

private static String replaceNamespace(String renderedNamespace, URI uri, InputStream inputStream) throws IOException {
Expand Down Expand Up @@ -264,10 +264,10 @@ protected SyncResult wrapper(RunContext runContext, String renderedGitDirectory,
@Override
protected List<Flow> fetchResources(RunContext runContext, String renderedNamespace) {
if (this.includeChildNamespaces) {
return flowService(runContext).findByNamespacePrefix(runContext.flowInfo().tenantId(), renderedNamespace);
return flowService(runContext).findByNamespacePrefix(runContext.tenantId(), renderedNamespace);
}

return flowService(runContext).findByNamespace(runContext.flowInfo().tenantId(), renderedNamespace);
return flowService(runContext).findByNamespace(runContext.tenantId(), renderedNamespace);
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/io/kestra/plugin/git/services/GitService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ public void namespaceAccessGuard(RunContext runContext, String namespaceToAccess
FlowService flowService = ((DefaultRunContext)runContext).getApplicationContext().getBean(FlowService.class);
RunContext.FlowInfo flowInfo = runContext.flowInfo();
flowService.checkAllowedNamespace(
runContext.flowInfo().tenantId(),
runContext.tenantId(),
runContext.render(namespaceToAccess),
flowInfo.tenantId(),
flowInfo.namespace()
Expand Down
Loading