rename swagger_definition -> openapi_file (#21)

coupergateway · Sep 18, 2020 · 11d4d8b · 11d4d8b
1 parent a970df9
commit 11d4d8b
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/config/backend.go b/config/backend.go
@@ -13,7 +13,7 @@ type Backend struct {
 	Path           string   `hcl:"path,optional"`
 	Timeout        string   `hcl:"timeout,optional"`
 	TTFBTimeout    string   `hcl:"ttfb_timeout,optional"`
-	SwaggerDef     string   `hcl:"swagger_definition,optional"`
+	OpenAPIFile    string   `hcl:"openapi_file,optional"`
 	ValidateReq    bool     `hcl:"validate_request,optional"`
 	ValidateRes    bool     `hcl:"validate_response,optional"`
 }
@@ -65,8 +65,8 @@ func (b *Backend) Merge(other *Backend) (*Backend, []hcl.Body) {
 		result.TTFBTimeout = other.TTFBTimeout
 	}
 
-	if other.SwaggerDef != "" {
-		result.SwaggerDef = other.SwaggerDef
+	if other.OpenAPIFile != "" {
+		result.OpenAPIFile = other.OpenAPIFile
 	}
 
 	if other.ValidateReq {

diff --git a/config/runtime/handler.go b/config/runtime/handler.go
@@ -80,7 +80,7 @@ func BuildEntrypointHandlers(conf *config.Gateway, httpConf *HTTPConfig, log *lo
 				Path:           beConf.Path,
 				Timeout:        t,
 				TTFBTimeout:    ttfbt,
-				SwaggerDef:     beConf.SwaggerDef,
+				OpenAPIFile:    beConf.OpenAPIFile,
 				ValidateReq:    beConf.ValidateReq,
 				ValidateRes:    beConf.ValidateRes,
 			}, log, conf.Context)
@@ -196,7 +196,7 @@ func BuildEntrypointHandlers(conf *config.Gateway, httpConf *HTTPConfig, log *lo
 						Path:           beConf.Path,
 						Timeout:        t,
 						TTFBTimeout:    ttfbt,
-						SwaggerDef:     beConf.SwaggerDef,
+						OpenAPIFile:    beConf.OpenAPIFile,
 						ValidateReq:    beConf.ValidateReq,
 						ValidateRes:    beConf.ValidateRes,
 					}, log, conf.Context)
@@ -268,7 +268,7 @@ func BuildEntrypointHandlers(conf *config.Gateway, httpConf *HTTPConfig, log *lo
 					Path:           beConf.Path,
 					Timeout:        t,
 					TTFBTimeout:    ttfbt,
-					SwaggerDef:     beConf.SwaggerDef,
+					OpenAPIFile:    beConf.OpenAPIFile,
 					ValidateReq:    beConf.ValidateReq,
 					ValidateRes:    beConf.ValidateRes,
 				}, log, conf.Context)
@@ -452,7 +452,7 @@ func newInlineBackend(evalCtx *hcl.EvalContext, inlineDef hcl.Body, cors *config
 		Path:           beConf.Path,
 		Timeout:        t,
 		TTFBTimeout:    ttfbt,
-		SwaggerDef:     beConf.SwaggerDef,
+		OpenAPIFile:    beConf.OpenAPIFile,
 		ValidateReq:    beConf.ValidateReq,
 		ValidateRes:    beConf.ValidateRes,
 	}, log, evalCtx)

diff --git a/couper.hcl b/couper.hcl
@@ -55,7 +55,7 @@ server "couperConnect" {
         endpoint "/httpbin/**" {
             backend "httpbin" {
                 path = "/**"
-                swagger_definition = "./upstream/httpbin.yaml"
+                openapi_file = "./upstream/httpbin.yaml"
                 validate_request = true
                 validate_response = true
 

diff --git a/handler/proxy.go b/handler/proxy.go
@@ -55,7 +55,7 @@ type ProxyOptions struct {
 	ConnectTimeout, Timeout, TTFBTimeout time.Duration
 	Context                              []hcl.Body
 	BackendName                          string
-	Hostname, Origin, Path, SwaggerDef   string
+	Hostname, Origin, Path, OpenAPIFile  string
 	ValidateReq, ValidateRes             bool
 	CORS                                 *CORSOptions
 }
@@ -166,7 +166,7 @@ func (p *Proxy) preparetRequestValidatation(outreq *http.Request) (context.Conte
 		if err != nil {
 			return nil, nil, nil, err
 		}
-		router := openapi3filter.NewRouter().WithSwaggerFromFile(dir + "/" + p.options.SwaggerDef)
+		router := openapi3filter.NewRouter().WithSwaggerFromFile(dir + "/" + p.options.OpenAPIFile)
 		validationCtx := context.Background()
 		route, pathParams, _ := router.FindRoute(outreq.Method, outreq.URL)