revert this as it's not strictly necessary now

hashicorp · Jan 25, 2021 · 7ed3c35 · 7ed3c35
1 parent 5480aca
commit 7ed3c35
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 1,425 deletions.
diff --git a/agent/agent_test.go b/agent/agent_test.go
@@ -22,7 +22,7 @@ import (
 	"testing"
 	"time"
 
-	gogo_jsonpb "github.com/gogo/protobuf/jsonpb"
+	"github.com/golang/protobuf/jsonpb"
 	"github.com/google/tcpproxy"
 	"github.com/hashicorp/go-hclog"
 	"github.com/hashicorp/serf/coordinate"
@@ -4990,7 +4990,7 @@ func TestAutoConfig_Integration(t *testing.T) {
 		rdr := strings.NewReader(string(data))
 
 		var resp pbautoconf.AutoConfigResponse
-		pbUnmarshaler := &gogo_jsonpb.Unmarshaler{
+		pbUnmarshaler := &jsonpb.Unmarshaler{
 			AllowUnknownFields: false,
 		}
 		require.NoError(r, pbUnmarshaler.Unmarshal(rdr, &resp), "data: %s", data)

diff --git a/agent/auto-config/persist.go b/agent/auto-config/persist.go
@@ -7,7 +7,7 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/gogo/protobuf/jsonpb"
+	"github.com/golang/protobuf/jsonpb"
 	"github.com/hashicorp/consul/proto/pbautoconf"
 )