Skip to content

Commit d744385

Browse files
committed
C-WCOW: Use existing policy related function
Signed-off-by: Mahati Chamarthy <mahati.chamarthy@gmail.com>
1 parent 1b56509 commit d744385

File tree

3 files changed

+4
-11
lines changed

3 files changed

+4
-11
lines changed

internal/hcsoci/create.go

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -265,11 +265,7 @@ func CreateContainer(ctx context.Context, createOptions *CreateOptions) (_ cow.C
265265
// v1 Argon or Xenon. Pass the document directly to HCS.
266266
hcsDocument = v1
267267
} else if coi.HostingSystem != nil {
268-
isCWCOWUVM := false
269-
if createOptions.HostingSystem.WCOWconfidentialUVMOptions != nil {
270-
isCWCOWUVM = true
271-
}
272-
if isCWCOWUVM {
268+
if coi.HostingSystem.HasConfidentialPolicy() {
273269
// confidential wcow uvm
274270
gcsDocument = &guestresource.CWCOWHostedSystem{
275271
Spec: *createOptions.Spec,

internal/uvm/start.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -337,10 +337,10 @@ func (uvm *UtilityVM) Start(ctx context.Context) (err error) {
337337
}
338338
}
339339

340-
if uvm.WCOWconfidentialUVMOptions != nil && uvm.OS() == "windows" {
340+
if uvm.HasConfidentialPolicy() && uvm.OS() == "windows" {
341341
copts := []WCOWConfidentialUVMOpt{
342-
WithWCOWSecurityPolicy(uvm.WCOWconfidentialUVMOptions.WCOWSecurityPolicy),
343-
WithWCOWSecurityPolicyEnforcer(uvm.WCOWconfidentialUVMOptions.WCOWSecurityPolicyEnforcer),
342+
WithWCOWSecurityPolicy(uvm.createOpts.(OptionsWCOW).SecurityPolicy),
343+
WithWCOWSecurityPolicyEnforcer(uvm.createOpts.(OptionsWCOW).SecurityPolicyEnforcer),
344344
}
345345
if err := uvm.SetWCOWConfidentialUVMOptions(ctx, copts...); err != nil {
346346
return err

internal/uvm/types.go

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ import (
1414
"github.com/Microsoft/hcsshim/hcn"
1515
"github.com/Microsoft/hcsshim/internal/gcs"
1616
"github.com/Microsoft/hcsshim/internal/hcs"
17-
"github.com/Microsoft/hcsshim/internal/protocol/guestresource"
1817
"github.com/Microsoft/hcsshim/internal/uvm/scsi"
1918
)
2019

@@ -147,8 +146,6 @@ type UtilityVM struct {
147146
// ref counting for block CIMs
148147
blockCIMMounts map[string]*UVMMountedBlockCIMs
149148
blockCIMMountLock sync.Mutex
150-
// WCOWconfidentialUVMOptions hold confidential UVM specific options
151-
WCOWconfidentialUVMOptions *guestresource.WCOWConfidentialOptions
152149
}
153150

154151
func (uvm *UtilityVM) ScratchEncryptionEnabled() bool {

0 commit comments

Comments
 (0)