Skip to content
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

[DoNotMerge]Added EncryptionIdentity to Encryption properties. #11602

Closed
wants to merge 17 commits into from
+305 −2
Closed

[DoNotMerge]Added EncryptionIdentity to Encryption properties. #11602

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
cec4983
Added EncryptionIdentity to Encryption properties.
dhanvia Nov 9, 2020
80ba422
Made suggested changes. Added examples for account creation.
dhanvia Dec 15, 2020
7867e10
Made changes to include UserAssignedIdentity in MSIType
dhanvia Dec 15, 2020
afc7da3
Linked Examples. Fixed minor syntax issues.
dhanvia Jan 6, 2021
58757e7
fixed type error in dictionary
dhanvia Jan 6, 2021
ef13ece
removed certain properties from responses.
dhanvia Jan 6, 2021
6c56fb4
Minor Syntax changes in examples.
dhanvia Jan 6, 2021
e9beee0
white space changes
dhanvia Jan 6, 2021
0ff50e9
Removed EncryptionIdentity properties for testing purposes
dhanvia Jan 6, 2021
192bec2
Added encryptionIdentities back.
dhanvia Jan 6, 2021
1e8ef3c
Added type to Encryption Identity
dhanvia Jan 6, 2021
14bb9ef
Added EncryptionIdentity in EncryptionProperties in the example
dhanvia Jan 14, 2021
cd9db0a
Fixed identityType
dhanvia Jan 30, 2021
9b4c776
IdentityType modeasstring set to true
dhanvia Jan 30, 2021
9f831c9
Added update example
dhanvia Jan 30, 2021
faa5744
Fixed ModelValidation Errors
dhanvia Feb 2, 2021
60cdf16
fix prettier check
Juliehzl Feb 3, 2021
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
6 changes: 5 additions & 1 deletion ...020-08-01-preview/examples/StorageAccountCreateUserAssignedEncryptionIdentityWithCMK.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,11 @@
"keyname": "wrappingKey",
"keyversion": ""
},
"keySource": "Microsoft.Keyvault"
"keySource": "Microsoft.Keyvault",
"identity":{
"type": "ManagedServiceIdentity",
"userAssignedIdentity": "/subscriptions/{subscription-id}/resourceGroups/res9101/providers/Microsoft.ManagedIdentity/userAssignedIdentities/{managed-identity-name}"
dhanvia marked this conversation as resolved.
Show resolved Hide resolved
}
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion ...cation/storage/resource-manager/Microsoft.Storage/preview/2020-08-01-preview/storage.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2152,7 +2152,7 @@
],
"x-ms-enum": {
"name": "EncryptionIdentityType",
"modelAsString": false
"modelAsString": true
}
}
}
Expand Down