Update autorest version to Preview.45 (Azure#19834)

* updating autorest version

* updating clients/models with updated metadata and ors

* updating structs in container

* updating changelog.md

* Updating tests and recordings

* updating sas example

* updating service tests

* updating azblob examples

* Fixing test

* fixing test

Author: siminsavani-msft

sdk/storage/azblob/CHANGELOG.md

@@ -12,6 +12,7 @@
 
 ### Bugs Fixed
 * Fixed encoding issues seen in FilterBlobs. Fixes [#17421](https://github.com/Azure/azure-sdk-for-go/issues/17421).
+* Fixing inconsistency seen with Metadata and ORS response. Fixes [#19688](https://github.com/Azure/azure-sdk-for-go/issues/19688).
 
 ### Other Changes
 

sdk/storage/azblob/appendblob/client.go

@@ -290,7 +290,7 @@ func (ab *Client) SetHTTPHeaders(ctx context.Context, HTTPHeaders blob.HTTPHeade
 
 // SetMetadata changes a blob's metadata.
 // https://docs.microsoft.com/rest/api/storageservices/set-blob-metadata.
-func (ab *Client) SetMetadata(ctx context.Context, metadata map[string]string, o *blob.SetMetadataOptions) (blob.SetMetadataResponse, error) {
+func (ab *Client) SetMetadata(ctx context.Context, metadata map[string]*string, o *blob.SetMetadataOptions) (blob.SetMetadataResponse, error) {
 	return ab.BlobClient().SetMetadata(ctx, metadata, o)
 }
 

sdk/storage/azblob/appendblob/client_test.go

@@ -444,7 +444,7 @@ func (s *AppendBlobRecordedTestsSuite) TestBlobCreateAppendMetadataEmpty() {
 	abClient := getAppendBlobClient(abName, containerClient)
 
 	createAppendBlobOptions := appendblob.CreateOptions{
-		Metadata: map[string]string{},
+		Metadata: map[string]*string{},
 	}
 	_, err = abClient.Create(context.Background(), &createAppendBlobOptions)
 	_require.Nil(err)
@@ -468,7 +468,7 @@ func (s *AppendBlobRecordedTestsSuite) TestBlobCreateAppendMetadataInvalid() {
 	abClient := getAppendBlobClient(abName, containerClient)
 
 	createAppendBlobOptions := appendblob.CreateOptions{
-		Metadata: map[string]string{"In valid!": "bar"},
+		Metadata: map[string]*string{"In valid!": to.Ptr("bar")},
 	}
 	_, err = abClient.Create(context.Background(), &createAppendBlobOptions)
 	_require.NotNil(err)
@@ -1610,7 +1610,7 @@ func (s *AppendBlobUnrecordedTestsSuite) TestSetBlobMetadataReturnsVID() {
 	bbName := testcommon.GenerateName(testName)
 	bbClient := testcommon.CreateNewBlockBlob(context.Background(), _require, bbName, containerClient)
 
-	metadata := map[string]string{"test_key_1": "test_value_1", "test_key_2": "2019"}
+	metadata := map[string]*string{"test_key_1": to.Ptr("test_value_1"), "test_key_2": to.Ptr("2019")}
 	resp, err := bbClient.SetMetadata(context.Background(), metadata, nil)
 	_require.Nil(err)
 	_require.NotNil(resp.VersionID)

sdk/storage/azblob/appendblob/models.go

@@ -49,7 +49,7 @@ type CreateOptions struct {
 	// are specified, the destination blob is created with the specified metadata, and metadata is not copied from the source
 	// blob or file. Note that beginning with version 2009-09-19, metadata names must adhere to the naming rules for C# identifiers.
 	// See Naming and Referencing Containers, Blobs, and Metadata for more information.
-	Metadata map[string]string
+	Metadata map[string]*string
 }
 
 func (o *CreateOptions) format() (*generated.AppendBlobClientCreateOptions, *generated.BlobHTTPHeaders, *generated.LeaseAccessConditions, *generated.CpkInfo, *generated.CpkScopeInfo, *generated.ModifiedAccessConditions) {

sdk/storage/azblob/blob/client.go

@@ -176,7 +176,7 @@ func (b *Client) SetHTTPHeaders(ctx context.Context, HTTPHeaders HTTPHeaders, o
 
 // SetMetadata changes a blob's metadata.
 // https://docs.microsoft.com/rest/api/storageservices/set-blob-metadata.
-func (b *Client) SetMetadata(ctx context.Context, metadata map[string]string, o *SetMetadataOptions) (SetMetadataResponse, error) {
+func (b *Client) SetMetadata(ctx context.Context, metadata map[string]*string, o *SetMetadataOptions) (SetMetadataResponse, error) {
 	basics := generated.BlobClientSetMetadataOptions{Metadata: metadata}
 	leaseAccessConditions, cpkInfo, cpkScope, modifiedAccessConditions := o.format()
 	resp, err := b.generated().SetMetadata(ctx, &basics, leaseAccessConditions, cpkInfo, cpkScope, modifiedAccessConditions)

sdk/storage/azblob/blob/client_test.go

@@ -243,16 +243,15 @@ func (s *BlobRecordedTestsSuite) TestBlobStartCopyMetadata() {
 	anotherBlobName := "copy" + blobName
 	copyBlobClient := testcommon.GetBlockBlobClient(anotherBlobName, containerClient)
 
-	var metadata = map[string]string{"Bla": "foo"}
 	resp, err := copyBlobClient.StartCopyFromURL(context.Background(), bbClient.URL(), &blob.StartCopyFromURLOptions{
-		Metadata: metadata,
+		Metadata: testcommon.BasicMetadata,
 	})
 	_require.Nil(err)
 	waitForCopy(_require, copyBlobClient, resp)
 
 	resp2, err := copyBlobClient.GetProperties(context.Background(), nil)
 	_require.Nil(err)
-	_require.EqualValues(resp2.Metadata, metadata)
+	_require.EqualValues(resp2.Metadata, testcommon.BasicMetadata)
 }
 
 func (s *BlobRecordedTestsSuite) TestBlobStartCopyMetadataNil() {
@@ -305,7 +304,7 @@ func (s *BlobRecordedTestsSuite) TestBlobStartCopyMetadataEmpty() {
 	_, err = copyBlobClient.Upload(context.Background(), streaming.NopCloser(bytes.NewReader([]byte("data"))), nil)
 	_require.Nil(err)
 
-	metadata := make(map[string]string)
+	metadata := make(map[string]*string)
 	options := blob.StartCopyFromURLOptions{
 		Metadata: metadata,
 	}
@@ -335,8 +334,8 @@ func (s *BlobRecordedTestsSuite) TestBlobStartCopyMetadataInvalidField() {
 	anotherBlobName := "copy" + testcommon.GenerateBlobName(testName)
 	copyBlobClient := testcommon.GetBlockBlobClient(anotherBlobName, containerClient)
 
-	metadata := make(map[string]string)
-	metadata["I nvalid."] = "foo"
+	metadata := make(map[string]*string)
+	metadata["I nvalid."] = to.Ptr("foo")
 	options := blob.StartCopyFromURLOptions{
 		Metadata: metadata,
 	}
@@ -924,8 +923,8 @@ func (s *BlobRecordedTestsSuite) TestBlobStartCopyDestIfMatchFalse() {
 			},
 		},
 	}
-	metadata := make(map[string]string)
-	metadata["bla"] = "bla"
+	metadata := make(map[string]*string)
+	metadata["bla"] = to.Ptr("bla")
 	_, err = destBlobClient.SetMetadata(context.Background(), metadata, nil)
 	_require.Nil(err)
 
@@ -1167,7 +1166,7 @@ func (s *BlobRecordedTestsSuite) TestBlobSnapshotMetadataInvalid() {
 	bbClient := testcommon.CreateNewBlockBlob(context.Background(), _require, blockBlobName, containerClient)
 
 	createBlobSnapshotOptions := blob.CreateSnapshotOptions{
-		Metadata: map[string]string{"Invalid Field!": "value"},
+		Metadata: map[string]*string{"Invalid Field!": to.Ptr("value")},
 	}
 	_, err = bbClient.CreateSnapshot(context.Background(), &createBlobSnapshotOptions)
 	_require.NotNil(err)
@@ -2729,7 +2728,7 @@ func (s *BlobRecordedTestsSuite) TestBlobSetMetadataNil() {
 	blockBlobName := testcommon.GenerateBlobName(testName)
 	bbClient := testcommon.CreateNewBlockBlob(context.Background(), _require, blockBlobName, containerClient)
 
-	_, err = bbClient.SetMetadata(context.Background(), map[string]string{"not": "nil"}, nil)
+	_, err = bbClient.SetMetadata(context.Background(), map[string]*string{"not": to.Ptr("nil")}, nil)
 	_require.Nil(err)
 
 	_, err = bbClient.SetMetadata(context.Background(), nil, nil)
@@ -2753,10 +2752,10 @@ func (s *BlobRecordedTestsSuite) TestBlobSetMetadataEmpty() {
 	blockBlobName := testcommon.GenerateBlobName(testName)
 	bbClient := testcommon.CreateNewBlockBlob(context.Background(), _require, blockBlobName, containerClient)
 
-	_, err = bbClient.SetMetadata(context.Background(), map[string]string{"not": "nil"}, nil)
+	_, err = bbClient.SetMetadata(context.Background(), map[string]*string{"not": to.Ptr("nil")}, nil)
 	_require.Nil(err)
 
-	_, err = bbClient.SetMetadata(context.Background(), map[string]string{}, nil)
+	_, err = bbClient.SetMetadata(context.Background(), map[string]*string{}, nil)
 	_require.Nil(err)
 
 	resp, err := bbClient.GetProperties(context.Background(), nil)
@@ -2777,7 +2776,7 @@ func (s *BlobRecordedTestsSuite) TestBlobSetMetadataInvalidField() {
 	blockBlobName := testcommon.GenerateBlobName(testName)
 	bbClient := testcommon.CreateNewBlockBlob(context.Background(), _require, blockBlobName, containerClient)
 
-	_, err = bbClient.SetMetadata(context.Background(), map[string]string{"Invalid field!": "value"}, nil)
+	_, err = bbClient.SetMetadata(context.Background(), map[string]*string{"Invalid field!": to.Ptr("value")}, nil)
 	_require.NotNil(err)
 	_require.Contains(err.Error(), testcommon.InvalidHeaderErrorSubstring)
 	//_require.Equal(strings.Contains(err.Error(), testcommon.InvalidHeaderErrorSubstring), true)

sdk/storage/azblob/blob/examples_test.go

@@ -86,7 +86,7 @@ func Example_blob_Client_SetMetadata() {
 	_, err = blobClient.Upload(
 		context.TODO(),
 		streaming.NopCloser(strings.NewReader("Some text")),
-		&blockblob.UploadOptions{Metadata: map[string]string{"author": "Jeffrey", "app": creatingApp}},
+		&blockblob.UploadOptions{Metadata: map[string]*string{"author": to.Ptr("Jeffrey"), "app": to.Ptr(creatingApp)}},
 	)
 	handleError(err)
 
@@ -103,11 +103,11 @@ func Example_blob_Client_SetMetadata() {
 	}
 
 	for k, v := range get.Metadata {
-		fmt.Print(k + "=" + v + "\n")
+		fmt.Print(k + "=" + *v + "\n")
 	}
 
 	// Update the blob's metadata and write it back to the blob
-	get.Metadata["editor"] = "Grant"
+	get.Metadata["editor"] = to.Ptr("Grant")
 	_, err = blobClient.SetMetadata(context.TODO(), get.Metadata, nil)
 	handleError(err)
 }

sdk/storage/azblob/blob/models.go

@@ -305,7 +305,7 @@ func (o *SetMetadataOptions) format() (*generated.LeaseAccessConditions, *CpkInf
 
 // CreateSnapshotOptions contains the optional parameters for the Client.CreateSnapshot method.
 type CreateSnapshotOptions struct {
-	Metadata         map[string]string
+	Metadata         map[string]*string
 	AccessConditions *AccessConditions
 	CpkInfo          *CpkInfo
 	CpkScopeInfo     *CpkScopeInfo
@@ -341,7 +341,7 @@ type StartCopyFromURLOptions struct {
 	// are specified, the destination blob is created with the specified metadata, and metadata is not copied from the source
 	// blob or file. Note that beginning with version 2009-09-19, metadata names must adhere to the naming rules for C# identifiers.
 	// See Naming and Referencing Containers, Blobs, and Metadata for more information.
-	Metadata map[string]string
+	Metadata map[string]*string
 	// Optional: Indicates the priority with which to rehydrate an archived blob.
 	RehydratePriority *RehydratePriority
 	// Overrides the sealed state of the destination blob. Service version 2019-12-12 and newer.
@@ -531,7 +531,7 @@ type CopyFromURLOptions struct {
 	// is not copied from the source blob or file. Note that beginning with
 	// version 2009-09-19, metadata names must adhere to the naming rules for C# identifiers. See Naming and Referencing Containers,
 	// Blobs, and Metadata for more information.
-	Metadata map[string]string
+	Metadata map[string]*string
 	// Specify the md5 calculated for the range of bytes that must be read from the copy source.
 	SourceContentMD5 []byte
 	// Optional. Indicates the tier to be set on the blob.

sdk/storage/azblob/blob/utils.go

@@ -25,14 +25,14 @@ type ObjectReplicationPolicy struct {
 }
 
 // deserializeORSPolicies is utility function to deserialize ORS Policies
-func deserializeORSPolicies(policies map[string]string) (objectReplicationPolicies []ObjectReplicationPolicy) {
+func deserializeORSPolicies(policies map[string]*string) (objectReplicationPolicies []ObjectReplicationPolicy) {
 	if policies == nil {
 		return nil
 	}
 	// For source blobs (blobs that have policy ids and rule ids applied to them),
 	// the header will be formatted as "x-ms-or-<policy_id>_<rule_id>: {Complete, Failed}".
 	// The value of this header is the status of the replication.
-	orPolicyStatusHeader := make(map[string]string)
+	orPolicyStatusHeader := make(map[string]*string)
 	for key, value := range policies {
 		if strings.Contains(key, "or-") && key != "x-ms-or-policy-id" {
 			orPolicyStatusHeader[key] = value
@@ -44,7 +44,7 @@ func deserializeORSPolicies(policies map[string]string) (objectReplicationPolici
 		policyAndRuleIDs := strings.Split(strings.Split(key, "or-")[1], "_")
 		policyId, ruleId := policyAndRuleIDs[0], policyAndRuleIDs[1]
 
-		parsedResult[policyId] = append(parsedResult[policyId], ObjectReplicationRules{RuleId: ruleId, Status: value})
+		parsedResult[policyId] = append(parsedResult[policyId], ObjectReplicationRules{RuleId: ruleId, Status: *value})
 	}
 
 	for policyId, rules := range parsedResult {

sdk/storage/azblob/blob/utils_test.go

@@ -7,20 +7,21 @@
 package blob
 
 import (
+	"github.com/Azure/azure-sdk-for-go/sdk/azcore/to"
 	"testing"
 
 	"github.com/stretchr/testify/require"
 )
 
 func TestDeserializeORSPolicies(t *testing.T) {
 
-	headers := map[string]string{
-		"x-ms-or-111_111":   "Completed",
-		"x-ms-or-111_222":   "Failed",
-		"x-ms-or-222_111":   "Completed",
-		"x-ms-or-222_222":   "Failed",
-		"x-ms-or-policy-id": "333",     // to be ignored
-		"x-ms-not-related":  "garbage", // to be ignored
+	headers := map[string]*string{
+		"x-ms-or-111_111":   to.Ptr("Completed"),
+		"x-ms-or-111_222":   to.Ptr("Failed"),
+		"x-ms-or-222_111":   to.Ptr("Completed"),
+		"x-ms-or-222_222":   to.Ptr("Failed"),
+		"x-ms-or-policy-id": to.Ptr("333"),     // to be ignored
+		"x-ms-not-related":  to.Ptr("garbage"), // to be ignored
 	}
 
 	result := deserializeORSPolicies(headers)