pr ci include test runs against api mock

cherusk · cherusk · commit 434c8e2139e7 · 2025-12-12T14:07:46.000+01:00
Using openapi.yml godon-api mock deliberately. That avoids having to
start godon-api dependencies and keeps the test flow simple.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -32,7 +32,7 @@ jobs:
 
         # Set environment variables for this session
         export SSL_CERT_FILE="/etc/ssl/certs/ca-bundle.crt"
-        export NIX_SSL_CERT_FILE="/etc/ssl/certs/ca-bundle.crt" 
+        export NIX_SSL_CERT_FILE="/etc/ssl/certs/ca-bundle.crt"
         export CURL_CA_BUNDLE="/etc/ssl/certs/ca-bundle.crt"
 
         # Add to nix.conf for daemon
@@ -58,3 +58,138 @@ jobs:
         ls -la $(nix path-info .#default)/bin/ || echo "$out/bin not found"
         echo "Testing compiled binary with direct path..."
         $(nix path-info .#default)/bin/godon_cli --help
+
+    - name: Start Prism mock container
+      run: |
+        # Download the OpenAPI spec with retry
+        echo "Downloading OpenAPI spec..."
+        curl -L --retry 3 --retry-delay 5 -o openapi.yml \
+          https://raw.githubusercontent.com/godon-dev/godon-images/main/images/godon-api/openapi.yml
+
+        # Verify the spec was downloaded
+        if [ ! -f openapi.yml ]; then
+          echo "Failed to download OpenAPI spec"
+          exit 1
+        fi
+        echo "OpenAPI spec downloaded successfully"
+        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
+          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 "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
+        BINARY_PATH=$(nix path-info .#default)/bin/godon_cli
+
+        echo "Running integration tests against Prism mock..."
+
+        # Test breeder list
+        echo "Testing: breeder list"
+        $BINARY_PATH --hostname=localhost --port=4010 breeder list
+
+        # Create test YAML files using echo
+        echo 'name: "Test Breeder"' > test_breeder.yml
+        echo 'description: "Integration test breeder"' >> test_breeder.yml
+        echo 'config:' >> test_breeder.yml
+        echo '  setting1: "value1"' >> test_breeder.yml
+        echo '  setting2: 42' >> test_breeder.yml
+
+        echo "Testing: breeder create"
+        $BINARY_PATH --hostname=localhost --port=4010 breeder create --file=test_breeder.yml
+
+        # Test breeder show with a mock UUID
+        echo "Testing: breeder show"
+        $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
+        echo 'description: "Updated integration test breeder"' >> test_breeder_update.yml
+        echo 'config:' >> test_breeder_update.yml
+        echo '  setting1: "updated_value1"' >> test_breeder_update.yml
+        echo '  setting2: 100' >> test_breeder_update.yml
+        echo '  new_setting: "new_value"' >> test_breeder_update.yml
+
+        echo "Testing: breeder update"
+        $BINARY_PATH --hostname=localhost --port=4010 breeder update --file=test_breeder_update.yml
+
+        # Test breeder purge
+        echo "Testing: breeder purge"
+        $BINARY_PATH --hostname=localhost --port=4010 breeder purge --id=123e4567-e89b-12d3-a456-426614174000
+
+        # Test help commands
+        echo "Testing: help commands"
+        $BINARY_PATH --help
+        $BINARY_PATH breeder --help || true  # May fail but tests argument parsing
+
+    - name: Cleanup Prism container
+      if: always()
+      run: |
+        docker stop prism || true
+        docker rm prism || true
diff --git a/flake.nix b/flake.nix
@@ -38,8 +38,9 @@
           buildPhase = ''
             echo "Building godon-cli version: ${version}"
             
-            # Refresh package list and build
+            # Refresh package list and install dependencies
             nimble refresh
+            nimble install -y
             
             # Build the CLI
             mkdir -p bin
diff --git a/godon_cli.nimble b/godon_cli.nimble
@@ -7,7 +7,7 @@ license       = "AGPL-3.0"
 
 # Dependencies
 
-requires "nim >= 2.0.0"
+requires "nim >= 2.0.0", "yaml"
 
 # Task definitions
 
diff --git a/src/godon/breeder.nim b/src/godon/breeder.nim
@@ -2,6 +2,7 @@
 ## Implementation of breeder-related API endpoints
 
 import std/[httpclient, json, strutils, uri]
+import yaml
 import client, types
 
 proc listBreeders*(client: GodonClient): ApiResponse[seq[Breeder]] =
@@ -24,15 +25,12 @@ proc createBreeder*(client: GodonClient, request: BreederCreateRequest): ApiResp
     result = ApiResponse[Breeder](success: false, data: default(Breeder), error: e.msg)
 
 proc parseBreederFromYaml*(yamlContent: string): BreederCreateRequest =
-  ## Parse breeder configuration from YAML content
-  ## Note: This would require a YAML library like yaml.nim
-  ## For now, this is a placeholder for the YAML parsing logic
-  ## Users can pass JSON directly or we can add proper YAML parsing later
+  ## Parse breeder configuration from YAML content using yaml library
   try:
-    let jsonNode = parseJson(yamlContent)
-    result = jsonNode.to(BreederCreateRequest)
+    let yamlNode = yaml.loadYaml(yamlContent)
+    result = yamlNode.to(BreederCreateRequest)
   except CatchableError as e:
-    raise newException(ValueError, "Failed to parse YAML/JSON: " & e.msg)
+    raise newException(ValueError, "Failed to parse YAML: " & e.msg)
 
 proc createBreederFromYaml*(client: GodonClient, yamlContent: string): ApiResponse[Breeder] =
   ## Create a breeder from YAML content
diff --git a/src/godon/client.nim b/src/godon/client.nim
@@ -29,32 +29,33 @@ 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(response.status)
+  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)
 
 proc handleError*(client: GodonClient, response: Response): ref CatchableError =
   ## Convert HTTP error response to exception
-  let statusCode = parseInt(response.status)
+  let statusCode = parseInt(split(response.status, " ")[0])
   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
   
diff --git a/src/godon/types.nim b/src/godon/types.nim
@@ -5,12 +5,11 @@ import std/json
 
 type
   Breeder* = object
-    uuid*: string
+    id*: string
     name*: string
-    description*: string
+    status*: string
     config*: JsonNode
     createdAt*: string
-    updatedAt*: string
 
   BreederCreateRequest* = object
     name*: string
diff --git a/src/godon_cli.nim b/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) =
@@ -53,12 +53,20 @@ proc parseArgs(): (string, string, int, string, seq[string]) =
       of "hostname":
         hostname = val
       of "port":
+        if val.len == 0:
+          writeError("Port option requires a value")
         try:
           port = parseInt(val)
         except ValueError:
           writeError("Invalid port number: " & val)
       of "api-version":
         apiVersion = val
+      of "file":
+        # Reconstruct as argument for subcommand parsing
+        args.add("--file=" & val)
+      of "id":
+        # Reconstruct as argument for subcommand parsing  
+        args.add("--id=" & val)
       of "help", "h":
         writeHelp()
         quit(0)
@@ -84,20 +92,19 @@ 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 "  ---"
     else:
       writeError(response.error)
   
   of "create":
     var file = ""
-    for i in 1 ..< args.len.int:
-      if args[i-1] == "--file":
-        file = args[i]
+    for arg in args:
+      if arg.startsWith("--file="):
+        file = arg.split("=")[1]
         break
     
     if file.len == 0:
@@ -111,32 +118,31 @@ 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
+      echo "  Status: ", response.data.status
     else:
       writeError(response.error)
   
   of "show":
-    var uuid = ""
-    for i in 1 ..< args.len.int:
-      if args[i-1] == "--uuid":
-        uuid = args[i]
+    var id = ""
+    for arg in args:
+      if arg.startsWith("--id="):
+        id = arg.split("=")[1]
         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 "  Status: ", response.data.status
       echo "  Config: ", pretty(response.data.config)
       echo "  Created: ", response.data.createdAt
-      echo "  Updated: ", response.data.updatedAt
     else:
       writeError(response.error)
   
@@ -158,24 +164,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
+      echo "  Status: ", response.data.status
     else:
       writeError(response.error)
   
   of "purge":
-    var uuid = ""
-    for i in 1 ..< args.len.int:
-      if args[i-1] == "--uuid":
-        uuid = args[i]
+    var id = ""
+    for arg in args:
+      if arg.startsWith("--id="):
+        id = arg.split("=")[1]
         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:
