Fix protobuf's inconsistent dependency

[alyyousuf7]

I started getting "inconsistent dependency" errors in CI: https://circleci.com/gh/docker/swarmkit/7532

I guess some of the files were missed while revendoring in #2229.
The committed differences were found in vendor/github.com/golang/protobuf after running make dep-validate.

Signed-off-by: Ali Yousuf aly.yousuf7@gmail.com

[ijc]

This is strange, CI is complaining that it's vendoring check is seeing the older (current master) version:

diff -r vendor/github.com/golang/protobuf/ptypes/empty/empty.pb.go .vendor.bak/github.com/golang/protobuf/ptypes/empty/empty.pb.go
1c1
< // Code generated by protoc-gen-go. DO NOT EDIT.
---
> // Code generated by protoc-gen-go.
2a3
> // DO NOT EDIT!
+ inconsistent dependencies! what you have in vendor.conf does not match with what you have in vendor

But when I run vndr locally against master I'm (now, I'm sure I wasn't seeing this when I made #2229) seeing the same diff as you.

github.com/golang/protobuf is vendored using a specific hash 7a211bcf3bce0e3f1d74f9894916e6f116ae83b4 so it ought to be getting identical content each time.

[ijc]

The expected versions of these files are:

• https://github.com/golang/protobuf/blob/7a211bcf3bce0e3f1d74f9894916e6f116ae83b4/ptypes/empty/empty.pb.go
• https://github.com/golang/protobuf/blob/7a211bcf3bce0e3f1d74f9894916e6f116ae83b4/ptypes/empty/empty.proto
  They match the versions in this PR and not the ones in the repo.
  I'm confused.

[ijc]

I'm not confused, the diff here really is missing that first hunk to vendor/github.com/golang/protobuf/ptypes/empty/empty.pb.go, or so it seems.

[alyyousuf7]

I ran vndr again locally and now I see the following diff:

diff --git a/vendor/github.com/golang/protobuf/ptypes/empty/empty.pb.go b/vendor/github.com/golang/protobuf/ptypes/empty/empty.pb.go
index 9779cb3f..ae159414 100644
--- a/vendor/github.com/golang/protobuf/ptypes/empty/empty.pb.go
+++ b/vendor/github.com/golang/protobuf/ptypes/empty/empty.pb.go
@@ -1,6 +1,5 @@
-// Code generated by protoc-gen-go.
+// Code generated by protoc-gen-go. DO NOT EDIT.
 // source: github.com/golang/protobuf/ptypes/empty/empty.proto
-// DO NOT EDIT!
 
 /*
 Package empty is a generated protocol buffer package.

[ijc]

That's exactly what I see too when I run vndr on this PR.

[alyyousuf7]

Pushed the diff. And it passed the dep-validate check.

[ijc]

Excellent, LGTM.

Thanks for sorting this out, I'm still rather mystified about the whole thing but I'll learn to live with it.

[codecov]

Codecov Report

Merging #2283 into master will increase coverage by <.01%.
The diff coverage is n/a.

@@            Coverage Diff            @@
##           master   #2283      +/-   ##
=========================================
+ Coverage    60.4%   60.4%   +<.01%     
=========================================
  Files         125     125              
  Lines       20394   20394              
=========================================
+ Hits        12318   12320       +2     
- Misses       6682    6686       +4     
+ Partials     1394    1388       -6

[aaronlehmann]

This is interesting. I'd like to understand why CI passed in #2229 (https://circleci.com/gh/docker/swarmkit/7361). I wonder if there's a bug in the dep-validate target.

[aaronlehmann]

#2229 didn't use this github.com/golang/protobuf/ptypes/empty package, so it wasn't present in the vendor directory on that branch.

The package was added to the vendor directory when containerd dependencies were added. It must have been vendored from the earlier version. Then when this was merged, it made the vendor tree inconsistent.

LGTM

[ijc]

Thanks for figuring it out, I'll sleep a little better!