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

CHAINSAW-234 Add rhsm.environments to schema #145

Merged
merged 6 commits into from
Jan 9, 2025
Merged

CHAINSAW-234 Add rhsm.environments to schema #145

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6c8368e
Add rhsm.environments to schema
Tomboyo Dec 4, 2024
b188cf5
Make environment pattern an exact match
Tomboyo Dec 5, 2024
c5481fe
Update rhsm environments schema
Tomboyo Dec 16, 2024
88f38df
Make invalids entry yet more invalid
Tomboyo Dec 16, 2024
70c5363
fix tests
Tomboyo Dec 16, 2024
e51aa6b
Add max length
Tomboyo Jan 7, 2025
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
11 changes: 11 additions & 0 deletions schemas/system_profile/v1.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -592,6 +592,17 @@ $defs:
example: "8.1, 7.5, 9.9"
type: string
maxLength: 255
environment_ids:
description: Environments ("content templates") the system is subscribed to.
example: ["262e621d10ae4475ab5732b39a9160b2"]
type: array
items:
description: An environment ID.
type: string
example: "262e621d10ae4475ab5732b39a9160b2, 01fd642e02de4e6da2da6172081a971e"
pattern: '^.*$'
maxLength: 256

system_purpose:
description: Object for system purpose information
type: object
Expand Down
1 change: 1 addition & 0 deletions tests/utils/invalids.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,7 @@
{"network_interfaces": [{"ipv6_addresses": "0123:4567:89ab:cdef:0123:4567:89ab:cdef"}]},
{"network_interfaces": [{"mtu": "15"}]},
{"rhsm": {"version": "x" * 300}},
{"rhsm": {"environment_ids": [5]}}, # must be an array of strings
{"operating_system": {"name": "RHEL"}}, # Incomplete OS definition
{"operating_system": {"name": "RHEL", "major": 9}}, # Incomplete OS definition
{"operating_system": {"major": 8, "minor": 7}}, # Incomplete OS definition
Expand Down
2 changes: 2 additions & 0 deletions tests/utils/valids.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,8 @@
{"network_interfaces": [{"ipv6_addresses": ["0123:4567:89ab:cdef:0123:4567:89ab:cdef"]}]},
{"network_interfaces": [{"mtu": 15}]},
{"rhsm": {"version": "99Server"}},
{"rhsm": {"environment_ids": ["46b6e690cc6a4906a3c9af4bca6e507d"]}},
{"rhsm": {"environment_ids": ["I'm an opaque token. I can be any string."]}},
{"operating_system": {"name": "RHEL", "major": 8, "minor": 10}},
{"operating_system": {"name": "CentOS", "major": 7, "minor": 0}},
{"operating_system": {"name": "CentOS Linux", "major": 7, "minor": 0}},
Expand Down
Loading