From 26d47041b187d0e78fc20c5ff4549fcae8587b3f Mon Sep 17 00:00:00 2001 From: Hasan Turken Date: Tue, 17 Aug 2021 00:39:51 +0300 Subject: [PATCH 01/18] Add tfcli package with cli interfaces Signed-off-by: Hasan Turken --- go.mod | 1 + go.sum | 448 ++++++++++++++++++++++++++++++++++++++++ pkg/tfcli/error.go | 29 +++ pkg/tfcli/interfaces.go | 82 ++++++++ 4 files changed, 560 insertions(+) create mode 100644 pkg/tfcli/error.go create mode 100644 pkg/tfcli/interfaces.go diff --git a/go.mod b/go.mod index 4f900929..467116b8 100644 --- a/go.mod +++ b/go.mod @@ -8,4 +8,5 @@ require ( github.com/iancoleman/strcase v0.2.0 github.com/muvaf/typewriter v0.0.0-20210818141336-01a132960eec github.com/pkg/errors v0.9.1 + github.com/crossplane/crossplane-runtime v0.14.0 ) diff --git a/go.sum b/go.sum index c7ced206..5563db96 100644 --- a/go.sum +++ b/go.sum @@ -20,6 +20,7 @@ cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4g cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ= cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE= cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk= +cloud.google.com/go/firestore v1.1.0/go.mod h1:ulACoGHTpvq5r8rxGJ4ddJZBZqakUQqClKRT5SZwBmk= cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I= cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw= cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA= @@ -30,6 +31,23 @@ cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohl cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs= cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= +github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8= +github.com/Azure/go-autorest v14.2.0+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24= +github.com/Azure/go-autorest/autorest v0.9.0/go.mod h1:xyHB1BMZT0cuDHU7I0+g046+BFDTQ8rEZB0s4Yfa6bI= +github.com/Azure/go-autorest/autorest v0.11.1/go.mod h1:JFgpikqFJ/MleTTxwepExTKnFUKKszPS8UavbQYUMuw= +github.com/Azure/go-autorest/autorest/adal v0.5.0/go.mod h1:8Z9fGy2MpX0PvDjB1pEgQTmVqjGhiHBW7RJJEciWzS0= +github.com/Azure/go-autorest/autorest/adal v0.9.0/go.mod h1:/c022QCutn2P7uY+/oQWWNcK9YU+MH96NgK+jErpbcg= +github.com/Azure/go-autorest/autorest/adal v0.9.5/go.mod h1:B7KF7jKIeC9Mct5spmyCB/A8CG/sEz1vwIRGv/bbw7A= +github.com/Azure/go-autorest/autorest/date v0.1.0/go.mod h1:plvfp3oPSKwf2DNjlBjWF/7vwR+cUD/ELuzDCXwHUVA= +github.com/Azure/go-autorest/autorest/date v0.3.0/go.mod h1:BI0uouVdmngYNUzGWeSYnokU+TrmwEsOqdt8Y6sso74= +github.com/Azure/go-autorest/autorest/mocks v0.1.0/go.mod h1:OTyCOPRA2IgIlWxVYxBee2F5Gr4kF2zd2J5cFRaIDN0= +github.com/Azure/go-autorest/autorest/mocks v0.2.0/go.mod h1:OTyCOPRA2IgIlWxVYxBee2F5Gr4kF2zd2J5cFRaIDN0= +github.com/Azure/go-autorest/autorest/mocks v0.4.0/go.mod h1:LTp+uSrOhSkaKrUy935gNZuuIPPVsHlr9DSOxSayd+k= +github.com/Azure/go-autorest/autorest/mocks v0.4.1/go.mod h1:LTp+uSrOhSkaKrUy935gNZuuIPPVsHlr9DSOxSayd+k= +github.com/Azure/go-autorest/logger v0.1.0/go.mod h1:oExouG+K6PryycPJfVSxi/koC6LSNgds39diKLz7Vrc= +github.com/Azure/go-autorest/logger v0.2.0/go.mod h1:T9E3cAhj2VqvPOtCYAvby9aBXkZmbF5NWuPV8+WeEW8= +github.com/Azure/go-autorest/tracing v0.5.0/go.mod h1:r/s2XiOKccPW3HrqB+W0TQzfbtp2fGCgRFtBroKn4Dk= +github.com/Azure/go-autorest/tracing v0.6.0/go.mod h1:+vhtPC754Xsa23ID7GlGsrdKBpUA79WCAKPPZVC2DeU= 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/Masterminds/goutils v1.1.0/go.mod h1:8cTjp+g8YejhMuvIA5y2vz3BpJxksy863GQaJW2MFNU= @@ -37,12 +55,23 @@ github.com/Masterminds/semver v1.5.0/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF0 github.com/Masterminds/sprig v2.22.0+incompatible/go.mod h1:y6hNFY5UBTIWBxnzTeuNhlNS5hqE0NB0E6fgfo2Br3o= github.com/Microsoft/go-winio v0.4.14/go.mod h1:qXqCSQ3Xa7+6tgxaGTIe4Kpcdsi+P8jBhyzoq1bpyYA= github.com/Microsoft/go-winio v0.4.16/go.mod h1:XB6nPKklQyQ7GC9LdcBEcBl8PF76WugXOPRXwdLnMv0= +github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb06e3pkSAbeQ52E9H9iFoQsEEwGN64994WTCIhntQ= +github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= github.com/ProtonMail/go-crypto v0.0.0-20210428141323-04723f9f07d7/go.mod h1:z4/9nQmJSSwwds7ejkxaJwO37dru3geImFUdJlaLzQo= +github.com/PuerkitoBio/purell v1.0.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0= +github.com/PuerkitoBio/purell v1.1.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0= +github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0= +github.com/PuerkitoBio/urlesc v0.0.0-20160726150825-5bd2802263f2/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE= +github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE= github.com/acomagu/bufpipe v1.0.3/go.mod h1:mxdxdup/WdsKVreO5GpW4+M/1CE2sMG4jeGJ2sYmHc4= 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= github.com/alecthomas/kong v0.2.16/go.mod h1:kQOmtJgV+Lb4aj+I2LEn40cbtawdWJ9Y8QLq+lElKxE= +github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= +github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= +github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= +github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= github.com/andybalholm/crlf v0.0.0-20171020200849-670099aa064f/go.mod h1:k8feO4+kXDxro6ErPXBRTJ/ro2mf0SsFG8s7doP9kJE= github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYUyUczH0OGQWaF5ceTx0UBShxjsH6f8oGKYe2c= github.com/apparentlymart/go-cidr v1.0.1/go.mod h1:EBcsNrHc3zQeuaeCeCtQruQm+n9/YjEn/vI25Lg7Gwc= @@ -55,31 +84,87 @@ github.com/apparentlymart/go-textseg/v12 v12.0.0 h1:bNEQyAGak9tojivJNkoqWErVCQbj github.com/apparentlymart/go-textseg/v12 v12.0.0/go.mod h1:S/4uRK2UtaQttw1GenVJEynmyUenKwP++x/+DdGV/Ec= github.com/apparentlymart/go-textseg/v13 v13.0.0 h1:Y+KvPE1NYz0xl601PVImeQfFyEy6iT90AvPUL1NNfNw= github.com/apparentlymart/go-textseg/v13 v13.0.0/go.mod h1:ZK2fH7c4NqDTLtiYLvIkEghdlcqw7yxLeM89kiTRPUo= +github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o= +github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= +github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY= github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs= +github.com/asaskevich/govalidator v0.0.0-20180720115003-f9ffefc3facf/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY= +github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY= github.com/aws/aws-sdk-go v1.15.78/go.mod h1:E3/ieXAlvM0XWO57iftYVDLLvQ824smPP3ATZkfNZeM= github.com/aws/aws-sdk-go v1.25.3/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= +github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= +github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= +github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d/go.mod h1:6QX/PXZ00z/TKoufEY6K/a0k6AhaJrQKdFe6OfVXsa4= github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= +github.com/bketelsen/crypt v0.0.3-0.20200106085610-5cbc8cc4026c/go.mod h1:MKsuJmJgSg28kpZDP6UIiPt0e0Oz0kqKNGyRaWEPv84= +github.com/blang/semver v3.5.0+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk= +github.com/blang/semver v3.5.1+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= +github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= +github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/cheggaaa/pb v1.0.27/go.mod h1:pQciLPpbU0oxA0h+VJYYLxO+XeDQb5pZijXscXHm81s= github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= +github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8= +github.com/coreos/bbolt v1.3.1-coreos.6/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk= +github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk= +github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= +github.com/coreos/etcd v3.3.13+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= +github.com/coreos/etcd v3.3.15+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= +github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk= +github.com/coreos/go-oidc v2.1.0+incompatible/go.mod h1:CgnwVTmzoESiwO9qyAFEMiHoZ1nMCKZlZ9V6mm3/LKc= +github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= +github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= +github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= +github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= +github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= +github.com/coreos/pkg v0.0.0-20180108230652-97fdf19511ea/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= +github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= +github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE= +github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= +github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= +github.com/crossplane/crossplane-runtime v0.14.0 h1:alBvQAwg9wJ88wEBnzyzmlN0N/v1W3Jx4OvBX3Fmrkg= +github.com/crossplane/crossplane-runtime v0.14.0/go.mod h1:Bc54/KBvV9ld/tvervcnhcSzk13FYguTqmYt72Mybps= +github.com/davecgh/go-spew v0.0.0-20151105211317-5215b55f46b2/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= +github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no= +github.com/docker/docker v0.7.3-0.20190327010347-be7ac8be2ae0/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= +github.com/docker/go-units v0.3.3/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= +github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96/go.mod h1:Qh8CwZgvJUkLughtfhJv5dyTYa91l1fOUCrgjqmcifM= +github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod h1:WwZ+bS3ebgob9U8Nd0kOddGdZWjyMGR8Wziv+TBNwSE= +github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= +github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= +github.com/elazarl/goproxy v0.0.0-20170405201442-c4fc26588b6e/go.mod h1:/Zj4wYkgs4iZTTu3o/KG3Itv/qCCa8VVMlb3i9OVuzc= +github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153/go.mod h1:/Zj4wYkgs4iZTTu3o/KG3Itv/qCCa8VVMlb3i9OVuzc= +github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs= +github.com/emicklei/go-restful v2.9.5+incompatible/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs= github.com/emirpasic/gods v1.12.0/go.mod h1:YfzfFFoVP/catgzJb4IKIqXjX78Ha8FMSDh3ymbK86o= github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= +github.com/evanphx/json-patch v4.2.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= +github.com/evanphx/json-patch v4.5.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= +github.com/evanphx/json-patch v4.9.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc= +github.com/form3tech-oss/jwt-go v3.2.2+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k= +github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= +github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= +github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= +github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/gliderlabs/ssh v0.2.2/go.mod h1:U7qILu1NlMHj9FlMhZLlkCdDnU1DBEAqr0aevW3Awn0= +github.com/globalsign/mgo v0.0.0-20180905125535-1ca0a4f7cbcb/go.mod h1:xkRDCp4j0OGD1HRkm4kmhM+pmpv3AKq5SU7GMg4oO/Q= +github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8/go.mod h1:xkRDCp4j0OGD1HRkm4kmhM+pmpv3AKq5SU7GMg4oO/Q= github.com/go-git/gcfg v1.5.0/go.mod h1:5m20vg6GwYabIxaOonVkTdrILxQMpEShl1xiMF4ua+E= github.com/go-git/go-billy/v5 v5.2.0/go.mod h1:pmpqyWchKfYfrkb/UVH4otLvyi/5gJlGI4Hb3ZqZ3W0= github.com/go-git/go-billy/v5 v5.3.1/go.mod h1:pmpqyWchKfYfrkb/UVH4otLvyi/5gJlGI4Hb3ZqZ3W0= @@ -88,9 +173,64 @@ github.com/go-git/go-git/v5 v5.4.2/go.mod h1:gQ1kArt6d+n+BGd+/B/I74HwRTLhth2+zti github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= +github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= +github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= +github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= +github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= +github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7sIas= +github.com/go-logr/logr v0.2.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU= +github.com/go-logr/logr v0.3.0 h1:q4c+kbcR0d5rSurhBR8dIgieOaYpXtsdTYfx22Cu6rs= +github.com/go-logr/logr v0.3.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU= +github.com/go-logr/zapr v0.2.0/go.mod h1:qhKdvif7YF5GI9NWEpyxTSSBdGmzkNguibrdCNVPunU= +github.com/go-openapi/analysis v0.0.0-20180825180245-b006789cd277/go.mod h1:k70tL6pCuVxPJOHXQ+wIac1FUrvNkHolPie/cLEU6hI= +github.com/go-openapi/analysis v0.17.0/go.mod h1:IowGgpVeD0vNm45So8nr+IcQ3pxVtpRoBWb8PVZO0ik= +github.com/go-openapi/analysis v0.18.0/go.mod h1:IowGgpVeD0vNm45So8nr+IcQ3pxVtpRoBWb8PVZO0ik= +github.com/go-openapi/analysis v0.19.2/go.mod h1:3P1osvZa9jKjb8ed2TPng3f0i/UY9snX6gxi44djMjk= +github.com/go-openapi/errors v0.17.0/go.mod h1:LcZQpmvG4wyF5j4IhA73wkLFQg+QJXOQHVjmcZxhka0= +github.com/go-openapi/errors v0.18.0/go.mod h1:LcZQpmvG4wyF5j4IhA73wkLFQg+QJXOQHVjmcZxhka0= +github.com/go-openapi/errors v0.19.2/go.mod h1:qX0BLWsyaKfvhluLejVpVNwNRdXZhEbTA4kxxpKBC94= +github.com/go-openapi/jsonpointer v0.0.0-20160704185906-46af16f9f7b1/go.mod h1:+35s3my2LFTysnkMfxsJBAMHj/DoqoB9knIWoYG/Vk0= +github.com/go-openapi/jsonpointer v0.17.0/go.mod h1:cOnomiV+CVVwFLk0A/MExoFMjwdsUdVpsRhURCKh+3M= +github.com/go-openapi/jsonpointer v0.18.0/go.mod h1:cOnomiV+CVVwFLk0A/MExoFMjwdsUdVpsRhURCKh+3M= +github.com/go-openapi/jsonpointer v0.19.2/go.mod h1:3akKfEdA7DF1sugOqz1dVQHBcuDBPKZGEoHC/NkiQRg= +github.com/go-openapi/jsonpointer v0.19.3/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg= +github.com/go-openapi/jsonreference v0.0.0-20160704190145-13c6e3589ad9/go.mod h1:W3Z9FmVs9qj+KR4zFKmDPGiLdk1D9Rlm7cyMvf57TTg= +github.com/go-openapi/jsonreference v0.17.0/go.mod h1:g4xxGn04lDIRh0GJb5QlpE3HfopLOL6uZrK/VgnsK9I= +github.com/go-openapi/jsonreference v0.18.0/go.mod h1:g4xxGn04lDIRh0GJb5QlpE3HfopLOL6uZrK/VgnsK9I= +github.com/go-openapi/jsonreference v0.19.2/go.mod h1:jMjeRr2HHw6nAVajTXJ4eiUwohSTlpa0o73RUL1owJc= +github.com/go-openapi/jsonreference v0.19.3/go.mod h1:rjx6GuL8TTa9VaixXglHmQmIL98+wF9xc8zWvFonSJ8= +github.com/go-openapi/loads v0.17.0/go.mod h1:72tmFy5wsWx89uEVddd0RjRWPZm92WRLhf7AC+0+OOU= +github.com/go-openapi/loads v0.18.0/go.mod h1:72tmFy5wsWx89uEVddd0RjRWPZm92WRLhf7AC+0+OOU= +github.com/go-openapi/loads v0.19.0/go.mod h1:72tmFy5wsWx89uEVddd0RjRWPZm92WRLhf7AC+0+OOU= +github.com/go-openapi/loads v0.19.2/go.mod h1:QAskZPMX5V0C2gvfkGZzJlINuP7Hx/4+ix5jWFxsNPs= +github.com/go-openapi/runtime v0.0.0-20180920151709-4f900dc2ade9/go.mod h1:6v9a6LTXWQCdL8k1AO3cvqx5OtZY/Y9wKTgaoP6YRfA= +github.com/go-openapi/runtime v0.19.0/go.mod h1:OwNfisksmmaZse4+gpV3Ne9AyMOlP1lt4sK4FXt0O64= +github.com/go-openapi/spec v0.0.0-20160808142527-6aced65f8501/go.mod h1:J8+jY1nAiCcj+friV/PDoE1/3eeccG9LYBs0tYvLOWc= +github.com/go-openapi/spec v0.17.0/go.mod h1:XkF/MOi14NmjsfZ8VtAKf8pIlbZzyoTvZsdfssdxcBI= +github.com/go-openapi/spec v0.18.0/go.mod h1:XkF/MOi14NmjsfZ8VtAKf8pIlbZzyoTvZsdfssdxcBI= +github.com/go-openapi/spec v0.19.2/go.mod h1:sCxk3jxKgioEJikev4fgkNmwS+3kuYdJtcsZsD5zxMY= +github.com/go-openapi/spec v0.19.3/go.mod h1:FpwSN1ksY1eteniUU7X0N/BgJ7a4WvBFVA8Lj9mJglo= +github.com/go-openapi/strfmt v0.17.0/go.mod h1:P82hnJI0CXkErkXi8IKjPbNBM6lV6+5pLP5l494TcyU= +github.com/go-openapi/strfmt v0.18.0/go.mod h1:P82hnJI0CXkErkXi8IKjPbNBM6lV6+5pLP5l494TcyU= +github.com/go-openapi/strfmt v0.19.0/go.mod h1:+uW+93UVvGGq2qGaZxdDeJqSAqBqBdl+ZPMF/cC8nDY= +github.com/go-openapi/swag v0.0.0-20160704191624-1d0bd113de87/go.mod h1:DXUve3Dpr1UfpPtxFw+EFuQ41HhCWZfha5jSVRG7C7I= +github.com/go-openapi/swag v0.17.0/go.mod h1:AByQ+nYG6gQg71GINrmuDXCPWdL640yX49/kXLo40Tg= +github.com/go-openapi/swag v0.18.0/go.mod h1:AByQ+nYG6gQg71GINrmuDXCPWdL640yX49/kXLo40Tg= +github.com/go-openapi/swag v0.19.2/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk= +github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk= +github.com/go-openapi/validate v0.18.0/go.mod h1:Uh4HdOzKt19xGIGm1qHf/ofbX1YQ4Y+MYsct2VUrAJ4= +github.com/go-openapi/validate v0.19.2/go.mod h1:1tRCw7m3jtI8eNWEEliiAqUIcBztB2KDnRCRMUi7GTA= +github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= github.com/go-test/deep v1.0.3 h1:ZrJSEWsXzPOxaZnFteGEfooLba+ju3FYIbOrS+rQd68= github.com/go-test/deep v1.0.3/go.mod h1:wGDj63lr65AM2AQyKZd/NYHGb0R+1RLqB8NKt3aSFNA= +github.com/gobuffalo/flect v0.1.5/go.mod h1:W3K3X9ksuZfir8f/LrfVtWmCDQFfayuylOJ7sz/Fj80= +github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= +github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4= +github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o= +github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= +github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= +github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= @@ -100,6 +240,7 @@ github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFU github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= github.com/golang/mock v1.4.1/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= github.com/golang/mock v1.4.3/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= +github.com/golang/protobuf v0.0.0-20161109072736-4bd1920723d7/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= 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= @@ -115,6 +256,8 @@ github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvq github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8= github.com/golang/protobuf v1.4.2 h1:+Z5KGCizgyZCbGh1KZqA0fcLLkwbsjIzS4aV2v7wJX0= github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= +github.com/golang/protobuf v1.4.3 h1:JjCZWpVbqXDqFVmTfYWEVTMIYrL/NPdPSCHPJ0T/raM= +github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/google/addlicense v0.0.0-20210428195630-6d92264d7170/go.mod h1:EMjYTRimagHs1FwlIqKyX3wAM0u3rA+McvlIIWmSamA= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= @@ -129,6 +272,9 @@ github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.6 h1:BKbKCqvP6I+rmFHt06ZmyQtvB8xAkWdhFyr0ZUNZcxQ= github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/gofuzz v0.0.0-20161122191042-44d81051d367/go.mod h1:HP5RmnzzSNb993RKQDq4+1A4ia9nllfqcQFTQJedwGI= +github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/gofuzz v1.1.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= @@ -139,37 +285,72 @@ github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod h1:ZgVRPoUq/hf github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= +github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= +github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY= +github.com/googleapis/gnostic v0.4.1/go.mod h1:LRhVm6pbyptWbWbuZ38d1eyptfvIytN3ir6b65WBswg= +github.com/googleapis/gnostic v0.5.1/go.mod h1:6U4PtQXGIEt/Z3h5MAT7FNofLnw9vXk2cUuW7uA/OeU= +github.com/gophercloud/gophercloud v0.1.0/go.mod h1:vxM41WHh5uqHVBMZHzuwNOHh8XEoIEcSTewFxm1c5g8= +github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= +github.com/gorilla/websocket v0.0.0-20170926233335-4201258b820c/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= +github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= +github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= +github.com/gregjones/httpcache v0.0.0-20170728041850-787624de3eb7/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA= +github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA= +github.com/grpc-ecosystem/go-grpc-middleware v0.0.0-20190222133341-cfaf5686ec79/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= +github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= +github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de4/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= +github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= +github.com/grpc-ecosystem/grpc-gateway v1.3.0/go.mod h1:RSKVYQBd5MCa4OVpNdGskqpgL2+G+NZTnrVHpWWfpdw= +github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= +github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= +github.com/hashicorp/consul/api v1.1.0/go.mod h1:VmuI/Lkw1nC05EYQWNKwWGbkg+FbDBtguAZLlVdkD9Q= +github.com/hashicorp/consul/sdk v0.1.1/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8= 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-checkpoint v0.5.0/go.mod h1:7nfLNL10NsxqO4iWuW6tWW0HjZuDrwkBuEQsVcpCOgg= github.com/hashicorp/go-cleanhttp v0.5.0/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= +github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48= github.com/hashicorp/go-cty v1.4.1-0.20200414143053-d3edf31b6320 h1:1/D3zfFHttUKaCaGKZ/dR2roBXv0vKbSCnssIldfQdI= github.com/hashicorp/go-cty v1.4.1-0.20200414143053-d3edf31b6320/go.mod h1:EiZBMaudVLy8fmjf9Npq1dq9RalhveqZG5w/yz3mHWs= +github.com/hashicorp/go-getter v1.4.0/go.mod h1:7qxyCd8rBfcShwsvxgIguu4KbS3l8bUCwg2Umn7RjeY= github.com/hashicorp/go-getter v1.5.3/go.mod h1:BrrV/1clo8cCYu6mxvboYg+KutTiFnXjMEgDD8+i7ZI= github.com/hashicorp/go-hclog v0.0.0-20180709165350-ff2cf002a8dd/go.mod h1:9bjs9uLqI8l75knNv3lV1kA55veR+WUPSiKIWcQHudI= github.com/hashicorp/go-hclog v0.14.1/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ= github.com/hashicorp/go-hclog v0.15.0/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ= +github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= +github.com/hashicorp/go-msgpack v0.5.3/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM= github.com/hashicorp/go-multierror v1.0.0 h1:iVjPR7a6H0tWELX5NxNe7bYopibicUzc7uPribsnS6o= github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk= github.com/hashicorp/go-plugin v1.3.0/go.mod h1:F9eH4LrE/ZsRdbwhfjs9k9HoDUwAHnYtXdgmf1AVNs0= github.com/hashicorp/go-plugin v1.4.1/go.mod h1:5fGEH17QVwTTcR0zV7yhDPLLmFX9YSZ38b18Udy6vYQ= +github.com/hashicorp/go-rootcerts v1.0.0/go.mod h1:K6zTfqpRlCUIjkwsN4Z+hiSfzSTQa6eBIzfwKfwNnHU= github.com/hashicorp/go-safetemp v1.0.0/go.mod h1:oaerMy3BhqiTbVye6QuFhFtIceqFoDHxNAB65b+Rj1I= +github.com/hashicorp/go-sockaddr v1.0.0/go.mod h1:7Xibr9yA9JjQq1JpNB2Vw7kxv8xerXegt+ozgdvDeDU= +github.com/hashicorp/go-syslog v1.0.0/go.mod h1:qPfqrKkXGihmCqbJM2mZgkZGvKG1dFdvsLplgctolz4= github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= 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/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= github.com/hashicorp/go-version v1.3.0 h1:McDWVJIU/y+u1BRV06dPaLfLCaT7fUTJLp5r04x7iNw= github.com/hashicorp/go-version v1.3.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= +github.com/hashicorp/go.net v0.0.1/go.mod h1:hjKkEWcCURg++eb33jQU7oqQcI9XDCnUzHA0oac0k90= github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= +github.com/hashicorp/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4= +github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= +github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= github.com/hashicorp/hcl/v2 v2.3.0/go.mod h1:d+FwDBbOLvpAM3Z6J7gPj/VoAGkNe/gm352ZhjJ/Zv8= github.com/hashicorp/hcl/v2 v2.8.2 h1:wmFle3D1vu0okesm8BTLVDyJ6/OL9DCLUwn0b2OptiY= github.com/hashicorp/hcl/v2 v2.8.2/go.mod h1:bQTN5mpo+jewjJgh8jr0JUguIi7qPHUF6yIfAEN3jqY= github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64= +github.com/hashicorp/mdns v1.0.0/go.mod h1:tL+uN++7HEJ6SQLQ2/p+z2pH24WQKWjBPkE0mNTz8vQ= +github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2pPBoIllUwCN7I= +github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc= github.com/hashicorp/terraform-exec v0.14.0/go.mod h1:qrAASDq28KZiMPDnQ02sFS9udcqEkRly002EA2izXTA= github.com/hashicorp/terraform-json v0.12.0/go.mod h1:pmbq9o4EuL43db5+0ogX10Yofv1nozM+wskr/bGFJpI= github.com/hashicorp/terraform-plugin-go v0.3.0 h1:AJqYzP52JFYl9NABRI7smXI1pNjgR5Q/y2WyVJ/BOZA= @@ -178,41 +359,72 @@ github.com/hashicorp/terraform-plugin-sdk/v2 v2.7.0 h1:SuI59MqNjYDrL7EfqHX9V6P/2 github.com/hashicorp/terraform-plugin-sdk/v2 v2.7.0/go.mod h1:grseeRo9g3yNkYW09iFlV8LG78jTa1ssBgouogQg/RU= github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb/go.mod h1:+NfK9FKeTrX5uv1uIXGdwYDTeHna2qgaIlx54MXqjAM= github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d/go.mod h1:+NfK9FKeTrX5uv1uIXGdwYDTeHna2qgaIlx54MXqjAM= +github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= github.com/huandu/xstrings v1.3.2/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE= github.com/iancoleman/strcase v0.2.0 h1:05I4QRnGpI0m37iZQRuskXh+w77mr6Z41lwQzuHLwW0= github.com/iancoleman/strcase v0.2.0/go.mod h1:iwCmte+B7n89clKwxIoIXy/HfoL7AsD47ZCWhYzw7ho= github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= +github.com/imdario/mergo v0.3.5/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= +github.com/imdario/mergo v0.3.10/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA= github.com/imdario/mergo v0.3.11/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA= github.com/imdario/mergo v0.3.12/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA= +github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i6rXxKeerYnT8Nvf0QmHCRC1n8sfWVwXF2Frvo= github.com/jessevdk/go-flags v1.5.0/go.mod h1:Fw0T6WPc1dYxT4mKEZRfG5kJhaTDP9pj1c2EWnYs/m4= github.com/jhump/protoreflect v1.6.0/go.mod h1:eaTn3RZAmMBcV0fifFvlm6VHNz3wSkYyXYWUh7ymB74= github.com/jmespath/go-jmespath v0.0.0-20160202185014-0b12d6b521d8/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= +github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo= +github.com/json-iterator/go v0.0.0-20180612202835-f2b4162afba3/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= +github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= +github.com/json-iterator/go v1.1.7/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= +github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= +github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= +github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= github.com/kevinburke/ssh_config v0.0.0-20201106050909-4977a11b4351/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM= +github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q= +github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= github.com/klauspost/compress v1.11.2/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= 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/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= +github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= +github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pretty v0.2.1 h1:Fmg33tUaq4/8ym9TJN1x7sLJnHVwhP33CNkpYV/7rwI= github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= +github.com/kr/pty v1.1.5/go.mod h1:9r2w37qlBe7rQ6e1fg1S/9xpWHSnaqNdHD3WcMdbPDA= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= 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= +github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= +github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= +github.com/mailru/easyjson v0.0.0-20160728113105-d5b7844b561a/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= +github.com/mailru/easyjson v0.0.0-20180823135443-60711f1a8329/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= +github.com/mailru/easyjson v0.0.0-20190312143242-1de009706dbe/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= +github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= +github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= +github.com/mailru/easyjson v0.7.0/go.mod h1:KAzv3t3aY1NaHWoQz1+4F1ccyAH66Jk7yos7ldAVICs= github.com/matryer/is v1.2.0/go.mod h1:2fLPjFQM9rhQ15aVEtbuwhJinnOqrmgXPNdZsdwlWXA= github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= +github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= github.com/mattn/go-isatty v0.0.10/go.mod h1:qgIWMr58cqv1PHHyhnkY9lrL7etaEgOFcMEpPG5Rm84= +github.com/mattn/go-runewidth v0.0.2/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= github.com/mattn/go-runewidth v0.0.4/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= +github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= +github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4= +github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= +github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc= github.com/mitchellh/cli v1.1.2/go.mod h1:6iaV0fGdElS6dPBx0EApTxHrcWvmJphyh2n8YBLPPZ4= github.com/mitchellh/copystructure v1.0.0/go.mod h1:SNtv71yrdKgLRyLFxmLdkAbkKEFWgYaq1OVrnRcwhnw= github.com/mitchellh/copystructure v1.2.0 h1:vpKXTN4ewci03Vljg/q9QvCGUDttBOGBIa15WveJJGw= @@ -226,45 +438,141 @@ github.com/mitchellh/go-testing-interface v1.0.4/go.mod h1:kRemZodwjscx+RGhAo8eI 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/gox v0.4.0/go.mod h1:Sd9lOJ0+aimLBi73mGofS1ycjY8lL3uZM3JPS42BGNg= +github.com/mitchellh/iochan v1.0.0/go.mod h1:JwYml1nuB7xOzsp52dPpHFffvOCDupsG0QubkSMEySY= +github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= 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/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= github.com/mitchellh/reflectwalk v1.0.2 h1:G2LzWKi524PWgd3mLHV8Y5k7s6XUvT0Gef6zxSIeXaQ= github.com/mitchellh/reflectwalk v1.0.2/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= +github.com/moby/term v0.0.0-20200312100748-672ec06f55cd/go.mod h1:DdlQx2hp0Ss5/fLikoLlEeIYiATotOjgB//nb973jeo= +github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= +github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= +github.com/modern-go/reflect2 v0.0.0-20180320133207-05fbef0ca5da/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= +github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= +github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= +github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= +github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= github.com/muvaf/typewriter v0.0.0-20210818141336-01a132960eec h1:d6rrK7O0hupL9vj6bjSzaEslgRoEVgJsvsQSqT9V4LQ= github.com/muvaf/typewriter v0.0.0-20210818141336-01a132960eec/go.mod h1:SAAdeMEiFXR8LcHffvIdiLI1w243DCH2DuHq7UrA5YQ= +github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= +github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= github.com/nsf/jsondiff v0.0.0-20200515183724-f29ed568f4ce h1:RPclfga2SEJmgMmz2k+Mg7cowZ8yv4Trqw9UsJby758= github.com/nsf/jsondiff v0.0.0-20200515183724-f29ed568f4ce/go.mod h1:uFMI8w+ref4v2r9jz+c9i1IfIttS/OkmLfrk1jne5hs= +github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQA= +github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U= +github.com/olekukonko/tablewriter v0.0.0-20170122224234-a0225b3f23b5/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo= +github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= +github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= +github.com/onsi/ginkgo v1.8.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= +github.com/onsi/ginkgo v1.11.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= +github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk= +github.com/onsi/ginkgo v1.14.1/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY= +github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= +github.com/onsi/gomega v1.5.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= +github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= +github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= +github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= +github.com/onsi/gomega v1.10.2/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= +github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= +github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k= +github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= +github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU= github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= +github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pmezard/go-difflib v0.0.0-20151028094244-d8ed2627bdf0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI= +github.com/pquerna/cachecontrol v0.0.0-20171018203845-0dec1b30a021/go.mod h1:prYjPmNq4d1NPVmpShWobRqXY3q7Vp+80DqgxxUrUIA= +github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= +github.com/prometheus/client_golang v0.9.2/go.mod h1:OsXs2jCmiKlQ1lTBmv21f2mNfw4xf/QclQDMrYNZzcM= +github.com/prometheus/client_golang v0.9.3/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDft0ttaMvbicHlPoso= +github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= +github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= +github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= +github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= +github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= +github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= +github.com/prometheus/common v0.0.0-20181126121408-4724e9255275/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= +github.com/prometheus/common v0.4.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= +github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= +github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= +github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= +github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= +github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= +github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= +github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= +github.com/prometheus/procfs v0.2.0/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= +github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU= +github.com/remyoudompheng/bigfft v0.0.0-20170806203942-52369c62f446/go.mod h1:uYEyJGbgTkfkS4+E/PavXkNJcbFIpEtjt2B0KDQ5+9M= +github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= +github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g= +github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= +github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= +github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= github.com/sebdah/goldie v1.0.0/go.mod h1:jXP4hmWywNEwZzhMuv2ccnqTSFpuq8iyQhtQdkkZBH4= github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo= github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM= github.com/sergi/go-diff v1.2.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM= +github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= +github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q= +github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= +github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88= +github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= +github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= +github.com/soheilhy/cmux v0.1.3/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM= +github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM= +github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= +github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ= +github.com/spf13/afero v1.2.2/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk= +github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= +github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ= +github.com/spf13/cobra v0.0.5/go.mod h1:3K3wKZymM7VvHMDS9+Akkh4K60UwM26emMESw8tLCHU= +github.com/spf13/cobra v1.1.1/go.mod h1:WnodtKOvamDL/PwE2M4iKs8aMDBZ5Q5klgD3qfVJQMI= +github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo= +github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= +github.com/spf13/pflag v1.0.1/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= github.com/spf13/pflag v1.0.2/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= +github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= +github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= +github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s= +github.com/spf13/viper v1.7.0/go.mod h1:8WkrPz2fc9jxqZNCJI/76HCieCp4Q8HaLFoCha5qpdg= +github.com/stoewer/go-strcase v1.2.0/go.mod h1:IBiWB2sKIp3wVVQ3Y035++gc+knqhUQag1KpM8ahLw8= 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/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE= +github.com/stretchr/testify v0.0.0-20151208002404-e3a8ff8ce365/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= +github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= +github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= +github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= +github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0= +github.com/ulikunitz/xz v0.5.5/go.mod h1:2bypXElzHzzJZwzH67Y6wb67pO62Rzfn7BSiF4ABRW8= github.com/ulikunitz/xz v0.5.8/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14= +github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA= github.com/vmihailenco/msgpack v3.3.3+incompatible/go.mod h1:fy3FlTQTDXWkZ7Bh6AcGMlsjHatGryHQYUTf1ShIgkk= github.com/vmihailenco/msgpack v4.0.4+incompatible h1:dSLoQfGFAo3F6OoNhwUmLwVgaUXK79GlxNBwueZn0xI= github.com/vmihailenco/msgpack v4.0.4+incompatible/go.mod h1:fy3FlTQTDXWkZ7Bh6AcGMlsjHatGryHQYUTf1ShIgkk= github.com/vmihailenco/msgpack/v4 v4.3.12/go.mod h1:gborTTJjAo/GWTqqRjrLCn9pgNN+NXzzngzBKDPIqw4= github.com/vmihailenco/tagparser v0.1.1/go.mod h1:OeAg3pn3UbLjkWt+rN9oFYB6u/cQgqMEUPoW2WPyhdI= github.com/xanzy/ssh-agent v0.3.0/go.mod h1:3s9xbODqPuuhK9JV1R321M/FlMZSBvE5aY6eAcqrDh0= +github.com/xiang90/probing v0.0.0-20160813154853-07dd2e8dfe18/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= +github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= +github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q= github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= @@ -274,23 +582,49 @@ github.com/zclconf/go-cty v1.2.1/go.mod h1:hOPWgoHbaTUnI5k4D2ld+GRpFJSCe6bCM7m1q github.com/zclconf/go-cty v1.8.4 h1:pwhhz5P+Fjxse7S7UriBrMu6AUJSZM5pKqGem1PjGAs= github.com/zclconf/go-cty v1.8.4/go.mod h1:vVKLxnk3puL4qRAv72AO+W99LUD4da90g3uUAzyuvAk= github.com/zclconf/go-cty-debug v0.0.0-20191215020915-b22d67c1ba0b/go.mod h1:ZRKQfBXbGkpdV6QMzT3rU1kSTAnfu1dO8dPKjYprgj8= +go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= +go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= +go.etcd.io/bbolt v1.3.5/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ= +go.etcd.io/etcd v0.5.0-alpha.5.0.20200910180754-dd1b699fc489/go.mod h1:yVHk9ub3CSBatqGNg7GRmsnfLWtoW60w4eDYfh7vHDg= go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= +go.uber.org/atomic v0.0.0-20181018215023-8dc6146f7569/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= +go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= +go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= +go.uber.org/atomic v1.6.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= +go.uber.org/goleak v1.1.10/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A= +go.uber.org/multierr v0.0.0-20180122172545-ddea229ff1df/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= +go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= +go.uber.org/multierr v1.5.0/go.mod h1:FeouvMocqHpRaaGuG9EjoKcStLC43Zu/fmqdUMPcKYU= +go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9Ejo0C68/HhF8uaILCdgjnY+goOA= +go.uber.org/zap v0.0.0-20180814183419-67bc79d13d15/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= +go.uber.org/zap v1.8.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= +go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= +go.uber.org/zap v1.15.0/go.mod h1:Mb2vm2krFEG5DV0W9qcHBYFtp/Wku1cvYaqPsS/WYfc= +golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= +golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= +golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= +golang.org/x/crypto v0.0.0-20190211182817-74369b46fc67/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190219172222-a4c6cb3142f2/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20190320223903-b7391e95e576/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190426145343-a29dc8fdc734/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= +golang.org/x/exp v0.0.0-20190125153040-c74c464bbbf2/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= +golang.org/x/exp v0.0.0-20190312203227-4b39c73a6495/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod h1:86+5VVa7VpoJ4kLfm080zCjGlMRFzhUhsZKEZO7MGek= golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod h1:JXzH8nQsPlswgeRAPE3MuO9GYsAcnJvJ4vnMwN/5qkY= @@ -320,20 +654,32 @@ golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzB golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0 h1:RM4zey1++hCTbCVQfnWeKs9/IEsaBLA8vTkd0WVtmH4= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/net v0.0.0-20170114055629-f2499483f923/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180530234432-1e491301e022/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180811021610-c39426892332/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20181005035420-146acd28ed58/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20181220203305-927f97764cc3/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/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190320064053-1272bf9dcd53/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-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-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20190812203447-cdfb69ac37fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= @@ -344,10 +690,12 @@ golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/ golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= +golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210326060303-6b1517762897 h1:KrsHThm5nFk34YtATK1LsThyGhGbGe1olrte/HInHvs= golang.org/x/net v0.0.0-20210326060303-6b1517762897/go.mod h1:uSPa2vr4CLtc/ILN5odXGNXS6mhrKVzTaCXzk9m6W3k= @@ -365,23 +713,39 @@ golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sys v0.0.0-20170830134202-bb24a47a89ea/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +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-20180905080454-ebe1bf3edb33/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-20181026203630-95b1ffbd15a5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190209173611-3b5209105503/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/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-20190321052220-f7bb7a8bee54/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/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-20190616124812-15dcb6c0061f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -393,8 +757,11 @@ golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20201112073958-5cba982894dd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -402,31 +769,46 @@ golang.org/x/sys v0.0.0-20210324051608-47abb6519492/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210502180810-71e4cd670f79 h1:RX8C8PRZc2hTIod4ds8ij+/4RQX3AqhYj3uOHmyaz4E= golang.org/x/sys v0.0.0-20210502180810-71e4cd670f79/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= +golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.5 h1:i6eZZ+zk0SOf0xgBpEpPD18qWcJda6q1sxt3S0kzyUQ= golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20181011042414-1f849cf54d09/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190206041539-40960b6deb8e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= +golang.org/x/tools v0.0.0-20190614205625-5aca471b1d59/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= +golang.org/x/tools v0.0.0-20190624222133-a101b041ded4/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191108193012-7d206e10da11/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191112195655-aa38f8e97acc/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= @@ -446,8 +828,10 @@ golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod h1:o4KQGtdN14AW+yjs golang.org/x/tools v0.0.0-20200312045724-11d5b4c81c7d/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw= golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8= golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200505023115-26f46d2f7ef8/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200616133436-c1934b75d054/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200713011307-fd294ab11aed/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/tools v0.1.0 h1:po9/4sTYwZU9lPhi1tOrb4hCv3qrhiQ77LZfGa2OjwY= @@ -457,6 +841,10 @@ golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +gomodules.xyz/jsonpatch/v2 v2.1.0/go.mod h1:IhYNNY4jnS53ZnfE4PAmpKtDpTCj1JFXc+3mwe7XcUU= +gonum.org/v1/gonum v0.0.0-20190331200053-3d26580ed485/go.mod h1:2ltnJ7xHfj0zHS40VVPYEAAMTa3ZGguvHGBSJeRWqE0= +gonum.org/v1/netlib v0.0.0-20190313105609-8cb42192e0e0/go.mod h1:wa6Ws7BG/ESfp6dHfk7C6KdzKA7wR7u/rKwOGE66zvw= +gonum.org/v1/netlib v0.0.0-20190331212654-76723241ea4e/go.mod h1:kS+toOQn6AQKjmKJ7gzohV1XkqsFehRA2FbsbkopSuQ= google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M= google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= @@ -507,6 +895,7 @@ google.golang.org/genproto v0.0.0-20200515170657-fc4c6c6a6587/go.mod h1:YsZOwe1m google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod h1:jDfRM7FcilCzHH/e9qn6dsT145K34l5v+OpcnNgKAAA= google.golang.org/genproto v0.0.0-20200711021454-869866162049/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20201110150050-8816d57aaa9a/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/grpc v1.8.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= @@ -531,19 +920,37 @@ google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpAD google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4= google.golang.org/protobuf v1.25.0 h1:Ejskq+SyPohKW+1uil0JJMtmHCgJPJ/qWTxr8qp+R4c= google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= +gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= +gopkg.in/cheggaaa/pb.v1 v1.0.25/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qStrOgw= gopkg.in/cheggaaa/pb.v1 v1.0.27/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qStrOgw= gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= +gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= +gopkg.in/inf.v0 v0.9.0/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw= +gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw= +gopkg.in/ini.v1 v1.51.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= +gopkg.in/natefinch/lumberjack.v2 v2.0.0/go.mod h1:l0ndWWf7gzL7RNwBG7wST/UCcT4T24xpD6X8LsfU/+k= +gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo= +gopkg.in/square/go-jose.v2 v2.2.2/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI= +gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI= +gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74= +gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v3 v3.0.0-20190905181640-827449938966/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw= +gotest.tools/v3 v3.0.2/go.mod h1:3SzNCllyD9/Y+b5r9JIKQ474KzkZyqLqEfYqMsX94Bk= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= @@ -551,6 +958,47 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= +k8s.io/api v0.0.0-20190918155943-95b840bb6a1f/go.mod h1:uWuOHnjmNrtQomJrvEBg0c0HRNyQ+8KTEERVsK0PW48= +k8s.io/api v0.20.1/go.mod h1:KqwcCVogGxQY3nBlRpwt+wpAMF/KjaCc7RpywacvqUo= +k8s.io/apiextensions-apiserver v0.0.0-20190918161926-8f644eb6e783/go.mod h1:xvae1SZB3E17UpV59AWc271W/Ph25N+bjPyR63X6tPY= +k8s.io/apiextensions-apiserver v0.20.1/go.mod h1:ntnrZV+6a3dB504qwC5PN/Yg9PBiDNt1EVqbW2kORVk= +k8s.io/apimachinery v0.0.0-20190913080033-27d36303b655/go.mod h1:nL6pwRT8NgfF8TT68DBI8uEePRt89cSvoXUVqbkWHq4= +k8s.io/apimachinery v0.20.1/go.mod h1:WlLqWAHZGg07AeltaI0MV5uk1Omp8xaN0JGLY6gkRpU= +k8s.io/apiserver v0.0.0-20190918160949-bfa5e2e684ad/go.mod h1:XPCXEwhjaFN29a8NldXA901ElnKeKLrLtREO9ZhFyhg= +k8s.io/apiserver v0.20.1/go.mod h1:ro5QHeQkgMS7ZGpvf4tSMx6bBOgPfE+f52KwvXfScaU= +k8s.io/client-go v0.0.0-20190918160344-1fbdaa4c8d90/go.mod h1:J69/JveO6XESwVgG53q3Uz5OSfgsv4uxpScmmyYOOlk= +k8s.io/client-go v0.20.1/go.mod h1:/zcHdt1TeWSd5HoUe6elJmHSQ6uLLgp4bIJHVEuy+/Y= +k8s.io/code-generator v0.0.0-20190912054826-cd179ad6a269/go.mod h1:V5BD6M4CyaN5m+VthcclXWsVcT1Hu+glwa1bi3MIsyE= +k8s.io/code-generator v0.20.1/go.mod h1:UsqdF+VX4PU2g46NC2JRs4gc+IfrctnwHb76RNbWHJg= +k8s.io/component-base v0.0.0-20190918160511-547f6c5d7090/go.mod h1:933PBGtQFJky3TEwYx4aEPZ4IxqhWh3R6DCmzqIn1hA= +k8s.io/component-base v0.20.1/go.mod h1:guxkoJnNoh8LNrbtiQOlyp2Y2XFCZQmrcg2n/DeYNLk= +k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= +k8s.io/gengo v0.0.0-20190822140433-26a664648505/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= +k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= +k8s.io/gengo v0.0.0-20201113003025-83324d819ded/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= +k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk= +k8s.io/klog v0.3.0/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk= +k8s.io/klog v0.4.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I= +k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE= +k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y= +k8s.io/klog/v2 v2.4.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y= +k8s.io/kube-openapi v0.0.0-20190816220812-743ec37842bf/go.mod h1:1TqjTSzOxsLGIKfj0lK8EeCP7K1iUG65v09OM0/WG5E= +k8s.io/kube-openapi v0.0.0-20201113171705-d219536bb9fd/go.mod h1:WOJ3KddDSol4tAGcJo0Tvi+dK12EcqSLqcWsryKMpfM= +k8s.io/utils v0.0.0-20190801114015-581e00157fb1/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew= +k8s.io/utils v0.0.0-20201110183641-67b214c5f920/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= +modernc.org/cc v1.0.0/go.mod h1:1Sk4//wdnYJiUIxnW8ddKpaOJCF37yAdqYnkxUpaYxw= +modernc.org/golex v1.0.0/go.mod h1:b/QX9oBD/LhixY6NDh+IdGv17hgB+51fET1i2kPSmvk= +modernc.org/mathutil v1.0.0/go.mod h1:wU0vUrJsVWBZ4P6e7xtFJEhFSNsfRLJ8H458uRjg03k= +modernc.org/strutil v1.0.0/go.mod h1:lstksw84oURvj9y3tn8lGvRxyRC1S2+g5uuIzNfIOBs= +modernc.org/xc v1.0.0/go.mod h1:mRNCo0bvLjGhHO9WsyuKVU4q0ceiDDDoEeWDJHrNx8I= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= +sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.14/go.mod h1:LEScyzhFmoF5pso/YSeBstl57mOzx9xlU9n85RGrDQg= +sigs.k8s.io/controller-runtime v0.8.0/go.mod h1:v9Lbj5oX443uR7GXYY46E0EE2o7k2YxQ58GxVNeXSW4= +sigs.k8s.io/controller-tools v0.2.4/go.mod h1:m/ztfQNocGYBgTTCmFdnK94uVvgxeZeE3LtJvd/jIzA= +sigs.k8s.io/structured-merge-diff v0.0.0-20190525122527-15d366b2352e/go.mod h1:wWxsB5ozmmv/SG7nM11ayaAW51xMvak/t1r0CSlcokI= +sigs.k8s.io/structured-merge-diff v0.0.0-20190817042607-6149e4549fca/go.mod h1:IIgPezJWb76P0hotTxzDbWsMYB8APh18qZnxkomBpxA= +sigs.k8s.io/structured-merge-diff/v4 v4.0.2/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw= +sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o= +sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc= diff --git a/pkg/tfcli/error.go b/pkg/tfcli/error.go new file mode 100644 index 00000000..a914bc55 --- /dev/null +++ b/pkg/tfcli/error.go @@ -0,0 +1,29 @@ +package tfcli + +import "fmt" + +type OperationType int + +const ( + OperationUnknown OperationType = iota + OperationObserve + OperationCreate + OperationUpdate + OperationDelete +) + +func (o OperationType) String() string { + return []string{"Unknown", "Observe", "Create", "Update", "Delete"}[o] +} + +type OperationInProgressError struct { + op OperationType +} + +func (e *OperationInProgressError) Error() string { + return fmt.Sprintf("operation %s in progress", e.op.String()) +} + +func (e *OperationInProgressError) GetOperation() OperationType { + return e.op +} diff --git a/pkg/tfcli/interfaces.go b/pkg/tfcli/interfaces.go new file mode 100644 index 00000000..87517bc2 --- /dev/null +++ b/pkg/tfcli/interfaces.go @@ -0,0 +1,82 @@ +/* +Copyright 2021 The Crossplane Authors. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package tfcli + +import ( + "context" + "time" + + "github.com/crossplane/crossplane-runtime/pkg/logging" +) + +type ObserveResult struct { + UpToDate bool + Completed bool + Exists bool +} + +type Client interface { + Observe(id string) (ObserveResult, error) + Create() (bool, error) + Update() (bool, error) + Delete() (bool, error) + GetHandle() string + GetState() []byte + Destroy() error +} + +type Builder interface { + RequiresProvider + RequiresResource + RequiresState + RequiresContext + RequiresTimeout + RequiresLogger + BuildObserveClient() (Client, error) + BuildCreateClient() (Client, error) + BuildUpdateClient() (Client, error) + BuildDeletionClient() (Client, error) +} + +type RequiresLogger interface { + WithLogger(logger logging.Logger) Builder +} + +type RequiresTimeout interface { + WithTimeout(d time.Duration) Builder +} + +type RequiresContext interface { + WithContext(ctx context.Context) Builder +} + +type RequiresState interface { + WithState(tfState []byte) Builder +} + +type RequiresResource interface { + WithResourceType(labelType string) Builder + WithResourceName(labelName string) Builder + WithResourceBody(body []byte) Builder + WithHandle(handle string) Builder +} + +type RequiresProvider interface { + WithProviderSource(source string) Builder + WithProviderVersion(version string) Builder + WithProviderConfiguration(conf []byte) Builder +} From 9ced7bbe175b4bcb5981dd98d5901b5a633687ac Mon Sep 17 00:00:00 2001 From: Hasan Turken Date: Tue, 17 Aug 2021 00:41:07 +0300 Subject: [PATCH 02/18] Add terraform state v4 schema and parsing Signed-off-by: Hasan Turken --- pkg/conversion/statev4.go | 134 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 134 insertions(+) create mode 100644 pkg/conversion/statev4.go diff --git a/pkg/conversion/statev4.go b/pkg/conversion/statev4.go new file mode 100644 index 00000000..b833d44b --- /dev/null +++ b/pkg/conversion/statev4.go @@ -0,0 +1,134 @@ +package conversion + +import ( + "encoding/base64" + "encoding/json" + + "github.com/pkg/errors" +) + +const ( + errCannotParseState = "cannot parse state" + errCannotDecodeMetadata = "cannot decode state metadata" + errInvalidState = "invalid state file" + errFmtIncompatibleVersion = "state version not supported, expecting 4 found %d" + + errNotOneResource = "state file should contain exactly 1 resource" + errNotOneInstance = "state file should contain exactly 1 instance" +) + +// State file schema from https://github.com/hashicorp/terraform/blob/d9dfd451ea572219871bb9c5503a471418258e40/internal/states/statefile/version4.go + +type StateV4 struct { + Version uint64 `json:"version"` + TerraformVersion string `json:"terraform_version"` + Serial uint64 `json:"serial"` + Lineage string `json:"lineage"` + RootOutputs map[string]OutputStateV4 `json:"outputs"` + Resources []ResourceStateV4 `json:"resources"` +} + +type OutputStateV4 struct { + ValueRaw json.RawMessage `json:"value"` + ValueTypeRaw json.RawMessage `json:"type"` + Sensitive bool `json:"sensitive,omitempty"` +} + +type ResourceStateV4 struct { + Module string `json:"module,omitempty"` + Mode string `json:"mode"` + Type string `json:"type"` + Name string `json:"name"` + EachMode string `json:"each,omitempty"` + ProviderConfig string `json:"provider"` + Instances []InstanceObjectStateV4 `json:"instances"` +} + +type InstanceObjectStateV4 struct { + IndexKey interface{} `json:"index_key,omitempty"` + Status string `json:"status,omitempty"` + Deposed string `json:"deposed,omitempty"` + + SchemaVersion uint64 `json:"schema_version"` + AttributesRaw json.RawMessage `json:"attributes,omitempty"` + AttributesFlat map[string]string `json:"attributes_flat,omitempty"` + AttributeSensitivePaths json.RawMessage `json:"sensitive_attributes,omitempty,"` + + PrivateRaw []byte `json:"private,omitempty"` + + Dependencies []string `json:"dependencies,omitempty"` + + CreateBeforeDestroy bool `json:"create_before_destroy,omitempty"` +} + +func ReadStateV4(data []byte) (*StateV4, error) { + st := &StateV4{} + if err := json.Unmarshal(data, st); err != nil { + return nil, errors.Wrap(err, errCannotParseState) + } + + return st, errors.Wrap(st.Validate(), errInvalidState) +} + +func BuildStateV4(encodedMetadata string, attributesSensitive json.RawMessage) (*StateV4, error) { + st := &StateV4{} + + m, err := base64.StdEncoding.DecodeString(encodedMetadata) + if err != nil { + return nil, errors.Wrap(err, errCannotDecodeMetadata) + } + err = json.Unmarshal(m, st) + if err != nil { + return nil, errors.Wrap(err, errCannotParseState) + } + + if err = st.Validate(); err != nil { + return nil, errors.Wrap(err, errInvalidState) + } + + st.Resources[0].Instances[0].AttributeSensitivePaths = attributesSensitive + + return st, nil +} + +func (st *StateV4) Validate() error { + // We only recognize and support state file version 4 right now + if st.Version != 4 { + return errors.Errorf(errFmtIncompatibleVersion, st.Version) + } + // Terraform state files may contain more than 1 resources. And each resource + // could have more than 1 instances which is controlled by the count argument: + // https://www.terraform.io/docs/language/meta-arguments/count.html#basic-syntax + // In our case, we expect our state file will always contain exactly 1 instance of 1 resource. + if len(st.Resources) != 1 { + return errors.New(errNotOneResource) + } + if len(st.Resources[0].Instances) != 1 { + return errors.New(errNotOneInstance) + } + + return nil +} + +func (st *StateV4) GetAttributes() json.RawMessage { + return st.Resources[0].Instances[0].AttributesRaw +} + +func (st *StateV4) GetSensitiveAttributes() json.RawMessage { + return st.Resources[0].Instances[0].AttributeSensitivePaths +} + +func (st *StateV4) GetEncodedState() (string, error) { + // TODO(hasan): do we need a deep copy, probably + st.Resources[0].Instances[0].AttributeSensitivePaths = nil + b, err := json.Marshal(st) + if err != nil { + return "", err + } + + return base64.StdEncoding.EncodeToString(b), nil +} + +func (st *StateV4) Serialize() ([]byte, error) { + return json.Marshal(st) +} From 5479e1026f2977e86c2720ca5874eefe512eedae Mon Sep 17 00:00:00 2001 From: Hasan Turken Date: Tue, 17 Aug 2021 00:41:45 +0300 Subject: [PATCH 03/18] Add tfparser helper for conversion Signed-off-by: Hasan Turken --- go.mod | 2 ++ go.sum | 3 +++ pkg/conversion/json.go | 5 +++++ 3 files changed, 10 insertions(+) create mode 100644 pkg/conversion/json.go diff --git a/go.mod b/go.mod index 467116b8..a5a34222 100644 --- a/go.mod +++ b/go.mod @@ -9,4 +9,6 @@ require ( github.com/muvaf/typewriter v0.0.0-20210818141336-01a132960eec github.com/pkg/errors v0.9.1 github.com/crossplane/crossplane-runtime v0.14.0 + github.com/pkg/errors v0.9.1 + github.com/json-iterator/go v1.1.10 ) diff --git a/go.sum b/go.sum index 5563db96..f34f13c6 100644 --- a/go.sum +++ b/go.sum @@ -378,6 +378,7 @@ github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22 github.com/json-iterator/go v0.0.0-20180612202835-f2b4162afba3/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= github.com/json-iterator/go v1.1.7/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= +github.com/json-iterator/go v1.1.10 h1:Kz6Cvnvv2wGdaG/V8yMvfkmNiXq9Ya2KUv4rouJJr68= github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= @@ -448,9 +449,11 @@ github.com/mitchellh/reflectwalk v1.0.2 h1:G2LzWKi524PWgd3mLHV8Y5k7s6XUvT0Gef6zx github.com/mitchellh/reflectwalk v1.0.2/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= github.com/moby/term v0.0.0-20200312100748-672ec06f55cd/go.mod h1:DdlQx2hp0Ss5/fLikoLlEeIYiATotOjgB//nb973jeo= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= +github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/reflect2 v0.0.0-20180320133207-05fbef0ca5da/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= +github.com/modern-go/reflect2 v1.0.1 h1:9f412s+6RmYXLWZSEzVVgPGK7C2PphHj5RJrvfx9AWI= github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= diff --git a/pkg/conversion/json.go b/pkg/conversion/json.go new file mode 100644 index 00000000..8cc3446a --- /dev/null +++ b/pkg/conversion/json.go @@ -0,0 +1,5 @@ +package conversion + +import jsoniter "github.com/json-iterator/go" + +var TFParser = jsoniter.Config{TagKey: "tf"}.Froze() From 330e197e109bbcadee1b6eecabc380ca9a712fd2 Mon Sep 17 00:00:00 2001 From: Hasan Turken Date: Tue, 17 Aug 2021 00:43:28 +0300 Subject: [PATCH 04/18] Add Terraformed resource interface Signed-off-by: Hasan Turken --- pkg/terraform/resource/interfaces.go | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 pkg/terraform/resource/interfaces.go diff --git a/pkg/terraform/resource/interfaces.go b/pkg/terraform/resource/interfaces.go new file mode 100644 index 00000000..a923db4c --- /dev/null +++ b/pkg/terraform/resource/interfaces.go @@ -0,0 +1,27 @@ +package resource + +import ( + "github.com/crossplane/crossplane-runtime/pkg/resource" +) + +// TerraformStateHandler handles terraform state +type TerraformStateHandler interface { + GetObservation() ([]byte, error) + SetObservation(data []byte) error + + GetParameters() ([]byte, error) + SetParameters(data []byte) error +} + +type TerraformMetadataProvider interface { + GetTerraformResourceType() string + GetTerraformResourceIdField() string +} + +// Terraformed is a Kubernetes object representing a concrete terraform managed resource +type Terraformed interface { + resource.Managed + + TerraformMetadataProvider + TerraformStateHandler +} From 800b96f9929445a2a3dc4b62b8c67e3f8663d6f9 Mon Sep 17 00:00:00 2001 From: Hasan Turken Date: Tue, 17 Aug 2021 00:45:59 +0300 Subject: [PATCH 05/18] Add conversion adapter interface Signed-off-by: Hasan Turken --- pkg/conversion/adapter.go | 62 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) create mode 100644 pkg/conversion/adapter.go diff --git a/pkg/conversion/adapter.go b/pkg/conversion/adapter.go new file mode 100644 index 00000000..891555c7 --- /dev/null +++ b/pkg/conversion/adapter.go @@ -0,0 +1,62 @@ +package conversion + +import ( + "context" + + "github.com/crossplane/crossplane-runtime/pkg/reconciler/managed" + + "github.com/crossplane-contrib/terrajet/pkg/terraform/resource" +) + +// ObserveResult represents result of an observe operation +type ObserveResult struct { + // Tells whether the observe operation is completed. + Completed bool + // Terraform state to persist + State string + // Sensitive information that is available during creation/update. + ConnectionDetails managed.ConnectionDetails + // Is resource up to date + UpToDate bool + // Does resource exist + Exists bool + + LateInitialized bool +} + +// CreateResult represents result of a create operation +type CreateResult struct { + // Tells whether the apply operation is completed. + Completed bool + // Terraform state to persist + ExternalName string + + State string + + // Sensitive information that is available during creation/update. + ConnectionDetails managed.ConnectionDetails +} + +// UpdateResult represents result of an update operation +type UpdateResult struct { + // Tells whether the apply operation is completed. + Completed bool + // Terraform state to persist + State string + // Sensitive information that is available during creation/update. + ConnectionDetails managed.ConnectionDetails +} + +// DeletionResult represents result of a delete operation +type DeletionResult struct { + // Tells whether the apply operation is completed. + Completed bool +} + +// A Adapter is used to interact with terraform managed resources +type Adapter interface { + Observe(ctx context.Context, tr resource.Terraformed) (ObserveResult, error) + Create(ctx context.Context, tr resource.Terraformed) (CreateResult, error) + Update(ctx context.Context, tr resource.Terraformed) (UpdateResult, error) + Delete(ctx context.Context, tr resource.Terraformed) (DeletionResult, error) +} From 622764a9e0600495b8e99924daad4398ddebe552 Mon Sep 17 00:00:00 2001 From: Hasan Turken Date: Tue, 17 Aug 2021 00:47:56 +0300 Subject: [PATCH 06/18] Add cli implementation for conversion adapter Signed-off-by: Hasan Turken --- go.mod | 1 + pkg/conversion/cli.go | 208 ++++++++++++++++++++++++++++++++++++++++++ pkg/meta/meta.go | 20 ++++ 3 files changed, 229 insertions(+) create mode 100644 pkg/conversion/cli.go create mode 100644 pkg/meta/meta.go diff --git a/go.mod b/go.mod index a5a34222..46b5bfce 100644 --- a/go.mod +++ b/go.mod @@ -11,4 +11,5 @@ require ( github.com/crossplane/crossplane-runtime v0.14.0 github.com/pkg/errors v0.9.1 github.com/json-iterator/go v1.1.10 + k8s.io/apimachinery v0.20.1 ) diff --git a/pkg/conversion/cli.go b/pkg/conversion/cli.go new file mode 100644 index 00000000..6b347fee --- /dev/null +++ b/pkg/conversion/cli.go @@ -0,0 +1,208 @@ +package conversion + +import ( + "context" + "fmt" + + "github.com/pkg/errors" + "k8s.io/apimachinery/pkg/util/json" + + "github.com/crossplane/crossplane-runtime/pkg/logging" + xpmeta "github.com/crossplane/crossplane-runtime/pkg/meta" + "github.com/crossplane/crossplane-runtime/pkg/reconciler/managed" + + "github.com/crossplane-contrib/terrajet/pkg/meta" + "github.com/crossplane-contrib/terrajet/pkg/terraform/resource" + "github.com/crossplane-contrib/terrajet/pkg/tfcli" +) + +// Cli is an Adapter implementation for Terraform Cli +type Cli struct { + builderBase tfcli.Builder +} + +func NewCli(l logging.Logger, tr resource.Terraformed, cliBuilder tfcli.Builder) *Cli { + return &Cli{ + builderBase: cliBuilder, + } +} + +func (t *Cli) Observe(ctx context.Context, tr resource.Terraformed) (ObserveResult, error) { + attr, err := tr.GetParameters() + if err != nil { + return ObserveResult{}, errors.Wrap(err, "failed to get attributes") + } + + var stRaw []byte + if meta.GetState(tr) != "" { + stEnc := meta.GetState(tr) + st, err := BuildStateV4(stEnc, nil) + if err != nil { + return ObserveResult{}, errors.Wrap(err, "cannot build state") + } + + stRaw, err = st.Serialize() + if err != nil { + return ObserveResult{}, errors.Wrap(err, "cannot serialize state") + } + } + + tfc, err := t.builderBase.WithState(stRaw).WithResourceBody(attr).BuildCreateClient() + + tfRes, err := tfc.Observe(xpmeta.GetExternalName(tr)) + + if opErr, ok := err.(*tfcli.OperationInProgressError); ok { + if opErr.GetOperation() == tfcli.OperationCreate { + return ObserveResult{ + Completed: true, + Exists: false, + }, nil + } + if opErr.GetOperation() == tfcli.OperationUpdate || opErr.GetOperation() == tfcli.OperationDelete { + return ObserveResult{ + Completed: true, + Exists: true, + }, nil + } + } + if err != nil { + return ObserveResult{}, errors.Wrap(err, "failed to observe with tf cli") + } + + if !tfRes.Completed { + return ObserveResult{ + Completed: false, + }, nil + } + + newStateRaw := tfc.GetState() + + newSt, err := ReadStateV4(newStateRaw) + if err != nil { + return ObserveResult{}, errors.Wrap(err, "cannot build state") + } + + // TODO(hasan): Handle late initialization + + if err = tr.SetObservation(newSt.GetAttributes()); err != nil { + return ObserveResult{}, errors.Wrap(err, "cannot set observation") + } + + conn := managed.ConnectionDetails{} + if err = json.Unmarshal(newSt.GetSensitiveAttributes(), &conn); err != nil { + return ObserveResult{}, errors.Wrap(err, "cannot parse connection details") + } + + newStEnc, err := newSt.GetEncodedState() + if err != nil { + return ObserveResult{}, errors.Wrap(err, "cannot encode new state") + } + + return ObserveResult{ + Completed: true, + State: newStEnc, + ConnectionDetails: conn, + UpToDate: tfRes.UpToDate, + Exists: tfRes.Exists, + }, nil +} + +func (t *Cli) Create(ctx context.Context, tr resource.Terraformed) (CreateResult, error) { + attr, err := tr.GetParameters() + if err != nil { + return CreateResult{}, errors.Wrap(err, "failed to get attributes") + } + + tfc, err := t.builderBase.WithResourceBody(attr).BuildCreateClient() + + if err != nil { + return CreateResult{}, errors.Wrap(err, "cannot build create client") + } + + completed, err := tfc.Create() + if err != nil { + return CreateResult{}, errors.Wrap(err, "create failed with") + } + + if !completed { + return CreateResult{}, nil + } + + stRaw := tfc.GetState() + st, err := ReadStateV4(stRaw) + if err != nil { + return CreateResult{}, errors.Wrap(err, "cannot parse state") + } + + stAttr := map[string]interface{}{} + + if err = json.Unmarshal(st.GetAttributes(), &stAttr); err != nil { + return CreateResult{}, errors.Wrap(err, "cannot parse state attributes") + } + + id, exists := stAttr[tr.GetTerraformResourceIdField()] + if !exists { + return CreateResult{}, errors.Wrap(err, fmt.Sprintf("no value for id field: %s", tr.GetTerraformResourceIdField())) + } + en, ok := id.(string) + if !ok { + return CreateResult{}, errors.Wrap(err, "id field is not a string") + } + + conn := managed.ConnectionDetails{} + if err = json.Unmarshal(st.GetSensitiveAttributes(), &conn); err != nil { + return CreateResult{}, errors.Wrap(err, "cannot parse connection details") + } + + stEnc, err := st.GetEncodedState() + if err != nil { + return CreateResult{}, errors.Wrap(err, "cannot encode new state") + } + + return CreateResult{ + Completed: true, + ExternalName: en, + State: stEnc, + ConnectionDetails: conn, + }, nil +} + +// Update is a Terraform Cli implementation for Apply function of Adapter interface. +func (t *Cli) Update(ctx context.Context, tr resource.Terraformed) (UpdateResult, error) { + return UpdateResult{}, nil +} + +// Delete is a Terraform Cli implementation for Delete function of Adapter interface. +func (t *Cli) Delete(ctx context.Context, tr resource.Terraformed) (DeletionResult, error) { + stEnc := meta.GetState(tr) + st, err := BuildStateV4(stEnc, nil) + if err != nil { + return DeletionResult{}, errors.Wrap(err, "cannot build state") + } + + stRaw, err := st.Serialize() + if err != nil { + return DeletionResult{}, errors.Wrap(err, "cannot serialize state") + } + + attr, err := tr.GetParameters() + if err != nil { + return DeletionResult{}, errors.Wrap(err, "failed to get attributes") + } + + tfc, err := t.builderBase.WithState(stRaw).WithResourceBody(attr).BuildDeletionClient() + if err != nil { + return DeletionResult{}, errors.Wrap(err, "cannot build delete client") + } + + completed, err := tfc.Delete() + if err != nil { + return DeletionResult{}, errors.Wrap(err, "failed to delete") + } + + if !completed { + return DeletionResult{}, nil + } + + return DeletionResult{Completed: true}, nil +} diff --git a/pkg/meta/meta.go b/pkg/meta/meta.go new file mode 100644 index 00000000..2b0a0c8b --- /dev/null +++ b/pkg/meta/meta.go @@ -0,0 +1,20 @@ +package meta + +import ( + "github.com/crossplane/crossplane-runtime/pkg/meta" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" +) + +const ( + AnnotationKeyState = "tf.crossplane.io/state" +) + +// GetState returns the Terraform state annotation value on the resource. +func GetState(o metav1.Object) string { + return o.GetAnnotations()[AnnotationKeyState] +} + +// SetState sets the Terraform state annotation of the resource. +func SetState(o metav1.Object, state string) { + meta.AddAnnotations(o, map[string]string{AnnotationKeyState: state}) +} From 940d47a94d62c2c41ccd136cabafd4a95f068228 Mon Sep 17 00:00:00 2001 From: Hasan Turken Date: Tue, 17 Aug 2021 00:50:14 +0300 Subject: [PATCH 07/18] Add terraform common controller Signed-off-by: Hasan Turken --- go.mod | 2 + pkg/terraform/controller.go | 221 ++++++++++++++++++++++++++++++++++++ 2 files changed, 223 insertions(+) create mode 100644 pkg/terraform/controller.go diff --git a/go.mod b/go.mod index 46b5bfce..3e746c28 100644 --- a/go.mod +++ b/go.mod @@ -12,4 +12,6 @@ require ( github.com/pkg/errors v0.9.1 github.com/json-iterator/go v1.1.10 k8s.io/apimachinery v0.20.1 + k8s.io/client-go v0.20.1 + sigs.k8s.io/controller-runtime v0.8.0 ) diff --git a/pkg/terraform/controller.go b/pkg/terraform/controller.go new file mode 100644 index 00000000..a6f539d6 --- /dev/null +++ b/pkg/terraform/controller.go @@ -0,0 +1,221 @@ +package terraform + +import ( + "context" + "time" + + "github.com/pkg/errors" + "k8s.io/apimachinery/pkg/runtime/schema" + "k8s.io/apimachinery/pkg/types" + "k8s.io/client-go/util/retry" + ctrl "sigs.k8s.io/controller-runtime" + "sigs.k8s.io/controller-runtime/pkg/client" + "sigs.k8s.io/controller-runtime/pkg/controller" + + xpv1 "github.com/crossplane/crossplane-runtime/apis/common/v1" + "github.com/crossplane/crossplane-runtime/pkg/event" + "github.com/crossplane/crossplane-runtime/pkg/logging" + xpmeta "github.com/crossplane/crossplane-runtime/pkg/meta" + "github.com/crossplane/crossplane-runtime/pkg/ratelimiter" + "github.com/crossplane/crossplane-runtime/pkg/reconciler/managed" + xpresource "github.com/crossplane/crossplane-runtime/pkg/resource" + + "github.com/crossplane-contrib/terrajet/pkg/conversion" + "github.com/crossplane-contrib/terrajet/pkg/meta" + "github.com/crossplane-contrib/terrajet/pkg/terraform/resource" +) + +const ( + errUnexpectedObject = "the managed resource is not an Terraformed resource" +) + +// ProviderConfigFn is a function that returns provider specific configuration +// like provider credentials used to connect to cloud APIs. +type ProviderConfigFn func(ctx context.Context, client client.Client, mg xpresource.Managed) ([]byte, error) + +func SetupController(mgr ctrl.Manager, l logging.Logger, obj client.Object, of schema.GroupVersionKind, pcFn ProviderConfigFn) error { + name := managed.ControllerName(of.GroupKind().String()) + + rl := ratelimiter.NewDefaultProviderRateLimiter(ratelimiter.DefaultProviderRPS) + o := controller.Options{ + RateLimiter: ratelimiter.NewDefaultManagedRateLimiter(rl), + } + + r := managed.NewReconciler(mgr, + xpresource.ManagedKind(of), + managed.WithPollInterval(15*time.Second), + managed.WithInitializers(), + managed.WithExternalConnecter(&connector{kube: mgr.GetClient(), providerConfig: pcFn, logger: l}), + managed.WithLogger(l.WithValues("controller", name)), + managed.WithRecorder(event.NewAPIRecorder(mgr.GetEventRecorderFor(name)))) + + return ctrl.NewControllerManagedBy(mgr). + Named(name). + WithOptions(o). + For(obj). + Complete(r) +} + +type connector struct { + kube client.Client + providerConfig ProviderConfigFn + logger logging.Logger +} + +func (c *connector) Connect(ctx context.Context, mg xpresource.Managed) (managed.ExternalClient, error) { + tr, ok := mg.(resource.Terraformed) + if !ok { + return nil, errors.New(errUnexpectedObject) + } + + // TODO(hasan): create and pass the implementation of tfcli builder once available + /* pc, err := c.providerConfig(ctx, c.kube, mg) + if err != nil { + return nil, errors.Wrap(err, "failed to get provider config") + } + tfcb := tfcli.NewClientBuilder(). + WithLogger(c.logger). + WithResourceName(tr.GetName()). + WithHandle(string(tr.GetUID())). + WithProviderConfiguration(pc). + WithResourceType(tr.GetTerraformResourceType())*/ + + return &external{ + kube: c.kube, + tf: conversion.NewCli(c.logger, tr, nil), + log: c.logger, + record: event.NewNopRecorder(), + }, nil +} + +// external manages lifecycle of a Terraform managed resource by implementing +// managed.ExternalClient interface. +type external struct { + kube client.Client + tf conversion.Adapter + + log logging.Logger + record event.Recorder +} + +func (e *external) Observe(ctx context.Context, mg xpresource.Managed) (managed.ExternalObservation, error) { + tr, ok := mg.(resource.Terraformed) + if !ok { + return managed.ExternalObservation{}, errors.New(errUnexpectedObject) + } + + if xpmeta.GetExternalName(tr) == "" && meta.GetState(tr) == "" { + tr.SetConditions(xpv1.Creating()) + return managed.ExternalObservation{ + ResourceExists: false, + }, nil + } + + res, err := e.tf.Observe(ctx, tr) + if err != nil { + return managed.ExternalObservation{}, errors.Wrap(err, "cannot check if resource exists") + } + + if !res.Completed { + // Observation is in progress, do nothing + return managed.ExternalObservation{ + ResourceExists: true, + ResourceUpToDate: true, + }, nil + } + + if res.UpToDate { + tr.SetConditions(xpv1.Available()) + } + + return managed.ExternalObservation{ + ResourceExists: res.Exists, + ResourceUpToDate: res.UpToDate, + ResourceLateInitialized: res.LateInitialized, + ConnectionDetails: res.ConnectionDetails, + }, nil +} + +func (e *external) Create(ctx context.Context, mg xpresource.Managed) (managed.ExternalCreation, error) { + tr, ok := mg.(resource.Terraformed) + if !ok { + return managed.ExternalCreation{}, errors.New(errUnexpectedObject) + } + + res, err := e.tf.Create(ctx, tr) + if err != nil { + return managed.ExternalCreation{}, errors.Wrap(err, "failed to create") + } + if !res.Completed { + // Creation is in progress, do nothing + return managed.ExternalCreation{}, nil + } + + if err := e.persistState(ctx, tr, res.State, res.ExternalName); err != nil { + return managed.ExternalCreation{}, errors.Wrap(err, "cannot persist state") + } + + return managed.ExternalCreation{ + ConnectionDetails: res.ConnectionDetails, + }, err +} + +func (e *external) Update(ctx context.Context, mg xpresource.Managed) (managed.ExternalUpdate, error) { + tr, ok := mg.(resource.Terraformed) + if !ok { + return managed.ExternalUpdate{}, errors.New(errUnexpectedObject) + } + + res, err := e.tf.Update(ctx, tr) + if err != nil { + return managed.ExternalUpdate{}, errors.Wrap(err, "failed to update") + } + if !res.Completed { + // Update is in progress, do nothing + return managed.ExternalUpdate{}, nil + } + + if meta.GetState(tr) != res.State { + if err := e.persistState(ctx, tr, res.State, ""); err != nil { + return managed.ExternalUpdate{}, errors.Wrap(err, "cannot persist state") + } + } + + return managed.ExternalUpdate{ + ConnectionDetails: res.ConnectionDetails, + }, nil +} + +func (e *external) Delete(ctx context.Context, mg xpresource.Managed) error { + tr, ok := mg.(resource.Terraformed) + if !ok { + return errors.New(errUnexpectedObject) + } + + _, err := e.tf.Delete(ctx, tr) + if err != nil { + return errors.Wrap(err, "failed to delete") + } + + return nil +} + +func (e *external) persistState(ctx context.Context, tr resource.Terraformed, state, externalName string) error { + // We will retry in all cases where the error comes from the api-server. + // At one point, context deadline will be exceeded and we'll get out + // of the loop. In that case, we warn the user that the external resource + // might be leaked. + err := retry.OnError(retry.DefaultRetry, xpresource.IsAPIError, func() error { + nn := types.NamespacedName{Name: tr.GetName()} + if err := e.kube.Get(ctx, nn, tr); err != nil { + return err + } + if xpmeta.GetExternalName(tr) == "" { + xpmeta.SetExternalName(tr, externalName) + } + meta.SetState(tr, state) + return e.kube.Update(ctx, tr) + }) + + return errors.Wrap(err, "cannot update resource state") +} From 5535a2dfbd5f55a442d410e75ad072747442f890 Mon Sep 17 00:00:00 2001 From: Hasan Turken Date: Tue, 17 Aug 2021 00:56:36 +0300 Subject: [PATCH 08/18] Fix linter errors Signed-off-by: Hasan Turken --- .golangci.yml | 2 +- pkg/conversion/cli.go | 3 +++ pkg/meta/meta.go | 3 ++- pkg/terraform/controller.go | 14 +++++++------- 4 files changed, 13 insertions(+), 9 deletions(-) diff --git a/.golangci.yml b/.golangci.yml index 141b4648..7bbb0326 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -38,7 +38,7 @@ linters-settings: goimports: # put imports beginning with prefix after 3rd-party packages; # it's a comma-separated list of prefixes - local-prefixes: github.com/crossplane/crossplane + local-prefixes: github.com/crossplane-contrib/terrajet gocyclo: # minimal code complexity to report, 30 by default (but we recommend 10-20) diff --git a/pkg/conversion/cli.go b/pkg/conversion/cli.go index 6b347fee..3444a05f 100644 --- a/pkg/conversion/cli.go +++ b/pkg/conversion/cli.go @@ -48,6 +48,9 @@ func (t *Cli) Observe(ctx context.Context, tr resource.Terraformed) (ObserveResu } tfc, err := t.builderBase.WithState(stRaw).WithResourceBody(attr).BuildCreateClient() + if err != nil { + return ObserveResult{}, errors.Wrap(err, "cannot build create client") + } tfRes, err := tfc.Observe(xpmeta.GetExternalName(tr)) diff --git a/pkg/meta/meta.go b/pkg/meta/meta.go index 2b0a0c8b..892fee62 100644 --- a/pkg/meta/meta.go +++ b/pkg/meta/meta.go @@ -1,8 +1,9 @@ package meta import ( - "github.com/crossplane/crossplane-runtime/pkg/meta" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + + "github.com/crossplane/crossplane-runtime/pkg/meta" ) const ( diff --git a/pkg/terraform/controller.go b/pkg/terraform/controller.go index a6f539d6..30c625f7 100644 --- a/pkg/terraform/controller.go +++ b/pkg/terraform/controller.go @@ -200,21 +200,21 @@ func (e *external) Delete(ctx context.Context, mg xpresource.Managed) error { return nil } -func (e *external) persistState(ctx context.Context, tr resource.Terraformed, state, externalName string) error { +func (e *external) persistState(ctx context.Context, obj xpresource.Object, state, externalName string) error { // We will retry in all cases where the error comes from the api-server. // At one point, context deadline will be exceeded and we'll get out // of the loop. In that case, we warn the user that the external resource // might be leaked. err := retry.OnError(retry.DefaultRetry, xpresource.IsAPIError, func() error { - nn := types.NamespacedName{Name: tr.GetName()} - if err := e.kube.Get(ctx, nn, tr); err != nil { + nn := types.NamespacedName{Name: obj.GetName()} + if err := e.kube.Get(ctx, nn, obj); err != nil { return err } - if xpmeta.GetExternalName(tr) == "" { - xpmeta.SetExternalName(tr, externalName) + if xpmeta.GetExternalName(obj) == "" { + xpmeta.SetExternalName(obj, externalName) } - meta.SetState(tr, state) - return e.kube.Update(ctx, tr) + meta.SetState(obj, state) + return e.kube.Update(ctx, obj) }) return errors.Wrap(err, "cannot update resource state") From fe4d6bba22e146e80c9f5c2df28148c7e5067d39 Mon Sep 17 00:00:00 2001 From: Hasan Turken Date: Tue, 17 Aug 2021 01:24:45 +0300 Subject: [PATCH 09/18] Refactor cli adaptor Signed-off-by: Hasan Turken --- pkg/conversion/cli.go | 210 +++++++++++++++++++++++++----------------- 1 file changed, 123 insertions(+), 87 deletions(-) diff --git a/pkg/conversion/cli.go b/pkg/conversion/cli.go index 3444a05f..bbeee88e 100644 --- a/pkg/conversion/cli.go +++ b/pkg/conversion/cli.go @@ -28,28 +28,14 @@ func NewCli(l logging.Logger, tr resource.Terraformed, cliBuilder tfcli.Builder) } func (t *Cli) Observe(ctx context.Context, tr resource.Terraformed) (ObserveResult, error) { - attr, err := tr.GetParameters() + b, err := t.getBuilderForResource(tr) if err != nil { - return ObserveResult{}, errors.Wrap(err, "failed to get attributes") - } - - var stRaw []byte - if meta.GetState(tr) != "" { - stEnc := meta.GetState(tr) - st, err := BuildStateV4(stEnc, nil) - if err != nil { - return ObserveResult{}, errors.Wrap(err, "cannot build state") - } - - stRaw, err = st.Serialize() - if err != nil { - return ObserveResult{}, errors.Wrap(err, "cannot serialize state") - } + return ObserveResult{}, errors.Wrap(err, "cannot get builder") } - tfc, err := t.builderBase.WithState(stRaw).WithResourceBody(attr).BuildCreateClient() + tfc, err := b.BuildObserveClient() if err != nil { - return ObserveResult{}, errors.Wrap(err, "cannot build create client") + return ObserveResult{}, errors.Wrap(err, "cannot build observe client") } tfRes, err := tfc.Observe(xpmeta.GetExternalName(tr)) @@ -58,16 +44,20 @@ func (t *Cli) Observe(ctx context.Context, tr resource.Terraformed) (ObserveResu if opErr.GetOperation() == tfcli.OperationCreate { return ObserveResult{ Completed: true, - Exists: false, + + Exists: false, }, nil } if opErr.GetOperation() == tfcli.OperationUpdate || opErr.GetOperation() == tfcli.OperationDelete { return ObserveResult{ Completed: true, - Exists: true, + + Exists: true, + UpToDate: false, }, nil } } + if err != nil { return ObserveResult{}, errors.Wrap(err, "failed to observe with tf cli") } @@ -78,46 +68,27 @@ func (t *Cli) Observe(ctx context.Context, tr resource.Terraformed) (ObserveResu }, nil } - newStateRaw := tfc.GetState() - - newSt, err := ReadStateV4(newStateRaw) + stParseResp, err := consumeState(tfc.GetState(), tr, false) if err != nil { - return ObserveResult{}, errors.Wrap(err, "cannot build state") - } - - // TODO(hasan): Handle late initialization - - if err = tr.SetObservation(newSt.GetAttributes()); err != nil { - return ObserveResult{}, errors.Wrap(err, "cannot set observation") - } - - conn := managed.ConnectionDetails{} - if err = json.Unmarshal(newSt.GetSensitiveAttributes(), &conn); err != nil { - return ObserveResult{}, errors.Wrap(err, "cannot parse connection details") - } - - newStEnc, err := newSt.GetEncodedState() - if err != nil { - return ObserveResult{}, errors.Wrap(err, "cannot encode new state") + return ObserveResult{}, errors.Wrap(err, "cannot parse state") } return ObserveResult{ Completed: true, - State: newStEnc, - ConnectionDetails: conn, + State: stParseResp.encodedState, + ConnectionDetails: stParseResp.connectionDetails, UpToDate: tfRes.UpToDate, Exists: tfRes.Exists, }, nil } func (t *Cli) Create(ctx context.Context, tr resource.Terraformed) (CreateResult, error) { - attr, err := tr.GetParameters() + b, err := t.getBuilderForResource(tr) if err != nil { - return CreateResult{}, errors.Wrap(err, "failed to get attributes") + return CreateResult{}, errors.Wrap(err, "cannot get builder") } - tfc, err := t.builderBase.WithResourceBody(attr).BuildCreateClient() - + tfc, err := b.BuildCreateClient() if err != nil { return CreateResult{}, errors.Wrap(err, "cannot build create client") } @@ -131,81 +102,146 @@ func (t *Cli) Create(ctx context.Context, tr resource.Terraformed) (CreateResult return CreateResult{}, nil } - stRaw := tfc.GetState() - st, err := ReadStateV4(stRaw) + stParseResp, err := consumeState(tfc.GetState(), tr, true) if err != nil { return CreateResult{}, errors.Wrap(err, "cannot parse state") } - stAttr := map[string]interface{}{} + return CreateResult{ + Completed: true, + ExternalName: stParseResp.externalID, + State: stParseResp.encodedState, + ConnectionDetails: stParseResp.connectionDetails, + }, nil +} - if err = json.Unmarshal(st.GetAttributes(), &stAttr); err != nil { - return CreateResult{}, errors.Wrap(err, "cannot parse state attributes") +// Update is a Terraform Cli implementation for Apply function of Adapter interface. +func (t *Cli) Update(ctx context.Context, tr resource.Terraformed) (UpdateResult, error) { + b, err := t.getBuilderForResource(tr) + if err != nil { + return UpdateResult{}, errors.Wrap(err, "cannot get builder") } - id, exists := stAttr[tr.GetTerraformResourceIdField()] - if !exists { - return CreateResult{}, errors.Wrap(err, fmt.Sprintf("no value for id field: %s", tr.GetTerraformResourceIdField())) + tfc, err := b.BuildUpdateClient() + if err != nil { + return UpdateResult{}, errors.Wrap(err, "cannot build update client") } - en, ok := id.(string) - if !ok { - return CreateResult{}, errors.Wrap(err, "id field is not a string") + + completed, err := tfc.Update() + if err != nil { + return UpdateResult{}, errors.Wrap(err, "update failed") } - conn := managed.ConnectionDetails{} - if err = json.Unmarshal(st.GetSensitiveAttributes(), &conn); err != nil { - return CreateResult{}, errors.Wrap(err, "cannot parse connection details") + if !completed { + return UpdateResult{}, nil } - stEnc, err := st.GetEncodedState() + stParseResp, err := consumeState(tfc.GetState(), tr, false) if err != nil { - return CreateResult{}, errors.Wrap(err, "cannot encode new state") + return UpdateResult{}, errors.Wrap(err, "cannot parse state") } - - return CreateResult{ + return UpdateResult{ Completed: true, - ExternalName: en, - State: stEnc, - ConnectionDetails: conn, - }, nil -} - -// Update is a Terraform Cli implementation for Apply function of Adapter interface. -func (t *Cli) Update(ctx context.Context, tr resource.Terraformed) (UpdateResult, error) { - return UpdateResult{}, nil + State: stParseResp.encodedState, + ConnectionDetails: stParseResp.connectionDetails, + }, err } // Delete is a Terraform Cli implementation for Delete function of Adapter interface. func (t *Cli) Delete(ctx context.Context, tr resource.Terraformed) (DeletionResult, error) { - stEnc := meta.GetState(tr) - st, err := BuildStateV4(stEnc, nil) + b, err := t.getBuilderForResource(tr) if err != nil { - return DeletionResult{}, errors.Wrap(err, "cannot build state") + return DeletionResult{}, errors.Wrap(err, "cannot get builder") } - stRaw, err := st.Serialize() + tfc, err := b.BuildDeletionClient() if err != nil { - return DeletionResult{}, errors.Wrap(err, "cannot serialize state") + return DeletionResult{}, errors.Wrap(err, "cannot build deletion client") } - attr, err := tr.GetParameters() + completed, err := tfc.Delete() if err != nil { - return DeletionResult{}, errors.Wrap(err, "failed to get attributes") + return DeletionResult{}, errors.Wrap(err, "failed to delete") + } + + if !completed { + return DeletionResult{}, nil + } + + return DeletionResult{Completed: true}, nil +} + +func (t *Cli) getBuilderForResource(tr resource.Terraformed) (tfcli.Builder, error) { + var stateRaw []byte + if meta.GetState(tr) != "" { + stEnc := meta.GetState(tr) + st, err := BuildStateV4(stEnc, nil) + if err != nil { + return nil, errors.Wrap(err, "cannot build state") + } + + stateRaw, err = st.Serialize() + if err != nil { + return nil, errors.Wrap(err, "cannot serialize state") + } } - tfc, err := t.builderBase.WithState(stRaw).WithResourceBody(attr).BuildDeletionClient() + attr, err := tr.GetParameters() if err != nil { - return DeletionResult{}, errors.Wrap(err, "cannot build delete client") + return nil, errors.Wrap(err, "failed to get attributes") } - completed, err := tfc.Delete() + return t.builderBase.WithState(stateRaw).WithResourceBody(attr), nil +} + +type consumeStateResponse struct { + externalID string + encodedState string + connectionDetails managed.ConnectionDetails +} + +func consumeState(state []byte, tr resource.Terraformed, parseExternalID bool) (consumeStateResponse, error) { + st, err := ReadStateV4(state) if err != nil { - return DeletionResult{}, errors.Wrap(err, "failed to delete") + return consumeStateResponse{}, errors.Wrap(err, "cannot build state") } - if !completed { - return DeletionResult{}, nil + var extID string + if parseExternalID { + stAttr := map[string]interface{}{} + if err = json.Unmarshal(st.GetAttributes(), &stAttr); err != nil { + return consumeStateResponse{}, errors.Wrap(err, "cannot parse state attributes") + } + + id, exists := stAttr[tr.GetTerraformResourceIdField()] + if !exists { + return consumeStateResponse{}, errors.Wrap(err, fmt.Sprintf("no value for id field: %s", tr.GetTerraformResourceIdField())) + } + var ok bool + extID, ok = id.(string) + if !ok { + return consumeStateResponse{}, errors.Wrap(err, "id field is not a string") + } } - return DeletionResult{Completed: true}, nil + // TODO(hasan): Handle late initialization + + if err = tr.SetObservation(st.GetAttributes()); err != nil { + return consumeStateResponse{}, errors.Wrap(err, "cannot set observation") + } + + conn := managed.ConnectionDetails{} + if err = json.Unmarshal(st.GetSensitiveAttributes(), &conn); err != nil { + return consumeStateResponse{}, errors.Wrap(err, "cannot parse connection details") + } + + stEnc, err := st.GetEncodedState() + if err != nil { + return consumeStateResponse{}, errors.Wrap(err, "cannot encode new state") + } + return consumeStateResponse{ + externalID: extID, + encodedState: stEnc, + connectionDetails: conn, + }, nil } From 7dd7ee881ba96ad7fbd381e458f975f6bceb6401 Mon Sep 17 00:00:00 2001 From: Hasan Turken Date: Tue, 17 Aug 2021 01:30:08 +0300 Subject: [PATCH 10/18] Remove context from Adapter interface Signed-off-by: Hasan Turken --- pkg/conversion/adapter.go | 10 ++++------ pkg/conversion/cli.go | 12 +++++------- pkg/terraform/controller.go | 21 +++++++++++---------- 3 files changed, 20 insertions(+), 23 deletions(-) diff --git a/pkg/conversion/adapter.go b/pkg/conversion/adapter.go index 891555c7..4791fcf1 100644 --- a/pkg/conversion/adapter.go +++ b/pkg/conversion/adapter.go @@ -1,8 +1,6 @@ package conversion import ( - "context" - "github.com/crossplane/crossplane-runtime/pkg/reconciler/managed" "github.com/crossplane-contrib/terrajet/pkg/terraform/resource" @@ -55,8 +53,8 @@ type DeletionResult struct { // A Adapter is used to interact with terraform managed resources type Adapter interface { - Observe(ctx context.Context, tr resource.Terraformed) (ObserveResult, error) - Create(ctx context.Context, tr resource.Terraformed) (CreateResult, error) - Update(ctx context.Context, tr resource.Terraformed) (UpdateResult, error) - Delete(ctx context.Context, tr resource.Terraformed) (DeletionResult, error) + Observe(tr resource.Terraformed) (ObserveResult, error) + Create(tr resource.Terraformed) (CreateResult, error) + Update(tr resource.Terraformed) (UpdateResult, error) + Delete(tr resource.Terraformed) (DeletionResult, error) } diff --git a/pkg/conversion/cli.go b/pkg/conversion/cli.go index bbeee88e..9042463e 100644 --- a/pkg/conversion/cli.go +++ b/pkg/conversion/cli.go @@ -1,13 +1,11 @@ package conversion import ( - "context" "fmt" "github.com/pkg/errors" "k8s.io/apimachinery/pkg/util/json" - "github.com/crossplane/crossplane-runtime/pkg/logging" xpmeta "github.com/crossplane/crossplane-runtime/pkg/meta" "github.com/crossplane/crossplane-runtime/pkg/reconciler/managed" @@ -21,13 +19,13 @@ type Cli struct { builderBase tfcli.Builder } -func NewCli(l logging.Logger, tr resource.Terraformed, cliBuilder tfcli.Builder) *Cli { +func NewCli(cliBuilder tfcli.Builder) *Cli { return &Cli{ builderBase: cliBuilder, } } -func (t *Cli) Observe(ctx context.Context, tr resource.Terraformed) (ObserveResult, error) { +func (t *Cli) Observe(tr resource.Terraformed) (ObserveResult, error) { b, err := t.getBuilderForResource(tr) if err != nil { return ObserveResult{}, errors.Wrap(err, "cannot get builder") @@ -82,7 +80,7 @@ func (t *Cli) Observe(ctx context.Context, tr resource.Terraformed) (ObserveResu }, nil } -func (t *Cli) Create(ctx context.Context, tr resource.Terraformed) (CreateResult, error) { +func (t *Cli) Create(tr resource.Terraformed) (CreateResult, error) { b, err := t.getBuilderForResource(tr) if err != nil { return CreateResult{}, errors.Wrap(err, "cannot get builder") @@ -116,7 +114,7 @@ func (t *Cli) Create(ctx context.Context, tr resource.Terraformed) (CreateResult } // Update is a Terraform Cli implementation for Apply function of Adapter interface. -func (t *Cli) Update(ctx context.Context, tr resource.Terraformed) (UpdateResult, error) { +func (t *Cli) Update(tr resource.Terraformed) (UpdateResult, error) { b, err := t.getBuilderForResource(tr) if err != nil { return UpdateResult{}, errors.Wrap(err, "cannot get builder") @@ -148,7 +146,7 @@ func (t *Cli) Update(ctx context.Context, tr resource.Terraformed) (UpdateResult } // Delete is a Terraform Cli implementation for Delete function of Adapter interface. -func (t *Cli) Delete(ctx context.Context, tr resource.Terraformed) (DeletionResult, error) { +func (t *Cli) Delete(tr resource.Terraformed) (DeletionResult, error) { b, err := t.getBuilderForResource(tr) if err != nil { return DeletionResult{}, errors.Wrap(err, "cannot get builder") diff --git a/pkg/terraform/controller.go b/pkg/terraform/controller.go index 30c625f7..72949cf4 100644 --- a/pkg/terraform/controller.go +++ b/pkg/terraform/controller.go @@ -63,13 +63,14 @@ type connector struct { } func (c *connector) Connect(ctx context.Context, mg xpresource.Managed) (managed.ExternalClient, error) { - tr, ok := mg.(resource.Terraformed) - if !ok { - return nil, errors.New(errUnexpectedObject) - } // TODO(hasan): create and pass the implementation of tfcli builder once available - /* pc, err := c.providerConfig(ctx, c.kube, mg) + + /* tr, ok := mg.(resource.Terraformed) + if !ok { + return nil, errors.New(errUnexpectedObject) + } + pc, err := c.providerConfig(ctx, c.kube, mg) if err != nil { return nil, errors.Wrap(err, "failed to get provider config") } @@ -82,7 +83,7 @@ func (c *connector) Connect(ctx context.Context, mg xpresource.Managed) (managed return &external{ kube: c.kube, - tf: conversion.NewCli(c.logger, tr, nil), + tf: conversion.NewCli(nil), log: c.logger, record: event.NewNopRecorder(), }, nil @@ -111,7 +112,7 @@ func (e *external) Observe(ctx context.Context, mg xpresource.Managed) (managed. }, nil } - res, err := e.tf.Observe(ctx, tr) + res, err := e.tf.Observe(tr) if err != nil { return managed.ExternalObservation{}, errors.Wrap(err, "cannot check if resource exists") } @@ -142,7 +143,7 @@ func (e *external) Create(ctx context.Context, mg xpresource.Managed) (managed.E return managed.ExternalCreation{}, errors.New(errUnexpectedObject) } - res, err := e.tf.Create(ctx, tr) + res, err := e.tf.Create(tr) if err != nil { return managed.ExternalCreation{}, errors.Wrap(err, "failed to create") } @@ -166,7 +167,7 @@ func (e *external) Update(ctx context.Context, mg xpresource.Managed) (managed.E return managed.ExternalUpdate{}, errors.New(errUnexpectedObject) } - res, err := e.tf.Update(ctx, tr) + res, err := e.tf.Update(tr) if err != nil { return managed.ExternalUpdate{}, errors.Wrap(err, "failed to update") } @@ -192,7 +193,7 @@ func (e *external) Delete(ctx context.Context, mg xpresource.Managed) error { return errors.New(errUnexpectedObject) } - _, err := e.tf.Delete(ctx, tr) + _, err := e.tf.Delete(tr) if err != nil { return errors.Wrap(err, "failed to delete") } From 0520e0e54a5ea81e23dbc9636ba78dd9bb0e4e15 Mon Sep 17 00:00:00 2001 From: Hasan Turken Date: Tue, 17 Aug 2021 01:44:55 +0300 Subject: [PATCH 11/18] Add comments for exported functions/types Signed-off-by: Hasan Turken --- pkg/conversion/adapter.go | 9 ++++----- pkg/conversion/cli.go | 7 +++++-- pkg/conversion/json.go | 1 + pkg/conversion/statev4.go | 17 ++++++++++++++--- pkg/meta/meta.go | 2 ++ pkg/terraform/controller.go | 1 + pkg/terraform/resource/interfaces.go | 1 + pkg/tfcli/error.go | 1 + 8 files changed, 29 insertions(+), 10 deletions(-) diff --git a/pkg/conversion/adapter.go b/pkg/conversion/adapter.go index 4791fcf1..1bbdbcd6 100644 --- a/pkg/conversion/adapter.go +++ b/pkg/conversion/adapter.go @@ -10,7 +10,7 @@ import ( type ObserveResult struct { // Tells whether the observe operation is completed. Completed bool - // Terraform state to persist + // Base64 encoded Terraform state to persist State string // Sensitive information that is available during creation/update. ConnectionDetails managed.ConnectionDetails @@ -18,7 +18,7 @@ type ObserveResult struct { UpToDate bool // Does resource exist Exists bool - + // Was the resource late initialized LateInitialized bool } @@ -28,9 +28,8 @@ type CreateResult struct { Completed bool // Terraform state to persist ExternalName string - + // Base64 encoded Terraform state to persist State string - // Sensitive information that is available during creation/update. ConnectionDetails managed.ConnectionDetails } @@ -51,7 +50,7 @@ type DeletionResult struct { Completed bool } -// A Adapter is used to interact with terraform managed resources +// An Adapter is used to interact with terraform managed resources type Adapter interface { Observe(tr resource.Terraformed) (ObserveResult, error) Create(tr resource.Terraformed) (CreateResult, error) diff --git a/pkg/conversion/cli.go b/pkg/conversion/cli.go index 9042463e..8d5776fe 100644 --- a/pkg/conversion/cli.go +++ b/pkg/conversion/cli.go @@ -19,12 +19,14 @@ type Cli struct { builderBase tfcli.Builder } +// NewCli returns a Cli object func NewCli(cliBuilder tfcli.Builder) *Cli { return &Cli{ builderBase: cliBuilder, } } +// Observe is a Terraform Cli implementation for Observe function of Adapter interface. func (t *Cli) Observe(tr resource.Terraformed) (ObserveResult, error) { b, err := t.getBuilderForResource(tr) if err != nil { @@ -80,6 +82,7 @@ func (t *Cli) Observe(tr resource.Terraformed) (ObserveResult, error) { }, nil } +// Create is a Terraform Cli implementation for Create function of Adapter interface. func (t *Cli) Create(tr resource.Terraformed) (CreateResult, error) { b, err := t.getBuilderForResource(tr) if err != nil { @@ -113,7 +116,7 @@ func (t *Cli) Create(tr resource.Terraformed) (CreateResult, error) { }, nil } -// Update is a Terraform Cli implementation for Apply function of Adapter interface. +// Update is a Terraform Cli implementation for Update function of Adapter interface. func (t *Cli) Update(tr resource.Terraformed) (UpdateResult, error) { b, err := t.getBuilderForResource(tr) if err != nil { @@ -199,7 +202,7 @@ type consumeStateResponse struct { } func consumeState(state []byte, tr resource.Terraformed, parseExternalID bool) (consumeStateResponse, error) { - st, err := ReadStateV4(state) + st, err := ParseStateV4(state) if err != nil { return consumeStateResponse{}, errors.Wrap(err, "cannot build state") } diff --git a/pkg/conversion/json.go b/pkg/conversion/json.go index 8cc3446a..a248b439 100644 --- a/pkg/conversion/json.go +++ b/pkg/conversion/json.go @@ -2,4 +2,5 @@ package conversion import jsoniter "github.com/json-iterator/go" +// TFParser is a json parser to marshal/unmarshal using "tf" tag. var TFParser = jsoniter.Config{TagKey: "tf"}.Froze() diff --git a/pkg/conversion/statev4.go b/pkg/conversion/statev4.go index b833d44b..a5148aab 100644 --- a/pkg/conversion/statev4.go +++ b/pkg/conversion/statev4.go @@ -19,6 +19,7 @@ const ( // State file schema from https://github.com/hashicorp/terraform/blob/d9dfd451ea572219871bb9c5503a471418258e40/internal/states/statefile/version4.go +// StateV4 represents a version 4 terraform state type StateV4 struct { Version uint64 `json:"version"` TerraformVersion string `json:"terraform_version"` @@ -28,12 +29,14 @@ type StateV4 struct { Resources []ResourceStateV4 `json:"resources"` } +// OutputStateV4 represents a version 4 output state type OutputStateV4 struct { ValueRaw json.RawMessage `json:"value"` ValueTypeRaw json.RawMessage `json:"type"` Sensitive bool `json:"sensitive,omitempty"` } +// ResourceStateV4 represents a version 4 resource state type ResourceStateV4 struct { Module string `json:"module,omitempty"` Mode string `json:"mode"` @@ -44,6 +47,7 @@ type ResourceStateV4 struct { Instances []InstanceObjectStateV4 `json:"instances"` } +// InstanceObjectStateV4 represents a version 4 instance object state type InstanceObjectStateV4 struct { IndexKey interface{} `json:"index_key,omitempty"` Status string `json:"status,omitempty"` @@ -61,7 +65,8 @@ type InstanceObjectStateV4 struct { CreateBeforeDestroy bool `json:"create_before_destroy,omitempty"` } -func ReadStateV4(data []byte) (*StateV4, error) { +// ParseStateV4 parses a given Terraform state as StateV4 object +func ParseStateV4(data []byte) (*StateV4, error) { st := &StateV4{} if err := json.Unmarshal(data, st); err != nil { return nil, errors.Wrap(err, errCannotParseState) @@ -70,10 +75,11 @@ func ReadStateV4(data []byte) (*StateV4, error) { return st, errors.Wrap(st.Validate(), errInvalidState) } -func BuildStateV4(encodedMetadata string, attributesSensitive json.RawMessage) (*StateV4, error) { +// BuildStateV4 builds a StateV4 object from the given base64 encoded state and sensitive attributes +func BuildStateV4(encodedState string, attributesSensitive json.RawMessage) (*StateV4, error) { st := &StateV4{} - m, err := base64.StdEncoding.DecodeString(encodedMetadata) + m, err := base64.StdEncoding.DecodeString(encodedState) if err != nil { return nil, errors.Wrap(err, errCannotDecodeMetadata) } @@ -91,6 +97,7 @@ func BuildStateV4(encodedMetadata string, attributesSensitive json.RawMessage) ( return st, nil } +// Validate checks if the StateV4 is a valid Terraform managed resource state func (st *StateV4) Validate() error { // We only recognize and support state file version 4 right now if st.Version != 4 { @@ -110,14 +117,17 @@ func (st *StateV4) Validate() error { return nil } +// GetAttributes returns attributes of the Terraform managed resource (i.e. first instance of first resource) func (st *StateV4) GetAttributes() json.RawMessage { return st.Resources[0].Instances[0].AttributesRaw } +// GetSensitiveAttributes returns sensitive attributes of the Terraform managed resource (i.e. first instance of first resource) func (st *StateV4) GetSensitiveAttributes() json.RawMessage { return st.Resources[0].Instances[0].AttributeSensitivePaths } +// GetEncodedState returns base64 encoded sanitized (i.e. sensitive attributes removed) state func (st *StateV4) GetEncodedState() (string, error) { // TODO(hasan): do we need a deep copy, probably st.Resources[0].Instances[0].AttributeSensitivePaths = nil @@ -129,6 +139,7 @@ func (st *StateV4) GetEncodedState() (string, error) { return base64.StdEncoding.EncodeToString(b), nil } +// Serialize serializes StateV4 object to byte array func (st *StateV4) Serialize() ([]byte, error) { return json.Marshal(st) } diff --git a/pkg/meta/meta.go b/pkg/meta/meta.go index 892fee62..8974ad9f 100644 --- a/pkg/meta/meta.go +++ b/pkg/meta/meta.go @@ -7,6 +7,8 @@ import ( ) const ( + // AnnotationKeyState is the annotation key to store base64 encoded Terraform state + // as an annotation for the Terraform managed resource AnnotationKeyState = "tf.crossplane.io/state" ) diff --git a/pkg/terraform/controller.go b/pkg/terraform/controller.go index 72949cf4..2b1c1f3e 100644 --- a/pkg/terraform/controller.go +++ b/pkg/terraform/controller.go @@ -33,6 +33,7 @@ const ( // like provider credentials used to connect to cloud APIs. type ProviderConfigFn func(ctx context.Context, client client.Client, mg xpresource.Managed) ([]byte, error) +// SetupController setups controller for a Terraform managed resource func SetupController(mgr ctrl.Manager, l logging.Logger, obj client.Object, of schema.GroupVersionKind, pcFn ProviderConfigFn) error { name := managed.ControllerName(of.GroupKind().String()) diff --git a/pkg/terraform/resource/interfaces.go b/pkg/terraform/resource/interfaces.go index a923db4c..b850b91d 100644 --- a/pkg/terraform/resource/interfaces.go +++ b/pkg/terraform/resource/interfaces.go @@ -13,6 +13,7 @@ type TerraformStateHandler interface { SetParameters(data []byte) error } +// TerraformMetadataProvider provides Terraform metadata for the Terraform managed resource type TerraformMetadataProvider interface { GetTerraformResourceType() string GetTerraformResourceIdField() string diff --git a/pkg/tfcli/error.go b/pkg/tfcli/error.go index a914bc55..07c9133a 100644 --- a/pkg/tfcli/error.go +++ b/pkg/tfcli/error.go @@ -2,6 +2,7 @@ package tfcli import "fmt" +// OperationType is an operation type for terraform cli type OperationType int const ( From db2bddf1eff8653c1adf8ed6ee90bd1bc955c6e9 Mon Sep 17 00:00:00 2001 From: Hasan Turken Date: Wed, 18 Aug 2021 00:04:52 +0300 Subject: [PATCH 12/18] Add comments explaining the logic Signed-off-by: Hasan Turken --- pkg/conversion/adapter.go | 32 ++----- pkg/conversion/cli.go | 168 ++++++++++++++++++++---------------- pkg/terraform/controller.go | 48 +++++++---- 3 files changed, 132 insertions(+), 116 deletions(-) diff --git a/pkg/conversion/adapter.go b/pkg/conversion/adapter.go index 1bbdbcd6..65fd0dc2 100644 --- a/pkg/conversion/adapter.go +++ b/pkg/conversion/adapter.go @@ -8,45 +8,27 @@ import ( // ObserveResult represents result of an observe operation type ObserveResult struct { - // Tells whether the observe operation is completed. - Completed bool - // Base64 encoded Terraform state to persist - State string - // Sensitive information that is available during creation/update. + Completed bool ConnectionDetails managed.ConnectionDetails - // Is resource up to date - UpToDate bool - // Does resource exist - Exists bool - // Was the resource late initialized - LateInitialized bool + UpToDate bool + Exists bool + LateInitialized bool } // CreateResult represents result of a create operation type CreateResult struct { - // Tells whether the apply operation is completed. - Completed bool - // Terraform state to persist - ExternalName string - // Base64 encoded Terraform state to persist - State string - // Sensitive information that is available during creation/update. + Completed bool ConnectionDetails managed.ConnectionDetails } // UpdateResult represents result of an update operation type UpdateResult struct { - // Tells whether the apply operation is completed. - Completed bool - // Terraform state to persist - State string - // Sensitive information that is available during creation/update. + Completed bool ConnectionDetails managed.ConnectionDetails } // DeletionResult represents result of a delete operation type DeletionResult struct { - // Tells whether the apply operation is completed. Completed bool } @@ -55,5 +37,5 @@ type Adapter interface { Observe(tr resource.Terraformed) (ObserveResult, error) Create(tr resource.Terraformed) (CreateResult, error) Update(tr resource.Terraformed) (UpdateResult, error) - Delete(tr resource.Terraformed) (DeletionResult, error) + Delete(tr resource.Terraformed) (bool, error) } diff --git a/pkg/conversion/cli.go b/pkg/conversion/cli.go index 8d5776fe..aece6daa 100644 --- a/pkg/conversion/cli.go +++ b/pkg/conversion/cli.go @@ -1,8 +1,6 @@ package conversion import ( - "fmt" - "github.com/pkg/errors" "k8s.io/apimachinery/pkg/util/json" @@ -14,6 +12,14 @@ import ( "github.com/crossplane-contrib/terrajet/pkg/tfcli" ) +const ( + errCannotGetClientBuilder = "cannot get client builder" + errCannotConsumeState = "cannot consume state" + + errFmtFailedToWithTFCli = "failed to %s with tf cli" + errFmtCannotBuildClient = "cannot build %s client" +) + // Cli is an Adapter implementation for Terraform Cli type Cli struct { builderBase tfcli.Builder @@ -28,38 +34,49 @@ func NewCli(cliBuilder tfcli.Builder) *Cli { // Observe is a Terraform Cli implementation for Observe function of Adapter interface. func (t *Cli) Observe(tr resource.Terraformed) (ObserveResult, error) { - b, err := t.getBuilderForResource(tr) + b, err := t.getClientBuilderForResource(tr) if err != nil { - return ObserveResult{}, errors.Wrap(err, "cannot get builder") + return ObserveResult{}, errors.Wrap(err, errCannotGetClientBuilder) } - tfc, err := b.BuildObserveClient() if err != nil { - return ObserveResult{}, errors.Wrap(err, "cannot build observe client") + return ObserveResult{}, errors.Wrapf(err, errFmtCannotBuildClient, "observe") } + // Attempt to make an observation. There are a couple of possibilities at this point: + // a. No tfcli operation in progress, we just kick off a new observation. It should + // immediately return "tfRes.Completed" as "false", and we return completed=false in ObserveResult. + // b. An "observe" operation is in progress that we kicked off in one of the previous reconciliations. + // This call would return tfRes.Completed as false, and we would return completed=false in ObserveResult. + // c. A previously started "observe" operation completed. We can just consume state and return ObserveResult + // accordingly. + // d. A previously started "create" operation is in progress or completed but its state needs to be + // read to kick off a new operation. We will return "Exists: false" in order to trigger a Create call. + // e. A previously started "update" operation is in progress or completed but its state needs to be + // read to kick off a new operation. We will return "UpToDate: false" in order to trigger an Update call. + // f. A previously started "delete" operation is in progress and by returning "Exists: true" and since + // deletion timestamp should already be set, it would trigger a delete call. tfRes, err := tfc.Observe(xpmeta.GetExternalName(tr)) - if opErr, ok := err.(*tfcli.OperationInProgressError); ok { - if opErr.GetOperation() == tfcli.OperationCreate { - return ObserveResult{ - Completed: true, + if isOperationInProgress(err, tfcli.OperationCreate) { + return ObserveResult{ + Completed: true, - Exists: false, - }, nil - } - if opErr.GetOperation() == tfcli.OperationUpdate || opErr.GetOperation() == tfcli.OperationDelete { - return ObserveResult{ - Completed: true, + Exists: false, + }, nil + } - Exists: true, - UpToDate: false, - }, nil - } + if isOperationInProgress(err, tfcli.OperationUpdate) || isOperationInProgress(err, tfcli.OperationDelete) { + return ObserveResult{ + Completed: true, + + Exists: true, + UpToDate: false, + }, nil } if err != nil { - return ObserveResult{}, errors.Wrap(err, "failed to observe with tf cli") + return ObserveResult{}, errors.Wrapf(err, errFmtFailedToWithTFCli, "observe") } if !tfRes.Completed { @@ -68,15 +85,14 @@ func (t *Cli) Observe(tr resource.Terraformed) (ObserveResult, error) { }, nil } - stParseResp, err := consumeState(tfc.GetState(), tr, false) + conn, err := consumeState(tfc.GetState(), tr, false) if err != nil { - return ObserveResult{}, errors.Wrap(err, "cannot parse state") + return ObserveResult{}, errors.Wrap(err, errCannotConsumeState) } return ObserveResult{ Completed: true, - State: stParseResp.encodedState, - ConnectionDetails: stParseResp.connectionDetails, + ConnectionDetails: conn, UpToDate: tfRes.UpToDate, Exists: tfRes.Exists, }, nil @@ -84,95 +100,99 @@ func (t *Cli) Observe(tr resource.Terraformed) (ObserveResult, error) { // Create is a Terraform Cli implementation for Create function of Adapter interface. func (t *Cli) Create(tr resource.Terraformed) (CreateResult, error) { - b, err := t.getBuilderForResource(tr) + b, err := t.getClientBuilderForResource(tr) if err != nil { - return CreateResult{}, errors.Wrap(err, "cannot get builder") + return CreateResult{}, errors.Wrap(err, errCannotGetClientBuilder) } tfc, err := b.BuildCreateClient() if err != nil { - return CreateResult{}, errors.Wrap(err, "cannot build create client") + return CreateResult{}, errors.Wrapf(err, errFmtCannotBuildClient, "create") } completed, err := tfc.Create() if err != nil { - return CreateResult{}, errors.Wrap(err, "create failed with") + return CreateResult{}, errors.Wrapf(err, errFmtFailedToWithTFCli, "create") } if !completed { return CreateResult{}, nil } - stParseResp, err := consumeState(tfc.GetState(), tr, true) + conn, err := consumeState(tfc.GetState(), tr, true) if err != nil { - return CreateResult{}, errors.Wrap(err, "cannot parse state") + return CreateResult{}, errors.Wrap(err, errCannotConsumeState) } return CreateResult{ Completed: true, - ExternalName: stParseResp.externalID, - State: stParseResp.encodedState, - ConnectionDetails: stParseResp.connectionDetails, + ConnectionDetails: conn, }, nil } // Update is a Terraform Cli implementation for Update function of Adapter interface. func (t *Cli) Update(tr resource.Terraformed) (UpdateResult, error) { - b, err := t.getBuilderForResource(tr) + b, err := t.getClientBuilderForResource(tr) if err != nil { - return UpdateResult{}, errors.Wrap(err, "cannot get builder") + return UpdateResult{}, errors.Wrap(err, errCannotGetClientBuilder) } tfc, err := b.BuildUpdateClient() if err != nil { - return UpdateResult{}, errors.Wrap(err, "cannot build update client") + return UpdateResult{}, errors.Wrapf(err, errFmtCannotBuildClient, "update") } completed, err := tfc.Update() if err != nil { - return UpdateResult{}, errors.Wrap(err, "update failed") + return UpdateResult{}, errors.Wrapf(err, errFmtFailedToWithTFCli, "update") } if !completed { return UpdateResult{}, nil } - stParseResp, err := consumeState(tfc.GetState(), tr, false) + conn, err := consumeState(tfc.GetState(), tr, false) if err != nil { - return UpdateResult{}, errors.Wrap(err, "cannot parse state") + return UpdateResult{}, errors.Wrap(err, errCannotConsumeState) } return UpdateResult{ Completed: true, - State: stParseResp.encodedState, - ConnectionDetails: stParseResp.connectionDetails, + ConnectionDetails: conn, }, err } // Delete is a Terraform Cli implementation for Delete function of Adapter interface. -func (t *Cli) Delete(tr resource.Terraformed) (DeletionResult, error) { - b, err := t.getBuilderForResource(tr) +func (t *Cli) Delete(tr resource.Terraformed) (bool, error) { + b, err := t.getClientBuilderForResource(tr) if err != nil { - return DeletionResult{}, errors.Wrap(err, "cannot get builder") + return false, errors.Wrap(err, errCannotGetClientBuilder) } tfc, err := b.BuildDeletionClient() if err != nil { - return DeletionResult{}, errors.Wrap(err, "cannot build deletion client") + return false, errors.Wrapf(err, errFmtCannotBuildClient, "delete") } completed, err := tfc.Delete() if err != nil { - return DeletionResult{}, errors.Wrap(err, "failed to delete") + return false, errors.Wrapf(err, errFmtFailedToWithTFCli, "delete") } if !completed { - return DeletionResult{}, nil + return false, nil } - return DeletionResult{Completed: true}, nil + // TODO(hasan): Does it make any sense to call GetState on delete client? + // Would delete operation be considered as completed (i.e. allowing a new operation like Observe) + // if I didn't call GetState? + _ = tfc.GetState() + + return true, nil } -func (t *Cli) getBuilderForResource(tr resource.Terraformed) (tfcli.Builder, error) { +// getClientBuilderForResource returns a tfcli client builder by setting attributes +// (i.e. desired spec input) and terraform state (if available) on client builder base. +func (t *Cli) getClientBuilderForResource(tr resource.Terraformed) (tfcli.Builder, error) { var stateRaw []byte if meta.GetState(tr) != "" { stEnc := meta.GetState(tr) @@ -195,54 +215,58 @@ func (t *Cli) getBuilderForResource(tr resource.Terraformed) (tfcli.Builder, err return t.builderBase.WithState(stateRaw).WithResourceBody(attr), nil } -type consumeStateResponse struct { - externalID string - encodedState string - connectionDetails managed.ConnectionDetails -} - -func consumeState(state []byte, tr resource.Terraformed, parseExternalID bool) (consumeStateResponse, error) { +// consumeState parses input tfstate and sets related fields in the custom resource. +func consumeState(state []byte, tr resource.Terraformed, parseExternalID bool) (managed.ConnectionDetails, error) { st, err := ParseStateV4(state) if err != nil { - return consumeStateResponse{}, errors.Wrap(err, "cannot build state") + return nil, errors.Wrap(err, "cannot build state") } - var extID string if parseExternalID { + // Terraform stores id for the external resource as an attribute in the resource state. + // Key for the attribute holding external identifier is resource specific. We rely on + // GetTerraformResourceIdField() function to find out that key. stAttr := map[string]interface{}{} if err = json.Unmarshal(st.GetAttributes(), &stAttr); err != nil { - return consumeStateResponse{}, errors.Wrap(err, "cannot parse state attributes") + return nil, errors.Wrap(err, "cannot parse state attributes") } id, exists := stAttr[tr.GetTerraformResourceIdField()] if !exists { - return consumeStateResponse{}, errors.Wrap(err, fmt.Sprintf("no value for id field: %s", tr.GetTerraformResourceIdField())) + return nil, errors.Wrapf(err, "no value for id field: %s", tr.GetTerraformResourceIdField()) } - var ok bool - extID, ok = id.(string) + extID, ok := id.(string) if !ok { - return consumeStateResponse{}, errors.Wrap(err, "id field is not a string") + return nil, errors.Wrap(err, "id field is not a string") } + xpmeta.SetExternalName(tr, extID) } // TODO(hasan): Handle late initialization if err = tr.SetObservation(st.GetAttributes()); err != nil { - return consumeStateResponse{}, errors.Wrap(err, "cannot set observation") + return nil, errors.Wrap(err, "cannot set observation") } conn := managed.ConnectionDetails{} if err = json.Unmarshal(st.GetSensitiveAttributes(), &conn); err != nil { - return consumeStateResponse{}, errors.Wrap(err, "cannot parse connection details") + return nil, errors.Wrap(err, "cannot parse connection details") } stEnc, err := st.GetEncodedState() if err != nil { - return consumeStateResponse{}, errors.Wrap(err, "cannot encode new state") + return nil, errors.Wrap(err, "cannot encoded state") } - return consumeStateResponse{ - externalID: extID, - encodedState: stEnc, - connectionDetails: conn, - }, nil + meta.SetState(tr, stEnc) + + return conn, nil +} + +func isOperationInProgress(err error, op tfcli.OperationType) bool { + if opErr, ok := err.(*tfcli.OperationInProgressError); ok { + if opErr.GetOperation() == op { + return true + } + } + return false } diff --git a/pkg/terraform/controller.go b/pkg/terraform/controller.go index 2b1c1f3e..387de61b 100644 --- a/pkg/terraform/controller.go +++ b/pkg/terraform/controller.go @@ -2,7 +2,6 @@ package terraform import ( "context" - "time" "github.com/pkg/errors" "k8s.io/apimachinery/pkg/runtime/schema" @@ -44,7 +43,6 @@ func SetupController(mgr ctrl.Manager, l logging.Logger, obj client.Object, of s r := managed.NewReconciler(mgr, xpresource.ManagedKind(of), - managed.WithPollInterval(15*time.Second), managed.WithInitializers(), managed.WithExternalConnecter(&connector{kube: mgr.GetClient(), providerConfig: pcFn, logger: l}), managed.WithLogger(l.WithValues("controller", name)), @@ -90,8 +88,6 @@ func (c *connector) Connect(ctx context.Context, mg xpresource.Managed) (managed }, nil } -// external manages lifecycle of a Terraform managed resource by implementing -// managed.ExternalClient interface. type external struct { kube client.Client tf conversion.Adapter @@ -107,7 +103,6 @@ func (e *external) Observe(ctx context.Context, mg xpresource.Managed) (managed. } if xpmeta.GetExternalName(tr) == "" && meta.GetState(tr) == "" { - tr.SetConditions(xpv1.Creating()) return managed.ExternalObservation{ ResourceExists: false, }, nil @@ -119,14 +114,23 @@ func (e *external) Observe(ctx context.Context, mg xpresource.Managed) (managed. } if !res.Completed { - // Observation is in progress, do nothing + // Note(hasan): If an async operation is not completed yet, we don't want to reconcile + // with exponential backoff since this is not an error condition rather an expected situation. + // And checking that frequently wouldn't make much sense since we expect terraform client + // invokes to take some seconds. Here, we chose to check again after poll interval, + // but to speed things up, we might want to consider adding a special wait that is less frequent + // than exponential backoff but more frequent than poll interval. + + // Observation is in progress, do nothing. We will check again after the poll interval. return managed.ExternalObservation{ ResourceExists: true, ResourceUpToDate: true, }, nil } - if res.UpToDate { + // During creation (i.e. apply), Terraform already waits until resource is ready. + // So, I believe it would be safe to assume it is available if create step completed (i.e. resource exists). + if res.Exists { tr.SetConditions(xpv1.Available()) } @@ -149,11 +153,11 @@ func (e *external) Create(ctx context.Context, mg xpresource.Managed) (managed.E return managed.ExternalCreation{}, errors.Wrap(err, "failed to create") } if !res.Completed { - // Creation is in progress, do nothing + // Creation is in progress, do nothing. We will check again after the poll interval. return managed.ExternalCreation{}, nil } - if err := e.persistState(ctx, tr, res.State, res.ExternalName); err != nil { + if err := e.persistState(ctx, tr); err != nil { return managed.ExternalCreation{}, errors.Wrap(err, "cannot persist state") } @@ -173,14 +177,12 @@ func (e *external) Update(ctx context.Context, mg xpresource.Managed) (managed.E return managed.ExternalUpdate{}, errors.Wrap(err, "failed to update") } if !res.Completed { - // Update is in progress, do nothing + // Update is in progress, do nothing. We will check again after the poll interval. return managed.ExternalUpdate{}, nil } - if meta.GetState(tr) != res.State { - if err := e.persistState(ctx, tr, res.State, ""); err != nil { - return managed.ExternalUpdate{}, errors.Wrap(err, "cannot persist state") - } + if err := e.persistState(ctx, tr); err != nil { + return managed.ExternalUpdate{}, errors.Wrap(err, "cannot persist state") } return managed.ExternalUpdate{ @@ -202,9 +204,12 @@ func (e *external) Delete(ctx context.Context, mg xpresource.Managed) error { return nil } -func (e *external) persistState(ctx context.Context, obj xpresource.Object, state, externalName string) error { +func (e *external) persistState(ctx context.Context, obj xpresource.Object) error { + externalName := xpmeta.GetExternalName(obj) + newState := meta.GetState(obj) + // We will retry in all cases where the error comes from the api-server. - // At one point, context deadline will be exceeded and we'll get out + // At one point, context deadline will be exceeded and, we'll get out // of the loop. In that case, we warn the user that the external resource // might be leaked. err := retry.OnError(retry.DefaultRetry, xpresource.IsAPIError, func() error { @@ -212,10 +217,15 @@ func (e *external) persistState(ctx context.Context, obj xpresource.Object, stat if err := e.kube.Get(ctx, nn, obj); err != nil { return err } - if xpmeta.GetExternalName(obj) == "" { - xpmeta.SetExternalName(obj, externalName) + + // We know that external name would never change once it is set + if xpmeta.GetExternalName(obj) != "" && xpmeta.GetExternalName(obj) != externalName { + return errors.Errorf("external name should not change once it is set. current %s, new %s", + xpmeta.GetExternalName(obj), externalName) } - meta.SetState(obj, state) + + xpmeta.SetExternalName(obj, externalName) + meta.SetState(obj, newState) return e.kube.Update(ctx, obj) }) From e4c778826858a6adc9738e1e0343aca438e206db Mon Sep 17 00:00:00 2001 From: Hasan Turken Date: Thu, 19 Aug 2021 00:12:34 +0300 Subject: [PATCH 13/18] Resolve comments related to naming and minor refactoring Signed-off-by: Hasan Turken --- pkg/conversion/adapter.go | 23 +++++------- pkg/conversion/cli.go | 78 +++++++++++++++++++-------------------- pkg/conversion/statev4.go | 9 +---- 3 files changed, 50 insertions(+), 60 deletions(-) diff --git a/pkg/conversion/adapter.go b/pkg/conversion/adapter.go index 65fd0dc2..98e12dcf 100644 --- a/pkg/conversion/adapter.go +++ b/pkg/conversion/adapter.go @@ -6,8 +6,8 @@ import ( "github.com/crossplane-contrib/terrajet/pkg/terraform/resource" ) -// ObserveResult represents result of an observe operation -type ObserveResult struct { +// Observation represents result of an observe operation +type Observation struct { Completed bool ConnectionDetails managed.ConnectionDetails UpToDate bool @@ -15,27 +15,22 @@ type ObserveResult struct { LateInitialized bool } -// CreateResult represents result of a create operation -type CreateResult struct { +// Creation represents result of a create operation +type Creation struct { Completed bool ConnectionDetails managed.ConnectionDetails } -// UpdateResult represents result of an update operation -type UpdateResult struct { +// Update represents result of an update operation +type Update struct { Completed bool ConnectionDetails managed.ConnectionDetails } -// DeletionResult represents result of a delete operation -type DeletionResult struct { - Completed bool -} - // An Adapter is used to interact with terraform managed resources type Adapter interface { - Observe(tr resource.Terraformed) (ObserveResult, error) - Create(tr resource.Terraformed) (CreateResult, error) - Update(tr resource.Terraformed) (UpdateResult, error) + Observe(tr resource.Terraformed) (Observation, error) + Create(tr resource.Terraformed) (Creation, error) + Update(tr resource.Terraformed) (Update, error) Delete(tr resource.Terraformed) (bool, error) } diff --git a/pkg/conversion/cli.go b/pkg/conversion/cli.go index aece6daa..a9bc19f9 100644 --- a/pkg/conversion/cli.go +++ b/pkg/conversion/cli.go @@ -16,39 +16,39 @@ const ( errCannotGetClientBuilder = "cannot get client builder" errCannotConsumeState = "cannot consume state" - errFmtFailedToWithTFCli = "failed to %s with tf cli" + errFmtCannotDoWithTFCli = "cannot %s with tf cli" errFmtCannotBuildClient = "cannot build %s client" ) -// Cli is an Adapter implementation for Terraform Cli -type Cli struct { +// CLI is an Adapter implementation for Terraform CLI +type CLI struct { builderBase tfcli.Builder } -// NewCli returns a Cli object -func NewCli(cliBuilder tfcli.Builder) *Cli { - return &Cli{ +// NewCli returns a CLI object +func NewCli(cliBuilder tfcli.Builder) *CLI { + return &CLI{ builderBase: cliBuilder, } } -// Observe is a Terraform Cli implementation for Observe function of Adapter interface. -func (t *Cli) Observe(tr resource.Terraformed) (ObserveResult, error) { +// Observe is a Terraform CLI implementation for Observe function of Adapter interface. +func (t *CLI) Observe(tr resource.Terraformed) (Observation, error) { b, err := t.getClientBuilderForResource(tr) if err != nil { - return ObserveResult{}, errors.Wrap(err, errCannotGetClientBuilder) + return Observation{}, errors.Wrap(err, errCannotGetClientBuilder) } tfc, err := b.BuildObserveClient() if err != nil { - return ObserveResult{}, errors.Wrapf(err, errFmtCannotBuildClient, "observe") + return Observation{}, errors.Wrapf(err, errFmtCannotBuildClient, "observe") } // Attempt to make an observation. There are a couple of possibilities at this point: // a. No tfcli operation in progress, we just kick off a new observation. It should - // immediately return "tfRes.Completed" as "false", and we return completed=false in ObserveResult. + // immediately return "tfRes.Completed" as "false", and we return completed=false in Observation. // b. An "observe" operation is in progress that we kicked off in one of the previous reconciliations. - // This call would return tfRes.Completed as false, and we would return completed=false in ObserveResult. - // c. A previously started "observe" operation completed. We can just consume state and return ObserveResult + // This call would return tfRes.Completed as false, and we would return completed=false in Observation. + // c. A previously started "observe" operation completed. We can just consume state and return Observation // accordingly. // d. A previously started "create" operation is in progress or completed but its state needs to be // read to kick off a new operation. We will return "Exists: false" in order to trigger a Create call. @@ -59,7 +59,7 @@ func (t *Cli) Observe(tr resource.Terraformed) (ObserveResult, error) { tfRes, err := tfc.Observe(xpmeta.GetExternalName(tr)) if isOperationInProgress(err, tfcli.OperationCreate) { - return ObserveResult{ + return Observation{ Completed: true, Exists: false, @@ -67,7 +67,7 @@ func (t *Cli) Observe(tr resource.Terraformed) (ObserveResult, error) { } if isOperationInProgress(err, tfcli.OperationUpdate) || isOperationInProgress(err, tfcli.OperationDelete) { - return ObserveResult{ + return Observation{ Completed: true, Exists: true, @@ -76,21 +76,21 @@ func (t *Cli) Observe(tr resource.Terraformed) (ObserveResult, error) { } if err != nil { - return ObserveResult{}, errors.Wrapf(err, errFmtFailedToWithTFCli, "observe") + return Observation{}, errors.Wrapf(err, errFmtCannotDoWithTFCli, "observe") } if !tfRes.Completed { - return ObserveResult{ + return Observation{ Completed: false, }, nil } conn, err := consumeState(tfc.GetState(), tr, false) if err != nil { - return ObserveResult{}, errors.Wrap(err, errCannotConsumeState) + return Observation{}, errors.Wrap(err, errCannotConsumeState) } - return ObserveResult{ + return Observation{ Completed: true, ConnectionDetails: conn, UpToDate: tfRes.UpToDate, @@ -98,71 +98,71 @@ func (t *Cli) Observe(tr resource.Terraformed) (ObserveResult, error) { }, nil } -// Create is a Terraform Cli implementation for Create function of Adapter interface. -func (t *Cli) Create(tr resource.Terraformed) (CreateResult, error) { +// Create is a Terraform CLI implementation for Create function of Adapter interface. +func (t *CLI) Create(tr resource.Terraformed) (Creation, error) { b, err := t.getClientBuilderForResource(tr) if err != nil { - return CreateResult{}, errors.Wrap(err, errCannotGetClientBuilder) + return Creation{}, errors.Wrap(err, errCannotGetClientBuilder) } tfc, err := b.BuildCreateClient() if err != nil { - return CreateResult{}, errors.Wrapf(err, errFmtCannotBuildClient, "create") + return Creation{}, errors.Wrapf(err, errFmtCannotBuildClient, "create") } completed, err := tfc.Create() if err != nil { - return CreateResult{}, errors.Wrapf(err, errFmtFailedToWithTFCli, "create") + return Creation{}, errors.Wrapf(err, errFmtCannotDoWithTFCli, "create") } if !completed { - return CreateResult{}, nil + return Creation{}, nil } conn, err := consumeState(tfc.GetState(), tr, true) if err != nil { - return CreateResult{}, errors.Wrap(err, errCannotConsumeState) + return Creation{}, errors.Wrap(err, errCannotConsumeState) } - return CreateResult{ + return Creation{ Completed: true, ConnectionDetails: conn, }, nil } -// Update is a Terraform Cli implementation for Update function of Adapter interface. -func (t *Cli) Update(tr resource.Terraformed) (UpdateResult, error) { +// Update is a Terraform CLI implementation for Update function of Adapter interface. +func (t *CLI) Update(tr resource.Terraformed) (Update, error) { b, err := t.getClientBuilderForResource(tr) if err != nil { - return UpdateResult{}, errors.Wrap(err, errCannotGetClientBuilder) + return Update{}, errors.Wrap(err, errCannotGetClientBuilder) } tfc, err := b.BuildUpdateClient() if err != nil { - return UpdateResult{}, errors.Wrapf(err, errFmtCannotBuildClient, "update") + return Update{}, errors.Wrapf(err, errFmtCannotBuildClient, "update") } completed, err := tfc.Update() if err != nil { - return UpdateResult{}, errors.Wrapf(err, errFmtFailedToWithTFCli, "update") + return Update{}, errors.Wrapf(err, errFmtCannotDoWithTFCli, "update") } if !completed { - return UpdateResult{}, nil + return Update{}, nil } conn, err := consumeState(tfc.GetState(), tr, false) if err != nil { - return UpdateResult{}, errors.Wrap(err, errCannotConsumeState) + return Update{}, errors.Wrap(err, errCannotConsumeState) } - return UpdateResult{ + return Update{ Completed: true, ConnectionDetails: conn, }, err } -// Delete is a Terraform Cli implementation for Delete function of Adapter interface. -func (t *Cli) Delete(tr resource.Terraformed) (bool, error) { +// Delete is a Terraform CLI implementation for Delete function of Adapter interface. +func (t *CLI) Delete(tr resource.Terraformed) (bool, error) { b, err := t.getClientBuilderForResource(tr) if err != nil { return false, errors.Wrap(err, errCannotGetClientBuilder) @@ -175,7 +175,7 @@ func (t *Cli) Delete(tr resource.Terraformed) (bool, error) { completed, err := tfc.Delete() if err != nil { - return false, errors.Wrapf(err, errFmtFailedToWithTFCli, "delete") + return false, errors.Wrapf(err, errFmtCannotDoWithTFCli, "delete") } if !completed { @@ -192,7 +192,7 @@ func (t *Cli) Delete(tr resource.Terraformed) (bool, error) { // getClientBuilderForResource returns a tfcli client builder by setting attributes // (i.e. desired spec input) and terraform state (if available) on client builder base. -func (t *Cli) getClientBuilderForResource(tr resource.Terraformed) (tfcli.Builder, error) { +func (t *CLI) getClientBuilderForResource(tr resource.Terraformed) (tfcli.Builder, error) { var stateRaw []byte if meta.GetState(tr) != "" { stEnc := meta.GetState(tr) diff --git a/pkg/conversion/statev4.go b/pkg/conversion/statev4.go index a5148aab..9222c167 100644 --- a/pkg/conversion/statev4.go +++ b/pkg/conversion/statev4.go @@ -77,21 +77,16 @@ func ParseStateV4(data []byte) (*StateV4, error) { // BuildStateV4 builds a StateV4 object from the given base64 encoded state and sensitive attributes func BuildStateV4(encodedState string, attributesSensitive json.RawMessage) (*StateV4, error) { - st := &StateV4{} - m, err := base64.StdEncoding.DecodeString(encodedState) if err != nil { return nil, errors.Wrap(err, errCannotDecodeMetadata) } - err = json.Unmarshal(m, st) + + st, err := ParseStateV4(m) if err != nil { return nil, errors.Wrap(err, errCannotParseState) } - if err = st.Validate(); err != nil { - return nil, errors.Wrap(err, errInvalidState) - } - st.Resources[0].Instances[0].AttributeSensitivePaths = attributesSensitive return st, nil From 64ec148c351684e1330acae623e3001d8efcbe5b Mon Sep 17 00:00:00 2001 From: Hasan Turken Date: Thu, 19 Aug 2021 15:58:27 +0300 Subject: [PATCH 14/18] Go mod tidy after rebase on main Signed-off-by: Hasan Turken --- go.mod | 5 ++--- go.sum | 53 ++++++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 54 insertions(+), 4 deletions(-) diff --git a/go.mod b/go.mod index 3e746c28..9abd831d 100644 --- a/go.mod +++ b/go.mod @@ -3,14 +3,13 @@ module github.com/crossplane-contrib/terrajet go 1.16 require ( + github.com/crossplane/crossplane-runtime v0.14.0 github.com/hashicorp/hcl/v2 v2.8.2 // indirect github.com/hashicorp/terraform-plugin-sdk/v2 v2.7.0 github.com/iancoleman/strcase v0.2.0 + github.com/json-iterator/go v1.1.10 github.com/muvaf/typewriter v0.0.0-20210818141336-01a132960eec github.com/pkg/errors v0.9.1 - github.com/crossplane/crossplane-runtime v0.14.0 - github.com/pkg/errors v0.9.1 - github.com/json-iterator/go v1.1.10 k8s.io/apimachinery v0.20.1 k8s.io/client-go v0.20.1 sigs.k8s.io/controller-runtime v0.8.0 diff --git a/go.sum b/go.sum index f34f13c6..1c7fa7fc 100644 --- a/go.sum +++ b/go.sum @@ -95,6 +95,7 @@ github.com/aws/aws-sdk-go v1.15.78/go.mod h1:E3/ieXAlvM0XWO57iftYVDLLvQ824smPP3A github.com/aws/aws-sdk-go v1.25.3/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= +github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d/go.mod h1:6QX/PXZ00z/TKoufEY6K/a0k6AhaJrQKdFe6OfVXsa4= github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= @@ -102,7 +103,9 @@ github.com/bketelsen/crypt v0.0.3-0.20200106085610-5cbc8cc4026c/go.mod h1:MKsuJm github.com/blang/semver v3.5.0+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk= github.com/blang/semver v3.5.1+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= +github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko= github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= +github.com/cespare/xxhash/v2 v2.1.1 h1:6MnRN8NT7+YBpUIWxHtefFZOKTAPgGjpQSxqLNn0+qY= github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/cheggaaa/pb v1.0.27/go.mod h1:pQciLPpbU0oxA0h+VJYYLxO+XeDQb5pZijXscXHm81s= github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= @@ -154,11 +157,13 @@ github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1m github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/evanphx/json-patch v4.2.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= github.com/evanphx/json-patch v4.5.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= +github.com/evanphx/json-patch v4.9.0+incompatible h1:kLcOMZeuLAJvL2BPWLMIj5oaZQobrkAqrL+WFZwQses= github.com/evanphx/json-patch v4.9.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc= github.com/form3tech-oss/jwt-go v3.2.2+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= +github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4= github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= @@ -181,6 +186,7 @@ github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7 github.com/go-logr/logr v0.2.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU= github.com/go-logr/logr v0.3.0 h1:q4c+kbcR0d5rSurhBR8dIgieOaYpXtsdTYfx22Cu6rs= github.com/go-logr/logr v0.3.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU= +github.com/go-logr/zapr v0.2.0 h1:v6Ji8yBW77pva6NkJKQdHLAJKrIJKRHz0RXwPqCHSR4= github.com/go-logr/zapr v0.2.0/go.mod h1:qhKdvif7YF5GI9NWEpyxTSSBdGmzkNguibrdCNVPunU= github.com/go-openapi/analysis v0.0.0-20180825180245-b006789cd277/go.mod h1:k70tL6pCuVxPJOHXQ+wIac1FUrvNkHolPie/cLEU6hI= github.com/go-openapi/analysis v0.17.0/go.mod h1:IowGgpVeD0vNm45So8nr+IcQ3pxVtpRoBWb8PVZO0ik= @@ -227,12 +233,14 @@ github.com/gobuffalo/flect v0.1.5/go.mod h1:W3K3X9ksuZfir8f/LrfVtWmCDQFfayuylOJ7 github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4= github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o= +github.com/gogo/protobuf v1.3.1 h1:DqDEcV5aeaTmdFBePNpYsp3FlcVH/2ISVVM9Qf8PSls= github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= +github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e h1:1r7pUrabqp18hOBcwBwiTsbnFeTZHV9eER/QT5JVZxY= github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= @@ -254,7 +262,6 @@ github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrU github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8= -github.com/golang/protobuf v1.4.2 h1:+Z5KGCizgyZCbGh1KZqA0fcLLkwbsjIzS4aV2v7wJX0= github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/golang/protobuf v1.4.3 h1:JjCZWpVbqXDqFVmTfYWEVTMIYrL/NPdPSCHPJ0T/raM= github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= @@ -274,6 +281,7 @@ github.com/google/go-cmp v0.5.6 h1:BKbKCqvP6I+rmFHt06ZmyQtvB8xAkWdhFyr0ZUNZcxQ= github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/gofuzz v0.0.0-20161122191042-44d81051d367/go.mod h1:HP5RmnzzSNb993RKQDq4+1A4ia9nllfqcQFTQJedwGI= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/gofuzz v1.1.0 h1:Hsa8mG0dQ46ij8Sl2AYJDUv1oA9/d6Vk+3LG99Oe02g= github.com/google/gofuzz v1.1.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= @@ -287,11 +295,13 @@ github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hf github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.1.2 h1:EVhdT+1Kseyi1/pUmXKaFxYsDNy9RQYkMWRH68J/W7Y= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY= github.com/googleapis/gnostic v0.4.1/go.mod h1:LRhVm6pbyptWbWbuZ38d1eyptfvIytN3ir6b65WBswg= +github.com/googleapis/gnostic v0.5.1 h1:A8Yhf6EtqTv9RMsU6MQTyrtV1TjWlR6xU9BsZIwuTCM= github.com/googleapis/gnostic v0.5.1/go.mod h1:6U4PtQXGIEt/Z3h5MAT7FNofLnw9vXk2cUuW7uA/OeU= github.com/gophercloud/gophercloud v0.1.0/go.mod h1:vxM41WHh5uqHVBMZHzuwNOHh8XEoIEcSTewFxm1c5g8= github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= @@ -341,6 +351,7 @@ github.com/hashicorp/go-version v1.3.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09 github.com/hashicorp/go.net v0.0.1/go.mod h1:hjKkEWcCURg++eb33jQU7oqQcI9XDCnUzHA0oac0k90= github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= +github.com/hashicorp/golang-lru v0.5.4 h1:YDjusn29QI/Das2iO9M0BHnIbxPeyuCHsjMW+lJfyTc= github.com/hashicorp/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4= github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= @@ -367,6 +378,7 @@ github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1: github.com/imdario/mergo v0.3.5/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= github.com/imdario/mergo v0.3.10/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA= github.com/imdario/mergo v0.3.11/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA= +github.com/imdario/mergo v0.3.12 h1:b6R2BslTbIEToALKP7LxUvijTsNI9TAe80pLWN2g/HU= github.com/imdario/mergo v0.3.12/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i6rXxKeerYnT8Nvf0QmHCRC1n8sfWVwXF2Frvo= @@ -423,6 +435,7 @@ github.com/mattn/go-isatty v0.0.10/go.mod h1:qgIWMr58cqv1PHHyhnkY9lrL7etaEgOFcME github.com/mattn/go-runewidth v0.0.2/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= github.com/mattn/go-runewidth v0.0.4/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= +github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 h1:I0XW9+e1XWDxdcEniV4rQAIOPUGDq67JSCiRCgGCZLI= github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4= github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc= @@ -464,6 +477,7 @@ github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+ github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= github.com/nsf/jsondiff v0.0.0-20200515183724-f29ed568f4ce h1:RPclfga2SEJmgMmz2k+Mg7cowZ8yv4Trqw9UsJby758= github.com/nsf/jsondiff v0.0.0-20200515183724-f29ed568f4ce/go.mod h1:uFMI8w+ref4v2r9jz+c9i1IfIttS/OkmLfrk1jne5hs= +github.com/nxadm/tail v1.4.4 h1:DQuhQpB1tVlglWS2hLQ5OV6B5r8aGxSrPc5Qo6uTN78= github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQA= github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U= @@ -473,12 +487,14 @@ github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+W github.com/onsi/ginkgo v1.8.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.11.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk= +github.com/onsi/ginkgo v1.14.1 h1:jMU0WaQrP0a/YAEq8eJmJKjBoMs+pClEr1vDMlM/Do4= github.com/onsi/ginkgo v1.14.1/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY= github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= github.com/onsi/gomega v1.5.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= +github.com/onsi/gomega v1.10.2 h1:aY/nuoWlKJud2J6U0E3NWsjlg+0GtwXxgEqthRdzlcs= github.com/onsi/gomega v1.10.2/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k= @@ -490,6 +506,7 @@ github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINE github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v0.0.0-20151028094244-d8ed2627bdf0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +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/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI= github.com/pquerna/cachecontrol v0.0.0-20171018203845-0dec1b30a021/go.mod h1:prYjPmNq4d1NPVmpShWobRqXY3q7Vp+80DqgxxUrUIA= @@ -497,21 +514,25 @@ github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXP github.com/prometheus/client_golang v0.9.2/go.mod h1:OsXs2jCmiKlQ1lTBmv21f2mNfw4xf/QclQDMrYNZzcM= github.com/prometheus/client_golang v0.9.3/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDft0ttaMvbicHlPoso= github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= +github.com/prometheus/client_golang v1.7.1 h1:NTGy1Ja9pByO+xAeH/qiWnLrKtr3hJPNjaVUwnjpdpA= github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= +github.com/prometheus/client_model v0.2.0 h1:uq5h0d+GuxiXLJLNABMgp2qUWDPiLvgCzz2dUR+/W/M= github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= github.com/prometheus/common v0.0.0-20181126121408-4724e9255275/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= github.com/prometheus/common v0.4.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= +github.com/prometheus/common v0.10.0 h1:RyRA7RzGXQZiW+tGMr7sxa85G1z0yOpM1qq5c8lNawc= github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= +github.com/prometheus/procfs v0.2.0 h1:wH4vA7pcjKuZzjF7lM8awk4fnuJO6idemZXoKnULUx4= github.com/prometheus/procfs v0.2.0/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU= github.com/remyoudompheng/bigfft v0.0.0-20170806203942-52369c62f446/go.mod h1:uYEyJGbgTkfkS4+E/PavXkNJcbFIpEtjt2B0KDQ5+9M= @@ -536,6 +557,7 @@ github.com/soheilhy/cmux v0.1.3/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4k github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM= github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ= +github.com/spf13/afero v1.2.2 h1:5jhuqJyZCZf2JRofRvN/nIFgIWNzPa3/Vz8mYylgbWc= github.com/spf13/afero v1.2.2/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk= github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ= @@ -546,6 +568,7 @@ github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff/go.mod h1:DYY7MBk1bdzu github.com/spf13/pflag v1.0.1/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= github.com/spf13/pflag v1.0.2/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= +github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s= github.com/spf13/viper v1.7.0/go.mod h1:8WkrPz2fc9jxqZNCJI/76HCieCp4Q8HaLFoCha5qpdg= @@ -559,6 +582,7 @@ github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UV github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= @@ -597,15 +621,19 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.uber.org/atomic v0.0.0-20181018215023-8dc6146f7569/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= +go.uber.org/atomic v1.6.0 h1:Ezj3JGmsOnG1MoRWQkPBsKLe9DwWD9QeXzTRzzldNVk= go.uber.org/atomic v1.6.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= +go.uber.org/goleak v1.1.10 h1:z+mqJhf6ss6BSfSM671tgKyZBFPTTJM+HLxnhPC3wu0= go.uber.org/goleak v1.1.10/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A= go.uber.org/multierr v0.0.0-20180122172545-ddea229ff1df/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= +go.uber.org/multierr v1.5.0 h1:KCa4XfM8CWFCpxXRGok+Q0SS/0XBhMDbHHGABQLvD2A= go.uber.org/multierr v1.5.0/go.mod h1:FeouvMocqHpRaaGuG9EjoKcStLC43Zu/fmqdUMPcKYU= go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9Ejo0C68/HhF8uaILCdgjnY+goOA= go.uber.org/zap v0.0.0-20180814183419-67bc79d13d15/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= go.uber.org/zap v1.8.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= +go.uber.org/zap v1.15.0 h1:ZZCA22JRF2gQE5FoNmhmrf7jeJJ2uhqDUNRYKm8dvmM= go.uber.org/zap v1.15.0/go.mod h1:Mb2vm2krFEG5DV0W9qcHBYFtp/Wku1cvYaqPsS/WYfc= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= @@ -623,6 +651,7 @@ golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPh golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= +golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b h1:7mWr3k41Qtv8XlltBkDkl8LoP3mpSgBW8BUoxtEdbXg= golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190125153040-c74c464bbbf2/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= @@ -647,6 +676,7 @@ golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod h1:6SW0HCj/g11FgYtHl golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRuDixDT3tpyyb+LUpUlRWLxfhWrs= golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= +golang.org/x/lint v0.0.0-20200302205851-738671d3881b h1:Wh+f8QHJXR411sJR8/vRBTZ7YapZaRvUcLFFJhusH0k= golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE= golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o= @@ -706,6 +736,7 @@ golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAG golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= +golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d h1:TzXSXBo42m9gQenoE3b9BGiEpg5IG2JkU5FkPIawgtw= golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= 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= @@ -771,6 +802,7 @@ golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210324051608-47abb6519492/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210502180810-71e4cd670f79 h1:RX8C8PRZc2hTIod4ds8ij+/4RQX3AqhYj3uOHmyaz4E= golang.org/x/sys v0.0.0-20210502180810-71e4cd670f79/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1 h1:v+OssWQX+hTHEmOBgwxdZxK4zHq3yOs8F9J7mk0PY8E= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -785,6 +817,7 @@ golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxb golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e h1:EHBhcS0mlXEAVwNyO2dLfjToGsyY4j24pTs2ScHnX7s= golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= @@ -844,6 +877,7 @@ golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +gomodules.xyz/jsonpatch/v2 v2.1.0 h1:Phva6wqu+xR//Njw6iorylFFgn/z547tw5Ne3HZPQ+k= gomodules.xyz/jsonpatch/v2 v2.1.0/go.mod h1:IhYNNY4jnS53ZnfE4PAmpKtDpTCj1JFXc+3mwe7XcUU= gonum.org/v1/gonum v0.0.0-20190331200053-3d26580ed485/go.mod h1:2ltnJ7xHfj0zHS40VVPYEAAMTa3ZGguvHGBSJeRWqE0= gonum.org/v1/netlib v0.0.0-20190313105609-8cb42192e0e0/go.mod h1:wa6Ws7BG/ESfp6dHfk7C6KdzKA7wR7u/rKwOGE66zvw= @@ -935,11 +969,13 @@ gopkg.in/cheggaaa/pb.v1 v1.0.27/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qS gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= gopkg.in/inf.v0 v0.9.0/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw= +gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc= gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw= gopkg.in/ini.v1 v1.51.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/natefinch/lumberjack.v2 v2.0.0/go.mod h1:l0ndWWf7gzL7RNwBG7wST/UCcT4T24xpD6X8LsfU/+k= gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo= gopkg.in/square/go-jose.v2 v2.2.2/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI= +gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI= gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74= @@ -948,9 +984,11 @@ gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU= gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v3 v3.0.0-20190905181640-827449938966/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776 h1:tQIYjPdBoyREyB9XMu+nnTclpTYkz2zFM+lzLJFO4gQ= gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw= gotest.tools/v3 v3.0.2/go.mod h1:3SzNCllyD9/Y+b5r9JIKQ474KzkZyqLqEfYqMsX94Bk= @@ -962,18 +1000,23 @@ honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= k8s.io/api v0.0.0-20190918155943-95b840bb6a1f/go.mod h1:uWuOHnjmNrtQomJrvEBg0c0HRNyQ+8KTEERVsK0PW48= +k8s.io/api v0.20.1 h1:ud1c3W3YNzGd6ABJlbFfKXBKXO+1KdGfcgGGNgFR03E= k8s.io/api v0.20.1/go.mod h1:KqwcCVogGxQY3nBlRpwt+wpAMF/KjaCc7RpywacvqUo= k8s.io/apiextensions-apiserver v0.0.0-20190918161926-8f644eb6e783/go.mod h1:xvae1SZB3E17UpV59AWc271W/Ph25N+bjPyR63X6tPY= +k8s.io/apiextensions-apiserver v0.20.1 h1:ZrXQeslal+6zKM/HjDXLzThlz/vPSxrfK3OqL8txgVQ= k8s.io/apiextensions-apiserver v0.20.1/go.mod h1:ntnrZV+6a3dB504qwC5PN/Yg9PBiDNt1EVqbW2kORVk= k8s.io/apimachinery v0.0.0-20190913080033-27d36303b655/go.mod h1:nL6pwRT8NgfF8TT68DBI8uEePRt89cSvoXUVqbkWHq4= +k8s.io/apimachinery v0.20.1 h1:LAhz8pKbgR8tUwn7boK+b2HZdt7MiTu2mkYtFMUjTRQ= k8s.io/apimachinery v0.20.1/go.mod h1:WlLqWAHZGg07AeltaI0MV5uk1Omp8xaN0JGLY6gkRpU= k8s.io/apiserver v0.0.0-20190918160949-bfa5e2e684ad/go.mod h1:XPCXEwhjaFN29a8NldXA901ElnKeKLrLtREO9ZhFyhg= k8s.io/apiserver v0.20.1/go.mod h1:ro5QHeQkgMS7ZGpvf4tSMx6bBOgPfE+f52KwvXfScaU= k8s.io/client-go v0.0.0-20190918160344-1fbdaa4c8d90/go.mod h1:J69/JveO6XESwVgG53q3Uz5OSfgsv4uxpScmmyYOOlk= +k8s.io/client-go v0.20.1 h1:Qquik0xNFbK9aUG92pxHYsyfea5/RPO9o9bSywNor+M= k8s.io/client-go v0.20.1/go.mod h1:/zcHdt1TeWSd5HoUe6elJmHSQ6uLLgp4bIJHVEuy+/Y= k8s.io/code-generator v0.0.0-20190912054826-cd179ad6a269/go.mod h1:V5BD6M4CyaN5m+VthcclXWsVcT1Hu+glwa1bi3MIsyE= k8s.io/code-generator v0.20.1/go.mod h1:UsqdF+VX4PU2g46NC2JRs4gc+IfrctnwHb76RNbWHJg= k8s.io/component-base v0.0.0-20190918160511-547f6c5d7090/go.mod h1:933PBGtQFJky3TEwYx4aEPZ4IxqhWh3R6DCmzqIn1hA= +k8s.io/component-base v0.20.1 h1:6OQaHr205NSl24t5wOF2IhdrlxZTWEZwuGlLvBgaeIg= k8s.io/component-base v0.20.1/go.mod h1:guxkoJnNoh8LNrbtiQOlyp2Y2XFCZQmrcg2n/DeYNLk= k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/gengo v0.0.0-20190822140433-26a664648505/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= @@ -981,13 +1024,17 @@ k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8 k8s.io/gengo v0.0.0-20201113003025-83324d819ded/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk= k8s.io/klog v0.3.0/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk= +k8s.io/klog v0.4.0 h1:lCJCxf/LIowc2IGS9TPjWDyXY4nOmdGdfcwwDQCOURQ= k8s.io/klog v0.4.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I= k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE= k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y= +k8s.io/klog/v2 v2.4.0 h1:7+X0fUguPyrKEC4WjH8iGDg3laWgMo5tMnRTIGTTxGQ= k8s.io/klog/v2 v2.4.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y= k8s.io/kube-openapi v0.0.0-20190816220812-743ec37842bf/go.mod h1:1TqjTSzOxsLGIKfj0lK8EeCP7K1iUG65v09OM0/WG5E= +k8s.io/kube-openapi v0.0.0-20201113171705-d219536bb9fd h1:sOHNzJIkytDF6qadMNKhhDRpc6ODik8lVC6nOur7B2c= k8s.io/kube-openapi v0.0.0-20201113171705-d219536bb9fd/go.mod h1:WOJ3KddDSol4tAGcJo0Tvi+dK12EcqSLqcWsryKMpfM= k8s.io/utils v0.0.0-20190801114015-581e00157fb1/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew= +k8s.io/utils v0.0.0-20201110183641-67b214c5f920 h1:CbnUZsM497iRC5QMVkHwyl8s2tB3g7yaSHkYPkpgelw= k8s.io/utils v0.0.0-20201110183641-67b214c5f920/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= modernc.org/cc v1.0.0/go.mod h1:1Sk4//wdnYJiUIxnW8ddKpaOJCF37yAdqYnkxUpaYxw= modernc.org/golex v1.0.0/go.mod h1:b/QX9oBD/LhixY6NDh+IdGv17hgB+51fET1i2kPSmvk= @@ -998,10 +1045,14 @@ rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8 rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.14/go.mod h1:LEScyzhFmoF5pso/YSeBstl57mOzx9xlU9n85RGrDQg= +sigs.k8s.io/controller-runtime v0.8.0 h1:s0dYdo7lQgJiAf+alP82PRwbz+oAqL3oSyMQ18XRDOc= sigs.k8s.io/controller-runtime v0.8.0/go.mod h1:v9Lbj5oX443uR7GXYY46E0EE2o7k2YxQ58GxVNeXSW4= sigs.k8s.io/controller-tools v0.2.4/go.mod h1:m/ztfQNocGYBgTTCmFdnK94uVvgxeZeE3LtJvd/jIzA= sigs.k8s.io/structured-merge-diff v0.0.0-20190525122527-15d366b2352e/go.mod h1:wWxsB5ozmmv/SG7nM11ayaAW51xMvak/t1r0CSlcokI= +sigs.k8s.io/structured-merge-diff v0.0.0-20190817042607-6149e4549fca h1:6dsH6AYQWbyZmtttJNe8Gq1cXOeS1BdV3eW37zHilAQ= sigs.k8s.io/structured-merge-diff v0.0.0-20190817042607-6149e4549fca/go.mod h1:IIgPezJWb76P0hotTxzDbWsMYB8APh18qZnxkomBpxA= +sigs.k8s.io/structured-merge-diff/v4 v4.0.2 h1:YHQV7Dajm86OuqnIR6zAelnDWBRjo+YhYV9PmGrh1s8= sigs.k8s.io/structured-merge-diff/v4 v4.0.2/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw= sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o= +sigs.k8s.io/yaml v1.2.0 h1:kr/MCeFWJWTwyaHoR9c8EjH9OumOmoF9YGiZd7lFm/Q= sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc= From 47a2ab9df60dea0862e48d19b23260515f032b03 Mon Sep 17 00:00:00 2001 From: Hasan Turken Date: Thu, 19 Aug 2021 21:40:16 +0300 Subject: [PATCH 15/18] Update tfcli interface per latest agreement Signed-off-by: Hasan Turken --- pkg/tfcli/interfaces.go | 36 +++++++++++++++++------------------- 1 file changed, 17 insertions(+), 19 deletions(-) diff --git a/pkg/tfcli/interfaces.go b/pkg/tfcli/interfaces.go index 87517bc2..9493f448 100644 --- a/pkg/tfcli/interfaces.go +++ b/pkg/tfcli/interfaces.go @@ -23,33 +23,35 @@ import ( "github.com/crossplane/crossplane-runtime/pkg/logging" ) -type ObserveResult struct { - UpToDate bool +type RefreshResult struct { + UpToDate bool + Exists bool + State []byte +} + +type ApplyResult struct { + Completed bool + State []byte +} + +type DestroyResult struct { Completed bool - Exists bool } type Client interface { - Observe(id string) (ObserveResult, error) - Create() (bool, error) - Update() (bool, error) - Delete() (bool, error) - GetHandle() string - GetState() []byte - Destroy() error + Refresh(ctx context.Context, id string) (RefreshResult, error) + Apply(ctx context.Context) (ApplyResult, error) + Destroy(ctx context.Context) (DestroyResult, error) + Close(ctx context.Context) error } type Builder interface { RequiresProvider RequiresResource RequiresState - RequiresContext RequiresTimeout RequiresLogger - BuildObserveClient() (Client, error) - BuildCreateClient() (Client, error) - BuildUpdateClient() (Client, error) - BuildDeletionClient() (Client, error) + BuildClient() (Client, error) } type RequiresLogger interface { @@ -60,10 +62,6 @@ type RequiresTimeout interface { WithTimeout(d time.Duration) Builder } -type RequiresContext interface { - WithContext(ctx context.Context) Builder -} - type RequiresState interface { WithState(tfState []byte) Builder } From 514f95d74e07ff6022754e2cd681c387e60d4c11 Mon Sep 17 00:00:00 2001 From: Hasan Turken Date: Thu, 19 Aug 2021 22:56:31 +0300 Subject: [PATCH 16/18] Update based on the latest tfcli interface Signed-off-by: Hasan Turken --- pkg/conversion/adapter.go | 16 +-- pkg/conversion/cli.go | 231 +++++++++++++----------------------- pkg/conversion/json.go | 3 + pkg/conversion/statev4.go | 28 ++--- pkg/terraform/controller.go | 86 +++++--------- pkg/tfcli/error.go | 14 ++- pkg/tfcli/interfaces.go | 30 ++--- 7 files changed, 153 insertions(+), 255 deletions(-) diff --git a/pkg/conversion/adapter.go b/pkg/conversion/adapter.go index 98e12dcf..2ec12395 100644 --- a/pkg/conversion/adapter.go +++ b/pkg/conversion/adapter.go @@ -1,6 +1,8 @@ package conversion import ( + "context" + "github.com/crossplane/crossplane-runtime/pkg/reconciler/managed" "github.com/crossplane-contrib/terrajet/pkg/terraform/resource" @@ -8,19 +10,12 @@ import ( // Observation represents result of an observe operation type Observation struct { - Completed bool ConnectionDetails managed.ConnectionDetails UpToDate bool Exists bool LateInitialized bool } -// Creation represents result of a create operation -type Creation struct { - Completed bool - ConnectionDetails managed.ConnectionDetails -} - // Update represents result of an update operation type Update struct { Completed bool @@ -29,8 +24,7 @@ type Update struct { // An Adapter is used to interact with terraform managed resources type Adapter interface { - Observe(tr resource.Terraformed) (Observation, error) - Create(tr resource.Terraformed) (Creation, error) - Update(tr resource.Terraformed) (Update, error) - Delete(tr resource.Terraformed) (bool, error) + Observe(ctx context.Context, tr resource.Terraformed) (Observation, error) + Update(ctx context.Context, tr resource.Terraformed) (Update, error) + Delete(ctx context.Context, tr resource.Terraformed) (bool, error) } diff --git a/pkg/conversion/cli.go b/pkg/conversion/cli.go index a9bc19f9..c96c5165 100644 --- a/pkg/conversion/cli.go +++ b/pkg/conversion/cli.go @@ -1,11 +1,11 @@ package conversion import ( - "github.com/pkg/errors" - "k8s.io/apimachinery/pkg/util/json" + "context" xpmeta "github.com/crossplane/crossplane-runtime/pkg/meta" "github.com/crossplane/crossplane-runtime/pkg/reconciler/managed" + "github.com/pkg/errors" "github.com/crossplane-contrib/terrajet/pkg/meta" "github.com/crossplane-contrib/terrajet/pkg/terraform/resource" @@ -13,145 +13,127 @@ import ( ) const ( - errCannotGetClientBuilder = "cannot get client builder" - errCannotConsumeState = "cannot consume state" + errCannotConsumeState = "cannot consume state" errFmtCannotDoWithTFCli = "cannot %s with tf cli" - errFmtCannotBuildClient = "cannot build %s client" ) +// BuildClientForResource returns a tfcli client by setting attributes +// (i.e. desired spec input) and terraform state (if available) for a given +// client builder base. +func BuildClientForResource(builderBase tfcli.Builder, tr resource.Terraformed) (tfcli.Client, error) { + var stateRaw []byte + if meta.GetState(tr) != "" { + stEnc := meta.GetState(tr) + st, err := BuildStateV4(stEnc, nil) + if err != nil { + return nil, errors.Wrap(err, "cannot build state") + } + + stateRaw, err = st.Serialize() + if err != nil { + return nil, errors.Wrap(err, "cannot serialize state") + } + } + + attr, err := tr.GetParameters() + if err != nil { + return nil, errors.Wrap(err, "failed to get attributes") + } + + return builderBase.WithState(stateRaw).WithResourceBody(attr).BuildClient() +} + // CLI is an Adapter implementation for Terraform CLI type CLI struct { - builderBase tfcli.Builder + tfcli tfcli.Client } // NewCli returns a CLI object -func NewCli(cliBuilder tfcli.Builder) *CLI { +func NewCli(client tfcli.Client) *CLI { return &CLI{ - builderBase: cliBuilder, + tfcli: client, } } // Observe is a Terraform CLI implementation for Observe function of Adapter interface. -func (t *CLI) Observe(tr resource.Terraformed) (Observation, error) { - b, err := t.getClientBuilderForResource(tr) - if err != nil { - return Observation{}, errors.Wrap(err, errCannotGetClientBuilder) - } - tfc, err := b.BuildObserveClient() - if err != nil { - return Observation{}, errors.Wrapf(err, errFmtCannotBuildClient, "observe") - } +func (t *CLI) Observe(ctx context.Context, tr resource.Terraformed) (Observation, error) { - // Attempt to make an observation. There are a couple of possibilities at this point: - // a. No tfcli operation in progress, we just kick off a new observation. It should - // immediately return "tfRes.Completed" as "false", and we return completed=false in Observation. - // b. An "observe" operation is in progress that we kicked off in one of the previous reconciliations. - // This call would return tfRes.Completed as false, and we would return completed=false in Observation. - // c. A previously started "observe" operation completed. We can just consume state and return Observation - // accordingly. - // d. A previously started "create" operation is in progress or completed but its state needs to be - // read to kick off a new operation. We will return "Exists: false" in order to trigger a Create call. - // e. A previously started "update" operation is in progress or completed but its state needs to be - // read to kick off a new operation. We will return "UpToDate: false" in order to trigger an Update call. - // f. A previously started "delete" operation is in progress and by returning "Exists: true" and since - // deletion timestamp should already be set, it would trigger a delete call. - tfRes, err := tfc.Observe(xpmeta.GetExternalName(tr)) - - if isOperationInProgress(err, tfcli.OperationCreate) { - return Observation{ - Completed: true, + tfRes, err := t.tfcli.Refresh(ctx, xpmeta.GetExternalName(tr)) - Exists: false, + if isOperationInProgress(err, tfcli.OperationApply) { + // A previously started "Apply" operation is in progress or completed + // but one last call needs to be done as completed to be able to kick + // off a new operation. We will return "Exists: true, UpToDate: false" + // in order to trigger an Update call. + return Observation{ + Exists: true, + UpToDate: false, }, nil } - if isOperationInProgress(err, tfcli.OperationUpdate) || isOperationInProgress(err, tfcli.OperationDelete) { + if isOperationInProgress(err, tfcli.OperationDestroy) { + // A previously started "Destroy" operation is in progress or completed + // but one last call needs to be done as completed to be able to kick + // off a new operation. We will return "Exists: true, UpToDate: true" in + // order to trigger a Delete call (given we already have deletion + // timestamp set). return Observation{ - Completed: true, - Exists: true, - UpToDate: false, + UpToDate: true, }, nil } if err != nil { return Observation{}, errors.Wrapf(err, errFmtCannotDoWithTFCli, "observe") } + // No tfcli operation was in progress, our blocking observation completed + // successfully, and we have an observation to consume. - if !tfRes.Completed { - return Observation{ - Completed: false, - }, nil + // If resource does not exist, and it was actually deleted, we no longer + // need this client (hence underlying workspace) for this resource. + if !tfRes.Exists && xpmeta.WasDeleted(tr) { + return Observation{}, errors.Wrap(t.tfcli.Close(ctx), "failed to clean up tfcli client") } - conn, err := consumeState(tfc.GetState(), tr, false) + // After a successful observation, we now have a state to consume. + // We will consume the state by: + // - returning "sensitive attributes" as connection details + // - setting external name annotation, if not set already, from attribute + // - late initializing "spec.forProvider" with "attributes" + // - setting observation at "status.atProvider" with "attributes" + // - storing base64encoded "tfstate" as an annotation + conn, err := consumeState(tfRes.State, tr) if err != nil { return Observation{}, errors.Wrap(err, errCannotConsumeState) } return Observation{ - Completed: true, ConnectionDetails: conn, UpToDate: tfRes.UpToDate, Exists: tfRes.Exists, }, nil } -// Create is a Terraform CLI implementation for Create function of Adapter interface. -func (t *CLI) Create(tr resource.Terraformed) (Creation, error) { - b, err := t.getClientBuilderForResource(tr) - if err != nil { - return Creation{}, errors.Wrap(err, errCannotGetClientBuilder) - } - - tfc, err := b.BuildCreateClient() - if err != nil { - return Creation{}, errors.Wrapf(err, errFmtCannotBuildClient, "create") - } - - completed, err := tfc.Create() - if err != nil { - return Creation{}, errors.Wrapf(err, errFmtCannotDoWithTFCli, "create") - } - - if !completed { - return Creation{}, nil - } - - conn, err := consumeState(tfc.GetState(), tr, true) - if err != nil { - return Creation{}, errors.Wrap(err, errCannotConsumeState) - } - - return Creation{ - Completed: true, - ConnectionDetails: conn, - }, nil -} - // Update is a Terraform CLI implementation for Update function of Adapter interface. -func (t *CLI) Update(tr resource.Terraformed) (Update, error) { - b, err := t.getClientBuilderForResource(tr) - if err != nil { - return Update{}, errors.Wrap(err, errCannotGetClientBuilder) - } - - tfc, err := b.BuildUpdateClient() - if err != nil { - return Update{}, errors.Wrapf(err, errFmtCannotBuildClient, "update") - } - - completed, err := tfc.Update() +func (t *CLI) Update(ctx context.Context, tr resource.Terraformed) (Update, error) { + ar, err := t.tfcli.Apply(ctx) if err != nil { return Update{}, errors.Wrapf(err, errFmtCannotDoWithTFCli, "update") } - if !completed { + if !ar.Completed { return Update{}, nil } - conn, err := consumeState(tfc.GetState(), tr, false) + // After a successful Apply, we now have a state to consume. + // We will consume the state by: + // - returning "sensitive attributes" as connection details + // - setting external name annotation, if not set already, from attribute + // - late initializing "spec.forProvider" with "attributes" + // - setting observation at "status.atProvider" with "attributes" + // - storing base64encoded "tfstate" as an annotation + conn, err := consumeState(ar.State, tr) if err != nil { return Update{}, errors.Wrap(err, errCannotConsumeState) } @@ -162,72 +144,29 @@ func (t *CLI) Update(tr resource.Terraformed) (Update, error) { } // Delete is a Terraform CLI implementation for Delete function of Adapter interface. -func (t *CLI) Delete(tr resource.Terraformed) (bool, error) { - b, err := t.getClientBuilderForResource(tr) - if err != nil { - return false, errors.Wrap(err, errCannotGetClientBuilder) - } - - tfc, err := b.BuildDeletionClient() - if err != nil { - return false, errors.Wrapf(err, errFmtCannotBuildClient, "delete") - } - - completed, err := tfc.Delete() +func (t *CLI) Delete(ctx context.Context, tr resource.Terraformed) (bool, error) { + dr, err := t.tfcli.Destroy(ctx) if err != nil { return false, errors.Wrapf(err, errFmtCannotDoWithTFCli, "delete") } - if !completed { - return false, nil - } - - // TODO(hasan): Does it make any sense to call GetState on delete client? - // Would delete operation be considered as completed (i.e. allowing a new operation like Observe) - // if I didn't call GetState? - _ = tfc.GetState() - - return true, nil -} - -// getClientBuilderForResource returns a tfcli client builder by setting attributes -// (i.e. desired spec input) and terraform state (if available) on client builder base. -func (t *CLI) getClientBuilderForResource(tr resource.Terraformed) (tfcli.Builder, error) { - var stateRaw []byte - if meta.GetState(tr) != "" { - stEnc := meta.GetState(tr) - st, err := BuildStateV4(stEnc, nil) - if err != nil { - return nil, errors.Wrap(err, "cannot build state") - } - - stateRaw, err = st.Serialize() - if err != nil { - return nil, errors.Wrap(err, "cannot serialize state") - } - } - - attr, err := tr.GetParameters() - if err != nil { - return nil, errors.Wrap(err, "failed to get attributes") - } - - return t.builderBase.WithState(stateRaw).WithResourceBody(attr), nil + return dr.Completed, nil } // consumeState parses input tfstate and sets related fields in the custom resource. -func consumeState(state []byte, tr resource.Terraformed, parseExternalID bool) (managed.ConnectionDetails, error) { +func consumeState(state []byte, tr resource.Terraformed) (managed.ConnectionDetails, error) { st, err := ParseStateV4(state) if err != nil { return nil, errors.Wrap(err, "cannot build state") } - if parseExternalID { - // Terraform stores id for the external resource as an attribute in the resource state. - // Key for the attribute holding external identifier is resource specific. We rely on - // GetTerraformResourceIdField() function to find out that key. + if xpmeta.GetExternalName(tr) == "" { + // Terraform stores id for the external resource as an attribute in the + // resource state. Key for the attribute holding external identifier is + // resource specific. We rely on GetTerraformResourceIdField() function + // to find out that key. stAttr := map[string]interface{}{} - if err = json.Unmarshal(st.GetAttributes(), &stAttr); err != nil { + if err = JSParser.Unmarshal(st.GetAttributes(), &stAttr); err != nil { return nil, errors.Wrap(err, "cannot parse state attributes") } @@ -249,7 +188,7 @@ func consumeState(state []byte, tr resource.Terraformed, parseExternalID bool) ( } conn := managed.ConnectionDetails{} - if err = json.Unmarshal(st.GetSensitiveAttributes(), &conn); err != nil { + if err = JSParser.Unmarshal(st.GetSensitiveAttributes(), &conn); err != nil { return nil, errors.Wrap(err, "cannot parse connection details") } diff --git a/pkg/conversion/json.go b/pkg/conversion/json.go index a248b439..e4d232fd 100644 --- a/pkg/conversion/json.go +++ b/pkg/conversion/json.go @@ -4,3 +4,6 @@ import jsoniter "github.com/json-iterator/go" // TFParser is a json parser to marshal/unmarshal using "tf" tag. var TFParser = jsoniter.Config{TagKey: "tf"}.Froze() + +// JSParser is a json parser to marshal/unmarshal using "json" tag. +var JSParser = jsoniter.Config{TagKey: "json"}.Froze() diff --git a/pkg/conversion/statev4.go b/pkg/conversion/statev4.go index 9222c167..79f06fb7 100644 --- a/pkg/conversion/statev4.go +++ b/pkg/conversion/statev4.go @@ -2,8 +2,8 @@ package conversion import ( "encoding/base64" - "encoding/json" + jsoniter "github.com/json-iterator/go" "github.com/pkg/errors" ) @@ -31,9 +31,9 @@ type StateV4 struct { // OutputStateV4 represents a version 4 output state type OutputStateV4 struct { - ValueRaw json.RawMessage `json:"value"` - ValueTypeRaw json.RawMessage `json:"type"` - Sensitive bool `json:"sensitive,omitempty"` + ValueRaw jsoniter.RawMessage `json:"value"` + ValueTypeRaw jsoniter.RawMessage `json:"type"` + Sensitive bool `json:"sensitive,omitempty"` } // ResourceStateV4 represents a version 4 resource state @@ -53,10 +53,10 @@ type InstanceObjectStateV4 struct { Status string `json:"status,omitempty"` Deposed string `json:"deposed,omitempty"` - SchemaVersion uint64 `json:"schema_version"` - AttributesRaw json.RawMessage `json:"attributes,omitempty"` - AttributesFlat map[string]string `json:"attributes_flat,omitempty"` - AttributeSensitivePaths json.RawMessage `json:"sensitive_attributes,omitempty,"` + SchemaVersion uint64 `json:"schema_version"` + AttributesRaw jsoniter.RawMessage `json:"attributes,omitempty"` + AttributesFlat map[string]string `json:"attributes_flat,omitempty"` + AttributeSensitivePaths jsoniter.RawMessage `json:"sensitive_attributes,omitempty,"` PrivateRaw []byte `json:"private,omitempty"` @@ -68,7 +68,7 @@ type InstanceObjectStateV4 struct { // ParseStateV4 parses a given Terraform state as StateV4 object func ParseStateV4(data []byte) (*StateV4, error) { st := &StateV4{} - if err := json.Unmarshal(data, st); err != nil { + if err := JSParser.Unmarshal(data, st); err != nil { return nil, errors.Wrap(err, errCannotParseState) } @@ -76,7 +76,7 @@ func ParseStateV4(data []byte) (*StateV4, error) { } // BuildStateV4 builds a StateV4 object from the given base64 encoded state and sensitive attributes -func BuildStateV4(encodedState string, attributesSensitive json.RawMessage) (*StateV4, error) { +func BuildStateV4(encodedState string, attributesSensitive jsoniter.RawMessage) (*StateV4, error) { m, err := base64.StdEncoding.DecodeString(encodedState) if err != nil { return nil, errors.Wrap(err, errCannotDecodeMetadata) @@ -113,12 +113,12 @@ func (st *StateV4) Validate() error { } // GetAttributes returns attributes of the Terraform managed resource (i.e. first instance of first resource) -func (st *StateV4) GetAttributes() json.RawMessage { +func (st *StateV4) GetAttributes() jsoniter.RawMessage { return st.Resources[0].Instances[0].AttributesRaw } // GetSensitiveAttributes returns sensitive attributes of the Terraform managed resource (i.e. first instance of first resource) -func (st *StateV4) GetSensitiveAttributes() json.RawMessage { +func (st *StateV4) GetSensitiveAttributes() jsoniter.RawMessage { return st.Resources[0].Instances[0].AttributeSensitivePaths } @@ -126,7 +126,7 @@ func (st *StateV4) GetSensitiveAttributes() json.RawMessage { func (st *StateV4) GetEncodedState() (string, error) { // TODO(hasan): do we need a deep copy, probably st.Resources[0].Instances[0].AttributeSensitivePaths = nil - b, err := json.Marshal(st) + b, err := JSParser.Marshal(st) if err != nil { return "", err } @@ -136,5 +136,5 @@ func (st *StateV4) GetEncodedState() (string, error) { // Serialize serializes StateV4 object to byte array func (st *StateV4) Serialize() ([]byte, error) { - return json.Marshal(st) + return JSParser.Marshal(st) } diff --git a/pkg/terraform/controller.go b/pkg/terraform/controller.go index 387de61b..85f39017 100644 --- a/pkg/terraform/controller.go +++ b/pkg/terraform/controller.go @@ -62,27 +62,35 @@ type connector struct { } func (c *connector) Connect(ctx context.Context, mg xpresource.Managed) (managed.ExternalClient, error) { + tr, ok := mg.(resource.Terraformed) + if !ok { + return nil, errors.New(errUnexpectedObject) + } // TODO(hasan): create and pass the implementation of tfcli builder once available - - /* tr, ok := mg.(resource.Terraformed) - if !ok { - return nil, errors.New(errUnexpectedObject) - } + /* pc, err := c.providerConfig(ctx, c.kube, mg) if err != nil { - return nil, errors.Wrap(err, "failed to get provider config") + return nil, errors.Wrap(err, "cannot get provider config") } tfcb := tfcli.NewClientBuilder(). WithLogger(c.logger). WithResourceName(tr.GetName()). WithHandle(string(tr.GetUID())). WithProviderConfiguration(pc). - WithResourceType(tr.GetTerraformResourceType())*/ + WithResourceType(tr.GetTerraformResourceType()) + + tfcli, err := conversion.BuildClientForResource(tfcb, tr) + */ + + tfcli, err := conversion.BuildClientForResource(nil, tr) + if err != nil { + return nil, errors.Wrap(err, "cannot build tf client for resource") + } return &external{ kube: c.kube, - tf: conversion.NewCli(nil), + tf: conversion.NewCli(tfcli), log: c.logger, record: event.NewNopRecorder(), }, nil @@ -108,28 +116,14 @@ func (e *external) Observe(ctx context.Context, mg xpresource.Managed) (managed. }, nil } - res, err := e.tf.Observe(tr) + res, err := e.tf.Observe(ctx, tr) if err != nil { return managed.ExternalObservation{}, errors.Wrap(err, "cannot check if resource exists") } - if !res.Completed { - // Note(hasan): If an async operation is not completed yet, we don't want to reconcile - // with exponential backoff since this is not an error condition rather an expected situation. - // And checking that frequently wouldn't make much sense since we expect terraform client - // invokes to take some seconds. Here, we chose to check again after poll interval, - // but to speed things up, we might want to consider adding a special wait that is less frequent - // than exponential backoff but more frequent than poll interval. - - // Observation is in progress, do nothing. We will check again after the poll interval. - return managed.ExternalObservation{ - ResourceExists: true, - ResourceUpToDate: true, - }, nil - } - - // During creation (i.e. apply), Terraform already waits until resource is ready. - // So, I believe it would be safe to assume it is available if create step completed (i.e. resource exists). + // During creation (i.e. apply), Terraform already waits until resource is + // ready. So, I believe it would be safe to assume it is available if create + // step completed (i.e. resource exists). if res.Exists { tr.SetConditions(xpv1.Available()) } @@ -143,27 +137,9 @@ func (e *external) Observe(ctx context.Context, mg xpresource.Managed) (managed. } func (e *external) Create(ctx context.Context, mg xpresource.Managed) (managed.ExternalCreation, error) { - tr, ok := mg.(resource.Terraformed) - if !ok { - return managed.ExternalCreation{}, errors.New(errUnexpectedObject) - } - - res, err := e.tf.Create(tr) - if err != nil { - return managed.ExternalCreation{}, errors.Wrap(err, "failed to create") - } - if !res.Completed { - // Creation is in progress, do nothing. We will check again after the poll interval. - return managed.ExternalCreation{}, nil - } - - if err := e.persistState(ctx, tr); err != nil { - return managed.ExternalCreation{}, errors.Wrap(err, "cannot persist state") - } - - return managed.ExternalCreation{ - ConnectionDetails: res.ConnectionDetails, - }, err + // Terraform does not have distinct 'create' and 'update' operations. + u, err := e.Update(ctx, mg) + return managed.ExternalCreation{ConnectionDetails: u.ConnectionDetails}, err } func (e *external) Update(ctx context.Context, mg xpresource.Managed) (managed.ExternalUpdate, error) { @@ -172,7 +148,7 @@ func (e *external) Update(ctx context.Context, mg xpresource.Managed) (managed.E return managed.ExternalUpdate{}, errors.New(errUnexpectedObject) } - res, err := e.tf.Update(tr) + res, err := e.tf.Update(ctx, tr) if err != nil { return managed.ExternalUpdate{}, errors.Wrap(err, "failed to update") } @@ -196,7 +172,7 @@ func (e *external) Delete(ctx context.Context, mg xpresource.Managed) error { return errors.New(errUnexpectedObject) } - _, err := e.tf.Delete(tr) + _, err := e.tf.Delete(ctx, tr) if err != nil { return errors.Wrap(err, "failed to delete") } @@ -204,26 +180,18 @@ func (e *external) Delete(ctx context.Context, mg xpresource.Managed) error { return nil } +// persistState does its best to store external name and tfstate annotations on +// the object. func (e *external) persistState(ctx context.Context, obj xpresource.Object) error { externalName := xpmeta.GetExternalName(obj) newState := meta.GetState(obj) - // We will retry in all cases where the error comes from the api-server. - // At one point, context deadline will be exceeded and, we'll get out - // of the loop. In that case, we warn the user that the external resource - // might be leaked. err := retry.OnError(retry.DefaultRetry, xpresource.IsAPIError, func() error { nn := types.NamespacedName{Name: obj.GetName()} if err := e.kube.Get(ctx, nn, obj); err != nil { return err } - // We know that external name would never change once it is set - if xpmeta.GetExternalName(obj) != "" && xpmeta.GetExternalName(obj) != externalName { - return errors.Errorf("external name should not change once it is set. current %s, new %s", - xpmeta.GetExternalName(obj), externalName) - } - xpmeta.SetExternalName(obj, externalName) meta.SetState(obj, newState) return e.kube.Update(ctx, obj) diff --git a/pkg/tfcli/error.go b/pkg/tfcli/error.go index 07c9133a..7457d85a 100644 --- a/pkg/tfcli/error.go +++ b/pkg/tfcli/error.go @@ -6,17 +6,20 @@ import "fmt" type OperationType int const ( + // OperationUnknown represents an Unknown operation OperationUnknown OperationType = iota - OperationObserve - OperationCreate - OperationUpdate - OperationDelete + // OperationApply represents an Apply operation + OperationApply + // OperationDestroy respresents a Destrot operation + OperationDestroy ) func (o OperationType) String() string { - return []string{"Unknown", "Observe", "Create", "Update", "Delete"}[o] + return []string{"Unknown", "Apply", "Destroy"}[o] } +// OperationInProgressError is a custom error indicating there is an ongoing +// operation which prevents starting a new one. type OperationInProgressError struct { op OperationType } @@ -25,6 +28,7 @@ func (e *OperationInProgressError) Error() string { return fmt.Sprintf("operation %s in progress", e.op.String()) } +// GetOperation returns the OperationType that is in progress func (e *OperationInProgressError) GetOperation() OperationType { return e.op } diff --git a/pkg/tfcli/interfaces.go b/pkg/tfcli/interfaces.go index 9493f448..c6dfdb1c 100644 --- a/pkg/tfcli/interfaces.go +++ b/pkg/tfcli/interfaces.go @@ -23,57 +23,47 @@ import ( "github.com/crossplane/crossplane-runtime/pkg/logging" ) +// RefreshResult represents result of a Refresh operation type RefreshResult struct { UpToDate bool Exists bool State []byte } +// ApplyResult represents result of an Apply operation type ApplyResult struct { Completed bool State []byte } +// DestroyResult represents result of a Destroy operation type DestroyResult struct { Completed bool } +// Client is a Terraform cli client type Client interface { + // Refresh is a "blocking" operation refreshing terraform state and preparing + // a RefreshResult based on that. Refresh(ctx context.Context, id string) (RefreshResult, error) + // Apply is a "non-blocking" operation triggering a Terraform Apply Apply(ctx context.Context) (ApplyResult, error) + // Destroy is a "non-blocking" operation triggering a Terraform Destroy Destroy(ctx context.Context) (DestroyResult, error) + // Close destroys this client and underlying workspace for this client Close(ctx context.Context) error } +// Builder is a Terraform Client builder type Builder interface { - RequiresProvider - RequiresResource - RequiresState - RequiresTimeout - RequiresLogger BuildClient() (Client, error) -} - -type RequiresLogger interface { WithLogger(logger logging.Logger) Builder -} - -type RequiresTimeout interface { WithTimeout(d time.Duration) Builder -} - -type RequiresState interface { WithState(tfState []byte) Builder -} - -type RequiresResource interface { WithResourceType(labelType string) Builder WithResourceName(labelName string) Builder WithResourceBody(body []byte) Builder WithHandle(handle string) Builder -} - -type RequiresProvider interface { WithProviderSource(source string) Builder WithProviderVersion(version string) Builder WithProviderConfiguration(conf []byte) Builder From 4246657031f181fdaf0de83e83ceaa8735307180 Mon Sep 17 00:00:00 2001 From: Hasan Turken Date: Fri, 20 Aug 2021 20:43:19 +0300 Subject: [PATCH 17/18] Resolve comments - refactorings and improvements Signed-off-by: Hasan Turken --- pkg/conversion/adapter.go | 2 +- pkg/conversion/cli.go | 25 ++++++++++++++++++------- pkg/conversion/statev4.go | 6 +++++- pkg/terraform/controller.go | 2 +- 4 files changed, 25 insertions(+), 10 deletions(-) diff --git a/pkg/conversion/adapter.go b/pkg/conversion/adapter.go index 2ec12395..334bf324 100644 --- a/pkg/conversion/adapter.go +++ b/pkg/conversion/adapter.go @@ -25,6 +25,6 @@ type Update struct { // An Adapter is used to interact with terraform managed resources type Adapter interface { Observe(ctx context.Context, tr resource.Terraformed) (Observation, error) - Update(ctx context.Context, tr resource.Terraformed) (Update, error) + CreateOrUpdate(ctx context.Context, tr resource.Terraformed) (Update, error) Delete(ctx context.Context, tr resource.Terraformed) (bool, error) } diff --git a/pkg/conversion/cli.go b/pkg/conversion/cli.go index c96c5165..afc2b9d8 100644 --- a/pkg/conversion/cli.go +++ b/pkg/conversion/cli.go @@ -61,7 +61,7 @@ func (t *CLI) Observe(ctx context.Context, tr resource.Terraformed) (Observation tfRes, err := t.tfcli.Refresh(ctx, xpmeta.GetExternalName(tr)) - if isOperationInProgress(err, tfcli.OperationApply) { + if isApplying(err) { // A previously started "Apply" operation is in progress or completed // but one last call needs to be done as completed to be able to kick // off a new operation. We will return "Exists: true, UpToDate: false" @@ -72,7 +72,7 @@ func (t *CLI) Observe(ctx context.Context, tr resource.Terraformed) (Observation }, nil } - if isOperationInProgress(err, tfcli.OperationDestroy) { + if isDestroying(err) { // A previously started "Destroy" operation is in progress or completed // but one last call needs to be done as completed to be able to kick // off a new operation. We will return "Exists: true, UpToDate: true" in @@ -103,9 +103,12 @@ func (t *CLI) Observe(ctx context.Context, tr resource.Terraformed) (Observation // - late initializing "spec.forProvider" with "attributes" // - setting observation at "status.atProvider" with "attributes" // - storing base64encoded "tfstate" as an annotation - conn, err := consumeState(tfRes.State, tr) - if err != nil { - return Observation{}, errors.Wrap(err, errCannotConsumeState) + var conn managed.ConnectionDetails + if tfRes.State != nil { + conn, err = consumeState(tfRes.State, tr) + if err != nil { + return Observation{}, errors.Wrap(err, errCannotConsumeState) + } } return Observation{ @@ -115,8 +118,8 @@ func (t *CLI) Observe(ctx context.Context, tr resource.Terraformed) (Observation }, nil } -// Update is a Terraform CLI implementation for Update function of Adapter interface. -func (t *CLI) Update(ctx context.Context, tr resource.Terraformed) (Update, error) { +// CreateOrUpdate is a Terraform CLI implementation for CreateOrUpdate function of Adapter interface. +func (t *CLI) CreateOrUpdate(ctx context.Context, tr resource.Terraformed) (Update, error) { ar, err := t.tfcli.Apply(ctx) if err != nil { return Update{}, errors.Wrapf(err, errFmtCannotDoWithTFCli, "update") @@ -201,6 +204,14 @@ func consumeState(state []byte, tr resource.Terraformed) (managed.ConnectionDeta return conn, nil } +func isApplying(err error) bool { + return isOperationInProgress(err, tfcli.OperationApply) +} + +func isDestroying(err error) bool { + return isOperationInProgress(err, tfcli.OperationDestroy) +} + func isOperationInProgress(err error, op tfcli.OperationType) bool { if opErr, ok := err.(*tfcli.OperationInProgressError); ok { if opErr.GetOperation() == op { diff --git a/pkg/conversion/statev4.go b/pkg/conversion/statev4.go index 79f06fb7..af80bac1 100644 --- a/pkg/conversion/statev4.go +++ b/pkg/conversion/statev4.go @@ -124,7 +124,11 @@ func (st *StateV4) GetSensitiveAttributes() jsoniter.RawMessage { // GetEncodedState returns base64 encoded sanitized (i.e. sensitive attributes removed) state func (st *StateV4) GetEncodedState() (string, error) { - // TODO(hasan): do we need a deep copy, probably + sensitive := st.Resources[0].Instances[0].AttributeSensitivePaths + defer func() { + st.Resources[0].Instances[0].AttributeSensitivePaths = sensitive + }() + st.Resources[0].Instances[0].AttributeSensitivePaths = nil b, err := JSParser.Marshal(st) if err != nil { diff --git a/pkg/terraform/controller.go b/pkg/terraform/controller.go index 85f39017..e85a5a26 100644 --- a/pkg/terraform/controller.go +++ b/pkg/terraform/controller.go @@ -148,7 +148,7 @@ func (e *external) Update(ctx context.Context, mg xpresource.Managed) (managed.E return managed.ExternalUpdate{}, errors.New(errUnexpectedObject) } - res, err := e.tf.Update(ctx, tr) + res, err := e.tf.CreateOrUpdate(ctx, tr) if err != nil { return managed.ExternalUpdate{}, errors.Wrap(err, "failed to update") } From 8442ddf13f3d5f1207117a1fbc8bfc538ffeaa90 Mon Sep 17 00:00:00 2001 From: Hasan Turken Date: Fri, 20 Aug 2021 20:48:10 +0300 Subject: [PATCH 18/18] Move tfcli error helpers to tfcli.errors package Signed-off-by: Hasan Turken --- pkg/conversion/cli.go | 22 +++------------------- pkg/tfcli/{error.go => errors/errors.go} | 21 ++++++++++++++++++++- 2 files changed, 23 insertions(+), 20 deletions(-) rename pkg/tfcli/{error.go => errors/errors.go} (62%) diff --git a/pkg/conversion/cli.go b/pkg/conversion/cli.go index afc2b9d8..bfc7304a 100644 --- a/pkg/conversion/cli.go +++ b/pkg/conversion/cli.go @@ -10,6 +10,7 @@ import ( "github.com/crossplane-contrib/terrajet/pkg/meta" "github.com/crossplane-contrib/terrajet/pkg/terraform/resource" "github.com/crossplane-contrib/terrajet/pkg/tfcli" + tferrors "github.com/crossplane-contrib/terrajet/pkg/tfcli/errors" ) const ( @@ -61,7 +62,7 @@ func (t *CLI) Observe(ctx context.Context, tr resource.Terraformed) (Observation tfRes, err := t.tfcli.Refresh(ctx, xpmeta.GetExternalName(tr)) - if isApplying(err) { + if tferrors.IsApplying(err) { // A previously started "Apply" operation is in progress or completed // but one last call needs to be done as completed to be able to kick // off a new operation. We will return "Exists: true, UpToDate: false" @@ -72,7 +73,7 @@ func (t *CLI) Observe(ctx context.Context, tr resource.Terraformed) (Observation }, nil } - if isDestroying(err) { + if tferrors.IsDestroying(err) { // A previously started "Destroy" operation is in progress or completed // but one last call needs to be done as completed to be able to kick // off a new operation. We will return "Exists: true, UpToDate: true" in @@ -203,20 +204,3 @@ func consumeState(state []byte, tr resource.Terraformed) (managed.ConnectionDeta return conn, nil } - -func isApplying(err error) bool { - return isOperationInProgress(err, tfcli.OperationApply) -} - -func isDestroying(err error) bool { - return isOperationInProgress(err, tfcli.OperationDestroy) -} - -func isOperationInProgress(err error, op tfcli.OperationType) bool { - if opErr, ok := err.(*tfcli.OperationInProgressError); ok { - if opErr.GetOperation() == op { - return true - } - } - return false -} diff --git a/pkg/tfcli/error.go b/pkg/tfcli/errors/errors.go similarity index 62% rename from pkg/tfcli/error.go rename to pkg/tfcli/errors/errors.go index 7457d85a..98d53adf 100644 --- a/pkg/tfcli/error.go +++ b/pkg/tfcli/errors/errors.go @@ -1,4 +1,4 @@ -package tfcli +package errors import "fmt" @@ -32,3 +32,22 @@ func (e *OperationInProgressError) Error() string { func (e *OperationInProgressError) GetOperation() OperationType { return e.op } + +// IsApplying returns whether the given error a Apply in progress error +func IsApplying(err error) bool { + return isOperationInProgress(err, OperationApply) +} + +// IsDestroying returns whether the given error a Destroy in progress error +func IsDestroying(err error) bool { + return isOperationInProgress(err, OperationDestroy) +} + +func isOperationInProgress(err error, op OperationType) bool { + if opErr, ok := err.(*OperationInProgressError); ok { + if opErr.GetOperation() == op { + return true + } + } + return false +}