Trying to fix dependencies.
This commit is contained in:
		
							parent
							
								
									25152157ba
								
							
						
					
					
						commit
						ee28fa27e4
					
				| 
						 | 
					@ -1 +0,0 @@
 | 
				
			||||||
package mocks
 | 
					 | 
				
			||||||
| 
						 | 
					@ -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)
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
| 
						 | 
					@ -13,6 +13,8 @@ import (
 | 
				
			||||||
	"strconv"
 | 
						"strconv"
 | 
				
			||||||
	"time"
 | 
						"time"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						httpclient "github.com/zalando/postgres-operator/pkg/util/httpclient"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	"github.com/sirupsen/logrus"
 | 
						"github.com/sirupsen/logrus"
 | 
				
			||||||
	v1 "k8s.io/api/core/v1"
 | 
						v1 "k8s.io/api/core/v1"
 | 
				
			||||||
)
 | 
					)
 | 
				
			||||||
| 
						 | 
					@ -31,20 +33,14 @@ type Interface interface {
 | 
				
			||||||
	GetMemberData(server *v1.Pod) (MemberData, error)
 | 
						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
 | 
					// Patroni API client
 | 
				
			||||||
type Patroni struct {
 | 
					type Patroni struct {
 | 
				
			||||||
	httpClient HTTPClient
 | 
						httpClient httpclient.HTTPClient
 | 
				
			||||||
	logger     *logrus.Entry
 | 
						logger     *logrus.Entry
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
// New create patroni
 | 
					// New create patroni
 | 
				
			||||||
func New(logger *logrus.Entry, client HTTPClient) *Patroni {
 | 
					func New(logger *logrus.Entry, client httpclient.HTTPClient) *Patroni {
 | 
				
			||||||
	if client == nil {
 | 
						if client == nil {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	} else {
 | 
						} else {
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -94,5 +94,4 @@ func TestPatroniAPI(t *testing.T) {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	mockClient := mocks.NewMockHTTPClient(ctrl)
 | 
						mockClient := mocks.NewMockHTTPClient(ctrl)
 | 
				
			||||||
	mockClient.EXPECT().Get(gomock.Any()).Return(&response)
 | 
						mockClient.EXPECT().Get(gomock.Any()).Return(&response)
 | 
				
			||||||
 | 
					 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue