Skip to content
Draft
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@ use crate::{
},
},
models::{
BlobContainerClientAcquireLeaseOptions, BlobContainerClientBreakLeaseOptions,
BlobContainerClientChangeLeaseOptions, BlobContainerClientCreateOptions,
BlobContainerClientDeleteOptions, BlobContainerClientGetAccessPolicyOptions,
BlobContainerClientGetAccountInfoOptions, BlobContainerClientGetPropertiesOptions,
BlobContainerClientListBlobFlatSegmentOptions, BlobContainerClientReleaseLeaseOptions,
BlobContainerClientRenewLeaseOptions, BlobContainerClientSetAccessPolicyOptions,
BlobContainerClientSetAccessPolicyResult, BlobContainerClientSetMetadataOptions,
ListBlobsFlatSegmentResponse,
format_signed_identifiers, BlobContainerClientAcquireLeaseOptions,
BlobContainerClientBreakLeaseOptions, BlobContainerClientChangeLeaseOptions,
BlobContainerClientCreateOptions, BlobContainerClientDeleteOptions,
BlobContainerClientGetAccessPolicyOptions, BlobContainerClientGetAccountInfoOptions,
BlobContainerClientGetPropertiesOptions, BlobContainerClientListBlobFlatSegmentOptions,
BlobContainerClientReleaseLeaseOptions, BlobContainerClientRenewLeaseOptions,
BlobContainerClientSetAccessPolicyOptions, BlobContainerClientSetAccessPolicyResult,
BlobContainerClientSetMetadataOptions, ListBlobsFlatSegmentResponse,
},
pipeline::StorageHeadersPolicy,
BlobClient, BlobContainerClientOptions,
Expand Down Expand Up @@ -263,10 +263,12 @@ impl BlobContainerClient {
/// * `options` - Optional configuration for the request.
pub async fn set_access_policy(
&self,
container_acl: RequestContent<Vec<SignedIdentifier>, XmlFormat>,
container_acl: Vec<SignedIdentifier>,
options: Option<BlobContainerClientSetAccessPolicyOptions<'_>>,
) -> Result<Response<BlobContainerClientSetAccessPolicyResult, NoFormat>> {
self.client.set_access_policy(container_acl, options).await
self.client
.set_access_policy(format_signed_identifiers(container_acl)?, options)
.await
}

/// Gets the permissions for the specified container. The permissions indicate whether container data
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

23 changes: 22 additions & 1 deletion sdk/storage/azure_storage_blob/src/models/extensions.rs
Original file line number Diff line number Diff line change
@@ -1,9 +1,15 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.

use azure_core::{
http::{RequestContent, XmlFormat},
xml::to_xml_with_root,
};
use serde::Serialize;

use crate::models::{
AppendBlobClientCreateOptions, BlobTag, BlobTags, BlockBlobClientUploadBlobFromUrlOptions,
PageBlobClientCreateOptions,
PageBlobClientCreateOptions, SignedIdentifier,
};
use azure_core::error::ErrorKind;
use std::collections::HashMap;
Expand Down Expand Up @@ -89,3 +95,18 @@ impl From<HashMap<String, String>> for BlobTags {
}
}
}

// SignedIdentifiers wrapper for correct XML serialization.
#[derive(Serialize)]
struct SignedIdentifiersWrapper {
#[serde(rename = "SignedIdentifier")]
items: Vec<SignedIdentifier>,
}

// Converts a `Vec<SignedIdentifier>` into `RequestContent<Vec<SignedIdentifier>, XmlFormat>`.
pub(crate) fn format_signed_identifiers(
value: Vec<SignedIdentifier>,
) -> Result<RequestContent<Vec<SignedIdentifier>, XmlFormat>, azure_core::Error> {
let wrapper = SignedIdentifiersWrapper { items: value };
Ok(to_xml_with_root("SignedIdentifiers", &wrapper)?.into())
}
2 changes: 0 additions & 2 deletions sdk/storage/azure_storage_blob/src/parsers.rs
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.

use crate::models::{BlobTag, BlobTags};
use std::collections::HashMap;
use std::io::{Error, ErrorKind};

/// Takes in an offset and a length, verifies alignment to a 512-byte boundary, and
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -312,11 +312,11 @@ async fn test_container_access_policy(ctx: TestContext) -> Result<(), Box<dyn Er
};
let signed_identifier = SignedIdentifier {
access_policy: Some(access_policy),
id: None,
id: Some("testid".into()),
};

container_client
.set_access_policy(signed_identifier.into()?, None)
.set_access_policy(vec![signed_identifier], None)
.await?;

// Assert
Expand Down
Loading