rename swagger_definition -> openapi_file (#21)

coupergateway · Dec 8, 2020 · a5a73d6 · a5a73d6
1 parent fa9303a
commit a5a73d6
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/config/backend.go b/config/backend.go
@@ -14,7 +14,7 @@ type Backend struct {
 	RequestBodyLimit string   `hcl:"request_body_limit,optional"`
 	TTFBTimeout      string   `hcl:"ttfb_timeout,optional"`
 	Timeout          string   `hcl:"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"`
 }
@@ -82,8 +82,8 @@ func (b *Backend) Merge(other *Backend) (*Backend, []hcl.Body) {
 		result.Timeout = other.Timeout
 	}
 
-	if other.SwaggerDef != "" {
-		result.SwaggerDef = other.SwaggerDef
+	if other.OpenAPIFile != "" {
+		result.OpenAPIFile = other.OpenAPIFile
 	}
 
 	if other.ValidateReq {

diff --git a/handler/proxy.go b/handler/proxy.go
@@ -177,7 +177,7 @@ func (p *Proxy) prepareRequestValidation(outreq *http.Request) (context.Context,
 		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)
 

diff --git a/handler/proxy_options.go b/handler/proxy_options.go
@@ -14,7 +14,7 @@ type ProxyOptions struct {
 	ConnectTimeout, Timeout, TTFBTimeout time.Duration
 	Context                              []hcl.Body
 	BackendName                          string
-	SwaggerDef                           string
+	OpenAPIFile                          string
 	ValidateReq, ValidateRes             bool
 	CORS                                 *CORSOptions
 	RequestBodyLimit                     int64
@@ -52,7 +52,7 @@ func NewProxyOptions(conf *config.Backend, corsOpts *CORSOptions, remainCtx []hc
 		RequestBodyLimit: bodyLimit,
 		TTFBTimeout:      ttfbD,
 		Timeout:          totalD,
-		SwaggerDef:       conf.SwaggerDef,
+		OpenAPIFile:      conf.OpenAPIFile,
 		ValidateReq:      conf.ValidateReq,
 		ValidateRes:      conf.ValidateRes,
 	}, nil