Skip to content

[ReleasePR @azure/arm-storage] [Linked to PR# 1045] Adding support for encryption key type #6864

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
openapi-sdkautomation wants to merge 1 commit into from
Closed

[ReleasePR @azure/arm-storage] [Linked to PR# 1045] Adding support for encryption key type #6864

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion sdk/storage/arm-storage/LICENSE.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The MIT License (MIT)

Copyright (c) 2019 Microsoft
Copyright (c) 2020 Microsoft

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
28 changes: 20 additions & 8 deletions sdk/storage/arm-storage/src/models/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,6 +270,12 @@ export interface EncryptionService {
* **NOTE: This property will not be serialized. It can only be populated by the server.**
*/
readonly lastEnabledTime?: Date;
/**
* Encryption key type to be used for the encryption service. 'Account' key type implies that an
* account-scoped encryption key will be used. 'Service' key type implies that a default service
* key is used. Possible values include: 'Service', 'Account'
*/
keyType?: KeyType;
}

/**
Expand All @@ -286,14 +292,12 @@ export interface EncryptionServices {
file?: EncryptionService;
/**
* The encryption function of the table storage service.
* **NOTE: This property will not be serialized. It can only be populated by the server.**
*/
readonly table?: EncryptionService;
table?: EncryptionService;
/**
* The encryption function of the queue storage service.
* **NOTE: This property will not be serialized. It can only be populated by the server.**
*/
readonly queue?: EncryptionService;
queue?: EncryptionService;
}

/**
Expand Down Expand Up @@ -1887,7 +1891,7 @@ export interface FileShare extends AzureEntityResource {
metadata?: { [propertyName: string]: string };
/**
* The maximum size of the share, in gigabytes. Must be greater than 0, and less than or equal to
* 5TB (5120). For Large File Shares, the maximum size is 100000.
* 5TB (5120). For Large File Shares, the maximum size is 102400.
*/
shareQuota?: number;
}
Expand All @@ -1907,7 +1911,7 @@ export interface FileShareItem extends AzureEntityResource {
metadata?: { [propertyName: string]: string };
/**
* The maximum size of the share, in gigabytes. Must be greater than 0, and less than or equal to
* 5TB (5120). For Large File Shares, the maximum size is 100000.
* 5TB (5120). For Large File Shares, the maximum size is 102400.
*/
shareQuota?: number;
}
Expand Down Expand Up @@ -2053,7 +2057,7 @@ export interface FileSharesCreateOptionalParams extends msRest.RequestOptionsBas
metadata?: { [propertyName: string]: string };
/**
* The maximum size of the share, in gigabytes. Must be greater than 0, and less than or equal to
* 5TB (5120). For Large File Shares, the maximum size is 100000.
* 5TB (5120). For Large File Shares, the maximum size is 102400.
*/
shareQuota?: number;
}
Expand All @@ -2068,7 +2072,7 @@ export interface FileSharesUpdateOptionalParams extends msRest.RequestOptionsBas
metadata?: { [propertyName: string]: string };
/**
* The maximum size of the share, in gigabytes. Must be greater than 0, and less than or equal to
* 5TB (5120). For Large File Shares, the maximum size is 100000.
* 5TB (5120). For Large File Shares, the maximum size is 102400.
*/
shareQuota?: number;
}
Expand Down Expand Up @@ -2259,6 +2263,14 @@ export type Kind = 'Storage' | 'StorageV2' | 'BlobStorage' | 'FileStorage' | 'Bl
*/
export type Reason = 'AccountNameInvalid' | 'AlreadyExists';

/**
* Defines values for KeyType.
* Possible values include: 'Service', 'Account'
* @readonly
* @enum {string}
*/
export type KeyType = 'Service' | 'Account';

/**
* Defines values for KeySource.
* Possible values include: 'Microsoft.Storage', 'Microsoft.Keyvault'
Expand Down
12 changes: 8 additions & 4 deletions sdk/storage/arm-storage/src/models/mappers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -435,6 +435,12 @@ export const EncryptionService: msRest.CompositeMapper = {
type: {
name: "DateTime"
}
},
keyType: {
serializedName: "keyType",
type: {
name: "String"
}
}
}
}
Expand All @@ -461,15 +467,13 @@ export const EncryptionServices: msRest.CompositeMapper = {
}
},
table: {
readOnly: true,
serializedName: "table",
type: {
name: "Composite",
className: "EncryptionService"
}
},
queue: {
readOnly: true,
serializedName: "queue",
type: {
name: "Composite",
Expand Down Expand Up @@ -3046,7 +3050,7 @@ export const FileShare: msRest.CompositeMapper = {
shareQuota: {
serializedName: "properties.shareQuota",
constraints: {
InclusiveMaximum: 100000,
InclusiveMaximum: 102400,
InclusiveMinimum: 1
},
type: {
Expand Down Expand Up @@ -3085,7 +3089,7 @@ export const FileShareItem: msRest.CompositeMapper = {
shareQuota: {
serializedName: "properties.shareQuota",
constraints: {
InclusiveMaximum: 100000,
InclusiveMaximum: 102400,
InclusiveMinimum: 1
},
type: {
Expand Down