Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
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
17 changes: 14 additions & 3 deletions specification/storage/Microsoft.BlobStorage/client.tsp
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,10 @@ interface PageBlobClient extends Storage.Blob.PageBlob {}
@@clientName(UserDelegationKey.signedTid, "signedTenantId", "javascript");
@@clientName(UserDelegationKey.signedStart, "signedStartsOn", "javascript");
@@clientName(UserDelegationKey.signedExpiry, "signedExpiresOn", "javascript");
@@clientName(FilterBlobResponse.nextMarker, "continuationToken", "javascript");
@@clientName(FilteredBlobResponse.nextMarker,
"continuationToken",
"javascript"
);
@@clientName(ListContainersResponse.NextMarker,
"continuationToken",
"javascript"
Expand All @@ -203,11 +206,11 @@ interface PageBlobClient extends Storage.Blob.PageBlob {}
@@clientName(ListBlobsResponse.nextMarker, "continuationToken", "javascript");
@@clientName(ListBlobsResponse.maxResults, "maxPageSize", "javascript");
@@clientName(PageList.nextMarker, "continuationToken", "javascript");
@@clientName(ListBlobsHierarchySegmentResponse.nextMarker,
@@clientName(ListBlobsHierarchicalResponse.nextMarker,
"continuationToken",
"javascript"
);
@@clientName(ListBlobsHierarchySegmentResponse.maxResults,
@@clientName(ListBlobsHierarchicalResponse.maxResults,
"maxPageSize",
"javascript"
);
Expand Down Expand Up @@ -580,6 +583,10 @@ model SignedIdentifiersGo is Array<SignedIdentifier>;
@@clientName(LeaseStatus, "LeaseStatusType", "go");
@@clientName(ListBlobsIncludeItemGo, "ListBlobsIncludeItem", "go");
@@clientName(ListBlobsResponse, "ListBlobsFlatSegmentResponse", "go");
@@clientName(ListBlobsHierarchicalResponse,
"ListBlobsHierarchySegmentResponse",
"go"
);
@@clientName(Metrics.includeApis, "IncludeAPIs", "go");
@@clientName(QueryType, "QueryFormatType", "go");
@@clientName(Storage.Blob.Blob.setProperties, "SetHTTPHeaders", "go");
Expand Down Expand Up @@ -790,6 +797,10 @@ model BlobServicePropertiesCsharp {
@@clientName(BlobItem.objectReplicationMetadata, "OrMetadata", "csharp");
@@clientName(Blob.setProperties, "SetHttpHeaders", "csharp");
@@clientName(ListBlobsResponse, "ListBlobsFlatSegmentResponse", "csharp");
@@clientName(ListBlobsHierarchicalResponse,
"ListBlobsHierarchySegmentResponse",
"csharp"
);
@@clientName(Container.findBlobsByTags, "FilterBlobs", "csharp");
@@clientName(Service.findBlobsByTags, "FilterBlobs", "csharp");
@@clientName(Service.listContainers, "ListContainersSegment", "csharp");
Expand Down
42 changes: 13 additions & 29 deletions specification/storage/Microsoft.BlobStorage/models.tsp
Original file line number Diff line number Diff line change
Expand Up @@ -469,7 +469,7 @@ model SignedIdentifier {

/** The result of a Filter Blobs API call */
@Xml.name("EnumerationResults")
model FilterBlobResponse {
model FilteredBlobResponse {
/** The service endpoint. */
@Xml.attribute
@Xml.name("ServiceEndpoint")
Expand All @@ -481,6 +481,7 @@ model FilterBlobResponse {
/** The blob segment. */
@pageItems
@Xml.name("Blobs")
// TODO: We want this to be blob_items but that causes an emitter conflict. Will standup in a separate PR.
blobs: FilterBlobItem[];

/** The next marker of the blobs. */
Expand Down Expand Up @@ -581,7 +582,7 @@ enum SkuName {
StandardRAGZRS: "Standard_RAGZRS",
}

/** The list containers response */
/** The list containers response. */
@Xml.name("EnumerationResults")
model ListContainersResponse {
/** The service endpoint. */
Expand Down Expand Up @@ -1326,15 +1327,6 @@ model ListBlobsResponse {
nextMarker?: string;
}

/** The blob flat list segment. */
model BlobFlatListSegment {
/** The blob items. */
@pageItems
@Xml.name("Blob")
@Xml.unwrapped
blobItems: BlobItem[];
}

/** Represents a page list. */
model PageList {
/** The page ranges. */
Expand Down Expand Up @@ -2536,23 +2528,9 @@ model BlobPrefix {
@Xml.name("Name") name: BlobName;
}

/** Represents an array of blobs. */
model BlobHierarchyListSegment {
/** The blob items */
@pageItems
@Xml.name("Blob")
@Xml.unwrapped
blobItems: BlobItem[];

/** The blob prefixes. */
@Xml.name("BlobPrefix")
@Xml.unwrapped
blobPrefixes?: BlobPrefix[];
}

/** An enumeration of blobs */
/** An enumeration of blobs. */
@Xml.name("EnumerationResults")
model ListBlobsHierarchySegmentResponse {
model ListBlobsHierarchicalResponse {
/** The service endpoint. */
@Xml.attribute
@Xml.name("ServiceEndpoint")
Expand All @@ -2575,9 +2553,15 @@ model ListBlobsHierarchySegmentResponse {
/** The max results of the blobs. */
@Xml.name("MaxResults") maxResults?: int32;

/** The blob segment. */
/** The blob items. */
@pageItems
@Xml.name("Blobs")
segment: BlobHierarchyListSegment;
blobItems: BlobItem[];

/** The blob prefixes. */
@Xml.name("BlobPrefix")
@Xml.unwrapped
blobPrefixes?: BlobPrefix[];

/** The next marker of the blobs. */
@continuationToken
Expand Down
6 changes: 3 additions & 3 deletions specification/storage/Microsoft.BlobStorage/routes.tsp
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@ interface Service {
{
/** The filter blobs enumeration results */
@body
enumerationResults: FilterBlobResponse;
enumerationResults: FilteredBlobResponse;
}
>;
}
Expand Down Expand Up @@ -490,7 +490,7 @@ interface Container {
{
/** The container filter blob enumeration results */
@body
enumerationResults: FilterBlobResponse;
enumerationResults: FilteredBlobResponse;
}
>;

Expand Down Expand Up @@ -651,7 +651,7 @@ interface Container {
{
/** The list of blobs in the container */
@body
enumerationResults: ListBlobsHierarchySegmentResponse;
enumerationResults: ListBlobsHierarchicalResponse;
}
>;

Expand Down