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

test GH output printer #324

Merged
merged 1 commit into from
Feb 3, 2025
Merged

test GH output printer #324

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
6 changes: 5 additions & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,11 @@ jobs:
java-version: '11'

- name: Build and Release
run: ./gradlew clean check
run: ./gradlew clean check shadowJar

- name: Test validate
continue-on-error: true
run: ./rmf-gen.sh validate -f GITHUB ./api-spec/api.raml
test_node:
name: Build npm package

Expand Down
1 change: 1 addition & 0 deletions tools/cli-application/src/main/kotlin/io/vrap/rmf/codegen/cli/DiffSubcommand.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ class DiffSubcommand : Callable<Int> {
OutputFormat.PHP_MARKDOWN -> PHPMarkdownFormatPrinter()
OutputFormat.TS_MARKDOWN -> TSMarkdownFormatPrinter()
OutputFormat.DOTNET_MARKDOWN -> DotNetMarkdownFormatPrinter()
OutputFormat.GITHUB -> CliFormatPrinter()
OutputFormat.JSON -> JsonFormatPrinter()
}
}
Expand Down
10 changes: 3 additions & 7 deletions tools/cli-application/src/main/kotlin/io/vrap/rmf/codegen/cli/Utils.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,11 @@ enum class OutputFormat {
PHP_MARKDOWN,
TS_MARKDOWN,
DOTNET_MARKDOWN,
JSON;
JSON,
GITHUB;

companion object {
const val VALID_VALUES = "CLI, JSON, MARKDOWN"
const val VALID_VALUES = "CLI, JSON, MARKDOWN, GITHUB"
}
}

Expand Down Expand Up @@ -183,8 +184,3 @@ object InternalLogger {
}
}
}





24 changes: 21 additions & 3 deletions tools/cli-application/src/main/kotlin/io/vrap/rmf/codegen/cli/ValidateSubcommand.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ import io.vrap.rmf.raml.model.RamlDiagnostic
import io.vrap.rmf.raml.model.RamlModelBuilder
import io.vrap.rmf.raml.model.RamlModelResult
import io.vrap.rmf.raml.model.modules.Api
import io.vrap.rmf.raml.validation.Source
import io.vrap.rmf.raml.validation.Violation
import org.eclipse.emf.common.util.Diagnostic
import org.eclipse.emf.common.util.URI
Expand Down Expand Up @@ -199,6 +198,7 @@ class ValidateSubcommand : Callable<Int> {
OutputFormat.PHP_MARKDOWN -> MarkdownFormatPrinter(linkFormatter)
OutputFormat.TS_MARKDOWN -> MarkdownFormatPrinter(linkFormatter)
OutputFormat.DOTNET_MARKDOWN -> MarkdownFormatPrinter(linkFormatter)
OutputFormat.GITHUB -> GithubFormatPrinter(linkFormatter)
OutputFormat.JSON -> TODO()
}
}
Expand Down Expand Up @@ -280,6 +280,26 @@ class ValidateSubcommand : Callable<Int> {
}
}

class GithubFormatPrinter(override val linkFormatter: LinkFormatter): FormatPrinter {

override fun print(fileURI: URI, result: RamlModelResult<Api>): String {
val validationResults = result.validationResults
var output = ""
if (validationResults.isNotEmpty()) {
val errors = validationResults.filter { diagnostic -> diagnostic.severity == Diagnostic.ERROR }
val warnings = validationResults.filter { diagnostic -> diagnostic.severity == Diagnostic.WARNING }
val infos = validationResults.filter { diagnostic -> diagnostic.severity == Diagnostic.INFO }

if (errors.isNotEmpty()) output += errors.joinToString("\n") { "::error file=${java.net.URI.create(it.location).path},line=${it.line}::${it.detailMessage()}" }
if (warnings.isNotEmpty()) output += errors.joinToString("\n") { "::warning file=${java.net.URI.create(it.location).path},line=${it.line}::${it.detailMessage()}" }
if (infos.isNotEmpty()) output += errors.joinToString("\n") { "::notice file=${java.net.URI.create(it.location).path},line=${it.line}::${it.detailMessage()}" }

return output
}
return "✅ Specification at ${fileURI.toFileString()} is valid."
}
}

class MarkdownFormatPrinter(override val linkFormatter: LinkFormatter): FormatPrinter {
override fun print(fileURI: URI, result: RamlModelResult<Api>): String {
val relativeFileLink = Path(fileURI.toFileString()).relativeTo(linkFormatter.filePath)
Expand Down Expand Up @@ -321,5 +341,3 @@ class ValidateSubcommand : Callable<Int> {
}
}
}


Loading