summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorFabricio Voznika <fvoznika@google.com>2021-03-09 20:51:53 -0800
committergVisor bot <gvisor-bot@google.com>2021-03-09 20:54:15 -0800
commit14fc2ddd6cb2f25482ef0d16ec5e3ffda3dd0f6e (patch)
tree1e0b01634253fedb8586b3c5078b50cde131ddf9
parente0e04814b40f1d4077d1cf6001395bd6a919b288 (diff)
Update flock to v0.8.0
PiperOrigin-RevId: 361962416
-rw-r--r--WORKSPACE4
-rw-r--r--go.mod2
-rw-r--r--go.sum2
-rw-r--r--nogo.yaml2
-rw-r--r--runsc/container/state_file.go2
5 files changed, 6 insertions, 6 deletions
diff --git a/WORKSPACE b/WORKSPACE
index 4ee93a670..779ee6ae6 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -303,8 +303,8 @@ go_repository(
go_repository(
name = "com_github_gofrs_flock",
importpath = "github.com/gofrs/flock",
- sum = "h1:JFTFz3HZTGmgMz4E1TabNBNJljROSYgja1b4l50FNVs=",
- version = "v0.6.1-0.20180915234121-886344bea079",
+ sum = "h1:MSdYClljsF3PbENUUEx85nkWfJSGfzYI9yEBZOJz6CY=",
+ version = "v0.8.0",
)
go_repository(
diff --git a/go.mod b/go.mod
index 0774d2930..870fb0b83 100644
--- a/go.mod
+++ b/go.mod
@@ -20,7 +20,7 @@ require (
github.com/docker/docker v1.4.2-0.20191028175130-9e7d5ac5ea55 // indirect
github.com/docker/go-connections v0.3.0 // indirect
github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c // indirect
- github.com/gofrs/flock v0.6.1-0.20180915234121-886344bea079 // indirect
+ github.com/gofrs/flock v0.8.0 // indirect
github.com/gogo/googleapis v1.4.0 // indirect
github.com/gogo/protobuf v1.3.1 // indirect
github.com/golang/mock v1.4.4 // indirect
diff --git a/go.sum b/go.sum
index 9d7ef2243..bd3d0b0f7 100644
--- a/go.sum
+++ b/go.sum
@@ -135,6 +135,8 @@ github.com/godbus/dbus/v5 v5.0.3 h1:ZqHaoEF7TBzh4jzPmqVhE/5A1z9of6orkAe5uHoAeME=
github.com/godbus/dbus/v5 v5.0.3/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
github.com/gofrs/flock v0.6.1-0.20180915234121-886344bea079 h1:JFTFz3HZTGmgMz4E1TabNBNJljROSYgja1b4l50FNVs=
github.com/gofrs/flock v0.6.1-0.20180915234121-886344bea079/go.mod h1:F1TvTiK9OcQqauNUHlbJvyl9Qa1QvF/gOUDKA14jxHU=
+github.com/gofrs/flock v0.8.0 h1:MSdYClljsF3PbENUUEx85nkWfJSGfzYI9yEBZOJz6CY=
+github.com/gofrs/flock v0.8.0/go.mod h1:F1TvTiK9OcQqauNUHlbJvyl9Qa1QvF/gOUDKA14jxHU=
github.com/gogo/googleapis v1.4.0 h1:zgVt4UpGxcqVOw97aRGxT4svlcmdK35fynLNctY32zI=
github.com/gogo/googleapis v1.4.0/go.mod h1:5YRNX2z1oM5gXdAkurHa942MDgEJyk02w4OecKY87+c=
github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o=
diff --git a/nogo.yaml b/nogo.yaml
index 96e3aeccc..c0445a837 100644
--- a/nogo.yaml
+++ b/nogo.yaml
@@ -46,8 +46,6 @@ global:
- "(field|method|struct|type) .* should be .*"
# Generated proto code sometimes duplicates imports with aliases.
- "duplicate import"
- # TODO(b/179817829): Upgrade to flock to v0.8.0.
- - "flock.NewFlock is deprecated: Use New instead"
internal:
suppress:
# We use ALL_CAPS for system definitions,
diff --git a/runsc/container/state_file.go b/runsc/container/state_file.go
index 4ed73eb84..0399903a0 100644
--- a/runsc/container/state_file.go
+++ b/runsc/container/state_file.go
@@ -245,7 +245,7 @@ type StateFile struct {
// lock globally locks all locking operations for the container.
func (s *StateFile) lock() error {
s.once.Do(func() {
- s.flock = flock.NewFlock(s.lockPath())
+ s.flock = flock.New(s.lockPath())
})
if err := s.flock.Lock(); err != nil {