From ee28fa27e435a6b22fc915a5c5c4d46f3f6b7a54 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Mu=C3=9Fler?= <janm81@gmail.com>
Date: Fri, 19 Feb 2021 19:25:18 +0100
Subject: [PATCH] Trying to fix dependencies.

---
 mocks/mocks.go                    |  1 -
 pkg/util/httpclient/httpclient.go | 11 +++++++++++
 pkg/util/patroni/patroni.go       | 12 ++++--------
 pkg/util/patroni/patroni_test.go  |  1 -
 4 files changed, 15 insertions(+), 10 deletions(-)
 delete mode 100644 mocks/mocks.go
 create mode 100644 pkg/util/httpclient/httpclient.go

diff --git a/mocks/mocks.go b/mocks/mocks.go
deleted file mode 100644
index f726b26e5..000000000
--- a/mocks/mocks.go
+++ /dev/null
@@ -1 +0,0 @@
-package mocks
diff --git a/pkg/util/httpclient/httpclient.go b/pkg/util/httpclient/httpclient.go
new file mode 100644
index 000000000..e7022f1a3
--- /dev/null
+++ b/pkg/util/httpclient/httpclient.go
@@ -0,0 +1,11 @@
+package httpclient
+
+//go:generate mockgen -package mocks -destination=$PWD/mocks/$GOFILE -source=$GOFILE -build_flags=-mod=vendor
+
+import "net/http"
+
+// HTTPClient interface
+type HTTPClient interface {
+	Do(req *http.Request) (*http.Response, error)
+	Get(url string) (resp *http.Response, err error)
+}
diff --git a/pkg/util/patroni/patroni.go b/pkg/util/patroni/patroni.go
index 10d9a878c..1580eff3d 100644
--- a/pkg/util/patroni/patroni.go
+++ b/pkg/util/patroni/patroni.go
@@ -13,6 +13,8 @@ import (
 	"strconv"
 	"time"
 
+	httpclient "github.com/zalando/postgres-operator/pkg/util/httpclient"
+
 	"github.com/sirupsen/logrus"
 	v1 "k8s.io/api/core/v1"
 )
@@ -31,20 +33,14 @@ type Interface interface {
 	GetMemberData(server *v1.Pod) (MemberData, error)
 }
 
-// HTTPClient interface
-type HTTPClient interface {
-	Do(req *http.Request) (*http.Response, error)
-	Get(url string) (resp *http.Response, err error)
-}
-
 // Patroni API client
 type Patroni struct {
-	httpClient HTTPClient
+	httpClient httpclient.HTTPClient
 	logger     *logrus.Entry
 }
 
 // New create patroni
-func New(logger *logrus.Entry, client HTTPClient) *Patroni {
+func New(logger *logrus.Entry, client httpclient.HTTPClient) *Patroni {
 	if client == nil {
 
 	} else {
diff --git a/pkg/util/patroni/patroni_test.go b/pkg/util/patroni/patroni_test.go
index 8855a713e..1e4ef15f3 100644
--- a/pkg/util/patroni/patroni_test.go
+++ b/pkg/util/patroni/patroni_test.go
@@ -94,5 +94,4 @@ func TestPatroniAPI(t *testing.T) {
 
 	mockClient := mocks.NewMockHTTPClient(ctrl)
 	mockClient.EXPECT().Get(gomock.Any()).Return(&response)
-
 }