diff --git a/credentials/credentials.go b/credentials/credentials.go index d1df180994..0c98eb1493 100644 --- a/credentials/credentials.go +++ b/credentials/credentials.go @@ -1,3 +1,4 @@ +//go:build windows // +build windows // Package credentials holds the necessary structs and functions for adding diff --git a/devices/assigned_devices.go b/devices/assigned_devices.go index 3f4f3c27b2..3e9269aebc 100644 --- a/devices/assigned_devices.go +++ b/devices/assigned_devices.go @@ -1,3 +1,4 @@ +//go:build windows // +build windows package devices diff --git a/devices/drivers.go b/devices/drivers.go index f37911efe6..6866d9f628 100644 --- a/devices/drivers.go +++ b/devices/drivers.go @@ -1,3 +1,4 @@ +//go:build windows // +build windows package devices diff --git a/devices/pnp.go b/devices/pnp.go index 4714090839..8f039962d5 100644 --- a/devices/pnp.go +++ b/devices/pnp.go @@ -1,3 +1,4 @@ +//go:build windows // +build windows package devices diff --git a/guest/bridge/bridge.go b/guest/bridge/bridge.go index 7a399820cb..2d2e56c768 100644 --- a/guest/bridge/bridge.go +++ b/guest/bridge/bridge.go @@ -1,3 +1,4 @@ +//go:build linux // +build linux // Package bridge defines the bridge struct, which implements the control loop diff --git a/guest/bridge/bridge_unit_test.go b/guest/bridge/bridge_unit_test.go index f388f8a02a..f0236fbb2a 100644 --- a/guest/bridge/bridge_unit_test.go +++ b/guest/bridge/bridge_unit_test.go @@ -1,3 +1,4 @@ +//go:build linux // +build linux package bridge diff --git a/guest/bridge/bridge_v2.go b/guest/bridge/bridge_v2.go index 460579b524..4830b02f2b 100644 --- a/guest/bridge/bridge_v2.go +++ b/guest/bridge/bridge_v2.go @@ -1,3 +1,4 @@ +//go:build linux // +build linux package bridge diff --git a/guest/network/netns.go b/guest/network/netns.go index cfba62ef40..d714812c5a 100644 --- a/guest/network/netns.go +++ b/guest/network/netns.go @@ -1,3 +1,4 @@ +//go:build linux // +build linux package network diff --git a/guest/network/network.go b/guest/network/network.go index ec4f1fc9bd..d286952271 100644 --- a/guest/network/network.go +++ b/guest/network/network.go @@ -1,3 +1,4 @@ +//go:build linux // +build linux package network diff --git a/guest/network/network_test.go b/guest/network/network_test.go index 21e3728a8c..28ae3bdc97 100644 --- a/guest/network/network_test.go +++ b/guest/network/network_test.go @@ -1,3 +1,4 @@ +//go:build linux // +build linux package network diff --git a/guest/runtime/hcsv2/container.go b/guest/runtime/hcsv2/container.go index 9dcd080cb3..5f6a8fea33 100644 --- a/guest/runtime/hcsv2/container.go +++ b/guest/runtime/hcsv2/container.go @@ -1,3 +1,4 @@ +//go:build linux // +build linux package hcsv2 diff --git a/guest/runtime/hcsv2/network.go b/guest/runtime/hcsv2/network.go index 9ff739c47e..6a592b8240 100644 --- a/guest/runtime/hcsv2/network.go +++ b/guest/runtime/hcsv2/network.go @@ -1,3 +1,4 @@ +//go:build linux // +build linux package hcsv2 diff --git a/guest/runtime/hcsv2/network_test.go b/guest/runtime/hcsv2/network_test.go index e73d256c4a..3a428ba159 100644 --- a/guest/runtime/hcsv2/network_test.go +++ b/guest/runtime/hcsv2/network_test.go @@ -1,3 +1,4 @@ +//go:build linux // +build linux package hcsv2 diff --git a/guest/runtime/hcsv2/nvidia_utils.go b/guest/runtime/hcsv2/nvidia_utils.go index 206eb4fade..84cae4718b 100644 --- a/guest/runtime/hcsv2/nvidia_utils.go +++ b/guest/runtime/hcsv2/nvidia_utils.go @@ -1,3 +1,4 @@ +//go:build linux // +build linux package hcsv2 diff --git a/guest/runtime/hcsv2/process.go b/guest/runtime/hcsv2/process.go index c4343525c9..0a7dee8b30 100644 --- a/guest/runtime/hcsv2/process.go +++ b/guest/runtime/hcsv2/process.go @@ -1,3 +1,4 @@ +//go:build linux // +build linux package hcsv2 diff --git a/guest/runtime/hcsv2/sandbox_container.go b/guest/runtime/hcsv2/sandbox_container.go index 14e3366003..ddfbace177 100644 --- a/guest/runtime/hcsv2/sandbox_container.go +++ b/guest/runtime/hcsv2/sandbox_container.go @@ -1,3 +1,4 @@ +//go:build linux // +build linux package hcsv2 diff --git a/guest/runtime/hcsv2/spec.go b/guest/runtime/hcsv2/spec.go index ca38ca92af..a0be478804 100644 --- a/guest/runtime/hcsv2/spec.go +++ b/guest/runtime/hcsv2/spec.go @@ -1,3 +1,4 @@ +//go:build linux // +build linux package hcsv2 diff --git a/guest/runtime/hcsv2/standalone_container.go b/guest/runtime/hcsv2/standalone_container.go index 5586b2446c..8ea0275cac 100644 --- a/guest/runtime/hcsv2/standalone_container.go +++ b/guest/runtime/hcsv2/standalone_container.go @@ -1,3 +1,4 @@ +//go:build linux // +build linux package hcsv2 diff --git a/guest/runtime/hcsv2/uvm.go b/guest/runtime/hcsv2/uvm.go index b1ec2c1001..c3768afac0 100644 --- a/guest/runtime/hcsv2/uvm.go +++ b/guest/runtime/hcsv2/uvm.go @@ -1,3 +1,4 @@ +//go:build linux // +build linux package hcsv2 diff --git a/guest/runtime/hcsv2/workload_container.go b/guest/runtime/hcsv2/workload_container.go index a929650fa0..d271c162ef 100644 --- a/guest/runtime/hcsv2/workload_container.go +++ b/guest/runtime/hcsv2/workload_container.go @@ -1,3 +1,4 @@ +//go:build linux // +build linux package hcsv2 diff --git a/guest/runtime/runc/ioutils.go b/guest/runtime/runc/ioutils.go index 9a00cb1af8..328affd084 100644 --- a/guest/runtime/runc/ioutils.go +++ b/guest/runtime/runc/ioutils.go @@ -1,3 +1,4 @@ +//go:build linux // +build linux package runc diff --git a/guest/runtime/runc/runc.go b/guest/runtime/runc/runc.go index e6d929f5d1..1456d04e93 100644 --- a/guest/runtime/runc/runc.go +++ b/guest/runtime/runc/runc.go @@ -1,3 +1,4 @@ +//go:build linux // +build linux // Package runc defines an implementation of the Runtime interface which uses diff --git a/guest/runtime/runc/utils.go b/guest/runtime/runc/utils.go index 4d09da84b3..5c4caebc85 100644 --- a/guest/runtime/runc/utils.go +++ b/guest/runtime/runc/utils.go @@ -1,3 +1,4 @@ +//go:build linux // +build linux package runc diff --git a/guest/runtime/runtime.go b/guest/runtime/runtime.go index 7f4854f906..ecf6c3e003 100644 --- a/guest/runtime/runtime.go +++ b/guest/runtime/runtime.go @@ -1,3 +1,4 @@ +//go:build linux // +build linux // Package runtime defines the interface between the GCS and an OCI container diff --git a/guest/stdio/connection.go b/guest/stdio/connection.go index 9458596489..0ab2485acd 100644 --- a/guest/stdio/connection.go +++ b/guest/stdio/connection.go @@ -1,3 +1,4 @@ +//go:build linux // +build linux package stdio diff --git a/guest/stdio/stdio.go b/guest/stdio/stdio.go index 0a71823f3e..6e0f7cf9c7 100644 --- a/guest/stdio/stdio.go +++ b/guest/stdio/stdio.go @@ -1,3 +1,4 @@ +//go:build linux // +build linux package stdio diff --git a/guest/stdio/tty.go b/guest/stdio/tty.go index 4f4bc7dc11..a05a2cb15d 100644 --- a/guest/stdio/tty.go +++ b/guest/stdio/tty.go @@ -1,3 +1,4 @@ +//go:build linux // +build linux package stdio diff --git a/guest/storage/crypt/crypt.go b/guest/storage/crypt/crypt.go index 607ce18f92..268973fdc1 100644 --- a/guest/storage/crypt/crypt.go +++ b/guest/storage/crypt/crypt.go @@ -1,3 +1,4 @@ +//go:build linux // +build linux package crypt diff --git a/guest/storage/crypt/crypt_test.go b/guest/storage/crypt/crypt_test.go index c7bab94486..b5f31599c6 100644 --- a/guest/storage/crypt/crypt_test.go +++ b/guest/storage/crypt/crypt_test.go @@ -1,3 +1,4 @@ +//go:build linux // +build linux package crypt diff --git a/guest/storage/crypt/utilities.go b/guest/storage/crypt/utilities.go index 7fcecde0ac..dcafd6346f 100644 --- a/guest/storage/crypt/utilities.go +++ b/guest/storage/crypt/utilities.go @@ -1,3 +1,4 @@ +//go:build linux // +build linux package crypt diff --git a/guest/storage/devicemapper/devicemapper.go b/guest/storage/devicemapper/devicemapper.go index c7157fe445..3b313284c1 100644 --- a/guest/storage/devicemapper/devicemapper.go +++ b/guest/storage/devicemapper/devicemapper.go @@ -1,3 +1,4 @@ +//go:build linux // +build linux package devicemapper diff --git a/guest/storage/devicemapper/devicemapper_test.go b/guest/storage/devicemapper/devicemapper_test.go index 278345b484..76d5e56f69 100644 --- a/guest/storage/devicemapper/devicemapper_test.go +++ b/guest/storage/devicemapper/devicemapper_test.go @@ -1,3 +1,4 @@ +//go:build linux // +build linux package devicemapper diff --git a/guest/storage/devicemapper/targets.go b/guest/storage/devicemapper/targets.go index 0d1422a1cf..9adfa0c108 100644 --- a/guest/storage/devicemapper/targets.go +++ b/guest/storage/devicemapper/targets.go @@ -1,3 +1,4 @@ +//go:build linux // +build linux package devicemapper diff --git a/guest/storage/mount.go b/guest/storage/mount.go index 9fe230136c..4d6d9ec0ba 100644 --- a/guest/storage/mount.go +++ b/guest/storage/mount.go @@ -1,3 +1,4 @@ +//go:build linux // +build linux package storage diff --git a/guest/storage/mount_test.go b/guest/storage/mount_test.go index 2ddb838d69..be419a87a3 100644 --- a/guest/storage/mount_test.go +++ b/guest/storage/mount_test.go @@ -1,3 +1,4 @@ +//go:build linux // +build linux package storage diff --git a/guest/storage/overlay/overlay.go b/guest/storage/overlay/overlay.go index 8c2de80268..b370ab888c 100644 --- a/guest/storage/overlay/overlay.go +++ b/guest/storage/overlay/overlay.go @@ -1,3 +1,4 @@ +//go:build linux // +build linux package overlay diff --git a/guest/storage/overlay/overlay_test.go b/guest/storage/overlay/overlay_test.go index 828ee2a955..668c5f0289 100644 --- a/guest/storage/overlay/overlay_test.go +++ b/guest/storage/overlay/overlay_test.go @@ -1,3 +1,4 @@ +//go:build linux // +build linux package overlay diff --git a/guest/storage/pci/pci.go b/guest/storage/pci/pci.go index f77222db95..26828fa636 100644 --- a/guest/storage/pci/pci.go +++ b/guest/storage/pci/pci.go @@ -1,3 +1,4 @@ +//go:build linux // +build linux package pci diff --git a/guest/storage/pci/pci_test.go b/guest/storage/pci/pci_test.go index 2c27dc4f96..632624c3e0 100644 --- a/guest/storage/pci/pci_test.go +++ b/guest/storage/pci/pci_test.go @@ -1,3 +1,4 @@ +//go:build linux // +build linux package pci diff --git a/guest/storage/plan9/plan9.go b/guest/storage/plan9/plan9.go index 796d4685cc..28aa080207 100644 --- a/guest/storage/plan9/plan9.go +++ b/guest/storage/plan9/plan9.go @@ -1,3 +1,4 @@ +//go:build linux // +build linux package plan9 diff --git a/guest/storage/pmem/pmem.go b/guest/storage/pmem/pmem.go index 8826e3d00d..3a94069b0c 100644 --- a/guest/storage/pmem/pmem.go +++ b/guest/storage/pmem/pmem.go @@ -1,3 +1,4 @@ +//go:build linux // +build linux package pmem diff --git a/guest/storage/pmem/pmem_test.go b/guest/storage/pmem/pmem_test.go index be61d70b11..354ea3ab7a 100644 --- a/guest/storage/pmem/pmem_test.go +++ b/guest/storage/pmem/pmem_test.go @@ -1,3 +1,4 @@ +//go:build linux // +build linux package pmem diff --git a/guest/storage/scsi/scsi.go b/guest/storage/scsi/scsi.go index fbcebf3754..cdd02b02ab 100644 --- a/guest/storage/scsi/scsi.go +++ b/guest/storage/scsi/scsi.go @@ -1,3 +1,4 @@ +//go:build linux // +build linux package scsi diff --git a/guest/storage/scsi/scsi_test.go b/guest/storage/scsi/scsi_test.go index 853cb83df7..8137421314 100644 --- a/guest/storage/scsi/scsi_test.go +++ b/guest/storage/scsi/scsi_test.go @@ -1,3 +1,4 @@ +//go:build linux // +build linux package scsi diff --git a/guest/storage/utilities.go b/guest/storage/utilities.go index 1a4727e537..2cbef13f08 100644 --- a/guest/storage/utilities.go +++ b/guest/storage/utilities.go @@ -1,3 +1,4 @@ +//go:build linux // +build linux package storage diff --git a/guest/storage/utilities_test.go b/guest/storage/utilities_test.go index 239f95f056..5b787099af 100644 --- a/guest/storage/utilities_test.go +++ b/guest/storage/utilities_test.go @@ -1,3 +1,4 @@ +//go:build linux // +build linux package storage diff --git a/guest/storage/vmbus/vmbus.go b/guest/storage/vmbus/vmbus.go index 6ea91bbb9c..513e24b6e8 100644 --- a/guest/storage/vmbus/vmbus.go +++ b/guest/storage/vmbus/vmbus.go @@ -1,3 +1,4 @@ +//go:build linux // +build linux package vmbus diff --git a/guest/storage/vmbus/vmbus_test.go b/guest/storage/vmbus/vmbus_test.go index 491865c21d..ff1dcf072e 100644 --- a/guest/storage/vmbus/vmbus_test.go +++ b/guest/storage/vmbus/vmbus_test.go @@ -1,3 +1,4 @@ +//go:build linux // +build linux package vmbus diff --git a/hcsoci/clone.go b/hcsoci/clone.go index f2a103ffaa..d92531ab0a 100644 --- a/hcsoci/clone.go +++ b/hcsoci/clone.go @@ -1,3 +1,4 @@ +//go:build windows // +build windows package hcsoci diff --git a/hcsoci/create.go b/hcsoci/create.go index 5f80fd2f26..6c9640f878 100644 --- a/hcsoci/create.go +++ b/hcsoci/create.go @@ -1,3 +1,4 @@ +//go:build windows // +build windows package hcsoci diff --git a/hcsoci/hcsdoc_lcow.go b/hcsoci/hcsdoc_lcow.go index 4b202e2d2a..5612cd18f0 100644 --- a/hcsoci/hcsdoc_lcow.go +++ b/hcsoci/hcsdoc_lcow.go @@ -1,3 +1,4 @@ +//go:build windows // +build windows package hcsoci diff --git a/hcsoci/hcsdoc_wcow.go b/hcsoci/hcsdoc_wcow.go index 8f51420540..688d901609 100644 --- a/hcsoci/hcsdoc_wcow.go +++ b/hcsoci/hcsdoc_wcow.go @@ -1,3 +1,4 @@ +//go:build windows // +build windows package hcsoci diff --git a/hcsoci/resources_lcow.go b/hcsoci/resources_lcow.go index 8038231e50..085854a4c7 100644 --- a/hcsoci/resources_lcow.go +++ b/hcsoci/resources_lcow.go @@ -1,3 +1,4 @@ +//go:build windows // +build windows package hcsoci diff --git a/hcsoci/resources_wcow.go b/hcsoci/resources_wcow.go index d7ce96e2a7..1150ca5c3c 100644 --- a/hcsoci/resources_wcow.go +++ b/hcsoci/resources_wcow.go @@ -1,3 +1,4 @@ +//go:build windows // +build windows package hcsoci diff --git a/hns/hnspolicy.go b/hns/hnspolicy.go index 591a2631e4..a80a0c9ba2 100644 --- a/hns/hnspolicy.go +++ b/hns/hnspolicy.go @@ -93,15 +93,15 @@ type ACLPolicy struct { InternalPort uint16 `json:",omitempty"` Action ActionType Direction DirectionType - LocalAddresses string `json:",omitempty"` - RemoteAddresses string `json:",omitempty"` - LocalPorts string `json:"LocalPorts,omitempty"` - LocalPort uint16 `json:",omitempty"` - RemotePorts string `json:"RemotePorts,omitempty"` - RemotePort uint16 `json:",omitempty"` - RuleType RuleType `json:"RuleType,omitempty"` - Priority uint16 `json:",omitempty"` - ServiceName string `json:",omitempty"` + LocalAddresses string `json:",omitempty"` + RemoteAddresses string `json:",omitempty"` + LocalPorts string `json:"LocalPorts,omitempty"` + LocalPort uint16 `json:",omitempty"` + RemotePorts string `json:"RemotePorts,omitempty"` + RemotePort uint16 `json:",omitempty"` + RuleType RuleType `json:"RuleType,omitempty"` + Priority uint16 `json:",omitempty"` + ServiceName string `json:",omitempty"` } type Policy struct { diff --git a/layers/layers.go b/layers/layers.go index 0cf06b92d7..fc3488dd3f 100644 --- a/layers/layers.go +++ b/layers/layers.go @@ -1,3 +1,4 @@ +//go:build windows // +build windows // Package layers deals with container layer mounting/unmounting for LCOW and WCOW diff --git a/safefile/safeopen_admin_test.go b/safefile/safeopen_admin_test.go index 99cee4a8e2..47a1dee219 100644 --- a/safefile/safeopen_admin_test.go +++ b/safefile/safeopen_admin_test.go @@ -1,3 +1,4 @@ +//go:build admin // +build admin package safefile diff --git a/schemaversion/schemaversion.go b/schemaversion/schemaversion.go index 13fdceedae..bb2fa62375 100644 --- a/schemaversion/schemaversion.go +++ b/schemaversion/schemaversion.go @@ -1,3 +1,4 @@ +//go:build windows // +build windows package schemaversion diff --git a/vmservice/vmservice.pb.go b/vmservice/vmservice.pb.go index 9a97c1c738..c828d0dadd 100644 --- a/vmservice/vmservice.pb.go +++ b/vmservice/vmservice.pb.go @@ -2402,7 +2402,7 @@ func (m *VMConfig) MarshalTo(dAtA []byte) (int, error) { i += n6 } if len(m.ExtraData) > 0 { - for k, _ := range m.ExtraData { + for k := range m.ExtraData { dAtA[i] = 0x42 i++ v := m.ExtraData[k] @@ -4281,7 +4281,7 @@ func (this *VMConfig) String() string { return "nil" } keysForExtraData := make([]string, 0, len(this.ExtraData)) - for k, _ := range this.ExtraData { + for k := range this.ExtraData { keysForExtraData = append(keysForExtraData, k) } github_com_gogo_protobuf_sortkeys.Strings(keysForExtraData)