Skip to content
This repository was archived by the owner on Mar 11, 2025. It is now read-only.

Commit f616cbe

Browse files
loafoeloafoe
committed
Merge remote-tracking branch 'origin/main'
2 parents 683510d + 7e8ae7a commit f616cbe

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+141
-180
lines changed

‎ai/client.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import (
55
"bytes"
66
"encoding/json"
77
"io"
8-
"io/ioutil"
98
"net/http"
109
"net/url"
1110
"os"
@@ -188,7 +187,7 @@ func (c *Client) NewAIRequest(method, requestPath string, opt interface{}, optio
188187
bodyReader := bytes.NewReader(bodyBytes)
189188

190189
u.RawQuery = ""
191-
req.Body = ioutil.NopCloser(bodyReader)
190+
req.Body = io.NopCloser(bodyReader)
192191
req.ContentLength = int64(bodyReader.Len())
193192
req.Header.Set("Content-Type", "application/json")
194193
}

‎ai/client_test.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package ai_test
22

33
import (
44
"io"
5-
"io/ioutil"
65
"net/http"
76
"net/http/httptest"
87
"os"
@@ -165,7 +164,7 @@ func TestDebug(t *testing.T) {
165164
teardown := setup(t)
166165
defer teardown()
167166

168-
tempFile, err := ioutil.TempFile("", "example")
167+
tempFile, err := os.CreateTemp("", "example")
169168
if err != nil {
170169
t.Fatalf("Error: %v", err)
171170
}

‎ai/inference/client_test.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package inference_test
22

33
import (
44
"io"
5-
"io/ioutil"
65
"net/http"
76
"net/http/httptest"
87
"os"
@@ -200,7 +199,7 @@ func TestDebug(t *testing.T) {
200199
teardown := setup(t)
201200
defer teardown()
202201

203-
tempFile, err := ioutil.TempFile("", "example")
202+
tempFile, err := os.CreateTemp("", "example")
204203
if err != nil {
205204
t.Fatalf("Error: %v", err)
206205
}

‎ai/training/client_test.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package training_test
22

33
import (
44
"io"
5-
"io/ioutil"
65
"net/http"
76
"net/http/httptest"
87
"os"
@@ -200,7 +199,7 @@ func TestDebug(t *testing.T) {
200199
teardown := setup(t)
201200
defer teardown()
202201

203-
tmpfile, err := ioutil.TempFile("", "example")
202+
tmpfile, err := os.CreateTemp("", "example")
204203
if err != nil {
205204
t.Fatalf("Error: %v", err)
206205
}

‎ai/workspace/client_test.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package workspace_test
22

33
import (
44
"io"
5-
"io/ioutil"
65
"net/http"
76
"net/http/httptest"
87
"os"
@@ -199,7 +198,7 @@ func TestDebug(t *testing.T) {
199198
teardown := setup(t)
200199
defer teardown()
201200

202-
tmpfile, err := ioutil.TempFile("", "example")
201+
tmpfile, err := os.CreateTemp("", "example")
203202
if err != nil {
204203
t.Fatalf("Error: %v", err)
205204
}

‎audit/client.go‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import (
66
"encoding/json"
77
"fmt"
88
"io"
9-
"io/ioutil"
109
"net/http"
1110
"net/url"
1211
"os"
@@ -152,7 +151,7 @@ func (c *Client) newAuditRequest(method, path string, bodyBytes []byte, options
152151
bodyReader := bytes.NewReader(bodyBytes)
153152

154153
u.RawQuery = ""
155-
req.Body = ioutil.NopCloser(bodyReader)
154+
req.Body = io.NopCloser(bodyReader)
156155
req.ContentLength = int64(bodyReader.Len())
157156
}
158157

@@ -188,7 +187,9 @@ func (c *Client) do(req *http.Request, v interface{}) (*Response, error) {
188187
doErr := internal.CheckResponse(resp)
189188

190189
if v != nil {
191-
defer resp.Body.Close() // Only close if we plan to read it
190+
defer func() {
191+
_ = resp.Body.Close()
192+
}() // Only close if we plan to read it
192193
if w, ok := v.(io.Writer); ok {
193194
_, err = io.Copy(w, resp.Body)
194195
} else {

‎audit/client_test.go‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package audit_test
22

33
import (
4-
"io/ioutil"
54
"net/http"
65
"net/http/httptest"
76
"os"
@@ -40,15 +39,17 @@ func TestDebug(t *testing.T) {
4039
teardown := setup(t)
4140
defer teardown()
4241

43-
tmpfile, err := ioutil.TempFile("", "example")
42+
tmpfile, err := os.CreateTemp("", "example")
4443
if err != nil {
4544
t.Fatalf("Error: %v", err)
4645
}
4746

4847
_, _, _ = auditClient.CreateAuditEvent(nil)
4948

5049
defer auditClient.Close()
51-
defer os.Remove(tmpfile.Name()) // clean up
50+
defer func() {
51+
_ = os.Remove(tmpfile.Name())
52+
}() // clean up
5253

5354
// TODO: trigger call here
5455

‎blr/client.go‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import (
66
"encoding/json"
77
"fmt"
88
"io"
9-
"io/ioutil"
109
"net/http"
1110
"net/url"
1211
"os"
@@ -153,7 +152,7 @@ func (c *Client) NewRequest(method, requestPath string, opt interface{}, options
153152
bodyReader := bytes.NewReader(bodyBytes)
154153

155154
u.RawQuery = ""
156-
req.Body = ioutil.NopCloser(bodyReader)
155+
req.Body = io.NopCloser(bodyReader)
157156
req.ContentLength = int64(bodyReader.Len())
158157
req.Header.Set("Content-Type", "application/json")
159158
}
@@ -190,7 +189,7 @@ func newResponse(r *http.Response) *Response {
190189
return response
191190
}
192191

193-
// Do executes a http request. If v implements the io.Writer
192+
// Do performs a http request. If v implements the io.Writer
194193
// interface, the raw response body will be written to v, without attempting to
195194
// first decode it.
196195
func (c *Client) Do(req *http.Request, v interface{}) (*Response, error) {

‎blr/client_test.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package blr_test
22

33
import (
44
"io"
5-
_ "io/ioutil"
65
"net/http"
76
"net/http/httptest"
87
_ "os"
@@ -158,7 +157,7 @@ func TestDebug(t *testing.T) {
158157
teardown := setup(t)
159158
defer teardown()
160159
161-
tempFile, err := ioutil.TempFile("", "example")
160+
tempFile, err := os.CreateTemp("", "example")
162161
if err != nil {
163162
t.Fatalf("Error: %v", err)
164163
}

‎cartel/client.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import (
1010
"encoding/json"
1111
"fmt"
1212
"io"
13-
"io/ioutil"
1413
"net/http"
1514
"net/url"
1615
"os"
@@ -216,7 +215,7 @@ func (c *Client) newRequest(method, path string, opt *RequestBody, options []Opt
216215
bodyReader := bytes.NewReader(bodyBytes)
217216

218217
u.RawQuery = ""
219-
req.Body = ioutil.NopCloser(bodyReader)
218+
req.Body = io.NopCloser(bodyReader)
220219
req.ContentLength = int64(bodyReader.Len())
221220
req.Header.Set("Content-Type", "application/json")
222221
req.Header.Set("Authorization", string(generateSignature([]byte(c.config.Secret), bodyBytes)))

0 commit comments

Comments
 (0)