tests-restored-locally

Author: general-kroll-4-life

go.mod

@@ -5,6 +5,7 @@ go 1.25.3
 require (
 	github.com/DATA-DOG/go-sqlmock v1.5.1
 	github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e
+	github.com/getkin/kin-openapi v0.88.0
 	github.com/google/go-jsonnet v0.17.0
 	github.com/jackc/pgtype v1.10.0
 	github.com/jackc/pgx/v5 v5.0.4
@@ -17,7 +18,7 @@ require (
 	github.com/spf13/cobra v1.4.0
 	github.com/spf13/pflag v1.0.5
 	github.com/spf13/viper v1.10.1
-	github.com/stackql/any-sdk v0.4.1-alpha03
+	github.com/stackql/any-sdk v0.4.1-alpha04
 	github.com/stackql/go-suffix-map v0.0.1-alpha01
 	github.com/stackql/psql-wire v0.1.2-alpha01
 	github.com/stackql/stackql-parser v0.0.16-alpha01
@@ -70,7 +71,6 @@ require (
 	github.com/dvsekhvalnov/jose2go v1.6.0 // indirect
 	github.com/fsnotify/fsnotify v1.5.1 // indirect
 	github.com/gabriel-vasile/mimetype v1.4.7 // indirect
-	github.com/getkin/kin-openapi v0.88.0 // indirect
 	github.com/ghodss/yaml v1.0.0 // indirect
 	github.com/go-openapi/jsonpointer v0.19.5 // indirect
 	github.com/go-openapi/swag v0.21.1 // indirect

go.sum

@@ -467,8 +467,8 @@ github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
 github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
 github.com/spf13/viper v1.10.1 h1:nuJZuYpG7gTj/XqiUwg8bA0cp1+M2mC3J4g5luUYBKk=
 github.com/spf13/viper v1.10.1/go.mod h1:IGlFPqhNAPKRxohIzWpI5QEy4kuI7tcl5WvR+8qy1rU=
-github.com/stackql/any-sdk v0.4.1-alpha03 h1:tHH+GNkW3o8uB1++rA93+XlOxFL/btpGJ/10MbDr5KU=
-github.com/stackql/any-sdk v0.4.1-alpha03/go.mod h1:KTVgzZ2jlvGET55T/vzM7J+yIqpDOxbYFkoydaCs2K0=
+github.com/stackql/any-sdk v0.4.1-alpha04 h1:wcwx4OBBRd7S5A21Q6BzKvE/zbhgi4lKI8KC8Adblec=
+github.com/stackql/any-sdk v0.4.1-alpha04/go.mod h1:KTVgzZ2jlvGET55T/vzM7J+yIqpDOxbYFkoydaCs2K0=
 github.com/stackql/go-suffix-map v0.0.1-alpha01 h1:TDUDS8bySu41Oo9p0eniUeCm43mnRM6zFEd6j6VUaz8=
 github.com/stackql/go-suffix-map v0.0.1-alpha01/go.mod h1:QAi+SKukOyf4dBtWy8UMy+hsXXV+yyEE4vmBkji2V7g=
 github.com/stackql/psql-wire v0.1.2-alpha01 h1:RMBRURGspmSNqm2/sgoEc+D6Sri2y/3drjl4nKlOOi4=

internal/stackql/primitivegenerator/statement_analyzer.go

@@ -7,6 +7,7 @@ import (
 	"strings"
 	"time"
 
+	"github.com/getkin/kin-openapi/openapi3"
 	"github.com/stackql/any-sdk/anysdk"
 	"github.com/stackql/any-sdk/pkg/constants"
 	"github.com/stackql/any-sdk/pkg/dto"
@@ -951,7 +952,19 @@ func (pb *standardPrimitiveGenerator) expandTable(
 	if err != nil {
 		return err
 	}
-	availableServers, availableServersDoExist := svc.GetServers()
+	var availableServers openapi3.Servers
+	var availableServersDoExist bool
+	method, _ := tbl.GetMethod()
+	if method != nil {
+		srvs, ok := method.GetServers()
+		if ok && len(srvs) > 0 {
+			availableServers = srvs
+			availableServersDoExist = true
+		}
+	}
+	if len(availableServers) == 0 {
+		availableServers, availableServersDoExist = svc.GetServers()
+	}
 	if availableServersDoExist {
 		for _, sv := range availableServers {
 			for k := range sv.Variables {

test/python/stackql_test_tooling/flask/aws/root_path_cfg.json

@@ -250,7 +250,7 @@
     },
     "GET:/:10": {
         "method": "GET",
-        "path": "/stackql-trial-bucket-01",
+        "path": "/",
         "queryStringParameters": { 
           "max-keys": [ "1000" ]
         },
@@ -286,7 +286,7 @@
     },
     "GET:/:12": {
         "method": "GET",
-        "path": "/stackql-trial-bucket-01",
+        "path": "/",
         "queryStringParameters": { 
           "location": [ "" ]
         },

test/registry/src/aws/v0.1.0/services/s3.yaml

@@ -879,7 +879,14 @@ paths:
                 $ref: '#/components/schemas/ObjectNotInActiveTierError'
           description: |-
             The source object of the COPY action is not in the active tier and is only stored in Amazon S3 Glacier.
-  /{Bucket}?max-keys=1000:
+  /?max-keys=1000:
+    servers:
+    - url: 'https://{Bucket}.s3-{region}.amazonaws.com'
+      variables:
+        Bucket:
+          default: stackql-trial-bucket-02
+        region:
+          default: us-east-1
     get:
       description: "This operation is not supported for directory buckets.\n\nReturns\
         \ some or all (up to 1,000) of the objects in a bucket. You can use the request\
@@ -900,11 +907,6 @@ paths:
         \ you must URL encode this value to `my%20%20file.txt`."
       operationId: ListObjects
       parameters:
-      - in: path
-        name: Bucket
-        required: true
-        schema:
-          $ref: '#/components/schemas/BucketName'
       - in: header
         name: x-amz-content-sha256
         required: false
@@ -4890,7 +4892,14 @@ paths:
             text/xml:
               schema:
                 $ref: '#/components/schemas/GetBucketInventoryConfigurationOutput'
-  /{Bucket}?location:
+  /?location:
+    servers:
+    - url: https://{Bucket}.s3.{region}.amazonaws.com
+      variables:
+        region:
+          default: us-east-1
+        Bucket:
+          default: example-bucket
     get:
       operationId: GetBucketLocation
       description: |-
@@ -4914,11 +4923,6 @@ paths:
 
         You must URL encode any signed header values that contain spaces. For example, if your header value is `my file.txt`, containing two spaces after `my`, you must URL encode this value to `my%20%20file.txt`.
       parameters:
-      - name: Bucket
-        in: path
-        required: true
-        schema:
-          $ref: '#/components/schemas/BucketName'
       - name: x-amz-content-sha256
         in: header
         required: false
@@ -22400,7 +22404,7 @@ components:
       methods:
         get_bucket_location:
           operation:
-            $ref: '#/paths/~1{Bucket}?location/get'
+            $ref: '#/paths/~1?location/get'
           response:
             mediaType: text/xml
             openAPIDocKey: '200'
@@ -23206,7 +23210,7 @@ components:
             openAPIDocKey: '200'
         list_objects:
           operation:
-            $ref: '#/paths/~1{Bucket}?max-keys=1000/get'
+            $ref: '#/paths/~1?max-keys=1000/get'
           response:
             mediaType: text/xml
             openAPIDocKey: '200'