HYPERFLEET-1103 - feat:restructure TypeSpec sources into core, gcp

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

Author: rh-amarin

.github/workflows/ci.yml

@@ -47,9 +47,9 @@ jobs:
         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 +59,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"

aliases-core.tsp

@@ -58,29 +58,20 @@ done
 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}"
+# Resolve the provider entry point
+PROVIDER_ENTRY="${PROVIDER}/main.tsp"
+if [ ! -f "$PROVIDER_ENTRY" ]; then
+    echo -e "${RED}Error: Provider entry point not found: ${PROVIDER_ENTRY}${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"
+    for dir in */; do
+        if [ -f "${dir}main.tsp" ]; then
+            echo "  - ${dir%/}"
         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}"
@@ -105,24 +96,15 @@ else
 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 ""
-
-# Step 2: Create output directory for the provider
+# Step 1: Create output directory for the provider
 OUTPUT_DIR="schemas/${PROVIDER}"
-echo -e "${YELLOW}Step 2: Preparing output directory...${NC}"
+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}"
+# Step 2: Compile TypeSpec to generate OpenAPI schema
+echo -e "${YELLOW}Step 2: Compiling TypeSpec from ${PROVIDER_ENTRY}...${NC}"
 TEMP_OUTPUT_DIR="tsp-output-${PROVIDER}"
 
 # Cleanup function to remove temporary directory on exit
@@ -133,7 +115,7 @@ cleanup() {
 }
 trap cleanup EXIT
 
-if "$TSP" compile main.tsp --output-dir "$TEMP_OUTPUT_DIR"; then
+if "$TSP" compile "$PROVIDER_ENTRY" --output-dir "$TEMP_OUTPUT_DIR"; then
     # Move the generated schema to the provider-specific directory
     if [ -f "${TEMP_OUTPUT_DIR}/schema/openapi.yaml" ]; then
         mv "${TEMP_OUTPUT_DIR}/schema/openapi.yaml" "${OUTPUT_DIR}/openapi.yaml"
@@ -152,10 +134,10 @@ else
     exit 1
 fi
 
-# Step 4: Convert to OpenAPI 2.0 (Swagger) if requested
+# Step 3: 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}"
+    echo -e "${YELLOW}Step 3: Converting to OpenAPI 2.0 (Swagger)...${NC}"
 
     if npx api-spec-converter \
         --from=openapi_3 \

aliases-gcp.tsp

@@ -0,0 +1,50 @@
+import "@typespec/http";
+import "@typespec/openapi";
+import "@typespec/openapi3";
+
+import "./models/cluster/model.tsp";
+import "./models/cluster/example_cluster.tsp";
+import "./models/cluster/example_post.tsp";
+import "./models/cluster/example_patch.tsp";
+import "./models/nodepool/model.tsp";
+import "./models/nodepool/example_nodepool.tsp";
+import "./models/nodepool/example_post.tsp";
+import "./models/nodepool/example_patch.tsp";
+import "./services/statuses-internal.tsp";
+
+import "../shared/services/clusters.tsp";
+import "../shared/services/statuses.tsp";
+import "../shared/services/nodepools.tsp";
+
+using Http;
+using OpenAPI;
+
+/**
+ * HyperFleet API provides simple CRUD operations for managing cluster resources and their status history.
+ *
+ * **Architecture**: Simple CRUD only, no business logic, no event creation.
+ * Sentinel operator handles all orchestration logic.
+ * Adapters handle the specifics of managing spec
+ *
+ */
+@service(#{ title: "HyperFleet API" })
+@info(#{
+  version: "1.0.15",
+  contact: #{
+    name: "HyperFleet Team",
+    url: "https://github.com/openshift-hyperfleet",
+  },
+  license: #{
+    name: "Apache 2.0",
+    url: "https://www.apache.org/licenses/LICENSE-2.0",
+  },
+})
+@server("https://hyperfleet.redhat.com", "Production")
+@route("/api/hyperfleet/v1")
+namespace HyperFleet;
+
+// Override BearerAuth to use lowercase "bearer" as required by kin-openapi
+model BearerAuth {
+  type: AuthType.http;
+  scheme: "bearer";
+}

aliases.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",

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 exampleClusterPatchRequest: ClusterPatchRequest = #{
   spec: #{},

core/main.tsp

@@ -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",