Skip to content

Commit f7e1986

Browse files
tombuildsstufftombuildsstuff
authored
Merge pull request #114 from tombuildsstuff/b/making-response-parsing-consistent
`2023-11-03`: making the Response parsing consistent
2 parents a1ba466 + bbf0f64 commit f7e1986

File tree

105 files changed

+146
-150
lines changed

Some content is hidden

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

105 files changed

+146
-150
lines changed

‎.go-version

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
1.22.2

‎storage/2023-11-03/blob/accounts/get_service_properties.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ func (c Client) GetServiceProperties(ctx context.Context, accountName string) (r
3636

3737
var resp *client.Response
3838
resp, err = req.Execute(ctx)
39-
if resp != nil {
39+
if resp != nil && resp.Response != nil {
4040
result.HttpResponse = resp.Response
4141

4242
err = resp.Unmarshal(&result)

‎storage/2023-11-03/blob/accounts/set_service_properties.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ func (c Client) SetServiceProperties(ctx context.Context, accountName string, in
4040

4141
var resp *client.Response
4242
resp, err = req.Execute(ctx)
43-
if resp != nil {
43+
if resp != nil && resp.Response != nil {
4444
result.HttpResponse = resp.Response
4545
}
4646
if err != nil {

‎storage/2023-11-03/blob/blobs/append_block.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,10 +102,10 @@ func (c Client) AppendBlock(ctx context.Context, containerName, blobName string,
102102

103103
var resp *client.Response
104104
resp, err = req.Execute(ctx)
105-
if resp != nil {
105+
if resp != nil && resp.Response != nil {
106106
result.HttpResponse = resp.Response
107107

108-
if resp.Response != nil && resp.Header != nil {
108+
if resp.Header != nil {
109109
result.BlobAppendOffset = resp.Header.Get("x-ms-blob-append-offset")
110110
result.ContentMD5 = resp.Header.Get("Content-MD5")
111111
result.ETag = resp.Header.Get("ETag")

‎storage/2023-11-03/blob/blobs/copy.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -152,10 +152,10 @@ func (c Client) Copy(ctx context.Context, containerName, blobName string, input
152152

153153
var resp *client.Response
154154
resp, err = req.Execute(ctx)
155-
if resp != nil {
155+
if resp != nil && resp.Response != nil {
156156
result.HttpResponse = resp.Response
157157

158-
if resp.Response != nil && resp.Header != nil {
158+
if resp.Header != nil {
159159
result.CopyID = resp.Header.Get("x-ms-copy-id")
160160
result.CopyStatus = resp.Header.Get("x-ms-copy-status")
161161
}

‎storage/2023-11-03/blob/blobs/copy_abort.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ func (c Client) AbortCopy(ctx context.Context, containerName, blobName string, i
6464

6565
var resp *client.Response
6666
resp, err = req.Execute(ctx)
67-
if resp != nil {
67+
if resp != nil && resp.Response != nil {
6868
result.HttpResponse = resp.Response
6969
}
7070
if err != nil {

‎storage/2023-11-03/blob/blobs/delete.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ func (c Client) Delete(ctx context.Context, containerName, blobName string, inpu
5757

5858
var resp *client.Response
5959
resp, err = req.Execute(ctx)
60-
if resp != nil {
60+
if resp != nil && resp.Response != nil {
6161
result.HttpResponse = resp.Response
6262
}
6363
if err != nil {

‎storage/2023-11-03/blob/blobs/delete_snapshot.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ func (c Client) DeleteSnapshot(ctx context.Context, containerName, blobName stri
6464

6565
var resp *client.Response
6666
resp, err = req.Execute(ctx)
67-
if resp != nil {
67+
if resp != nil && resp.Response != nil {
6868
result.HttpResponse = resp.Response
6969
}
7070
if err != nil {

‎storage/2023-11-03/blob/blobs/delete_snapshots.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ func (c Client) DeleteSnapshots(ctx context.Context, containerName, blobName str
5656

5757
var resp *client.Response
5858
resp, err = req.Execute(ctx)
59-
if resp != nil {
59+
if resp != nil && resp.Response != nil {
6060
result.HttpResponse = resp.Response
6161
}
6262
if err != nil {

‎storage/2023-11-03/blob/blobs/get.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ func (c Client) Get(ctx context.Context, containerName, blobName string, input G
6565

6666
var resp *client.Response
6767
resp, err = req.Execute(ctx)
68-
if resp != nil {
68+
if resp != nil && resp.Response != nil {
6969
result.HttpResponse = resp.Response
7070

7171
if resp.Body != nil {

‎storage/2023-11-03/blob/blobs/get_block_list.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,10 +68,10 @@ func (c Client) GetBlockList(ctx context.Context, containerName, blobName string
6868

6969
var resp *client.Response
7070
resp, err = req.Execute(ctx)
71-
if resp != nil {
71+
if resp != nil && resp.Response != nil {
7272
result.HttpResponse = resp.Response
7373

74-
if resp.Response != nil && resp.Header != nil {
74+
if resp.Header != nil {
7575
result.ContentType = resp.Header.Get("Content-Type")
7676
result.ETag = resp.Header.Get("ETag")
7777

‎storage/2023-11-03/blob/blobs/get_page_ranges.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,10 +78,10 @@ func (c Client) GetPageRanges(ctx context.Context, containerName, blobName strin
7878

7979
var resp *client.Response
8080
resp, err = req.Execute(ctx)
81-
if resp != nil {
81+
if resp != nil && resp.Response != nil {
8282
result.HttpResponse = resp.Response
8383

84-
if resp.Response != nil && resp.Header != nil {
84+
if resp.Header != nil {
8585
result.ContentType = resp.Header.Get("Content-Type")
8686
result.ETag = resp.Header.Get("ETag")
8787

‎storage/2023-11-03/blob/blobs/incremental_copy_blob.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ func (c Client) IncrementalCopyBlob(ctx context.Context, containerName, blobName
6666

6767
var resp *client.Response
6868
resp, err = req.Execute(ctx)
69-
if resp != nil {
69+
if resp != nil && resp.Response != nil {
7070
result.HttpResponse = resp.Response
7171
}
7272
if err != nil {

‎storage/2023-11-03/blob/blobs/lease_acquire.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ func (c Client) AcquireLease(ctx context.Context, containerName, blobName string
8080

8181
var resp *client.Response
8282
resp, err = req.Execute(ctx)
83-
if resp != nil {
83+
if resp != nil && resp.Response != nil {
8484
result.HttpResponse = resp.Response
8585

8686
if resp.Response != nil && resp.Header != nil {

‎storage/2023-11-03/blob/blobs/lease_break.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ func (c Client) BreakLease(ctx context.Context, containerName, blobName string,
7474

7575
var resp *client.Response
7676
resp, err = req.Execute(ctx)
77-
if resp != nil {
77+
if resp != nil && resp.Response != nil {
7878
result.HttpResponse = resp.Response
7979
}
8080
if err != nil {

‎storage/2023-11-03/blob/blobs/lease_change.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ func (c Client) ChangeLease(ctx context.Context, containerName, blobName string,
6767

6868
var resp *client.Response
6969
resp, err = req.Execute(ctx)
70-
if resp != nil {
70+
if resp != nil && resp.Response != nil {
7171
result.HttpResponse = resp.Response
7272

7373
if resp.Response != nil && resp.Header != nil {

‎storage/2023-11-03/blob/blobs/lease_release.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ func (c Client) ReleaseLease(ctx context.Context, containerName, blobName string
5959

6060
var resp *client.Response
6161
resp, err = req.Execute(ctx)
62-
if resp != nil {
62+
if resp != nil && resp.Response != nil {
6363
result.HttpResponse = resp.Response
6464
}
6565
if err != nil {

‎storage/2023-11-03/blob/blobs/lease_renew.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ func (c Client) RenewLease(ctx context.Context, containerName, blobName string,
5858

5959
var resp *client.Response
6060
resp, err = req.Execute(ctx)
61-
if resp != nil {
61+
if resp != nil && resp.Response != nil {
6262
result.HttpResponse = resp.Response
6363
}
6464
if err != nil {

‎storage/2023-11-03/blob/blobs/metadata_set.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ func (c Client) SetMetaData(ctx context.Context, containerName, blobName string,
6565

6666
var resp *client.Response
6767
resp, err = req.Execute(ctx)
68-
if resp != nil {
68+
if resp != nil && resp.Response != nil {
6969
result.HttpResponse = resp.Response
7070
}
7171
if err != nil {

‎storage/2023-11-03/blob/blobs/properties_get.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -197,10 +197,10 @@ func (c Client) GetProperties(ctx context.Context, containerName, blobName strin
197197

198198
var resp *client.Response
199199
resp, err = req.Execute(ctx)
200-
if resp != nil {
200+
if resp != nil && resp.Response != nil {
201201
result.HttpResponse = resp.Response
202202

203-
if resp.Response != nil && resp.Header != nil {
203+
if resp.Header != nil {
204204
result.AccessTier = AccessTier(resp.Header.Get("x-ms-access-tier"))
205205
result.AccessTierChangeTime = resp.Header.Get("x-ms-access-tier-change-time")
206206
result.ArchiveStatus = ArchiveStatus(resp.Header.Get("x-ms-archive-status"))

‎storage/2023-11-03/blob/blobs/properties_set.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ func (c Client) SetProperties(ctx context.Context, containerName, blobName strin
6464

6565
var resp *client.Response
6666
resp, err = req.Execute(ctx)
67-
if resp != nil {
67+
if resp != nil && resp.Response != nil {
6868
result.HttpResponse = resp.Response
6969
}
7070
if err != nil {

‎storage/2023-11-03/blob/blobs/put_append_blob.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ func (c Client) PutAppendBlob(ctx context.Context, containerName, blobName strin
6969

7070
var resp *client.Response
7171
resp, err = req.Execute(ctx)
72-
if resp != nil {
72+
if resp != nil && resp.Response != nil {
7373
result.HttpResponse = resp.Response
7474
}
7575
if err != nil {

‎storage/2023-11-03/blob/blobs/put_block.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ func (c Client) PutBlock(ctx context.Context, containerName, blobName string, in
7575

7676
var resp *client.Response
7777
resp, err = req.Execute(ctx)
78-
if resp != nil {
78+
if resp != nil && resp.Response != nil {
7979
result.HttpResponse = resp.Response
8080
}
8181
if err != nil {

‎storage/2023-11-03/blob/blobs/put_block_blob.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ func (c Client) PutBlockBlob(ctx context.Context, containerName, blobName string
8787

8888
var resp *client.Response
8989
resp, err = req.Execute(ctx)
90-
if resp != nil {
90+
if resp != nil && resp.Response != nil {
9191
result.HttpResponse = resp.Response
9292
}
9393
if err != nil {

‎storage/2023-11-03/blob/blobs/put_block_list.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,10 +86,10 @@ func (c Client) PutBlockList(ctx context.Context, containerName, blobName string
8686

8787
var resp *client.Response
8888
resp, err = req.Execute(ctx)
89-
if resp != nil {
89+
if resp != nil && resp.Response != nil {
9090
result.HttpResponse = resp.Response
9191

92-
if resp.Response != nil && resp.Header != nil {
92+
if resp.Header != nil {
9393
result.ContentMD5 = resp.Header.Get("Content-MD5")
9494
result.ETag = resp.Header.Get("ETag")
9595
result.LastModified = resp.Header.Get("Last-Modified")

‎storage/2023-11-03/blob/blobs/put_block_url.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,10 +71,10 @@ func (c Client) PutBlockFromURL(ctx context.Context, containerName, blobName str
7171

7272
var resp *client.Response
7373
resp, err = req.Execute(ctx)
74-
if resp != nil {
74+
if resp != nil && resp.Response != nil {
7575
result.HttpResponse = resp.Response
7676

77-
if resp.Response != nil && resp.Header != nil {
77+
if resp.Header != nil {
7878
result.ContentMD5 = resp.Header.Get("Content-MD5")
7979
}
8080
}

‎storage/2023-11-03/blob/blobs/put_page_blob.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ func (c Client) PutPageBlob(ctx context.Context, containerName, blobName string,
7474

7575
var resp *client.Response
7676
resp, err = req.Execute(ctx)
77-
if resp != nil {
77+
if resp != nil && resp.Response != nil {
7878
result.HttpResponse = resp.Response
7979
}
8080
if err != nil {

‎storage/2023-11-03/blob/blobs/put_page_clear.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ func (c Client) PutPageClear(ctx context.Context, containerName, blobName string
6868

6969
var resp *client.Response
7070
resp, err = req.Execute(ctx)
71-
if resp != nil {
71+
if resp != nil && resp.Response != nil {
7272
result.HttpResponse = resp.Response
7373
}
7474
if err != nil {

‎storage/2023-11-03/blob/blobs/put_page_update.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,10 +94,10 @@ func (c Client) PutPageUpdate(ctx context.Context, containerName, blobName strin
9494

9595
var resp *client.Response
9696
resp, err = req.Execute(ctx)
97-
if resp != nil {
97+
if resp != nil && resp.Response != nil {
9898
result.HttpResponse = resp.Response
9999

100-
if resp.Response != nil && resp.Header != nil {
100+
if resp.Header != nil {
101101
result.BlobSequenceNumber = resp.Header.Get("x-ms-blob-sequence-number")
102102
result.ContentMD5 = resp.Header.Get("Content-MD5")
103103
result.LastModified = resp.Header.Get("Last-Modified")

‎storage/2023-11-03/blob/blobs/set_tier.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ func (c Client) SetTier(ctx context.Context, containerName, blobName string, inp
5555

5656
var resp *client.Response
5757
resp, err = req.Execute(ctx)
58-
if resp != nil {
58+
if resp != nil && resp.Response != nil {
5959
result.HttpResponse = resp.Response
6060
}
6161
if err != nil {

‎storage/2023-11-03/blob/blobs/snapshot.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,10 +96,10 @@ func (c Client) Snapshot(ctx context.Context, containerName, blobName string, in
9696

9797
var resp *client.Response
9898
resp, err = req.Execute(ctx)
99-
if resp != nil {
99+
if resp != nil && resp.Response != nil {
100100
result.HttpResponse = resp.Response
101101

102-
if resp.Response != nil && resp.Header != nil {
102+
if resp.Header != nil {
103103
result.ETag = resp.Header.Get("ETag")
104104
result.SnapshotDateTime = resp.Header.Get("x-ms-snapshot")
105105
}

‎storage/2023-11-03/blob/blobs/snapshot_get_properties.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,10 +63,10 @@ func (c Client) GetSnapshotProperties(ctx context.Context, containerName, blobNa
6363

6464
var resp *client.Response
6565
resp, err = req.Execute(ctx)
66-
if resp != nil {
66+
if resp != nil && resp.Response != nil {
6767
result.HttpResponse = resp.Response
6868

69-
if resp.Response != nil && resp.Header != nil {
69+
if resp.Header != nil {
7070
result.AccessTier = AccessTier(resp.Header.Get("x-ms-access-tier"))
7171
result.AccessTierChangeTime = resp.Header.Get("x-ms-access-tier-change-time")
7272
result.ArchiveStatus = ArchiveStatus(resp.Header.Get("x-ms-archive-status"))

‎storage/2023-11-03/blob/blobs/undelete.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ func (c Client) Undelete(ctx context.Context, containerName, blobName string) (r
4848

4949
var resp *client.Response
5050
resp, err = req.Execute(ctx)
51-
if resp != nil {
51+
if resp != nil && resp.Response != nil {
5252
result.HttpResponse = resp.Response
5353
}
5454
if err != nil {

‎storage/2023-11-03/blob/containers/create.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ func (c Client) Create(ctx context.Context, containerName string, input CreateIn
9090

9191
var resp *client.Response
9292
resp, err = req.Execute(ctx)
93-
if resp != nil {
93+
if resp != nil && resp.Response != nil {
9494
result.HttpResponse = resp.Response
9595
}
9696
if err != nil {

‎storage/2023-11-03/blob/containers/delete.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ func (c Client) Delete(ctx context.Context, containerName string) (result Delete
3838

3939
var resp *client.Response
4040
resp, err = req.Execute(ctx)
41-
if resp != nil {
41+
if resp != nil && resp.Response != nil {
4242
result.HttpResponse = resp.Response
4343
}
4444
if err != nil {

‎storage/2023-11-03/blob/containers/get_properties.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,10 @@ func (c Client) GetProperties(ctx context.Context, containerName string, input G
4747

4848
var resp *client.Response
4949
resp, err = req.Execute(ctx)
50-
if resp != nil {
50+
if resp != nil && resp.Response != nil {
5151
result.HttpResponse = resp.Response
5252

53-
if resp.Response != nil && resp.Header != nil {
53+
if resp.Header != nil {
5454
result.DefaultEncryptionScope = resp.Header.Get("x-ms-default-encryption-scope")
5555
result.LeaseStatus = LeaseStatus(resp.Header.Get("x-ms-lease-status"))
5656
result.LeaseState = LeaseState(resp.Header.Get("x-ms-lease-state"))

‎storage/2023-11-03/blob/containers/lease_acquire.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,10 @@ func (c Client) AcquireLease(ctx context.Context, containerName string, input Ac
5757

5858
var resp *client.Response
5959
resp, err = req.Execute(ctx)
60-
if resp != nil {
60+
if resp != nil && resp.Response != nil {
6161
result.HttpResponse = resp.Response
6262

63-
if resp.Response != nil && resp.Header != nil {
63+
if resp.Header != nil {
6464
result.LeaseID = resp.Header.Get("x-ms-lease-id")
6565
}
6666
}

‎storage/2023-11-03/blob/containers/lease_break.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,10 +64,10 @@ func (c Client) BreakLease(ctx context.Context, containerName string, input Brea
6464

6565
var resp *client.Response
6666
resp, err = req.Execute(ctx)
67-
if resp != nil {
67+
if resp != nil && resp.Response != nil {
6868
result.HttpResponse = resp.Response
6969

70-
if resp.Response != nil && resp.Header != nil {
70+
if resp.Header != nil {
7171
if leaseTimeRaw := resp.Header.Get("x-ms-lease-time"); leaseTimeRaw != "" {
7272
if leaseTime, err := strconv.Atoi(leaseTimeRaw); err == nil {
7373
result.LeaseTime = leaseTime

0 commit comments

Comments
 (0)