Skip to content

main: Stop setting COSA_META_SCHEMA #2961

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

Merged
cgwalters merged 2 commits into from
Jul 6, 2022
Merged

main: Stop setting COSA_META_SCHEMA #2961

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0fae4db
Fix duplicate `.json.json` in schema defaults
cgwalters Jul 5, 2022
3d9f179
main: Stop setting `COSA_META_SCHEMA`
cgwalters Jul 5, 2022
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
2 changes: 1 addition & 1 deletion src/cmd-meta
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ def new_cli():
action='store_true')
parser.add_argument('--schema', help='location of meta.json schema',
default=os.environ.get("COSA_META_SCHEMA",
f'{COSA_PATH}/v1.json.json'))
f'{COSA_PATH}/v1.json'))
parser.add_argument('--true', dest='bool', default=None,
help='set a field', action='store_true')
parser.add_argument('--false', dest='bool', default=None,
Expand Down
2 changes: 1 addition & 1 deletion src/cmd-oc-adm-release
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ if __name__ == '__main__':
parser.add_argument('--build', default='latest')
parser.add_argument('--schema', help='location of meta.json schema',
default=os.environ.get("COSA_META_SCHEMA",
f'{COSA_PATH}/v1.json.json'))
f'{COSA_PATH}/v1.json'))
parser.add_argument("--authfile", action="store", required=True,
help="Pull secret")
parser.add_argument("--arch", action='store',
Expand Down
8 changes: 0 additions & 8 deletions src/coreos-assembler
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,14 +74,6 @@ if [ -z "${cmd}" ]; then
fi
shift

COSA_META_SCHEMA="${COSA_META_SCHEMA:-/usr/lib/coreos-assembler/v1.json}"
schema_override="${PWD}/src/config/schema.json"
if [ -e "${schema_override}" ]; then
COSA_META_SCHEMA=$(realpath "${schema_override}")
fi
export COSA_META_SCHEMA
Comment on lines -77 to -82
Copy link
Member

@dustymabe dustymabe Jul 6, 2022

Choose a reason for hiding this comment

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

so the code itself already behaves this way and there was no reason to do this?

Does it handle if "${PWD}/src/config/schema.json" exists?

I'm happy to delete this code, just don't know if anything is relying on that.

Copy link
Member Author

@cgwalters cgwalters Jul 6, 2022

Choose a reason for hiding this comment

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

Does it handle if "${PWD}/src/config/schema.json" exists?

Ah right, I should have commented on that. I don't believe that was ever actually used, so it should be safe to delete.



target=/usr/lib/coreos-assembler/cmd-${cmd}
if test -x "${target}"; then
exec "${target}" "$@"
Expand Down