Merge pull request #281 from microsoft/user/sgolshani/security_encryp…

…tion_type Add SecurityEncryptionType
microsoft · Aug 21, 2024 · 302d811 · 302d811
2 parents 449745f + be6f764
commit 302d811
Show file tree

Hide file tree

Showing 8 changed files with 504 additions and 357 deletions.
diff --git a/go.mod b/go.mod
@@ -16,7 +16,7 @@ require (
 
 require (
 	golang.org/x/net v0.28.0 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20240814211410-ddb44dafa142 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20240820151423-278611b39280 // indirect
 )
 
 replace (

diff --git a/go.sum b/go.sum
@@ -1522,8 +1522,8 @@ google.golang.org/genproto/googleapis/rpc v0.0.0-20230706204954-ccb25ca9f130/go.
 google.golang.org/genproto/googleapis/rpc v0.0.0-20230731190214-cbb8c96f2d6d/go.mod h1:TUfxEVdsvPg18p6AslUXFoLdpED4oBnGwyqk3dV1XzM=
 google.golang.org/genproto/googleapis/rpc v0.0.0-20230803162519-f966b187b2e5/go.mod h1:zBEcrKX2ZOcEkHWxBPAIvYUWOKKMIhYcmNiUIu2ji3I=
 google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d/go.mod h1:+Bk1OCOj40wS2hwAMA+aCW9ypzm63QTBBHp6lQ3p+9M=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20240814211410-ddb44dafa142 h1:e7S5W7MGGLaSu8j3YjdezkZ+m1/Nm0uRVRMEMGk26Xs=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20240814211410-ddb44dafa142/go.mod h1:UqMtugtsSgubUsoxbuAoiCXvqvErP7Gf0so0mK9tHxU=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20240820151423-278611b39280 h1:XQMA2e105XNlEZ8NRF0HqnUOZzP14sUSsgL09kpdNnU=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20240820151423-278611b39280/go.mod h1:UqMtugtsSgubUsoxbuAoiCXvqvErP7Gf0so0mK9tHxU=
 google.golang.org/grpc v1.59.0 h1:Z5Iec2pjwb+LEOqzpB2MR12/eKFhDPhuqW91O+4bwUk=
 google.golang.org/grpc v1.59.0/go.mod h1:aUPDwccQo6OTjy7Hct4AfBPD1GptF4fyUjIkQ9YtF98=
 google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw=

diff --git a/rpc/cloudagent/compute/moc_cloudagent_virtualmachine.pb.go b/rpc/cloudagent/compute/moc_cloudagent_virtualmachine.pb.go
diff --git a/rpc/cloudagent/compute/virtualmachine/moc_cloudagent_virtualmachine.proto b/rpc/cloudagent/compute/virtualmachine/moc_cloudagent_virtualmachine.proto
@@ -33,6 +33,7 @@ message SSHPublicKey {
 message Disk {
 	// reference to the virtual hard disk managed by storage
 	string diskname = 1;
+	VirtualMachineManagedDiskParameters managedDisk = 2;
 }
 
 message StorageConfiguration {

diff --git a/rpc/common/moc_common_computecommon.pb.go b/rpc/common/moc_common_computecommon.pb.go
diff --git a/rpc/common/moc_common_computecommon.proto b/rpc/common/moc_common_computecommon.proto
@@ -237,6 +237,19 @@ enum SecurityType {
         CONFIDENTIALVM = 2;
 }
 
+enum SecurityEncryptionTypes {
+    SecurityEncryptionNone = 0;
+    NonPersistedTPM = 1;
+}
+
+message VMDiskSecurityProfile {
+    SecurityEncryptionTypes securityEncryptionType = 1;
+}
+
+message VirtualMachineManagedDiskParameters {
+    VMDiskSecurityProfile securityProfile = 1;
+}
+
 message ProxyConfiguration {
 	string httpProxy = 1 [(sensitivecompute) = true];
 	string httpsProxy = 2 [(sensitivecompute) = true];

diff --git a/rpc/nodeagent/compute/moc_nodeagent_virtualmachine.pb.go b/rpc/nodeagent/compute/moc_nodeagent_virtualmachine.pb.go
diff --git a/rpc/nodeagent/compute/virtualmachine/moc_nodeagent_virtualmachine.proto b/rpc/nodeagent/compute/virtualmachine/moc_nodeagent_virtualmachine.proto
@@ -29,6 +29,7 @@ message SSHPublicKey {
 message Disk {
 	// reference to the virtual hard disk managed by storage
 	string diskname = 1;
+    VirtualMachineManagedDiskParameters managedDisk = 2;
 }
 
 message SharedFolder {