clean up merge conflicts

TykTechnologies · Mar 24, 2021 · 6359edc · 6359edc
1 parent 23d31d0
commit 6359edc
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 18 deletions.
diff --git a/apidef/api_definitions.go b/apidef/api_definitions.go
@@ -196,13 +196,6 @@ type VirtualMeta struct {
 	ProxyOnError         bool   `bson:"proxy_on_error" json:"proxy_on_error"`
 }
 
-type GoPluginMeta struct {
-	Path       string `bson:"path" json:"path"`
-	Method     string `bson:"method" json:"method"`
-	PluginPath string `bson:"plugin_path" json:"plugin_path"`
-	SymbolName string `bson:"func_name" json:"func_name"`
-}
-
 type MethodTransformMeta struct {
 	Path     string `bson:"path" json:"path"`
 	Method   string `bson:"method" json:"method"`

diff --git a/gateway/api_definition.go b/gateway/api_definition.go
@@ -139,12 +139,9 @@ type URLSpec struct {
 	DoNotTrackEndpoint        apidef.TrackEndpointMeta
 	ValidatePathMeta          apidef.ValidatePathMeta
 	Internal                  apidef.InternalMeta
-<<<<<<< HEAD
 	GoPluginMeta              GoPluginMiddleware
-=======
-	GoPluginConfig            GoPluginMiddleware
->>>>>>> e0f2475caf75f4fdf97d60114b6f42df3b03f27e
-	IgnoreCase                bool
+
+	IgnoreCase bool
 }
 
 type EndPointCacheMeta struct {
@@ -885,7 +882,6 @@ func (a APIDefinitionLoader) compileGopluginPathspathSpec(paths []apidef.GoPlugi
 			fmt.Println("Cant load")
 		}
 
-
 		urlSpec = append(urlSpec, newSpec)
 	}
 
@@ -1248,13 +1244,9 @@ func (a *APISpec) CheckSpecMatchesStatus(r *http.Request, rxPaths []URLSpec, mod
 				return true, &rxPaths[i].Internal
 			}
 		case GoPlugin:
-<<<<<<< HEAD
 			if method == rxPaths[i].GoPluginMeta.Meta.Method {
 				return true, &rxPaths[i].GoPluginMeta
-=======
-			if method == rxPaths[i].Internal.Method {
-				return true, &rxPaths[i].GoPluginConfig
->>>>>>> e0f2475caf75f4fdf97d60114b6f42df3b03f27e
+
 			}
 		}
 	}