Update Go module version to 1.17

cmd/gcs/main.go

@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 package main

cmd/gcstools/generichook.go

@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 package main

cmd/gcstools/installdrivers.go

@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 package main

cmd/gcstools/main.go

@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 package main

ext4/internal/compactext4/verify_test.go

@@ -1,3 +1,4 @@
+//go:build !linux
 // +build !linux
 
 package compactext4

go.mod

@@ -1,6 +1,6 @@
 module github.com/Microsoft/hcsshim
 
-go 1.13
+go 1.17
 
 require (
  github.com/BurntSushi/toml v0.3.1
@@ -28,12 +28,34 @@ require (
  github.com/vishvananda/netns v0.0.0-20200728191858-db3c7e526aae
  go.etcd.io/bbolt v1.3.6
  go.opencensus.io v0.22.3
- golang.org/x/net v0.0.0-20210825183410-e898025ed96a // indirect
  golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
  golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e
  google.golang.org/grpc v1.40.0
 )
 
+require (
+ github.com/containerd/fifo v1.0.0 // indirect
+ github.com/coreos/go-systemd/v22 v22.3.2 // indirect
+ github.com/cpuguy83/go-md2man/v2 v2.0.0 // indirect
+ github.com/docker/cli v0.0.0-20191017083524-a8ff7f821017 // indirect
+ github.com/docker/distribution v2.7.1+incompatible // indirect
+ github.com/docker/docker v1.4.2-0.20190924003213-a8608b5b67c7 // indirect
+ github.com/docker/docker-credential-helpers v0.6.3 // indirect
+ github.com/docker/go-units v0.4.0 // indirect
+ github.com/godbus/dbus/v5 v5.0.4 // indirect
+ github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect
+ github.com/golang/protobuf v1.5.0 // indirect
+ github.com/moby/sys/mountinfo v0.4.1 // indirect
+ github.com/opencontainers/go-digest v1.0.0 // indirect
+ github.com/opencontainers/image-spec v1.0.2 // indirect
+ github.com/russross/blackfriday/v2 v2.0.1 // indirect
+ github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect
+ golang.org/x/net v0.0.0-20210825183410-e898025ed96a // indirect
+ golang.org/x/text v0.3.6 // indirect
+ google.golang.org/genproto v0.0.0-20201110150050-8816d57aaa9a // indirect
+ google.golang.org/protobuf v1.27.1 // indirect
+)
+
 replace (
  google.golang.org/genproto => google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63
  google.golang.org/grpc => google.golang.org/grpc v1.27.1

go.sum

@@ -427,7 +427,6 @@ github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfn
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/pty v1.1.5/go.mod h1:9r2w37qlBe7rQ6e1fg1S/9xpWHSnaqNdHD3WcMdbPDA=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
-github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/linuxkit/virtsock v0.0.0-20201010232012-f8cee7dfc7a3 h1:jUp75lepDg0phMUJBCmvaeFDldD2N3S1lBuPwUTszio=
 github.com/linuxkit/virtsock v0.0.0-20201010232012-f8cee7dfc7a3/go.mod h1:3r6x7q95whyfWQpmGZTu3gk3v2YkMi05HEzl7Tf7YEo=
@@ -468,7 +467,6 @@ github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8m
 github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
 github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw=
 github.com/ncw/swift v1.0.47/go.mod h1:23YIA4yWVnGwv2dQlN4bB7egfYX6YLn0Yo/S6zZO/ZM=
-github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs=
 github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
 github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=
 github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U=
@@ -920,7 +918,6 @@ gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8
 gopkg.in/check.v1 v1.0.0-20141024133853-64131543e789/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f h1:BLraFXnmrev5lT+xlilqcH8XK9/i0At2xKjWk4p6zsU=
 gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/cheggaaa/pb.v1 v1.0.25/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qStrOgw=
 gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=

hcn/hcnendpoint_test.go

@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package hcn

hcn/hcnerrors_test.go

@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package hcn

hcn/hcnloadbalancer.go

@@ -35,7 +35,7 @@ var (
  // LoadBalancerFlagsNone is the default.
  LoadBalancerFlagsNone LoadBalancerFlags = 0
  // LoadBalancerFlagsDSR enables Direct Server Return (DSR)
- LoadBalancerFlagsDSR LoadBalancerFlags = 1
+ LoadBalancerFlagsDSR  LoadBalancerFlags = 1
  LoadBalancerFlagsIPv6 LoadBalancerFlags = 2
 )
 

hcn/hcnloadbalancer_test.go

@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package hcn

hcn/hcnnamespace_test.go

@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package hcn

hcn/hcnnetwork_test.go

@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package hcn
@@ -169,7 +170,7 @@ func TestAddRemoveHostRoutePolicy(t *testing.T) {
  testNetworkPolicy(t, hostRoutePolicy)
 }
 
-func TestAddRemoveNetworACLPolicy(t *testing.T){
+func TestAddRemoveNetworACLPolicy(t *testing.T) {
 
  networkACLPolicy, err := HcnCreateNetworkACLs()
  if err != nil {

hcn/hcnpolicy.go

@@ -23,7 +23,7 @@ const (
  // Endpoint and Network have InterfaceConstraint and ProviderAddress
  NetworkProviderAddress EndpointPolicyType = "ProviderAddress"
  NetworkInterfaceConstraint EndpointPolicyType = "InterfaceConstraint"
- TierAcl EndpointPolicyType = "TierAcl" 
+ TierAcl  EndpointPolicyType = "TierAcl"
 )
 
 // EndpointPolicy is a collection of Policy settings for an Endpoint.
@@ -133,7 +133,7 @@ type AclPolicySetting struct {
  RemotePorts string `json:",omitempty"`
  RuleType RuleType `json:",omitempty"`
  Priority uint16 `json:",omitempty"`
-} 
+}
 
 // QosPolicySetting sets Quality of Service bandwidth caps on an Endpoint.
 type QosPolicySetting struct {
@@ -166,7 +166,7 @@ type NetworkACLPolicySetting struct {
  RemotePorts string `json:",omitempty"`
  RuleType RuleType `json:",omitempty"`
  Priority uint16 `json:",omitempty"`
-} 
+}
 
 // FiveTuple is nested in L4ProxyPolicySetting for WFP support.
 type FiveTuple struct {
@@ -284,7 +284,7 @@ type RemoteSubnetRoutePolicySetting struct {
 type SetPolicyType string
 
 const (
- SetPolicyTypeIpSet SetPolicyType = "IPSET"
+ SetPolicyTypeIpSet  SetPolicyType = "IPSET"
  SetPolicyTypeNestedIpSet SetPolicyType = "NESTEDIPSET"
 )
 
@@ -320,25 +320,25 @@ type L4ProxyPolicySetting struct {
  Protocol ProtocolType `json:",omitempty"`
  Exceptions []string `json:",omitempty"`
  Destination string
- OutboundNAT bool  `json:",omitempty"`
+ OutboundNAT bool `json:",omitempty"`
 }
 
 // TierAclRule represents an ACL within TierAclPolicySetting
 type TierAclRule struct {
- Id string  `json:",omitempty"`
- Protocols string  `json:",omitempty"`
- TierAclRuleAction ActionType  `json:","`
- LocalAddresses string  `json:",omitempty"`
- RemoteAddresses string  `json:",omitempty"`
- LocalPorts string  `json:",omitempty"`
- RemotePorts string  `json:",omitempty"`
- Priority uint16  `json:",omitempty"`
+ Id string `json:",omitempty"`
+ Protocols string `json:",omitempty"`
+ TierAclRuleAction ActionType `json:","`
+ LocalAddresses string `json:",omitempty"`
+ RemoteAddresses string `json:",omitempty"`
+ LocalPorts string `json:",omitempty"`
+ RemotePorts string `json:",omitempty"`
+ Priority uint16 `json:",omitempty"`
 }
 
 // TierAclPolicySetting represents a Tier containing ACLs
 type TierAclPolicySetting struct {
- Name  string  `json:","`
- Direction  DirectionType  `json:","`
- Order  uint16  `json:""`
- TierAclRules  []TierAclRule  `json:",omitempty"`
+ Name string `json:","`
+ Direction DirectionType `json:","`
+ Order uint16 `json:""`
+ TierAclRules []TierAclRule `json:",omitempty"`
 }

hcn/hcnroute_test.go

@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package hcn

hcn/hcnsupport_test.go

@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package hcn
@@ -127,7 +128,7 @@ func TestNestedIpSetSupport(t *testing.T) {
  }
 }
 
-func TestNetworkACLPolicySupport(t *testing.T){
+func TestNetworkACLPolicySupport(t *testing.T) {
  supportedFeatures := GetSupportedFeatures()
  err := NetworkACLPolicySupported()
  if supportedFeatures.NetworkACL && err != nil {