Merge pull request #330 from Cray-HPE/casmcms-9022-csm-1.5

CASMCMS-9022: Fix incorrect uses of format keyword in API spec

CHANGELOG.md

@@ -7,6 +7,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [2.10.20] - 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.10.19] - 2024-05-31
 ### Fixed
 - Instantiate S3 client in a thread-safe manner.

api/openapi.yaml.in

@@ -111,7 +111,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
@@ -1606,7 +1606,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
@@ -1619,7 +1619,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