Skip to content

Commit

Permalink
CodeGen from PR 13550 in Azure/azure-rest-api-specs
Browse files Browse the repository at this point in the history
Merge c0c5fcdc64b8e53f9ac5e154ac2e4dc28e35b7f4 into 726a387880fe2815392063e679dc3013fd654816
  • Loading branch information
SDKAuto committed Mar 24, 2021
1 parent 10395be commit ae4734b
Show file tree
Hide file tree
Showing 21 changed files with 201 additions and 26 deletions.
2 changes: 2 additions & 0 deletions sdk/storage/arm-storage/src/models/blobContainersMappers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ export {
ImmutabilityPolicy,
ImmutabilityPolicyProperties,
IPRule,
KeyPolicy,
KeyVaultProperties,
LastAccessTimeTrackingPolicy,
LeaseContainerRequest,
Expand Down Expand Up @@ -85,6 +86,7 @@ export {
ResourceAccessRule,
RestorePolicyProperties,
RoutingPreference,
SasPolicy,
Sku,
SmbSetting,
StorageAccount,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ export {
ImmutabilityPolicy,
ImmutabilityPolicyProperties,
IPRule,
KeyPolicy,
KeyVaultProperties,
LastAccessTimeTrackingPolicy,
LegalHoldProperties,
Expand Down Expand Up @@ -78,6 +79,7 @@ export {
ResourceAccessRule,
RestorePolicyProperties,
RoutingPreference,
SasPolicy,
Sku,
SmbSetting,
StorageAccount,
Expand Down
2 changes: 2 additions & 0 deletions sdk/storage/arm-storage/src/models/blobServicesMappers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ export {
ImmutabilityPolicy,
ImmutabilityPolicyProperties,
IPRule,
KeyPolicy,
KeyVaultProperties,
LastAccessTimeTrackingPolicy,
LegalHoldProperties,
Expand Down Expand Up @@ -77,6 +78,7 @@ export {
ResourceAccessRule,
RestorePolicyProperties,
RoutingPreference,
SasPolicy,
Sku,
SmbSetting,
StorageAccount,
Expand Down
2 changes: 2 additions & 0 deletions sdk/storage/arm-storage/src/models/deletedAccountsMappers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ export {
ImmutabilityPolicy,
ImmutabilityPolicyProperties,
IPRule,
KeyPolicy,
KeyVaultProperties,
LastAccessTimeTrackingPolicy,
LegalHoldProperties,
Expand Down Expand Up @@ -78,6 +79,7 @@ export {
ResourceAccessRule,
RestorePolicyProperties,
RoutingPreference,
SasPolicy,
Sku,
SmbSetting,
StorageAccount,
Expand Down
2 changes: 2 additions & 0 deletions sdk/storage/arm-storage/src/models/encryptionScopesMappers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ export {
ImmutabilityPolicy,
ImmutabilityPolicyProperties,
IPRule,
KeyPolicy,
KeyVaultProperties,
LastAccessTimeTrackingPolicy,
LegalHoldProperties,
Expand Down Expand Up @@ -79,6 +80,7 @@ export {
ResourceAccessRule,
RestorePolicyProperties,
RoutingPreference,
SasPolicy,
Sku,
SmbSetting,
StorageAccount,
Expand Down
2 changes: 2 additions & 0 deletions sdk/storage/arm-storage/src/models/fileServicesMappers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ export {
ImmutabilityPolicy,
ImmutabilityPolicyProperties,
IPRule,
KeyPolicy,
KeyVaultProperties,
LastAccessTimeTrackingPolicy,
LegalHoldProperties,
Expand Down Expand Up @@ -77,6 +78,7 @@ export {
ResourceAccessRule,
RestorePolicyProperties,
RoutingPreference,
SasPolicy,
Sku,
SmbSetting,
StorageAccount,
Expand Down
2 changes: 2 additions & 0 deletions sdk/storage/arm-storage/src/models/fileSharesMappers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ export {
ImmutabilityPolicy,
ImmutabilityPolicyProperties,
IPRule,
KeyPolicy,
KeyVaultProperties,
LastAccessTimeTrackingPolicy,
LegalHoldProperties,
Expand Down Expand Up @@ -78,6 +79,7 @@ export {
ResourceAccessRule,
RestorePolicyProperties,
RoutingPreference,
SasPolicy,
Sku,
SmbSetting,
StorageAccount,
Expand Down
56 changes: 56 additions & 0 deletions sdk/storage/arm-storage/src/models/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -255,6 +255,26 @@ export interface CustomDomain {
useSubDomainName?: boolean;
}

/**
* SasPolicy assigned to the storage account.
*/
export interface SasPolicy {
/**
* The SAS expiration period, DD.HH:MM:SS.
*/
sasExpirationPeriod: string;
}

/**
* KeyPolicy assigned to the storage account.
*/
export interface KeyPolicy {
/**
* The key expiration period in days.
*/
keyExpirationPeriodInDays: number;
}

/**
* A service that allows server-side encryption to be used.
*/
Expand Down Expand Up @@ -618,6 +638,14 @@ export interface StorageAccountCreateParameters {
* The identity of the resource.
*/
identity?: Identity;
/**
* SasPolicy assigned to the storage account.
*/
sasPolicy?: SasPolicy;
/**
* KeyPolicy assigned to the storage account.
*/
keyPolicy?: KeyPolicy;
/**
* User domain assigned to the storage account. Name is the CNAME source. Only one custom domain
* is supported per storage account at this time. To clear the existing custom domain, use an
Expand Down Expand Up @@ -1083,6 +1111,21 @@ export interface StorageAccount extends TrackedResource {
* **NOTE: This property will not be serialized. It can only be populated by the server.**
*/
readonly customDomain?: CustomDomain;
/**
* SasPolicy assigned to the storage account.
* **NOTE: This property will not be serialized. It can only be populated by the server.**
*/
readonly sasPolicy?: SasPolicy;
/**
* KeyPolicy assigned to the storage account.
* **NOTE: This property will not be serialized. It can only be populated by the server.**
*/
readonly keyPolicy?: KeyPolicy;
/**
* Gets the list of storage account keys creation time.
* **NOTE: This property will not be serialized. It can only be populated by the server.**
*/
readonly keyCreationTime?: { [propertyName: string]: Date } | { [propertyName: string]: string };
/**
* Gets the URLs that are used to perform a retrieval of a public blob, queue, or table object
* from the secondary location of the storage account. Only available if the SKU name is
Expand Down Expand Up @@ -1190,6 +1233,11 @@ export interface StorageAccountKey {
* **NOTE: This property will not be serialized. It can only be populated by the server.**
*/
readonly permissions?: KeyPermission;
/**
* Creation time of the key, in round trip date format.
* **NOTE: This property will not be serialized. It can only be populated by the server.**
*/
readonly creationTime?: Date;
}

/**
Expand Down Expand Up @@ -1244,6 +1292,14 @@ export interface StorageAccountUpdateParameters {
* Provides the encryption settings on the account. The default setting is unencrypted.
*/
encryption?: Encryption;
/**
* SasPolicy assigned to the storage account.
*/
sasPolicy?: SasPolicy;
/**
* KeyPolicy assigned to the storage account.
*/
keyPolicy?: KeyPolicy;
/**
* Required for storage accounts where kind = BlobStorage. The access tier used for billing.
* Possible values include: 'Hot', 'Cool'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ export {
ImmutabilityPolicy,
ImmutabilityPolicyProperties,
IPRule,
KeyPolicy,
KeyVaultProperties,
LastAccessTimeTrackingPolicy,
LegalHoldProperties,
Expand Down Expand Up @@ -76,6 +77,7 @@ export {
ResourceAccessRule,
RestorePolicyProperties,
RoutingPreference,
SasPolicy,
Sku,
SmbSetting,
StorageAccount,
Expand Down
106 changes: 106 additions & 0 deletions sdk/storage/arm-storage/src/models/mappers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -417,6 +417,49 @@ export const CustomDomain: msRest.CompositeMapper = {
}
};

export const SasPolicy: msRest.CompositeMapper = {
serializedName: "SasPolicy",
type: {
name: "Composite",
className: "SasPolicy",
modelProperties: {
sasExpirationPeriod: {
required: true,
serializedName: "sasExpirationPeriod",
type: {
name: "String"
}
},
expirationAction: {
required: true,
isConstant: true,
serializedName: "expirationAction",
defaultValue: 'Log',
type: {
name: "String"
}
}
}
}
};

export const KeyPolicy: msRest.CompositeMapper = {
serializedName: "KeyPolicy",
type: {
name: "Composite",
className: "KeyPolicy",
modelProperties: {
keyExpirationPeriodInDays: {
required: true,
serializedName: "keyExpirationPeriodInDays",
type: {
name: "Number"
}
}
}
}
};

export const EncryptionService: msRest.CompositeMapper = {
serializedName: "EncryptionService",
type: {
Expand Down Expand Up @@ -1007,6 +1050,20 @@ export const StorageAccountCreateParameters: msRest.CompositeMapper = {
className: "Identity"
}
},
sasPolicy: {
serializedName: "properties.sasPolicy",
type: {
name: "Composite",
className: "SasPolicy"
}
},
keyPolicy: {
serializedName: "properties.keyPolicy",
type: {
name: "Composite",
className: "KeyPolicy"
}
},
customDomain: {
serializedName: "properties.customDomain",
type: {
Expand Down Expand Up @@ -1686,6 +1743,34 @@ export const StorageAccount: msRest.CompositeMapper = {
className: "CustomDomain"
}
},
sasPolicy: {
readOnly: true,
serializedName: "properties.sasPolicy",
type: {
name: "Composite",
className: "SasPolicy"
}
},
keyPolicy: {
readOnly: true,
serializedName: "properties.keyPolicy",
type: {
name: "Composite",
className: "KeyPolicy"
}
},
keyCreationTime: {
readOnly: true,
serializedName: "properties.keyCreationTime",
type: {
name: "Dictionary",
value: {
type: {
name: "DateTime"
}
}
}
},
secondaryEndpoints: {
readOnly: true,
serializedName: "properties.secondaryEndpoints",
Expand Down Expand Up @@ -1847,6 +1932,13 @@ export const StorageAccountKey: msRest.CompositeMapper = {
"Full"
]
}
},
creationTime: {
readOnly: true,
serializedName: "creationTime",
type: {
name: "DateTime"
}
}
}
}
Expand Down Expand Up @@ -1937,6 +2029,20 @@ export const StorageAccountUpdateParameters: msRest.CompositeMapper = {
className: "Encryption"
}
},
sasPolicy: {
serializedName: "properties.sasPolicy",
type: {
name: "Composite",
className: "SasPolicy"
}
},
keyPolicy: {
serializedName: "properties.keyPolicy",
type: {
name: "Composite",
className: "KeyPolicy"
}
},
accessTier: {
serializedName: "properties.accessTier",
type: {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ export {
ImmutabilityPolicy,
ImmutabilityPolicyProperties,
IPRule,
KeyPolicy,
KeyVaultProperties,
LastAccessTimeTrackingPolicy,
LegalHoldProperties,
Expand Down Expand Up @@ -78,6 +79,7 @@ export {
ResourceAccessRule,
RestorePolicyProperties,
RoutingPreference,
SasPolicy,
Sku,
SmbSetting,
StorageAccount,
Expand Down
Loading

0 comments on commit ae4734b

Please sign in to comment.