Skip to content

Commit 85e41f0

Browse files
RachelTuckerRachelTucker
committed
Manually updated networking code for select commands
1 parent 80b9faf commit 85e41f0

38 files changed

+1256
-1585
lines changed

‎src/ds3/ds3Client.go‎

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,19 @@ import (
55
"net/url"
66
)
77

8+
const (
9+
HTTP_VERB_GET = "GET"
10+
HTTP_VERB_PUT = "PUT"
11+
HTTP_VERB_POST = "POST"
12+
HTTP_VERB_DELETE = "DELETE"
13+
HTTP_VERB_HEAD = "HEAD"
14+
HTTP_VERB_PATCH = "PATCH"
15+
)
16+
817
type Client struct {
9-
netLayer networking.Network
10-
clientPolicy *ClientPolicy
18+
sendNetwork networking.Network
19+
clientPolicy *ClientPolicy
20+
connectionInfo *networking.ConnectionInfo
1121
}
1222

1323
type ClientBuilder struct {
@@ -26,9 +36,9 @@ const DEFAULT_MAX_REDIRECTS = 5
2636
func NewClientBuilder(endpoint *url.URL, creds *networking.Credentials) *ClientBuilder {
2737
return &ClientBuilder{
2838
&networking.ConnectionInfo{
29-
Endpoint: endpoint,
30-
Creds: creds,
31-
Proxy: nil},
39+
Endpoint: endpoint,
40+
Credentials: creds,
41+
Proxy: nil},
3242
&ClientPolicy{
3343
maxRetries: DEFAULT_MAX_RETRIES,
3444
maxRedirect: DEFAULT_MAX_REDIRECTS}}
@@ -51,8 +61,8 @@ func (clientBuilder *ClientBuilder) WithNetworkRetryCount(count int) *ClientBuil
5161

5262
func (clientBuilder *ClientBuilder) BuildClient() *Client {
5363
return &Client{
54-
networking.NewHttpNetwork(clientBuilder.connectionInfo),
55-
clientBuilder.clientPolicy,
64+
sendNetwork: networking.NewSendNetwork(clientBuilder.connectionInfo),
65+
clientPolicy: clientBuilder.clientPolicy,
66+
connectionInfo: clientBuilder.connectionInfo,
5667
}
5768
}
58-

‎src/ds3/ds3Deletes.go‎

Lines changed: 104 additions & 70 deletions
Large diffs are not rendered by default.

‎src/ds3/ds3Gets.go‎

Lines changed: 221 additions & 153 deletions
Large diffs are not rendered by default.

‎src/ds3/ds3Heads.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import (
1919
)
2020

2121
func (client *Client) HeadBucket(request *models.HeadBucketRequest) (*models.HeadBucketResponse, error) {
22-
networkRetryDecorator := networking.NewNetworkRetryDecorator(&(client.netLayer), client.clientPolicy.maxRetries)
22+
networkRetryDecorator := networking.NewNetworkRetryDecorator(&(client.sendNetwork), client.clientPolicy.maxRetries)
2323

2424
// Invoke the HTTP request.
2525
response, requestErr := networkRetryDecorator.Invoke(request)
@@ -31,7 +31,7 @@ func (client *Client) HeadBucket(request *models.HeadBucketRequest) (*models.Hea
3131
return models.NewHeadBucketResponse(response)
3232
}
3333
func (client *Client) HeadObject(request *models.HeadObjectRequest) (*models.HeadObjectResponse, error) {
34-
networkRetryDecorator := networking.NewNetworkRetryDecorator(&(client.netLayer), client.clientPolicy.maxRetries)
34+
networkRetryDecorator := networking.NewNetworkRetryDecorator(&(client.sendNetwork), client.clientPolicy.maxRetries)
3535

3636
// Invoke the HTTP request.
3737
response, requestErr := networkRetryDecorator.Invoke(request)

‎src/ds3/ds3Posts.go‎

Lines changed: 93 additions & 51 deletions
Large diffs are not rendered by default.

‎src/ds3/ds3Puts.go‎

Lines changed: 224 additions & 108 deletions
Large diffs are not rendered by default.

‎src/ds3/models/clearSuspectBlobAzureTargetsSpectraS3Request.go‎

Lines changed: 4 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -20,45 +20,17 @@ import (
2020
)
2121

2222
type ClearSuspectBlobAzureTargetsSpectraS3Request struct {
23-
content networking.ReaderWithSizeDecorator
24-
queryParams *url.Values
23+
Ids []string
24+
Force bool
2525
}
2626

2727
func NewClearSuspectBlobAzureTargetsSpectraS3Request(ids []string) *ClearSuspectBlobAzureTargetsSpectraS3Request {
28-
queryParams := &url.Values{}
29-
3028
return &ClearSuspectBlobAzureTargetsSpectraS3Request{
31-
content: buildIdListPayload(ids),
32-
queryParams: queryParams,
29+
Ids: ids,
3330
}
3431
}
3532

36-
37-
3833
func (clearSuspectBlobAzureTargetsSpectraS3Request *ClearSuspectBlobAzureTargetsSpectraS3Request) WithForce() *ClearSuspectBlobAzureTargetsSpectraS3Request {
39-
clearSuspectBlobAzureTargetsSpectraS3Request.queryParams.Set("force", "")
34+
clearSuspectBlobAzureTargetsSpectraS3Request.Force = true
4035
return clearSuspectBlobAzureTargetsSpectraS3Request
4136
}
42-
43-
func (ClearSuspectBlobAzureTargetsSpectraS3Request) Verb() networking.HttpVerb {
44-
return networking.DELETE
45-
}
46-
47-
func (clearSuspectBlobAzureTargetsSpectraS3Request *ClearSuspectBlobAzureTargetsSpectraS3Request) Path() string {
48-
return "/_rest_/suspect_blob_azure_target"
49-
}
50-
51-
func (clearSuspectBlobAzureTargetsSpectraS3Request *ClearSuspectBlobAzureTargetsSpectraS3Request) QueryParams() *url.Values {
52-
return clearSuspectBlobAzureTargetsSpectraS3Request.queryParams
53-
}
54-
55-
func (ClearSuspectBlobAzureTargetsSpectraS3Request) GetChecksum() networking.Checksum {
56-
return networking.NewNoneChecksum()
57-
}
58-
func (ClearSuspectBlobAzureTargetsSpectraS3Request) Header() *http.Header {
59-
return &http.Header{}
60-
}
61-
62-
func (clearSuspectBlobAzureTargetsSpectraS3Request *ClearSuspectBlobAzureTargetsSpectraS3Request) GetContentStream() networking.ReaderWithSizeDecorator {
63-
return clearSuspectBlobAzureTargetsSpectraS3Request.content
64-
}

‎src/ds3/models/clearSuspectBlobPoolsSpectraS3Request.go‎

Lines changed: 4 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -13,52 +13,19 @@
1313

1414
package models
1515

16-
import (
17-
"net/url"
18-
"net/http"
19-
"ds3/networking"
20-
)
21-
2216
type ClearSuspectBlobPoolsSpectraS3Request struct {
23-
content networking.ReaderWithSizeDecorator
24-
queryParams *url.Values
17+
Ids []string
18+
Force bool
2519
}
2620

2721
func NewClearSuspectBlobPoolsSpectraS3Request(ids []string) *ClearSuspectBlobPoolsSpectraS3Request {
28-
queryParams := &url.Values{}
2922

3023
return &ClearSuspectBlobPoolsSpectraS3Request{
31-
content: buildIdListPayload(ids),
32-
queryParams: queryParams,
24+
Ids: ids,
3325
}
3426
}
3527

36-
37-
3828
func (clearSuspectBlobPoolsSpectraS3Request *ClearSuspectBlobPoolsSpectraS3Request) WithForce() *ClearSuspectBlobPoolsSpectraS3Request {
39-
clearSuspectBlobPoolsSpectraS3Request.queryParams.Set("force", "")
29+
clearSuspectBlobPoolsSpectraS3Request.Force = true
4030
return clearSuspectBlobPoolsSpectraS3Request
4131
}
42-
43-
func (ClearSuspectBlobPoolsSpectraS3Request) Verb() networking.HttpVerb {
44-
return networking.DELETE
45-
}
46-
47-
func (clearSuspectBlobPoolsSpectraS3Request *ClearSuspectBlobPoolsSpectraS3Request) Path() string {
48-
return "/_rest_/suspect_blob_pool"
49-
}
50-
51-
func (clearSuspectBlobPoolsSpectraS3Request *ClearSuspectBlobPoolsSpectraS3Request) QueryParams() *url.Values {
52-
return clearSuspectBlobPoolsSpectraS3Request.queryParams
53-
}
54-
55-
func (ClearSuspectBlobPoolsSpectraS3Request) GetChecksum() networking.Checksum {
56-
return networking.NewNoneChecksum()
57-
}
58-
func (ClearSuspectBlobPoolsSpectraS3Request) Header() *http.Header {
59-
return &http.Header{}
60-
}
61-
62-
func (clearSuspectBlobPoolsSpectraS3Request *ClearSuspectBlobPoolsSpectraS3Request) GetContentStream() networking.ReaderWithSizeDecorator {
63-
return clearSuspectBlobPoolsSpectraS3Request.content
64-
}

‎src/ds3/models/completeMultiPartUploadRequest.go‎

Lines changed: 8 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -13,55 +13,18 @@
1313

1414
package models
1515

16-
import (
17-
"net/url"
18-
"net/http"
19-
"ds3/networking"
20-
)
21-
2216
type CompleteMultiPartUploadRequest struct {
23-
bucketName string
24-
objectName string
25-
content networking.ReaderWithSizeDecorator
26-
uploadId string
27-
queryParams *url.Values
17+
BucketName string
18+
ObjectName string
19+
Parts []Part
20+
UploadId string
2821
}
2922

3023
func NewCompleteMultiPartUploadRequest(bucketName string, objectName string, parts []Part, uploadId string) *CompleteMultiPartUploadRequest {
31-
queryParams := &url.Values{}
32-
queryParams.Set("upload_id", uploadId)
33-
3424
return &CompleteMultiPartUploadRequest{
35-
bucketName: bucketName,
36-
objectName: objectName,
37-
uploadId: uploadId,
38-
content: buildPartsListStream(parts),
39-
queryParams: queryParams,
25+
BucketName: bucketName,
26+
ObjectName: objectName,
27+
UploadId: uploadId,
28+
Parts: parts,
4029
}
4130
}
42-
43-
44-
45-
46-
func (CompleteMultiPartUploadRequest) Verb() networking.HttpVerb {
47-
return networking.POST
48-
}
49-
50-
func (completeMultiPartUploadRequest *CompleteMultiPartUploadRequest) Path() string {
51-
return "/" + completeMultiPartUploadRequest.bucketName + "/" + completeMultiPartUploadRequest.objectName
52-
}
53-
54-
func (completeMultiPartUploadRequest *CompleteMultiPartUploadRequest) QueryParams() *url.Values {
55-
return completeMultiPartUploadRequest.queryParams
56-
}
57-
58-
func (CompleteMultiPartUploadRequest) GetChecksum() networking.Checksum {
59-
return networking.NewNoneChecksum()
60-
}
61-
func (CompleteMultiPartUploadRequest) Header() *http.Header {
62-
return &http.Header{}
63-
}
64-
65-
func (completeMultiPartUploadRequest *CompleteMultiPartUploadRequest) GetContentStream() networking.ReaderWithSizeDecorator {
66-
return completeMultiPartUploadRequest.content
67-
}

‎src/ds3/models/deleteJobCreatedNotificationRegistrationSpectraS3Request.go‎

Lines changed: 2 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -20,41 +20,12 @@ import (
2020
)
2121

2222
type DeleteJobCreatedNotificationRegistrationSpectraS3Request struct {
23-
notificationId string
24-
queryParams *url.Values
23+
NotificationId string
2524
}
2625

2726
func NewDeleteJobCreatedNotificationRegistrationSpectraS3Request(notificationId string) *DeleteJobCreatedNotificationRegistrationSpectraS3Request {
28-
queryParams := &url.Values{}
2927

3028
return &DeleteJobCreatedNotificationRegistrationSpectraS3Request{
31-
notificationId: notificationId,
32-
queryParams: queryParams,
29+
NotificationId: notificationId,
3330
}
3431
}
35-
36-
37-
38-
39-
func (DeleteJobCreatedNotificationRegistrationSpectraS3Request) Verb() networking.HttpVerb {
40-
return networking.DELETE
41-
}
42-
43-
func (deleteJobCreatedNotificationRegistrationSpectraS3Request *DeleteJobCreatedNotificationRegistrationSpectraS3Request) Path() string {
44-
return "/_rest_/job_created_notification_registration/" + deleteJobCreatedNotificationRegistrationSpectraS3Request.notificationId
45-
}
46-
47-
func (deleteJobCreatedNotificationRegistrationSpectraS3Request *DeleteJobCreatedNotificationRegistrationSpectraS3Request) QueryParams() *url.Values {
48-
return deleteJobCreatedNotificationRegistrationSpectraS3Request.queryParams
49-
}
50-
51-
func (DeleteJobCreatedNotificationRegistrationSpectraS3Request) GetChecksum() networking.Checksum {
52-
return networking.NewNoneChecksum()
53-
}
54-
func (DeleteJobCreatedNotificationRegistrationSpectraS3Request) Header() *http.Header {
55-
return &http.Header{}
56-
}
57-
58-
func (DeleteJobCreatedNotificationRegistrationSpectraS3Request) GetContentStream() networking.ReaderWithSizeDecorator {
59-
return nil
60-
}

0 commit comments

Comments
 (0)