diff --git a/cli/zally/cflzally.sh b/cli/zally/cflzally.sh index 1c84b0085..a676963c9 100644 --- a/cli/zally/cflzally.sh +++ b/cli/zally/cflzally.sh @@ -7,16 +7,15 @@ echo "Linting $PATH..." /usr/bin/zally lint --json $PATH > /tmp/zally.json RESULT=$? +echo "Formatting markdown comment..." if /usr/bin/jq --exit-status ".violations | length > 0" /tmp/zally.json; then - - echo "Formatting markdown comment..." /usr/bin/jq \ --raw-output \ "$JSONTOMARKDOWN" \ /tmp/zally.json > /tmp/zally.md /bin/sed -e s/^/\ \ /g /tmp/zally.md - echo "Commenting on gitlab commit..." + echo "Commenting violations on gitlab commit..." /usr/bin/curl \ --silent \ --request POST \ @@ -26,6 +25,18 @@ if /usr/bin/jq --exit-status ".violations | length > 0" /tmp/zally.json; then --form "line=1" \ --form "line_type=new" \ ${CI_PROJECT_URL}/../../api/v4/projects/${CI_PROJECT_ID}/repository/commits/${CI_BUILD_REF}/comments + +else + echo "Commenting success on gitlab commit..." + /usr/bin/curl \ + --silent \ + --request POST \ + --header "PRIVATE-TOKEN: ${ZALLY_GITLAB_TOKEN}" \ + --data "note=%F0%9F%91%8D" \ + --data "path=$PATH" \ + --data "line=1" \ + --data "line_type=new" \ + ${CI_PROJECT_URL}/../../api/v4/projects/${CI_PROJECT_ID}/repository/commits/${CI_BUILD_REF}/comments fi exit $RESULT \ No newline at end of file diff --git a/server/src/test/java/de/zalando/zally/rule/CoreFilingAPITest.kt b/server/src/test/java/de/zalando/zally/rule/CoreFilingAPITest.kt index 8f72b45c5..aadd82320 100644 --- a/server/src/test/java/de/zalando/zally/rule/CoreFilingAPITest.kt +++ b/server/src/test/java/de/zalando/zally/rule/CoreFilingAPITest.kt @@ -200,6 +200,7 @@ class CoreFilingAPITest { policy.withMoreIgnores(listOf( "MatchingSummaryAndOperationIdNames", "101", // UseOpenApiRule + "146", // LimitNumberOfResourcesRule "150", // UseSpecificHttpStatusCodes "151" // NotSpecifyStandardErrorCodesRule )))