Fix resolve deps script (#25)

* Fix resolve deps
* Starting cleanup
* More cleanup
* Fix first test
* Fix parse tests
* Fix first merge test
* Fix second merge test
* Delete extra tests/logic since behavior changed
* Add changelog
* Refactor to remove separate package
* Move changelog
* Remove unused struct

Makefile

@@ -8,7 +8,7 @@ format:
 #----------------------------------------------------------------------------------
 
 # Set this variable to the version of GlooE you want to target
-GLOOE_VERSION ?= 1.3.8
+GLOOE_VERSION ?= 1.5.10
 
 # Set this variable to the name of your build plugin
 PLUGIN_BUILD_NAME ?= RequiredHeader.so
@@ -28,7 +28,7 @@ STORAGE_HOSTNAME ?= storage.googleapis.com
 GLOOE_DIR := _glooe
 _ := $(shell mkdir -p $(GLOOE_DIR))
 
-PLUGIN_MODULE_PATH := $(shell grep module go.mod | cut -d ' ' -f 2-)
+PLUGIN_MODULE_PATH := $(shell grep module go.mod | head -n 1 | cut -d ' ' -f 2-)
 
 #----------------------------------------------------------------------------------
 # Build an docker image which contains the plugin framework and plugin implementation

README.md

@@ -164,8 +164,7 @@ generated by running `go list -m all`);
 ### resolve-deps
 The `resolve-deps` target compares and merge the dependencies of your plugin module with the dependencies of the Gloo Enterprise one. 
 It will succeed if the shared dependencies match _exactly_ (this is another constraint imposed by Go plugins, more info 
-[here](https://docs.solo.io/gloo/latest/guides/dev/writing_auth_plugins/#build-helper-tools)) and fail otherwise, outputting information 
-about mismatches to stdout.
+[here](https://docs.solo.io/gloo/latest/guides/dev/writing_auth_plugins/#build-helper-tools)) and fail otherwise.
 
 ### build-plugin
 The `build-plugin` target uses the information published by Gloo Enterprise to mirror its build 

changelog/v0.4.0/fix-resolve-deps.yaml

@@ -0,0 +1,7 @@
+changelog:
+  - type: BREAKING_CHANGE
+    description: >
+      Fix over-complicated and broken resolve-deps script; now the Gloo Edge Enterprise dependencies will be
+      added in their entirety as replace statements to the plugin's go.mod in the resolve-deps script to ensure
+      that the correct dependencies are used.
+    issueLink: https://github.com/solo-io/gloo/issues/3748