dbg - prisma startup

Author: cherusk

.github/workflows/ci.yml

@@ -72,29 +72,77 @@ jobs:
           exit 1
         fi
         echo "OpenAPI spec downloaded successfully"
-        head -5 openapi.yml
+        echo "=== Spec file size ==="
+        wc -l openapi.yml
+        echo "=== First 20 lines of spec ==="
+        head -20 openapi.yml
+        echo "=== Paths section ==="
+        grep -A 20 "^paths:" openapi.yml || echo "No paths section found"
+        echo "=== All path definitions ==="
+        grep -E "^\s*/" openapi.yml || echo "No path definitions found"
 
         # Start Prism container in background
         docker run -d --name prism -p 4010:4010 \
           -v $(pwd)/openapi.yml:/tmp/openapi.yml \
           stoplight/prism:4 \
           mock --host 0.0.0.0 /tmp/openapi.yml
 
+        # Check if container started
+        echo "Checking container status..."
+        docker ps | grep prism || echo "Container not found in docker ps"
+        echo "=== Container logs ==="
+        docker logs prism || echo "No logs available"
+        echo "=== Container inspection ==="
+        docker inspect prism | grep -A 10 -B 10 "State" || echo "Could not inspect container"
+        echo "=== Network ports ==="
+        docker port prism || echo "Could not get port mappings"
+
         # Wait for Prism to start
         echo "Waiting for Prism to start..."
         sleep 15
 
+        # Test basic connectivity
+        echo "Testing basic connectivity to localhost:4010..."
+        curl -v http://localhost:4010 || echo "Basic connection failed"
+
         # Verify Prism is running with retry
         for i in {1..5}; do
-          if curl -f http://localhost:4010/health; then
-            echo "Prism container started successfully on port 4010"
+          echo "=== Attempt $i: Testing Prism health ==="
+          if curl -v http://localhost:4010/health 2>&1 | head -10; then
+            echo "✅ Prism container started successfully on port 4010"
             break
           else
-            echo "Attempt $i: Prism not ready yet, waiting..."
+            echo "❌ Attempt $i: Prism not ready yet, waiting..."
+            echo "Container still running?"
+            docker ps | grep prism || echo "Container stopped"
+            echo "Recent logs:"
+            docker logs --tail 5 prism
             sleep 5
           fi
         done
 
+        # Test available endpoints
+        echo "=== Testing available Prism endpoints ==="
+        echo "Testing root path:"
+        curl -v http://localhost:4010/ 2>&1 | head -10 || echo "Root path failed"
+        
+        echo "Testing /v0 path:"
+        curl -v http://localhost:4010/v0 2>&1 | head -10 || echo "/v0 path failed"
+        
+        echo "Testing /v0/breeders:"
+        curl -v http://localhost:4010/v0/breeders 2>&1 | head -10 || echo "/v0/breeders failed"
+        
+        echo "Testing OpenAPI spec:"
+        curl -v http://localhost:4010/openapi.json 2>&1 | head -5 || echo "OpenAPI spec failed"
+        
+        echo "=== Testing exact URLs that CLI will use ==="
+        echo "Testing /breeders (what CLI should call):"
+        curl -v http://localhost:4010/breeders 2>&1 | head -10 || echo "/breeders failed"
+        
+        echo "Testing POST /breeders:"
+        curl -X POST -H "Content-Type: application/json" -d '{"name":"test"}' \
+          http://localhost:4010/breeders 2>&1 | head -10 || echo "POST /breeders failed"
+
     - name: Integration tests against Prism mock
       run: |
         # Get the binary path
@@ -118,7 +166,7 @@ jobs:
 
         # Test breeder show with a mock UUID
         echo "Testing: breeder show"
-        $BINARY_PATH --hostname=localhost --port=4010 breeder show --uuid=123e4567-e89b-12d3-a456-426614174000
+        $BINARY_PATH --hostname=localhost --port=4010 breeder show --id=123e4567-e89b-12d3-a456-426614174000
 
         # Create update test file
         echo 'name: "Updated Test Breeder"' > test_breeder_update.yml
@@ -133,7 +181,7 @@ jobs:
 
         # Test breeder purge
         echo "Testing: breeder purge"
-        $BINARY_PATH --hostname=localhost --port=4010 breeder purge --uuid=123e4567-e89b-12d3-a456-426614174000
+        $BINARY_PATH --hostname=localhost --port=4010 breeder purge --id=123e4567-e89b-12d3-a456-426614174000
 
         # Test help commands
         echo "Testing: help commands"

src/godon/client.nim

@@ -29,21 +29,22 @@ proc newGodonClient*(hostname: string = DefaultHostname,
 
 proc baseUrl*(client: GodonClient): string =
   ## Get the base URL for API requests
-  result = "http://" & client.config.hostname & ":" & $client.config.port & "/" & client.config.apiVersion
+  result = "http://" & client.config.hostname & ":" & $client.config.port
 
 proc handleResponse*[T](client: GodonClient; response: Response): ApiResponse[T] =
   ## Handle HTTP response and convert to ApiResponse
   let statusCode = parseInt(split(response.status, " ")[0])
   if statusCode >= 200 and statusCode < 300:
     try:
+      echo "Raw response body: ", response.body
       let jsonData = parseJson(response.body)
       result = ApiResponse[T](success: true, data: jsonData.to(T), error: "")
     except CatchableError as e:
       result = ApiResponse[T](success: false, data: default(T), error: "JSON parse error: " & e.msg)
   else:
     try:
       let errorJson = parseJson(response.body)
-      let errorMsg = errorJson.getOrDefault("message").getStr("HTTP Error: " & $statusCode)
+      let errorMsg = errorJson{"message"}.getStr("HTTP Error: " & $statusCode)
       result = ApiResponse[T](success: false, data: default(T), error: errorMsg)
     except CatchableError:
       result = ApiResponse[T](success: false, data: default(T), error: "HTTP Error: " & $statusCode)
@@ -54,7 +55,7 @@ proc handleError*(client: GodonClient, response: Response): ref CatchableError =
   var errorMsg = "HTTP Error: " & $statusCode
   try:
     let errorJson = parseJson(response.body)
-    errorMsg = errorJson.getOrDefault("message").getStr(errorMsg)
+    errorMsg = errorJson{"message"}.getStr(errorMsg)
   except CatchableError:
     discard
 

src/godon/types.nim

@@ -5,9 +5,10 @@ import std/json
 
 type
   Breeder* = object
-    uuid*: string
+    id*: string
     name*: string
     description*: string
+    status*: string
     config*: JsonNode
     createdAt*: string
     updatedAt*: string

src/godon_cli.nim

@@ -10,9 +10,9 @@ Usage:
 Commands:
   breeder list                           List all configured breeders
   breeder create --file <path>           Create a breeder from file
-  breeder show --uuid <uuid>             Show breeder details
+  breeder show --id <id>             Show breeder details
   breeder update --file <path>           Update a breeder from file
-  breeder purge --uuid <uuid>            Delete a breeder
+  breeder purge --id <id>            Delete a breeder
 
 Global Options:
   --hostname, -h <host>     Godon hostname (default: localhost)
@@ -24,7 +24,7 @@ Examples:
   godon_cli breeder list
   godon_cli --hostname api.example.com --port 9090 breeder list
   godon_cli breeder create --file breeder.yaml
-  godon_cli breeder show --uuid 123e4567-e89b-12d3-a456-426614174000
+  godon_cli breeder show --id 123e4567-e89b-12d3-a456-426614174000
 """
 
 proc writeError(message: string) =
@@ -41,7 +41,6 @@ proc parseArgs(): (string, string, int, string, seq[string]) =
   var p = initOptParser(commandLineParams())
 
   for kind, key, val in p.getopt():
-    echo "Parsed: kind=", kind, " key=", key, " val=", val
     case kind
     of cmdArgument:
       if command.len == 0:
@@ -87,9 +86,10 @@ proc handleBreederCommand(client: GodonClient, command: string, args: seq[string
     if response.success:
       echo "Breeders:"
       for breeder in response.data:
-        echo "  UUID: ", breeder.uuid
+        echo "  ID: ", breeder.id
         echo "  Name: ", breeder.name
         echo "  Description: ", breeder.description
+        echo "  Status: ", breeder.status
         echo "  Created: ", breeder.createdAt
         echo "  Updated: ", breeder.updatedAt
         echo "  ---"
@@ -114,27 +114,27 @@ proc handleBreederCommand(client: GodonClient, command: string, args: seq[string
     let response = client.createBreederFromYaml(content)
     if response.success:
       echo "Breeder created successfully:"
-      echo "  UUID: ", response.data.uuid
+      echo "  ID: ", response.data.id
       echo "  Name: ", response.data.name
       echo "  Description: ", response.data.description
     else:
       writeError(response.error)
 
   of "show":
-    var uuid = ""
+    var id = ""
     for i in 1 ..< args.len.int:
-      if args[i-1] == "--uuid":
-        uuid = args[i]
+      if args[i-1] == "--id":
+        id = args[i]
         break
 
-    if uuid.len == 0:
-      writeError("breeder show requires --uuid <uuid>")
+    if id.len == 0:
+      writeError("breeder show requires --id <id>")
 
-    echo "Getting breeder details for UUID: ", uuid
-    let response = client.getBreeder(uuid)
+    echo "Getting breeder details for ID: ", id
+    let response = client.getBreeder(id)
     if response.success:
       echo "Breeder Details:"
-      echo "  UUID: ", response.data.uuid
+      echo "  ID: ", response.data.id
       echo "  Name: ", response.data.name
       echo "  Description: ", response.data.description
       echo "  Config: ", pretty(response.data.config)
@@ -161,24 +161,24 @@ proc handleBreederCommand(client: GodonClient, command: string, args: seq[string
     let response = client.updateBreederFromYaml(content)
     if response.success:
       echo "Breeder updated successfully:"
-      echo "  UUID: ", response.data.uuid
+      echo "  ID: ", response.data.id
       echo "  Name: ", response.data.name
       echo "  Description: ", response.data.description
     else:
       writeError(response.error)
 
   of "purge":
-    var uuid = ""
+    var id = ""
     for i in 1 ..< args.len.int:
-      if args[i-1] == "--uuid":
-        uuid = args[i]
+      if args[i-1] == "--id":
+        id = args[i]
         break
 
-    if uuid.len == 0:
-      writeError("breeder purge requires --uuid <uuid>")
+    if id.len == 0:
+      writeError("breeder purge requires --id <id>")
 
-    echo "Deleting breeder with UUID: ", uuid
-    let response = client.deleteBreeder(uuid)
+    echo "Deleting breeder with ID: ", id
+    let response = client.deleteBreeder(id)
     if response.success:
       echo "Breeder deleted successfully"
       if response.data != nil: