Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 main.tsp
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ using OpenAPI;
*/
@service(#{ title: "HyperFleet API" })
@info(#{
version: "1.0.25",
version: "1.0.26",

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

🩺 Stability & Availability | 🟠 Major | ⚡ Quick win

Keep @info.version in the exact format CI parses.

Line 36 is part of the merge gate: .github/workflows/ci.yml:42-64 extracts version: "..." from main.tsp, and this PR already fails that step with Failed to extract version from main.tsp. Merge stays blocked until this entry is emitted in the exact parseable form or the workflow is updated in the same change.

🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

In `@main.tsp` at line 36, The `@info.version` entry in main.tsp is not being
emitted in the exact string format that the CI version extraction step expects,
causing the parse to fail. Update the version declaration so it matches the CI
parser’s required `version: "..."` shape exactly, using the existing version
symbol in main.tsp, or adjust the workflow parser in the same change if the
format must change.

Source: Pipeline failures

contact: #{
name: "HyperFleet Team",
url: "https://github.com/openshift-hyperfleet",
Expand Down
6 changes: 3 additions & 3 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"build": "./build-schema.sh"
},
"dependencies": {
"hyperfleet": "github:openshift-hyperfleet/hyperfleet-api-spec#v1.0.24"
"hyperfleet": "github:openshift-hyperfleet/hyperfleet-api-spec#v1.0.25"
},
"devDependencies": {
"@stoplight/spectral-cli": "6.15.1",
Expand Down
20 changes: 1 addition & 19 deletions schemas/template/openapi.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
openapi: 3.0.0
info:
title: HyperFleet API
version: 1.0.25
version: 1.0.26
contact:
name: HyperFleet Team
url: https://github.com/openshift-hyperfleet
Expand Down Expand Up @@ -1501,19 +1501,16 @@ components:
description: Timestamp when the resource was last updated
created_by:
type: string
format: email
description: Identity that created the resource
updated_by:
type: string
format: email
description: Identity that last updated the resource
deleted_time:
type: string
format: date-time
description: Timestamp when deletion was requested; omitted if not marked for deletion
deleted_by:
type: string
format: email
description: Identity that requested deletion; omitted if not marked for deletion
generation:
type: integer
Expand Down Expand Up @@ -1669,19 +1666,16 @@ components:
description: Timestamp when the resource was last updated
created_by:
type: string
format: email
description: Identity that created the resource
updated_by:
type: string
format: email
description: Identity that last updated the resource
deleted_time:
type: string
format: date-time
description: Timestamp when deletion was requested; omitted if not marked for deletion
deleted_by:
type: string
format: email
description: Identity that requested deletion; omitted if not marked for deletion
generation:
type: integer
Expand Down Expand Up @@ -2035,19 +2029,16 @@ components:
description: Timestamp when the resource was last updated
created_by:
type: string
format: email
description: Identity that created the resource
updated_by:
type: string
format: email
description: Identity that last updated the resource
deleted_time:
type: string
format: date-time
description: Timestamp when deletion was requested; omitted if not marked for deletion
deleted_by:
type: string
format: email
description: Identity that requested deletion; omitted if not marked for deletion
generation:
type: integer
Expand Down Expand Up @@ -2230,19 +2221,16 @@ components:
description: Timestamp when the resource was last updated
created_by:
type: string
format: email
description: Identity that created the resource
updated_by:
type: string
format: email
description: Identity that last updated the resource
deleted_time:
type: string
format: date-time
description: Timestamp when deletion was requested; omitted if not marked for deletion
deleted_by:
type: string
format: email
description: Identity that requested deletion; omitted if not marked for deletion
generation:
type: integer
Expand Down Expand Up @@ -2639,19 +2627,16 @@ components:
description: Timestamp when the resource was last updated
created_by:
type: string
format: email
description: Identity that created the resource
updated_by:
type: string
format: email
description: Identity that last updated the resource
deleted_time:
type: string
format: date-time
description: Timestamp when deletion was requested; omitted if not marked for deletion
deleted_by:
type: string
format: email
description: Identity that requested deletion; omitted if not marked for deletion
generation:
type: integer
Expand Down Expand Up @@ -2827,19 +2812,16 @@ components:
description: Timestamp when the resource was last updated
created_by:
type: string
format: email
description: Identity that created the resource
updated_by:
type: string
format: email
description: Identity that last updated the resource
deleted_time:
type: string
format: date-time
description: Timestamp when deletion was requested; omitted if not marked for deletion
deleted_by:
type: string
format: email
description: Identity that requested deletion; omitted if not marked for deletion
generation:
type: integer
Expand Down
20 changes: 1 addition & 19 deletions schemas/template/swagger.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ info:
name: Apache 2.0
url: 'https://www.apache.org/licenses/LICENSE-2.0'
title: HyperFleet API
version: 1.0.25
version: 1.0.26
host: hyperfleet.redhat.com
basePath: /
schemes:
Expand Down Expand Up @@ -1491,15 +1491,13 @@ definitions:
properties:
created_by:
description: Identity that created the resource
format: email
type: string
created_time:
description: Timestamp when the resource was created
format: date-time
type: string
deleted_by:
description: Identity that requested deletion; omitted if not marked for deletion
format: email
type: string
deleted_time:
description: >-
Expand Down Expand Up @@ -1536,7 +1534,6 @@ definitions:
$ref: '#/definitions/ResourceStatus'
updated_by:
description: Identity that last updated the resource
format: email
type: string
updated_time:
description: Timestamp when the resource was last updated
Expand Down Expand Up @@ -1715,15 +1712,13 @@ definitions:
properties:
created_by:
description: Identity that created the resource
format: email
type: string
created_time:
description: Timestamp when the resource was created
format: date-time
type: string
deleted_by:
description: Identity that requested deletion; omitted if not marked for deletion
format: email
type: string
deleted_time:
description: >-
Expand Down Expand Up @@ -1764,7 +1759,6 @@ definitions:
$ref: '#/definitions/ClusterStatus'
updated_by:
description: Identity that last updated the resource
format: email
type: string
updated_time:
description: Timestamp when the resource was last updated
Expand Down Expand Up @@ -2106,15 +2100,13 @@ definitions:
properties:
created_by:
description: Identity that created the resource
format: email
type: string
created_time:
description: Timestamp when the resource was created
format: date-time
type: string
deleted_by:
description: Identity that requested deletion; omitted if not marked for deletion
format: email
type: string
deleted_time:
description: >-
Expand Down Expand Up @@ -2157,7 +2149,6 @@ definitions:
$ref: '#/definitions/NodePoolStatus'
updated_by:
description: Identity that last updated the resource
format: email
type: string
updated_time:
description: Timestamp when the resource was last updated
Expand Down Expand Up @@ -2234,15 +2225,13 @@ definitions:
properties:
created_by:
description: Identity that created the resource
format: email
type: string
created_time:
description: Timestamp when the resource was created
format: date-time
type: string
deleted_by:
description: Identity that requested deletion; omitted if not marked for deletion
format: email
type: string
deleted_time:
description: >-
Expand Down Expand Up @@ -2285,7 +2274,6 @@ definitions:
$ref: '#/definitions/NodePoolStatus'
updated_by:
description: Identity that last updated the resource
format: email
type: string
updated_time:
description: Timestamp when the resource was last updated
Expand Down Expand Up @@ -2689,15 +2677,13 @@ definitions:
properties:
created_by:
description: Identity that created the resource
format: email
type: string
created_time:
description: Timestamp when the resource was created
format: date-time
type: string
deleted_by:
description: Identity that requested deletion; omitted if not marked for deletion
format: email
type: string
deleted_time:
description: >-
Expand Down Expand Up @@ -2735,7 +2721,6 @@ definitions:
$ref: '#/definitions/ResourceStatus'
updated_by:
description: Identity that last updated the resource
format: email
type: string
updated_time:
description: Timestamp when the resource was last updated
Expand Down Expand Up @@ -2874,15 +2859,13 @@ definitions:
properties:
created_by:
description: Identity that created the resource
format: email
type: string
created_time:
description: Timestamp when the resource was created
format: date-time
type: string
deleted_by:
description: Identity that requested deletion; omitted if not marked for deletion
format: email
type: string
deleted_time:
description: >-
Expand Down Expand Up @@ -2919,7 +2902,6 @@ definitions:
$ref: '#/definitions/ResourceStatus'
updated_by:
description: Identity that last updated the resource
format: email
type: string
updated_time:
description: Timestamp when the resource was last updated
Expand Down