Skip to content

Detect indentation from existing YAML in MigrateToRules #39

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

Open
scuba10steve wants to merge 1 commit into
base: main
Choose a base branch
from
+93 −2
Open

Detect indentation from existing YAML in MigrateToRules #39

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
21 changes: 19 additions & 2 deletions src/main/java/org/openrewrite/gitlab/MigrateToRules.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,8 @@ private static Yaml.Mapping migrateWithOnly(Yaml.Mapping m, Yaml.Mapping.Entry o
String entryPrefix = onlyEntry.getPrefix();
String baseIndent = entryPrefix.contains("\n") ?
entryPrefix.substring(entryPrefix.lastIndexOf('\n') + 1) : " ";
String seqIndent = baseIndent + " ";
String indentUnit = detectIndentUnit(baseIndent, (Yaml.Sequence) onlyEntry.getValue());
String seqIndent = baseIndent + indentUnit;
String contentIndent = seqIndent + " ";

StringBuilder sb = new StringBuilder("rules:");
Expand Down Expand Up @@ -147,7 +148,8 @@ private static Yaml.Mapping migrateExceptOnly(Yaml.Mapping m, Yaml.Mapping.Entry
String entryPrefix = exceptEntry.getPrefix();
String baseIndent = entryPrefix.contains("\n") ?
entryPrefix.substring(entryPrefix.lastIndexOf('\n') + 1) : " ";
String seqIndent = baseIndent + " ";
String indentUnit = detectIndentUnit(baseIndent, (Yaml.Sequence) exceptEntry.getValue());
String seqIndent = baseIndent + indentUnit;
String contentIndent = seqIndent + " ";

StringBuilder sb = new StringBuilder("rules:");
Expand Down Expand Up @@ -190,6 +192,21 @@ private static Yaml.Mapping migrateExceptOnly(Yaml.Mapping m, Yaml.Mapping.Entry
.orElse(null);
}

private static String detectIndentUnit(String baseIndent, Yaml.Sequence seq) {
List<Yaml.Sequence.Entry> entries = seq.getEntries();
if (entries.isEmpty()) {
return " ";
}
String childPrefix = entries.get(0).getPrefix();
String childIndent = childPrefix.contains("\n") ?
childPrefix.substring(childPrefix.lastIndexOf('\n') + 1) : "";
int increment = childIndent.length() - baseIndent.length();
if (increment <= 0) {
return " ";
}
return childIndent.substring(baseIndent.length());
}

static String refToCondition(String ref) {
switch (ref) {
case "branches":
Expand Down
74 changes: 74 additions & 0 deletions src/test/java/org/openrewrite/gitlab/MigrateToRulesTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -348,6 +348,80 @@ void multipleJobs() {
);
}

@Test
void migrateFourSpaceIndentOnly() {
rewriteRun(
//language=yaml
yaml(
"""
build_job:
script: make build
only:
- main
- tags
""",
"""
build_job:
script: make build
rules:
- if: $CI_COMMIT_BRANCH == 'main'
- if: $CI_COMMIT_TAG
""",
source -> source.path(".gitlab-ci.yml")
)
);
}

@Test
void migrateFourSpaceIndentExcept() {
rewriteRun(
//language=yaml
yaml(
"""
build_job:
script: make build
except:
- tags
""",
"""
build_job:
script: make build
rules:
- if: $CI_COMMIT_TAG
when: never
- when: always
""",
source -> source.path(".gitlab-ci.yml")
)
);
}

@Test
void migrateFourSpaceIndentCombined() {
rewriteRun(
//language=yaml
yaml(
"""
build_job:
script: make build
only:
- branches
except:
- main
""",
"""
build_job:
script: make build
rules:
- if: $CI_COMMIT_BRANCH == 'main'
when: never
- if: $CI_COMMIT_BRANCH
""",
source -> source.path(".gitlab-ci.yml")
)
);
}

@Test
void noopForNonGitlabCiFiles() {
rewriteRun(
Expand Down
Loading