Skip to content

Add ./hack/verify-jsonformat.sh to have properly formatted JSON files #1139

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.

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

Merged
merged 3 commits into from
Feb 26, 2015

Conversation

mfojtik
Copy link
Contributor

@mfojtik mfojtik commented Feb 25, 2015

This PR adds a new command:

./hack/verify-jsonformat.sh [--fix]

This command scans the repository for JSON file and verify that all JSON files are properly formatted, without errors, etc.

It also comes with handy --fix option that will format the JSON file for you. In this way all JSON files will look consistent.

@mfojtik mfojtik changed the title Fix json Add ./hack/verify-jsonformat.sh to have properly formatted JSON files Feb 25, 2015
@mfojtik
Copy link
Contributor Author

mfojtik commented Feb 25, 2015

@smarterclayton @bparees @soltysh PTAL

@soltysh
Copy link
Contributor

soltysh commented Feb 25, 2015

Generally speaking I like it, although our verify also does the actual formatting. I'd rather split those two actions, this way verify-jsonformat.sh could be part of PR tests, IMHO.

@mfojtik
Copy link
Contributor Author

mfojtik commented Feb 25, 2015

@soltysh our verify? is there another script that is verifying the JSON files? Without --fix this command can be part of PR tests (as it only warns when you are trying to push unformatted JSON)

@mfojtik
Copy link
Contributor Author

mfojtik commented Feb 25, 2015

@soltysh agree, seems like the MarshalIndent has some problem with big number and it seems like a Go bug (?). Going to perform only validation for errors in JSON instead of checking formatting.

@mfojtik
Copy link
Contributor Author

mfojtik commented Feb 25, 2015

[test]

@openshift-bot
Copy link
Contributor

continuous-integration/openshift-jenkins/test Running (https://ci.openshift.redhat.com/jenkins/job/test_pull_requests_openshift3/1176/)

@@ -0,0 +1,41 @@
#!/bin/bash

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

how about some usage docs?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

good catch

@mfojtik
Copy link
Contributor Author

mfojtik commented Feb 25, 2015

@bparees fixed && rebased

@mfojtik
Copy link
Contributor Author

mfojtik commented Feb 25, 2015

@bparees should I add it into .travis.yml ? no more invalid JSON(s) can pass after that :)

@soltysh
Copy link
Contributor

soltysh commented Feb 25, 2015

+1

@mfojtik
Copy link
Contributor Author

mfojtik commented Feb 26, 2015

[merge]

@openshift-bot
Copy link
Contributor

continuous-integration/openshift-jenkins/merge SUCCESS (https://ci.openshift.redhat.com/jenkins/job/merge_pull_requests_openshift3/1043/) (Image: devenv-fedora_899)

@mfojtik
Copy link
Contributor Author

mfojtik commented Feb 26, 2015

[merge]

@openshift-bot
Copy link
Contributor

Evaluated for origin up to ee3a34e

openshift-bot pushed a commit that referenced this pull request Feb 26, 2015
@openshift-bot openshift-bot merged commit de48629 into openshift:master Feb 26, 2015
jpeeler pushed a commit to jpeeler/origin that referenced this pull request Sep 5, 2017
…service-catalog/' changes from 7e650e7e39..ef63307bdb

ef63307bdb origin build: add origin tooling
a876fe3 v0.0.17 (openshift#1178)
c5237fe correct osbapi service definition (openshift#1177)
6036d4e Adding walkthrough instructions for 1.7 (openshift#1171)
5f111dd Specifying that you need Helm v2.5.0 for installation (openshift#1170)
08043bd Adding more small fixes to the walkthrough & install docs (openshift#1169)
d65d4a1 rbac targets needed to be renamed as well (openshift#1161)
590f6f2 Write helm command to file for api aggregation (openshift#1141)
49ddcf6 clean before building a specific arch (openshift#1168)
43f7cfb Splitting up the Walkthrough for 1.6 and 1.7 instructions (openshift#1163)
02e0217 Updates to README (openshift#1166)
57f2aa5 Adding instructions for installing from Macs (openshift#1164)
dfe620e fix rate-limiting for polling queue (openshift#1143)
ca5f335 Use Generation instead of checksum for Broker (openshift#1145)
5364daa Merge branch 'pr/1158'
f34c5db move Travis deployment script to directory in 'contrib/'
2a00d7f Update incorrect port (openshift#1156)
b0ed60e improve the repository's layout (openshift#1154)
f870baf Follow up file / renames from openshift#1142 (openshift#1152)
826b4f9 remove unnecessary json annotations (openshift#1153)
33cb345 Rename resources. closes openshift#1080 (openshift#1142)
70c2b9b Add ability to specify CA certs to use for TLS authentication. (openshift#1112)
2aa5039 v0.0.16 (openshift#1140)
65de49c Comments for unit test bullet proofing (openshift#1139)
REVERT: 7e650e7e39 origin build: add origin tooling

git-subtree-dir: cmd/service-catalog/go/src/github.com/kubernetes-incubator/service-catalog
git-subtree-split: ef63307bdbaa64efca204912f5361a4f3d3be2c8
jpeeler pushed a commit to jpeeler/origin that referenced this pull request Sep 11, 2017
…service-catalog/' changes from 7e650e7e39..ef63307bdb

ef63307bdb origin build: add origin tooling
a876fe3 v0.0.17 (openshift#1178)
c5237fe correct osbapi service definition (openshift#1177)
6036d4e Adding walkthrough instructions for 1.7 (openshift#1171)
5f111dd Specifying that you need Helm v2.5.0 for installation (openshift#1170)
08043bd Adding more small fixes to the walkthrough & install docs (openshift#1169)
d65d4a1 rbac targets needed to be renamed as well (openshift#1161)
590f6f2 Write helm command to file for api aggregation (openshift#1141)
49ddcf6 clean before building a specific arch (openshift#1168)
43f7cfb Splitting up the Walkthrough for 1.6 and 1.7 instructions (openshift#1163)
02e0217 Updates to README (openshift#1166)
57f2aa5 Adding instructions for installing from Macs (openshift#1164)
dfe620e fix rate-limiting for polling queue (openshift#1143)
ca5f335 Use Generation instead of checksum for Broker (openshift#1145)
5364daa Merge branch 'pr/1158'
f34c5db move Travis deployment script to directory in 'contrib/'
2a00d7f Update incorrect port (openshift#1156)
b0ed60e improve the repository's layout (openshift#1154)
f870baf Follow up file / renames from openshift#1142 (openshift#1152)
826b4f9 remove unnecessary json annotations (openshift#1153)
33cb345 Rename resources. closes openshift#1080 (openshift#1142)
70c2b9b Add ability to specify CA certs to use for TLS authentication. (openshift#1112)
2aa5039 v0.0.16 (openshift#1140)
65de49c Comments for unit test bullet proofing (openshift#1139)
REVERT: 7e650e7e39 origin build: add origin tooling

git-subtree-dir: cmd/service-catalog/go/src/github.com/kubernetes-incubator/service-catalog
git-subtree-split: ef63307bdbaa64efca204912f5361a4f3d3be2c8
jpeeler pushed a commit to jpeeler/origin that referenced this pull request Feb 1, 2018
* Broker binding tests cleanup

Comments every test and documents various testing combinations when present.

(openshift#1077)

* Modify test helper to be more clear

getTestInstanceNonbindableServiceBindablePlan has been rewritten to call
getTestInstance directly rather than calling another helper function to do so.

This is a small change, but I think it more readable and consistent with nearby
helper functions.
@mfojtik mfojtik deleted the fix_json branch September 5, 2018 21:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants