Regenerating AzBlob to STG 85/86 (#20724)

* Regenerating azblob to stg 85/86

* Updating CopyFromURL

* minor change

* minor fixes

* undo some minor fixes

* Updating Go code generator

* Fixing calls to pipeline

* Adding custom UnmarshalXML for BlobItem and BlobPrefix

* Updating constructor method for AppendBlobClient

* Updating Client constructors

* Undoing minor fixes to blob examples

* Fixing authpolicy

* Updating azcore version

* Fixing client strings

* Const for service client

* Minor fix

* fixing go mod files

* Shared constants client name

* Addressing comments

sdk/storage/azblob/appendblob/client.go

@@ -9,6 +9,7 @@ package appendblob
 import (
  "context"
  "errors"
+ "github.com/Azure/azure-sdk-for-go/sdk/azcore/policy"
  "io"
  "os"
  "time"
@@ -35,12 +36,14 @@ type Client base.CompositeClient[generated.BlobClient, generated.AppendBlobClien
 func NewClient(blobURL string, cred azcore.TokenCredential, options *ClientOptions) (*Client, error) {
  authPolicy := shared.NewStorageChallengePolicy(cred)
  conOptions := shared.GetClientOptions(options)
- conOptions.PerRetryPolicies = append(conOptions.PerRetryPolicies, authPolicy)
- pl := runtime.NewPipeline(exported.ModuleName,
- exported.ModuleVersion, runtime.PipelineOptions{},
- &conOptions.ClientOptions)
+ plOpts := runtime.PipelineOptions{PerRetry: []policy.Policy{authPolicy}}
 
- return (*Client)(base.NewAppendBlobClient(blobURL, pl, nil)), nil
+ azClient, err := azcore.NewClient(shared.AppendBlobClient, exported.ModuleVersion, plOpts, &conOptions.ClientOptions)
+ if err != nil {
+ return nil, err
+ }
+
+ return (*Client)(base.NewAppendBlobClient(blobURL, azClient, nil)), nil
 }
 
 // NewClientWithNoCredential creates an instance of Client with the specified values.
@@ -49,12 +52,13 @@ func NewClient(blobURL string, cred azcore.TokenCredential, options *ClientOptio
 // - options - client options; pass nil to accept the default values
 func NewClientWithNoCredential(blobURL string, options *ClientOptions) (*Client, error) {
  conOptions := shared.GetClientOptions(options)
- pl := runtime.NewPipeline(exported.ModuleName,
- exported.ModuleVersion,
- runtime.PipelineOptions{},
- &conOptions.ClientOptions)
 
- return (*Client)(base.NewAppendBlobClient(blobURL, pl, nil)), nil
+ azClient, err := azcore.NewClient(shared.AppendBlobClient, exported.ModuleVersion, runtime.PipelineOptions{}, &conOptions.ClientOptions)
+ if err != nil {
+ return nil, err
+ }
+
+ return (*Client)(base.NewAppendBlobClient(blobURL, azClient, nil)), nil
 }
 
 // NewClientWithSharedKeyCredential creates an instance of Client with the specified values.
@@ -64,13 +68,14 @@ func NewClientWithNoCredential(blobURL string, options *ClientOptions) (*Client,
 func NewClientWithSharedKeyCredential(blobURL string, cred *blob.SharedKeyCredential, options *ClientOptions) (*Client, error) {
  authPolicy := exported.NewSharedKeyCredPolicy(cred)
  conOptions := shared.GetClientOptions(options)
- conOptions.PerRetryPolicies = append(conOptions.PerRetryPolicies, authPolicy)
- pl := runtime.NewPipeline(exported.ModuleName,
- exported.ModuleVersion,
- runtime.PipelineOptions{},
- &conOptions.ClientOptions)
+ plOpts := runtime.PipelineOptions{PerRetry: []policy.Policy{authPolicy}}
+
+ azClient, err := azcore.NewClient(shared.AppendBlobClient, exported.ModuleVersion, plOpts, &conOptions.ClientOptions)
+ if err != nil {
+ return nil, err
+ }
 
- return (*Client)(base.NewAppendBlobClient(blobURL, pl, cred)), nil
+ return (*Client)(base.NewAppendBlobClient(blobURL, azClient, cred)), nil
 }
 
 // NewClientFromConnectionString creates an instance of Client with the specified values.
@@ -130,7 +135,7 @@ func (ab *Client) WithSnapshot(snapshot string) (*Client, error) {
  }
  p.Snapshot = snapshot
 
- return (*Client)(base.NewAppendBlobClient(p.String(), ab.generated().Pipeline(), ab.sharedKey())), nil
+ return (*Client)(base.NewAppendBlobClient(p.String(), ab.generated().InternalClient(), ab.sharedKey())), nil
 }
 
 // WithVersionID creates a new AppendBlobURL object identical to the source but with the specified version id.
@@ -142,7 +147,7 @@ func (ab *Client) WithVersionID(versionID string) (*Client, error) {
  }
  p.VersionID = versionID
 
- return (*Client)(base.NewAppendBlobClient(p.String(), ab.generated().Pipeline(), ab.sharedKey())), nil
+ return (*Client)(base.NewAppendBlobClient(p.String(), ab.generated().InternalClient(), ab.sharedKey())), nil
 }
 
 // Create creates a 0-size append blob. Call AppendBlock to append data to an append blob.

sdk/storage/azblob/blob/client.go

@@ -8,6 +8,7 @@ package blob
 
 import (
  "context"
+ "github.com/Azure/azure-sdk-for-go/sdk/azcore/policy"
  "github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/bloberror"
  "io"
  "os"
@@ -37,10 +38,13 @@ type Client base.Client[generated.BlobClient]
 func NewClient(blobURL string, cred azcore.TokenCredential, options *ClientOptions) (*Client, error) {
  authPolicy := shared.NewStorageChallengePolicy(cred)
  conOptions := shared.GetClientOptions(options)
- conOptions.PerRetryPolicies = append(conOptions.PerRetryPolicies, authPolicy)
- pl := runtime.NewPipeline(exported.ModuleName, exported.ModuleVersion, runtime.PipelineOptions{}, &conOptions.ClientOptions)
+ plOpts := runtime.PipelineOptions{PerRetry: []policy.Policy{authPolicy}}
 
- return (*Client)(base.NewBlobClient(blobURL, pl, &cred)), nil
+ azClient, err := azcore.NewClient(shared.BlobClient, exported.ModuleVersion, plOpts, &conOptions.ClientOptions)
+ if err != nil {
+ return nil, err
+ }
+ return (*Client)(base.NewBlobClient(blobURL, azClient, &cred)), nil
 }
 
 // NewClientWithNoCredential creates an instance of Client with the specified values.
@@ -49,9 +53,12 @@ func NewClient(blobURL string, cred azcore.TokenCredential, options *ClientOptio
 // - options - client options; pass nil to accept the default values
 func NewClientWithNoCredential(blobURL string, options *ClientOptions) (*Client, error) {
  conOptions := shared.GetClientOptions(options)
- pl := runtime.NewPipeline(exported.ModuleName, exported.ModuleVersion, runtime.PipelineOptions{}, &conOptions.ClientOptions)
 
- return (*Client)(base.NewBlobClient(blobURL, pl, nil)), nil
+ azClient, err := azcore.NewClient(shared.BlobClient, exported.ModuleVersion, runtime.PipelineOptions{}, &conOptions.ClientOptions)
+ if err != nil {
+ return nil, err
+ }
+ return (*Client)(base.NewBlobClient(blobURL, azClient, nil)), nil
 }
 
 // NewClientWithSharedKeyCredential creates an instance of Client with the specified values.
@@ -61,10 +68,13 @@ func NewClientWithNoCredential(blobURL string, options *ClientOptions) (*Client,
 func NewClientWithSharedKeyCredential(blobURL string, cred *SharedKeyCredential, options *ClientOptions) (*Client, error) {
  authPolicy := exported.NewSharedKeyCredPolicy(cred)
  conOptions := shared.GetClientOptions(options)
- conOptions.PerRetryPolicies = append(conOptions.PerRetryPolicies, authPolicy)
- pl := runtime.NewPipeline(exported.ModuleName, exported.ModuleVersion, runtime.PipelineOptions{}, &conOptions.ClientOptions)
+ plOpts := runtime.PipelineOptions{PerRetry: []policy.Policy{authPolicy}}
 
- return (*Client)(base.NewBlobClient(blobURL, pl, cred)), nil
+ azClient, err := azcore.NewClient(shared.BlobClient, exported.ModuleVersion, plOpts, &conOptions.ClientOptions)
+ if err != nil {
+ return nil, err
+ }
+ return (*Client)(base.NewBlobClient(blobURL, azClient, cred)), nil
 }
 
 // NewClientFromConnectionString creates an instance of Client with the specified values.
@@ -116,7 +126,7 @@ func (b *Client) WithSnapshot(snapshot string) (*Client, error) {
  }
  p.Snapshot = snapshot
 
- return (*Client)(base.NewBlobClient(p.String(), b.generated().Pipeline(), b.credential())), nil
+ return (*Client)(base.NewBlobClient(p.String(), b.generated().InternalClient(), b.credential())), nil
 }
 
 // WithVersionID creates a new AppendBlobURL object identical to the source but with the specified version id.
@@ -128,7 +138,7 @@ func (b *Client) WithVersionID(versionID string) (*Client, error) {
  }
  p.VersionID = versionID
 
- return (*Client)(base.NewBlobClient(p.String(), b.generated().Pipeline(), b.credential())), nil
+ return (*Client)(base.NewBlobClient(p.String(), b.generated().InternalClient(), b.credential())), nil
 }
 
 // Delete marks the specified blob or snapshot for deletion. The blob is later deleted during garbage collection.
@@ -261,8 +271,8 @@ func (b *Client) SetLegalHold(ctx context.Context, legalHold bool, options *SetL
 // CopyFromURL synchronously copies the data at the source URL to a block blob, with sizes up to 256 MB.
 // For more information, see https://docs.microsoft.com/en-us/rest/api/storageservices/copy-blob-from-url.
 func (b *Client) CopyFromURL(ctx context.Context, copySource string, options *CopyFromURLOptions) (CopyFromURLResponse, error) {
- copyOptions, smac, mac, lac := options.format()
- resp, err := b.generated().CopyFromURL(ctx, copySource, copyOptions, smac, mac, lac)
+ copyOptions, smac, mac, lac, cpkScopeInfo := options.format()
+ resp, err := b.generated().CopyFromURL(ctx, copySource, copyOptions, smac, mac, lac, cpkScopeInfo)
  return resp, err
 }
 

sdk/storage/azblob/blob/models.go

@@ -544,11 +544,13 @@ type CopyFromURLOptions struct {
  SourceModifiedAccessConditions *SourceModifiedAccessConditions
 
  BlobAccessConditions *AccessConditions
+
+ CPKScopeInfo *CPKScopeInfo
 }
 
-func (o *CopyFromURLOptions) format() (*generated.BlobClientCopyFromURLOptions, *generated.SourceModifiedAccessConditions, *generated.ModifiedAccessConditions, *generated.LeaseAccessConditions) {
+func (o *CopyFromURLOptions) format() (*generated.BlobClientCopyFromURLOptions, *generated.SourceModifiedAccessConditions, *generated.ModifiedAccessConditions, *generated.LeaseAccessConditions, *generated.CPKScopeInfo) {
  if o == nil {
- return nil, nil, nil, nil
+ return nil, nil, nil, nil, nil
  }
 
  options := &generated.BlobClientCopyFromURLOptions{
@@ -563,7 +565,7 @@ func (o *CopyFromURLOptions) format() (*generated.BlobClientCopyFromURLOptions,
  }
 
  leaseAccessConditions, modifiedAccessConditions := exported.FormatBlobAccessConditions(o.BlobAccessConditions)
- return options, o.SourceModifiedAccessConditions, modifiedAccessConditions, leaseAccessConditions
+ return options, o.SourceModifiedAccessConditions, modifiedAccessConditions, leaseAccessConditions, o.CPKScopeInfo
 }
 
 // ---------------------------------------------------------------------------------------------------------------------

sdk/storage/azblob/blockblob/client.go

@@ -11,6 +11,7 @@ import (
  "context"
  "encoding/base64"
  "errors"
+ "github.com/Azure/azure-sdk-for-go/sdk/azcore/policy"
  "io"
  "math"
  "os"
@@ -43,10 +44,13 @@ type Client base.CompositeClient[generated.BlobClient, generated.BlockBlobClient
 func NewClient(blobURL string, cred azcore.TokenCredential, options *ClientOptions) (*Client, error) {
  authPolicy := shared.NewStorageChallengePolicy(cred)
  conOptions := shared.GetClientOptions(options)
- conOptions.PerRetryPolicies = append(conOptions.PerRetryPolicies, authPolicy)
- pl := runtime.NewPipeline(exported.ModuleName, exported.ModuleVersion, runtime.PipelineOptions{}, &conOptions.ClientOptions)
+ plOpts := runtime.PipelineOptions{PerRetry: []policy.Policy{authPolicy}}
 
- return (*Client)(base.NewBlockBlobClient(blobURL, pl, nil)), nil
+ azClient, err := azcore.NewClient(shared.BlockBlobClient, exported.ModuleVersion, plOpts, &conOptions.ClientOptions)
+ if err != nil {
+ return nil, err
+ }
+ return (*Client)(base.NewBlockBlobClient(blobURL, azClient, nil)), nil
 }
 
 // NewClientWithNoCredential creates an instance of Client with the specified values.
@@ -55,9 +59,13 @@ func NewClient(blobURL string, cred azcore.TokenCredential, options *ClientOptio
 // - options - client options; pass nil to accept the default values
 func NewClientWithNoCredential(blobURL string, options *ClientOptions) (*Client, error) {
  conOptions := shared.GetClientOptions(options)
- pl := runtime.NewPipeline(exported.ModuleName, exported.ModuleVersion, runtime.PipelineOptions{}, &conOptions.ClientOptions)
 
- return (*Client)(base.NewBlockBlobClient(blobURL, pl, nil)), nil
+ azClient, err := azcore.NewClient(shared.BlockBlobClient, exported.ModuleVersion, runtime.PipelineOptions{}, &conOptions.ClientOptions)
+ if err != nil {
+ return nil, err
+ }
+
+ return (*Client)(base.NewBlockBlobClient(blobURL, azClient, nil)), nil
 }
 
 // NewClientWithSharedKeyCredential creates an instance of Client with the specified values.
@@ -67,10 +75,14 @@ func NewClientWithNoCredential(blobURL string, options *ClientOptions) (*Client,
 func NewClientWithSharedKeyCredential(blobURL string, cred *blob.SharedKeyCredential, options *ClientOptions) (*Client, error) {
  authPolicy := exported.NewSharedKeyCredPolicy(cred)
  conOptions := shared.GetClientOptions(options)
- conOptions.PerRetryPolicies = append(conOptions.PerRetryPolicies, authPolicy)
- pl := runtime.NewPipeline(exported.ModuleName, exported.ModuleVersion, runtime.PipelineOptions{}, &conOptions.ClientOptions)
+ plOpts := runtime.PipelineOptions{PerRetry: []policy.Policy{authPolicy}}
+
+ azClient, err := azcore.NewClient(shared.BlockBlobClient, exported.ModuleVersion, plOpts, &conOptions.ClientOptions)
+ if err != nil {
+ return nil, err
+ }
 
- return (*Client)(base.NewBlockBlobClient(blobURL, pl, cred)), nil
+ return (*Client)(base.NewBlockBlobClient(blobURL, azClient, cred)), nil
 }
 
 // NewClientFromConnectionString creates an instance of Client with the specified values.
@@ -130,7 +142,7 @@ func (bb *Client) WithSnapshot(snapshot string) (*Client, error) {
  }
  p.Snapshot = snapshot
 
- return (*Client)(base.NewBlockBlobClient(p.String(), bb.generated().Pipeline(), bb.sharedKey())), nil
+ return (*Client)(base.NewBlockBlobClient(p.String(), bb.generated().Internal(), bb.sharedKey())), nil
 }
 
 // WithVersionID creates a new AppendBlobURL object identical to the source but with the specified version id.
@@ -142,7 +154,7 @@ func (bb *Client) WithVersionID(versionID string) (*Client, error) {
  }
  p.VersionID = versionID
 
- return (*Client)(base.NewBlockBlobClient(p.String(), bb.generated().Pipeline(), bb.sharedKey())), nil
+ return (*Client)(base.NewBlockBlobClient(p.String(), bb.generated().Internal(), bb.sharedKey())), nil
 }
 
 // Upload creates a new block blob or overwrites an existing block blob.

sdk/storage/azblob/container/client.go

@@ -44,10 +44,13 @@ type Client base.Client[generated.ContainerClient]
 func NewClient(containerURL string, cred azcore.TokenCredential, options *ClientOptions) (*Client, error) {
  authPolicy := shared.NewStorageChallengePolicy(cred)
  conOptions := shared.GetClientOptions(options)
- conOptions.PerRetryPolicies = append(conOptions.PerRetryPolicies, authPolicy)
- pl := runtime.NewPipeline(exported.ModuleName, exported.ModuleVersion, runtime.PipelineOptions{}, &conOptions.ClientOptions)
+ plOpts := runtime.PipelineOptions{PerRetry: []policy.Policy{authPolicy}}
 
- return (*Client)(base.NewContainerClient(containerURL, pl, &cred)), nil
+ azClient, err := azcore.NewClient(shared.ContainerClient, exported.ModuleVersion, plOpts, &conOptions.ClientOptions)
+ if err != nil {
+ return nil, err
+ }
+ return (*Client)(base.NewContainerClient(containerURL, azClient, &cred)), nil
 }
 
 // NewClientWithNoCredential creates an instance of Client with the specified values.
@@ -56,9 +59,12 @@ func NewClient(containerURL string, cred azcore.TokenCredential, options *Client
 // - options - client options; pass nil to accept the default values
 func NewClientWithNoCredential(containerURL string, options *ClientOptions) (*Client, error) {
  conOptions := shared.GetClientOptions(options)
- pl := runtime.NewPipeline(exported.ModuleName, exported.ModuleVersion, runtime.PipelineOptions{}, &conOptions.ClientOptions)
 
- return (*Client)(base.NewContainerClient(containerURL, pl, nil)), nil
+ azClient, err := azcore.NewClient(shared.ContainerClient, exported.ModuleVersion, runtime.PipelineOptions{}, &conOptions.ClientOptions)
+ if err != nil {
+ return nil, err
+ }
+ return (*Client)(base.NewContainerClient(containerURL, azClient, nil)), nil
 }
 
 // NewClientWithSharedKeyCredential creates an instance of Client with the specified values.
@@ -68,10 +74,13 @@ func NewClientWithNoCredential(containerURL string, options *ClientOptions) (*Cl
 func NewClientWithSharedKeyCredential(containerURL string, cred *SharedKeyCredential, options *ClientOptions) (*Client, error) {
  authPolicy := exported.NewSharedKeyCredPolicy(cred)
  conOptions := shared.GetClientOptions(options)
- conOptions.PerRetryPolicies = append(conOptions.PerRetryPolicies, authPolicy)
- pl := runtime.NewPipeline(exported.ModuleName, exported.ModuleVersion, runtime.PipelineOptions{}, &conOptions.ClientOptions)
+ plOpts := runtime.PipelineOptions{PerRetry: []policy.Policy{authPolicy}}
 
- return (*Client)(base.NewContainerClient(containerURL, pl, cred)), nil
+ azClient, err := azcore.NewClient(shared.ContainerClient, exported.ModuleVersion, plOpts, &conOptions.ClientOptions)
+ if err != nil {
+ return nil, err
+ }
+ return (*Client)(base.NewContainerClient(containerURL, azClient, cred)), nil
 }
 
 // NewClientFromConnectionString creates an instance of Client with the specified values.
@@ -124,7 +133,7 @@ func (c *Client) URL() string {
 func (c *Client) NewBlobClient(blobName string) *blob.Client {
  blobName = url.PathEscape(blobName)
  blobURL := runtime.JoinPaths(c.URL(), blobName)
- return (*blob.Client)(base.NewBlobClient(blobURL, c.generated().Pipeline(), c.credential()))
+ return (*blob.Client)(base.NewBlobClient(blobURL, c.generated().InternalClient(), c.credential()))
 }
 
 // NewAppendBlobClient creates a new appendblob.Client object by concatenating blobName to the end of
@@ -133,7 +142,7 @@ func (c *Client) NewBlobClient(blobName string) *blob.Client {
 func (c *Client) NewAppendBlobClient(blobName string) *appendblob.Client {
  blobName = url.PathEscape(blobName)
  blobURL := runtime.JoinPaths(c.URL(), blobName)
- return (*appendblob.Client)(base.NewAppendBlobClient(blobURL, c.generated().Pipeline(), c.sharedKey()))
+ return (*appendblob.Client)(base.NewAppendBlobClient(blobURL, c.generated().InternalClient(), c.sharedKey()))
 }
 
 // NewBlockBlobClient creates a new blockblob.Client object by concatenating blobName to the end of
@@ -142,7 +151,7 @@ func (c *Client) NewAppendBlobClient(blobName string) *appendblob.Client {
 func (c *Client) NewBlockBlobClient(blobName string) *blockblob.Client {
  blobName = url.PathEscape(blobName)
  blobURL := runtime.JoinPaths(c.URL(), blobName)
- return (*blockblob.Client)(base.NewBlockBlobClient(blobURL, c.generated().Pipeline(), c.sharedKey()))
+ return (*blockblob.Client)(base.NewBlockBlobClient(blobURL, c.generated().InternalClient(), c.sharedKey()))
 }
 
 // NewPageBlobClient creates a new pageblob.Client object by concatenating blobName to the end of
@@ -151,7 +160,7 @@ func (c *Client) NewBlockBlobClient(blobName string) *blockblob.Client {
 func (c *Client) NewPageBlobClient(blobName string) *pageblob.Client {
  blobName = url.PathEscape(blobName)
  blobURL := runtime.JoinPaths(c.URL(), blobName)
- return (*pageblob.Client)(base.NewPageBlobClient(blobURL, c.generated().Pipeline(), c.sharedKey()))
+ return (*pageblob.Client)(base.NewPageBlobClient(blobURL, c.generated().InternalClient(), c.sharedKey()))
 }
 
 // Create creates a new container within a storage account. If a container with the same name already exists, the operation fails.
@@ -272,7 +281,7 @@ func (c *Client) NewListBlobsFlatPager(o *ListBlobsFlatOptions) *runtime.Pager[L
  if err != nil {
  return ListBlobsFlatResponse{}, err
  }
- resp, err := c.generated().Pipeline().Do(req)
+ resp, err := c.generated().InternalClient().Pipeline().Do(req)
  if err != nil {
  return ListBlobsFlatResponse{}, err
  }
@@ -308,7 +317,7 @@ func (c *Client) NewListBlobsHierarchyPager(delimiter string, o *ListBlobsHierar
  if err != nil {
  return ListBlobsHierarchyResponse{}, err
  }
- resp, err := c.generated().Pipeline().Do(req)
+ resp, err := c.generated().InternalClient().Pipeline().Do(req)
  if err != nil {
  return ListBlobsHierarchyResponse{}, err
  }

sdk/storage/azblob/go.mod

@@ -3,7 +3,7 @@ module github.com/Azure/azure-sdk-for-go/sdk/storage/azblob
 go 1.18
 
 require (
- github.com/Azure/azure-sdk-for-go/sdk/azcore v1.6.0
+ github.com/Azure/azure-sdk-for-go/sdk/azcore v1.6.1
  github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.3.0
  github.com/Azure/azure-sdk-for-go/sdk/internal v1.3.0
  github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/storage/armstorage v1.2.0