Move around HCS schema and resource path definitions

cmd/containerd-shim-runhcs-v1/task_hcs.go

@@ -24,12 +24,12 @@ import (
 	"github.com/Microsoft/hcsshim/internal/cmd"
 	"github.com/Microsoft/hcsshim/internal/cow"
 	"github.com/Microsoft/hcsshim/internal/hcs"
+	"github.com/Microsoft/hcsshim/internal/hcs/schema1"
+	hcsschema "github.com/Microsoft/hcsshim/internal/hcs/schema2"
 	"github.com/Microsoft/hcsshim/internal/hcsoci"
 	"github.com/Microsoft/hcsshim/internal/log"
 	"github.com/Microsoft/hcsshim/internal/oci"
 	"github.com/Microsoft/hcsshim/internal/resources"
-	"github.com/Microsoft/hcsshim/internal/schema1"
-	hcsschema "github.com/Microsoft/hcsshim/internal/schema2"
 	"github.com/Microsoft/hcsshim/internal/shimdiag"
 	"github.com/Microsoft/hcsshim/internal/uvm"
 	"github.com/Microsoft/hcsshim/osversion"

cmd/runhcs/kill.go

@@ -5,7 +5,7 @@ import (
 
 	"github.com/Microsoft/hcsshim/internal/appargs"
 	"github.com/Microsoft/hcsshim/internal/hcs"
-	"github.com/Microsoft/hcsshim/internal/schema1"
+	"github.com/Microsoft/hcsshim/internal/hcs/schema1"
 	"github.com/Microsoft/hcsshim/internal/signals"
 	"github.com/Microsoft/hcsshim/osversion"
 	"github.com/urfave/cli"

cmd/runhcs/ps.go

@@ -7,7 +7,7 @@ import (
 	"os"
 
 	"github.com/Microsoft/hcsshim/internal/appargs"
-	"github.com/Microsoft/hcsshim/internal/schema1"
+	"github.com/Microsoft/hcsshim/internal/hcs/schema1"
 	"github.com/urfave/cli"
 )
 

computestorage/storage.go

@@ -4,7 +4,7 @@
 package computestorage
 
 import (
-	hcsschema "github.com/Microsoft/hcsshim/internal/schema2"
+	hcsschema "github.com/Microsoft/hcsshim/internal/hcs/schema2"
 )
 
 //go:generate go run ../mksyscall_windows.go -output zsyscall_windows.go storage.go

container.go

@@ -8,8 +8,8 @@ import (
 	"time"
 
 	"github.com/Microsoft/hcsshim/internal/hcs"
+	"github.com/Microsoft/hcsshim/internal/hcs/schema1"
 	"github.com/Microsoft/hcsshim/internal/mergemaps"
-	"github.com/Microsoft/hcsshim/internal/schema1"
 )
 
 // ContainerProperties holds the properties for a container and the processes running in that container

interface.go

@@ -4,7 +4,7 @@ import (
 	"io"
 	"time"
 
-	"github.com/Microsoft/hcsshim/internal/schema1"
+	"github.com/Microsoft/hcsshim/internal/hcs/schema1"
 )
 
 // ProcessConfig is used as both the input of Container.CreateProcess

internal/cmd/cmd.go

@@ -12,7 +12,7 @@ import (
 	"time"
 
 	"github.com/Microsoft/hcsshim/internal/cow"
-	hcsschema "github.com/Microsoft/hcsshim/internal/schema2"
+	hcsschema "github.com/Microsoft/hcsshim/internal/hcs/schema2"
 	specs "github.com/opencontainers/runtime-spec/specs-go"
 	"github.com/sirupsen/logrus"
 	"golang.org/x/sync/errgroup"

internal/cmd/cmd_test.go

@@ -15,7 +15,7 @@ import (
 	"time"
 
 	"github.com/Microsoft/hcsshim/internal/cow"
-	hcsschema "github.com/Microsoft/hcsshim/internal/schema2"
+	hcsschema "github.com/Microsoft/hcsshim/internal/hcs/schema2"
 )
 
 type localProcessHost struct {

internal/cow/cow.go

@@ -4,8 +4,8 @@ import (
 	"context"
 	"io"
 
-	"github.com/Microsoft/hcsshim/internal/schema1"
-	hcsschema "github.com/Microsoft/hcsshim/internal/schema2"
+	"github.com/Microsoft/hcsshim/internal/hcs/schema1"
+	hcsschema "github.com/Microsoft/hcsshim/internal/hcs/schema2"
 )
 
 // Process is the interface for an OS process running in a container or utility VM.

internal/cpugroup/cpugroup.go

@@ -8,7 +8,7 @@ import (
 	"strings"
 
 	"github.com/Microsoft/hcsshim/internal/hcs"
-	hcsschema "github.com/Microsoft/hcsshim/internal/schema2"
+	hcsschema "github.com/Microsoft/hcsshim/internal/hcs/schema2"
 )
 
 const NullGroupID = "00000000-0000-0000-0000-000000000000"

internal/credentials/credentials.go

@@ -12,8 +12,8 @@ import (
 	"fmt"
 
 	"github.com/Microsoft/hcsshim/internal/hcs"
+	hcsschema "github.com/Microsoft/hcsshim/internal/hcs/schema2"
 	"github.com/Microsoft/hcsshim/internal/log"
-	hcsschema "github.com/Microsoft/hcsshim/internal/schema2"
 )
 
 // Container Credential Guard is in HCS's own words "The solution to

internal/gcs/container.go

@@ -7,10 +7,10 @@ import (
 	"time"
 
 	"github.com/Microsoft/hcsshim/internal/cow"
+	"github.com/Microsoft/hcsshim/internal/hcs/schema1"
+	hcsschema "github.com/Microsoft/hcsshim/internal/hcs/schema2"
 	"github.com/Microsoft/hcsshim/internal/log"
 	"github.com/Microsoft/hcsshim/internal/oc"
-	"github.com/Microsoft/hcsshim/internal/schema1"
-	hcsschema "github.com/Microsoft/hcsshim/internal/schema2"
 	"go.opencensus.io/trace"
 )
 

internal/gcs/guestconnection.go

@@ -15,10 +15,10 @@ import (
 	"github.com/Microsoft/go-winio"
 	"github.com/Microsoft/go-winio/pkg/guid"
 	"github.com/Microsoft/hcsshim/internal/cow"
+	"github.com/Microsoft/hcsshim/internal/hcs/schema1"
 	"github.com/Microsoft/hcsshim/internal/log"
 	"github.com/Microsoft/hcsshim/internal/logfields"
 	"github.com/Microsoft/hcsshim/internal/oc"
-	"github.com/Microsoft/hcsshim/internal/schema1"
 	"github.com/sirupsen/logrus"
 	"go.opencensus.io/trace"
 )

internal/gcs/protocol.go

@@ -5,8 +5,8 @@ import (
 	"fmt"
 
 	"github.com/Microsoft/go-winio/pkg/guid"
-	"github.com/Microsoft/hcsshim/internal/schema1"
-	hcsschema "github.com/Microsoft/hcsshim/internal/schema2"
+	"github.com/Microsoft/hcsshim/internal/hcs/schema1"
+	hcsschema "github.com/Microsoft/hcsshim/internal/hcs/schema2"
 )
 
 // LinuxGcsVsockPort is the vsock port number that the Linux GCS will

internal/guestrequest/types.go

@@ -1,7 +1,7 @@
 package guestrequest
 
 import (
-	hcsschema "github.com/Microsoft/hcsshim/internal/schema2"
+	hcsschema "github.com/Microsoft/hcsshim/internal/hcs/schema2"
 )
 
 // Arguably, many of these (at least CombinedLayers) should have been generated

internal/hcs/resourcepaths/silo.go

@@ -0,0 +1,11 @@
+package resourcepaths
+
+//nolint:deadcode,varcheck
+const (
+	// silo container resources paths
+	SiloDeviceResourcePath          string = "Container/Devices/Generic"
+	SiloMappedDirectoryResourcePath string = "Container/MappedDirectories"
+	SiloMappedPipeResourcePath      string = "Container/MappedPipes"
+	SiloMemoryResourcePath          string = "Container/Memory/SizeInMB"
+	SiloRegistryFlushStatePath      string = "Container/RegistryFlushState"
+)

internal/hcs/resourcepaths/virtualmachine.go

@@ -0,0 +1,24 @@
+package resourcepaths
+
+//nolint:deadcode,varcheck
+const (
+	GPUResourcePath                  string = "VirtualMachine/ComputeTopology/Gpu"
+	MemoryResourcePath               string = "VirtualMachine/ComputeTopology/Memory/SizeInMB"
+	CPUGroupResourcePath             string = "VirtualMachine/ComputeTopology/Processor/CpuGroup"
+	IdledResourcePath                string = "VirtualMachine/ComputeTopology/Processor/IdledProcessors"
+	CPUFrequencyPowerCapResourcePath string = "VirtualMachine/ComputeTopology/Processor/CpuFrequencyPowerCap"
+	CPULimitsResourcePath            string = "VirtualMachine/ComputeTopology/Processor/Limits"
+	SerialResourceFormat             string = "VirtualMachine/Devices/ComPorts/%d"
+	FlexibleIovResourceFormat        string = "VirtualMachine/Devices/FlexibleIov/%s"
+	LicensingResourcePath            string = "VirtualMachine/Devices/Licensing"
+	MappedPipeResourceFormat         string = "VirtualMachine/Devices/MappedPipes/%s"
+	NetworkResourceFormat            string = "VirtualMachine/Devices/NetworkAdapters/%s"
+	Plan9ShareResourcePath           string = "VirtualMachine/Devices/Plan9/Shares"
+	SCSIResourceFormat               string = "VirtualMachine/Devices/Scsi/%s/Attachments/%d"
+	SharedMemoryRegionResourcePath   string = "VirtualMachine/Devices/SharedMemory/Regions"
+	VirtualPCIResourceFormat         string = "VirtualMachine/Devices/VirtualPci/%s"
+	VPMemControllerResourceFormat    string = "VirtualMachine/Devices/VirtualPMem/Devices/%d"
+	VPMemDeviceResourceFormat        string = "VirtualMachine/Devices/VirtualPMem/Devices/%d/Mappings/%d"
+	VSMBShareResourcePath            string = "VirtualMachine/Devices/VirtualSmb/Shares"
+	HvSocketConfigResourceFormat     string = "VirtualMachine/Devices/HvSocket/HvSocketConfig/ServiceTable/%s"
+)

internal/schema1/schema1.go → internal/hcs/schema1/schema1.go

@@ -5,7 +5,7 @@ import (
 	"time"
 
 	"github.com/Microsoft/go-winio/pkg/guid"
-	hcsschema "github.com/Microsoft/hcsshim/internal/schema2"
+	hcsschema "github.com/Microsoft/hcsshim/internal/hcs/schema2"
 )
 
 // ProcessConfig is used as both the input of Container.CreateProcess

internal/hcs/service.go

@@ -4,7 +4,7 @@ import (
 	"context"
 	"encoding/json"
 
-	hcsschema "github.com/Microsoft/hcsshim/internal/schema2"
+	hcsschema "github.com/Microsoft/hcsshim/internal/hcs/schema2"
 	"github.com/Microsoft/hcsshim/internal/vmcompute"
 )
 

internal/hcs/system.go

@@ -9,10 +9,10 @@ import (
 	"syscall"
 
 	"github.com/Microsoft/hcsshim/internal/cow"
+	"github.com/Microsoft/hcsshim/internal/hcs/schema1"
+	hcsschema "github.com/Microsoft/hcsshim/internal/hcs/schema2"
 	"github.com/Microsoft/hcsshim/internal/log"
 	"github.com/Microsoft/hcsshim/internal/oc"
-	"github.com/Microsoft/hcsshim/internal/schema1"
-	hcsschema "github.com/Microsoft/hcsshim/internal/schema2"
 	"github.com/Microsoft/hcsshim/internal/timeout"
 	"github.com/Microsoft/hcsshim/internal/vmcompute"
 	"go.opencensus.io/trace"

internal/hcsoci/clone.go

@@ -7,13 +7,9 @@ import (
 	"fmt"
 
 	"github.com/Microsoft/hcsshim/internal/cow"
+	"github.com/Microsoft/hcsshim/internal/hcs/resourcepaths"
+	hcsschema "github.com/Microsoft/hcsshim/internal/hcs/schema2"
 	"github.com/Microsoft/hcsshim/internal/requesttype"
-	hcsschema "github.com/Microsoft/hcsshim/internal/schema2"
-)
-
-const (
-	MappedDirectoryResourcePath = "Container/MappedDirectories"
-	MappedPipeResourcePath      = "Container/MappedPipes"
 )
 
 // Usually mounts specified in the container config are added in the container doc
@@ -26,7 +22,7 @@ func addMountsToClone(ctx context.Context, c cow.Container, mounts *mountsConfig
 	for _, md := range mounts.mdsv2 {
 		requestDocument := &hcsschema.ModifySettingRequest{
 			RequestType:  requesttype.Add,
-			ResourcePath: MappedDirectoryResourcePath,
+			ResourcePath: resourcepaths.SiloMappedDirectoryResourcePath,
 			Settings:     md,
 		}
 		err := c.Modify(ctx, requestDocument)
@@ -38,7 +34,7 @@ func addMountsToClone(ctx context.Context, c cow.Container, mounts *mountsConfig
 	for _, mp := range mounts.mpsv2 {
 		requestDocument := &hcsschema.ModifySettingRequest{
 			RequestType:  requesttype.Add,
-			ResourcePath: MappedPipeResourcePath,
+			ResourcePath: resourcepaths.SiloMappedPipeResourcePath,
 			Settings:     mp,
 		}
 		err := c.Modify(ctx, requestDocument)

internal/hcsoci/create.go

@@ -14,10 +14,10 @@ import (
 	"github.com/Microsoft/hcsshim/internal/clone"
 	"github.com/Microsoft/hcsshim/internal/cow"
 	"github.com/Microsoft/hcsshim/internal/hcs"
+	hcsschema "github.com/Microsoft/hcsshim/internal/hcs/schema2"
 	"github.com/Microsoft/hcsshim/internal/log"
 	"github.com/Microsoft/hcsshim/internal/oci"
 	"github.com/Microsoft/hcsshim/internal/resources"
-	hcsschema "github.com/Microsoft/hcsshim/internal/schema2"
 	"github.com/Microsoft/hcsshim/internal/schemaversion"
 	"github.com/Microsoft/hcsshim/internal/uvm"
 	specs "github.com/opencontainers/runtime-spec/specs-go"

internal/hcsoci/hcsdoc_lcow.go

@@ -6,8 +6,8 @@ import (
 	"context"
 	"encoding/json"
 
+	hcsschema "github.com/Microsoft/hcsshim/internal/hcs/schema2"
 	"github.com/Microsoft/hcsshim/internal/log"
-	hcsschema "github.com/Microsoft/hcsshim/internal/schema2"
 	"github.com/Microsoft/hcsshim/internal/schemaversion"
 	specs "github.com/opencontainers/runtime-spec/specs-go"
 )

internal/hcsoci/hcsdoc_wcow.go

@@ -9,12 +9,12 @@ import (
 	"regexp"
 	"strings"
 
+	"github.com/Microsoft/hcsshim/internal/hcs/schema1"
+	hcsschema "github.com/Microsoft/hcsshim/internal/hcs/schema2"
 	"github.com/Microsoft/hcsshim/internal/layers"
 	"github.com/Microsoft/hcsshim/internal/log"
 	"github.com/Microsoft/hcsshim/internal/oci"
 	"github.com/Microsoft/hcsshim/internal/processorinfo"
-	"github.com/Microsoft/hcsshim/internal/schema1"
-	hcsschema "github.com/Microsoft/hcsshim/internal/schema2"
 	"github.com/Microsoft/hcsshim/internal/uvm"
 	"github.com/Microsoft/hcsshim/internal/uvmfolder"
 	"github.com/Microsoft/hcsshim/internal/wclayer"

internal/jobcontainers/jobcontainer.go

@@ -15,12 +15,12 @@ import (
 	"github.com/Microsoft/go-winio/pkg/guid"
 	"github.com/Microsoft/hcsshim/internal/cow"
 	"github.com/Microsoft/hcsshim/internal/hcs"
+	"github.com/Microsoft/hcsshim/internal/hcs/schema1"
+	hcsschema "github.com/Microsoft/hcsshim/internal/hcs/schema2"
 	"github.com/Microsoft/hcsshim/internal/jobobject"
 	"github.com/Microsoft/hcsshim/internal/layers"
 	"github.com/Microsoft/hcsshim/internal/log"
 	"github.com/Microsoft/hcsshim/internal/queue"
-	"github.com/Microsoft/hcsshim/internal/schema1"
-	hcsschema "github.com/Microsoft/hcsshim/internal/schema2"
 	"github.com/Microsoft/hcsshim/internal/winapi"
 	specs "github.com/opencontainers/runtime-spec/specs-go"
 	"github.com/pkg/errors"

internal/layers/layers.go

@@ -8,9 +8,9 @@ import (
 	"fmt"
 	"path/filepath"
 
+	hcsschema "github.com/Microsoft/hcsshim/internal/hcs/schema2"
 	"github.com/Microsoft/hcsshim/internal/log"
 	"github.com/Microsoft/hcsshim/internal/ospath"
-	hcsschema "github.com/Microsoft/hcsshim/internal/schema2"
 	"github.com/Microsoft/hcsshim/internal/uvm"
 	uvmpkg "github.com/Microsoft/hcsshim/internal/uvm"
 	"github.com/Microsoft/hcsshim/internal/wclayer"

internal/processorinfo/host_information.go

@@ -7,7 +7,7 @@ import (
 	"fmt"
 
 	"github.com/Microsoft/hcsshim/internal/hcs"
-	hcsschema "github.com/Microsoft/hcsshim/internal/schema2"
+	hcsschema "github.com/Microsoft/hcsshim/internal/hcs/schema2"
 )
 
 // HostProcessorInfo queries HCS for the host's processor information, including topology

internal/schemaversion/schemaversion.go

@@ -6,7 +6,7 @@ import (
 	"encoding/json"
 	"fmt"
 
-	hcsschema "github.com/Microsoft/hcsshim/internal/schema2"
+	hcsschema "github.com/Microsoft/hcsshim/internal/hcs/schema2"
 	"github.com/Microsoft/hcsshim/osversion"
 	"github.com/sirupsen/logrus"
 )

internal/uvm/capabilities.go

@@ -1,6 +1,6 @@
 package uvm
 
-import "github.com/Microsoft/hcsshim/internal/schema1"
+import "github.com/Microsoft/hcsshim/internal/hcs/schema1"
 
 // SignalProcessSupported returns `true` if the guest supports the capability to
 // signal a process.

internal/uvm/clone.go

@@ -5,7 +5,7 @@ import (
 	"fmt"
 
 	"github.com/Microsoft/hcsshim/internal/cow"
-	hcsschema "github.com/Microsoft/hcsshim/internal/schema2"
+	hcsschema "github.com/Microsoft/hcsshim/internal/hcs/schema2"
 	"github.com/pkg/errors"
 )
 

internal/uvm/combine_layers.go

@@ -4,8 +4,8 @@ import (
 	"context"
 
 	"github.com/Microsoft/hcsshim/internal/guestrequest"
+	hcsschema "github.com/Microsoft/hcsshim/internal/hcs/schema2"
 	"github.com/Microsoft/hcsshim/internal/requesttype"
-	hcsschema "github.com/Microsoft/hcsshim/internal/schema2"
 )
 
 // CombineLayersWCOW combines `layerPaths` with `containerRootPath` into the

internal/uvm/computeagent.go

@@ -6,8 +6,8 @@ import (
 
 	"github.com/Microsoft/go-winio"
 	"github.com/Microsoft/hcsshim/internal/computeagent"
+	hcsschema "github.com/Microsoft/hcsshim/internal/hcs/schema2"
 	"github.com/Microsoft/hcsshim/internal/hns"
-	hcsschema "github.com/Microsoft/hcsshim/internal/schema2"
 	"github.com/Microsoft/hcsshim/pkg/octtrpc"
 	"github.com/containerd/ttrpc"
 	"github.com/pkg/errors"