Skip to content
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

Jump to bottom

Fix/yamlsupport #665

Open
wants to merge 10 commits into
base: main
Choose a base branch
from
Open

Fix/yamlsupport #665

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
70dc6a3
fixing exporting the servicetemplate of a YAML CSAR
nyuuyn Mar 29, 2022
1a677e3
enables the YAML export to export normative types as well
nyuuyn Mar 29, 2022
e440292
Add configuration for YAML normative types export
v-yussupov May 11, 2022
163f4dd
Remove unused import
v-yussupov May 11, 2022
f4691cb
Add initial support for YAML workflows
v-yussupov Jun 3, 2022
a88f01f
Fix checkstyle issues
v-yussupov Jun 3, 2022
1c2eba7
fixes checkstyle issue
nyuuyn Jun 14, 2022
27a42c8
adds temporary fix for workflow params
nyuuyn Jun 14, 2022
c48b81b
Update input definitions in YAML workflows
v-yussupov Jun 20, 2022
5039ed8
Merge branch 'main' into fix/yamlsupport
koppor May 14, 2024
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
4 changes: 4 additions & 0 deletions ...ry.repository/src/main/java/org/eclipse/winery/repository/importing/YamlCsarImporter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,10 @@ protected Optional<ServiceTemplateId> processDefinitionsImport(TDefinitions defs
this.adjustNodeType(definitionsPath.getParent().getParent(), (TNodeType) ci, (NodeTypeId) wid, tmf, errors);
} else if (ci instanceof TRelationshipType) {
this.adjustRelationshipType(definitionsPath.getParent().getParent(), (TRelationshipType) ci, (RelationshipTypeId) wid, tmf, errors);
} else if (ci instanceof TServiceTemplate) {
// tosca yaml doesn't have plans but workflows, therefore this seems not to be working properly
// this.adjustServiceTemplate(definitionsPath.getParent().getParent(), tmf, (ServiceTemplateId) wid, (TServiceTemplate) ci, errors);
entryServiceTemplate = Optional.of((ServiceTemplateId) wid);
}

storeDefs(wid, newDefs);
Expand Down
2 changes: 1 addition & 1 deletion ...pository/src/main/java/org/eclipse/winery/repository/yaml/export/YamlToscaExportUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@

public class YamlToscaExportUtil extends ToscaExportUtil {

private static final boolean EXPORT_NORMATIVE_TYPES = false;
private static final boolean EXPORT_NORMATIVE_TYPES = true;
private static final Logger LOGGER = LoggerFactory.getLogger(YamlToscaExportUtil.class);

@Override
Expand Down