diff --git a/go.mod b/go.mod index 53c998c..7f1fe55 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,9 @@ go 1.18 require ( github.com/AlecAivazis/survey/v2 v2.3.5 + github.com/fatih/color v1.13.0 github.com/go-git/go-git/v5 v5.4.2 + github.com/goccy/go-yaml v1.9.5 github.com/spf13/cobra v1.5.0 github.com/spf13/viper v1.12.0 ) @@ -40,9 +42,10 @@ require ( github.com/xanzy/ssh-agent v0.3.0 // indirect golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4 // indirect golang.org/x/net v0.0.0-20220520000938-2e3eb7b945c2 // indirect - golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a // indirect + golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8 // indirect golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect golang.org/x/text v0.3.7 // indirect + golang.org/x/xerrors v0.0.0-20220609144429-65e65417b02f // indirect gopkg.in/ini.v1 v1.66.4 // indirect gopkg.in/warnings.v0 v0.1.2 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect diff --git a/go.sum b/go.sum index b023c93..8344d2e 100644 --- a/go.sum +++ b/go.sum @@ -36,8 +36,6 @@ cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RX cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0= cloud.google.com/go/storage v1.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3fOKtUw0Xmo= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= -github.com/AlecAivazis/survey/v2 v2.3.4 h1:pchTU9rsLUSvWEl2Aq9Pv3k0IE2fkqtGxazskAMd9Ng= -github.com/AlecAivazis/survey/v2 v2.3.4/go.mod h1:hrV6Y/kQCLhIZXGcriDCUBtB3wnN7156gMXJ3+b23xM= github.com/AlecAivazis/survey/v2 v2.3.5 h1:A8cYupsAZkjaUmhtTYv3sSqc7LO5mp1XDfqe5E/9wRQ= github.com/AlecAivazis/survey/v2 v2.3.5/go.mod h1:4AuI9b7RjAR+G7v9+C4YSlX/YL3K3cWNXgWXOhllqvI= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= @@ -63,7 +61,6 @@ github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDk github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= -github.com/cpuguy83/go-md2man/v2 v2.0.1/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/creack/pty v1.1.17 h1:QeVUsEDNrLBW4tMgZHvxy18sKtr6VI492kBhUfhDJNI= @@ -79,9 +76,11 @@ github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1m github.com/envoyproxy/go-control-plane v0.9.7/go.mod h1:cwu0lG7PUMfa9snN8LXBig5ynNVH9qI8YYLbd1fK2po= github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= +github.com/fatih/color v1.10.0/go.mod h1:ELkj/draVOlAH/xkhN6mQ50Qd0MPOk5AAr3maGEBuJM= +github.com/fatih/color v1.13.0 h1:8LOYc1KYPPmyKMuN8QV2DNRWNbLo6LZ0iLs8+mlH53w= +github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk= github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc= -github.com/fsnotify/fsnotify v1.5.1 h1:mZcQUHVQUQWoPXXtuf9yuEXKudkV2sx1E06UadKWpgI= -github.com/fsnotify/fsnotify v1.5.1/go.mod h1:T3375wBYaZdLLcVNkcVbzGHY7f1l/uK5T5Ai1i3InKU= +github.com/frankban/quicktest v1.14.3 h1:FJKSZTDHjyhriyC81FLQ0LY93eSai0ZyR/ZIkd3ZUKE= github.com/fsnotify/fsnotify v1.5.4 h1:jRbGcIw6P2Meqdwuo0H1p6JVLbL5DHKAKlYndzMwVZI= github.com/fsnotify/fsnotify v1.5.4/go.mod h1:OVB6XrOHzAwXMpEM7uPOzcehqUV2UqJxmVXmkdnm1bU= github.com/gliderlabs/ssh v0.2.2 h1:6zsha5zo/TWhRhwqCD3+EarCAgZ2yN28ipRnGPnwkI0= @@ -98,6 +97,15 @@ 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-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4= +github.com/go-playground/locales v0.13.0 h1:HyWk6mgj5qFqCT5fjGBuRArbVDfE4hi8+e8ceBS/t7Q= +github.com/go-playground/locales v0.13.0/go.mod h1:taPMhCMXrRLJO55olJkUXHZBHCxTMfnGwq/HNwmWNS8= +github.com/go-playground/universal-translator v0.17.0 h1:icxd5fm+REJzpZx7ZfpaD876Lmtgy7VtROAbHHXk8no= +github.com/go-playground/universal-translator v0.17.0/go.mod h1:UkSxE5sNxxRwHyU+Scu5vgOQjsIJAF8j9muTVoKLVtA= +github.com/go-playground/validator/v10 v10.4.1 h1:pH2c5ADXtd66mxoE0Zm9SUhxE20r7aM3F26W0hOn+GE= +github.com/go-playground/validator/v10 v10.4.1/go.mod h1:nlOn6nFhuKACm19sB/8EGNn9GlaMV7XkbRSipzJ0Ii4= +github.com/goccy/go-yaml v1.9.5 h1:Eh/+3uk9kLxG4koCX6lRMAPS1OaMSAi+FJcya0INdB0= +github.com/goccy/go-yaml v1.9.5/go.mod h1:U/jl18uSupI5rdI2jmuCswEA2htH9eXfferR3KfscvA= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= 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= @@ -134,7 +142,7 @@ github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.7 h1:81/ik6ipDQS2aGcBfIN5dHDB36BwrStyeAQquSYCV4o= +github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= 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/martian/v3 v3.1.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= @@ -178,37 +186,36 @@ github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+o github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= -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/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= 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/leodido/go-urn v1.2.0 h1:hpXL4XnriNwQ/ABnpepYM/1vCLWNDfUNts8dX3xTG6Y= +github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII= github.com/magiconair/properties v1.8.6 h1:5ibWZ6iY0NctNGWo87LalDlEZ6R41TqbbDamhfG/Qzo= github.com/magiconair/properties v1.8.6/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60= github.com/matryer/is v1.2.0 h1:92UTHpy8CDwaJ08GqLDzhhuixiBUUD1p3AU6PHddz4A= github.com/matryer/is v1.2.0/go.mod h1:2fLPjFQM9rhQ15aVEtbuwhJinnOqrmgXPNdZsdwlWXA= github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= +github.com/mattn/go-colorable v0.1.8/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= +github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= github.com/mattn/go-colorable v0.1.12 h1:jF+Du6AlPIjs2BiUiQlKOX0rt3SujHxPnksPKZbaA40= github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4= github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= +github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= github.com/mattn/go-isatty v0.0.14 h1:yVuAays6BHfxijgZPzw+3Zlu5yQgKGP2/hcQbHb7S9Y= github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94= github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b h1:j7+1HpAFS1zy5+Q4qx1fWh90gTKwiN4QCGoY9TWyyO4= github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b/go.mod h1:01TrycV0kFyexm33Z7vhZRXopbI8J3TDReVlkTgMUxE= github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y= github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= -github.com/mitchellh/mapstructure v1.4.3 h1:OVowDSCllw/YjdLkam3/sm7wEtOy59d8ndGgCcyj8cs= -github.com/mitchellh/mapstructure v1.4.3/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY= github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= -github.com/pelletier/go-toml v1.9.4 h1:tjENF6MfZAg8e4ZmZTeWaWiT2vXtsoO6+iuOjFhECwM= -github.com/pelletier/go-toml v1.9.4/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= github.com/pelletier/go-toml v1.9.5 h1:4yBQzkHv+7BHq2PQUZF3Mx0IYxG7LsP222s7Agd3ve8= github.com/pelletier/go-toml v1.9.5/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= -github.com/pelletier/go-toml/v2 v2.0.0-beta.8 h1:dy81yyLYJDwMTifq24Oi/IslOslRrDSb3jwDggjz3Z0= -github.com/pelletier/go-toml/v2 v2.0.0-beta.8/go.mod h1:r9LEWfGN8R5k0VXJ+0BkIe7MYkRdwZOjgMj2KwnJFUo= github.com/pelletier/go-toml/v2 v2.0.1 h1:8e3L2cCQzLFi2CR4g7vGFuFxX7Jl1kKX8gW+iV0GUKU= github.com/pelletier/go-toml/v2 v2.0.1/go.mod h1:r9LEWfGN8R5k0VXJ+0BkIe7MYkRdwZOjgMj2KwnJFUo= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= @@ -219,26 +226,21 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= +github.com/rogpeppe/go-internal v1.6.1 h1:/FiVV8dS/e+YqF2JvO3yXRFbBLTIuSDkuC7aBOAvL+k= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/sergi/go-diff v1.1.0 h1:we8PVUC3FE2uYfodKH/nBHMSetSfHDR6scGdBi+erh0= github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM= github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q= github.com/spf13/afero v1.8.2 h1:xehSyVa0YnHWsJ49JFljMpg1HX19V6NDZ1fkm1Xznbo= github.com/spf13/afero v1.8.2/go.mod h1:CtAatgMJh6bJEIs48Ay/FOnkljP3WeGUG0MC1RfAqwo= -github.com/spf13/cast v1.4.1 h1:s0hze+J0196ZfEMTs80N7UlFt0BDuQ7Q+JDnHiMWKdA= -github.com/spf13/cast v1.4.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= github.com/spf13/cast v1.5.0 h1:rj3WzYc11XZaIZMPKmwP96zkFEnnAmV8s6XbB2aY32w= github.com/spf13/cast v1.5.0/go.mod h1:SpXXQ5YoyJw6s3/6cMTQuxvgRl3PCJiyaX9p6b155UU= -github.com/spf13/cobra v1.4.0 h1:y+wJpx64xcgO1V+RcnwW0LEHxTKRi2ZDPSBjWnrg88Q= -github.com/spf13/cobra v1.4.0/go.mod h1:Wo4iy3BUC+X2Fybo0PDqwJIv3dNRiZLHQymsfxlB84g= github.com/spf13/cobra v1.5.0 h1:X+jTBEBqF0bHN+9cSMgmfuvv2VHJ9ezmFNf9Y/XstYU= github.com/spf13/cobra v1.5.0/go.mod h1:dWXEIy2H428czQCjInthrTRUg7yKbok+2Qi/yBIJoUM= github.com/spf13/jwalterweatherman v1.1.0 h1:ue6voC5bR5F8YxI5S67j9i582FU4Qvo2bmqnqMYADFk= github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo= 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.11.0 h1:7OX/1FS6n7jHD1zGrZTM7WtY13ZELRyosK4k93oPr44= -github.com/spf13/viper v1.11.0/go.mod h1:djo0X/bA5+tYVoCn+C7cAYJGcVn/qYLFTG8gdUsX7Zk= github.com/spf13/viper v1.12.0 h1:CZ7eSOd3kZoaYDLbXnmzgQI5RlciuXBMA+18HwHRfZQ= github.com/spf13/viper v1.12.0/go.mod h1:b6COn30jlNxbm/V2IqWiNWkJ+vZNiMNksliPCiuKtSI= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= @@ -250,8 +252,6 @@ github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1 h1:5TQK59W5E3v0r2duFAb7P95B6hEeOyEnHRa8MjYSMTY= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/subosito/gotenv v1.2.0 h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s= -github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= github.com/subosito/gotenv v1.3.0 h1:mjC+YW8QpAdXibNi+vNWgzmgBH4+5l5dCXv8cNysBLI= github.com/subosito/gotenv v1.3.0/go.mod h1:YzJjq/33h7nrwdY+iHMhEOEEbW0ovIz0tB6t6PwAXzs= github.com/xanzy/ssh-agent v0.3.0 h1:wUMzuKtKilRgBAD1sUb8gOwwRr2FGoBVumcjoOACClI= @@ -342,8 +342,6 @@ golang.org/x/net v0.0.0-20201209123823-ac852fbbde11/go.mod h1:m0MpNAwzfU5UDzcl9v golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210326060303-6b1517762897/go.mod h1:uSPa2vr4CLtc/ILN5odXGNXS6mhrKVzTaCXzk9m6W3k= -golang.org/x/net v0.0.0-20220412020605-290c469a71a5 h1:bRb386wvrE+oBNdF1d/Xh9mQrfQ4ecYhW5qJ5GvTGT4= -golang.org/x/net v0.0.0-20220412020605-290c469a71a5/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.0.0-20220520000938-2e3eb7b945c2 h1:NWy5+hlRbC7HK+PmcXVUmW1IMyFce7to56IUvhUFm7Y= golang.org/x/net v0.0.0-20220520000938-2e3eb7b945c2/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= @@ -381,6 +379,7 @@ golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7w 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-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200116001909-b77594299b42/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= golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -407,11 +406,10 @@ golang.org/x/sys v0.0.0-20210502180810-71e4cd670f79/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220412211240-33da011f77ad h1:ntjMns5wyP/fN65tdBD4g8J5w8n015+iIIs9rtjXkY0= golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220422013727-9388b58f7150/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a h1:dGzPydgVsqGcTRVwiLJ1jVbufYwmzD3LfVPLKsKg+0k= -golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8 h1:0A+M6Uqn+Eje4kHMK80dtF3JCXC4ykBgQG4Fe06QRhQ= +golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210503060354-a79de5458b56/go.mod h1:tfny5GFUkzUvx4ps4ajbZsCe5lw1metzhBm9T3x7oIY= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 h1:JGgROgKl9N8DuW20oFS5gxc+lE67/N3FcwmBPMe7ArY= @@ -478,6 +476,8 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20220609144429-65e65417b02f h1:uF6paiQQebLeSXkrTqHqz0MXhXXS1KgF41eUdBNvxK0= +golang.org/x/xerrors v0.0.0-20220609144429-65e65417b02f/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8= 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= @@ -583,8 +583,6 @@ gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo= -gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.0 h1:hjy8E9ON/egN1tAYqKb61G10WtihqetD4sz2H+8nIeA= gopkg.in/yaml.v3 v3.0.0/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= diff --git a/internal/cmd/aquifer.go b/internal/cmd/aquifer.go new file mode 100644 index 0000000..803f17b --- /dev/null +++ b/internal/cmd/aquifer.go @@ -0,0 +1,29 @@ +package cmd + +import ( + "github.com/anoriqq/qpm/internal/service/aquifer" + "github.com/spf13/cobra" +) + +var aquiferCmd = &cobra.Command{ + Use: "aquifer", + Short: "manage aquifer", +} + +func init() { + rootCmd.AddCommand(aquiferCmd) +} + +var aquiferPullCmd = &cobra.Command{ + Use: "pull", + Short: "get aquifer form remote repository", + RunE: aquiferPullRun, +} + +func init() { + aquiferCmd.AddCommand(aquiferPullCmd) +} + +func aquiferPullRun(_ *cobra.Command, _ []string) error { + return aquifer.Pull() +} diff --git a/internal/cmd/config.go b/internal/cmd/config.go index 86803c4..5d46d14 100644 --- a/internal/cmd/config.go +++ b/internal/cmd/config.go @@ -10,8 +10,8 @@ import ( var configCmd = &cobra.Command{ Use: "config", Short: "update config", - Example: ` # set ScriptDir to ~/.qpm - qpm config ScriptDir ~/.qpm`, + Example: ` # set AquiferDir to ~/.qpm + qpm config AquiferDir ~/.qpm`, RunE: configRun, } diff --git a/internal/cmd/getscript.go b/internal/cmd/getscript.go deleted file mode 100644 index 83d9727..0000000 --- a/internal/cmd/getscript.go +++ /dev/null @@ -1,20 +0,0 @@ -package cmd - -import ( - "github.com/anoriqq/qpm/internal/service/getscript" - "github.com/spf13/cobra" -) - -var getscriptCmd = &cobra.Command{ - Use: "getscript", - Short: "get script dir form remote repository", - RunE: getscriptRun, -} - -func init() { - rootCmd.AddCommand(getscriptCmd) -} - -func getscriptRun(_ *cobra.Command, _ []string) error { - return getscript.GetScript() -} diff --git a/internal/cmd/install.go b/internal/cmd/install.go index 3351708..1b1add3 100644 --- a/internal/cmd/install.go +++ b/internal/cmd/install.go @@ -3,7 +3,7 @@ package cmd import ( "errors" - "github.com/anoriqq/qpm/internal/service/install" + "github.com/anoriqq/qpm/internal/service/aquifer" "github.com/spf13/cobra" ) @@ -23,7 +23,7 @@ func installRun(_ *cobra.Command, args []string) error { return err } - return install.Install(pkgName) + return aquifer.Install(pkgName) } func getPkgName(args []string) (string, error) { diff --git a/internal/config/config.go b/internal/config/config.go index 985caa6..06d5e8e 100644 --- a/internal/config/config.go +++ b/internal/config/config.go @@ -63,8 +63,8 @@ func createIfNotExistConfigFile(configHome, configName, configType string) error var Cfg Config type Config struct { - ScriptDir string - ScriptRepoURL string + AquiferDir string + AquiferRepoURL string GitHubUsername string GitHubAccessToken string } @@ -83,12 +83,12 @@ func Load() error { return nil } -func hasScriptDir() bool { - return len(Cfg.ScriptDir) != 0 +func hasAquiferDir() bool { + return len(Cfg.AquiferDir) != 0 } -func SetScriptDir(scriptDir string) error { - viper.Set("ScriptDir", scriptDir) +func SetAquiferDir(aquiferDir string) error { + viper.Set("AquiferDir", aquiferDir) err := viper.WriteConfig() if err != nil { @@ -98,12 +98,12 @@ func SetScriptDir(scriptDir string) error { return viper.Unmarshal(&Cfg) } -func hasScriptRepoURL() bool { - return len(Cfg.ScriptRepoURL) != 0 +func hasAquiferRepoURL() bool { + return len(Cfg.AquiferRepoURL) != 0 } -func SetScriptRepoURL(scriptRepoURL string) error { - viper.Set("ScriptRepoURL", scriptRepoURL) +func SetAquiferRepoURL(aquiferRepoURL string) error { + viper.Set("AquiferRepoURL", aquiferRepoURL) err := viper.WriteConfig() if err != nil { diff --git a/internal/config/survey.go b/internal/config/survey.go index d39ceb5..5d09844 100644 --- a/internal/config/survey.go +++ b/internal/config/survey.go @@ -15,17 +15,17 @@ func SetCfgWithSurvey(setters ...func() error) error { return nil } -func SetScriptDirWithSurvey() error { - if hasScriptDir() { +func SetAquiferDirWithSurvey() error { + if hasAquiferDir() { return nil } - scriptDir, err := stdin.SurveyScriptDir() + aquiferDir, err := stdin.SurveyAquiferDir() if err != nil { return err } - err = SetScriptDir(scriptDir) + err = SetAquiferDir(aquiferDir) if err != nil { return err } @@ -33,17 +33,17 @@ func SetScriptDirWithSurvey() error { return nil } -func SetScriptRepoURLWithSurvey() error { - if hasScriptRepoURL() { +func SetAquiferRepoURLWithSurvey() error { + if hasAquiferRepoURL() { return nil } - scriptRepoURL, err := stdin.SurveyScriptRepoURL() + aquiferRepoURL, err := stdin.SurveyAquiferRepoURL() if err != nil { return err } - err = SetScriptRepoURL(scriptRepoURL.String()) + err = SetAquiferRepoURL(aquiferRepoURL.String()) if err != nil { return err } diff --git a/internal/service/aquifer/aquifer.go b/internal/service/aquifer/aquifer.go new file mode 100644 index 0000000..dd8ffda --- /dev/null +++ b/internal/service/aquifer/aquifer.go @@ -0,0 +1,124 @@ +package aquifer + +import ( + "fmt" + "io" + "os" + "os/exec" + "path/filepath" + "runtime" + + "github.com/anoriqq/qpm/internal/config" + "github.com/fatih/color" + "github.com/goccy/go-yaml" +) + +const ( + envOS = "QPM_OS" + envArch = "QPM_ARCH" +) + +var headerOutput = color.New(color.FgHiCyan).Add(color.Bold) + +type Plan struct { + Dependencies []string + Run []string +} + +type Aquifer struct { + Version string + Name string + Install map[string]Plan + Uninstall map[string]Plan +} + +func Install(pkgName string) error { + err := config.SetCfgWithSurvey( + config.SetAquiferDirWithSurvey, + ) + if err != nil { + return err + } + + aquiferPath, err := getAquiferPath(config.Cfg.AquiferDir, pkgName) + if err != nil { + return err + } + + aquifer, err := getAquifer(aquiferPath) + if err != nil { + return err + } + + plan, err := getPlan(aquifer, runtime.GOOS) + if err != nil { + return err + } + + return installAquifer(plan) +} + +func getAquiferPath(aquiferDir, pkgName string) (string, error) { + aquiferPath, err := filepath.Abs(fmt.Sprintf("%s/%s/latest.yml", aquiferDir, pkgName)) + if err != nil { + return "", err + } + + return aquiferPath, nil +} + +func getAquifer(aquiferPath string) (Aquifer, error) { + _, err := os.Stat(aquiferPath) + if os.IsNotExist(err) { + return Aquifer{}, fmt.Errorf("aquifer not found: %s", aquiferPath) + } + + f, err := os.Open(aquiferPath) + if err != nil { + return Aquifer{}, err + } + defer f.Close() + + bytes, err := io.ReadAll(f) + if err != nil { + return Aquifer{}, err + } + + var aquifer Aquifer + err = yaml.Unmarshal(bytes, &aquifer) + if err != nil { + return Aquifer{}, err + } + + return aquifer, nil +} + +func getPlan(aquifer Aquifer, os string) (Plan, error) { + plan, ok := aquifer.Install[os] + if !ok { + return Plan{}, fmt.Errorf("not declared os: %s", runtime.GOOS) + } + + return plan, nil +} + +func installAquifer(plan Plan) error { + for i, v := range plan.Run { + headerOutput.Printf("[%d] %s\n", i+1, v) + + c := exec.Command("bash", "-c", v) + c.Env = append(c.Env, + fmt.Sprintf("%s=%s", envOS, runtime.GOARCH), + fmt.Sprintf("%s=%s", envArch, runtime.GOOS), + ) + + output, err := c.Output() + if err != nil { + return err + } + + fmt.Printf("%v", string(output)) + } + + return nil +} diff --git a/internal/service/getscript/getscript.go b/internal/service/aquifer/pull.go similarity index 57% rename from internal/service/getscript/getscript.go rename to internal/service/aquifer/pull.go index e30a64a..ec8e385 100644 --- a/internal/service/getscript/getscript.go +++ b/internal/service/aquifer/pull.go @@ -1,4 +1,4 @@ -package getscript +package aquifer import ( "fmt" @@ -10,10 +10,12 @@ import ( "github.com/anoriqq/qpm/internal/stdin" ) -func GetScript() error { +var fileFmt = time.Now().Format("20060102150405") + +func Pull() error { err := config.SetCfgWithSurvey( - config.SetScriptDirWithSurvey, - config.SetScriptRepoURLWithSurvey, + config.SetAquiferDirWithSurvey, + config.SetAquiferRepoURLWithSurvey, config.SetGitHubUsernameWithSurvey, config.SetGitHubAccessTokenWithSurvey, ) @@ -21,12 +23,13 @@ func GetScript() error { return err } - err = stdin.SurveyDeleteScriptDir() + err = stdin.SurveyDeleteAquiferDir() if err != nil { return err } - err = os.Rename(config.Cfg.ScriptDir, fmt.Sprintf("%s.old_%s", config.Cfg.ScriptDir, time.Now().Format("20060102150405"))) + oldName := fmt.Sprintf("%s.old_%s", config.Cfg.AquiferDir, fileFmt) + err = os.Rename(config.Cfg.AquiferDir, oldName) if err != nil && !os.IsNotExist(err) { return err } @@ -36,9 +39,9 @@ func GetScript() error { return err } - fmt.Println(config.Cfg.ScriptRepoURL) + fmt.Println(config.Cfg.AquiferRepoURL) - err = c.Clone(config.Cfg.ScriptDir, config.Cfg.ScriptRepoURL) + err = c.Clone(config.Cfg.AquiferDir, config.Cfg.AquiferRepoURL) if err != nil { return err } diff --git a/internal/service/config/config.go b/internal/service/config/config.go index 2e2b2a4..195d166 100644 --- a/internal/service/config/config.go +++ b/internal/service/config/config.go @@ -20,11 +20,11 @@ func PrintConfig() { func SetConfig(configField, configValue string) error { switch strings.ToLower(configField) { - case "scriptdir": - config.SetScriptDir(configValue) + case "aquiferdir": + config.SetAquiferDir(configValue) return nil - case "scriptrepourl": - config.SetScriptRepoURL(configValue) + case "aquiferrepourl": + config.SetAquiferRepoURL(configValue) return nil case "githubusername": config.SetGitHubUsername(configValue) diff --git a/internal/service/install/install.go b/internal/service/install/install.go deleted file mode 100644 index ca8dc45..0000000 --- a/internal/service/install/install.go +++ /dev/null @@ -1,60 +0,0 @@ -package install - -import ( - "bufio" - "fmt" - "os" - "os/exec" - "path/filepath" - "runtime" - - "github.com/anoriqq/qpm/internal/config" -) - -func Install(pkgName string) error { - err := config.SetCfgWithSurvey( - config.SetScriptDirWithSurvey, - ) - if err != nil { - return err - } - - installScriptPath, err := getInstallScriptPaht(config.Cfg.ScriptDir, pkgName) - if err != nil { - return err - } - - return execInstallScript(installScriptPath) -} - -func getInstallScriptPaht(scriptDir, pkgName string) (string, error) { - installScriptPath, err := filepath.Abs(fmt.Sprintf("%s/%s/latest.sh", scriptDir, pkgName)) - if err != nil { - return "", err - } - - return installScriptPath, nil -} - -func execInstallScript(installScriptPath string) error { - _, err := os.Stat(installScriptPath) - if os.IsNotExist(err) { - return fmt.Errorf("install script not found: %s", installScriptPath) - } - - c := exec.Command("/bin/sh", installScriptPath, "install", runtime.GOOS, runtime.GOARCH) - - stdout, err := c.StdoutPipe() - if err != nil { - return err - } - - c.Start() - - scanner := bufio.NewScanner(stdout) - for scanner.Scan() { - fmt.Println(scanner.Text()) - } - - return c.Wait() -} diff --git a/internal/stdin/stdin.go b/internal/stdin/stdin.go index 1fd9ce4..62d0457 100644 --- a/internal/stdin/stdin.go +++ b/internal/stdin/stdin.go @@ -9,24 +9,24 @@ import ( "github.com/anoriqq/qpm/internal/survey" ) -func SurveyScriptRepoURL() (*url.URL, error) { - msg := "Please enter qpm script repository full URL." +func SurveyAquiferRepoURL() (*url.URL, error) { + msg := "Please enter qpm aquifer repository full URL." - rawScriptRepoURL, err := survey.AskOneInputRequired(msg, "") + rawAquiferRepoURL, err := survey.AskOneInputRequired(msg, "") if err != nil { return nil, err } - scriptRepoURL, err := url.Parse(rawScriptRepoURL) + aquiferRepoURL, err := url.Parse(rawAquiferRepoURL) if err != nil { return nil, err } - return scriptRepoURL, nil + return aquiferRepoURL, nil } -func SurveyDeleteScriptDir() error { - msg := "Do you want to replace the script dir and continue?" +func SurveyDeleteAquiferDir() error { + msg := "Do you want to replace the aquifer dir and continue?" canDelete, err := survey.AskOneConfirm(msg, false) if err != nil { @@ -34,7 +34,7 @@ func SurveyDeleteScriptDir() error { } if !canDelete { - return errors.New("to clone the script repository, the script dir must be deleted") + return errors.New("to clone the aquifer repository, the aquifer dir must be deleted") } return nil @@ -62,7 +62,7 @@ func SurveyGitHubAccessToken() (string, error) { return githubAccessToken, nil } -func SurveyScriptDir() (string, error) { +func SurveyAquiferDir() (string, error) { home, err := os.UserHomeDir() if err != nil { return "", err @@ -70,12 +70,12 @@ func SurveyScriptDir() (string, error) { def := filepath.Join(home, ".qpm") - msg := "Please enter qpm script path." + msg := "Please enter qpm aquifer path." - scriptDir, err := survey.AskOneInputRequired(msg, def) + aquiferDir, err := survey.AskOneInputRequired(msg, def) if err != nil { return "", err } - return scriptDir, nil + return aquiferDir, nil }