From nobody Mon Mar 27 11:27:10 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PlVsB6v8vz428Lw; Mon, 27 Mar 2023 11:27:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PlVsB68PSz3KXB; Mon, 27 Mar 2023 11:27:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679916430; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GUbQYqLsgPZZqff4xN9rWv23hRRhlBpSsk9tptVOd0g=; b=JtsPfbolRij/Cnf9c98ufB0jNHRB7WdJIiVZBJ1Ujgdyj9lbFrgPZGinsN/uPBwI4M91Lb uLAtAA0nGgGok3VpzKWWWpkLex6tTEkcpYBb+zapduYfHUN76+/8IUgWQCIKKKxz8/+uI2 7W9u6zOl2T0rVKUP/h3/l5M4HFoQBLPlq/lLUnJTJcXnnPlJOY2/tLozpNpxjNz0GYSgGc tPzNBWwNrZiOmLrOpG5lhz+Aq3oMqTqiT/CAsW0r53BCLKUrDiH5uMWMRQC4RhFNEy5rCL E7AalwmXVOth2ziRit1mgIhLWJz6KdrmAOSg+phVEHXnptGuS4UjAIXPSxhcVQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679916430; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GUbQYqLsgPZZqff4xN9rWv23hRRhlBpSsk9tptVOd0g=; b=Ejr6sA0ytf6oI/Y4/INbM+VUxoDmLdisRfcIR0oxpElQ8/cuR67/PT/xj2UV/r4Wr8lgw7 hfGAcz/OxKeJJCd71xvsib9Cg2JphffGBGyL3nlcFXaCCKQKWJQYAzqJ1h1VHKmK+SC9Wr 9yaVE/P4kvo13JjPWwp/Ydtt2ToJZkXAzGzOhqGDCzD/LBUknGLLHFHh29qpJAMhsjOXMd twWUHPSpzOkbx5+xGEqWR9ySXZhlcF5vZMFI20rW6Bq/CzqV9MjLKXzi44ngF50JYgg3dm DqW7G5B4sP2bGWV7zrsE/QqTWaDCp9i9uv+fDz/CAffJwhCXL0UTK4he2YuP/g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679916430; a=rsa-sha256; cv=none; b=x9FMqSGZnEKS4+hJYj9DBjhISRx57ObwXJYhqWSSIw+6TZuOD229KiQ2bi8ybcIq3w56IS 2aBcZkeDXYg2PlnhrdHwMrxh/0K9CBy+No5SOiUTCq0CholCKyeyf1kZeka3GoW3qd5SeO SHYCXDhSfnpU0M/i3HM5kr6Nha7waKexSPu52ZUztvocqK9zhnQUcEpCqMYu/Ga9LFBG/k 6A0iOY26AfxXip9FuCIcboBQoHkfUiMDDz/B/ysO7pEp/Tg4WcIziwrwYwpHRJ3EW+DvKM JQf81/o9UTWA7+C0YdJNwecs1NBHyVeCrlh9md+UM+XxiqJvxTOkwpchJ79hmA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PlVsB5Fg1zL4G; Mon, 27 Mar 2023 11:27:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32RBRAmU058460; Mon, 27 Mar 2023 11:27:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32RBRAdZ058459; Mon, 27 Mar 2023 11:27:10 GMT (envelope-from git) Date: Mon, 27 Mar 2023 11:27:10 GMT Message-Id: <202303271127.32RBRAdZ058459@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Robert Clausecker Subject: git: 921e15750ea9 - main - sysutils/terraform-provider-gridscale: fix build on riscv64 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 921e15750ea96c1c080ccfec59a37226421056ea Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=921e15750ea96c1c080ccfec59a37226421056ea commit 921e15750ea96c1c080ccfec59a37226421056ea Author: Robert Clausecker AuthorDate: 2023-03-24 22:25:19 +0000 Commit: Robert Clausecker CommitDate: 2023-03-27 11:24:55 +0000 sysutils/terraform-provider-gridscale: fix build on riscv64 Bump golang.org/x/sys dependency to a version new enough to support riscv64-freebsd. Sponsored by: Berliner Linux User Group e.V. Approved by: portmgr (build fix blanket) --- sysutils/terraform-provider-gridscale/Makefile | 7 +- sysutils/terraform-provider-gridscale/distinfo | 4 +- .../files/patch-go.mod | 74 ++++++ .../files/patch-go.sum | 210 ++++++++++++++++ .../files/patch-vendor_modules.txt | 279 +++++++++++++++++++++ 5 files changed, 572 insertions(+), 2 deletions(-) diff --git a/sysutils/terraform-provider-gridscale/Makefile b/sysutils/terraform-provider-gridscale/Makefile index b2b91aaf37ba..2666412a05af 100644 --- a/sysutils/terraform-provider-gridscale/Makefile +++ b/sysutils/terraform-provider-gridscale/Makefile @@ -1,7 +1,7 @@ PORTNAME= terraform-provider-gridscale PORTVERSION= 1.6.2 DISTVERSIONPREFIX= v -PORTREVISION= 11 +PORTREVISION= 12 CATEGORIES= sysutils MAINTAINER= egypcio@FreeBSD.org @@ -17,7 +17,12 @@ USES= go:modules GO_PKGNAME= github.com/${GH_ACCOUNT}/${PORTNAME} USE_GITHUB= yes GH_ACCOUNT= terraform-providers +GH_TUPLE= golang:sys:v0.6.0:sys PLIST_FILES= bin/${PORTNAME} +pre-patch: + ${RM} -r ${WRKSRC}/vendor/golang.org/x/sys + ${LN} -s ${WRKDIR}/sys-* ${WRKSRC}/vendor/golang.org/x/sys + .include diff --git a/sysutils/terraform-provider-gridscale/distinfo b/sysutils/terraform-provider-gridscale/distinfo index a17dc262fcb4..b23865f2b357 100644 --- a/sysutils/terraform-provider-gridscale/distinfo +++ b/sysutils/terraform-provider-gridscale/distinfo @@ -1,3 +1,5 @@ -TIMESTAMP = 1594196585 +TIMESTAMP = 1679694752 SHA256 (terraform-providers-terraform-provider-gridscale-v1.6.2_GH0.tar.gz) = df888f340572685bd6fc0565836f6be28a803d117cf472f364b76f727ae6185d SIZE (terraform-providers-terraform-provider-gridscale-v1.6.2_GH0.tar.gz) = 4621680 +SHA256 (golang-sys-v0.6.0_GH0.tar.gz) = b4f6d17c7a128f76169964b437cb66b3f2dbf9a33361928ec19dfecf7b03fc54 +SIZE (golang-sys-v0.6.0_GH0.tar.gz) = 1434234 diff --git a/sysutils/terraform-provider-gridscale/files/patch-go.mod b/sysutils/terraform-provider-gridscale/files/patch-go.mod new file mode 100644 index 000000000000..b7ab4c89205a --- /dev/null +++ b/sysutils/terraform-provider-gridscale/files/patch-go.mod @@ -0,0 +1,74 @@ +--- go.mod.orig 2023-03-24 21:59:16 UTC ++++ go.mod +@@ -3,8 +3,69 @@ module github.com/terraform-providers/terraform-provid + require ( + github.com/gridscale/gsclient-go/v3 v3.1.0 + github.com/hashicorp/terraform-plugin-sdk v1.0.0 ++) ++ ++require ( ++ cloud.google.com/go v0.45.1 // indirect ++ github.com/agext/levenshtein v1.2.2 // indirect ++ github.com/apparentlymart/go-cidr v1.0.1 // indirect ++ github.com/apparentlymart/go-textseg v1.0.0 // indirect ++ github.com/armon/go-radix v1.0.0 // indirect ++ github.com/aws/aws-sdk-go v1.19.39 // indirect ++ github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d // indirect ++ github.com/bgentry/speakeasy v0.1.0 // indirect ++ github.com/davecgh/go-spew v1.1.1 // indirect ++ github.com/fatih/color v1.7.0 // indirect ++ github.com/golang/protobuf v1.3.2 // indirect ++ github.com/google/go-cmp v0.3.0 // indirect ++ github.com/google/uuid v1.1.1 // indirect ++ github.com/googleapis/gax-go/v2 v2.0.5 // indirect ++ github.com/hashicorp/errwrap v1.0.0 // indirect ++ github.com/hashicorp/go-cleanhttp v0.5.1 // indirect ++ github.com/hashicorp/go-getter v1.4.0 // indirect ++ github.com/hashicorp/go-hclog v0.9.2 // indirect ++ github.com/hashicorp/go-multierror v1.0.0 // indirect ++ github.com/hashicorp/go-plugin v1.0.1 // indirect ++ github.com/hashicorp/go-safetemp v1.0.0 // indirect ++ github.com/hashicorp/go-uuid v1.0.1 // indirect ++ github.com/hashicorp/go-version v1.2.0 // indirect ++ github.com/hashicorp/golang-lru v0.5.1 // indirect ++ github.com/hashicorp/hcl v0.0.0-20170504190234-a4b07c25de5f // indirect ++ github.com/hashicorp/hcl2 v0.0.0-20190821123243-0c888d1241f6 // indirect ++ github.com/hashicorp/hil v0.0.0-20190212112733-ab17b08d6590 // indirect ++ github.com/hashicorp/logutils v1.0.0 // indirect ++ github.com/hashicorp/terraform-config-inspect v0.0.0-20190821133035-82a99dc22ef4 // indirect ++ github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d // indirect ++ github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af // indirect ++ github.com/konsorten/go-windows-terminal-sequences v1.0.3 // indirect ++ github.com/mattn/go-colorable v0.0.9 // indirect ++ github.com/mattn/go-isatty v0.0.4 // indirect ++ github.com/mitchellh/cli v1.0.0 // indirect ++ github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db // indirect ++ github.com/mitchellh/copystructure v1.0.0 // indirect ++ github.com/mitchellh/go-homedir v1.1.0 // indirect ++ github.com/mitchellh/go-testing-interface v1.0.0 // indirect ++ github.com/mitchellh/go-wordwrap v1.0.0 // indirect ++ github.com/mitchellh/mapstructure v1.1.2 // indirect ++ github.com/mitchellh/reflectwalk v1.0.1 // indirect ++ github.com/oklog/run v1.0.0 // indirect ++ github.com/posener/complete v1.2.1 // indirect + github.com/sirupsen/logrus v1.6.0 // indirect +- golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae // indirect ++ github.com/spf13/afero v1.2.2 // indirect ++ github.com/ulikunitz/xz v0.5.5 // indirect ++ github.com/vmihailenco/msgpack v3.3.3+incompatible // indirect ++ github.com/zclconf/go-cty v1.1.0 // indirect ++ github.com/zclconf/go-cty-yaml v1.0.1 // indirect ++ go.opencensus.io v0.22.0 // indirect ++ golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586 // indirect ++ golang.org/x/net v0.0.0-20200421231249-e086a090c8fd // indirect ++ golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45 // indirect ++ golang.org/x/sys v0.6.0 // indirect ++ golang.org/x/text v0.3.2 // indirect ++ google.golang.org/api v0.9.0 // indirect ++ google.golang.org/appengine v1.6.1 // indirect ++ google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55 // indirect ++ google.golang.org/grpc v1.23.0 // indirect + ) + +-go 1.13 ++go 1.17 diff --git a/sysutils/terraform-provider-gridscale/files/patch-go.sum b/sysutils/terraform-provider-gridscale/files/patch-go.sum new file mode 100644 index 000000000000..7813e7231fd0 --- /dev/null +++ b/sysutils/terraform-provider-gridscale/files/patch-go.sum @@ -0,0 +1,210 @@ +--- go.sum.orig 2023-03-24 21:59:20 UTC ++++ go.sum +@@ -9,7 +9,6 @@ cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2Ul + cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE= + github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= + github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= +-github.com/agext/levenshtein v1.2.1 h1:QmvMAjj2aEICytGiWzmxoE0x2KZvE0fvmqMOfy2tjT8= + github.com/agext/levenshtein v1.2.1/go.mod h1:JEDfjyjHDjOF/1e4FlBE/PkbqA9OfWu2ki2W0IB5558= + github.com/agext/levenshtein v1.2.2 h1:0S/Yg6LYmFJ5stwQeRp6EeOcCbj7xiqQSdNelsXvaqE= + github.com/agext/levenshtein v1.2.2/go.mod h1:JEDfjyjHDjOF/1e4FlBE/PkbqA9OfWu2ki2W0IB5558= +@@ -44,11 +43,9 @@ github.com/go-test/deep v1.0.3/go.mod h1:wGDj63lr65AM2 + github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b h1:VKtxabqXZkF25pY9ekfRL6a582T4P37/31XEstQ5p58= + github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= + github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= +-github.com/golang/mock v1.2.0 h1:28o5sBqPkBsMGnC6b4MvE2TzSr5/AT4c/1fLqVGIwlk= + github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= + github.com/golang/mock v1.3.1 h1:qGJ6qTW+x6xX/my+8YUVl4WNpX9B7+/l2tRsHGZ7f2s= + github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y= +-github.com/golang/protobuf v1.1.0 h1:0iH4Ffd/meGoXqF2lSAhZHt8X+cPgkfn/cb6Cce5Vpc= + github.com/golang/protobuf v1.1.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= + github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= + github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +@@ -57,7 +54,6 @@ github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lX + github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= + github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= + github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= +-github.com/google/go-cmp v0.2.0 h1:+dTQ8DZQJz0Mb/HjFlkptS1FeQ4cWSnN941F8aEG4SQ= + github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= + github.com/google/go-cmp v0.3.0 h1:crn/baboCvb5fXaQ0IJ1SGTsTVrWpDsCWC8EGETZijY= + github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= +@@ -75,13 +71,11 @@ github.com/gridscale/gsclient-go/v3 v3.1.0/go.mod h1:h + github.com/hashicorp/errwrap v0.0.0-20180715044906-d6c0cd880357/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= + github.com/hashicorp/errwrap v1.0.0 h1:hLrqtEDnRye3+sgx6z4qVLNuviH3MR5aQ0ykNJa/UYA= + github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= +-github.com/hashicorp/go-cleanhttp v0.5.0 h1:wvCrVc9TjDls6+YGAF2hAifE1E5U1+b4tH6KdvN3Gig= + github.com/hashicorp/go-cleanhttp v0.5.0/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= + github.com/hashicorp/go-cleanhttp v0.5.1 h1:dH3aiDG9Jvb5r5+bYHsikaOUIpcM0xvgMXVoDkXMzJM= + github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= + github.com/hashicorp/go-getter v1.4.0 h1:ENHNi8494porjD0ZhIrjlAHnveSFhY7hvOJrV/fsKkw= + github.com/hashicorp/go-getter v1.4.0/go.mod h1:7qxyCd8rBfcShwsvxgIguu4KbS3l8bUCwg2Umn7RjeY= +-github.com/hashicorp/go-hclog v0.0.0-20180709165350-ff2cf002a8dd h1:rNuUHR+CvK1IS89MMtcF0EpcVMZtjKfPRp4MEmt/aTs= + github.com/hashicorp/go-hclog v0.0.0-20180709165350-ff2cf002a8dd/go.mod h1:9bjs9uLqI8l75knNv3lV1kA55veR+WUPSiKIWcQHudI= + github.com/hashicorp/go-hclog v0.9.2 h1:CG6TE5H9/JXsFWJCfoIVpKFIkFe6ysEuHirp4DxCsHI= + github.com/hashicorp/go-hclog v0.9.2/go.mod h1:5CU+agLiy3J7N7QjHK5d05KxGsuXiQLrjA0H7acj2lQ= +@@ -94,7 +88,6 @@ github.com/hashicorp/go-safetemp v1.0.0 h1:2HR189eFNrj + github.com/hashicorp/go-safetemp v1.0.0/go.mod h1:oaerMy3BhqiTbVye6QuFhFtIceqFoDHxNAB65b+Rj1I= + github.com/hashicorp/go-uuid v1.0.1 h1:fv1ep09latC32wFoVwnqcnKJGnMSdBanPczbHAYm1BE= + github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= +-github.com/hashicorp/go-version v1.1.0 h1:bPIoEKD27tNdebFGGxxYwcL4nepeY4j1QP23PFRGzg0= + github.com/hashicorp/go-version v1.1.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= + github.com/hashicorp/go-version v1.2.0 h1:3vNe/fWF5CBgRIguda1meWhsZHy3m8gCJ5wx+dIzX/E= + github.com/hashicorp/go-version v1.2.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= +@@ -113,7 +106,6 @@ github.com/hashicorp/terraform-config-inspect v0.0.0-2 + github.com/hashicorp/terraform-config-inspect v0.0.0-20190821133035-82a99dc22ef4/go.mod h1:JDmizlhaP5P0rYTTZB0reDMefAiJyfWPEtugV4in1oI= + github.com/hashicorp/terraform-plugin-sdk v1.0.0 h1:3AjuuV1LJKs1NlG+heUgqWN6/QCSx2kDhyS6K7F0fTw= + github.com/hashicorp/terraform-plugin-sdk v1.0.0/go.mod h1:NuwtLpEpPsFaKJPJNGtMcn9vlhe6Ofe+Y6NqXhJgV2M= +-github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb h1:b5rjCoWHc7eqmAS4/qyk21ZsHyb6Mxv/jykxvNTkU4M= + github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb/go.mod h1:+NfK9FKeTrX5uv1uIXGdwYDTeHna2qgaIlx54MXqjAM= + github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d h1:kJCB4vdITiW1eC1vq2e6IsrXKrZit1bv/TDYFGMp4BQ= + github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d/go.mod h1:+NfK9FKeTrX5uv1uIXGdwYDTeHna2qgaIlx54MXqjAM= +@@ -124,7 +116,6 @@ github.com/jmespath/go-jmespath v0.0.0-20180206201540- + github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= + github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= + github.com/keybase/go-crypto v0.0.0-20161004153544-93f5b35093ba/go.mod h1:ghbZscTyKdM07+Fw3KSi0hcJm+AlEUWj8QLlPtijN/M= +-github.com/konsorten/go-windows-terminal-sequences v1.0.1 h1:mweAR1A6xJ3oS2pRaGiHgQ4OO8tzTaLawm8vnODuwDk= + github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= + github.com/konsorten/go-windows-terminal-sequences v1.0.3 h1:CE8S1cTafDpPvMhIxNJKvHsGVBgn1xWYf1NbHQhywc8= + github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= +@@ -133,7 +124,6 @@ github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNO + github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= + github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= + github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= +-github.com/kylelemons/godebug v0.0.0-20170820004349-d65d576e9348 h1:MtvEpTB6LX3vkb4ax0b5D2DHbNAUsen0Gx5wZoq3lV4= + github.com/kylelemons/godebug v0.0.0-20170820004349-d65d576e9348/go.mod h1:B69LEHPfb2qLo0BaaOLcbitczOKLWTsrBG9LczfCD4k= + github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc= + github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw= +@@ -149,21 +139,17 @@ github.com/mitchellh/colorstring v0.0.0-20190213212951 + github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db/go.mod h1:l0dey0ia/Uv7NcFFVbCLtqEBQbrT4OCwCSKTEv6enCw= + github.com/mitchellh/copystructure v1.0.0 h1:Laisrj+bAB6b/yJwB5Bt3ITZhGJdqmxquMKeZ+mmkFQ= + github.com/mitchellh/copystructure v1.0.0/go.mod h1:SNtv71yrdKgLRyLFxmLdkAbkKEFWgYaq1OVrnRcwhnw= +-github.com/mitchellh/go-homedir v1.0.0 h1:vKb8ShqSby24Yrqr/yDYkuFz8d0WUjys40rvnGC8aR0= + github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= + github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y= + github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= +-github.com/mitchellh/go-testing-interface v0.0.0-20171004221916-a61a99592b77 h1:7GoSOOW2jpsfkntVKaS2rAr1TJqfcxotyaUcuxoZSzg= + github.com/mitchellh/go-testing-interface v0.0.0-20171004221916-a61a99592b77/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI= + github.com/mitchellh/go-testing-interface v1.0.0 h1:fzU/JVNcaqHQEcVFAKeR41fkiLdIPrefOvVG1VZ96U0= + github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI= +-github.com/mitchellh/go-wordwrap v0.0.0-20150314170334-ad45545899c7 h1:DpOJ2HYzCv8LZP15IdmG+YdwD2luVPHITV96TkirNBM= + github.com/mitchellh/go-wordwrap v0.0.0-20150314170334-ad45545899c7/go.mod h1:ZXFpozHsX6DPmq2I0TCekCxypsnAUbP2oI0UX1GXzOo= + github.com/mitchellh/go-wordwrap v1.0.0 h1:6GlHJ/LTGMrIJbwgdqdl2eEH8o+Exx/0m8ir9Gns0u4= + github.com/mitchellh/go-wordwrap v1.0.0/go.mod h1:ZXFpozHsX6DPmq2I0TCekCxypsnAUbP2oI0UX1GXzOo= + github.com/mitchellh/mapstructure v1.1.2 h1:fmNYVwqnSfB9mZU6OS2O6GsXM+wcskZDuKQzvN1EDeE= + github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= +-github.com/mitchellh/reflectwalk v1.0.0 h1:9D+8oIskB4VJBN5SFlmc27fSlIBZaov1Wpk/IfikLNY= + github.com/mitchellh/reflectwalk v1.0.0/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= + github.com/mitchellh/reflectwalk v1.0.1 h1:FVzMWA5RllMAKIdUSC8mdWo3XtwoecrH79BY70sEEpE= + github.com/mitchellh/reflectwalk v1.0.1/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= +@@ -180,7 +166,6 @@ github.com/posener/complete v1.2.1 h1:LrvDIY//XNo65Lq8 + github.com/posener/complete v1.2.1/go.mod h1:6gapUrK/U1TAN7ciCoNRIdVC5sbdBTUh1DKN0g6uH7E= + github.com/sergi/go-diff v1.0.0 h1:Kpca3qRNrduNnOQeazBd0ysaKrUJiIuISHxogkT9RPQ= + github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo= +-github.com/sirupsen/logrus v1.4.2 h1:SPIRibHv4MatM3XXNO2BJeFLZwZ2LvZgfQ5+UNI2im4= + github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= + github.com/sirupsen/logrus v1.6.0 h1:UBcNElsrwanuuMsnGSlYmtmgbb23qDR5dG+6X6Oo89I= + github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88= +@@ -190,9 +175,7 @@ github.com/spf13/pflag v1.0.2/go.mod h1:DYY7MBk1bdzusC + github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= + github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= + github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +-github.com/stretchr/testify v1.2.2 h1:bSDNvY7ZPG5RlJ8otE/7V6gMiyenm9RtJ7IUVIAoJ1w= + github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= +-github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q= + github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= + github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk= + github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= +@@ -208,9 +191,7 @@ github.com/zclconf/go-cty-yaml v1.0.1/go.mod h1:IP3Ylp + go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= + go.opencensus.io v0.22.0 h1:C9hSCOW830chIVkdja34wa6Ky+IzWllkUinR+BtRZd4= + go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= +-golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2 h1:VklqNMn3ovrHsnt90PveolxSbWFaJdECFbxSq0Mqo2M= + golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +-golang.org/x/crypto v0.0.0-20190426145343-a29dc8fdc734 h1:p/H982KKEjUnLJkM3tt/LemDnOc1GiZL5FCVlORJ5zo= + golang.org/x/crypto v0.0.0-20190426145343-a29dc8fdc734/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= + golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= + golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586 h1:7KByu05hhLed2MO29w7p1XfZvZ13m8mub3shuVftRs0= +@@ -230,17 +211,13 @@ golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go + golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= + golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= + golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +-golang.org/x/net v0.0.0-20190311183353-d8887717615a h1:oWX7TPOiFAMXLq8o0ikBYfCJVlRHBcsciT5bXOrH628= + golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= + golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= + golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +-golang.org/x/net v0.0.0-20190502183928-7f726cade0ab h1:9RfW3ktsOZxgo9YNbBAjq1FWzc/igwEcUzZz8IXgSbk= + golang.org/x/net v0.0.0-20190502183928-7f726cade0ab/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= + golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= + golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= +-golang.org/x/net v0.0.0-20190620200207-3b0461eec859 h1:R/3boaszxrf1GEUWTVDzSKVwLmSJpwZ1yqXm8j0v2QI= + golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +-golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7 h1:fHDIZ2oxGnUZRN6WgWFCbYBjH9uqVPRCUVUDhs0wnbA= + golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= + golang.org/x/net v0.0.0-20200421231249-e086a090c8fd h1:QPwSajcTUrFriMF1nJ3XzgoqakqQEsnZf9LdXdi2nkI= + golang.org/x/net v0.0.0-20200421231249-e086a090c8fd/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +@@ -248,42 +225,34 @@ golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be + golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= + golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45 h1:SVwTIAaPC2U/AvvLNZ2a7OVsmBpC8L5BlwK1whH3hm0= + golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= +-golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f h1:wMNYb4v58l5UBM7MYRLPG6ZhfOqbKu7X5eyFl8ZhKvA= + golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= + golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +-golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4 h1:YUO/7uOKsKeq9UokNS62b8FYywz3ker1l1vDZRCRefw= + golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= + golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +-golang.org/x/sync v0.0.0-20190423024810-112230192c58 h1:8gQV6CLnAEikrhgkHFbMAEhagSSnXWGV915qUMm9mrU= + golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= + golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= + golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= + golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= + golang.org/x/sys v0.0.0-20190129075346-302c3dd5f1cc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +-golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a h1:1BGLXjeY4akVXGgbC9HugT3Jv3hCI0z56oJR5vAMgBU= + golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= + golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= + golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= + golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= + golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +-golang.org/x/sys v0.0.0-20190502175342-a43fa875dd82 h1:vsphBvatvfbhlb4PO1BYSr9dzugGxJ/SQHoNufZJq1w= + golang.org/x/sys v0.0.0-20190502175342-a43fa875dd82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= + golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= + golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +-golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0 h1:HyfiK1WMnHj5FXFXatD+Qs1A/xC2Run6RzeW1SyHxpc= + golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +-golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd h1:xhmwyvizuTgC2qz7ZlMluP20uW+C3Rm0FD/WLDX8884= + golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= + golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae h1:Ih9Yo4hSPImZOpfGuA4bR/ORKTAbhZo2AbWNRCnevdo= + golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +-golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg= ++golang.org/x/sys v0.6.0 h1:MVltZSvRTcU2ljQOhs94SXPftV6DCNnZViHeQps87pQ= ++golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= + golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +-golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2 h1:z99zHgr7hKfrUcX/KsoJk5FJfjTceCKIp96+biqP4To= + golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= + golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs= + golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= + golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +-golang.org/x/time v0.0.0-20190308202827-9d24e82272b4 h1:SvFZT6jyqRaOeXpc5h/JSfZenJ2O330aBsf7JfSUXmQ= + golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= + golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= + golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +@@ -302,12 +271,10 @@ google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93 + google.golang.org/api v0.9.0 h1:jbyannxz0XFD3zdjgrSUsaJbgpH4eTrkdhRChkHPfO8= + google.golang.org/api v0.9.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= + google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= +-google.golang.org/appengine v1.4.0 h1:/wp5JvzpHIxhs/dumFmF7BXTf3Z+dd4uXta4kVyO508= + google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= + google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= + google.golang.org/appengine v1.6.1 h1:QzqyMA1tlu6CgqCDUtU9V+ZKhLFT2dkJuANu5QaxI3I= + google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0= +-google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8 h1:Nw54tB0rB7hY/N0NQvRW8DG4Yk3Q6T9cu9RcFQDu1tc= + google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= + google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= + google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= +@@ -319,7 +286,6 @@ google.golang.org/genproto v0.0.0-20190819201941-24fa4 + google.golang.org/grpc v1.14.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= + google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= + google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= +-google.golang.org/grpc v1.21.1 h1:j6XxA85m/6txkUCHvzlV5f+HBNl/1r5cZ2A/3IEFOO8= + google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= + google.golang.org/grpc v1.23.0 h1:AzbTB6ux+okLTzP8Ru1Xs41C303zdcfEht7MQnYJt5A= + google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= diff --git a/sysutils/terraform-provider-gridscale/files/patch-vendor_modules.txt b/sysutils/terraform-provider-gridscale/files/patch-vendor_modules.txt new file mode 100644 index 000000000000..84623efaad98 --- /dev/null +++ b/sysutils/terraform-provider-gridscale/files/patch-vendor_modules.txt @@ -0,0 +1,279 @@ +--- vendor/modules.txt.orig 2023-03-24 22:02:06 UTC ++++ vendor/modules.txt +@@ -1,4 +1,5 @@ + # cloud.google.com/go v0.45.1 ++## explicit; go 1.9 + cloud.google.com/go/compute/metadata + cloud.google.com/go/iam + cloud.google.com/go/internal +@@ -7,14 +8,19 @@ cloud.google.com/go/internal/trace + cloud.google.com/go/internal/version + cloud.google.com/go/storage + # github.com/agext/levenshtein v1.2.2 ++## explicit + github.com/agext/levenshtein + # github.com/apparentlymart/go-cidr v1.0.1 ++## explicit + github.com/apparentlymart/go-cidr/cidr + # github.com/apparentlymart/go-textseg v1.0.0 ++## explicit + github.com/apparentlymart/go-textseg/textseg + # github.com/armon/go-radix v1.0.0 ++## explicit + github.com/armon/go-radix + # github.com/aws/aws-sdk-go v1.19.39 ++## explicit + github.com/aws/aws-sdk-go/aws + github.com/aws/aws-sdk-go/aws/awserr + github.com/aws/aws-sdk-go/aws/awsutil +@@ -51,14 +57,19 @@ github.com/aws/aws-sdk-go/private/protocol/xml/xmlutil + github.com/aws/aws-sdk-go/service/s3 + github.com/aws/aws-sdk-go/service/sts + # github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d ++## explicit + github.com/bgentry/go-netrc/netrc + # github.com/bgentry/speakeasy v0.1.0 ++## explicit + github.com/bgentry/speakeasy + # github.com/davecgh/go-spew v1.1.1 ++## explicit + github.com/davecgh/go-spew/spew + # github.com/fatih/color v1.7.0 ++## explicit + github.com/fatih/color + # github.com/golang/protobuf v1.3.2 ++## explicit + github.com/golang/protobuf/proto + github.com/golang/protobuf/protoc-gen-go/descriptor + github.com/golang/protobuf/ptypes +@@ -66,40 +77,55 @@ github.com/golang/protobuf/ptypes/any + github.com/golang/protobuf/ptypes/duration + github.com/golang/protobuf/ptypes/timestamp + # github.com/google/go-cmp v0.3.0 ++## explicit; go 1.8 + github.com/google/go-cmp/cmp + github.com/google/go-cmp/cmp/internal/diff + github.com/google/go-cmp/cmp/internal/flags + github.com/google/go-cmp/cmp/internal/function + github.com/google/go-cmp/cmp/internal/value + # github.com/google/uuid v1.1.1 ++## explicit + github.com/google/uuid + # github.com/googleapis/gax-go/v2 v2.0.5 ++## explicit + github.com/googleapis/gax-go/v2 + # github.com/gridscale/gsclient-go/v3 v3.1.0 ++## explicit; go 1.13 + github.com/gridscale/gsclient-go/v3 + # github.com/hashicorp/errwrap v1.0.0 ++## explicit + github.com/hashicorp/errwrap + # github.com/hashicorp/go-cleanhttp v0.5.1 ++## explicit + github.com/hashicorp/go-cleanhttp + # github.com/hashicorp/go-getter v1.4.0 ++## explicit + github.com/hashicorp/go-getter + github.com/hashicorp/go-getter/helper/url + # github.com/hashicorp/go-hclog v0.9.2 ++## explicit + github.com/hashicorp/go-hclog + # github.com/hashicorp/go-multierror v1.0.0 ++## explicit + github.com/hashicorp/go-multierror + # github.com/hashicorp/go-plugin v1.0.1 ++## explicit + github.com/hashicorp/go-plugin + github.com/hashicorp/go-plugin/internal/plugin + # github.com/hashicorp/go-safetemp v1.0.0 ++## explicit + github.com/hashicorp/go-safetemp + # github.com/hashicorp/go-uuid v1.0.1 ++## explicit + github.com/hashicorp/go-uuid + # github.com/hashicorp/go-version v1.2.0 ++## explicit + github.com/hashicorp/go-version + # github.com/hashicorp/golang-lru v0.5.1 ++## explicit + github.com/hashicorp/golang-lru/simplelru + # github.com/hashicorp/hcl v0.0.0-20170504190234-a4b07c25de5f ++## explicit + github.com/hashicorp/hcl + github.com/hashicorp/hcl/hcl/ast + github.com/hashicorp/hcl/hcl/parser +@@ -110,6 +136,7 @@ github.com/hashicorp/hcl/json/parser + github.com/hashicorp/hcl/json/scanner + github.com/hashicorp/hcl/json/token + # github.com/hashicorp/hcl2 v0.0.0-20190821123243-0c888d1241f6 ++## explicit + github.com/hashicorp/hcl2/ext/dynblock + github.com/hashicorp/hcl2/ext/typeexpr + github.com/hashicorp/hcl2/gohcl +@@ -121,12 +148,16 @@ github.com/hashicorp/hcl2/hcled + github.com/hashicorp/hcl2/hclparse + github.com/hashicorp/hcl2/hclwrite + # github.com/hashicorp/hil v0.0.0-20190212112733-ab17b08d6590 ++## explicit + github.com/hashicorp/hil/ast + # github.com/hashicorp/logutils v1.0.0 ++## explicit + github.com/hashicorp/logutils + # github.com/hashicorp/terraform-config-inspect v0.0.0-20190821133035-82a99dc22ef4 ++## explicit + github.com/hashicorp/terraform-config-inspect/tfconfig + # github.com/hashicorp/terraform-plugin-sdk v1.0.0 ++## explicit; go 1.12 + github.com/hashicorp/terraform-plugin-sdk/helper/acctest + github.com/hashicorp/terraform-plugin-sdk/helper/hashcode + github.com/hashicorp/terraform-plugin-sdk/helper/logging +@@ -173,52 +204,72 @@ github.com/hashicorp/terraform-plugin-sdk/internal/ver + github.com/hashicorp/terraform-plugin-sdk/plugin + github.com/hashicorp/terraform-plugin-sdk/terraform + # github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d ++## explicit + github.com/hashicorp/yamux + # github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af ++## explicit + github.com/jmespath/go-jmespath + # github.com/konsorten/go-windows-terminal-sequences v1.0.3 ++## explicit + github.com/konsorten/go-windows-terminal-sequences + # github.com/mattn/go-colorable v0.0.9 ++## explicit + github.com/mattn/go-colorable + # github.com/mattn/go-isatty v0.0.4 ++## explicit + github.com/mattn/go-isatty + # github.com/mitchellh/cli v1.0.0 ++## explicit + github.com/mitchellh/cli + # github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db ++## explicit + github.com/mitchellh/colorstring + # github.com/mitchellh/copystructure v1.0.0 ++## explicit + github.com/mitchellh/copystructure + # github.com/mitchellh/go-homedir v1.1.0 ++## explicit + github.com/mitchellh/go-homedir + # github.com/mitchellh/go-testing-interface v1.0.0 ++## explicit + github.com/mitchellh/go-testing-interface + # github.com/mitchellh/go-wordwrap v1.0.0 ++## explicit + github.com/mitchellh/go-wordwrap + # github.com/mitchellh/mapstructure v1.1.2 ++## explicit + github.com/mitchellh/mapstructure + # github.com/mitchellh/reflectwalk v1.0.1 ++## explicit + github.com/mitchellh/reflectwalk + # github.com/oklog/run v1.0.0 ++## explicit + github.com/oklog/run + # github.com/posener/complete v1.2.1 ++## explicit + github.com/posener/complete + github.com/posener/complete/cmd + github.com/posener/complete/cmd/install + github.com/posener/complete/match + # github.com/sirupsen/logrus v1.6.0 ++## explicit; go 1.13 + github.com/sirupsen/logrus + # github.com/spf13/afero v1.2.2 ++## explicit + github.com/spf13/afero + github.com/spf13/afero/mem + # github.com/ulikunitz/xz v0.5.5 ++## explicit + github.com/ulikunitz/xz + github.com/ulikunitz/xz/internal/hash + github.com/ulikunitz/xz/internal/xlog + github.com/ulikunitz/xz/lzma + # github.com/vmihailenco/msgpack v3.3.3+incompatible ++## explicit + github.com/vmihailenco/msgpack + github.com/vmihailenco/msgpack/codes + # github.com/zclconf/go-cty v1.1.0 ++## explicit + github.com/zclconf/go-cty/cty + github.com/zclconf/go-cty/cty/convert + github.com/zclconf/go-cty/cty/function +@@ -228,8 +279,10 @@ github.com/zclconf/go-cty/cty/json + github.com/zclconf/go-cty/cty/msgpack + github.com/zclconf/go-cty/cty/set + # github.com/zclconf/go-cty-yaml v1.0.1 ++## explicit + github.com/zclconf/go-cty-yaml + # go.opencensus.io v0.22.0 ++## explicit + go.opencensus.io + go.opencensus.io/internal + go.opencensus.io/internal/tagencoding +@@ -247,6 +300,7 @@ go.opencensus.io/trace/internal + go.opencensus.io/trace/propagation + go.opencensus.io/trace/tracestate + # golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586 ++## explicit + golang.org/x/crypto/bcrypt + golang.org/x/crypto/blowfish + golang.org/x/crypto/cast5 +@@ -264,6 +318,7 @@ golang.org/x/crypto/openpgp/s2k + golang.org/x/crypto/poly1305 + golang.org/x/crypto/ssh + # golang.org/x/net v0.0.0-20200421231249-e086a090c8fd ++## explicit; go 1.11 + golang.org/x/net/context + golang.org/x/net/context/ctxhttp + golang.org/x/net/http/httpguts +@@ -273,21 +328,24 @@ golang.org/x/net/idna + golang.org/x/net/internal/timeseries + golang.org/x/net/trace + # golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45 ++## explicit; go 1.11 + golang.org/x/oauth2 + golang.org/x/oauth2/google + golang.org/x/oauth2/internal + golang.org/x/oauth2/jws + golang.org/x/oauth2/jwt +-# golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae ++# golang.org/x/sys v0.6.0 ++## explicit; go 1.17 + golang.org/x/sys/cpu +-golang.org/x/sys/internal/unsafeheader + golang.org/x/sys/unix + # golang.org/x/text v0.3.2 ++## explicit + golang.org/x/text/secure/bidirule + golang.org/x/text/transform + golang.org/x/text/unicode/bidi + golang.org/x/text/unicode/norm + # google.golang.org/api v0.9.0 ++## explicit; go 1.9 + google.golang.org/api/gensupport + google.golang.org/api/googleapi + google.golang.org/api/googleapi/internal/uritemplates +@@ -299,6 +357,7 @@ google.golang.org/api/storage/v1 + google.golang.org/api/transport/http + google.golang.org/api/transport/http/internal/propagation + # google.golang.org/appengine v1.6.1 ++## explicit + google.golang.org/appengine + google.golang.org/appengine/datastore + google.golang.org/appengine/datastore/internal/cloudkey +@@ -313,12 +372,14 @@ google.golang.org/appengine/internal/remote_api + google.golang.org/appengine/internal/urlfetch + google.golang.org/appengine/urlfetch + # google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55 ++## explicit + google.golang.org/genproto/googleapis/api/annotations + google.golang.org/genproto/googleapis/iam/v1 + google.golang.org/genproto/googleapis/rpc/code + google.golang.org/genproto/googleapis/rpc/status + google.golang.org/genproto/googleapis/type/expr + # google.golang.org/grpc v1.23.0 ++## explicit + google.golang.org/grpc + google.golang.org/grpc/balancer + google.golang.org/grpc/balancer/base