Merge pull request #176 from microsoft/user/sethbe/SecurityType

Adding SecurityType to ProtoBuf
microsoft · Jun 15, 2023 · a175882 · a175882
2 parents 4e6e5d5 + 5e0302c
commit a175882
Show file tree

Hide file tree

Showing 8 changed files with 356 additions and 297 deletions.
diff --git a/go.mod b/go.mod
@@ -20,7 +20,7 @@ require (
 	github.com/kr/pretty v0.1.0 // indirect
 	golang.org/x/net v0.8.0 // indirect
 	golang.org/x/sys v0.6.0 // indirect
-	golang.org/x/text v0.9.0 // indirect
+	golang.org/x/text v0.10.0 // indirect
 	google.golang.org/genproto v0.0.0-20200128133413-58ce757ed39b // indirect
 	google.golang.org/protobuf v1.30.0 // indirect
 	gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 // indirect

diff --git a/go.sum b/go.sum
@@ -72,8 +72,8 @@ golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuX
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
-golang.org/x/text v0.9.0 h1:2sjJmO8cDvYveuX97RDLsxlyUxLl+GHoLxBiRdHllBE=
-golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
+golang.org/x/text v0.10.0 h1:UpjohKhiEgNc0CSauXmwYftY1+LlaC75SJwh0SgCX58=
+golang.org/x/text v0.10.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=

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
@@ -99,6 +99,7 @@ message UefiSettings {
 message SecurityConfiguration {
 	bool enableTPM = 1;
 	UefiSettings uefiSettings = 2;
+	SecurityType securityType = 3;
 }
 
 message VirtualMachine {

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
@@ -154,3 +154,9 @@ enum Architecture {
 extend google.protobuf.FieldOptions {
 	bool sensitivecompute = 50002;
 }
+
+enum SecurityType {
+        NOTCONFIGURED = 0;
+        TRUSTEDLAUNCH = 1;
+        CONFIDENTIALVM = 2;
+}
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
@@ -102,6 +102,7 @@ message UefiSettings {
 message SecurityConfiguration {
 	bool enableTPM = 1;
 	UefiSettings uefiSettings = 2;
+	SecurityType securityType = 3;
 }
 
 message VirtualMachine {