Skip to content

uvm: omit default WCIFS FilterType for older GCS compatibility #2739

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

Open
rawahars wants to merge 1 commit into
base: main
Choose a base branch
from
+13 −0
Open

uvm: omit default WCIFS FilterType for older GCS compatibility #2739

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 13 additions & 0 deletions internal/uvm/combine_layers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,19 @@ func (uvm *UtilityVM) CombineLayersWCOW(ctx context.Context, layerPaths []hcssch
return errNotSupported
}

// FilterType was added to the CombinedLayers HCS schema in version 2.9.
// Inbox GCS (vmcomputeagent.exe) on older Windows hosts (e.g. Windows
// Server 2022) ships a pre-2.9 schema and uses a strict JSON unmarshaller
// that rejects unknown fields with HCS_E_INVALID_JSON ("$.FilterType").
// Since WCIFS is the default behavior on the GCS side when the field is
// absent, drop the value here so the `omitempty` JSON tag removes it from
// the wire format. This preserves behavior on newer GCS (which also defaults
// to WCIFS) while remaining compatible with older inbox GCS.
// See: https://github.com/microsoft/hcsshim/issues/2714
if filterType == hcsschema.WCIFS {
filterType = ""
}

var modifyRequest *hcsschema.ModifySettingRequest
if uvm.HasConfidentialPolicy() {
modifyRequest = &hcsschema.ModifySettingRequest{
Expand Down