fix: Fix template resolution in UI #2754
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,77 @@ | ||
| import * as models from '../../models'; | ||
| import {ResourceScope, WorkflowStep} from '../../models'; | ||
|
|
||
| export function getResolvedTemplates(workflow: models.Workflow, node: models.NodeStatus): models.Template { | ||
|
There was a problem hiding this comment. this function has a lot of logic in it - so we should unit test it, but it is also a lift-and-shift, so not today |
||
| let tmpTemplate = { | ||
| template: node.templateName, | ||
| templateRef: node.templateRef | ||
| } as WorkflowStep; | ||
| const scope = getTemplateScope(node); | ||
| const referencedTemplates: models.Template[] = []; | ||
| let resolvedTemplate: models.Template = null; | ||
| const maxDepth = 10; | ||
| for (let i = 1; i < maxDepth + 1; i++) { | ||
| const templRef = resolveTemplateReference(scope.ResourceScope, scope.ResourceName, tmpTemplate); | ||
| let tmpl = null; | ||
| if (templRef.StorageNeeded) { | ||
| tmpl = workflow.status.storedTemplates[templRef.StoredTemplateName]; | ||
| } else if (tmpTemplate.template) { | ||
| tmpl = workflow.spec.templates.find(item => item.name === tmpTemplate.template); | ||
| } | ||
| if (!tmpl) { | ||
| const name = templRef.StoredTemplateName || tmpTemplate.template; | ||
| // tslint:disable-next-line: no-console | ||
| console.error(`StoredTemplate ${name} not found`); | ||
| return undefined; | ||
| } | ||
| referencedTemplates.push(tmpl); | ||
| if (!tmpl.template && !tmpl.templateRef) { | ||
| break; | ||
| } | ||
| tmpTemplate = tmpl; | ||
| if (i === maxDepth) { | ||
| // tslint:disable-next-line: no-console | ||
| console.error(`Template reference too deep`); | ||
| return undefined; | ||
| } | ||
| } | ||
| referencedTemplates.reverse().forEach(tmpl => { | ||
| tmpl = Object.assign({}, tmpl); | ||
| delete tmpl.template; | ||
| delete tmpl.templateRef; | ||
| resolvedTemplate = Object.assign({}, resolvedTemplate, tmpl); | ||
| }); | ||
| return resolvedTemplate; | ||
| } | ||
|
|
||
| // resolveTemplateReference resolves the stored template name of a given template holder on the template scope and determines | ||
| // if it should be stored | ||
| function resolveTemplateReference(callerScope: ResourceScope, resourceName: string, caller: WorkflowStep): {StoredTemplateName: string; StorageNeeded: boolean} { | ||
| if (caller.templateRef) { | ||
| // We are calling an external WorkflowTemplate or ClusterWorkflowTemplate. Template storage is needed | ||
| // We need to determine if we're calling a WorkflowTemplate or a ClusterWorkflowTemplate | ||
| const referenceScope: ResourceScope = caller.templateRef.clusterScope ? 'cluster' : 'namespaced'; | ||
| const name = referenceScope + '/' + caller.templateRef.name + '/' + caller.templateRef.template; | ||
| return {StoredTemplateName: name, StorageNeeded: true}; | ||
| } else if (callerScope !== 'local') { | ||
| // Either a WorkflowTemplate or a ClusterWorkflowTemplate is calling a template inside itself. Template storage is needed | ||
| const name = callerScope + '/' + resourceName + '/' + caller.template; | ||
| return {StoredTemplateName: name, StorageNeeded: true}; | ||
| } else { | ||
| // A Workflow is calling a template inside itself. Template storage is not needed | ||
| return {StoredTemplateName: '', StorageNeeded: false}; | ||
| } | ||
| } | ||
|
|
||
| function getTemplateScope(nodeStatus: models.NodeStatus): {ResourceScope: ResourceScope; ResourceName?: string} { | ||
| // For compatibility: an empty TemplateScope is a local scope | ||
| if (!nodeStatus.templateScope) { | ||
| return {ResourceScope: 'local'}; | ||
| } | ||
| const split = nodeStatus.templateScope.split('/'); | ||
| // For compatibility: an unspecified ResourceScope in a TemplateScope is a namespaced scope | ||
| if (split.length === 1) { | ||
| return {ResourceScope: 'namespaced', ResourceName: split[0]}; | ||
| } | ||
| return {ResourceScope: split[0] as ResourceScope, ResourceName: split[1]}; | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
All of the changes in
*.goand*.swagger.jsonfiles are only docstring changes.