vendor with go mod #3387

crazy-max · 2021-12-09T23:59:33Z

follow-up #3308

vendoring with go modules with nearly zero diff (ref moby/swarmkit#3046).

Signed-off-by: CrazyMax [email protected]

codecov-commenter · 2021-12-10T00:02:44Z

Codecov Report

Merging #3387 (663f01b) into master (6fbf816) will not change coverage.
The diff coverage is n/a.

@@           Coverage Diff           @@
##           master    #3387   +/-   ##
=======================================
  Coverage   56.35%   56.35%           
=======================================
  Files         304      304           
  Lines       26830    26830           
=======================================
  Hits        15121    15121           
  Misses      10789    10789           
  Partials      920      920

AkihiroSuda · 2021-12-10T11:48:17Z

Why is the filename vendor.mod, not go.mod?

errordeveloper · 2021-12-10T11:51:46Z

Why is the filename vendor.mod, not go.mod?

Creating go.mod implies opting in for all the rules around SemVer, which this repo cannot abide by as it uses CalVer. So the idea is to start using go mod vendor instead of vndr, so that all dependencies that do use go.mod can be easily consumed (i.e. without having to patch vndr).

AkihiroSuda · 2021-12-10T11:53:11Z

Why is the filename vendor.mod, not go.mod?

Creating go.mod implies opting in for all the rules around SemVer, which this repo cannot abide by as it uses CalVer. So the idea is to start using go mod vendor instead of vndr, so that all dependencies that do use go.mod can be easily consumed (i.e. without having to patch vndr).

Thanks for explanation, could you add this background to the comment lines of vendor.mod ?

errordeveloper · 2021-12-10T11:55:37Z

Thanks for explanation, could you add this background to the comment lines of vendor.mod ?

Good idea! @crazy-max would you mind doing that please? I'll update moby/swarmkit#3046 also.

crazy-max · 2021-12-10T12:06:50Z

@errordeveloper Yes sure!

thaJeztah · 2021-12-10T12:16:53Z

FWIW: I recalled we also had #3139 pending, but that never was finished / completed. I recalled I had a branch on my machine (but it may have still been "work in progress", as it was a quick "let's rip the remaining bits out as well" frenzy). Removing those k8s bits also helps reducing the list of dependencies considerably, so I just rebased that branch, and opened a draft PR to see what it would look like; #3389 (and if CI succeeds 😂)

vendor.mod

errordeveloper · 2021-12-10T14:39:27Z

Looks like this is good to go!

.gitignore

thaJeztah · 2021-12-13T11:32:17Z

Also opened docker/docker-ce-packaging#611 to do a quick check if the packaging scripts don't blow up 👍

scripts/vendor

crazy-max · 2021-12-14T15:06:51Z

PTAL @errordeveloper @thaJeztah @silvin-lubecki

scripts/vendor

errordeveloper · 2021-12-14T15:14:49Z

scripts/vendor

+  if [ ! -x "$(command -v modvendor)" ]; then
+    echo "modvendor not found. Install with 'go install github.com/goware/[email protected]'"
+    exit 1
+  fi


I'd recommend doing something similar to moby/swarmkit@a46370c, that way tools versions can be tracked in a separate go.mod file and will not interfere with actual runtime dependencies.

Yep sounds better with go build tools, will make some changes.

Hum will do that in a follow-up actually, there are other tools that would need the same behavior like goversioninfo.

errordeveloper

Looks good overall! Just a few nits.

crazy-max · 2021-12-14T20:12:01Z

.gitattributes

+vendor.mod linguist-language=Go-Module
+vendor.sum linguist-language=Go-Checksums


@errordeveloper Just stylish stuff you can add to match the proper language using gitattributes:

https://github.com/crazy-max/docker-cli/blob/vendor-gomod/vendor.mod

https://github.com/crazy-max/docker-cli/blob/vendor-gomod/vendor.sum

errordeveloper · 2021-12-15T19:57:28Z

@crazy-max should we request a review from someone who can merge this?

vendor/golang.org/x/sys/windows/svc/sys_windows_arm64.s

scripts/vendor

thaJeztah · 2021-12-16T16:32:49Z

Makefile

+	./scripts/vendor validate
+
+.PHONY: mod-outdated
+mod-outdated: ## check outdated dependencies


This is not yet in use, correct? (more of a "local dependabot check")

Yes this is only intended for local check

Signed-off-by: CrazyMax <[email protected]>

thaJeztah

LGTM

@tonistiigi PTAL

crazy-max · 2022-01-12T09:39:51Z

PTAL @tonistiigi @silvin-lubecki @tiborvass thanks

silvin-lubecki

LGTM 🚀

Signed-off-by: CrazyMax <[email protected]>

thaJeztah · 2022-01-13T14:00:21Z

let's bring this one in

crazy-max force-pushed the vendor-gomod branch from c094e3a to eb67226 Compare December 10, 2021 00:54

crazy-max marked this pull request as ready for review December 10, 2021 09:20

crazy-max force-pushed the vendor-gomod branch from eb67226 to 3b4c191 Compare December 10, 2021 09:39

errordeveloper approved these changes Dec 10, 2021

View reviewed changes

crazy-max force-pushed the vendor-gomod branch from 3b4c191 to cefa164 Compare December 10, 2021 12:23

crazy-max commented Dec 10, 2021

View reviewed changes

vendor.mod Outdated Show resolved Hide resolved

errordeveloper reviewed Dec 10, 2021

View reviewed changes

vendor.mod Outdated Show resolved Hide resolved

crazy-max force-pushed the vendor-gomod branch from cefa164 to 9c54383 Compare December 10, 2021 14:06

errordeveloper reviewed Dec 10, 2021

View reviewed changes

.gitignore Outdated Show resolved Hide resolved

thaJeztah mentioned this pull request Dec 13, 2021

[do not merge] testing go mod vendoring PRs docker/docker-ce-packaging#611

Closed

crazy-max force-pushed the vendor-gomod branch from 9c54383 to cb0968d Compare December 13, 2021 21:34

crazy-max commented Dec 13, 2021

View reviewed changes

scripts/vendor Outdated Show resolved Hide resolved

errordeveloper reviewed Dec 14, 2021

View reviewed changes

scripts/vendor Outdated Show resolved Hide resolved

errordeveloper reviewed Dec 14, 2021

View reviewed changes

crazy-max force-pushed the vendor-gomod branch 2 times, most recently from caef84b to fc57f10 Compare December 14, 2021 16:19

crazy-max mentioned this pull request Dec 14, 2021

vendor: use go mod moby/swarmkit#3046

Merged

crazy-max force-pushed the vendor-gomod branch 2 times, most recently from dcd21b4 to f49c568 Compare December 14, 2021 20:06

crazy-max force-pushed the vendor-gomod branch from f49c568 to baeb3cd Compare December 14, 2021 20:09

crazy-max commented Dec 14, 2021

View reviewed changes

thaJeztah reviewed Dec 16, 2021

View reviewed changes

crazy-max force-pushed the vendor-gomod branch from baeb3cd to 4675cee Compare December 16, 2021 18:51

crazy-max added 2 commits December 16, 2021 21:16

vendor with go mod

7e560ae

Signed-off-by: CrazyMax <[email protected]>

fix linguist with .gitattributes

caa31d9

Signed-off-by: CrazyMax <[email protected]>

crazy-max force-pushed the vendor-gomod branch from 4675cee to caa31d9 Compare December 16, 2021 20:16

thaJeztah approved these changes Dec 16, 2021

View reviewed changes

silvin-lubecki approved these changes Jan 12, 2022

View reviewed changes

use uuid to invalidate cache

663f01b

Signed-off-by: CrazyMax <[email protected]>

thaJeztah merged commit a4787cf into docker:master Jan 13, 2022

crazy-max deleted the vendor-gomod branch January 13, 2022 14:15

thaJeztah added this to the 22.06.0 milestone May 13, 2022

crazy-max mentioned this pull request Mar 24, 2023

switch to go module #4116

Closed

		vendor.mod linguist-language=Go-Module
		vendor.sum linguist-language=Go-Checksums

vendor with go mod #3387

vendor with go mod #3387

Uh oh!

Conversation

crazy-max commented Dec 9, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

codecov-commenter commented Dec 10, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

AkihiroSuda commented Dec 10, 2021

Uh oh!

errordeveloper commented Dec 10, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

AkihiroSuda commented Dec 10, 2021

Uh oh!

errordeveloper commented Dec 10, 2021

Uh oh!

crazy-max commented Dec 10, 2021

Uh oh!

thaJeztah commented Dec 10, 2021

Uh oh!

Uh oh!

Uh oh!

errordeveloper commented Dec 10, 2021

Uh oh!

Uh oh!

thaJeztah commented Dec 13, 2021

Uh oh!

Uh oh!

crazy-max commented Dec 14, 2021

Uh oh!

Uh oh!

errordeveloper Dec 14, 2021

Choose a reason for hiding this comment

Uh oh!

crazy-max Dec 14, 2021

Choose a reason for hiding this comment

Uh oh!

crazy-max Dec 14, 2021

Choose a reason for hiding this comment

Uh oh!

errordeveloper left a comment

Choose a reason for hiding this comment

Uh oh!

crazy-max Dec 14, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

errordeveloper Dec 14, 2021

Choose a reason for hiding this comment

Uh oh!

errordeveloper commented Dec 15, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

thaJeztah Dec 16, 2021

Choose a reason for hiding this comment

Uh oh!

crazy-max Dec 16, 2021

Choose a reason for hiding this comment

Uh oh!

crazy-max Dec 16, 2021

Choose a reason for hiding this comment

Uh oh!

thaJeztah left a comment

Choose a reason for hiding this comment

Uh oh!

crazy-max commented Jan 12, 2022

Uh oh!

silvin-lubecki left a comment

Choose a reason for hiding this comment

Uh oh!

thaJeztah commented Jan 13, 2022

Uh oh!

Reviewers

crazy-max commented Dec 9, 2021 •

edited

Loading

codecov-commenter commented Dec 10, 2021 •

edited

Loading

errordeveloper commented Dec 10, 2021 •

edited

Loading

crazy-max Dec 14, 2021 •

edited

Loading

errordeveloper commented Dec 15, 2021 •

edited

Loading