diff options
author | Vratko Polak <vrpolak@cisco.com> | 2022-01-31 15:24:53 +0100 |
---|---|---|
committer | Peter Mikus <peter.mikus@protonmail.ch> | 2022-06-30 07:02:06 +0000 |
commit | 9e22f65d5e9f7045625a8d6bf79ce75d836e1447 (patch) | |
tree | 847c04b2e7890700781289a62ab1a8b49c1ef3af /resources/libraries/bash | |
parent | 325cef50672aed697e277405fe9bb9b797d02701 (diff) |
style(tox): prepare for fixer scripts
The previous code assumes each tox script is a checker.
We want to add fixer scripts (not voting but editing) soon.
This is the less interesting part of the process,
renaming things and updating comments.
Includes some basic descriptions of how fixers differ from checkers.
Change-Id: I1ca1572a328acd02b41dcf4e70d7cb3746a03b03
Signed-off-by: Vratko Polak <vrpolak@cisco.com>
Diffstat (limited to 'resources/libraries/bash')
-rw-r--r-- | resources/libraries/bash/entry/tox/README.txt (renamed from resources/libraries/bash/entry/check/README.txt) | 20 | ||||
-rw-r--r-- | resources/libraries/bash/entry/tox/autogen.sh (renamed from resources/libraries/bash/entry/check/autogen.sh) | 2 | ||||
-rw-r--r-- | resources/libraries/bash/entry/tox/copyright_year.sh (renamed from resources/libraries/bash/entry/check/copyright_year.sh) | 2 | ||||
-rw-r--r-- | resources/libraries/bash/entry/tox/doc_verify.sh (renamed from resources/libraries/bash/entry/check/doc_verify.sh) | 4 | ||||
-rw-r--r-- | resources/libraries/bash/entry/tox/gpl_license.sh (renamed from resources/libraries/bash/entry/check/gpl_license.sh) | 2 | ||||
-rw-r--r-- | resources/libraries/bash/entry/tox/line.sh (renamed from resources/libraries/bash/entry/check/line.sh) | 2 | ||||
-rw-r--r-- | resources/libraries/bash/entry/tox/model_version.sh (renamed from resources/libraries/bash/entry/check/model_version.sh) | 0 | ||||
-rw-r--r-- | resources/libraries/bash/entry/tox/new_line.sh (renamed from resources/libraries/bash/entry/check/new_line.sh) | 2 | ||||
-rw-r--r-- | resources/libraries/bash/entry/tox/pylint.sh (renamed from resources/libraries/bash/entry/check/pylint.sh) | 2 |
9 files changed, 23 insertions, 13 deletions
diff --git a/resources/libraries/bash/entry/check/README.txt b/resources/libraries/bash/entry/tox/README.txt index 7f86d83b58..e13b60209e 100644 --- a/resources/libraries/bash/entry/check/README.txt +++ b/resources/libraries/bash/entry/tox/README.txt @@ -1,4 +1,4 @@ -# Copyright (c) 2021 Cisco and/or its affiliates. +# Copyright (c) 2022 Cisco and/or its affiliates. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at: @@ -11,10 +11,13 @@ # See the License for the specific language governing permissions and # limitations under the License. -This directory contains checker scripts and other files they need. -Each checker script is assumed to be run from tox, +This directory contains tox scripts and other files they need. +Generally, a tox script is either a checker (suitable for automated verify) +or a fixer (manually started, risky as uncommitted edits can be lost). +Each tox script is assumed to be run from tox, when working directory is set to ${CSIT_DIR}. -Each script should: + +Each checker script should: + Return nonzero exit code when it fails. ++ The tox might ignore the code when the check is not blocking. + Write less verbose output to stderr. @@ -25,3 +28,12 @@ Each script should: ++ The level of "less verbose" depends on check and state of codebase. + TODO: Should we carefully document which files are whitelisted/blacklisted for a particulat check? + +Each fixer script should: ++ Perform edits on current filesystem ++ Not assume git is clean (there may be uncommitted edits). ++ Use "git diff HEAD~" to get both comitted and uncomitted edits to analyze. ++ Output whatever it wants (possibly nothing). + +TODO: Should checkers be named differently than fixers? + E.g. both scripts and tox environments start with fix_? diff --git a/resources/libraries/bash/entry/check/autogen.sh b/resources/libraries/bash/entry/tox/autogen.sh index d7cd8e0dbd..40cc2c2066 100644 --- a/resources/libraries/bash/entry/check/autogen.sh +++ b/resources/libraries/bash/entry/tox/autogen.sh @@ -1,4 +1,4 @@ -# Copyright (c) 2021 Cisco and/or its affiliates. +# Copyright (c) 2022 Cisco and/or its affiliates. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at: diff --git a/resources/libraries/bash/entry/check/copyright_year.sh b/resources/libraries/bash/entry/tox/copyright_year.sh index dae1a8dc46..9ed9fcb653 100644 --- a/resources/libraries/bash/entry/check/copyright_year.sh +++ b/resources/libraries/bash/entry/tox/copyright_year.sh @@ -1,4 +1,4 @@ -# Copyright (c) 2021 Cisco and/or its affiliates. +# Copyright (c) 2022 Cisco and/or its affiliates. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at: diff --git a/resources/libraries/bash/entry/check/doc_verify.sh b/resources/libraries/bash/entry/tox/doc_verify.sh index baa9d8aa74..7eec4b69e4 100644 --- a/resources/libraries/bash/entry/check/doc_verify.sh +++ b/resources/libraries/bash/entry/tox/doc_verify.sh @@ -1,6 +1,4 @@ -#!/usr/bin/env bash - -# Copyright (c) 2021 Cisco and/or its affiliates. +# Copyright (c) 2022 Cisco and/or its affiliates. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at: diff --git a/resources/libraries/bash/entry/check/gpl_license.sh b/resources/libraries/bash/entry/tox/gpl_license.sh index 167d3f3ecd..7112075883 100644 --- a/resources/libraries/bash/entry/check/gpl_license.sh +++ b/resources/libraries/bash/entry/tox/gpl_license.sh @@ -1,4 +1,4 @@ -# Copyright (c) 2021 Cisco and/or its affiliates. +# Copyright (c) 2022 Cisco and/or its affiliates. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at: diff --git a/resources/libraries/bash/entry/check/line.sh b/resources/libraries/bash/entry/tox/line.sh index 6f373121e0..a90fc22cae 100644 --- a/resources/libraries/bash/entry/check/line.sh +++ b/resources/libraries/bash/entry/tox/line.sh @@ -1,4 +1,4 @@ -# Copyright (c) 2021 Cisco and/or its affiliates. +# Copyright (c) 2022 Cisco and/or its affiliates. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at: diff --git a/resources/libraries/bash/entry/check/model_version.sh b/resources/libraries/bash/entry/tox/model_version.sh index 2bcc628bfb..2bcc628bfb 100644 --- a/resources/libraries/bash/entry/check/model_version.sh +++ b/resources/libraries/bash/entry/tox/model_version.sh diff --git a/resources/libraries/bash/entry/check/new_line.sh b/resources/libraries/bash/entry/tox/new_line.sh index 4857f9f8bd..a8fb38f73e 100644 --- a/resources/libraries/bash/entry/check/new_line.sh +++ b/resources/libraries/bash/entry/tox/new_line.sh @@ -1,4 +1,4 @@ -# Copyright (c) 2021 Cisco and/or its affiliates. +# Copyright (c) 2022 Cisco and/or its affiliates. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at: diff --git a/resources/libraries/bash/entry/check/pylint.sh b/resources/libraries/bash/entry/tox/pylint.sh index fbfea4773e..a3e0f8ee14 100644 --- a/resources/libraries/bash/entry/check/pylint.sh +++ b/resources/libraries/bash/entry/tox/pylint.sh @@ -1,4 +1,4 @@ -# Copyright (c) 2021 Cisco and/or its affiliates. +# Copyright (c) 2022 Cisco and/or its affiliates. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at: |