Skip to content

Commit ac8f6dc

Browse files
Joshua-AndersonJoshua-Anderson
authored
ref(client): remove username and responseLimit fields (#16)
1 parent de73745 commit ac8f6dc

13 files changed

Lines changed: 49 additions & 61 deletions

File tree

‎apps/apps_test.go‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ func TestAppsCreate(t *testing.T) {
173173
UUID: "de1bf5b5-4a72-4f94-a10c-d2a3741cdf75",
174174
}
175175

176-
deis, err := deis.New(false, server.URL, "abc", "")
176+
deis, err := deis.New(false, server.URL, "abc")
177177
if err != nil {
178178
t.Fatal(err)
179179
}
@@ -209,7 +209,7 @@ func TestAppsGet(t *testing.T) {
209209
UUID: "de1bf5b5-4a72-4f94-a10c-d2a3741cdf75",
210210
}
211211

212-
deis, err := deis.New(false, server.URL, "abc", "")
212+
deis, err := deis.New(false, server.URL, "abc")
213213
if err != nil {
214214
t.Fatal(err)
215215
}
@@ -232,7 +232,7 @@ func TestAppsDestroy(t *testing.T) {
232232
server := httptest.NewServer(&handler)
233233
defer server.Close()
234234

235-
deis, err := deis.New(false, server.URL, "abc", "")
235+
deis, err := deis.New(false, server.URL, "abc")
236236
if err != nil {
237237
t.Fatal(err)
238238
}
@@ -254,7 +254,7 @@ func TestAppsRun(t *testing.T) {
254254
server := httptest.NewServer(&handler)
255255
defer server.Close()
256256

257-
deis, err := deis.New(false, server.URL, "abc", "")
257+
deis, err := deis.New(false, server.URL, "abc")
258258
if err != nil {
259259
t.Fatal(err)
260260
}
@@ -290,7 +290,7 @@ func TestAppsList(t *testing.T) {
290290
},
291291
}
292292

293-
deis, err := deis.New(false, server.URL, "abc", "")
293+
deis, err := deis.New(false, server.URL, "abc")
294294
if err != nil {
295295
t.Fatal(err)
296296
}
@@ -329,7 +329,7 @@ func TestAppsLogs(t *testing.T) {
329329
server := httptest.NewServer(&handler)
330330
defer server.Close()
331331

332-
deis, err := deis.New(false, server.URL, "abc", "")
332+
deis, err := deis.New(false, server.URL, "abc")
333333
if err != nil {
334334
t.Fatal(err)
335335
}
@@ -354,7 +354,7 @@ func TestAppsTransfer(t *testing.T) {
354354
server := httptest.NewServer(&handler)
355355
defer server.Close()
356356

357-
deis, err := deis.New(false, server.URL, "abc", "")
357+
deis, err := deis.New(false, server.URL, "abc")
358358
if err != nil {
359359
t.Fatal(err)
360360
}

‎auth/auth_test.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ func TestRegister(t *testing.T) {
165165
server := httptest.NewServer(&handler)
166166
defer server.Close()
167167

168-
deis, err := deis.New(false, server.URL, "abc", "")
168+
deis, err := deis.New(false, server.URL, "abc")
169169
if err != nil {
170170
t.Fatal(err)
171171
}
@@ -182,7 +182,7 @@ func TestLogin(t *testing.T) {
182182
server := httptest.NewServer(&handler)
183183
defer server.Close()
184184

185-
deis, err := deis.New(false, server.URL, "abc", "")
185+
deis, err := deis.New(false, server.URL, "abc")
186186
if err != nil {
187187
t.Fatal(err)
188188
}
@@ -207,7 +207,7 @@ func TestPasswd(t *testing.T) {
207207
server := httptest.NewServer(&handler)
208208
defer server.Close()
209209

210-
deis, err := deis.New(false, server.URL, "abc", "")
210+
deis, err := deis.New(false, server.URL, "abc")
211211
if err != nil {
212212
t.Fatal(err)
213213
}
@@ -224,7 +224,7 @@ func TestDelete(t *testing.T) {
224224
server := httptest.NewServer(&handler)
225225
defer server.Close()
226226

227-
deis, err := deis.New(false, server.URL, "abc", "")
227+
deis, err := deis.New(false, server.URL, "abc")
228228
if err != nil {
229229
t.Fatal(err)
230230
}
@@ -245,7 +245,7 @@ func TestDeleteUserApp(t *testing.T) {
245245
server := httptest.NewServer(&handler)
246246
defer server.Close()
247247

248-
d, err := deis.New(false, server.URL, "abc", "")
248+
d, err := deis.New(false, server.URL, "abc")
249249
if err != nil {
250250
t.Fatal(err)
251251
}
@@ -265,7 +265,7 @@ func TestRegenerate(t *testing.T) {
265265
server := httptest.NewServer(&handler)
266266
defer server.Close()
267267

268-
deis, err := deis.New(false, server.URL, "abc", "")
268+
deis, err := deis.New(false, server.URL, "abc")
269269
if err != nil {
270270
t.Fatal(err)
271271
}

‎builds/builds_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ func TestBuildsList(t *testing.T) {
110110
server := httptest.NewServer(handler)
111111
defer server.Close()
112112

113-
deis, err := deis.New(false, server.URL, "abc", "")
113+
deis, err := deis.New(false, server.URL, "abc")
114114
if err != nil {
115115
t.Fatal(err)
116116
}
@@ -145,7 +145,7 @@ func TestBuildCreate(t *testing.T) {
145145
server := httptest.NewServer(handler)
146146
defer server.Close()
147147

148-
deis, err := deis.New(false, server.URL, "abc", "")
148+
deis, err := deis.New(false, server.URL, "abc")
149149
if err != nil {
150150
t.Fatal(err)
151151
}

‎certs/certs_test.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ func TestCertsList(t *testing.T) {
122122
server := httptest.NewServer(handler)
123123
defer server.Close()
124124

125-
deis, err := deis.New(false, server.URL, "abc", "")
125+
deis, err := deis.New(false, server.URL, "abc")
126126
if err != nil {
127127
t.Fatal(err)
128128
}
@@ -161,7 +161,7 @@ func TestCert(t *testing.T) {
161161
server := httptest.NewServer(handler)
162162
defer server.Close()
163163

164-
deis, err := deis.New(false, server.URL, "abc", "")
164+
deis, err := deis.New(false, server.URL, "abc")
165165
if err != nil {
166166
t.Fatal(err)
167167
}
@@ -200,7 +200,7 @@ func TestCertInfo(t *testing.T) {
200200
server := httptest.NewServer(handler)
201201
defer server.Close()
202202

203-
deis, err := deis.New(false, server.URL, "abc", "")
203+
deis, err := deis.New(false, server.URL, "abc")
204204
if err != nil {
205205
t.Fatal(err)
206206
}
@@ -222,7 +222,7 @@ func TestCertDeletion(t *testing.T) {
222222
server := httptest.NewServer(handler)
223223
defer server.Close()
224224

225-
deis, err := deis.New(false, server.URL, "abc", "")
225+
deis, err := deis.New(false, server.URL, "abc")
226226
if err != nil {
227227
t.Fatal(err)
228228
}
@@ -243,7 +243,7 @@ func TestCertAttach(t *testing.T) {
243243
server := httptest.NewServer(handler)
244244
defer server.Close()
245245

246-
deis, err := deis.New(false, server.URL, "abc", "")
246+
deis, err := deis.New(false, server.URL, "abc")
247247
if err != nil {
248248
t.Fatal(err)
249249
}
@@ -269,7 +269,7 @@ func TestCertDetach(t *testing.T) {
269269
server := httptest.NewServer(handler)
270270
defer server.Close()
271271

272-
deis, err := deis.New(false, server.URL, "abc", "")
272+
deis, err := deis.New(false, server.URL, "abc")
273273
if err != nil {
274274
t.Fatal(err)
275275
}

‎config/config_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ func TestConfigSet(t *testing.T) {
120120
server := httptest.NewServer(&handler)
121121
defer server.Close()
122122

123-
deis, err := deis.New(false, server.URL, "abc", "")
123+
deis, err := deis.New(false, server.URL, "abc")
124124
if err != nil {
125125
t.Fatal(err)
126126
}
@@ -186,7 +186,7 @@ func TestConfigUnset(t *testing.T) {
186186
server := httptest.NewServer(&handler)
187187
defer server.Close()
188188

189-
deis, err := deis.New(false, server.URL, "abc", "")
189+
deis, err := deis.New(false, server.URL, "abc")
190190
if err != nil {
191191
t.Fatal(err)
192192
}
@@ -241,7 +241,7 @@ func TestConfigList(t *testing.T) {
241241
server := httptest.NewServer(&handler)
242242
defer server.Close()
243243

244-
deis, err := deis.New(false, server.URL, "abc", "")
244+
deis, err := deis.New(false, server.URL, "abc")
245245
if err != nil {
246246
t.Fatal(err)
247247
}

‎deis.go‎

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,6 @@ type Client struct {
2828

2929
// Token is used to authenticate the request against the API.
3030
Token string
31-
32-
// Username is the name of the user performing requests against the API.
33-
Username string
34-
35-
// ResponseLimit is the number of results to return on requests that can be limited.
36-
ResponseLimit int
3731
}
3832

3933
// APIVersion is the api version the sdk is compatible with.
@@ -43,16 +37,12 @@ var (
4337
// ErrAPIMismatch occurs when the sdk is using a different api version than the deis.
4438
ErrAPIMismatch = errors.New("API Version Mismatch between server and deis")
4539

46-
// DefaultResponseLimit is the default number of responses to return on requests that can
47-
// be limited.
48-
DefaultResponseLimit = 100
49-
5040
// DefaultUserAgent is used as the default user agent when making requests.
5141
DefaultUserAgent = fmt.Sprintf("Deis Go SDK V%s", APIVersion)
5242
)
5343

5444
// New creates a new deis to communicate with the api.
55-
func New(verifySSL bool, controllerURL string, token string, username string) (*Client, error) {
45+
func New(verifySSL bool, controllerURL string, token string) (*Client, error) {
5646
// urlx, unlike the native url library, uses sane defaults when URL parsing,
5747
// preventing issues like missing schemes.
5848
u, err := urlx.Parse(controllerURL)
@@ -65,8 +55,6 @@ func New(verifySSL bool, controllerURL string, token string, username string) (*
6555
VerifySSL: verifySSL,
6656
ControllerURL: u,
6757
Token: token,
68-
Username: username,
69-
ResponseLimit: DefaultResponseLimit,
7058
UserAgent: DefaultUserAgent,
7159
}, nil
7260
}

‎domains/domains_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ func TestDomainsList(t *testing.T) {
9898
server := httptest.NewServer(handler)
9999
defer server.Close()
100100

101-
deis, err := deis.New(false, server.URL, "abc", "")
101+
deis, err := deis.New(false, server.URL, "abc")
102102
if err != nil {
103103
t.Fatal(err)
104104
}
@@ -129,7 +129,7 @@ func TestDomainsAdd(t *testing.T) {
129129
server := httptest.NewServer(handler)
130130
defer server.Close()
131131

132-
deis, err := deis.New(false, server.URL, "abc", "")
132+
deis, err := deis.New(false, server.URL, "abc")
133133
if err != nil {
134134
t.Fatal(err)
135135
}
@@ -152,7 +152,7 @@ func TestDomainsRemove(t *testing.T) {
152152
server := httptest.NewServer(handler)
153153
defer server.Close()
154154

155-
deis, err := deis.New(false, server.URL, "abc", "")
155+
deis, err := deis.New(false, server.URL, "abc")
156156
if err != nil {
157157
t.Fatal(err)
158158
}

‎http_test.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ func TestCheckConnection(t *testing.T) {
100100
server := httptest.NewServer(handler)
101101
defer server.Close()
102102

103-
deis, err := New(false, server.URL, "", "")
103+
deis, err := New(false, server.URL, "")
104104
if err != nil {
105105
t.Fatal(err)
106106
}
@@ -118,7 +118,7 @@ func TestAPIMistmatch(t *testing.T) {
118118
server := httptest.NewServer(handler)
119119
defer server.Close()
120120

121-
deis, err := New(false, server.URL, "", "")
121+
deis, err := New(false, server.URL, "")
122122
if err != nil {
123123
t.Fatal(err)
124124
}
@@ -140,7 +140,7 @@ func TestBasicRequest(t *testing.T) {
140140
server := httptest.NewServer(handler)
141141
defer server.Close()
142142

143-
deis, err := New(false, server.URL, "abc", "")
143+
deis, err := New(false, server.URL, "abc")
144144
if err != nil {
145145
t.Fatal(err)
146146
}
@@ -175,7 +175,7 @@ func TestLimitedRequest(t *testing.T) {
175175
server := httptest.NewServer(handler)
176176
defer server.Close()
177177

178-
deis, err := New(false, server.URL, "abc", "")
178+
deis, err := New(false, server.URL, "abc")
179179
if err != nil {
180180
t.Fatal(err)
181181
}

‎keys/keys_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ func TestKeysList(t *testing.T) {
101101
server := httptest.NewServer(handler)
102102
defer server.Close()
103103

104-
deis, err := deis.New(false, server.URL, "abc", "")
104+
deis, err := deis.New(false, server.URL, "abc")
105105
if err != nil {
106106
t.Fatal(err)
107107
}
@@ -133,7 +133,7 @@ func TestKeyCreate(t *testing.T) {
133133
server := httptest.NewServer(handler)
134134
defer server.Close()
135135

136-
deis, err := deis.New(false, server.URL, "abc", "")
136+
deis, err := deis.New(false, server.URL, "abc")
137137
if err != nil {
138138
t.Fatal(err)
139139
}
@@ -156,7 +156,7 @@ func TestKeysDestroy(t *testing.T) {
156156
server := httptest.NewServer(&handler)
157157
defer server.Close()
158158

159-
deis, err := deis.New(false, server.URL, "abc", "")
159+
deis, err := deis.New(false, server.URL, "abc")
160160
if err != nil {
161161
t.Fatal(err)
162162
}

‎perms/perms_test.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ func TestList(t *testing.T) {
125125
server := httptest.NewServer(handler)
126126
defer server.Close()
127127

128-
deis, err := deis.New(false, server.URL, "abc", "")
128+
deis, err := deis.New(false, server.URL, "abc")
129129
if err != nil {
130130
t.Fatal(err)
131131
}
@@ -153,7 +153,7 @@ func TestListAdmins(t *testing.T) {
153153
server := httptest.NewServer(handler)
154154
defer server.Close()
155155

156-
deis, err := deis.New(false, server.URL, "abc", "")
156+
deis, err := deis.New(false, server.URL, "abc")
157157
if err != nil {
158158
t.Fatal(err)
159159
}
@@ -176,7 +176,7 @@ func TestNew(t *testing.T) {
176176
server := httptest.NewServer(handler)
177177
defer server.Close()
178178

179-
deis, err := deis.New(false, server.URL, "abc", "")
179+
deis, err := deis.New(false, server.URL, "abc")
180180
if err != nil {
181181
t.Fatal(err)
182182
}
@@ -193,7 +193,7 @@ func TestNewAdmin(t *testing.T) {
193193
server := httptest.NewServer(handler)
194194
defer server.Close()
195195

196-
deis, err := deis.New(false, server.URL, "abc", "")
196+
deis, err := deis.New(false, server.URL, "abc")
197197
if err != nil {
198198
t.Fatal(err)
199199
}
@@ -210,7 +210,7 @@ func TestDelete(t *testing.T) {
210210
server := httptest.NewServer(handler)
211211
defer server.Close()
212212

213-
deis, err := deis.New(false, server.URL, "abc", "")
213+
deis, err := deis.New(false, server.URL, "abc")
214214
if err != nil {
215215
t.Fatal(err)
216216
}
@@ -227,7 +227,7 @@ func TestDeleteAdmin(t *testing.T) {
227227
server := httptest.NewServer(handler)
228228
defer server.Close()
229229

230-
deis, err := deis.New(false, server.URL, "abc", "")
230+
deis, err := deis.New(false, server.URL, "abc")
231231
if err != nil {
232232
t.Fatal(err)
233233
}

0 commit comments

Comments
 (0)