HYPERFLEET-1103 - feat: restructure TypeSpec sources into core and shared

- Move GCP-specific models out of this repo (now in hyperfleet-api-spec-gcp)
- Restructure sources into core/ (core-specific) and shared/ (cross-provider)
- Add generic Resource model and CRUD service (from main reconciliation)
- Add force-delete endpoints for clusters, nodepools, and resources (internal)
- Add ResourceStatusesInternal for adapter resource status reporting
- Simplify build script: single provider (core only), openapi output only
- Add npm sub-path exports to enable downstream package imports

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

Author: rh-amarin

.github/workflows/ci.yml

@@ -24,32 +24,28 @@ jobs:
       - name: Install dependencies
         run: npm ci
 
-      - name: Build all schemas
-        run: |
-          ./build-schema.sh core
-          ./build-schema.sh core --swagger
-          ./build-schema.sh gcp
-          ./build-schema.sh gcp --swagger
+      - name: Build core schema
+        run: ./build-schema.sh
 
       - name: Check schema consistency
         run: |
           if ! git diff --exit-code schemas/; then
             echo "Committed schemas are out of sync with TypeSpec sources."
-            echo "Run './build-schema.sh core --swagger && ./build-schema.sh gcp --swagger' and commit the results."
+            echo "Run './build-schema.sh' and commit the results."
             exit 1
           fi
 
-      - name: Lint OpenAPI schemas
+      - name: Lint OpenAPI schema
         run: |
-          npx spectral lint schemas/core/openapi.yaml schemas/gcp/openapi.yaml --format github-actions --fail-severity warn
+          npx spectral lint schemas/core/openapi.yaml --format github-actions --fail-severity warn
 
       - name: Check version bump
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
-          CURRENT=$(grep -oP '(?<=version: ")[^"]+' main.tsp)
+          CURRENT=$(grep -oP '(?<=version: ")[^"]+' core/main.tsp)
           if [ -z "$CURRENT" ]; then
-            echo "::error::Failed to extract version from main.tsp — check the @info decorator format" >&2
+            echo "::error::Failed to extract version from core/main.tsp — check the @info decorator format" >&2
             exit 1
           fi
           LATEST=$(gh release list --limit 1 --json tagName --jq '.[0].tagName' 2>/dev/null | sed 's/^v//' || echo "")
@@ -59,10 +55,10 @@ jobs:
           fi
           HIGHEST=$(printf '%s\n%s\n' "$CURRENT" "$LATEST" | sort -V | tail -1)
           if [ "$CURRENT" = "$LATEST" ]; then
-            echo "::error::Version '$CURRENT' matches latest release tag 'v$LATEST' — bump the version in main.tsp before merging."
+            echo "::error::Version '$CURRENT' matches latest release tag 'v$LATEST' — bump the version in core/main.tsp before merging."
             exit 1
           elif [ "$HIGHEST" != "$CURRENT" ]; then
-            echo "::error::Version '$CURRENT' is lower than latest release 'v$LATEST' — version in main.tsp must be strictly greater."
+            echo "::error::Version '$CURRENT' is lower than latest release 'v$LATEST' — version in core/main.tsp must be strictly greater."
             exit 1
           fi
           echo "Version bump OK: $LATEST → $CURRENT"

.github/workflows/release.yml

@@ -28,9 +28,9 @@ jobs:
       - name: Extract version
         id: version
         run: |
-          VERSION=$(grep -oP '(?<=version: ")[^"]+' main.tsp)
+          VERSION=$(grep -oP '(?<=version: ")[^"]+' core/main.tsp)
           if [ -z "$VERSION" ]; then
-            echo "::error::Failed to extract version from main.tsp — check the @info decorator format" >&2
+            echo "::error::Failed to extract version from core/main.tsp — check the @info decorator format" >&2
             exit 1
           fi
           echo "version=$VERSION" >> "$GITHUB_OUTPUT"
@@ -49,21 +49,14 @@ jobs:
             echo "skip=false" >> "$GITHUB_OUTPUT"
           fi
 
-      - name: Build all schemas
+      - name: Build core schema
         if: steps.check_tag.outputs.skip == 'false'
-        run: |
-          ./build-schema.sh core
-          ./build-schema.sh core --swagger
-          ./build-schema.sh gcp
-          ./build-schema.sh gcp --swagger
+        run: ./build-schema.sh
 
       - name: Prepare release assets
         if: steps.check_tag.outputs.skip == 'false'
         run: |
           cp schemas/core/openapi.yaml core-openapi.yaml
-          cp schemas/core/swagger.yaml core-swagger.yaml
-          cp schemas/gcp/openapi.yaml gcp-openapi.yaml
-          cp schemas/gcp/swagger.yaml gcp-swagger.yaml
 
       - name: Create release tag
         if: steps.check_tag.outputs.skip == 'false'
@@ -85,8 +78,5 @@ jobs:
           prerelease: false
           files: |
             core-openapi.yaml
-            core-swagger.yaml
-            gcp-openapi.yaml
-            gcp-swagger.yaml
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

CHANGELOG.md

@@ -7,38 +7,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
-## [1.0.17] - 2026-05-21
-
-### Added
-
-- Generic `Resource` type with `kind` discriminator and JSONB `spec` field, replacing per-entity model hierarchies for new resource types (HYPERFLEET-1083)
-- `ResourceCreateRequest`, `ResourcePatchRequest`, `ResourceList`, `ResourceStatus` types in core contract
-- Generic `/resources` CRUD routes in core contract (GET list, GET by ID, POST, PATCH, DELETE) per design doc Section 3.2
-- `/channels` and `/channels/{channel_id}/versions` CRUD routes in GCP contract
-- `references` field on Resource for non-ownership associations between entities (Section 9)
-- `ChannelSpec` validation schema in GCP contract (`is_default`, `enabled_regex`)
-- `VersionSpec` validation schema in GCP contract (`raw_version`, `enabled`, `is_default`, `release_image`, `end_of_life_time`)
-- `KindChannel` and `KindVersion` kind aliases in GCP contract
-
-### Changed
-
-- `GET /resources/{id}/statuses` and `POST /resources/{id}/force-delete` moved to core contract
-- `GET /clusters/{id}/statuses` and `GET /nodepools/{id}/statuses` moved to core contract
-
-## [1.0.16] - 2026-05-20
-
-### Added
-
-- `channelGroup` optional field to `ReleaseSpec` in GCP cluster model (GCP-696)
-
-## [1.0.15] - 2026-05-18
-
-### Added
-
-- `ForceDeleteRequest` model with required `reason` field (HYPERFLEET-1075)
-- POST `/clusters/{cluster_id}/force-delete` internal endpoint for force-deleting stuck clusters (HYPERFLEET-1075)
-- POST `/clusters/{cluster_id}/nodepools/{nodepool_id}/force-delete` internal endpoint for force-deleting stuck nodepools (HYPERFLEET-1075)
-
 ## [1.0.14] - 2026-05-15
 
 ### Removed
@@ -170,10 +138,7 @@ First official stable release of the HyperFleet API specification.
 - Interactive API documentation
 
 <!-- Links -->
-[Unreleased]: https://github.com/openshift-hyperfleet/hyperfleet-api-spec/compare/v1.0.17...HEAD
-[1.0.17]: https://github.com/openshift-hyperfleet/hyperfleet-api-spec/compare/v1.0.16...v1.0.17
-[1.0.16]: https://github.com/openshift-hyperfleet/hyperfleet-api-spec/compare/v1.0.15...v1.0.16
-[1.0.15]: https://github.com/openshift-hyperfleet/hyperfleet-api-spec/compare/v1.0.14...v1.0.15
+[Unreleased]: https://github.com/openshift-hyperfleet/hyperfleet-api-spec/compare/v1.0.14...HEAD
 [1.0.14]: https://github.com/openshift-hyperfleet/hyperfleet-api-spec/compare/v1.0.13...v1.0.14
 [1.0.13]: https://github.com/openshift-hyperfleet/hyperfleet-api-spec/compare/v1.0.12...v1.0.13
 [1.0.12]: https://github.com/openshift-hyperfleet/hyperfleet-api-spec/compare/v1.0.11...v1.0.12

aliases-core.tsp

@@ -1,140 +1,42 @@
 #!/bin/bash
 
-# Build HyperFleet OpenAPI Schema
-# Usage: ./build-schema.sh <provider> [--swagger|--openapi2]
-#   provider: core, gcp, or any provider with aliases-{provider}.tsp file (required, must be first argument)
-#   --swagger, --openapi2: Also generate OpenAPI 2.0 (Swagger) format
+# Build HyperFleet core OpenAPI schema
+# Usage: ./build-schema.sh
 
 set -e
 
-# Colors for output
 RED='\033[0;31m'
 GREEN='\033[0;32m'
 YELLOW='\033[1;33m'
-NC='\033[0m' # No Color
+NC='\033[0m'
 
-# Parse arguments
-GENERATE_SWAGGER=false
-
-# Provider is required and must be the first argument
-if [ $# -lt 1 ]; then
-    echo -e "${RED}Error: Provider argument is required${NC}"
-    echo "Usage: $0 <provider> [--swagger|--openapi2]"
-    echo "  provider: core, gcp, or any provider with aliases-{provider}.tsp file"
-    echo "  --swagger, --openapi2: Also generate OpenAPI 2.0 (Swagger) format"
-    exit 1
-fi
-
-PROVIDER="$1"
-shift
-
-# Check if provider looks like an option (starts with -)
-if [[ "$PROVIDER" == -* ]]; then
-    echo -e "${RED}Error: Provider must be the first argument${NC}"
-    echo "Usage: $0 <provider> [--swagger|--openapi2]"
-    exit 1
-fi
-
-# Parse remaining options
-for arg in "$@"; do
-    case $arg in
-        --swagger|--openapi2)
-            GENERATE_SWAGGER=true
-            ;;
-        -*)
-            echo -e "${RED}Error: Unknown option: $arg${NC}"
-            echo "Usage: $0 <provider> [--swagger|--openapi2]"
-            exit 1
-            ;;
-        *)
-            echo -e "${RED}Error: Unexpected argument: $arg${NC}"
-            echo "Usage: $0 <provider> [--swagger|--openapi2]"
-            exit 1
-            ;;
-    esac
-done
-
-# Script directory (where the script is located)
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 cd "$SCRIPT_DIR"
 
-# Define the aliases file for the provider
-ALIASES_FILE="aliases-${PROVIDER}.tsp"
-
-# Check if the aliases file exists
-if [ ! -f "$ALIASES_FILE" ]; then
-    echo -e "${RED}Error: Provider aliases file not found: ${ALIASES_FILE}${NC}"
-    echo ""
-    echo "Available providers:"
-    for file in aliases-*.tsp; do
-        if [ -f "$file" ]; then
-            provider_name=$(echo "$file" | sed 's/aliases-\(.*\)\.tsp/\1/')
-            echo "  - $provider_name"
-        fi
-    done
-    exit 1
-fi
-
-# Check if main.tsp exists
-if [ ! -f "main.tsp" ]; then
-    echo -e "${RED}Error: main.tsp not found in current directory${NC}"
-    exit 1
-fi
-
-# Check if tsp command is available
 if [ ! -x "${SCRIPT_DIR}/node_modules/.bin/tsp" ]; then
     echo -e "${RED}Error: tsp not found in node_modules. Run 'npm install' first.${NC}"
     exit 1
 fi
 TSP="${SCRIPT_DIR}/node_modules/.bin/tsp"
 
-# Check if api-spec-converter is available when swagger output is requested
-if [ "$GENERATE_SWAGGER" = true ]; then
-    if ! npx api-spec-converter --version &> /dev/null; then
-        echo -e "${RED}Error: api-spec-converter not found. Please install it.${NC}"
-        echo "Install with: npm install --save-dev api-spec-converter"
-        exit 1
-    fi
-fi
-
-echo -e "${GREEN}Building HyperFleet API schema for provider: ${PROVIDER}${NC}"
-if [ "$GENERATE_SWAGGER" = true ]; then
-    echo -e "${GREEN}Output formats: OpenAPI 3.0 + OpenAPI 2.0 (Swagger)${NC}"
-else
-    echo -e "${GREEN}Output format: OpenAPI 3.0${NC}"
-fi
-echo ""
-
-# Step 1: Re-link aliases.tsp to the provider-specific aliases file
-echo -e "${YELLOW}Step 1: Linking aliases.tsp to ${ALIASES_FILE}${NC}"
-if [ -L "aliases.tsp" ] || [ -f "aliases.tsp" ]; then
-    rm -f aliases.tsp
-fi
-ln -sf "$ALIASES_FILE" aliases.tsp
-echo -e "${GREEN}✓ Linked aliases.tsp → ${ALIASES_FILE}${NC}"
+echo -e "${GREEN}Building HyperFleet core API schema${NC}"
 echo ""
 
-# Step 2: Create output directory for the provider
-OUTPUT_DIR="schemas/${PROVIDER}"
-echo -e "${YELLOW}Step 2: Preparing output directory...${NC}"
+OUTPUT_DIR="schemas/core"
+echo -e "${YELLOW}Step 1: Preparing output directory...${NC}"
 mkdir -p "$OUTPUT_DIR"
 echo -e "${GREEN}✓ Created output directory: ${OUTPUT_DIR}${NC}"
 echo ""
 
-# Step 3: Compile TypeSpec to generate OpenAPI schema
-echo -e "${YELLOW}Step 3: Compiling TypeSpec...${NC}"
-TEMP_OUTPUT_DIR="tsp-output-${PROVIDER}"
+echo -e "${YELLOW}Step 2: Compiling TypeSpec from core/main.tsp...${NC}"
+TEMP_OUTPUT_DIR="tsp-output-core"
 
-# Cleanup function to remove temporary directory on exit
 cleanup() {
-    if [ -d "$TEMP_OUTPUT_DIR" ]; then
-        rm -rf "$TEMP_OUTPUT_DIR"
-    fi
+    rm -rf "$TEMP_OUTPUT_DIR"
 }
 trap cleanup EXIT
 
-if "$TSP" compile main.tsp --output-dir "$TEMP_OUTPUT_DIR"; then
-    # Move the generated schema to the provider-specific directory
+if "$TSP" compile ./main.tsp --output-dir "$TEMP_OUTPUT_DIR"; then
     if [ -f "${TEMP_OUTPUT_DIR}/schema/openapi.yaml" ]; then
         mv "${TEMP_OUTPUT_DIR}/schema/openapi.yaml" "${OUTPUT_DIR}/openapi.yaml"
         echo ""
@@ -152,25 +54,5 @@ else
     exit 1
 fi
 
-# Step 4: Convert to OpenAPI 2.0 (Swagger) if requested
-if [ "$GENERATE_SWAGGER" = true ]; then
-    echo ""
-    echo -e "${YELLOW}Step 4: Converting to OpenAPI 2.0 (Swagger)...${NC}"
-    
-    if npx api-spec-converter \
-        --from=openapi_3 \
-        --to=swagger_2 \
-        --syntax=yaml \
-        "${OUTPUT_DIR}/openapi.yaml" > "${OUTPUT_DIR}/swagger.yaml" 2>/dev/null; then
-        echo -e "${GREEN}✓ Successfully generated OpenAPI 2.0 (Swagger) schema${NC}"
-        echo -e "${GREEN}Output: ${OUTPUT_DIR}/swagger.yaml${NC}"
-    else
-        echo -e "${RED}✗ Failed to convert to OpenAPI 2.0 (Swagger)${NC}"
-        echo "The OpenAPI 3.0 schema may contain features not supported in OpenAPI 2.0"
-        rm -f "${OUTPUT_DIR}/swagger.yaml"
-        exit 1
-    fi
-fi
-
 echo ""
 echo -e "${GREEN}Build complete!${NC}"

aliases-gcp.tsp

@@ -1,6 +1,6 @@
-import "../../aliases-core.tsp";
-import "../../models/clusters/model.tsp";
-import "../../models/common/model.tsp";
+import "./model.tsp";
+import "../../../shared/models/clusters/model.tsp";
+import "../../../shared/models/common/model.tsp";
 
 const exampleCluster: Cluster = #{
   kind: "Cluster",

aliases.tsp

@@ -1,5 +1,5 @@
-import "../../aliases-core.tsp";
-import "../../models/clusters/model.tsp";
+import "./model.tsp";
+import "../../../shared/models/clusters/model.tsp";
 
 const exampleClusterPatchRequest: ClusterPatchRequest = #{
   spec: #{},

build-schema.sh

@@ -1,5 +1,5 @@
-import "../../aliases-core.tsp";
-import "../../models/clusters/model.tsp";
+import "./model.tsp";
+import "../../../shared/models/clusters/model.tsp";
 
 const exampleClusterCreateRequest: ClusterCreateRequest = #{
   kind: "Cluster",