fix: server overriding (#24)

* fix: server overriding

* fix: fixed wrong condition in handling servers

* test: add server override functionality test

---------

Co-authored-by: Leonardo Vicentini <[email protected]>

Author: matteogastaldello

internal/client/restclient.go

@@ -21,6 +21,18 @@ func (u *UnstructuredClient) Call(ctx context.Context, cli *http.Client, path st
 		return nil, fmt.Errorf("path not found: %s", path)
 	}
 	httpMethod := string(opts.Method)
+	ops := pathItem.GetOperations()
+	if ops != nil {
+		op, ok := ops.Get(strings.ToLower(httpMethod))
+		if !ok {
+			return nil, fmt.Errorf("operation not found for method %s at path %s", httpMethod, path)
+		}
+
+		if len(op.Servers) > 0 {
+			server := op.Servers[0]
+			uri = buildPath(server.URL, path, opts.Parameters, opts.Query)
+		}
+	}
 
 	err := u.ValidateRequest(httpMethod, path, opts.Parameters, opts.Query)
 	if err != nil {

internal/client/restclient_test.go

@@ -42,6 +42,7 @@ func TestCallWithRecorder(t *testing.T) {
 		clientSetup   func(*UnstructuredClient)
 		expected      interface{}
 		expectedError string
+		expectedURL   string
 	}{
 		{
 			name: "path with slash in path parameter",
@@ -179,6 +180,26 @@ func TestCallWithRecorder(t *testing.T) {
 			},
 			expectedError: "unexpected status: 401: invalid status code: 401",
 		},
+		{
+			name: "server override in operation",
+			handler: func(w http.ResponseWriter, r *http.Request) {
+				// Verify that the request is using the override server URL
+				// The mock transport doesn't actually change the host, but we can verify
+				// the path and that the request was made
+				assert.Equal(t, "GET", r.Method)
+				assert.Equal(t, "/api/override", r.URL.Path)
+
+				w.Header().Set("Content-Type", "application/json")
+				w.WriteHeader(http.StatusOK)
+				json.NewEncoder(w).Encode(map[string]interface{}{"message": "override success"})
+			},
+			path: "/api/override",
+			opts: &RequestConfiguration{
+				Method: "GET",
+			},
+			expected:    map[string]interface{}{"message": "override success"},
+			expectedURL: "http://override.example.com/api/override",
+		},
 	}
 
 	for _, tt := range tests {
@@ -188,6 +209,11 @@ func TestCallWithRecorder(t *testing.T) {
 				handler: tt.handler,
 			}
 
+			// If we need to verify the URL (we set the field in the test case), capture it
+			if tt.expectedURL != "" {
+				mockTransport.capturedURL = ""
+			}
+
 			// Create test client
 			client := createTestClient(t)
 			if tt.clientSetup != nil {
@@ -200,6 +226,11 @@ func TestCallWithRecorder(t *testing.T) {
 			// Call the method under test
 			result, err := client.Call(context.Background(), testClient, tt.path, tt.opts)
 
+			// Verify the URL if expected, if we set the field in the test case
+			if tt.expectedURL != "" {
+				assert.Equal(t, tt.expectedURL, mockTransport.capturedURL)
+			}
+
 			if tt.expectedError != "" {
 				require.Error(t, err)
 				assert.Contains(t, err.Error(), tt.expectedError)
@@ -227,10 +258,16 @@ func TestCallWithRecorder(t *testing.T) {
 
 // mockTransport implements http.RoundTripper using a ResponseRecorder
 type mockTransport struct {
-	handler http.HandlerFunc
+	handler     http.HandlerFunc
+	capturedURL string
 }
 
 func (m *mockTransport) RoundTrip(req *http.Request) (*http.Response, error) {
+	// Capture the full URL for verification
+	if m.capturedURL == "" {
+		m.capturedURL = req.URL.String()
+	}
+
 	// Create a ResponseRecorder
 	rr := httptest.NewRecorder()
 

internal/client/testdata/openapi.yaml

@@ -141,6 +141,26 @@ paths:
                 items:
                   $ref: '#/components/schemas/Item'
 
+  /api/override:
+    get:
+      summary: Test endpoint with server override
+      operationId: getOverride
+      servers:
+        - url: http://override.example.com
+          description: Override server
+      responses:
+        '200':
+          description: Successful operation
+          content:
+            application/json:
+              schema:
+                type: object
+                properties:
+                  message:
+                    type: string
+        '404':
+          description: Not found
+
 components:
   schemas:
     User: