Export some missing types (Azure#19659)

* Export some missing types

Consolidated Lease* constants into the lease package.

* renamed BlobItemInternal to BlobItem

* rename BlobPropertiesInternal to BlobProperties

Author: jhendrixMSFT

sdk/storage/azblob/CHANGELOG.md

@@ -14,6 +14,7 @@
 * Corrected the name for `saoid` and `suoid` SAS parameters in `BlobSignatureValues` struct as per [this](https://learn.microsoft.com/rest/api/storageservices/create-user-delegation-sas#construct-a-user-delegation-sas)
 * Updated type of `BlockSize` from int to int64 in `UploadStreamOptions`
 * Field `XMSContentCRC64` has been renamed to `ContentCRC64`
+* The `Lease*` constant types and values in the `blob` and `container` packages have been moved to the `lease` package and their names fixed up to avoid stuttering.
 
 ### Bugs Fixed
 
@@ -24,6 +25,7 @@
 ### Other Changes
 
 * Avoid allocations when storing/fetching a slice via sync.Pool.
+* Added some missing public surface area in the `container` and `service` packages.
 
 ## 0.5.1 (2022-10-11)
 

sdk/storage/azblob/blob/constants.go

@@ -182,45 +182,3 @@ const (
 func PossibleQueryFormatTypeValues() []QueryFormatType {
 	return generated.PossibleQueryFormatTypeValues()
 }
-
-// LeaseDurationType defines values for LeaseDurationType
-type LeaseDurationType = generated.LeaseDurationType
-
-const (
-	LeaseDurationTypeInfinite LeaseDurationType = generated.LeaseDurationTypeInfinite
-	LeaseDurationTypeFixed    LeaseDurationType = generated.LeaseDurationTypeFixed
-)
-
-// PossibleLeaseDurationTypeValues returns the possible values for the LeaseDurationType const type.
-func PossibleLeaseDurationTypeValues() []LeaseDurationType {
-	return generated.PossibleLeaseDurationTypeValues()
-}
-
-// LeaseStateType defines values for LeaseStateType
-type LeaseStateType = generated.LeaseStateType
-
-const (
-	LeaseStateTypeAvailable LeaseStateType = generated.LeaseStateTypeAvailable
-	LeaseStateTypeLeased    LeaseStateType = generated.LeaseStateTypeLeased
-	LeaseStateTypeExpired   LeaseStateType = generated.LeaseStateTypeExpired
-	LeaseStateTypeBreaking  LeaseStateType = generated.LeaseStateTypeBreaking
-	LeaseStateTypeBroken    LeaseStateType = generated.LeaseStateTypeBroken
-)
-
-// PossibleLeaseStateTypeValues returns the possible values for the LeaseStateType const type.
-func PossibleLeaseStateTypeValues() []LeaseStateType {
-	return generated.PossibleLeaseStateTypeValues()
-}
-
-// LeaseStatusType defines values for LeaseStatusType
-type LeaseStatusType = generated.LeaseStatusType
-
-const (
-	LeaseStatusTypeLocked   LeaseStatusType = generated.LeaseStatusTypeLocked
-	LeaseStatusTypeUnlocked LeaseStatusType = generated.LeaseStatusTypeUnlocked
-)
-
-// PossibleLeaseStatusTypeValues returns the possible values for the LeaseStatusType const type.
-func PossibleLeaseStatusTypeValues() []LeaseStatusType {
-	return generated.PossibleLeaseStatusTypeValues()
-}

sdk/storage/azblob/container/constants.go

@@ -8,6 +8,32 @@ package container
 
 import "github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/internal/generated"
 
+// AccessTier defines values for blob access tiers.
+type AccessTier = generated.AccessTier
+
+const (
+	AccessTierArchive AccessTier = generated.AccessTierArchive
+	AccessTierCool    AccessTier = generated.AccessTierCool
+	AccessTierHot     AccessTier = generated.AccessTierHot
+	AccessTierP10     AccessTier = generated.AccessTierP10
+	AccessTierP15     AccessTier = generated.AccessTierP15
+	AccessTierP20     AccessTier = generated.AccessTierP20
+	AccessTierP30     AccessTier = generated.AccessTierP30
+	AccessTierP4      AccessTier = generated.AccessTierP4
+	AccessTierP40     AccessTier = generated.AccessTierP40
+	AccessTierP50     AccessTier = generated.AccessTierP50
+	AccessTierP6      AccessTier = generated.AccessTierP6
+	AccessTierP60     AccessTier = generated.AccessTierP60
+	AccessTierP70     AccessTier = generated.AccessTierP70
+	AccessTierP80     AccessTier = generated.AccessTierP80
+	AccessTierPremium AccessTier = generated.AccessTierPremium
+)
+
+// PossibleAccessTierValues returns the possible values for the AccessTier const type.
+func PossibleAccessTierValues() []AccessTier {
+	return generated.PossibleAccessTierValues()
+}
+
 // PublicAccessType defines values for AccessType - private (default) or blob or container
 type PublicAccessType = generated.PublicAccessType
 
@@ -67,48 +93,6 @@ func PossibleBlobTypeValues() []BlobType {
 	return generated.PossibleBlobTypeValues()
 }
 
-// LeaseStatusType defines values for LeaseStatusType
-type LeaseStatusType = generated.LeaseStatusType
-
-const (
-	LeaseStatusTypeLocked   LeaseStatusType = generated.LeaseStatusTypeLocked
-	LeaseStatusTypeUnlocked LeaseStatusType = generated.LeaseStatusTypeUnlocked
-)
-
-// PossibleLeaseStatusTypeValues returns the possible values for the LeaseStatusType const type.
-func PossibleLeaseStatusTypeValues() []LeaseStatusType {
-	return generated.PossibleLeaseStatusTypeValues()
-}
-
-// LeaseDurationType defines values for LeaseDurationType
-type LeaseDurationType = generated.LeaseDurationType
-
-const (
-	LeaseDurationTypeInfinite LeaseDurationType = generated.LeaseDurationTypeInfinite
-	LeaseDurationTypeFixed    LeaseDurationType = generated.LeaseDurationTypeFixed
-)
-
-// PossibleLeaseDurationTypeValues returns the possible values for the LeaseDurationType const type.
-func PossibleLeaseDurationTypeValues() []LeaseDurationType {
-	return generated.PossibleLeaseDurationTypeValues()
-}
-
-// LeaseStateType defines values for LeaseStateType
-type LeaseStateType = generated.LeaseStateType
-
-const (
-	LeaseStateTypeAvailable LeaseStateType = generated.LeaseStateTypeAvailable
-	LeaseStateTypeLeased    LeaseStateType = generated.LeaseStateTypeLeased
-	LeaseStateTypeExpired   LeaseStateType = generated.LeaseStateTypeExpired
-	LeaseStateTypeBreaking  LeaseStateType = generated.LeaseStateTypeBreaking
-	LeaseStateTypeBroken    LeaseStateType = generated.LeaseStateTypeBroken
-)
-
-// PossibleLeaseStateTypeValues returns the possible values for the LeaseStateType const type.
-func PossibleLeaseStateTypeValues() []LeaseStateType {
-	return generated.PossibleLeaseStateTypeValues()
-}
-
 // ArchiveStatus defines values for ArchiveStatus
 type ArchiveStatus = generated.ArchiveStatus
 

sdk/storage/azblob/container/models.go

@@ -29,10 +29,16 @@ func NewSharedKeyCredential(accountName, accountKey string) (*SharedKeyCredentia
 type CpkScopeInfo = generated.ContainerCpkScopeInfo
 
 // BlobProperties - Properties of a blob
-type BlobProperties = generated.BlobPropertiesInternal
+type BlobProperties = generated.BlobProperties
 
 // BlobItem - An Azure Storage blob
-type BlobItem = generated.BlobItemInternal
+type BlobItem = generated.BlobItem
+
+// BlobPrefix is a blob's prefix when hierarchically listing blobs.
+type BlobPrefix = generated.BlobPrefix
+
+// BlobTag - a key/value pair on a blob
+type BlobTag = generated.BlobTag
 
 // AccessConditions identifies container-specific access conditions which you optionally set.
 type AccessConditions = exported.ContainerAccessConditions

sdk/storage/azblob/internal/generated/autorest.md

@@ -311,3 +311,13 @@ directive:
   transform: >
     $["x-ms-client-name"] = "ContentCRC64"
 ```
+
+``` yaml
+directive:
+- rename-model:
+    from: BlobItemInternal
+    to: BlobItem
+- rename-model:
+    from: BlobPropertiesInternal
+    to: BlobProperties
+```

sdk/storage/azblob/internal/generated/zz_models.go

@@ -0,0 +1,51 @@
+//go:build go1.18
+// +build go1.18
+
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for license information.
+
+package lease
+
+import "github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/internal/generated"
+
+// StatusType defines values for StatusType
+type StatusType = generated.LeaseStatusType
+
+const (
+	StatusTypeLocked   StatusType = generated.LeaseStatusTypeLocked
+	StatusTypeUnlocked StatusType = generated.LeaseStatusTypeUnlocked
+)
+
+// PossibleStatusTypeValues returns the possible values for the StatusType const type.
+func PossibleStatusTypeValues() []StatusType {
+	return generated.PossibleLeaseStatusTypeValues()
+}
+
+// DurationType defines values for DurationType
+type DurationType = generated.LeaseDurationType
+
+const (
+	DurationTypeInfinite DurationType = generated.LeaseDurationTypeInfinite
+	DurationTypeFixed    DurationType = generated.LeaseDurationTypeFixed
+)
+
+// PossibleDurationTypeValues returns the possible values for the DurationType const type.
+func PossibleDurationTypeValues() []DurationType {
+	return generated.PossibleLeaseDurationTypeValues()
+}
+
+// StateType defines values for StateType
+type StateType = generated.LeaseStateType
+
+const (
+	StateTypeAvailable StateType = generated.LeaseStateTypeAvailable
+	StateTypeLeased    StateType = generated.LeaseStateTypeLeased
+	StateTypeExpired   StateType = generated.LeaseStateTypeExpired
+	StateTypeBreaking  StateType = generated.LeaseStateTypeBreaking
+	StateTypeBroken    StateType = generated.LeaseStateTypeBroken
+)
+
+// PossibleStateTypeValues returns the possible values for the StateType const type.
+func PossibleStateTypeValues() []StateType {
+	return generated.PossibleLeaseStateTypeValues()
+}

sdk/storage/azblob/internal/generated/zz_models_serde.go

@@ -11,7 +11,6 @@ import (
 	"github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/blockblob"
 	"github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/container"
 	"github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/internal/exported"
-	"github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/internal/generated"
 	"github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/service"
 )
 
@@ -52,10 +51,10 @@ type DownloadBufferOptions = blob.DownloadBufferOptions
 type DownloadFileOptions = blob.DownloadFileOptions
 
 // CpkInfo contains a group of parameters for client provided encryption key.
-type CpkInfo = generated.CpkInfo
+type CpkInfo = blob.CpkInfo
 
 // CpkScopeInfo contains a group of parameters for the ContainerClient.Create method.
-type CpkScopeInfo = generated.ContainerCpkScopeInfo
+type CpkScopeInfo = container.CpkScopeInfo
 
 // AccessConditions identifies blob-specific access conditions which you optionally set.
 type AccessConditions = exported.BlobAccessConditions

sdk/storage/azblob/lease/constants.go

@@ -22,6 +22,7 @@ import (
 	"github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/container"
 	"github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/internal/shared"
 	"github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/internal/testcommon"
+	"github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/lease"
 	"github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/sas"
 	"github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/service"
 	"github.com/stretchr/testify/require"
@@ -131,8 +132,8 @@ func (s *ServiceUnrecordedTestsSuite) TestListContainersBasic() {
 				_require.NotNil(ctnr.Properties)
 				_require.NotNil(ctnr.Properties.LastModified)
 				_require.NotNil(ctnr.Properties.ETag)
-				_require.Equal(*ctnr.Properties.LeaseStatus, container.LeaseStatusTypeUnlocked)
-				_require.Equal(*ctnr.Properties.LeaseState, container.LeaseStateTypeAvailable)
+				_require.Equal(*ctnr.Properties.LeaseStatus, lease.StatusTypeUnlocked)
+				_require.Equal(*ctnr.Properties.LeaseState, lease.StateTypeAvailable)
 				_require.Nil(ctnr.Properties.LeaseDuration)
 				_require.Nil(ctnr.Properties.PublicAccess)
 				_require.NotNil(ctnr.Metadata)
@@ -192,8 +193,8 @@ func (s *ServiceUnrecordedTestsSuite) TestListContainersBasicUsingConnectionStri
 				_require.NotNil(ctnr.Properties)
 				_require.NotNil(ctnr.Properties.LastModified)
 				_require.NotNil(ctnr.Properties.ETag)
-				_require.Equal(*ctnr.Properties.LeaseStatus, container.LeaseStatusTypeUnlocked)
-				_require.Equal(*ctnr.Properties.LeaseState, container.LeaseStateTypeAvailable)
+				_require.Equal(*ctnr.Properties.LeaseStatus, lease.StatusTypeUnlocked)
+				_require.Equal(*ctnr.Properties.LeaseState, lease.StateTypeAvailable)
 				_require.Nil(ctnr.Properties.LeaseDuration)
 				_require.Nil(ctnr.Properties.PublicAccess)
 				_require.NotNil(ctnr.Metadata)