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

[chore] master -> develop from PR Cray-HPE/bos#329 (casmcms-9022) #331

Merged
merged 4 commits into from
Jun 5, 2024
Merged

[chore] master -> develop from PR Cray-HPE/bos#329 (casmcms-9022) #331

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f02b73f
CASMCMS-9022: Fix incorrect uses of format keyword in API spec
mharding-hpe Jun 5, 2024
dbcc9b1
Release 2.20.0 for CSM 1.6
mharding-hpe Jun 5, 2024
6babd95
Merge pull request #329 from Cray-HPE/casmcms-9022
mharding-hpe Jun 5, 2024
e5845f8
Merge branch 'develop' into mergeback-master-casmcms-9022-1717615467
mharding-hpe Jun 5, 2024
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
5 changes: 5 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

## [2.20.0] - 2024-06-05
### Fixed
- Some schemas in the API used the `format` keyword to mean `pattern`, and thus the patterns they specified were not being
interpreted or enforced. This fixes that.

## [2.19.0] - 2024-06-05
### Dependencies
- Bumped `certifi` from 2022.12.7 to 2023.7.22 to resolve [SNYK-PYTHON-CERTIFI-5805047 CVE](https://security.snyk.io/vuln/SNYK-PYTHON-CERTIFI-5805047)
Expand Down
6 changes: 3 additions & 3 deletions api/openapi.yaml.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ components:
type: string
description: Age in minutes (e.g. "3m"), hours (e.g. "5h"), days (e.g. "10d"), or weeks (e.g. "2w").
example: 3d
format: '^(0|0[mMhHdDwW]|[1-9][0-9]*[mMhHdDwW])$'
pattern: '^(0|0[mMhHdDwW]|[1-9][0-9]*[mMhHdDwW])$'
minLength: 1
# This allows for over 10 years using the smallest units (minutes)
maxLength: 8
Expand Down Expand Up @@ -986,7 +986,7 @@ components:
Delete complete Sessions that are older than cleanup_completed_session_ttl (in minutes, hours, days, or weeks).
0 disables cleanup behavior.
example: 3d
format: '^(0|0[mMhHdDwW]|[1-9][0-9]*[mMhHdDwW])$'
pattern: '^(0|0[mMhHdDwW]|[1-9][0-9]*[mMhHdDwW])$'
minLength: 1
# This allows for over 10 years using the smallest units (minutes)
maxLength: 8
Expand All @@ -999,7 +999,7 @@ components:
The maximum amount of time a Component's actual state is considered valid (in minutes, hours, days, or weeks).
0 disables cleanup behavior for newly booted nodes and instructs bos-state-reporter to report once instead of periodically.
example: 6h
format: '^(0|0[mMhHdDwW]|[1-9][0-9]*[mMhHdDwW])$'
pattern: '^(0|0[mMhHdDwW]|[1-9][0-9]*[mMhHdDwW])$'
minLength: 1
# This allows for over 10 years using the smallest units (minutes)
maxLength: 8
Expand Down