From 2b46953c3f69d9ab24a5b60b6c62714df6a7de28 Mon Sep 17 00:00:00 2001 From: sawanoboly Date: Thu, 26 Jul 2018 14:35:20 +0900 Subject: [PATCH 01/10] go 1.10 to 1.10.3 --- vagrant/prov/ub14.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vagrant/prov/ub14.sh b/vagrant/prov/ub14.sh index 72d545f..54221e9 100644 --- a/vagrant/prov/ub14.sh +++ b/vagrant/prov/ub14.sh @@ -1,7 +1,7 @@ #!/bin/bash echo Installing golang ... -archive=go1.10.linux-amd64.tar.gz +archive=go1.10.3.linux-amd64.tar.gz if [ ! -f $archive ]; then wget -q https://storage.googleapis.com/golang/$archive fi From 92c020d92c7606e5600a0e025d07657043456762 Mon Sep 17 00:00:00 2001 From: sawanoboly Date: Thu, 26 Jul 2018 14:35:38 +0900 Subject: [PATCH 02/10] just run vgo build --- go.mod | 36 ++++++++++++++++++++++++++++++++++++ go.sum | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 89 insertions(+) create mode 100644 go.mod create mode 100644 go.sum diff --git a/go.mod b/go.mod new file mode 100644 index 0000000..499d822 --- /dev/null +++ b/go.mod @@ -0,0 +1,36 @@ +module github.com/mobingi/alm-agent + +require ( + docker.io/go-docker v1.0.0 + github.com/BurntSushi/toml v0.3.0 + github.com/Microsoft/go-winio v0.4.7 + github.com/aws/aws-sdk-go v1.13.4 + github.com/davecgh/go-spew v1.1.0 + github.com/docker/distribution v0.0.0-20170726174610-edc3ab29cdff + github.com/docker/go-connections v0.3.0 + github.com/docker/go-units v0.3.2 + github.com/docker/libnetwork v0.0.0-20180123220423-0ef1f8c94fa8 + github.com/go-ini/ini v1.32.0 + github.com/godbus/dbus v4.1.0+incompatible + github.com/gogo/protobuf v0.0.0-20170307180453-100ba4e88506 + github.com/google/go-github v15.0.0+incompatible + github.com/google/go-querystring v0.0.0-20170111101155-53e6ce116135 + github.com/hashicorp/go-version v0.0.0-20171129150820-4fe82ae3040f + github.com/jmespath/go-jmespath v0.0.0-20160202185014-0b12d6b521d8 + github.com/koron/go-dproxy v0.0.0-20151216073417-009e1192eaac + github.com/opencontainers/go-digest v1.0.0-rc1 + github.com/opencontainers/image-spec v1.0.1 + github.com/pkg/errors v0.8.0 + github.com/pmezard/go-difflib v1.0.0 + github.com/rakyll/statik v0.1.1 + github.com/sirupsen/logrus v1.0.4 + github.com/stretchr/testify v1.2.1 + github.com/stvp/rollbar v0.5.1 + github.com/tcnksm/go-latest v0.0.0-20170313132115-e3007ae9052e + github.com/urfave/cli v1.20.0 + github.com/vishvananda/netlink v0.0.0-20180223173537-5236321576c0 + github.com/vishvananda/netns v0.0.0-20171111001504-be1fbeda1936 + golang.org/x/crypto v0.0.0-20180222182404-49796115aa4b + golang.org/x/net v0.0.0-20180218175443-cbe0f9307d01 + golang.org/x/sys v0.0.0-20180224232135-f6cff0780e54 +) diff --git a/go.sum b/go.sum new file mode 100644 index 0000000..2cd4397 --- /dev/null +++ b/go.sum @@ -0,0 +1,53 @@ +docker.io/go-docker v1.0.0 h1:VdXS/aNYQxyA9wdLD5z8Q8Ro688/hG8HzKxYVEVbE6s= +docker.io/go-docker v1.0.0/go.mod h1:7tiAn5a0LFmjbPDbyTPOaTTOuG1ZRNXdPA6RvKY+fpY= +github.com/BurntSushi/toml v0.3.0 h1:e1/Ivsx3Z0FVTV0NSOv/aVgbUWyQuzj7DDnFblkRvsY= +github.com/BurntSushi/toml v0.3.0/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= +github.com/Microsoft/go-winio v0.4.7/go.mod h1:VhR8bwka0BXejwEJY73c50VrPtXAaKcyvVC4A4RozmA= +github.com/aws/aws-sdk-go v1.13.4/go.mod h1:ZRmQr0FajVIyZ4ZzBYKG5P3ZqPz9IHG41ZoMu1ADI3k= +github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/docker/distribution v0.0.0-20170726174610-edc3ab29cdff h1:FKH02LHYqSmeWd3GBh0KIkM8JBpw3RrShgtcWShdWJg= +github.com/docker/distribution v0.0.0-20170726174610-edc3ab29cdff/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= +github.com/docker/go-connections v0.3.0 h1:3lOnM9cSzgGwx8VfK/NGOW5fLQ0GjIlCkaktF+n1M6o= +github.com/docker/go-connections v0.3.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec= +github.com/docker/go-units v0.3.2 h1:Kjm80apys7gTtfVmCvVY8gwu10uofaFSrmAKOVrtueE= +github.com/docker/go-units v0.3.2/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= +github.com/docker/libnetwork v0.0.0-20180123220423-0ef1f8c94fa8/go.mod h1:93m0aTqz6z+g32wla4l4WxTrdtvBRmVzYRkYvasA5Z8= +github.com/go-ini/ini v1.32.0/go.mod h1:ByCAeIL28uOIIG0E3PJtZPDL8WnHpFKFOtgjp+3Ies8= +github.com/godbus/dbus v4.1.0+incompatible/go.mod h1:/YcGZj5zSblfDWMMoOzV4fas9FZnQYTkDnsGvmh2Grw= +github.com/gogo/protobuf v0.0.0-20170307180453-100ba4e88506 h1:zDlw+wgyXdfkRuvFCdEDUiPLmZp2cvf/dWHazY0a5VM= +github.com/gogo/protobuf v0.0.0-20170307180453-100ba4e88506/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= +github.com/google/go-github v15.0.0+incompatible h1:jlPg2Cpsxb/FyEV/MFiIE9tW/2RAevQNZDPeHbf5a94= +github.com/google/go-github v15.0.0+incompatible/go.mod h1:zLgOLi98H3fifZn+44m+umXrS52loVEgC2AApnigrVQ= +github.com/google/go-querystring v0.0.0-20170111101155-53e6ce116135 h1:zLTLjkaOFEFIOxY5BWLFLwh+cL8vOBW4XJ2aqLE/Tf0= +github.com/google/go-querystring v0.0.0-20170111101155-53e6ce116135/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck= +github.com/hashicorp/go-version v0.0.0-20171129150820-4fe82ae3040f h1:QnRipjW3Mm+sgD+vyO87cb+1RLzoM0mGVTYClil7mQg= +github.com/hashicorp/go-version v0.0.0-20171129150820-4fe82ae3040f/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= +github.com/jmespath/go-jmespath v0.0.0-20160202185014-0b12d6b521d8/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= +github.com/koron/go-dproxy v0.0.0-20151216073417-009e1192eaac h1:8SNHHVtXaDkkYLmpQ/+3aWQB9ylYYP1wNZBN1yePZ5o= +github.com/koron/go-dproxy v0.0.0-20151216073417-009e1192eaac/go.mod h1:sr1u347AB7iUHOVeVN58CkcQmCqr0SQj86qSbsYblJU= +github.com/opencontainers/go-digest v1.0.0-rc1 h1:WzifXhOVOEOuFYOJAW6aQqW0TooG2iki3E3Ii+WN7gQ= +github.com/opencontainers/go-digest v1.0.0-rc1/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s= +github.com/opencontainers/image-spec v1.0.1 h1:JMemWkRwHx4Zj+fVxWoMCFm/8sYGGrUVojFA6h/TRcI= +github.com/opencontainers/image-spec v1.0.1/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0= +github.com/pkg/errors v0.8.0 h1:WdK/asTD0HN+q6hsWO3/vpuAkAr+tw6aNJNDFFf0+qw= +github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/rakyll/statik v0.1.1 h1:fCLHsIMajHqD5RKigbFXpvX3dN7c80Pm12+NCrI3kvg= +github.com/rakyll/statik v0.1.1/go.mod h1:OEi9wJV/fMUAGx1eNjq75DKDsJVuEv1U0oYdX6GX8Zs= +github.com/sirupsen/logrus v1.0.4 h1:gzbtLsZC3Ic5PptoRG+kQj4L60qjK7H7XszrU163JNQ= +github.com/sirupsen/logrus v1.0.4/go.mod h1:pMByvHTf9Beacp5x1UXfOR9xyW/9antXMhjMPG0dEzc= +github.com/stretchr/testify v1.2.1/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= +github.com/stvp/rollbar v0.5.1 h1:qvyWbd0RNL5V27MBumqCXlcU7ohmHeEtKX+Czc8oeuw= +github.com/stvp/rollbar v0.5.1/go.mod h1:/fyFC854GgkbHRz/rSsiYc6h84o0G5hxBezoQqRK7Ho= +github.com/tcnksm/go-latest v0.0.0-20170313132115-e3007ae9052e h1:IWllFTiDjjLIf2oeKxpIUmtiDV5sn71VgeQgg6vcE7k= +github.com/tcnksm/go-latest v0.0.0-20170313132115-e3007ae9052e/go.mod h1:d7u6HkTYKSv5m6MCKkOQlHwaShTMl3HjqSGW3XtVhXM= +github.com/urfave/cli v1.20.0 h1:fDqGv3UG/4jbVl/QkFwEdddtEDjh/5Ov6X+0B/3bPaw= +github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA= +github.com/vishvananda/netlink v0.0.0-20180223173537-5236321576c0/go.mod h1:+SR5DhBJrl6ZM7CoCKvpw5BKroDKQ+PJqOg65H/2ktk= +github.com/vishvananda/netns v0.0.0-20171111001504-be1fbeda1936/go.mod h1:ZjcWmFBXmLKZu9Nxj3WKYEafiSqer2rnvPr0en9UNpI= +golang.org/x/crypto v0.0.0-20180222182404-49796115aa4b h1:/GxqO8gbyb+sNnviFY2IIMrtm8vGg6NEJDft68wJY/g= +golang.org/x/crypto v0.0.0-20180222182404-49796115aa4b/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= +golang.org/x/net v0.0.0-20180218175443-cbe0f9307d01 h1:po1f06KS05FvIQQA2pMuOWZAUXiy1KYdIf0ElUU2Hhc= +golang.org/x/net v0.0.0-20180218175443-cbe0f9307d01/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/sys v0.0.0-20180224232135-f6cff0780e54 h1:4qAtdeqGYyXU2CfUvLomEFw0cl5IxNxmEhXL52ODpiU= +golang.org/x/sys v0.0.0-20180224232135-f6cff0780e54/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= From 27dc62e885e744b46a8d3804dd939d2825684d15 Mon Sep 17 00:00:00 2001 From: sawanoboly Date: Thu, 26 Jul 2018 14:37:27 +0900 Subject: [PATCH 03/10] remove dep files --- Gopkg.lock | 272 ----------------------------------------------------- Gopkg.toml | 76 --------------- 2 files changed, 348 deletions(-) delete mode 100644 Gopkg.lock delete mode 100644 Gopkg.toml diff --git a/Gopkg.lock b/Gopkg.lock deleted file mode 100644 index 3222363..0000000 --- a/Gopkg.lock +++ /dev/null @@ -1,272 +0,0 @@ -# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'. - - -[[projects]] - name = "docker.io/go-docker" - packages = [ - ".", - "api", - "api/types", - "api/types/blkiodev", - "api/types/container", - "api/types/events", - "api/types/filters", - "api/types/image", - "api/types/mount", - "api/types/network", - "api/types/registry", - "api/types/strslice", - "api/types/swarm", - "api/types/swarm/runtime", - "api/types/time", - "api/types/versions", - "api/types/volume" - ] - revision = "b3f5b5de7bbce0acc6a7fc0a4c2b88db678e262e" - version = "v1.0.0" - -[[projects]] - name = "github.com/BurntSushi/toml" - packages = ["."] - revision = "b26d9c308763d68093482582cea63d69be07a0f0" - version = "v0.3.0" - -[[projects]] - name = "github.com/Microsoft/go-winio" - packages = ["."] - revision = "7da180ee92d8bd8bb8c37fc560e673e6557c392f" - version = "v0.4.7" - -[[projects]] - name = "github.com/aws/aws-sdk-go" - packages = [ - "aws", - "aws/awserr", - "aws/awsutil", - "aws/client", - "aws/client/metadata", - "aws/corehandlers", - "aws/credentials", - "aws/credentials/ec2rolecreds", - "aws/credentials/endpointcreds", - "aws/credentials/stscreds", - "aws/defaults", - "aws/ec2metadata", - "aws/endpoints", - "aws/request", - "aws/session", - "aws/signer/v4", - "internal/sdkrand", - "internal/shareddefaults", - "private/protocol", - "private/protocol/query", - "private/protocol/query/queryutil", - "private/protocol/rest", - "private/protocol/xml/xmlutil", - "service/autoscaling", - "service/cloudformation", - "service/elb", - "service/sts" - ] - revision = "f7f1ee9550cc76ceea731d99c8dbe00a0c39f66d" - version = "v1.13.4" - -[[projects]] - name = "github.com/davecgh/go-spew" - packages = ["spew"] - revision = "346938d642f2ec3594ed81d874461961cd0faa76" - version = "v1.1.0" - -[[projects]] - name = "github.com/docker/distribution" - packages = [ - "digestset", - "reference", - "uuid" - ] - revision = "edc3ab29cdff8694dd6feb85cfeb4b5f1b38ed9c" - -[[projects]] - name = "github.com/docker/go-connections" - packages = [ - "nat", - "sockets", - "tlsconfig" - ] - revision = "3ede32e2033de7505e6500d6c868c2b9ed9f169d" - version = "v0.3.0" - -[[projects]] - name = "github.com/docker/go-units" - packages = ["."] - revision = "0dadbb0345b35ec7ef35e228dabb8de89a65bf52" - version = "v0.3.2" - -[[projects]] - branch = "bump_17.12" - name = "github.com/docker/libnetwork" - packages = [ - "iptables", - "portallocator", - "portmapper" - ] - revision = "0ef1f8c94fa85acacf88b9be75ae07de91d0b2a5" - -[[projects]] - name = "github.com/go-ini/ini" - packages = ["."] - revision = "32e4c1e6bc4e7d0d8451aa6b75200d19e37a536a" - version = "v1.32.0" - -[[projects]] - name = "github.com/godbus/dbus" - packages = ["."] - revision = "a389bdde4dd695d414e47b755e95e72b7826432c" - version = "v4.1.0" - -[[projects]] - name = "github.com/gogo/protobuf" - packages = ["proto"] - revision = "100ba4e885062801d56799d78530b73b178a78f3" - version = "v0.4" - -[[projects]] - name = "github.com/google/go-github" - packages = ["github"] - revision = "e48060a28fac52d0f1cb758bc8b87c07bac4a87d" - version = "v15.0.0" - -[[projects]] - branch = "master" - name = "github.com/google/go-querystring" - packages = ["query"] - revision = "53e6ce116135b80d037921a7fdd5138cf32d7a8a" - -[[projects]] - branch = "master" - name = "github.com/hashicorp/go-version" - packages = ["."] - revision = "4fe82ae3040f80a03d04d2cccb5606a626b8e1ee" - -[[projects]] - name = "github.com/jmespath/go-jmespath" - packages = ["."] - revision = "0b12d6b5" - -[[projects]] - name = "github.com/koron/go-dproxy" - packages = ["."] - revision = "009e1192eaace40a885c5b93c37613b3cae820d6" - version = "v1.1" - -[[projects]] - name = "github.com/opencontainers/go-digest" - packages = ["."] - revision = "279bed98673dd5bef374d3b6e4b09e2af76183bf" - version = "v1.0.0-rc1" - -[[projects]] - name = "github.com/opencontainers/image-spec" - packages = [ - "specs-go", - "specs-go/v1" - ] - revision = "d60099175f88c47cd379c4738d158884749ed235" - version = "v1.0.1" - -[[projects]] - name = "github.com/pkg/errors" - packages = ["."] - revision = "645ef00459ed84a119197bfb8d8205042c6df63d" - version = "v0.8.0" - -[[projects]] - name = "github.com/pmezard/go-difflib" - packages = ["difflib"] - revision = "792786c7400a136282c1664665ae0a8db921c6c2" - version = "v1.0.0" - -[[projects]] - name = "github.com/rakyll/statik" - packages = ["fs"] - revision = "fd36b3595eb2ec8da4b8153b107f7ea08504899d" - version = "v0.1.1" - -[[projects]] - name = "github.com/sirupsen/logrus" - packages = ["."] - revision = "d682213848ed68c0a260ca37d6dd5ace8423f5ba" - version = "v1.0.4" - -[[projects]] - name = "github.com/stretchr/testify" - packages = ["assert"] - revision = "12b6f73e6084dad08a7c6e575284b177ecafbc71" - version = "v1.2.1" - -[[projects]] - name = "github.com/stvp/rollbar" - packages = ["."] - revision = "b20261800d8cda3be14dcef0d1a8320779bba61a" - version = "v0.5.1" - -[[projects]] - branch = "master" - name = "github.com/tcnksm/go-latest" - packages = ["."] - revision = "e3007ae9052ed85144087e7392e4c3fbc07962fa" - -[[projects]] - name = "github.com/urfave/cli" - packages = ["."] - revision = "cfb38830724cc34fedffe9a2a29fb54fa9169cd1" - version = "v1.20.0" - -[[projects]] - branch = "master" - name = "github.com/vishvananda/netlink" - packages = [ - ".", - "nl" - ] - revision = "5236321576c0c97ab02c078e60f9b1c5c1828807" - -[[projects]] - branch = "master" - name = "github.com/vishvananda/netns" - packages = ["."] - revision = "be1fbeda19366dea804f00efff2dd73a1642fdcc" - -[[projects]] - branch = "master" - name = "golang.org/x/crypto" - packages = ["ssh/terminal"] - revision = "49796115aa4b964c318aad4f3084fdb41e9aa067" - -[[projects]] - branch = "master" - name = "golang.org/x/net" - packages = [ - "context", - "context/ctxhttp", - "html", - "html/atom", - "proxy" - ] - revision = "cbe0f9307d0156177f9dd5dc85da1a31abc5f2fb" - -[[projects]] - branch = "master" - name = "golang.org/x/sys" - packages = [ - "unix", - "windows" - ] - revision = "f6cff0780e542efa0c8e864dc8fa522808f6a598" - -[solve-meta] - analyzer-name = "dep" - analyzer-version = 1 - inputs-digest = "0330c1e5b8b6079ec729bb0ff2b23bc762459ce6d92e56d11087c2cc3d724478" - solver-name = "gps-cdcl" - solver-version = 1 diff --git a/Gopkg.toml b/Gopkg.toml deleted file mode 100644 index 69d439f..0000000 --- a/Gopkg.toml +++ /dev/null @@ -1,76 +0,0 @@ - -# Gopkg.toml example -# -# Refer to https://github.com/golang/dep/blob/master/docs/Gopkg.toml.md -# for detailed Gopkg.toml documentation. -# -# required = ["github.com/user/thing/cmd/thing"] -# ignored = ["github.com/user/project/pkgX", "bitbucket.org/user/project/pkgA/pkgY"] -# -# [[constraint]] -# name = "github.com/user/project" -# version = "1.0.0" -# -# [[constraint]] -# name = "github.com/user/project2" -# branch = "dev" -# source = "github.com/myfork/project2" -# -# [[override]] -# name = "github.com/x/y" -# version = "2.4.0" - - -[[constraint]] - name = "docker.io/go-docker" - version = "1.0.0" - -[[constraint]] - name = "github.com/BurntSushi/toml" - -[[constraint]] - name = "github.com/aws/aws-sdk-go" - version = "1.4.22" - -[[constraint]] - name = "github.com/docker/distribution" - -[[constraint]] - name = "github.com/docker/libnetwork" - branch = "bump_17.12" - -[[constraint]] - name = "github.com/hashicorp/go-version" - -[[constraint]] - name = "github.com/koron/go-dproxy" - version = "1.1.0" - -[[constraint]] - name = "github.com/pkg/errors" - -[[constraint]] - name = "github.com/sirupsen/logrus" - version = "1.0.3" - -[[constraint]] - name = "github.com/stretchr/testify" - -[[constraint]] - name = "github.com/stvp/rollbar" - version = "0.5.0" - -[[constraint]] - name = "github.com/tcnksm/go-latest" - branch = "master" - -[[constraint]] - name = "github.com/urfave/cli" - version = "1.20.0" - -[[constraint]] - name = "golang.org/x/net" - -[[constraint]] - name = "github.com/rakyll/statik" - version = "0.1.1" From 66bb365fe385578b4119e442ebad6d1ee9084f82 Mon Sep 17 00:00:00 2001 From: sawanoboly Date: Mon, 15 Oct 2018 16:32:34 +0900 Subject: [PATCH 04/10] go1.11.1 --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 2a0e704..74fa43f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -4,7 +4,7 @@ jobs: build: working_directory: /go/src/github.com/mobingi/alm-agent docker: - - image: golang:1.10 + - image: golang:1.11 steps: - checkout - run: From 89a87ffc7d92be96711ac85e9a22c2783ccaf919 Mon Sep 17 00:00:00 2001 From: sawanoboly Date: Mon, 15 Oct 2018 16:36:59 +0900 Subject: [PATCH 05/10] vgo --- Makefile | 4 ++-- go.sum | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 1b10ff7..71b43eb 100644 --- a/Makefile +++ b/Makefile @@ -11,14 +11,14 @@ PACKAGES_ALL = $(shell go list ./...) PACKAGES_MAIN = $(shell go list ./... | grep -v '/addons/') setup: - go get -u github.com/golang/dep/cmd/dep + go get -u golang.org/x/vgo go get github.com/golang/lint/golint go get golang.org/x/tools/cmd/goimports go get -u github.com/rakyll/statik go get github.com/BurntSushi/toml/cmd/tomlv deps: - dep ensure -v + vgo get -v bindata: tomlv _data/*.toml diff --git a/go.sum b/go.sum index 2cd4397..1a13940 100644 --- a/go.sum +++ b/go.sum @@ -3,7 +3,9 @@ docker.io/go-docker v1.0.0/go.mod h1:7tiAn5a0LFmjbPDbyTPOaTTOuG1ZRNXdPA6RvKY+fpY github.com/BurntSushi/toml v0.3.0 h1:e1/Ivsx3Z0FVTV0NSOv/aVgbUWyQuzj7DDnFblkRvsY= github.com/BurntSushi/toml v0.3.0/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/Microsoft/go-winio v0.4.7/go.mod h1:VhR8bwka0BXejwEJY73c50VrPtXAaKcyvVC4A4RozmA= +github.com/aws/aws-sdk-go v1.13.4 h1:qodjE9iAZPMpzD/eEollutT612e6vsbI45E+S9WFf6I= github.com/aws/aws-sdk-go v1.13.4/go.mod h1:ZRmQr0FajVIyZ4ZzBYKG5P3ZqPz9IHG41ZoMu1ADI3k= +github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/docker/distribution v0.0.0-20170726174610-edc3ab29cdff h1:FKH02LHYqSmeWd3GBh0KIkM8JBpw3RrShgtcWShdWJg= github.com/docker/distribution v0.0.0-20170726174610-edc3ab29cdff/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= @@ -12,6 +14,7 @@ github.com/docker/go-connections v0.3.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5Xh github.com/docker/go-units v0.3.2 h1:Kjm80apys7gTtfVmCvVY8gwu10uofaFSrmAKOVrtueE= github.com/docker/go-units v0.3.2/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= github.com/docker/libnetwork v0.0.0-20180123220423-0ef1f8c94fa8/go.mod h1:93m0aTqz6z+g32wla4l4WxTrdtvBRmVzYRkYvasA5Z8= +github.com/go-ini/ini v1.32.0 h1:/MArBHSS0TFR28yPPDK1vPIjt4wUnPBfb81i6iiyKvA= github.com/go-ini/ini v1.32.0/go.mod h1:ByCAeIL28uOIIG0E3PJtZPDL8WnHpFKFOtgjp+3Ies8= github.com/godbus/dbus v4.1.0+incompatible/go.mod h1:/YcGZj5zSblfDWMMoOzV4fas9FZnQYTkDnsGvmh2Grw= github.com/gogo/protobuf v0.0.0-20170307180453-100ba4e88506 h1:zDlw+wgyXdfkRuvFCdEDUiPLmZp2cvf/dWHazY0a5VM= @@ -22,6 +25,7 @@ github.com/google/go-querystring v0.0.0-20170111101155-53e6ce116135 h1:zLTLjkaOF github.com/google/go-querystring v0.0.0-20170111101155-53e6ce116135/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck= github.com/hashicorp/go-version v0.0.0-20171129150820-4fe82ae3040f h1:QnRipjW3Mm+sgD+vyO87cb+1RLzoM0mGVTYClil7mQg= github.com/hashicorp/go-version v0.0.0-20171129150820-4fe82ae3040f/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= +github.com/jmespath/go-jmespath v0.0.0-20160202185014-0b12d6b521d8 h1:12VvqtR6Aowv3l/EQUlocDHW2Cp4G9WJVH7uyH8QFJE= github.com/jmespath/go-jmespath v0.0.0-20160202185014-0b12d6b521d8/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= github.com/koron/go-dproxy v0.0.0-20151216073417-009e1192eaac h1:8SNHHVtXaDkkYLmpQ/+3aWQB9ylYYP1wNZBN1yePZ5o= github.com/koron/go-dproxy v0.0.0-20151216073417-009e1192eaac/go.mod h1:sr1u347AB7iUHOVeVN58CkcQmCqr0SQj86qSbsYblJU= @@ -31,11 +35,13 @@ github.com/opencontainers/image-spec v1.0.1 h1:JMemWkRwHx4Zj+fVxWoMCFm/8sYGGrUVo github.com/opencontainers/image-spec v1.0.1/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0= github.com/pkg/errors v0.8.0 h1:WdK/asTD0HN+q6hsWO3/vpuAkAr+tw6aNJNDFFf0+qw= github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/rakyll/statik v0.1.1 h1:fCLHsIMajHqD5RKigbFXpvX3dN7c80Pm12+NCrI3kvg= github.com/rakyll/statik v0.1.1/go.mod h1:OEi9wJV/fMUAGx1eNjq75DKDsJVuEv1U0oYdX6GX8Zs= github.com/sirupsen/logrus v1.0.4 h1:gzbtLsZC3Ic5PptoRG+kQj4L60qjK7H7XszrU163JNQ= github.com/sirupsen/logrus v1.0.4/go.mod h1:pMByvHTf9Beacp5x1UXfOR9xyW/9antXMhjMPG0dEzc= +github.com/stretchr/testify v1.2.1 h1:52QO5WkIUcHGIR7EnGagH88x1bUzqGXTC5/1bDTUQ7U= github.com/stretchr/testify v1.2.1/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stvp/rollbar v0.5.1 h1:qvyWbd0RNL5V27MBumqCXlcU7ohmHeEtKX+Czc8oeuw= github.com/stvp/rollbar v0.5.1/go.mod h1:/fyFC854GgkbHRz/rSsiYc6h84o0G5hxBezoQqRK7Ho= From 35ef1f5fd0bfa2f8fffc4e777364b6896b0458ec Mon Sep 17 00:00:00 2001 From: sawanoboly Date: Mon, 15 Oct 2018 16:57:18 +0900 Subject: [PATCH 06/10] golint path --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 71b43eb..1328819 100644 --- a/Makefile +++ b/Makefile @@ -11,8 +11,8 @@ PACKAGES_ALL = $(shell go list ./...) PACKAGES_MAIN = $(shell go list ./... | grep -v '/addons/') setup: - go get -u golang.org/x/vgo go get github.com/golang/lint/golint + go get -u golang.org/x/lint/golint go get golang.org/x/tools/cmd/goimports go get -u github.com/rakyll/statik go get github.com/BurntSushi/toml/cmd/tomlv From 509458f2b79fa3163e2dd0dc351f07c07fde44c3 Mon Sep 17 00:00:00 2001 From: sawanoboly Date: Mon, 15 Oct 2018 17:02:12 +0900 Subject: [PATCH 07/10] comment++ --- statik/statik.go | 1 + 1 file changed, 1 insertion(+) diff --git a/statik/statik.go b/statik/statik.go index 6e58769..b17a2cc 100644 --- a/statik/statik.go +++ b/statik/statik.go @@ -1,5 +1,6 @@ // Code generated by statik. DO NOT EDIT. +// Package statik contains static assets. package statik import ( From 3d264825094e155b73ab8ff1c312a02774a9c77c Mon Sep 17 00:00:00 2001 From: sawanoboly Date: Mon, 15 Oct 2018 17:36:24 +0900 Subject: [PATCH 08/10] use vgo --- Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 82d5f08..6e7301b 100644 --- a/Makefile +++ b/Makefile @@ -31,10 +31,10 @@ verifydata: rm -rf ./compare test: deps - go test -v ${PACKAGES_ALL} -cover + vgo test -v ${PACKAGES_ALL} -cover race: deps - go test -v -race ${PACKAGES_ALL} -cover + vgo test -v -race ${PACKAGES_ALL} -cover lint: setup go vet ${PACKAGES_ALL} @@ -46,10 +46,10 @@ fmt: setup goimports -v -w ${PACKAGES} build: test - go build -ldflags "$(LDFLAGS)" -o bin/$(NAME) + vgo build -ldflags "$(LDFLAGS)" -o bin/$(NAME) cibuild: race - go build -ldflags "$(LDFLAGS)" -o bin/$(NAME) + vgo build -ldflags "$(LDFLAGS)" -o bin/$(NAME) clean: rm bin/$(NAME) From b47a5303871fac5294859325fc97b47306bcd3c3 Mon Sep 17 00:00:00 2001 From: sawanoboly Date: Mon, 15 Oct 2018 17:42:04 +0900 Subject: [PATCH 09/10] build by vgo --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 6e7301b..77877ad 100644 --- a/Makefile +++ b/Makefile @@ -55,8 +55,8 @@ clean: rm bin/$(NAME) addon: - cd addons/aws/; go build -ldflags "$(LDFLAGS)" -o ../../bin/$(NAME)-addon-aws - cd addons/common_logtracer/; go build -ldflags "$(LDFLAGS)" -o ../../bin/alm-logtracer + cd addons/aws/; vgo build -ldflags "$(LDFLAGS)" -o ../../bin/$(NAME)-addon-aws + cd addons/common_logtracer/; vgo build -ldflags "$(LDFLAGS)" -o ../../bin/alm-logtracer list: @ls -1 bin From 2aa3b0302bf8c30bb607a8782e224de336b0155d Mon Sep 17 00:00:00 2001 From: sawanoboly Date: Mon, 15 Oct 2018 17:44:40 +0900 Subject: [PATCH 10/10] cache key update --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 74fa43f..6b25eac 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -14,7 +14,7 @@ jobs: name: verifydata command: make verifydata - restore_cache: - key: godeps-{{ checksum "Gopkg.lock" }}-{{ checksum "Gopkg.toml" }} + key: godeps-{{ checksum "go.sum" }}-{{ checksum "go.mod" }} - run: name: test and build maincli command: make cibuild @@ -25,7 +25,7 @@ jobs: name: put version_info command: ./bin/alm-agent -v > ./bin/version_info.json - save_cache: - key: godeps-{{ checksum "Gopkg.lock" }}-{{ checksum "Gopkg.toml" }} + key: godeps-{{ checksum "go.sum" }}-{{ checksum "go.mod" }} paths: - "/go/src/golang.org" - "/go/src/github.com/golang"