Dev azblob 2 (#18820)

* Fix Linting. * Fix Linting. * More tests * Test Recordings * SAS Changes * SAS Changes * SAS Changes * Redid recordings * Copyright fix. * README fix. * README fix. * Removed io/ioutil library. * gofmt using go1.19 Co-authored-by: Mohit Sharma <mohitdtumce@gmail.com>
Azure · Aug 9, 2022 · 598ca6e · 598ca6e
1 parent 4b6f797
commit 598ca6e
Show file tree

Hide file tree

Showing 21 changed files with 433 additions and 449 deletions.
diff --git a/sdk/storage/azblob/README.md b/sdk/storage/azblob/README.md
@@ -291,7 +291,7 @@ handleError(err)
 // Use the bytes.Buffer object to read the downloaded data.
 // RetryReaderOptions has a lot of in-depth tuning abilities, but for the sake of simplicity, we'll omit those here.
 reader := blobDownloadResponse.BodyReader(nil)
-downloadData, err := ioutil.ReadAll(reader)
+downloadData, err := io.ReadAll(reader)
 handleError(err)
 
 if string(downloadData) != uploadData {

diff --git a/sdk/storage/azblob/blob/lease_client.go b/sdk/storage/azblob/blob/lease_client.go
@@ -96,7 +96,7 @@ func (c *LeaseClient) generated() *generated.BlobClient {
 }
 
 // AcquireLease acquires a lease on the blob for write and delete operations.
-//The lease Duration must be between 15 and 60 seconds, or infinite (-1).
+// The lease Duration must be between 15 and 60 seconds, or infinite (-1).
 // For more information, see https://docs.microsoft.com/rest/api/storageservices/lease-blob.
 func (c *LeaseClient) AcquireLease(ctx context.Context, o *AcquireLeaseOptions) (AcquireLeaseResponse, error) {
 	blobAcquireLeaseOptions, modifiedAccessConditions := o.format()

diff --git a/sdk/storage/azblob/blockblob/constants.go b/sdk/storage/azblob/blockblob/constants.go
@@ -6,7 +6,7 @@
 
 package blockblob
 
-//nolint
+// nolint
 const (
 	// CountToEnd specifies the end of the file
 	CountToEnd = 0

diff --git a/sdk/storage/azblob/container/models.go b/sdk/storage/azblob/container/models.go
@@ -135,7 +135,7 @@ type ListBlobsFlatOptions struct {
 
 // ---------------------------------------------------------------------------------------------------------------------
 
-//ListBlobsHierarchyOptions provides set of configurations for Client.NewListBlobsHierarchyPager
+// ListBlobsHierarchyOptions provides set of configurations for Client.NewListBlobsHierarchyPager
 type ListBlobsHierarchyOptions struct {
 	// Include this parameter to specify one or more datasets to include in the response.
 	Include []ListBlobsIncludeItem

diff --git a/sdk/storage/azblob/doc.go b/sdk/storage/azblob/doc.go
@@ -172,7 +172,8 @@ Examples
 	// Use the bytes.Buffer object to read the downloaded data.
 	// RetryReaderOptions has a lot of in-depth tuning abilities, but for the sake of simplicity, we'll omit those here.
 	reader := blobDownloadResponse.Body(nil)
-	downloadData, err := ioutil.ReadAll(reader)
+	downloadData, err := io.ReadAll(reader)
+
 	handle(err)
 	if string(downloadData) != uploadData {
 		handle(errors.New("Uploaded data should be same as downloaded data"))

diff --git a/sdk/storage/azblob/service/client.go b/sdk/storage/azblob/service/client.go
@@ -57,7 +57,7 @@ func NewClientWithSharedKey(serviceURL string, cred *SharedKeyCredential, option
 }
 
 // NewClientFromConnectionString creates a service client from the given connection string.
-//nolint
+// nolint
 func NewClientFromConnectionString(connectionString string, options *ClientOptions) (*Client, error) {
 	parsed, err := shared.ParseConnectionString(connectionString)
 	if err != nil {

diff --git a/sdk/storage/azblob/zt_access_policy_test.go b/sdk/storage/azblob/zt_access_policy_test.go
@@ -16,7 +16,7 @@ import (
 	"time"
 )
 
-//nolint
+// nolint
 func (s *azblobUnrecordedTestSuite) TestSetEmptyAccessPolicy() {
 	_require := require.New(s.T())
 	testName := s.T().Name()
@@ -33,7 +33,7 @@ func (s *azblobUnrecordedTestSuite) TestSetEmptyAccessPolicy() {
 	_require.Nil(err)
 }
 
-//nolint
+// nolint
 func (s *azblobUnrecordedTestSuite) TestSetAccessPolicy() {
 	_require := require.New(s.T())
 	testName := s.T().Name()
@@ -66,7 +66,7 @@ func (s *azblobUnrecordedTestSuite) TestSetAccessPolicy() {
 	_require.Nil(err)
 }
 
-//nolint
+// nolint
 func (s *azblobUnrecordedTestSuite) TestSetMultipleAccessPolicies() {
 	_require := require.New(s.T())
 	testName := s.T().Name()
@@ -119,7 +119,7 @@ func (s *azblobUnrecordedTestSuite) TestSetMultipleAccessPolicies() {
 	_require.Len(resp.SignedIdentifiers, 3)
 }
 
-//nolint
+// nolint
 func (s *azblobUnrecordedTestSuite) TestSetNullAccessPolicy() {
 	_require := require.New(s.T())
 	testName := s.T().Name()

diff --git a/sdk/storage/azblob/zt_append_blob_client_test.go b/sdk/storage/azblob/zt_append_blob_client_test.go
@@ -17,7 +17,7 @@ import (
 	"strings"
 )
 
-//nolint
+// nolint
 func (s *azblobUnrecordedTestSuite) TestAppendBlock() {
 	_require := require.New(s.T())
 	testName := s.T().Name()
@@ -57,7 +57,7 @@ func (s *azblobUnrecordedTestSuite) TestAppendBlock() {
 	_require.Equal(*appendResp.BlobCommittedBlockCount, int32(2))
 }
 
-//nolint
+// nolint
 func (s *azblobUnrecordedTestSuite) TestAppendBlockWithMD5() {
 	_require := require.New(s.T())
 	testName := s.T().Name()
@@ -201,7 +201,7 @@ func (s *azblobUnrecordedTestSuite) TestAppendBlockWithMD5() {
 //	downloadResp, err := destBlob.Download(ctx, nil)
 //	_require.Nil(err)
 //
-//	destData, err := ioutil.ReadAll(downloadresp.BodyReader(nil))
+//	destData, err := io.ReadAll(downloadresp.BodyReader(nil))
 //	_require.Nil(err)
 //	_require.Equal(destData, sourceData)
 //	_ = downloadresp.BodyReader(nil).Close()
@@ -296,7 +296,7 @@ func (s *azblobUnrecordedTestSuite) TestAppendBlockWithMD5() {
 //	// Check data integrity through downloading.
 //	downloadResp, err := destBlob.Download(ctx, nil)
 //	_require.Nil(err)
-//	destData, err := ioutil.ReadAll(downloadResp.BodyReader(nil))
+//	destData, err := io.ReadAll(downloadResp.BodyReader(nil))
 //	_require.Nil(err)
 //	_require.EqualValues(destData, sourceData)
 //

diff --git a/sdk/storage/azblob/zt_blob_client_test.go b/sdk/storage/azblob/zt_blob_client_test.go
@@ -19,14 +19,14 @@ import (
 	"github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/internal/exported"
 	"github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/service"
 	"github.com/stretchr/testify/require"
-	"io/ioutil"
+	"io"
 	"net/url"
 	"strconv"
 	"strings"
 	"time"
 )
 
-//nolint
+// nolint
 func (s *azblobUnrecordedTestSuite) TestCreateBlobClient() {
 	_require := require.New(s.T())
 	testName := s.T().Name()
@@ -50,7 +50,7 @@ func (s *azblobUnrecordedTestSuite) TestCreateBlobClient() {
 	_require.Equal(bbClient.URL(), correctURL)
 }
 
-//nolint
+// nolint
 func (s *azblobUnrecordedTestSuite) TestCreateBlobClientWithSnapshotAndSAS() {
 	_require := require.New(s.T())
 	testName := s.T().Name()
@@ -93,7 +93,7 @@ func (s *azblobUnrecordedTestSuite) TestCreateBlobClientWithSnapshotAndSAS() {
 	_require.Equal(blobURLParts, correctURL)
 }
 
-//nolint
+// nolint
 func (s *azblobUnrecordedTestSuite) TestCreateBlobClientWithSnapshotAndSASUsingConnectionString() {
 	_require := require.New(s.T())
 	testName := s.T().Name()
@@ -179,7 +179,7 @@ func (s *azblobTestSuite) TestBlobStartCopyDestEmpty() {
 	_require.Nil(err)
 
 	// Read the blob data to verify the copy
-	data, err := ioutil.ReadAll(resp.BodyReader(nil))
+	data, err := io.ReadAll(resp.BodyReader(nil))
 	_require.Nil(err)
 	_require.Equal(*resp.ContentLength, int64(len(blockBlobDefaultData)))
 	_require.Equal(string(data), blockBlobDefaultData)
@@ -448,14 +448,14 @@ func (s *azblobTestSuite) TestBlobStartCopySourcePrivate() {
 //	resp2, err := copyBlobClient.Download(ctx, &downloadBlobOptions)
 //	_require.Nil(err)
 //
-//	data, err := ioutil.ReadAll(resp2.Body(nil))
+//	data, err := io.ReadAll(resp2.Body(nil))
 //	_require.Nil(err)
 //	_require.Equal(*resp2.ContentLength, int64(len(blockBlobDefaultData)))
 //	_require.Equal(string(data), blockBlobDefaultData)
 //	_ = resp2.Body(nil).Close()
 //}
 
-//nolint
+// nolint
 func (s *azblobUnrecordedTestSuite) TestBlobStartCopyUsingSASDest() {
 	_require := require.New(s.T())
 	testName := s.T().Name()
@@ -1031,7 +1031,7 @@ func (s *azblobTestSuite) TestBlobStartCopyDestIfNoneMatchFalse() {
 	validateBlobErrorCode(_require, err, bloberror.TargetConditionNotMet)
 }
 
-//nolint
+// nolint
 func (s *azblobUnrecordedTestSuite) TestBlobAbortCopyInProgress() {
 	_require := require.New(s.T())
 	testName := s.T().Name()
@@ -1626,7 +1626,7 @@ func (s *azblobTestSuite) TestBlobDownloadDataCountZero() {
 	_require.Nil(err)
 
 	// Specifying a count of 0 results in the value being ignored
-	data, err := ioutil.ReadAll(resp.BodyReader(nil))
+	data, err := io.ReadAll(resp.BodyReader(nil))
 	_require.Nil(err)
 	_require.Equal(string(data), blockBlobDefaultData)
 }
@@ -1654,7 +1654,7 @@ func (s *azblobTestSuite) TestBlobDownloadDataCountExact() {
 	resp, err := bbClient.Download(ctx, &options)
 	_require.Nil(err)
 
-	data, err := ioutil.ReadAll(resp.BodyReader(nil))
+	data, err := io.ReadAll(resp.BodyReader(nil))
 	_require.Nil(err)
 	_require.Equal(string(data), blockBlobDefaultData)
 }
@@ -1681,7 +1681,7 @@ func (s *azblobTestSuite) TestBlobDownloadDataCountOutOfRange() {
 	resp, err := bbClient.Download(ctx, &options)
 	_require.Nil(err)
 
-	data, err := ioutil.ReadAll(resp.BodyReader(nil))
+	data, err := io.ReadAll(resp.BodyReader(nil))
 	_require.Nil(err)
 	_require.Equal(string(data), blockBlobDefaultData)
 }
@@ -1709,7 +1709,7 @@ func (s *azblobTestSuite) TestBlobDownloadDataEmptyRangeStruct() {
 	resp, err := bbClient.Download(ctx, &options)
 	_require.Nil(err)
 
-	data, err := ioutil.ReadAll(resp.BodyReader(nil))
+	data, err := io.ReadAll(resp.BodyReader(nil))
 	_require.Nil(err)
 	_require.Equal(string(data), blockBlobDefaultData)
 }
@@ -3246,7 +3246,7 @@ func (s *azblobTestSuite) TestBlobSetMetadataIfNoneMatchFalse() {
 	validateBlobErrorCode(_require, err, bloberror.ConditionNotMet)
 }
 
-//nolint
+// nolint
 func testBlobServiceClientDeleteImpl(_ *require.Assertions, _ *service.Client) error {
 	//containerClient := createNewContainer(_require, "gocblobserviceclientdeleteimpl", svcClient)
 	//defer deleteContainer(_require, containerClient)
@@ -3432,14 +3432,14 @@ func (s *azblobTestSuite) TestBlobClientPartsSASQueryTimes() {
 //	// Verify that we can inject errors first.
 //	reader := resp.Body(InjectErrorInRetryReaderOptions(errors.New("unrecoverable error")))
 //
-//	_, err = ioutil.ReadAll(reader)
+//	_, err = io.ReadAll(reader)
 //	_require.NotNil(err)
 //	_require.Equal(err.Error(), "unrecoverable error")
 //
 //	// Then inject the retryable error.
 //	reader = resp.Body(InjectErrorInRetryReaderOptions(io.ErrUnexpectedEOF))
 //
-//	buf, err := ioutil.ReadAll(reader)
+//	buf, err := io.ReadAll(reader)
 //	_require.Nil(err)
 //	_require.EqualValues(buf, []byte(blockBlobDefaultData))
 //}

diff --git a/sdk/storage/azblob/zt_blob_tags_test.go b/sdk/storage/azblob/zt_blob_tags_test.go
@@ -15,11 +15,11 @@ import (
 	"github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/container"
 	"github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/pageblob"
 	"github.com/stretchr/testify/require"
-	"io/ioutil"
+	"io"
 	"strings"
 )
 
-//nolint
+// nolint
 func (s *azblobUnrecordedTestSuite) TestSetBlobTags() {
 	_require := require.New(s.T())
 	testName := s.T().Name()
@@ -60,7 +60,7 @@ func (s *azblobUnrecordedTestSuite) TestSetBlobTags() {
 	}
 }
 
-//nolint
+// nolint
 func (s *azblobUnrecordedTestSuite) TestSetBlobTagsWithVID() {
 	_require := require.New(s.T())
 	testName := s.T().Name()
@@ -117,7 +117,7 @@ func (s *azblobUnrecordedTestSuite) TestSetBlobTagsWithVID() {
 	_require.Nil(blobGetTagsResponse.BlobTagSet)
 }
 
-//nolint
+// nolint
 func (s *azblobUnrecordedTestSuite) TestUploadBlockBlobWithSpecialCharactersInTags() {
 	_require := require.New(s.T())
 	testName := s.T().Name()
@@ -157,7 +157,7 @@ func (s *azblobUnrecordedTestSuite) TestUploadBlockBlobWithSpecialCharactersInTa
 	}
 }
 
-//nolint
+// nolint
 func (s *azblobUnrecordedTestSuite) TestStageBlockWithTags() {
 	_require := require.New(s.T())
 	testName := s.T().Name()
@@ -200,7 +200,7 @@ func (s *azblobUnrecordedTestSuite) TestStageBlockWithTags() {
 
 	contentResp, err := bbClient.Download(ctx, nil)
 	_require.Nil(err)
-	contentData, err := ioutil.ReadAll(contentResp.BodyReader(nil))
+	contentData, err := io.ReadAll(contentResp.BodyReader(nil))
 	_require.Nil(err)
 	_require.EqualValues(contentData, []uint8(strings.Join(data, "")))
 
@@ -329,7 +329,7 @@ func (s *azblobUnrecordedTestSuite) TestStageBlockWithTags() {
 //
 //	downloadResp, err := destBlob.Download(ctx, nil)
 //	_require.Nil(err)
-//	destData, err := ioutil.ReadAll(downloadResp.BodyReader(nil))
+//	destData, err := io.ReadAll(downloadResp.BodyReader(nil))
 //	_require.Nil(err)
 //	_require.EqualValues(destData, sourceData)
 //}
@@ -402,7 +402,7 @@ func (s *azblobUnrecordedTestSuite) TestStageBlockWithTags() {
 //
 //	downloadResp, err := destBlob.Download(ctx, nil)
 //	_require.Nil(err)
-//	destData, err := ioutil.ReadAll(downloadresp.BodyReader(nil))
+//	destData, err := io.ReadAll(downloadresp.BodyReader(nil))
 //	_require.Nil(err)
 //	_require.EqualValues(destData, sourceData)
 //	_require.Equal(*downloadResp.TagCount, int64(1))
@@ -423,7 +423,7 @@ func (s *azblobUnrecordedTestSuite) TestStageBlockWithTags() {
 //	// _require.Equal(resp.RawResponse.StatusCode, 202)
 //}
 
-//nolint
+// nolint
 func (s *azblobUnrecordedTestSuite) TestGetPropertiesReturnsTagsCount() {
 	_require := require.New(s.T())
 	testName := s.T().Name()
@@ -455,7 +455,7 @@ func (s *azblobUnrecordedTestSuite) TestGetPropertiesReturnsTagsCount() {
 	_require.Equal(*downloadResp.TagCount, int64(3))
 }
 
-//nolint
+// nolint
 func (s *azblobUnrecordedTestSuite) TestSetBlobTagForSnapshot() {
 	_require := require.New(s.T())
 	testName := s.T().Name()
@@ -488,7 +488,7 @@ func (s *azblobUnrecordedTestSuite) TestSetBlobTagForSnapshot() {
 }
 
 // TODO: Once new pacer is done.
-//nolint
+// nolint
 func (s *azblobUnrecordedTestSuite) TestListBlobReturnsTags() {
 	_require := require.New(s.T())
 	testName := s.T().Name()
@@ -733,7 +733,7 @@ func (s *azblobUnrecordedTestSuite) TestCreatePageBlobWithTags() {
 	}
 }
 
-//nolint
+// nolint
 func (s *azblobUnrecordedTestSuite) TestPageBlobSetBlobTagForSnapshot() {
 	_require := require.New(s.T())
 	testName := s.T().Name()
@@ -769,7 +769,7 @@ func (s *azblobUnrecordedTestSuite) TestPageBlobSetBlobTagForSnapshot() {
 	}
 }
 
-//nolint
+// nolint
 func (s *azblobUnrecordedTestSuite) TestCreateAppendBlobWithTags() {
 	_require := require.New(s.T())
 	testName := s.T().Name()