Storage STG98 Features (#6501)

* get set acl oauth (#6405)

* Storage STG98/Added support for x-ms-file-request-intent for blob copy APIs (#6406)

* Source File Copy Support

* Storage STG98/NFS 2 (#6404)

* feature

* add test record

* Update blob sas new string to sign (#6511)

Author: microzchang

sdk/storage/assets.json

@@ -2,5 +2,5 @@
   "AssetsRepo": "Azure/azure-sdk-assets",
   "AssetsRepoPrefixPath": "cpp",
   "TagPrefix": "cpp/storage",
-  "Tag": "cpp/storage_57a579efb6"
+  "Tag": "cpp/storage_7bea1dff90"
 }

sdk/storage/azure-storage-blobs/inc/azure/storage/blobs/blob_options.hpp

@@ -640,6 +640,12 @@ namespace Azure { namespace Storage { namespace Blobs {
      * source.
      */
     std::string SourceAuthorization;
+
+    /**
+     * Optional, only applicable (but required) when the source is Azure Storage Files and using
+     * token authentication. Used to indicate the intent of the request.
+     */
+    Azure::Nullable<Models::FileShareTokenIntent> FileRequestIntent;
   };
 
   /**
@@ -1017,6 +1023,12 @@ namespace Azure { namespace Storage { namespace Blobs {
      * source.
      */
     std::string SourceAuthorization;
+
+    /**
+     * Optional, only applicable (but required) when the source is Azure Storage Files and using
+     * token authentication. Used to indicate the intent of the request.
+     */
+    Azure::Nullable<Models::FileShareTokenIntent> FileRequestIntent;
   };
 
   /**
@@ -1073,6 +1085,12 @@ namespace Azure { namespace Storage { namespace Blobs {
      * source.
      */
     std::string SourceAuthorization;
+
+    /**
+     * Optional, only applicable (but required) when the source is Azure Storage Files and using
+     * token authentication. Used to indicate the intent of the request.
+     */
+    Azure::Nullable<Models::FileShareTokenIntent> FileRequestIntent;
   };
 
   /**
@@ -1366,6 +1384,12 @@ namespace Azure { namespace Storage { namespace Blobs {
      * source.
      */
     std::string SourceAuthorization;
+
+    /**
+     * Optional, only applicable (but required) when the source is Azure Storage Files and using
+     * token authentication. Used to indicate the intent of the request.
+     */
+    Azure::Nullable<Models::FileShareTokenIntent> FileRequestIntent;
   };
 
   /**
@@ -1477,6 +1501,12 @@ namespace Azure { namespace Storage { namespace Blobs {
      * source.
      */
     std::string SourceAuthorization;
+
+    /**
+     * Optional, only applicable (but required) when the source is Azure Storage Files and using
+     * token authentication. Used to indicate the intent of the request.
+     */
+    Azure::Nullable<Models::FileShareTokenIntent> FileRequestIntent;
   };
 
   /**

sdk/storage/azure-storage-blobs/inc/azure/storage/blobs/rest_client.hpp

@@ -32,7 +32,7 @@ namespace Azure { namespace Storage { namespace Blobs {
     /**
      * The version used for the operations to Azure storage services.
      */
-    constexpr static const char* ApiVersion = "2024-08-04";
+    constexpr static const char* ApiVersion = "2025-07-05";
   } // namespace _detail
   namespace Models {
     /**
@@ -1756,7 +1756,7 @@ namespace Azure { namespace Storage { namespace Blobs {
       /**
        * The tier of page blob on a premium storage account or tier of block blob on blob storage
        * LRS accounts. For a list of allowed premium page blob tiers, see
-       * https://learn.microsoft.com/en-us/azure/virtual-machines/windows/premium-storage#features.
+       * https://docs.microsoft.com/en-us/azure/virtual-machines/windows/premium-storage#features.
        * For blob storage LRS accounts, valid values are Hot/Cool/Archive.
        */
       Nullable<Models::AccessTier> AccessTier;
@@ -2182,6 +2182,20 @@ namespace Azure { namespace Storage { namespace Blobs {
       /** Constant value of type BlobCopySourceTagsMode: Copy */
       AZ_STORAGE_BLOBS_DLLEXPORT const static BlobCopySourceTagsMode Copy;
     };
+    /**
+     * @brief Valid value is backup.
+     */
+    class FileShareTokenIntent final
+        : public Core::_internal::ExtendableEnumeration<FileShareTokenIntent> {
+    public:
+      /** Constructs a new FileShareTokenIntent instance */
+      FileShareTokenIntent() = default;
+      /** Constructs a new FileShareTokenIntent from a string. */
+      explicit FileShareTokenIntent(std::string value) : ExtendableEnumeration(std::move(value)) {}
+
+      /** Constant value of type FileShareTokenIntent: Backup */
+      AZ_STORAGE_BLOBS_DLLEXPORT const static FileShareTokenIntent Backup;
+    };
     /**
      * @brief Response type for #Azure::Storage::Blobs::BlobClient::CopyFromUri.
      */
@@ -3779,6 +3793,7 @@ namespace Azure { namespace Storage { namespace Blobs {
         Nullable<std::string> CopySourceAuthorization;
         Nullable<std::string> EncryptionScope;
         Nullable<Models::BlobCopySourceTagsMode> CopySourceTags;
+        Nullable<Models::FileShareTokenIntent> FileRequestIntent;
         Nullable<std::vector<std::uint8_t>> SourceContentcrc64;
       };
       static Response<Models::CopyBlobFromUriResult> CopyFromUri(
@@ -3971,6 +3986,7 @@ namespace Azure { namespace Storage { namespace Blobs {
         ETag SourceIfMatch;
         ETag SourceIfNoneMatch;
         Nullable<std::string> CopySourceAuthorization;
+        Nullable<Models::FileShareTokenIntent> FileRequestIntent;
       };
       static Response<Models::UploadPagesFromUriResult> UploadPagesFromUri(
           Core::Http::_internal::HttpPipeline& pipeline,
@@ -4143,6 +4159,7 @@ namespace Azure { namespace Storage { namespace Blobs {
         ETag SourceIfMatch;
         ETag SourceIfNoneMatch;
         Nullable<std::string> CopySourceAuthorization;
+        Nullable<Models::FileShareTokenIntent> FileRequestIntent;
       };
       static Response<Models::AppendBlockFromUriResult> AppendBlockFromUri(
           Core::Http::_internal::HttpPipeline& pipeline,
@@ -4230,6 +4247,7 @@ namespace Azure { namespace Storage { namespace Blobs {
         Nullable<bool> CopySourceBlobProperties;
         Nullable<std::string> CopySourceAuthorization;
         Nullable<Models::BlobCopySourceTagsMode> CopySourceTags;
+        Nullable<Models::FileShareTokenIntent> FileRequestIntent;
         Nullable<std::vector<std::uint8_t>> SourceContentcrc64;
       };
       static Response<Models::UploadBlockBlobFromUriResult> UploadFromUri(
@@ -4271,6 +4289,7 @@ namespace Azure { namespace Storage { namespace Blobs {
         ETag SourceIfMatch;
         ETag SourceIfNoneMatch;
         Nullable<std::string> CopySourceAuthorization;
+        Nullable<Models::FileShareTokenIntent> FileRequestIntent;
       };
       static Response<Models::StageBlockFromUriResult> StageBlockFromUri(
           Core::Http::_internal::HttpPipeline& pipeline,

sdk/storage/azure-storage-blobs/src/append_blob_client.cpp

@@ -220,6 +220,8 @@ namespace Azure { namespace Storage { namespace Blobs {
     {
       protocolLayerOptions.CopySourceAuthorization = options.SourceAuthorization;
     }
+    protocolLayerOptions.FileRequestIntent = options.FileRequestIntent;
+
     return _detail::AppendBlobClient::AppendBlockFromUri(
         *m_pipeline, m_blobUrl, protocolLayerOptions, context);
   }

sdk/storage/azure-storage-blobs/src/blob_client.cpp

@@ -714,6 +714,7 @@ namespace Azure { namespace Storage { namespace Blobs {
     {
       protocolLayerOptions.CopySourceAuthorization = options.SourceAuthorization;
     }
+    protocolLayerOptions.FileRequestIntent = options.FileRequestIntent;
 
     return _detail::BlobClient::CopyFromUri(*m_pipeline, m_blobUrl, protocolLayerOptions, context);
   }

sdk/storage/azure-storage-blobs/src/blob_sas_builder.cpp

@@ -261,7 +261,7 @@ namespace Azure { namespace Storage { namespace Sas {
         + canonicalName + "\n" + userDelegationKey.SignedObjectId + "\n"
         + userDelegationKey.SignedTenantId + "\n" + signedStartsOnStr + "\n" + signedExpiresOnStr
         + "\n" + userDelegationKey.SignedService + "\n" + userDelegationKey.SignedVersion
-        + "\n\n\n\n" + (IPRange.HasValue() ? IPRange.Value() : "") + "\n" + protocol + "\n"
+        + "\n\n\n\n\n\n" + (IPRange.HasValue() ? IPRange.Value() : "") + "\n" + protocol + "\n"
         + SasVersion + "\n" + resource + "\n" + snapshotVersion + "\n" + EncryptionScope + "\n"
         + CacheControl + "\n" + ContentDisposition + "\n" + ContentEncoding + "\n" + ContentLanguage
         + "\n" + ContentType;
@@ -397,7 +397,7 @@ namespace Azure { namespace Storage { namespace Sas {
     return Permissions + "\n" + startsOnStr + "\n" + expiresOnStr + "\n" + canonicalName + "\n"
         + userDelegationKey.SignedObjectId + "\n" + userDelegationKey.SignedTenantId + "\n"
         + signedStartsOnStr + "\n" + signedExpiresOnStr + "\n" + userDelegationKey.SignedService
-        + "\n" + userDelegationKey.SignedVersion + "\n\n\n\n"
+        + "\n" + userDelegationKey.SignedVersion + "\n\n\n\n\n\n"
         + (IPRange.HasValue() ? IPRange.Value() : "") + "\n" + protocol + "\n" + SasVersion + "\n"
         + resource + "\n" + snapshotVersion + "\n" + EncryptionScope + "\n" + CacheControl + "\n"
         + ContentDisposition + "\n" + ContentEncoding + "\n" + ContentLanguage + "\n" + ContentType;

sdk/storage/azure-storage-blobs/src/block_blob_client.cpp

@@ -383,6 +383,7 @@ namespace Azure { namespace Storage { namespace Blobs {
     {
       protocolLayerOptions.CopySourceAuthorization = options.SourceAuthorization;
     }
+    protocolLayerOptions.FileRequestIntent = options.FileRequestIntent;
 
     return _detail::BlockBlobClient::UploadFromUri(
         *m_pipeline, m_blobUrl, protocolLayerOptions, context);
@@ -467,6 +468,7 @@ namespace Azure { namespace Storage { namespace Blobs {
     {
       protocolLayerOptions.CopySourceAuthorization = options.SourceAuthorization;
     }
+    protocolLayerOptions.FileRequestIntent = options.FileRequestIntent;
 
     return _detail::BlockBlobClient::StageBlockFromUri(
         *m_pipeline, m_blobUrl, protocolLayerOptions, context);

sdk/storage/azure-storage-blobs/src/page_blob_client.cpp

@@ -237,6 +237,8 @@ namespace Azure { namespace Storage { namespace Blobs {
     {
       protocolLayerOptions.CopySourceAuthorization = options.SourceAuthorization;
     }
+    protocolLayerOptions.FileRequestIntent = options.FileRequestIntent;
+
     return _detail::PageBlobClient::UploadPagesFromUri(
         *m_pipeline, m_blobUrl, protocolLayerOptions, context);
   }