From 5968a50c73177afc3b60e9bfe029ea488340e8d4 Mon Sep 17 00:00:00 2001
From: Kyle Yee <kyle.yee@opendoor.com>
Date: Mon, 1 Nov 2021 20:15:45 -0400
Subject: [PATCH 1/2] expose Get and Put methods in API interface

---
 zendesk/api.go     |  1 +
 zendesk/zendesk.go | 22 +++++++++++++++-------
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/zendesk/api.go b/zendesk/api.go
index c09989eb..e73ed7c2 100644
--- a/zendesk/api.go
+++ b/zendesk/api.go
@@ -7,6 +7,7 @@ package zendesk
 type API interface {
 	AutomationAPI
 	AttachmentAPI
+	BaseAPI
 	BrandAPI
 	DynamicContentAPI
 	GroupAPI
diff --git a/zendesk/zendesk.go b/zendesk/zendesk.go
index 1226cd4d..f0b5d989 100644
--- a/zendesk/zendesk.go
+++ b/zendesk/zendesk.go
@@ -24,13 +24,21 @@ var defaultHeaders = map[string]string{
 
 var subdomainRegexp = regexp.MustCompile("^[a-z0-9][a-z0-9-]+[a-z0-9]$")
 
-// Client of Zendesk API
-type Client struct {
-	baseURL    *url.URL
-	httpClient *http.Client
-	credential Credential
-	headers    map[string]string
-}
+type (
+	// Client of Zendesk API
+	Client struct {
+		baseURL    *url.URL
+		httpClient *http.Client
+		credential Credential
+		headers    map[string]string
+	}
+
+	// BaseAPI encapsulates base methods for zendesk client
+	BaseAPI interface {
+		Get(ctx context.Context, path string) ([]byte, error)
+		Post(ctx context.Context, path string, data interface{}) ([]byte, error)
+	}
+)
 
 // NewClient creates new Zendesk API client
 func NewClient(httpClient *http.Client) (*Client, error) {

From 1168ea7129c060934b5326f168f9d001c1de17d0 Mon Sep 17 00:00:00 2001
From: Kyle Yee <kyle.yee@opendoor.com>
Date: Mon, 1 Nov 2021 20:34:57 -0400
Subject: [PATCH 2/2] update mocks

---
 zendesk/mock/client.go | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/zendesk/mock/client.go b/zendesk/mock/client.go
index 5127e582..b0fb252b 100644
--- a/zendesk/mock/client.go
+++ b/zendesk/mock/client.go
@@ -458,6 +458,21 @@ func (mr *ClientMockRecorder) DeleteUpload(arg0, arg1 interface{}) *gomock.Call
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteUpload", reflect.TypeOf((*Client)(nil).DeleteUpload), arg0, arg1)
 }
 
+// Get mocks base method.
+func (m *Client) Get(arg0 context.Context, arg1 string) ([]byte, error) {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "Get", arg0, arg1)
+	ret0, _ := ret[0].([]byte)
+	ret1, _ := ret[1].(error)
+	return ret0, ret1
+}
+
+// Get indicates an expected call of Get.
+func (mr *ClientMockRecorder) Get(arg0, arg1 interface{}) *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Get", reflect.TypeOf((*Client)(nil).Get), arg0, arg1)
+}
+
 // GetAllTicketAudits mocks base method.
 func (m *Client) GetAllTicketAudits(arg0 context.Context, arg1 zendesk.CursorOption) ([]zendesk.TicketAudit, zendesk.Cursor, error) {
 	m.ctrl.T.Helper()
@@ -1091,6 +1106,21 @@ func (mr *ClientMockRecorder) ListTicketComments(arg0, arg1 interface{}) *gomock
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ListTicketComments", reflect.TypeOf((*Client)(nil).ListTicketComments), arg0, arg1)
 }
 
+// Post mocks base method.
+func (m *Client) Post(arg0 context.Context, arg1 string, arg2 interface{}) ([]byte, error) {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "Post", arg0, arg1, arg2)
+	ret0, _ := ret[0].([]byte)
+	ret1, _ := ret[1].(error)
+	return ret0, ret1
+}
+
+// Post indicates an expected call of Post.
+func (mr *ClientMockRecorder) Post(arg0, arg1, arg2 interface{}) *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Post", reflect.TypeOf((*Client)(nil).Post), arg0, arg1, arg2)
+}
+
 // Search mocks base method.
 func (m *Client) Search(arg0 context.Context, arg1 *zendesk.SearchOptions) (zendesk.SearchResults, zendesk.Page, error) {
 	m.ctrl.T.Helper()