forked from coop-cloud/abra
Compare commits
495 Commits
Author | SHA1 | Date |
---|---|---|
knoflook | f432bfdd23 | |
Comrade Renovate Bot | 848e17578d | |
decentral1se | 1615130929 | |
decentral1se | 7f315315f0 | |
decentral1se | 6a50981120 | |
decentral1se | c67471e6ca | |
decentral1se | f0fc1027e5 | |
decentral1se | c66695d55e | |
decentral1se | 262009701e | |
decentral1se | b31cb6b866 | |
decentral1se | f39e186b66 | |
decentral1se | a8f35bdf2f | |
decentral1se | 6e1e02ac28 | |
decentral1se | 16fc5ee54b | |
decentral1se | 37a1fcc4af | |
decentral1se | a9b522719f | |
decentral1se | ce70932a1c | |
decentral1se | d61e104536 | |
decentral1se | d5f30a3ae4 | |
decentral1se | 2555096510 | |
decentral1se | 3797292b20 | |
decentral1se | 6333815b71 | |
decentral1se | 793a850fd5 | |
decentral1se | 42c1450384 | |
decentral1se | a2377882f6 | |
decentral1se | e78b395662 | |
decentral1se | cdec834ca9 | |
decentral1se | b4b0b464bd | |
decentral1se | d8a1b0ccc1 | |
decentral1se | 3fbd381f55 | |
decentral1se | d3e127e5c8 | |
decentral1se | e9cfb076c6 | |
decentral1se | 8ccf856110 | |
decentral1se | d0945aa09d | |
decentral1se | 123619219e | |
decentral1se | a27410952e | |
Comrade Renovate Bot | 13e0392af6 | |
Comrade Renovate Bot | 99a6135f72 | |
decentral1se | a6b52c1354 | |
Comrade Renovate Bot | fa51459191 | |
decentral1se | c529988427 | |
decentral1se | 231cc3c718 | |
decentral1se | 3381b8936d | |
decentral1se | 823f869f1d | |
decentral1se | ecbeacf10f | |
decentral1se | 3f838038d5 | |
Comrade Renovate Bot | 91b4e021d0 | |
decentral1se | 598e87dca2 | |
decentral1se | 001511876d | |
decentral1se | b295958c17 | |
decentral1se | 2fbdcfb958 | |
decentral1se | 09ac74d205 | |
decentral1se | 5da4afa0ec | |
decentral1se | 9d5e805748 | |
Comrade Renovate Bot | 770ae5ed9b | |
decentral1se | e056d8dc44 | |
decentral1se | c3442354e7 | |
decentral1se | 6b2a0011af | |
decentral1se | 46fca7cfa7 | |
decentral1se | 82d560a946 | |
decentral1se | fc5107865b | |
decentral1se | 53ed1fc545 | |
Comrade Renovate Bot | cc9e3d4e60 | |
decentral1se | 0557284461 | |
decentral1se | b5f23d3791 | |
decentral1se | 2b2dcc01b4 | |
decentral1se | 0a208d049e | |
decentral1se | 141711ecd0 | |
Comrade Renovate Bot | cd46d71ce4 | |
Comrade Renovate Bot | 6fa090352d | |
decentral1se | 227c02cd09 | |
decentral1se | bfeda40e34 | |
decentral1se | 5237c7ed50 | |
decentral1se | 4e09f3b9a8 | |
decentral1se | dfb32cbb68 | |
decentral1se | bdd9b0a1aa | |
decentral1se | b2d17a1829 | |
decentral1se | c905376472 | |
decentral1se | d316de218c | |
decentral1se | 123475bd36 | |
decentral1se | 58e98f490d | |
decentral1se | 224b8865bf | |
decentral1se | 8fb9f42f13 | |
decentral1se | dc5e2a5b24 | |
decentral1se | 40b4ef5ab2 | |
decentral1se | 4a912ae3bc | |
decentral1se | 1150fcc595 | |
decentral1se | 45224d1349 | |
decentral1se | 7a40e2d616 | |
decentral1se | 2277e4ef72 | |
decentral1se | c0c3d9fe76 | |
decentral1se | 2493921ade | |
decentral1se | 22f9cf2be4 | |
decentral1se | a23124aede | |
decentral1se | e670844b56 | |
decentral1se | bc1729c5ca | |
decentral1se | fa8611b115 | |
decentral1se | 415df981ff | |
knoflook | 57728e58e8 | |
decentral1se | c7062e0494 | |
decentral1se | cff7534bf9 | |
decentral1se | 13e582349c | |
decentral1se | b1b9612e01 | |
decentral1se | afeee1270e | |
decentral1se | cb210d0c81 | |
decentral1se | 9f2bb3f74f | |
decentral1se | a33767f848 | |
decentral1se | a1abe5c6be | |
decentral1se | 672b44f965 | |
decentral1se | 6d9573ec7e | |
decentral1se | 53cd3b8b71 | |
decentral1se | b9ec41647b | |
decentral1se | f4b563528f | |
decentral1se | f9a2c1d58f | |
decentral1se | 7a66a90ecb | |
decentral1se | 0e688f1407 | |
decentral1se | c6db9ee355 | |
decentral1se | 7733637767 | |
decentral1se | 88f9796aaf | |
decentral1se | 6cdba0f9de | |
decentral1se | 199aa5f4e3 | |
decentral1se | 9b26c24a5f | |
decentral1se | ca75654769 | |
decentral1se | fc2d83d203 | |
decentral1se | 2f4f288a46 | |
decentral1se | e98f00d354 | |
Comrade Renovate Bot | b4c2773b87 | |
decentral1se | 3aec5d1d7e | |
decentral1se | e0fa1b6995 | |
decentral1se | b69ab0df65 | |
decentral1se | 69a7d37fb7 | |
decentral1se | 87649cbbd0 | |
decentral1se | 4b7ec6384c | |
decentral1se | b22b63c2ba | |
decentral1se | d9f3a11265 | |
decentral1se | d7cf11b876 | |
decentral1se | d7e1b2947a | |
decentral1se | 1b37d2d5f5 | |
decentral1se | 74dfb12fd6 | |
decentral1se | 49ccf2d204 | |
decentral1se | 76adc45431 | |
decentral1se | e38a0078f3 | |
decentral1se | 25b44dc54e | |
decentral1se | 0c2f6fb676 | |
decentral1se | 10e4a8b97f | |
decentral1se | eed2756784 | |
decentral1se | b61b8f0d2a | |
decentral1se | 763e7b5bff | |
decentral1se | d5ab9aedbf | |
decentral1se | 2ebb00c9d4 | |
decentral1se | 6d76b3646a | |
decentral1se | 636dc82258 | |
decentral1se | 66d5453248 | |
decentral1se | ba9abcb0d7 | |
decentral1se | a1cbf21f61 | |
decentral1se | bd1da39374 | |
decentral1se | 8b90519bc9 | |
decentral1se | 65feda7f1d | |
decentral1se | 64e223a810 | |
decentral1se | 379e01d855 | |
decentral1se | a421c0dca5 | |
decentral1se | abf56f9054 | |
decentral1se | 4dec3c4646 | |
decentral1se | c900cebc30 | |
decentral1se | 30209de3e2 | |
decentral1se | 625747d048 | |
decentral1se | a71b070921 | |
decentral1se | 33ff04c686 | |
decentral1se | c69a3c23c5 | |
decentral1se | 0b46909961 | |
decentral1se | 832e8e5a96 | |
decentral1se | abf83aa641 | |
decentral1se | 1df69aa259 | |
decentral1se | 7596a67ad5 | |
decentral1se | 93c7612efc | |
decentral1se | 2c78ac22e0 | |
decentral1se | 13661c72ce | |
decentral1se | 454092644a | |
decentral1se | 224c0c38db | |
decentral1se | 560e0eab86 | |
decentral1se | b92fdbbd52 | |
decentral1se | 0a550363b8 | |
decentral1se | 3119220c21 | |
decentral1se | 49f565e5db | |
decentral1se | 94522178b1 | |
decentral1se | 810bc27967 | |
decentral1se | 35d95fb9fb | |
decentral1se | d26fabe8ef | |
decentral1se | 84bf3ffa50 | |
decentral1se | 575485ec7a | |
decentral1se | 0b17292219 | |
decentral1se | fffd8b2647 | |
decentral1se | c07128b308 | |
decentral1se | 929ff88013 | |
decentral1se | 0353427c71 | |
decentral1se | 7a0d18ceb6 | |
decentral1se | 8992050409 | |
decentral1se | abd094387f | |
decentral1se | a556ca625b | |
decentral1se | 1b7836009f | |
decentral1se | eb3509ab3f | |
decentral1se | 87851d26f7 | |
decentral1se | c4f344b50a | |
decentral1se | 60e4dfd9cb | |
decentral1se | d957adb675 | |
decentral1se | 5254af0fe4 | |
decentral1se | ce96269be0 | |
decentral1se | 299276c383 | |
decentral1se | 866cdd1f29 | |
decentral1se | 95d385c420 | |
decentral1se | 605e2553b8 | |
decentral1se | 1245827dff | |
decentral1se | 9bdb07463c | |
decentral1se | be26f80f03 | |
decentral1se | 930ff68bb2 | |
decentral1se | 62441acf03 | |
decentral1se | 7460668ef4 | |
decentral1se | 047d0e6fbc | |
decentral1se | 8785f66391 | |
decentral1se | 24882e95b4 | |
decentral1se | 1fd0941239 | |
decentral1se | 26a11533b4 | |
decentral1se | b4f48c3c59 | |
decentral1se | 43e68a99b0 | |
decentral1se | bac6fb0fa8 | |
decentral1se | dc9c9715ce | |
decentral1se | 1f91b3bb03 | |
decentral1se | a700aca23d | |
decentral1se | 5cacd09a04 | |
decentral1se | 6a98024a2b | |
decentral1se | e85117be22 | |
decentral1se | fb24357d38 | |
decentral1se | f5d2d3adf6 | |
decentral1se | 07119b0575 | |
decentral1se | d2a6e35986 | |
decentral1se | 0aa37fcee8 | |
decentral1se | eb1b6be4c5 | |
decentral1se | b98397144a | |
decentral1se | 4c186678b8 | |
decentral1se | b1d9d9d858 | |
decentral1se | a06043375d | |
decentral1se | 3eef1e8587 | |
decentral1se | 37e48f262b | |
decentral1se | 06cc5d1cc3 | |
decentral1se | c13f438580 | |
decentral1se | 5cd4317580 | |
decentral1se | 2ba1ec3df0 | |
decentral1se | 34cdb9c9d8 | |
decentral1se | 9c281d8608 | |
decentral1se | 321ba1e0ec | |
decentral1se | c5a74e9f6b | |
decentral1se | f8191ac248 | |
decentral1se | 027c8a1420 | |
decentral1se | cdc08ae95a | |
decentral1se | 3f35510507 | |
decentral1se | 9f70a69bbf | |
decentral1se | b0834925a3 | |
decentral1se | 86d87253c5 | |
decentral1se | 17340a79da | |
decentral1se | 779c810521 | |
decentral1se | 9cc2554846 | |
decentral1se | 9a1cf258a5 | |
decentral1se | ba8138079f | |
decentral1se | 8735a8f0ea | |
decentral1se | a84a5bc320 | |
decentral1se | ae0e7b8e4c | |
decentral1se | c0caf14d74 | |
decentral1se | d66c558b5c | |
decentral1se | c8541e1b9d | |
decentral1se | 653b6c6d49 | |
decentral1se | e2c3bc35c3 | |
decentral1se | 6937bfbb0d | |
decentral1se | decfe095fe | |
decentral1se | 4283f130a2 | |
decentral1se | 3b5354b2a5 | |
decentral1se | 14400d4ed8 | |
decentral1se | dddf84d92b | |
decentral1se | fefb042716 | |
decentral1se | ab8db8df64 | |
decentral1se | 20f7a18caa | |
decentral1se | 58a24a50e1 | |
decentral1se | e839f100df | |
decentral1se | 41a757b7ed | |
decentral1se | 4b4298caf1 | |
decentral1se | 8e8c241fdf | |
decentral1se | 9b8ff1ddcd | |
decentral1se | a85cfe40d0 | |
decentral1se | fc29ca6fce | |
decentral1se | cfb02f45ed | |
decentral1se | 696172ad48 | |
decentral1se | 4089949a3f | |
decentral1se | a75b01e78a | |
decentral1se | 014d32112e | |
decentral1se | a7894cbda9 | |
decentral1se | e03761f251 | |
decentral1se | 190c1033e6 | |
decentral1se | 15d1e9dee0 | |
decentral1se | 0362928840 | |
decentral1se | 844961d016 | |
decentral1se | d0cc51b829 | |
decentral1se | 606b5ac3e4 | |
KawaiiPunk | 6f1bf258b3 | |
decentral1se | 7a5aa1b005 | |
decentral1se | db453f0ab1 | |
decentral1se | a07e71f7df | |
decentral1se | 4c6d52c426 | |
decentral1se | 327c5adef2 | |
decentral1se | 0dc8425a27 | |
decentral1se | 48c965bb21 | |
decentral1se | 5513754c22 | |
decentral1se | 3a27d9d9fb | |
decentral1se | 04b58230ea | |
decentral1se | 1b9097f9f3 | |
decentral1se | 3d100093dc | |
decentral1se | ef4383209e | |
decentral1se | 74f688350b | |
decentral1se | 737a22aacc | |
decentral1se | 56a1e7f8c4 | |
decentral1se | 6be2f36334 | |
decentral1se | a18d0e290d | |
decentral1se | 7e0feec311 | |
decentral1se | 29a4d05944 | |
decentral1se | b72bad955a | |
decentral1se | e9b4541c91 | |
decentral1se | 5b1b16d64a | |
decentral1se | ec7223146b | |
decentral1se | fa45264ea0 | |
decentral1se | f57222d6aa | |
decentral1se | 28d10928a4 | |
decentral1se | 0f4da38f98 | |
Comrade Renovate Bot | 11c2d1efe6 | |
decentral1se | 2b1cc9f6dd | |
decentral1se | 6100a636a6 | |
decentral1se | ddbf923338 | |
decentral1se | c1a00520dc | |
decentral1se | 0dc4b2beef | |
decentral1se | f75284364d | |
decentral1se | fbc3b48d39 | |
decentral1se | 6f0d8b190d | |
decentral1se | fc3742212c | |
decentral1se | fccbd7c7d7 | |
decentral1se | 2457b5fe95 | |
decentral1se | 72df640d99 | |
decentral1se | ae9e66c319 | |
decentral1se | 3589a7d56e | |
decentral1se | 8d499c0810 | |
decentral1se | cb2bb3f532 | |
decentral1se | 0a903f041f | |
decentral1se | 053a06ccba | |
decentral1se | 398deec272 | |
decentral1se | bf82bc9c7f | |
decentral1se | 217d4bc2cc | |
decentral1se | 9c8e6b63a6 | |
decentral1se | 5113db1612 | |
decentral1se | 66666e30b7 | |
decentral1se | 88d4984248 | |
decentral1se | bc34be4357 | |
decentral1se | 3d1aa55587 | |
decentral1se | e7469acf5b | |
decentral1se | a293179e89 | |
decentral1se | b912e73c5e | |
decentral1se | 4c66e44b3a | |
decentral1se | 033bad3d10 | |
decentral1se | a750344653 | |
decentral1se | f5caf5587a | |
decentral1se | fdc9e8b5fd | |
decentral1se | 75edcabb23 | |
decentral1se | fa0a63c11d | |
decentral1se | 3d3eefb2fe | |
decentral1se | 6998a87eef | |
decentral1se | b71a379788 | |
decentral1se | ba217dccbd | |
decentral1se | 45259b3266 | |
decentral1se | 59b80d5def | |
decentral1se | 8f6e1de1a1 | |
decentral1se | cd0d3b8892 | |
decentral1se | 0d1f65daac | |
decentral1se | cf1b46fa61 | |
decentral1se | 0fe0ffbafa | |
decentral1se | af3def7267 | |
decentral1se | c7de9c0719 | |
decentral1se | cf5ee4e682 | |
decentral1se | 9ddf69b988 | |
decentral1se | a925da8dee | |
decentral1se | 06f8078866 | |
decentral1se | 467947edf2 | |
decentral1se | 512cd9d85b | |
decentral1se | b8e2d1de67 | |
decentral1se | 3b7a8e6498 | |
decentral1se | 5bae262a79 | |
decentral1se | 6ad253b866 | |
Comrade Renovate Bot | b603069514 | |
Comrade Renovate Bot | d999cedd97 | |
decentral1se | 8215bb455b | |
decentral1se | 37ab9a9c08 | |
decentral1se | 48dd9cdeed | |
decentral1se | d02e1f247f | |
decentral1se | d087a60e09 | |
decentral1se | 48e16c414c | |
decentral1se | f3e55e5023 | |
decentral1se | ae6adace50 | |
decentral1se | 32dcddb631 | |
decentral1se | 3dbd343600 | |
decentral1se | 8393f4b134 | |
decentral1se | 8e56607cc9 | |
decentral1se | 85a543afac | |
decentral1se | 665396b679 | |
decentral1se | 870c561fee | |
decentral1se | 3fb43ffa2c | |
decentral1se | 2bc2f8630b | |
decentral1se | 6094dfaf92 | |
decentral1se | 3789e56404 | |
decentral1se | 2db5378418 | |
decentral1se | 7d8f3f1fab | |
knoflook | 9be78bc5fa | |
knoflook | 6c87d501e6 | |
decentral1se | 930c29f4a2 | |
decentral1se | 1d6c3e98e4 | |
decentral1se | a90f3b7463 | |
decentral1se | 962f566228 | |
decentral1se | 9896c57399 | |
decentral1se | 748d607ddc | |
decentral1se | 3901258a96 | |
decentral1se | 4347083f98 | |
decentral1se | 4641a942d8 | |
3wc | 759a00eeb3 | |
3wc | d1526fad21 | |
knoflook | 6ef15e0a26 | |
decentral1se | dd0f328a65 | |
decentral1se | aea5cc69c3 | |
3wc | b02475eca5 | |
3wc | d0a30f6b7b | |
3wc | 8635922b9f | |
3wc | 9d62fff074 | |
decentral1se | 711c4e5ee8 | |
decentral1se | cb32e88cde | |
decentral1se | a18729bf98 | |
decentral1se | dbf84b7640 | |
3wc | 75db249053 | |
decentral1se | fdf4fc6737 | |
decentral1se | ef6a9abba9 | |
decentral1se | ce57d5ed54 | |
decentral1se | 3b01b1bb2e | |
decentral1se | fbdb792795 | |
decentral1se | 900f40f07a | |
decentral1se | ecd2a63f0a | |
decentral1se | 304b70639f | |
decentral1se | d821975aa2 | |
decentral1se | 1b836dbab6 | |
decentral1se | fc51cf7775 | |
decentral1se | a7ebcd8950 | |
decentral1se | e589709cb0 | |
decentral1se | 56c3e070f5 | |
decentral1se | cc37615d83 | |
decentral1se | 0b37f63248 | |
Comrade Renovate Bot | 9c3a06a7d9 | |
Comrade Renovate Bot | cdef8b5ea5 | |
Comrade Renovate Bot | cba261b18c | |
decentral1se | 1f6e4fa4a3 | |
decentral1se | 4a245c3e02 | |
knoflook | 299faa1adf | |
decentral1se | 704e773a16 | |
decentral1se | 7143d09fd4 | |
decentral1se | 4e76d49c80 | |
decentral1se | c9dff0c3bd | |
decentral1se | e77e72a9e6 | |
Comrade Renovate Bot | af6f759c92 | |
Comrade Renovate Bot | 034295332c | |
Comrade Renovate Bot | dac2489e6d | |
Comrade Renovate Bot | 7bdc1946a2 | |
Comrade Renovate Bot | 2439643895 | |
Comrade Renovate Bot | 0876f677d1 | |
Comrade Renovate Bot | 31dafb3ae4 | |
decentral1se | 915083b426 | |
decentral1se | 486a1717e7 | |
decentral1se | 9122c0a9b8 | |
decentral1se | 85ff04202f | |
decentral1se | ecba4e01f1 | |
decentral1se | 751b187df6 | |
decentral1se | f74261dbe6 | |
Comrade Renovate Bot | 2600a8137c | |
decentral1se | b6a6163eff | |
knoflook | c25b2b17df | |
decentral1se | 713308e0b8 | |
decentral1se | fcbf41ee95 | |
knoflook | 5add4ccc1b | |
knoflook | 9220a8c09b | |
decentral1se | f78a04109c | |
decentral1se | b67ad02f87 | |
decentral1se | 215431696e | |
decentral1se | cd361237e7 | |
decentral1se | db10c7b849 | |
decentral1se | d38f82ebe7 | |
decentral1se | 59031595ea | |
decentral1se | 6f26b51f3e |
10
.drone.yml
10
.drone.yml
|
@ -3,12 +3,12 @@ kind: pipeline
|
||||||
name: coopcloud.tech/abra
|
name: coopcloud.tech/abra
|
||||||
steps:
|
steps:
|
||||||
- name: make check
|
- name: make check
|
||||||
image: golang:1.17
|
image: golang:1.18
|
||||||
commands:
|
commands:
|
||||||
- make check
|
- make check
|
||||||
|
|
||||||
- name: make static
|
- name: make static
|
||||||
image: golang:1.17
|
image: golang:1.18
|
||||||
ignore: true # until we decide we all want this check
|
ignore: true # until we decide we all want this check
|
||||||
environment:
|
environment:
|
||||||
STATIC_CHECK_URL: honnef.co/go/tools/cmd/staticcheck
|
STATIC_CHECK_URL: honnef.co/go/tools/cmd/staticcheck
|
||||||
|
@ -18,12 +18,12 @@ steps:
|
||||||
- make static
|
- make static
|
||||||
|
|
||||||
- name: make build
|
- name: make build
|
||||||
image: golang:1.17
|
image: golang:1.18
|
||||||
commands:
|
commands:
|
||||||
- make build
|
- make build
|
||||||
|
|
||||||
- name: make test
|
- name: make test
|
||||||
image: golang:1.17
|
image: golang:1.18
|
||||||
commands:
|
commands:
|
||||||
- make test
|
- make test
|
||||||
|
|
||||||
|
@ -55,7 +55,7 @@ steps:
|
||||||
event: tag
|
event: tag
|
||||||
|
|
||||||
- name: release
|
- name: release
|
||||||
image: golang:1.17
|
image: golang:1.18
|
||||||
environment:
|
environment:
|
||||||
GITEA_TOKEN:
|
GITEA_TOKEN:
|
||||||
from_secret: goreleaser_gitea_token
|
from_secret: goreleaser_gitea_token
|
||||||
|
|
|
@ -0,0 +1,4 @@
|
||||||
|
GANDI_TOKEN=...
|
||||||
|
HCLOUD_TOKEN=...
|
||||||
|
REGISTRY_PASSWORD=...
|
||||||
|
REGISTRY_USERNAME=...
|
|
@ -1,6 +1,8 @@
|
||||||
abra
|
|
||||||
.vscode/
|
|
||||||
vendor/
|
|
||||||
.envrc
|
|
||||||
dist/
|
|
||||||
*fmtcoverage.html
|
*fmtcoverage.html
|
||||||
|
.e2e.env
|
||||||
|
.envrc
|
||||||
|
.vscode/
|
||||||
|
abra
|
||||||
|
dist/
|
||||||
|
tests/integration/.abra/catalogue
|
||||||
|
vendor/
|
||||||
|
|
|
@ -0,0 +1,10 @@
|
||||||
|
# authors
|
||||||
|
|
||||||
|
> If you're looking at this and you hack on Abra and you're not listed here,
|
||||||
|
> please do add yourself! This is a community project, let's show
|
||||||
|
|
||||||
|
- 3wordchant
|
||||||
|
- decentral1se
|
||||||
|
- kawaiipunk
|
||||||
|
- knoflook
|
||||||
|
- roxxers
|
2
Makefile
2
Makefile
|
@ -5,7 +5,7 @@ LDFLAGS := "-X 'main.Commit=$(COMMIT)'"
|
||||||
DIST_LDFLAGS := $(LDFLAGS)" -s -w"
|
DIST_LDFLAGS := $(LDFLAGS)" -s -w"
|
||||||
export GOPRIVATE=coopcloud.tech
|
export GOPRIVATE=coopcloud.tech
|
||||||
|
|
||||||
all: run test install build clean format check static
|
all: format check static build test
|
||||||
|
|
||||||
run:
|
run:
|
||||||
@go run -ldflags=$(LDFLAGS) $(ABRA)
|
@go run -ldflags=$(LDFLAGS) $(ABRA)
|
||||||
|
|
53
README.md
53
README.md
|
@ -7,55 +7,6 @@
|
||||||
|
|
||||||
The Co-op Cloud utility belt 🎩🐇
|
The Co-op Cloud utility belt 🎩🐇
|
||||||
|
|
||||||
`abra` is a command-line tool for managing your own [Co-op Cloud](https://coopcloud.tech). It can provision new servers, create apps, deploy them, run backup and restore operations and a whole lot of other things. Please see [docs.coopcloud.tech](https://docs.coopcloud.tech) for more extensive documentation.
|
`abra` is our flagship client & command-line tool which has been developed specifically in the context of the Co-op Cloud project for the purpose of making day-to-day operations for [operators](https://docs.coopcloud.tech/operators/) and [maintainers](https://docs.coopcloud.tech/maintainers/) as convenient as possible. It is libre software, written in [Go](https://go.dev) and maintained and extended by the community ❤
|
||||||
|
|
||||||
## Hacking
|
Please see [docs.coopcloud.tech/abra/](https://docs.coopcloud.tech/abra/) for help on install, upgrade, hacking, troubleshooting & more!
|
||||||
|
|
||||||
### Getting started
|
|
||||||
|
|
||||||
Install [direnv](https://direnv.net), run `cp .envrc.sample .envrc`, then run `direnv allow` in this directory. This will set coopcloud repos as private due to [this bug.](https://git.coopcloud.tech/coop-cloud/coopcloud.tech/issues/20#issuecomment-8201). Or you can run `go env -w GOPRIVATE=coopcloud.tech` but I'm not sure how persistent this is.
|
|
||||||
|
|
||||||
Install [Go >= 1.16](https://golang.org/doc/install) and then:
|
|
||||||
|
|
||||||
- `make build` to build
|
|
||||||
- `./abra` to run commands
|
|
||||||
- `make test` will run tests
|
|
||||||
- `make install` will install it to `$GOPATH/bin`
|
|
||||||
- `go get <package>` and `go mod tidy` to add a new dependency
|
|
||||||
|
|
||||||
Our [Drone CI configuration](.drone.yml) runs a number of sanity on each pushed commit. See the [Makefile](./Makefile) for more handy targets.
|
|
||||||
|
|
||||||
Please use the [conventional commit format](https://www.conventionalcommits.org/en/v1.0.0/) for your commits so we can automate our change log.
|
|
||||||
|
|
||||||
### Versioning
|
|
||||||
|
|
||||||
We use [goreleaser](https://goreleaser.com) to help us automate releases. We use [semver](https://semver.org) for versioning all releases of the tool. While we are still in the public alpha release phase, we will maintain a `0.y.z-alpha` format. Change logs are generated from our commit logs. We are still working this out and aim to refine our release praxis as we go.
|
|
||||||
|
|
||||||
For developers, while using this `-alpha` format, the `y` part is the "major" version part. So, if you make breaking changes, you increment that and _not_ the `x` part. So, if you're on `0.1.0-alpha`, then you'd go to `0.1.1-alpha` for a backwards compatible change and `0.2.0-alpha` for a backwards incompatible change.
|
|
||||||
|
|
||||||
### Making a new release
|
|
||||||
|
|
||||||
- Change `ABRA_VERSION` to match the new tag in [`scripts`](./scripts/installer/installer) (use [semver](https://semver.org))
|
|
||||||
- Commit that change (e.g. `git commit -m 'chore: publish next tag x.y.z-alpha'`)
|
|
||||||
- Make a new tag (e.g. `git tag -a x.y.z-alpha`)
|
|
||||||
- Push the new tag (e.g. `git push && git push --tags`)
|
|
||||||
- Wait until the build finishes on [build.coopcloud.tech](https://build.coopcloud.tech/coop-cloud/abra)
|
|
||||||
- Deploy the new installer script (e.g. `cd ./scripts/installer && make`)
|
|
||||||
- Check the release worked, (e.g. `abra upgrade; abra -v`)
|
|
||||||
|
|
||||||
### Fork maintenance
|
|
||||||
|
|
||||||
#### `godotenv`
|
|
||||||
|
|
||||||
We maintain a fork of [godotenv](https://github.com/Autonomic-Cooperative/godotenv) for two features:
|
|
||||||
|
|
||||||
1. multi-line env var support
|
|
||||||
2. inline comment parsing
|
|
||||||
|
|
||||||
You can upgrade the version here by running `go get github.com/Autonomic-Cooperative/godotenv@<commit>` where `<commit>` is the
|
|
||||||
latest commit you want to pin to. We are aiming to migrate to YAML format for the environment configuration, so this should only
|
|
||||||
be a temporary thing.
|
|
||||||
|
|
||||||
#### `docker/client`
|
|
||||||
|
|
||||||
A number of modules in [pkg/upstream](./pkg/upstream) are copy/pasta'd from the upstream [docker/docker/client](https://pkg.go.dev/github.com/docker/docker/client). We had to do this because upstream are not exposing their API as public.
|
|
||||||
|
|
|
@ -1,28 +1,22 @@
|
||||||
package app
|
package app
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"github.com/urfave/cli/v2"
|
"github.com/urfave/cli"
|
||||||
)
|
)
|
||||||
|
|
||||||
// AppCommand defines the `abra app` command and ets subcommands
|
var AppCommand = cli.Command{
|
||||||
var AppCommand = &cli.Command{
|
Name: "app",
|
||||||
Name: "app",
|
Aliases: []string{"a"},
|
||||||
Usage: "Manage deployed apps",
|
Usage: "Manage apps",
|
||||||
Aliases: []string{"a"},
|
ArgsUsage: "<domain>",
|
||||||
ArgsUsage: "<app>",
|
Description: "This command provides functionality for managing the life cycle of your apps",
|
||||||
Description: `
|
Subcommands: []cli.Command{
|
||||||
This command provides all the functionality you need to manage the life cycle
|
|
||||||
of your apps. From initial deployment, day-2 operations (e.g. backup/restore)
|
|
||||||
to scaling apps up and spinning them down.
|
|
||||||
`,
|
|
||||||
Subcommands: []*cli.Command{
|
|
||||||
appNewCommand,
|
appNewCommand,
|
||||||
appConfigCommand,
|
appConfigCommand,
|
||||||
|
appRestartCommand,
|
||||||
appDeployCommand,
|
appDeployCommand,
|
||||||
appUpgradeCommand,
|
appUpgradeCommand,
|
||||||
appUndeployCommand,
|
appUndeployCommand,
|
||||||
appBackupCommand,
|
|
||||||
appRestoreCommand,
|
|
||||||
appRemoveCommand,
|
appRemoveCommand,
|
||||||
appCheckCommand,
|
appCheckCommand,
|
||||||
appListCommand,
|
appListCommand,
|
||||||
|
@ -34,5 +28,6 @@ to scaling apps up and spinning them down.
|
||||||
appSecretCommand,
|
appSecretCommand,
|
||||||
appVolumeCommand,
|
appVolumeCommand,
|
||||||
appVersionCommand,
|
appVersionCommand,
|
||||||
|
appErrorsCommand,
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,87 +0,0 @@
|
||||||
package app
|
|
||||||
|
|
||||||
import (
|
|
||||||
"errors"
|
|
||||||
"fmt"
|
|
||||||
"io/ioutil"
|
|
||||||
"os"
|
|
||||||
"os/exec"
|
|
||||||
"path"
|
|
||||||
"strings"
|
|
||||||
|
|
||||||
"coopcloud.tech/abra/cli/internal"
|
|
||||||
"coopcloud.tech/abra/pkg/config"
|
|
||||||
"github.com/sirupsen/logrus"
|
|
||||||
"github.com/urfave/cli/v2"
|
|
||||||
)
|
|
||||||
|
|
||||||
var backupAllServices bool
|
|
||||||
var backupAllServicesFlag = &cli.BoolFlag{
|
|
||||||
Name: "all",
|
|
||||||
Value: false,
|
|
||||||
Destination: &backupAllServices,
|
|
||||||
Aliases: []string{"a"},
|
|
||||||
Usage: "Backup all services",
|
|
||||||
}
|
|
||||||
|
|
||||||
var appBackupCommand = &cli.Command{
|
|
||||||
Name: "backup",
|
|
||||||
Usage: "Backup an app",
|
|
||||||
Aliases: []string{"b"},
|
|
||||||
Flags: []cli.Flag{backupAllServicesFlag},
|
|
||||||
ArgsUsage: "<service>",
|
|
||||||
Action: func(c *cli.Context) error {
|
|
||||||
app := internal.ValidateApp(c)
|
|
||||||
|
|
||||||
if c.Args().Get(1) != "" && backupAllServices {
|
|
||||||
internal.ShowSubcommandHelpAndError(c, errors.New("cannot use '<service>' and '--all' together"))
|
|
||||||
}
|
|
||||||
|
|
||||||
abraSh := path.Join(config.ABRA_DIR, "apps", app.Type, "abra.sh")
|
|
||||||
if _, err := os.Stat(abraSh); err != nil {
|
|
||||||
if os.IsNotExist(err) {
|
|
||||||
logrus.Fatalf("'%s' does not exist?", abraSh)
|
|
||||||
}
|
|
||||||
logrus.Fatal(err)
|
|
||||||
}
|
|
||||||
|
|
||||||
sourceCmd := fmt.Sprintf("source %s", abraSh)
|
|
||||||
|
|
||||||
execCmd := "abra_backup"
|
|
||||||
if !backupAllServices {
|
|
||||||
serviceName := c.Args().Get(1)
|
|
||||||
if serviceName == "" {
|
|
||||||
internal.ShowSubcommandHelpAndError(c, errors.New("no service(s) target provided"))
|
|
||||||
}
|
|
||||||
execCmd = fmt.Sprintf("abra_backup_%s", serviceName)
|
|
||||||
}
|
|
||||||
|
|
||||||
bytes, err := ioutil.ReadFile(abraSh)
|
|
||||||
if err != nil {
|
|
||||||
logrus.Fatal(err)
|
|
||||||
}
|
|
||||||
if !strings.Contains(string(bytes), execCmd) {
|
|
||||||
logrus.Fatalf("%s doesn't have a '%s' function", app.Type, execCmd)
|
|
||||||
}
|
|
||||||
|
|
||||||
sourceAndExec := fmt.Sprintf("%s; %s", sourceCmd, execCmd)
|
|
||||||
cmd := exec.Command("bash", "-c", sourceAndExec)
|
|
||||||
if err := internal.RunCmd(cmd); err != nil {
|
|
||||||
logrus.Fatal(err)
|
|
||||||
}
|
|
||||||
|
|
||||||
return nil
|
|
||||||
},
|
|
||||||
BashComplete: func(c *cli.Context) {
|
|
||||||
appNames, err := config.GetAppNames()
|
|
||||||
if err != nil {
|
|
||||||
logrus.Warn(err)
|
|
||||||
}
|
|
||||||
if c.NArg() > 0 {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
for _, a := range appNames {
|
|
||||||
fmt.Println(a)
|
|
||||||
}
|
|
||||||
},
|
|
||||||
}
|
|
|
@ -1,29 +1,33 @@
|
||||||
package app
|
package app
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"fmt"
|
|
||||||
"os"
|
"os"
|
||||||
"path"
|
"path"
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
"coopcloud.tech/abra/cli/internal"
|
"coopcloud.tech/abra/cli/internal"
|
||||||
|
"coopcloud.tech/abra/pkg/autocomplete"
|
||||||
"coopcloud.tech/abra/pkg/config"
|
"coopcloud.tech/abra/pkg/config"
|
||||||
"github.com/sirupsen/logrus"
|
"github.com/sirupsen/logrus"
|
||||||
"github.com/urfave/cli/v2"
|
"github.com/urfave/cli"
|
||||||
)
|
)
|
||||||
|
|
||||||
var appCheckCommand = &cli.Command{
|
var appCheckCommand = cli.Command{
|
||||||
Name: "check",
|
Name: "check",
|
||||||
Usage: "Check if app is configured correctly",
|
|
||||||
Aliases: []string{"c"},
|
Aliases: []string{"c"},
|
||||||
ArgsUsage: "<service>",
|
Usage: "Check if app is configured correctly",
|
||||||
|
ArgsUsage: "<domain>",
|
||||||
|
Flags: []cli.Flag{
|
||||||
|
internal.DebugFlag,
|
||||||
|
},
|
||||||
|
Before: internal.SubCommandBefore,
|
||||||
Action: func(c *cli.Context) error {
|
Action: func(c *cli.Context) error {
|
||||||
app := internal.ValidateApp(c)
|
app := internal.ValidateApp(c)
|
||||||
|
|
||||||
envSamplePath := path.Join(config.ABRA_DIR, "apps", app.Type, ".env.sample")
|
envSamplePath := path.Join(config.RECIPES_DIR, app.Recipe, ".env.sample")
|
||||||
if _, err := os.Stat(envSamplePath); err != nil {
|
if _, err := os.Stat(envSamplePath); err != nil {
|
||||||
if os.IsNotExist(err) {
|
if os.IsNotExist(err) {
|
||||||
logrus.Fatalf("'%s' does not exist?", envSamplePath)
|
logrus.Fatalf("%s does not exist?", envSamplePath)
|
||||||
}
|
}
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
|
@ -45,20 +49,9 @@ var appCheckCommand = &cli.Command{
|
||||||
logrus.Fatalf("%s is missing %s", app.Path, missingEnvVars)
|
logrus.Fatalf("%s is missing %s", app.Path, missingEnvVars)
|
||||||
}
|
}
|
||||||
|
|
||||||
logrus.Infof("all necessary environment variables defined for '%s'", app.Name)
|
logrus.Infof("all necessary environment variables defined for %s", app.Name)
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
},
|
},
|
||||||
BashComplete: func(c *cli.Context) {
|
BashComplete: autocomplete.AppNameComplete,
|
||||||
appNames, err := config.GetAppNames()
|
|
||||||
if err != nil {
|
|
||||||
logrus.Warn(err)
|
|
||||||
}
|
|
||||||
if c.NArg() > 0 {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
for _, a := range appNames {
|
|
||||||
fmt.Println(a)
|
|
||||||
}
|
|
||||||
},
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -2,21 +2,26 @@ package app
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"errors"
|
"errors"
|
||||||
"fmt"
|
|
||||||
"os"
|
"os"
|
||||||
"os/exec"
|
"os/exec"
|
||||||
|
|
||||||
"coopcloud.tech/abra/cli/internal"
|
"coopcloud.tech/abra/cli/internal"
|
||||||
|
"coopcloud.tech/abra/pkg/autocomplete"
|
||||||
"coopcloud.tech/abra/pkg/config"
|
"coopcloud.tech/abra/pkg/config"
|
||||||
"github.com/AlecAivazis/survey/v2"
|
"github.com/AlecAivazis/survey/v2"
|
||||||
"github.com/sirupsen/logrus"
|
"github.com/sirupsen/logrus"
|
||||||
"github.com/urfave/cli/v2"
|
"github.com/urfave/cli"
|
||||||
)
|
)
|
||||||
|
|
||||||
var appConfigCommand = &cli.Command{
|
var appConfigCommand = cli.Command{
|
||||||
Name: "config",
|
Name: "config",
|
||||||
Aliases: []string{"c"},
|
Aliases: []string{"c"},
|
||||||
Usage: "Edit app config",
|
Usage: "Edit app config",
|
||||||
|
ArgsUsage: "<domain>",
|
||||||
|
Flags: []cli.Flag{
|
||||||
|
internal.DebugFlag,
|
||||||
|
},
|
||||||
|
Before: internal.SubCommandBefore,
|
||||||
Action: func(c *cli.Context) error {
|
Action: func(c *cli.Context) error {
|
||||||
appName := c.Args().First()
|
appName := c.Args().First()
|
||||||
|
|
||||||
|
@ -31,7 +36,7 @@ var appConfigCommand = &cli.Command{
|
||||||
|
|
||||||
appFile, exists := files[appName]
|
appFile, exists := files[appName]
|
||||||
if !exists {
|
if !exists {
|
||||||
logrus.Fatalf("cannot find app with name '%s'", appName)
|
logrus.Fatalf("cannot find app with name %s", appName)
|
||||||
}
|
}
|
||||||
|
|
||||||
ed, ok := os.LookupEnv("EDITOR")
|
ed, ok := os.LookupEnv("EDITOR")
|
||||||
|
@ -55,16 +60,5 @@ var appConfigCommand = &cli.Command{
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
},
|
},
|
||||||
BashComplete: func(c *cli.Context) {
|
BashComplete: autocomplete.AppNameComplete,
|
||||||
appNames, err := config.GetAppNames()
|
|
||||||
if err != nil {
|
|
||||||
logrus.Warn(err)
|
|
||||||
}
|
|
||||||
if c.NArg() > 0 {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
for _, a := range appNames {
|
|
||||||
fmt.Println(a)
|
|
||||||
}
|
|
||||||
},
|
|
||||||
}
|
}
|
||||||
|
|
141
cli/app/cp.go
141
cli/app/cp.go
|
@ -1,26 +1,45 @@
|
||||||
package app
|
package app
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"context"
|
||||||
"fmt"
|
"fmt"
|
||||||
"os"
|
"os"
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
"coopcloud.tech/abra/cli/formatter"
|
|
||||||
"coopcloud.tech/abra/cli/internal"
|
"coopcloud.tech/abra/cli/internal"
|
||||||
|
"coopcloud.tech/abra/pkg/autocomplete"
|
||||||
"coopcloud.tech/abra/pkg/client"
|
"coopcloud.tech/abra/pkg/client"
|
||||||
"coopcloud.tech/abra/pkg/config"
|
"coopcloud.tech/abra/pkg/config"
|
||||||
|
"coopcloud.tech/abra/pkg/container"
|
||||||
|
"coopcloud.tech/abra/pkg/formatter"
|
||||||
"github.com/docker/docker/api/types"
|
"github.com/docker/docker/api/types"
|
||||||
"github.com/docker/docker/api/types/filters"
|
"github.com/docker/docker/api/types/filters"
|
||||||
"github.com/docker/docker/pkg/archive"
|
"github.com/docker/docker/pkg/archive"
|
||||||
"github.com/sirupsen/logrus"
|
"github.com/sirupsen/logrus"
|
||||||
"github.com/urfave/cli/v2"
|
"github.com/urfave/cli"
|
||||||
)
|
)
|
||||||
|
|
||||||
var appCpCommand = &cli.Command{
|
var appCpCommand = cli.Command{
|
||||||
Name: "cp",
|
Name: "cp",
|
||||||
Aliases: []string{"c"},
|
Aliases: []string{"c"},
|
||||||
ArgsUsage: "<src> <dst>",
|
ArgsUsage: "<domain> <src> <dst>",
|
||||||
Usage: "Copy files to/from a running app service",
|
Flags: []cli.Flag{
|
||||||
|
internal.DebugFlag,
|
||||||
|
internal.NoInputFlag,
|
||||||
|
},
|
||||||
|
Before: internal.SubCommandBefore,
|
||||||
|
Usage: "Copy files to/from a running app service",
|
||||||
|
Description: `
|
||||||
|
This command supports copying files to and from any app service file system.
|
||||||
|
|
||||||
|
If you want to copy a myfile.txt to the root of the app service:
|
||||||
|
|
||||||
|
abra app cp <domain> myfile.txt app:/
|
||||||
|
|
||||||
|
And if you want to copy that file back to your current working directory locally:
|
||||||
|
|
||||||
|
abra app cp <domain> app:/myfile.txt .
|
||||||
|
`,
|
||||||
Action: func(c *cli.Context) error {
|
Action: func(c *cli.Context) error {
|
||||||
app := internal.ValidateApp(c)
|
app := internal.ValidateApp(c)
|
||||||
|
|
||||||
|
@ -64,61 +83,69 @@ var appCpCommand = &cli.Command{
|
||||||
logrus.Debugf("assuming transfer is going TO the container")
|
logrus.Debugf("assuming transfer is going TO the container")
|
||||||
}
|
}
|
||||||
|
|
||||||
appFiles, err := config.LoadAppFiles("")
|
if !isToContainer {
|
||||||
|
if _, err := os.Stat(dstPath); os.IsNotExist(err) {
|
||||||
|
logrus.Fatalf("%s does not exist locally?", dstPath)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
err := configureAndCp(c, app, srcPath, dstPath, service, isToContainer)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
appEnv, err := config.GetApp(appFiles, app.Name)
|
|
||||||
if err != nil {
|
|
||||||
logrus.Fatal(err)
|
|
||||||
}
|
|
||||||
|
|
||||||
cl, err := client.New(app.Server)
|
|
||||||
if err != nil {
|
|
||||||
logrus.Fatal(err)
|
|
||||||
}
|
|
||||||
|
|
||||||
filters := filters.NewArgs()
|
|
||||||
filters.Add("name", fmt.Sprintf("%s_%s", appEnv.StackName(), service))
|
|
||||||
containers, err := cl.ContainerList(c.Context, types.ContainerListOptions{Filters: filters})
|
|
||||||
if err != nil {
|
|
||||||
logrus.Fatal(err)
|
|
||||||
}
|
|
||||||
|
|
||||||
if len(containers) != 1 {
|
|
||||||
logrus.Fatalf("expected 1 container but got %v", len(containers))
|
|
||||||
}
|
|
||||||
container := containers[0]
|
|
||||||
|
|
||||||
logrus.Debugf("retrieved '%s' as target container on '%s'", formatter.ShortenID(container.ID), app.Server)
|
|
||||||
|
|
||||||
if isToContainer {
|
|
||||||
if _, err := os.Stat(srcPath); err != nil {
|
|
||||||
logrus.Fatalf("'%s' does not exist?", srcPath)
|
|
||||||
}
|
|
||||||
|
|
||||||
toTarOpts := &archive.TarOptions{NoOverwriteDirNonDir: true, Compression: archive.Gzip}
|
|
||||||
content, err := archive.TarWithOptions(srcPath, toTarOpts)
|
|
||||||
if err != nil {
|
|
||||||
logrus.Fatal(err)
|
|
||||||
}
|
|
||||||
|
|
||||||
copyOpts := types.CopyToContainerOptions{AllowOverwriteDirWithFile: false, CopyUIDGID: false}
|
|
||||||
if err := cl.CopyToContainer(c.Context, container.ID, dstPath, content, copyOpts); err != nil {
|
|
||||||
logrus.Fatal(err)
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
content, _, err := cl.CopyFromContainer(c.Context, container.ID, srcPath)
|
|
||||||
if err != nil {
|
|
||||||
logrus.Fatal(err)
|
|
||||||
}
|
|
||||||
defer content.Close()
|
|
||||||
fromTarOpts := &archive.TarOptions{NoOverwriteDirNonDir: true, Compression: archive.Gzip}
|
|
||||||
if err := archive.Untar(content, dstPath, fromTarOpts); err != nil {
|
|
||||||
logrus.Fatal(err)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return nil
|
return nil
|
||||||
|
|
||||||
},
|
},
|
||||||
|
BashComplete: autocomplete.AppNameComplete,
|
||||||
|
}
|
||||||
|
|
||||||
|
func configureAndCp(
|
||||||
|
c *cli.Context,
|
||||||
|
app config.App,
|
||||||
|
srcPath string,
|
||||||
|
dstPath string,
|
||||||
|
service string,
|
||||||
|
isToContainer bool) error {
|
||||||
|
cl, err := client.New(app.Server)
|
||||||
|
if err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
filters := filters.NewArgs()
|
||||||
|
filters.Add("name", fmt.Sprintf("%s_%s", app.StackName(), service))
|
||||||
|
|
||||||
|
container, err := container.GetContainer(context.Background(), cl, filters, internal.NoInput)
|
||||||
|
if err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
logrus.Debugf("retrieved %s as target container on %s", formatter.ShortenID(container.ID), app.Server)
|
||||||
|
|
||||||
|
if isToContainer {
|
||||||
|
if _, err := os.Stat(srcPath); err != nil {
|
||||||
|
logrus.Fatalf("%s does not exist?", srcPath)
|
||||||
|
}
|
||||||
|
|
||||||
|
toTarOpts := &archive.TarOptions{NoOverwriteDirNonDir: true, Compression: archive.Gzip}
|
||||||
|
content, err := archive.TarWithOptions(srcPath, toTarOpts)
|
||||||
|
if err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
copyOpts := types.CopyToContainerOptions{AllowOverwriteDirWithFile: false, CopyUIDGID: false}
|
||||||
|
if err := cl.CopyToContainer(context.Background(), container.ID, dstPath, content, copyOpts); err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
content, _, err := cl.CopyFromContainer(context.Background(), container.ID, srcPath)
|
||||||
|
if err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
defer content.Close()
|
||||||
|
fromTarOpts := &archive.TarOptions{NoOverwriteDirNonDir: true, Compression: archive.Gzip}
|
||||||
|
if err := archive.Untar(content, dstPath, fromTarOpts); err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,26 +1,29 @@
|
||||||
package app
|
package app
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"fmt"
|
|
||||||
|
|
||||||
"coopcloud.tech/abra/cli/internal"
|
"coopcloud.tech/abra/cli/internal"
|
||||||
"coopcloud.tech/abra/pkg/config"
|
"coopcloud.tech/abra/pkg/autocomplete"
|
||||||
"github.com/sirupsen/logrus"
|
"github.com/urfave/cli"
|
||||||
"github.com/urfave/cli/v2"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
var appDeployCommand = &cli.Command{
|
var appDeployCommand = cli.Command{
|
||||||
Name: "deploy",
|
Name: "deploy",
|
||||||
Aliases: []string{"d"},
|
Aliases: []string{"d"},
|
||||||
Usage: "Deploy an app",
|
Usage: "Deploy an app",
|
||||||
|
ArgsUsage: "<domain>",
|
||||||
Flags: []cli.Flag{
|
Flags: []cli.Flag{
|
||||||
|
internal.DebugFlag,
|
||||||
|
internal.NoInputFlag,
|
||||||
internal.ForceFlag,
|
internal.ForceFlag,
|
||||||
internal.ChaosFlag,
|
internal.ChaosFlag,
|
||||||
|
internal.NoDomainChecksFlag,
|
||||||
|
internal.DontWaitConvergeFlag,
|
||||||
},
|
},
|
||||||
|
Before: internal.SubCommandBefore,
|
||||||
Description: `
|
Description: `
|
||||||
This command deploys a new instance of an app. It does not support changing the
|
This command deploys an app. It does not support incrementing the version of a
|
||||||
version of an existing deployed app, for this you need to look at the "abra app
|
deployed app, for this you need to look at the "abra app upgrade <domain>"
|
||||||
upgrade <app>" command.
|
command.
|
||||||
|
|
||||||
You may pass "--force" to re-deploy the same version again. This can be useful
|
You may pass "--force" to re-deploy the same version again. This can be useful
|
||||||
if the container runtime has gotten into a weird state.
|
if the container runtime has gotten into a weird state.
|
||||||
|
@ -29,17 +32,6 @@ Chas mode ("--chaos") will deploy your local checkout of a recipe as-is,
|
||||||
including unstaged changes and can be useful for live hacking and testing new
|
including unstaged changes and can be useful for live hacking and testing new
|
||||||
recipes.
|
recipes.
|
||||||
`,
|
`,
|
||||||
Action: internal.DeployAction,
|
Action: internal.DeployAction,
|
||||||
BashComplete: func(c *cli.Context) {
|
BashComplete: autocomplete.AppNameComplete,
|
||||||
appNames, err := config.GetAppNames()
|
|
||||||
if err != nil {
|
|
||||||
logrus.Warn(err)
|
|
||||||
}
|
|
||||||
if c.NArg() > 0 {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
for _, a := range appNames {
|
|
||||||
fmt.Println(a)
|
|
||||||
}
|
|
||||||
},
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -0,0 +1,141 @@
|
||||||
|
package app
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"strconv"
|
||||||
|
"strings"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"coopcloud.tech/abra/cli/internal"
|
||||||
|
"coopcloud.tech/abra/pkg/autocomplete"
|
||||||
|
"coopcloud.tech/abra/pkg/client"
|
||||||
|
"coopcloud.tech/abra/pkg/config"
|
||||||
|
"coopcloud.tech/abra/pkg/recipe"
|
||||||
|
stack "coopcloud.tech/abra/pkg/upstream/stack"
|
||||||
|
"github.com/docker/docker/api/types"
|
||||||
|
"github.com/docker/docker/api/types/filters"
|
||||||
|
dockerClient "github.com/docker/docker/client"
|
||||||
|
"github.com/sirupsen/logrus"
|
||||||
|
"github.com/urfave/cli"
|
||||||
|
)
|
||||||
|
|
||||||
|
var appErrorsCommand = cli.Command{
|
||||||
|
Name: "errors",
|
||||||
|
Usage: "List errors for a deployed app",
|
||||||
|
ArgsUsage: "<domain>",
|
||||||
|
Description: `
|
||||||
|
This command lists errors for a deployed app.
|
||||||
|
|
||||||
|
This is a best-effort implementation and an attempt to gather a number of tips
|
||||||
|
& tricks for finding errors together into one convenient command. When an app
|
||||||
|
is failing to deploy or having issues, it could be a lot of things.
|
||||||
|
|
||||||
|
This command currently takes into account:
|
||||||
|
|
||||||
|
Is the service deployed?
|
||||||
|
Is the service killed by an OOM error?
|
||||||
|
Is the service reporting an error (like in "ps --no-trunc" output)
|
||||||
|
Is the service healthcheck failing? what are the healthcheck logs?
|
||||||
|
|
||||||
|
Got any more ideas? Please let us know:
|
||||||
|
|
||||||
|
https://git.coopcloud.tech/coop-cloud/organising/issues/new/choose
|
||||||
|
|
||||||
|
This command is best accompanied by "abra app logs <domain>" which may reveal
|
||||||
|
further information which can help you debug the cause of an app failure via
|
||||||
|
the logs.
|
||||||
|
`,
|
||||||
|
Aliases: []string{"e"},
|
||||||
|
Flags: []cli.Flag{
|
||||||
|
internal.DebugFlag,
|
||||||
|
internal.WatchFlag,
|
||||||
|
},
|
||||||
|
Before: internal.SubCommandBefore,
|
||||||
|
BashComplete: autocomplete.AppNameComplete,
|
||||||
|
Action: func(c *cli.Context) error {
|
||||||
|
app := internal.ValidateApp(c)
|
||||||
|
|
||||||
|
cl, err := client.New(app.Server)
|
||||||
|
if err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
isDeployed, _, err := stack.IsDeployed(context.Background(), cl, app.StackName())
|
||||||
|
if err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if !isDeployed {
|
||||||
|
logrus.Fatalf("%s is not deployed?", app.Name)
|
||||||
|
}
|
||||||
|
|
||||||
|
if !internal.Watch {
|
||||||
|
if err := checkErrors(c, cl, app); err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
for {
|
||||||
|
if err := checkErrors(c, cl, app); err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
time.Sleep(2 * time.Second)
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
func checkErrors(c *cli.Context, cl *dockerClient.Client, app config.App) error {
|
||||||
|
recipe, err := recipe.Get(app.Recipe)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, service := range recipe.Config.Services {
|
||||||
|
filters := filters.NewArgs()
|
||||||
|
filters.Add("name", service.Name)
|
||||||
|
containers, err := cl.ContainerList(context.Background(), types.ContainerListOptions{Filters: filters})
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
if len(containers) == 0 {
|
||||||
|
logrus.Warnf("%s is not up, something seems wrong", service.Name)
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
|
||||||
|
container := containers[0]
|
||||||
|
containerState, err := cl.ContainerInspect(context.Background(), container.ID)
|
||||||
|
if err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if containerState.State.OOMKilled {
|
||||||
|
logrus.Warnf("%s has been killed due to an out of memory error", service.Name)
|
||||||
|
}
|
||||||
|
|
||||||
|
if containerState.State.Error != "" {
|
||||||
|
logrus.Warnf("%s reports this error: %s", service.Name, containerState.State.Error)
|
||||||
|
}
|
||||||
|
|
||||||
|
if containerState.State.Health != nil {
|
||||||
|
if containerState.State.Health.Status != "healthy" {
|
||||||
|
logrus.Warnf("%s healthcheck status is %s", service.Name, containerState.State.Health.Status)
|
||||||
|
logrus.Warnf("%s healthcheck has failed %s times", service.Name, strconv.Itoa(containerState.State.Health.FailingStreak))
|
||||||
|
for _, log := range containerState.State.Health.Log {
|
||||||
|
logrus.Warnf("%s healthcheck logs: %s", service.Name, strings.TrimSpace(log.Output))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func getServiceName(names []string) string {
|
||||||
|
containerName := strings.Join(names, " ")
|
||||||
|
trimmed := strings.TrimPrefix(containerName, "/")
|
||||||
|
return strings.Split(trimmed, ".")[0]
|
||||||
|
}
|
221
cli/app/list.go
221
cli/app/list.go
|
@ -5,44 +5,62 @@ import (
|
||||||
"sort"
|
"sort"
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
abraFormatter "coopcloud.tech/abra/cli/formatter"
|
"coopcloud.tech/abra/cli/internal"
|
||||||
"coopcloud.tech/abra/pkg/catalogue"
|
|
||||||
"coopcloud.tech/abra/pkg/config"
|
"coopcloud.tech/abra/pkg/config"
|
||||||
|
"coopcloud.tech/abra/pkg/formatter"
|
||||||
|
"coopcloud.tech/abra/pkg/recipe"
|
||||||
|
"coopcloud.tech/abra/pkg/ssh"
|
||||||
"coopcloud.tech/tagcmp"
|
"coopcloud.tech/tagcmp"
|
||||||
"github.com/sirupsen/logrus"
|
"github.com/sirupsen/logrus"
|
||||||
"github.com/urfave/cli/v2"
|
"github.com/urfave/cli"
|
||||||
)
|
)
|
||||||
|
|
||||||
var status bool
|
var status bool
|
||||||
var statusFlag = &cli.BoolFlag{
|
var statusFlag = &cli.BoolFlag{
|
||||||
Name: "status",
|
Name: "status, S",
|
||||||
Aliases: []string{"S"},
|
|
||||||
Value: false,
|
|
||||||
Usage: "Show app deployment status",
|
Usage: "Show app deployment status",
|
||||||
Destination: &status,
|
Destination: &status,
|
||||||
}
|
}
|
||||||
|
|
||||||
var appType string
|
var appRecipe string
|
||||||
var typeFlag = &cli.StringFlag{
|
var recipeFlag = &cli.StringFlag{
|
||||||
Name: "type",
|
Name: "recipe, r",
|
||||||
Aliases: []string{"t"},
|
|
||||||
Value: "",
|
Value: "",
|
||||||
Usage: "Show apps of a specific type",
|
Usage: "Show apps of a specific recipe",
|
||||||
Destination: &appType,
|
Destination: &appRecipe,
|
||||||
}
|
}
|
||||||
|
|
||||||
var listAppServer string
|
var listAppServer string
|
||||||
var listAppServerFlag = &cli.StringFlag{
|
var listAppServerFlag = &cli.StringFlag{
|
||||||
Name: "server",
|
Name: "server, s",
|
||||||
Aliases: []string{"s"},
|
|
||||||
Value: "",
|
Value: "",
|
||||||
Usage: "Show apps of a specific server",
|
Usage: "Show apps of a specific server",
|
||||||
Destination: &listAppServer,
|
Destination: &listAppServer,
|
||||||
}
|
}
|
||||||
|
|
||||||
var appListCommand = &cli.Command{
|
type appStatus struct {
|
||||||
Name: "list",
|
server string
|
||||||
Usage: "List all managed apps",
|
recipe string
|
||||||
|
appName string
|
||||||
|
domain string
|
||||||
|
status string
|
||||||
|
version string
|
||||||
|
upgrade string
|
||||||
|
}
|
||||||
|
|
||||||
|
type serverStatus struct {
|
||||||
|
apps []appStatus
|
||||||
|
appCount int
|
||||||
|
versionCount int
|
||||||
|
unversionedCount int
|
||||||
|
latestCount int
|
||||||
|
upgradeCount int
|
||||||
|
}
|
||||||
|
|
||||||
|
var appListCommand = cli.Command{
|
||||||
|
Name: "list",
|
||||||
|
Aliases: []string{"ls"},
|
||||||
|
Usage: "List all managed apps",
|
||||||
Description: `
|
Description: `
|
||||||
This command looks at your local file system listing of apps and servers (e.g.
|
This command looks at your local file system listing of apps and servers (e.g.
|
||||||
in ~/.abra/) to generate a report of all your apps.
|
in ~/.abra/) to generate a report of all your apps.
|
||||||
|
@ -50,13 +68,14 @@ in ~/.abra/) to generate a report of all your apps.
|
||||||
By passing the "--status/-S" flag, you can query all your servers for the
|
By passing the "--status/-S" flag, you can query all your servers for the
|
||||||
actual live deployment status. Depending on how many servers you manage, this
|
actual live deployment status. Depending on how many servers you manage, this
|
||||||
can take some time.
|
can take some time.
|
||||||
`,
|
`,
|
||||||
Aliases: []string{"ls"},
|
|
||||||
Flags: []cli.Flag{
|
Flags: []cli.Flag{
|
||||||
|
internal.DebugFlag,
|
||||||
statusFlag,
|
statusFlag,
|
||||||
listAppServerFlag,
|
listAppServerFlag,
|
||||||
typeFlag,
|
recipeFlag,
|
||||||
},
|
},
|
||||||
|
Before: internal.SubCommandBefore,
|
||||||
Action: func(c *cli.Context) error {
|
Action: func(c *cli.Context) error {
|
||||||
appFiles, err := config.LoadAppFiles(listAppServer)
|
appFiles, err := config.LoadAppFiles(listAppServer)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
@ -67,54 +86,81 @@ can take some time.
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
sort.Sort(config.ByServerAndType(apps))
|
|
||||||
|
sort.Sort(config.ByServerAndRecipe(apps))
|
||||||
|
|
||||||
statuses := make(map[string]map[string]string)
|
statuses := make(map[string]map[string]string)
|
||||||
tableCol := []string{"Server", "Type", "Domain"}
|
var catl recipe.RecipeCatalogue
|
||||||
if status {
|
if status {
|
||||||
tableCol = append(tableCol, "Status", "Version", "Updates")
|
alreadySeen := make(map[string]bool)
|
||||||
|
for _, app := range apps {
|
||||||
|
if _, ok := alreadySeen[app.Server]; !ok {
|
||||||
|
if err := ssh.EnsureHostKey(app.Server); err != nil {
|
||||||
|
logrus.Fatal(fmt.Sprintf(internal.SSHFailMsg, app.Server))
|
||||||
|
}
|
||||||
|
alreadySeen[app.Server] = true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
statuses, err = config.GetAppStatuses(appFiles)
|
statuses, err = config.GetAppStatuses(appFiles)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
var err error
|
||||||
|
catl, err = recipe.ReadRecipeCatalogue()
|
||||||
|
if err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
table := abraFormatter.CreateTable(tableCol)
|
var totalServersCount int
|
||||||
table.SetAutoMergeCellsByColumnIndex([]int{0})
|
var totalAppsCount int
|
||||||
|
allStats := make(map[string]serverStatus)
|
||||||
var (
|
|
||||||
versionedAppsCount int
|
|
||||||
unversionedAppsCount int
|
|
||||||
onLatestCount int
|
|
||||||
canUpgradeCount int
|
|
||||||
)
|
|
||||||
|
|
||||||
for _, app := range apps {
|
for _, app := range apps {
|
||||||
var tableRow []string
|
var stats serverStatus
|
||||||
if app.Type == appType || appType == "" {
|
var ok bool
|
||||||
// If type flag is set, check for it, if not, Type == ""
|
if stats, ok = allStats[app.Server]; !ok {
|
||||||
tableRow = []string{app.Server, app.Type, app.Domain}
|
stats = serverStatus{}
|
||||||
|
if appRecipe == "" {
|
||||||
|
// count server, no filtering
|
||||||
|
totalServersCount++
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if app.Recipe == appRecipe || appRecipe == "" {
|
||||||
|
if appRecipe != "" {
|
||||||
|
// only count server if matches filter
|
||||||
|
totalServersCount++
|
||||||
|
}
|
||||||
|
|
||||||
|
appStats := appStatus{}
|
||||||
|
stats.appCount++
|
||||||
|
totalAppsCount++
|
||||||
|
|
||||||
if status {
|
if status {
|
||||||
stackName := app.StackName()
|
|
||||||
status := "unknown"
|
status := "unknown"
|
||||||
version := "unknown"
|
version := "unknown"
|
||||||
if statusMeta, ok := statuses[stackName]; ok {
|
if statusMeta, ok := statuses[app.StackName()]; ok {
|
||||||
if currentVersion, exists := statusMeta["version"]; exists {
|
if currentVersion, exists := statusMeta["version"]; exists {
|
||||||
version = currentVersion
|
if currentVersion != "" {
|
||||||
|
version = currentVersion
|
||||||
|
}
|
||||||
}
|
}
|
||||||
if statusMeta["status"] != "" {
|
if statusMeta["status"] != "" {
|
||||||
status = statusMeta["status"]
|
status = statusMeta["status"]
|
||||||
}
|
}
|
||||||
tableRow = append(tableRow, status, version)
|
stats.versionCount++
|
||||||
versionedAppsCount++
|
|
||||||
} else {
|
} else {
|
||||||
tableRow = append(tableRow, status, version)
|
stats.unversionedCount++
|
||||||
unversionedAppsCount++
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
appStats.status = status
|
||||||
|
appStats.version = version
|
||||||
|
|
||||||
var newUpdates []string
|
var newUpdates []string
|
||||||
if version != "unknown" {
|
if version != "unknown" {
|
||||||
updates, err := catalogue.GetRecipeCatalogueVersions(app.Type)
|
updates, err := recipe.GetRecipeCatalogueVersions(app.Recipe, catl)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
|
@ -138,35 +184,80 @@ can take some time.
|
||||||
|
|
||||||
if len(newUpdates) == 0 {
|
if len(newUpdates) == 0 {
|
||||||
if version == "unknown" {
|
if version == "unknown" {
|
||||||
tableRow = append(tableRow, "unknown")
|
appStats.upgrade = "unknown"
|
||||||
} else {
|
} else {
|
||||||
tableRow = append(tableRow, "on latest")
|
appStats.upgrade = "latest"
|
||||||
onLatestCount++
|
stats.latestCount++
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
// FIXME: jeezus golang why do you not have a list reverse function
|
newUpdates = internal.ReverseStringList(newUpdates)
|
||||||
for i, j := 0, len(newUpdates)-1; i < j; i, j = i+1, j-1 {
|
appStats.upgrade = strings.Join(newUpdates, "\n")
|
||||||
newUpdates[i], newUpdates[j] = newUpdates[j], newUpdates[i]
|
stats.upgradeCount++
|
||||||
}
|
|
||||||
tableRow = append(tableRow, strings.Join(newUpdates, "\n"))
|
|
||||||
canUpgradeCount++
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
appStats.server = app.Server
|
||||||
|
appStats.recipe = app.Recipe
|
||||||
|
appStats.appName = app.Name
|
||||||
|
appStats.domain = app.Domain
|
||||||
|
|
||||||
|
stats.apps = append(stats.apps, appStats)
|
||||||
}
|
}
|
||||||
table.Append(tableRow)
|
|
||||||
|
allStats[app.Server] = stats
|
||||||
}
|
}
|
||||||
|
|
||||||
stats := fmt.Sprintf(
|
alreadySeen := make(map[string]bool)
|
||||||
"Total apps: %v | Versioned: %v | Unversioned: %v | On latest: %v | Can upgrade: %v",
|
for _, app := range apps {
|
||||||
len(apps),
|
if _, ok := alreadySeen[app.Server]; ok {
|
||||||
versionedAppsCount,
|
continue
|
||||||
unversionedAppsCount,
|
}
|
||||||
onLatestCount,
|
|
||||||
canUpgradeCount,
|
|
||||||
)
|
|
||||||
|
|
||||||
table.SetCaption(true, stats)
|
serverStat := allStats[app.Server]
|
||||||
table.Render()
|
|
||||||
|
tableCol := []string{"recipe", "domain"}
|
||||||
|
if status {
|
||||||
|
tableCol = append(tableCol, []string{"status", "version", "upgrade"}...)
|
||||||
|
}
|
||||||
|
|
||||||
|
table := formatter.CreateTable(tableCol)
|
||||||
|
|
||||||
|
for _, appStat := range serverStat.apps {
|
||||||
|
tableRow := []string{appStat.recipe, appStat.domain}
|
||||||
|
if status {
|
||||||
|
tableRow = append(tableRow, []string{appStat.status, appStat.version, appStat.upgrade}...)
|
||||||
|
}
|
||||||
|
table.Append(tableRow)
|
||||||
|
}
|
||||||
|
|
||||||
|
if table.NumLines() > 0 {
|
||||||
|
table.Render()
|
||||||
|
|
||||||
|
if status {
|
||||||
|
fmt.Println(fmt.Sprintf(
|
||||||
|
"server: %s | total apps: %v | versioned: %v | unversioned: %v | latest: %v | upgrade: %v",
|
||||||
|
app.Server,
|
||||||
|
serverStat.appCount,
|
||||||
|
serverStat.versionCount,
|
||||||
|
serverStat.unversionedCount,
|
||||||
|
serverStat.latestCount,
|
||||||
|
serverStat.upgradeCount,
|
||||||
|
))
|
||||||
|
} else {
|
||||||
|
fmt.Println(fmt.Sprintf("server: %s | total apps: %v", app.Server, serverStat.appCount))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if len(allStats) > 1 && table.NumLines() > 0 {
|
||||||
|
fmt.Println() // newline separator for multiple servers
|
||||||
|
}
|
||||||
|
|
||||||
|
alreadySeen[app.Server] = true
|
||||||
|
}
|
||||||
|
|
||||||
|
if len(allStats) > 1 {
|
||||||
|
fmt.Println(fmt.Sprintf("total servers: %v | total apps: %v ", totalServersCount, totalAppsCount))
|
||||||
|
}
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
},
|
},
|
||||||
|
|
119
cli/app/logs.go
119
cli/app/logs.go
|
@ -1,27 +1,39 @@
|
||||||
package app
|
package app
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"context"
|
||||||
"fmt"
|
"fmt"
|
||||||
"io"
|
"io"
|
||||||
"os"
|
"os"
|
||||||
"sync"
|
"sync"
|
||||||
|
|
||||||
"coopcloud.tech/abra/cli/internal"
|
"coopcloud.tech/abra/cli/internal"
|
||||||
|
"coopcloud.tech/abra/pkg/autocomplete"
|
||||||
"coopcloud.tech/abra/pkg/client"
|
"coopcloud.tech/abra/pkg/client"
|
||||||
"coopcloud.tech/abra/pkg/config"
|
"coopcloud.tech/abra/pkg/config"
|
||||||
|
"coopcloud.tech/abra/pkg/service"
|
||||||
"github.com/docker/docker/api/types"
|
"github.com/docker/docker/api/types"
|
||||||
"github.com/docker/docker/api/types/filters"
|
"github.com/docker/docker/api/types/filters"
|
||||||
dockerClient "github.com/docker/docker/client"
|
dockerClient "github.com/docker/docker/client"
|
||||||
"github.com/sirupsen/logrus"
|
"github.com/sirupsen/logrus"
|
||||||
"github.com/urfave/cli/v2"
|
"github.com/urfave/cli"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
var logOpts = types.ContainerLogsOptions{
|
||||||
|
Details: false,
|
||||||
|
Follow: true,
|
||||||
|
ShowStderr: true,
|
||||||
|
ShowStdout: true,
|
||||||
|
Tail: "20",
|
||||||
|
Timestamps: true,
|
||||||
|
}
|
||||||
|
|
||||||
// stackLogs lists logs for all stack services
|
// stackLogs lists logs for all stack services
|
||||||
func stackLogs(c *cli.Context, stackName string, client *dockerClient.Client) {
|
func stackLogs(c *cli.Context, stackName string, client *dockerClient.Client) {
|
||||||
filters := filters.NewArgs()
|
filters := filters.NewArgs()
|
||||||
filters.Add("name", stackName)
|
filters.Add("name", stackName)
|
||||||
serviceOpts := types.ServiceListOptions{Filters: filters}
|
serviceOpts := types.ServiceListOptions{Filters: filters}
|
||||||
services, err := client.ServiceList(c.Context, serviceOpts)
|
services, err := client.ServiceList(context.Background(), serviceOpts)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
|
@ -30,19 +42,14 @@ func stackLogs(c *cli.Context, stackName string, client *dockerClient.Client) {
|
||||||
for _, service := range services {
|
for _, service := range services {
|
||||||
wg.Add(1)
|
wg.Add(1)
|
||||||
go func(s string) {
|
go func(s string) {
|
||||||
logOpts := types.ContainerLogsOptions{
|
if internal.StdErrOnly {
|
||||||
Details: true,
|
logOpts.ShowStdout = false
|
||||||
Follow: true,
|
|
||||||
ShowStderr: true,
|
|
||||||
ShowStdout: true,
|
|
||||||
Tail: "20",
|
|
||||||
Timestamps: true,
|
|
||||||
}
|
}
|
||||||
logs, err := client.ServiceLogs(c.Context, s, logOpts)
|
|
||||||
|
logs, err := client.ServiceLogs(context.Background(), s, logOpts)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
// defer after err check as any err returns a nil io.ReadCloser
|
|
||||||
defer logs.Close()
|
defer logs.Close()
|
||||||
|
|
||||||
_, err = io.Copy(os.Stdout, logs)
|
_, err = io.Copy(os.Stdout, logs)
|
||||||
|
@ -51,15 +58,23 @@ func stackLogs(c *cli.Context, stackName string, client *dockerClient.Client) {
|
||||||
}
|
}
|
||||||
}(service.ID)
|
}(service.ID)
|
||||||
}
|
}
|
||||||
|
|
||||||
wg.Wait()
|
wg.Wait()
|
||||||
|
|
||||||
os.Exit(0)
|
os.Exit(0)
|
||||||
}
|
}
|
||||||
|
|
||||||
var appLogsCommand = &cli.Command{
|
var appLogsCommand = cli.Command{
|
||||||
Name: "logs",
|
Name: "logs",
|
||||||
Aliases: []string{"l"},
|
Aliases: []string{"l"},
|
||||||
ArgsUsage: "[<service>]",
|
ArgsUsage: "<domain> [<service>]",
|
||||||
Usage: "Tail app logs",
|
Usage: "Tail app logs",
|
||||||
|
Flags: []cli.Flag{
|
||||||
|
internal.StdErrOnlyFlag,
|
||||||
|
internal.DebugFlag,
|
||||||
|
},
|
||||||
|
Before: internal.SubCommandBefore,
|
||||||
|
BashComplete: autocomplete.AppNameComplete,
|
||||||
Action: func(c *cli.Context) error {
|
Action: func(c *cli.Context) error {
|
||||||
app := internal.ValidateApp(c)
|
app := internal.ValidateApp(c)
|
||||||
|
|
||||||
|
@ -70,55 +85,41 @@ var appLogsCommand = &cli.Command{
|
||||||
|
|
||||||
serviceName := c.Args().Get(1)
|
serviceName := c.Args().Get(1)
|
||||||
if serviceName == "" {
|
if serviceName == "" {
|
||||||
logrus.Debug("tailing logs for all app services")
|
logrus.Debugf("tailing logs for all %s services", app.Recipe)
|
||||||
stackLogs(c, app.StackName(), cl)
|
stackLogs(c, app.StackName(), cl)
|
||||||
}
|
} else {
|
||||||
logrus.Debugf("tailing logs for '%s'", serviceName)
|
logrus.Debugf("tailing logs for %s", serviceName)
|
||||||
|
if err := tailServiceLogs(c, cl, app, serviceName); err != nil {
|
||||||
service := fmt.Sprintf("%s_%s", app.StackName(), serviceName)
|
logrus.Fatal(err)
|
||||||
filters := filters.NewArgs()
|
}
|
||||||
filters.Add("name", service)
|
|
||||||
serviceOpts := types.ServiceListOptions{Filters: filters}
|
|
||||||
services, err := cl.ServiceList(c.Context, serviceOpts)
|
|
||||||
if err != nil {
|
|
||||||
logrus.Fatal(err)
|
|
||||||
}
|
|
||||||
if len(services) != 1 {
|
|
||||||
logrus.Fatalf("expected 1 service but got %v", len(services))
|
|
||||||
}
|
|
||||||
|
|
||||||
logOpts := types.ContainerLogsOptions{
|
|
||||||
Details: true,
|
|
||||||
Follow: true,
|
|
||||||
ShowStderr: true,
|
|
||||||
ShowStdout: true,
|
|
||||||
Tail: "20",
|
|
||||||
Timestamps: true,
|
|
||||||
}
|
|
||||||
logs, err := cl.ServiceLogs(c.Context, services[0].ID, logOpts)
|
|
||||||
if err != nil {
|
|
||||||
logrus.Fatal(err)
|
|
||||||
}
|
|
||||||
// defer after err check as any err returns a nil io.ReadCloser
|
|
||||||
defer logs.Close()
|
|
||||||
|
|
||||||
_, err = io.Copy(os.Stdout, logs)
|
|
||||||
if err != nil && err != io.EOF {
|
|
||||||
logrus.Fatal(err)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
},
|
},
|
||||||
BashComplete: func(c *cli.Context) {
|
}
|
||||||
appNames, err := config.GetAppNames()
|
|
||||||
if err != nil {
|
func tailServiceLogs(c *cli.Context, cl *dockerClient.Client, app config.App, serviceName string) error {
|
||||||
logrus.Warn(err)
|
filters := filters.NewArgs()
|
||||||
}
|
filters.Add("name", fmt.Sprintf("%s_%s", app.StackName(), serviceName))
|
||||||
if c.NArg() > 0 {
|
chosenService, err := service.GetService(context.Background(), cl, filters, internal.NoInput)
|
||||||
return
|
if err != nil {
|
||||||
}
|
logrus.Fatal(err)
|
||||||
for _, a := range appNames {
|
}
|
||||||
fmt.Println(a)
|
|
||||||
}
|
if internal.StdErrOnly {
|
||||||
},
|
logOpts.ShowStdout = false
|
||||||
|
}
|
||||||
|
|
||||||
|
logs, err := cl.ServiceLogs(context.Background(), chosenService.ID, logOpts)
|
||||||
|
if err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
defer logs.Close()
|
||||||
|
|
||||||
|
_, err = io.Copy(os.Stdout, logs)
|
||||||
|
if err != nil && err != io.EOF {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,12 +1,9 @@
|
||||||
package app
|
package app
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"fmt"
|
|
||||||
|
|
||||||
"coopcloud.tech/abra/cli/internal"
|
"coopcloud.tech/abra/cli/internal"
|
||||||
"coopcloud.tech/abra/pkg/catalogue"
|
"coopcloud.tech/abra/pkg/autocomplete"
|
||||||
"github.com/sirupsen/logrus"
|
"github.com/urfave/cli"
|
||||||
"github.com/urfave/cli/v2"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
var appNewDescription = `
|
var appNewDescription = `
|
||||||
|
@ -14,7 +11,7 @@ This command takes a recipe and uses it to create a new app. This new app
|
||||||
configuration is stored in your ~/.abra directory under the appropriate server.
|
configuration is stored in your ~/.abra directory under the appropriate server.
|
||||||
|
|
||||||
This command does not deploy your app for you. You will need to run "abra app
|
This command does not deploy your app for you. You will need to run "abra app
|
||||||
deploy <app>" to do so.
|
deploy <domain>" to do so.
|
||||||
|
|
||||||
You can see what recipes are available (i.e. values for the <recipe> argument)
|
You can see what recipes are available (i.e. values for the <recipe> argument)
|
||||||
by running "abra recipe ls".
|
by running "abra recipe ls".
|
||||||
|
@ -29,30 +26,21 @@ pass store (see passwordstore.org for more). The pass command must be available
|
||||||
on your $PATH.
|
on your $PATH.
|
||||||
`
|
`
|
||||||
|
|
||||||
var appNewCommand = &cli.Command{
|
var appNewCommand = cli.Command{
|
||||||
Name: "new",
|
Name: "new",
|
||||||
Usage: "Create a new app",
|
|
||||||
Aliases: []string{"n"},
|
Aliases: []string{"n"},
|
||||||
|
Usage: "Create a new app",
|
||||||
Description: appNewDescription,
|
Description: appNewDescription,
|
||||||
Flags: []cli.Flag{
|
Flags: []cli.Flag{
|
||||||
|
internal.DebugFlag,
|
||||||
|
internal.NoInputFlag,
|
||||||
internal.NewAppServerFlag,
|
internal.NewAppServerFlag,
|
||||||
internal.DomainFlag,
|
internal.DomainFlag,
|
||||||
internal.NewAppNameFlag,
|
|
||||||
internal.PassFlag,
|
internal.PassFlag,
|
||||||
internal.SecretsFlag,
|
internal.SecretsFlag,
|
||||||
},
|
},
|
||||||
ArgsUsage: "<recipe>",
|
Before: internal.SubCommandBefore,
|
||||||
Action: internal.NewAction,
|
ArgsUsage: "[<recipe>]",
|
||||||
BashComplete: func(c *cli.Context) {
|
Action: internal.NewAction,
|
||||||
catl, err := catalogue.ReadRecipeCatalogue()
|
BashComplete: autocomplete.RecipeNameComplete,
|
||||||
if err != nil {
|
|
||||||
logrus.Warn(err)
|
|
||||||
}
|
|
||||||
if c.NArg() > 0 {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
for name := range catl {
|
|
||||||
fmt.Println(name)
|
|
||||||
}
|
|
||||||
},
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,82 +1,82 @@
|
||||||
package app
|
package app
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"fmt"
|
"context"
|
||||||
"strings"
|
"strings"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
abraFormatter "coopcloud.tech/abra/cli/formatter"
|
|
||||||
"coopcloud.tech/abra/cli/internal"
|
"coopcloud.tech/abra/cli/internal"
|
||||||
|
"coopcloud.tech/abra/pkg/autocomplete"
|
||||||
"coopcloud.tech/abra/pkg/client"
|
"coopcloud.tech/abra/pkg/client"
|
||||||
"coopcloud.tech/abra/pkg/config"
|
"coopcloud.tech/abra/pkg/config"
|
||||||
"github.com/docker/cli/cli/command/formatter"
|
"coopcloud.tech/abra/pkg/formatter"
|
||||||
|
"coopcloud.tech/abra/pkg/service"
|
||||||
|
stack "coopcloud.tech/abra/pkg/upstream/stack"
|
||||||
|
"github.com/buger/goterm"
|
||||||
|
dockerFormatter "github.com/docker/cli/cli/command/formatter"
|
||||||
"github.com/docker/docker/api/types"
|
"github.com/docker/docker/api/types"
|
||||||
"github.com/docker/docker/api/types/filters"
|
"github.com/docker/docker/api/types/filters"
|
||||||
|
dockerClient "github.com/docker/docker/client"
|
||||||
"github.com/sirupsen/logrus"
|
"github.com/sirupsen/logrus"
|
||||||
"github.com/urfave/cli/v2"
|
"github.com/urfave/cli"
|
||||||
)
|
)
|
||||||
|
|
||||||
var watch bool
|
var appPsCommand = cli.Command{
|
||||||
var watchFlag = &cli.BoolFlag{
|
Name: "ps",
|
||||||
Name: "watch",
|
Aliases: []string{"p"},
|
||||||
Aliases: []string{"w"},
|
Usage: "Check app status",
|
||||||
Value: false,
|
ArgsUsage: "<domain>",
|
||||||
Usage: "Watch status by polling repeatedly",
|
Description: "This command shows a more detailed status output of a specific deployed app.",
|
||||||
Destination: &watch,
|
|
||||||
}
|
|
||||||
|
|
||||||
var appPsCommand = &cli.Command{
|
|
||||||
Name: "ps",
|
|
||||||
Usage: "Check app status",
|
|
||||||
Aliases: []string{"p"},
|
|
||||||
Flags: []cli.Flag{
|
Flags: []cli.Flag{
|
||||||
watchFlag,
|
internal.WatchFlag,
|
||||||
|
internal.DebugFlag,
|
||||||
},
|
},
|
||||||
|
Before: internal.SubCommandBefore,
|
||||||
|
BashComplete: autocomplete.AppNameComplete,
|
||||||
Action: func(c *cli.Context) error {
|
Action: func(c *cli.Context) error {
|
||||||
if !watch {
|
app := internal.ValidateApp(c)
|
||||||
showPSOutput(c)
|
|
||||||
|
cl, err := client.New(app.Server)
|
||||||
|
if err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
isDeployed, _, err := stack.IsDeployed(context.Background(), cl, app.StackName())
|
||||||
|
if err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if !isDeployed {
|
||||||
|
logrus.Fatalf("%s is not deployed?", app.Name)
|
||||||
|
}
|
||||||
|
|
||||||
|
if !internal.Watch {
|
||||||
|
showPSOutput(c, app, cl)
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// TODO: how do we make this update in-place in an x-platform way?
|
goterm.Clear()
|
||||||
for {
|
for {
|
||||||
showPSOutput(c)
|
goterm.MoveCursor(1, 1)
|
||||||
|
showPSOutput(c, app, cl)
|
||||||
|
goterm.Flush()
|
||||||
time.Sleep(2 * time.Second)
|
time.Sleep(2 * time.Second)
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
BashComplete: func(c *cli.Context) {
|
|
||||||
appNames, err := config.GetAppNames()
|
|
||||||
if err != nil {
|
|
||||||
logrus.Warn(err)
|
|
||||||
}
|
|
||||||
if c.NArg() > 0 {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
for _, a := range appNames {
|
|
||||||
fmt.Println(a)
|
|
||||||
}
|
|
||||||
},
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// showPSOutput renders ps output.
|
// showPSOutput renders ps output.
|
||||||
func showPSOutput(c *cli.Context) {
|
func showPSOutput(c *cli.Context, app config.App, cl *dockerClient.Client) {
|
||||||
app := internal.ValidateApp(c)
|
|
||||||
|
|
||||||
cl, err := client.New(app.Server)
|
|
||||||
if err != nil {
|
|
||||||
logrus.Fatal(err)
|
|
||||||
}
|
|
||||||
|
|
||||||
filters := filters.NewArgs()
|
filters := filters.NewArgs()
|
||||||
filters.Add("name", app.StackName())
|
filters.Add("name", app.StackName())
|
||||||
|
|
||||||
containers, err := cl.ContainerList(c.Context, types.ContainerListOptions{Filters: filters})
|
containers, err := cl.ContainerList(context.Background(), types.ContainerListOptions{Filters: filters})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
tableCol := []string{"image", "created", "status", "ports", "names"}
|
tableCol := []string{"service name", "image", "created", "status", "state", "ports"}
|
||||||
table := abraFormatter.CreateTable(tableCol)
|
table := formatter.CreateTable(tableCol)
|
||||||
|
|
||||||
for _, container := range containers {
|
for _, container := range containers {
|
||||||
var containerNames []string
|
var containerNames []string
|
||||||
|
@ -86,11 +86,12 @@ func showPSOutput(c *cli.Context) {
|
||||||
}
|
}
|
||||||
|
|
||||||
tableRow := []string{
|
tableRow := []string{
|
||||||
abraFormatter.RemoveSha(container.Image),
|
service.ContainerToServiceName(container.Names, app.StackName()),
|
||||||
abraFormatter.HumanDuration(container.Created),
|
formatter.RemoveSha(container.Image),
|
||||||
|
formatter.HumanDuration(container.Created),
|
||||||
container.Status,
|
container.Status,
|
||||||
formatter.DisplayablePorts(container.Ports),
|
container.State,
|
||||||
strings.Join(containerNames, "\n"),
|
dockerFormatter.DisplayablePorts(container.Ports),
|
||||||
}
|
}
|
||||||
table.Append(tableRow)
|
table.Append(tableRow)
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,17 +1,19 @@
|
||||||
package app
|
package app
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"context"
|
||||||
"fmt"
|
"fmt"
|
||||||
"os"
|
"os"
|
||||||
|
|
||||||
"coopcloud.tech/abra/cli/internal"
|
"coopcloud.tech/abra/cli/internal"
|
||||||
|
"coopcloud.tech/abra/pkg/autocomplete"
|
||||||
"coopcloud.tech/abra/pkg/client"
|
"coopcloud.tech/abra/pkg/client"
|
||||||
"coopcloud.tech/abra/pkg/config"
|
stack "coopcloud.tech/abra/pkg/upstream/stack"
|
||||||
"github.com/AlecAivazis/survey/v2"
|
"github.com/AlecAivazis/survey/v2"
|
||||||
"github.com/docker/docker/api/types"
|
"github.com/docker/docker/api/types"
|
||||||
"github.com/docker/docker/api/types/filters"
|
"github.com/docker/docker/api/types/filters"
|
||||||
"github.com/sirupsen/logrus"
|
"github.com/sirupsen/logrus"
|
||||||
"github.com/urfave/cli/v2"
|
"github.com/urfave/cli"
|
||||||
)
|
)
|
||||||
|
|
||||||
// Volumes stores the variable from VolumesFlag
|
// Volumes stores the variable from VolumesFlag
|
||||||
|
@ -19,58 +21,54 @@ var Volumes bool
|
||||||
|
|
||||||
// VolumesFlag is used to specify if volumes should be deleted when deleting an app
|
// VolumesFlag is used to specify if volumes should be deleted when deleting an app
|
||||||
var VolumesFlag = &cli.BoolFlag{
|
var VolumesFlag = &cli.BoolFlag{
|
||||||
Name: "volumes",
|
Name: "volumes, V",
|
||||||
Value: false,
|
|
||||||
Destination: &Volumes,
|
Destination: &Volumes,
|
||||||
}
|
}
|
||||||
|
|
||||||
var appRemoveCommand = &cli.Command{
|
var appRemoveCommand = cli.Command{
|
||||||
Name: "remove",
|
Name: "remove",
|
||||||
Usage: "Remove an already undeployed app",
|
Aliases: []string{"rm"},
|
||||||
Aliases: []string{"rm"},
|
ArgsUsage: "<domain>",
|
||||||
|
Usage: "Remove an already undeployed app",
|
||||||
Flags: []cli.Flag{
|
Flags: []cli.Flag{
|
||||||
VolumesFlag,
|
VolumesFlag,
|
||||||
internal.ForceFlag,
|
internal.ForceFlag,
|
||||||
|
internal.DebugFlag,
|
||||||
|
internal.NoInputFlag,
|
||||||
},
|
},
|
||||||
|
Before: internal.SubCommandBefore,
|
||||||
Action: func(c *cli.Context) error {
|
Action: func(c *cli.Context) error {
|
||||||
app := internal.ValidateApp(c)
|
app := internal.ValidateApp(c)
|
||||||
|
|
||||||
if !internal.Force {
|
if !internal.Force && !internal.NoInput {
|
||||||
response := false
|
response := false
|
||||||
prompt := &survey.Confirm{
|
prompt := &survey.Confirm{
|
||||||
Message: fmt.Sprintf("about to delete %s, are you sure?", app.Name),
|
Message: fmt.Sprintf("about to remove %s, are you sure?", app.Name),
|
||||||
}
|
}
|
||||||
if err := survey.AskOne(prompt, &response); err != nil {
|
if err := survey.AskOne(prompt, &response); err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
if !response {
|
if !response {
|
||||||
logrus.Fatal("user aborted app removal")
|
logrus.Fatal("aborting as requested")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
appFiles, err := config.LoadAppFiles("")
|
|
||||||
if err != nil {
|
|
||||||
logrus.Fatal(err)
|
|
||||||
}
|
|
||||||
|
|
||||||
cl, err := client.New(app.Server)
|
cl, err := client.New(app.Server)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
if !internal.Force {
|
|
||||||
// FIXME: only query for app we are interested in, not all of them!
|
isDeployed, _, err := stack.IsDeployed(context.Background(), cl, app.StackName())
|
||||||
statuses, err := config.GetAppStatuses(appFiles)
|
if err != nil {
|
||||||
if err != nil {
|
logrus.Fatal(err)
|
||||||
logrus.Fatal(err)
|
}
|
||||||
}
|
if isDeployed {
|
||||||
if statuses[app.Name]["status"] == "deployed" {
|
logrus.Fatalf("%s is still deployed. Run \"abra app undeploy %s\"", app.Name, app.Name)
|
||||||
logrus.Fatalf("'%s' is still deployed. Run \"abra app %s undeploy\" or pass --force", app.Name, app.Name)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
fs := filters.NewArgs()
|
fs := filters.NewArgs()
|
||||||
fs.Add("name", app.Name)
|
fs.Add("name", app.StackName())
|
||||||
secretList, err := cl.SecretList(c.Context, types.SecretListOptions{Filters: fs})
|
secretList, err := cl.SecretList(context.Background(), types.SecretListOptions{Filters: fs})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
|
@ -85,9 +83,12 @@ var appRemoveCommand = &cli.Command{
|
||||||
|
|
||||||
if len(secrets) > 0 {
|
if len(secrets) > 0 {
|
||||||
var secretNamesToRemove []string
|
var secretNamesToRemove []string
|
||||||
if !internal.Force {
|
|
||||||
|
if !internal.Force && !internal.NoInput {
|
||||||
secretsPrompt := &survey.MultiSelect{
|
secretsPrompt := &survey.MultiSelect{
|
||||||
Message: "which secrets do you want to remove?",
|
Message: "which secrets do you want to remove?",
|
||||||
|
Help: "'x' indicates selected, enter / return to confirm, ctrl-c to exit, vim mode is enabled",
|
||||||
|
VimMode: true,
|
||||||
Options: secretNames,
|
Options: secretNames,
|
||||||
Default: secretNames,
|
Default: secretNames,
|
||||||
}
|
}
|
||||||
|
@ -96,8 +97,12 @@ var appRemoveCommand = &cli.Command{
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if internal.Force || internal.NoInput {
|
||||||
|
secretNamesToRemove = secretNames
|
||||||
|
}
|
||||||
|
|
||||||
for _, name := range secretNamesToRemove {
|
for _, name := range secretNamesToRemove {
|
||||||
err := cl.SecretRemove(c.Context, secrets[name])
|
err := cl.SecretRemove(context.Background(), secrets[name])
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
|
@ -107,7 +112,7 @@ var appRemoveCommand = &cli.Command{
|
||||||
logrus.Info("no secrets to remove")
|
logrus.Info("no secrets to remove")
|
||||||
}
|
}
|
||||||
|
|
||||||
volumeListOKBody, err := cl.VolumeList(c.Context, fs)
|
volumeListOKBody, err := cl.VolumeList(context.Background(), fs)
|
||||||
volumeList := volumeListOKBody.Volumes
|
volumeList := volumeListOKBody.Volumes
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
|
@ -121,9 +126,11 @@ var appRemoveCommand = &cli.Command{
|
||||||
if len(vols) > 0 {
|
if len(vols) > 0 {
|
||||||
if Volumes {
|
if Volumes {
|
||||||
var removeVols []string
|
var removeVols []string
|
||||||
if !internal.Force {
|
if !internal.Force && !internal.NoInput {
|
||||||
volumesPrompt := &survey.MultiSelect{
|
volumesPrompt := &survey.MultiSelect{
|
||||||
Message: "which volumes do you want to remove?",
|
Message: "which volumes do you want to remove?",
|
||||||
|
Help: "'x' indicates selected, enter / return to confirm, ctrl-c to exit, vim mode is enabled",
|
||||||
|
VimMode: true,
|
||||||
Options: vols,
|
Options: vols,
|
||||||
Default: vols,
|
Default: vols,
|
||||||
}
|
}
|
||||||
|
@ -131,8 +138,9 @@ var appRemoveCommand = &cli.Command{
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
for _, vol := range removeVols {
|
for _, vol := range removeVols {
|
||||||
err := cl.VolumeRemove(c.Context, vol, internal.Force) // last argument is for force removing
|
err := cl.VolumeRemove(context.Background(), vol, internal.Force) // last argument is for force removing
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
|
@ -142,7 +150,9 @@ var appRemoveCommand = &cli.Command{
|
||||||
logrus.Info("no volumes were removed")
|
logrus.Info("no volumes were removed")
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
logrus.Info("no volumes to remove")
|
if Volumes {
|
||||||
|
logrus.Info("no volumes to remove")
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
err = os.Remove(app.Path)
|
err = os.Remove(app.Path)
|
||||||
|
@ -153,16 +163,5 @@ var appRemoveCommand = &cli.Command{
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
},
|
},
|
||||||
BashComplete: func(c *cli.Context) {
|
BashComplete: autocomplete.AppNameComplete,
|
||||||
appNames, err := config.GetAppNames()
|
|
||||||
if err != nil {
|
|
||||||
logrus.Warn(err)
|
|
||||||
}
|
|
||||||
if c.NArg() > 0 {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
for _, a := range appNames {
|
|
||||||
fmt.Println(a)
|
|
||||||
}
|
|
||||||
},
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -0,0 +1,70 @@
|
||||||
|
package app
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"errors"
|
||||||
|
"fmt"
|
||||||
|
|
||||||
|
"coopcloud.tech/abra/cli/internal"
|
||||||
|
"coopcloud.tech/abra/pkg/autocomplete"
|
||||||
|
"coopcloud.tech/abra/pkg/client"
|
||||||
|
upstream "coopcloud.tech/abra/pkg/upstream/service"
|
||||||
|
stack "coopcloud.tech/abra/pkg/upstream/stack"
|
||||||
|
"github.com/sirupsen/logrus"
|
||||||
|
"github.com/urfave/cli"
|
||||||
|
)
|
||||||
|
|
||||||
|
var appRestartCommand = cli.Command{
|
||||||
|
Name: "restart",
|
||||||
|
Aliases: []string{"re"},
|
||||||
|
Usage: "Restart an app",
|
||||||
|
ArgsUsage: "<domain>",
|
||||||
|
Flags: []cli.Flag{
|
||||||
|
internal.DebugFlag,
|
||||||
|
},
|
||||||
|
Before: internal.SubCommandBefore,
|
||||||
|
Description: `This command restarts a service within a deployed app.`,
|
||||||
|
BashComplete: autocomplete.AppNameComplete,
|
||||||
|
Action: func(c *cli.Context) error {
|
||||||
|
app := internal.ValidateApp(c)
|
||||||
|
|
||||||
|
serviceNameShort := c.Args().Get(1)
|
||||||
|
if serviceNameShort == "" {
|
||||||
|
err := errors.New("missing service?")
|
||||||
|
internal.ShowSubcommandHelpAndError(c, err)
|
||||||
|
}
|
||||||
|
|
||||||
|
cl, err := client.New(app.Server)
|
||||||
|
if err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
serviceName := fmt.Sprintf("%s_%s", app.StackName(), serviceNameShort)
|
||||||
|
|
||||||
|
logrus.Debugf("attempting to scale %s to 0 (restart logic)", serviceName)
|
||||||
|
if err := upstream.RunServiceScale(context.Background(), cl, serviceName, 0); err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := stack.WaitOnService(context.Background(), cl, serviceName, app.Name); err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
logrus.Debugf("%s has been scaled to 0 (restart logic)", serviceName)
|
||||||
|
|
||||||
|
logrus.Debugf("attempting to scale %s to 1 (restart logic)", serviceName)
|
||||||
|
if err := upstream.RunServiceScale(context.Background(), cl, serviceName, 1); err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := stack.WaitOnService(context.Background(), cl, serviceName, app.Name); err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
logrus.Debugf("%s has been scaled to 1 (restart logic)", serviceName)
|
||||||
|
|
||||||
|
logrus.Infof("%s service successfully restarted", serviceNameShort)
|
||||||
|
|
||||||
|
return nil
|
||||||
|
},
|
||||||
|
}
|
|
@ -1,79 +0,0 @@
|
||||||
package app
|
|
||||||
|
|
||||||
import (
|
|
||||||
"errors"
|
|
||||||
"fmt"
|
|
||||||
"io/ioutil"
|
|
||||||
"os"
|
|
||||||
"os/exec"
|
|
||||||
"path"
|
|
||||||
"strings"
|
|
||||||
|
|
||||||
"coopcloud.tech/abra/cli/internal"
|
|
||||||
"coopcloud.tech/abra/pkg/config"
|
|
||||||
"github.com/sirupsen/logrus"
|
|
||||||
"github.com/urfave/cli/v2"
|
|
||||||
)
|
|
||||||
|
|
||||||
var restoreAllServices bool
|
|
||||||
var restoreAllServicesFlag = &cli.BoolFlag{
|
|
||||||
Name: "all",
|
|
||||||
Value: false,
|
|
||||||
Destination: &restoreAllServices,
|
|
||||||
Aliases: []string{"a"},
|
|
||||||
Usage: "Restore all services",
|
|
||||||
}
|
|
||||||
|
|
||||||
var appRestoreCommand = &cli.Command{
|
|
||||||
Name: "restore",
|
|
||||||
Usage: "Restore an app from a backup",
|
|
||||||
Aliases: []string{"r"},
|
|
||||||
Flags: []cli.Flag{restoreAllServicesFlag},
|
|
||||||
ArgsUsage: "<service> [<backup file>]",
|
|
||||||
Action: func(c *cli.Context) error {
|
|
||||||
app := internal.ValidateApp(c)
|
|
||||||
|
|
||||||
if c.Args().Len() > 1 && restoreAllServices {
|
|
||||||
internal.ShowSubcommandHelpAndError(c, errors.New("cannot use <service>/<backup file> and '--all' together"))
|
|
||||||
}
|
|
||||||
|
|
||||||
abraSh := path.Join(config.ABRA_DIR, "apps", app.Type, "abra.sh")
|
|
||||||
if _, err := os.Stat(abraSh); err != nil {
|
|
||||||
if os.IsNotExist(err) {
|
|
||||||
logrus.Fatalf("'%s' does not exist?", abraSh)
|
|
||||||
}
|
|
||||||
logrus.Fatal(err)
|
|
||||||
}
|
|
||||||
|
|
||||||
sourceCmd := fmt.Sprintf("source %s", abraSh)
|
|
||||||
execCmd := "abra_restore"
|
|
||||||
if !restoreAllServices {
|
|
||||||
serviceName := c.Args().Get(1)
|
|
||||||
if serviceName == "" {
|
|
||||||
internal.ShowSubcommandHelpAndError(c, errors.New("no service(s) target provided"))
|
|
||||||
}
|
|
||||||
execCmd = fmt.Sprintf("abra_restore_%s", serviceName)
|
|
||||||
}
|
|
||||||
|
|
||||||
bytes, err := ioutil.ReadFile(abraSh)
|
|
||||||
if err != nil {
|
|
||||||
logrus.Fatal(err)
|
|
||||||
}
|
|
||||||
if !strings.Contains(string(bytes), execCmd) {
|
|
||||||
logrus.Fatalf("%s doesn't have a '%s' function", app.Type, execCmd)
|
|
||||||
}
|
|
||||||
|
|
||||||
backupFile := c.Args().Get(2)
|
|
||||||
if backupFile != "" {
|
|
||||||
execCmd = fmt.Sprintf("%s %s", execCmd, backupFile)
|
|
||||||
}
|
|
||||||
|
|
||||||
sourceAndExec := fmt.Sprintf("%s; %s", sourceCmd, execCmd)
|
|
||||||
cmd := exec.Command("bash", "-c", sourceAndExec)
|
|
||||||
if err := internal.RunCmd(cmd); err != nil {
|
|
||||||
logrus.Fatal(err)
|
|
||||||
}
|
|
||||||
|
|
||||||
return nil
|
|
||||||
},
|
|
||||||
}
|
|
|
@ -1,10 +1,12 @@
|
||||||
package app
|
package app
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"context"
|
||||||
"fmt"
|
"fmt"
|
||||||
|
|
||||||
"coopcloud.tech/abra/pkg/catalogue"
|
"coopcloud.tech/abra/pkg/autocomplete"
|
||||||
"coopcloud.tech/abra/pkg/config"
|
"coopcloud.tech/abra/pkg/config"
|
||||||
|
"coopcloud.tech/abra/pkg/lint"
|
||||||
"coopcloud.tech/abra/pkg/recipe"
|
"coopcloud.tech/abra/pkg/recipe"
|
||||||
stack "coopcloud.tech/abra/pkg/upstream/stack"
|
stack "coopcloud.tech/abra/pkg/upstream/stack"
|
||||||
"coopcloud.tech/tagcmp"
|
"coopcloud.tech/tagcmp"
|
||||||
|
@ -13,18 +15,23 @@ import (
|
||||||
"coopcloud.tech/abra/pkg/client"
|
"coopcloud.tech/abra/pkg/client"
|
||||||
"github.com/AlecAivazis/survey/v2"
|
"github.com/AlecAivazis/survey/v2"
|
||||||
"github.com/sirupsen/logrus"
|
"github.com/sirupsen/logrus"
|
||||||
"github.com/urfave/cli/v2"
|
"github.com/urfave/cli"
|
||||||
)
|
)
|
||||||
|
|
||||||
var appRollbackCommand = &cli.Command{
|
var appRollbackCommand = cli.Command{
|
||||||
Name: "rollback",
|
Name: "rollback",
|
||||||
|
Aliases: []string{"rl"},
|
||||||
Usage: "Roll an app back to a previous version",
|
Usage: "Roll an app back to a previous version",
|
||||||
Aliases: []string{"r", "downgrade"},
|
ArgsUsage: "<domain>",
|
||||||
ArgsUsage: "<app>",
|
|
||||||
Flags: []cli.Flag{
|
Flags: []cli.Flag{
|
||||||
|
internal.DebugFlag,
|
||||||
|
internal.NoInputFlag,
|
||||||
internal.ForceFlag,
|
internal.ForceFlag,
|
||||||
internal.ChaosFlag,
|
internal.ChaosFlag,
|
||||||
|
internal.NoDomainChecksFlag,
|
||||||
|
internal.DontWaitConvergeFlag,
|
||||||
},
|
},
|
||||||
|
Before: internal.SubCommandBefore,
|
||||||
Description: `
|
Description: `
|
||||||
This command rolls an app back to a previous version if one exists.
|
This command rolls an app back to a previous version if one exists.
|
||||||
|
|
||||||
|
@ -32,54 +39,66 @@ You may pass "--force/-f" to downgrade to the same version again. This can be
|
||||||
useful if the container runtime has gotten into a weird state.
|
useful if the container runtime has gotten into a weird state.
|
||||||
|
|
||||||
This action could be destructive, please ensure you have a copy of your app
|
This action could be destructive, please ensure you have a copy of your app
|
||||||
data beforehand - see "abra app backup <app>" for more.
|
data beforehand.
|
||||||
|
|
||||||
Chas mode ("--chaos") will deploy your local checkout of a recipe as-is,
|
Chas mode ("--chaos") will deploy your local checkout of a recipe as-is,
|
||||||
including unstaged changes and can be useful for live hacking and testing new
|
including unstaged changes and can be useful for live hacking and testing new
|
||||||
recipes.
|
recipes.
|
||||||
`,
|
`,
|
||||||
BashComplete: func(c *cli.Context) {
|
BashComplete: autocomplete.AppNameComplete,
|
||||||
appNames, err := config.GetAppNames()
|
|
||||||
if err != nil {
|
|
||||||
logrus.Warn(err)
|
|
||||||
}
|
|
||||||
if c.NArg() > 0 {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
for _, a := range appNames {
|
|
||||||
fmt.Println(a)
|
|
||||||
}
|
|
||||||
},
|
|
||||||
Action: func(c *cli.Context) error {
|
Action: func(c *cli.Context) error {
|
||||||
app := internal.ValidateApp(c)
|
app := internal.ValidateApp(c)
|
||||||
stackName := app.StackName()
|
stackName := app.StackName()
|
||||||
|
|
||||||
|
if !internal.Chaos {
|
||||||
|
if err := recipe.EnsureUpToDate(app.Recipe); err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
r, err := recipe.Get(app.Recipe)
|
||||||
|
if err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := lint.LintForErrors(r); err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
cl, err := client.New(app.Server)
|
cl, err := client.New(app.Server)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
logrus.Debugf("checking whether '%s' is already deployed", stackName)
|
logrus.Debugf("checking whether %s is already deployed", stackName)
|
||||||
|
|
||||||
isDeployed, deployedVersion, err := stack.IsDeployed(c.Context, cl, stackName)
|
isDeployed, deployedVersion, err := stack.IsDeployed(context.Background(), cl, stackName)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
if !isDeployed {
|
if !isDeployed {
|
||||||
logrus.Fatalf("'%s' is not deployed?", app.Name)
|
logrus.Fatalf("%s is not deployed?", app.Name)
|
||||||
}
|
}
|
||||||
|
|
||||||
versions, err := catalogue.GetRecipeCatalogueVersions(app.Type)
|
catl, err := recipe.ReadRecipeCatalogue()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
versions, err := recipe.GetRecipeCatalogueVersions(app.Recipe, catl)
|
||||||
|
if err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if len(versions) == 0 && !internal.Chaos {
|
||||||
|
logrus.Fatalf("no published releases for %s in the recipe catalogue?", app.Recipe)
|
||||||
|
}
|
||||||
|
|
||||||
var availableDowngrades []string
|
var availableDowngrades []string
|
||||||
if deployedVersion == "" {
|
if deployedVersion == "unknown" {
|
||||||
deployedVersion = "unknown"
|
|
||||||
availableDowngrades = versions
|
availableDowngrades = versions
|
||||||
logrus.Warnf("failed to determine version of deployed '%s'", app.Name)
|
logrus.Warnf("failed to determine version of deployed %s", app.Name)
|
||||||
}
|
}
|
||||||
|
|
||||||
if deployedVersion != "unknown" && !internal.Chaos {
|
if deployedVersion != "unknown" && !internal.Chaos {
|
||||||
|
@ -98,23 +117,21 @@ recipes.
|
||||||
}
|
}
|
||||||
|
|
||||||
if len(availableDowngrades) == 0 {
|
if len(availableDowngrades) == 0 {
|
||||||
logrus.Fatal("no available downgrades, you're on latest")
|
logrus.Info("no available downgrades, you're on oldest ✌️")
|
||||||
|
return nil
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// FIXME: jeezus golang why do you not have a list reverse function
|
availableDowngrades = internal.ReverseStringList(availableDowngrades)
|
||||||
for i, j := 0, len(availableDowngrades)-1; i < j; i, j = i+1, j-1 {
|
|
||||||
availableDowngrades[i], availableDowngrades[j] = availableDowngrades[j], availableDowngrades[i]
|
|
||||||
}
|
|
||||||
|
|
||||||
var chosenDowngrade string
|
var chosenDowngrade string
|
||||||
if !internal.Chaos {
|
if !internal.Chaos {
|
||||||
if internal.Force {
|
if internal.Force || internal.NoInput {
|
||||||
chosenDowngrade = availableDowngrades[0]
|
chosenDowngrade = availableDowngrades[0]
|
||||||
logrus.Debugf("choosing '%s' as version to downgrade to (--force)", chosenDowngrade)
|
logrus.Debugf("choosing %s as version to downgrade to (--force)", chosenDowngrade)
|
||||||
} else {
|
} else {
|
||||||
prompt := &survey.Select{
|
prompt := &survey.Select{
|
||||||
Message: fmt.Sprintf("Please select a downgrade (current version: '%s'):", deployedVersion),
|
Message: fmt.Sprintf("Please select a downgrade (current version: %s):", deployedVersion),
|
||||||
Options: availableDowngrades,
|
Options: availableDowngrades,
|
||||||
}
|
}
|
||||||
if err := survey.AskOne(prompt, &chosenDowngrade); err != nil {
|
if err := survey.AskOne(prompt, &chosenDowngrade); err != nil {
|
||||||
|
@ -124,7 +141,7 @@ recipes.
|
||||||
}
|
}
|
||||||
|
|
||||||
if !internal.Chaos {
|
if !internal.Chaos {
|
||||||
if err := recipe.EnsureVersion(app.Type, chosenDowngrade); err != nil {
|
if err := recipe.EnsureVersion(app.Recipe, chosenDowngrade); err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -132,13 +149,13 @@ recipes.
|
||||||
if internal.Chaos {
|
if internal.Chaos {
|
||||||
logrus.Warn("chaos mode engaged")
|
logrus.Warn("chaos mode engaged")
|
||||||
var err error
|
var err error
|
||||||
chosenDowngrade, err = recipe.ChaosVersion(app.Type)
|
chosenDowngrade, err = recipe.ChaosVersion(app.Recipe)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
abraShPath := fmt.Sprintf("%s/%s/%s", config.APPS_DIR, app.Type, "abra.sh")
|
abraShPath := fmt.Sprintf("%s/%s/%s", config.RECIPES_DIR, app.Recipe, "abra.sh")
|
||||||
abraShEnv, err := config.ReadAbraShEnvVars(abraShPath)
|
abraShEnv, err := config.ReadAbraShEnvVars(abraShPath)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
|
@ -147,7 +164,7 @@ recipes.
|
||||||
app.Env[k] = v
|
app.Env[k] = v
|
||||||
}
|
}
|
||||||
|
|
||||||
composeFiles, err := config.GetAppComposeFiles(app.Type, app.Env)
|
composeFiles, err := config.GetAppComposeFiles(app.Recipe, app.Env)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
|
@ -163,12 +180,12 @@ recipes.
|
||||||
}
|
}
|
||||||
|
|
||||||
if !internal.Force {
|
if !internal.Force {
|
||||||
if err := internal.NewVersionOverview(app, deployedVersion, chosenDowngrade); err != nil {
|
if err := internal.NewVersionOverview(app, deployedVersion, chosenDowngrade, ""); err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if err := stack.RunDeploy(cl, deployOpts, compose); err != nil {
|
if err := stack.RunDeploy(cl, deployOpts, compose, app.StackName(), internal.DontWaitConverge); err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1,51 +1,55 @@
|
||||||
package app
|
package app
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"context"
|
||||||
"errors"
|
"errors"
|
||||||
"fmt"
|
"fmt"
|
||||||
|
|
||||||
"coopcloud.tech/abra/cli/internal"
|
"coopcloud.tech/abra/cli/internal"
|
||||||
|
"coopcloud.tech/abra/pkg/autocomplete"
|
||||||
"coopcloud.tech/abra/pkg/client"
|
"coopcloud.tech/abra/pkg/client"
|
||||||
"coopcloud.tech/abra/pkg/config"
|
containerPkg "coopcloud.tech/abra/pkg/container"
|
||||||
"coopcloud.tech/abra/pkg/upstream/container"
|
"coopcloud.tech/abra/pkg/upstream/container"
|
||||||
"github.com/docker/cli/cli/command"
|
"github.com/docker/cli/cli/command"
|
||||||
"github.com/docker/docker/api/types"
|
"github.com/docker/docker/api/types"
|
||||||
"github.com/docker/docker/api/types/filters"
|
"github.com/docker/docker/api/types/filters"
|
||||||
"github.com/sirupsen/logrus"
|
"github.com/sirupsen/logrus"
|
||||||
"github.com/urfave/cli/v2"
|
"github.com/urfave/cli"
|
||||||
)
|
)
|
||||||
|
|
||||||
var user string
|
var user string
|
||||||
var userFlag = &cli.StringFlag{
|
var userFlag = &cli.StringFlag{
|
||||||
Name: "user",
|
Name: "user, u",
|
||||||
Value: "",
|
Value: "",
|
||||||
Destination: &user,
|
Destination: &user,
|
||||||
}
|
}
|
||||||
|
|
||||||
var noTTY bool
|
var noTTY bool
|
||||||
var noTTYFlag = &cli.BoolFlag{
|
var noTTYFlag = &cli.BoolFlag{
|
||||||
Name: "no-tty",
|
Name: "no-tty, t",
|
||||||
Value: false,
|
|
||||||
Destination: &noTTY,
|
Destination: &noTTY,
|
||||||
}
|
}
|
||||||
|
|
||||||
var appRunCommand = &cli.Command{
|
var appRunCommand = cli.Command{
|
||||||
Name: "run",
|
Name: "run",
|
||||||
|
Aliases: []string{"r"},
|
||||||
Flags: []cli.Flag{
|
Flags: []cli.Flag{
|
||||||
|
internal.DebugFlag,
|
||||||
noTTYFlag,
|
noTTYFlag,
|
||||||
userFlag,
|
userFlag,
|
||||||
},
|
},
|
||||||
Aliases: []string{"r"},
|
Before: internal.SubCommandBefore,
|
||||||
ArgsUsage: "<service> <args>...",
|
ArgsUsage: "<domain> <service> <args>...",
|
||||||
Usage: "Run a command in a service container",
|
Usage: "Run a command in a service container",
|
||||||
|
BashComplete: autocomplete.AppNameComplete,
|
||||||
Action: func(c *cli.Context) error {
|
Action: func(c *cli.Context) error {
|
||||||
app := internal.ValidateApp(c)
|
app := internal.ValidateApp(c)
|
||||||
|
|
||||||
if c.Args().Len() < 2 {
|
if len(c.Args()) < 2 {
|
||||||
internal.ShowSubcommandHelpAndError(c, errors.New("no <service> provided?"))
|
internal.ShowSubcommandHelpAndError(c, errors.New("no <service> provided?"))
|
||||||
}
|
}
|
||||||
|
|
||||||
if c.Args().Len() < 3 {
|
if len(c.Args()) < 3 {
|
||||||
internal.ShowSubcommandHelpAndError(c, errors.New("no <args> provided?"))
|
internal.ShowSubcommandHelpAndError(c, errors.New("no <args> provided?"))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -59,19 +63,12 @@ var appRunCommand = &cli.Command{
|
||||||
filters := filters.NewArgs()
|
filters := filters.NewArgs()
|
||||||
filters.Add("name", stackAndServiceName)
|
filters.Add("name", stackAndServiceName)
|
||||||
|
|
||||||
containers, err := cl.ContainerList(c.Context, types.ContainerListOptions{Filters: filters})
|
targetContainer, err := containerPkg.GetContainer(context.Background(), cl, filters, false)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
if len(containers) == 0 {
|
cmd := c.Args()[2:]
|
||||||
logrus.Fatalf("no containers matching '%s' found?", stackAndServiceName)
|
|
||||||
}
|
|
||||||
if len(containers) > 1 {
|
|
||||||
logrus.Fatalf("expected 1 container matching '%s' but got %d", stackAndServiceName, len(containers))
|
|
||||||
}
|
|
||||||
|
|
||||||
cmd := c.Args().Slice()[2:]
|
|
||||||
execCreateOpts := types.ExecConfig{
|
execCreateOpts := types.ExecConfig{
|
||||||
AttachStderr: true,
|
AttachStderr: true,
|
||||||
AttachStdin: true,
|
AttachStdin: true,
|
||||||
|
@ -88,41 +85,16 @@ var appRunCommand = &cli.Command{
|
||||||
execCreateOpts.Tty = false
|
execCreateOpts.Tty = false
|
||||||
}
|
}
|
||||||
|
|
||||||
// FIXME: an absolutely monumental hack to instantiate another command-line
|
// FIXME: avoid instantiating a new CLI
|
||||||
// client withing our command-line client so that we pass something down
|
|
||||||
// the tubes that satisfies the necessary interface requirements. We should
|
|
||||||
// refactor our vendored container code to not require all this cruft. For
|
|
||||||
// now, It Works.
|
|
||||||
dcli, err := command.NewDockerCli()
|
dcli, err := command.NewDockerCli()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
if err := container.RunExec(dcli, cl, containers[0].ID, &execCreateOpts); err != nil {
|
if err := container.RunExec(dcli, cl, targetContainer.ID, &execCreateOpts); err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
},
|
},
|
||||||
BashComplete: func(c *cli.Context) {
|
|
||||||
switch c.NArg() {
|
|
||||||
case 0:
|
|
||||||
appNames, err := config.GetAppNames()
|
|
||||||
if err != nil {
|
|
||||||
logrus.Warn(err)
|
|
||||||
}
|
|
||||||
for _, a := range appNames {
|
|
||||||
fmt.Println(a)
|
|
||||||
}
|
|
||||||
case 1:
|
|
||||||
appName := c.Args().First()
|
|
||||||
serviceNames, err := config.GetAppServiceNames(appName)
|
|
||||||
if err != nil {
|
|
||||||
logrus.Warn(err)
|
|
||||||
}
|
|
||||||
for _, s := range serviceNames {
|
|
||||||
fmt.Println(s)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,41 +1,55 @@
|
||||||
package app
|
package app
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"context"
|
||||||
"errors"
|
"errors"
|
||||||
"fmt"
|
"fmt"
|
||||||
"os"
|
"os"
|
||||||
"strconv"
|
"strconv"
|
||||||
|
|
||||||
abraFormatter "coopcloud.tech/abra/cli/formatter"
|
|
||||||
"coopcloud.tech/abra/cli/internal"
|
"coopcloud.tech/abra/cli/internal"
|
||||||
|
"coopcloud.tech/abra/pkg/autocomplete"
|
||||||
"coopcloud.tech/abra/pkg/client"
|
"coopcloud.tech/abra/pkg/client"
|
||||||
"coopcloud.tech/abra/pkg/config"
|
"coopcloud.tech/abra/pkg/config"
|
||||||
|
"coopcloud.tech/abra/pkg/formatter"
|
||||||
"coopcloud.tech/abra/pkg/secret"
|
"coopcloud.tech/abra/pkg/secret"
|
||||||
"github.com/docker/docker/api/types"
|
"github.com/docker/docker/api/types"
|
||||||
"github.com/docker/docker/api/types/filters"
|
"github.com/docker/docker/api/types/filters"
|
||||||
|
dockerClient "github.com/docker/docker/client"
|
||||||
"github.com/sirupsen/logrus"
|
"github.com/sirupsen/logrus"
|
||||||
"github.com/urfave/cli/v2"
|
"github.com/urfave/cli"
|
||||||
)
|
)
|
||||||
|
|
||||||
var allSecrets bool
|
var allSecrets bool
|
||||||
var allSecretsFlag = &cli.BoolFlag{
|
var allSecretsFlag = &cli.BoolFlag{
|
||||||
Name: "all",
|
Name: "all, a",
|
||||||
Aliases: []string{"A"},
|
|
||||||
Value: false,
|
|
||||||
Destination: &allSecrets,
|
Destination: &allSecrets,
|
||||||
Usage: "Generate all secrets",
|
Usage: "Generate all secrets",
|
||||||
}
|
}
|
||||||
|
|
||||||
var appSecretGenerateCommand = &cli.Command{
|
var rmAllSecrets bool
|
||||||
|
var rmAllSecretsFlag = &cli.BoolFlag{
|
||||||
|
Name: "all, a",
|
||||||
|
Destination: &rmAllSecrets,
|
||||||
|
Usage: "Remove all secrets",
|
||||||
|
}
|
||||||
|
|
||||||
|
var appSecretGenerateCommand = cli.Command{
|
||||||
Name: "generate",
|
Name: "generate",
|
||||||
Aliases: []string{"g"},
|
Aliases: []string{"g"},
|
||||||
Usage: "Generate secrets",
|
Usage: "Generate secrets",
|
||||||
ArgsUsage: "<secret> <version>",
|
ArgsUsage: "<domain> <secret> <version>",
|
||||||
Flags: []cli.Flag{allSecretsFlag, internal.PassFlag},
|
Flags: []cli.Flag{
|
||||||
|
internal.DebugFlag,
|
||||||
|
allSecretsFlag,
|
||||||
|
internal.PassFlag,
|
||||||
|
},
|
||||||
|
Before: internal.SubCommandBefore,
|
||||||
|
BashComplete: autocomplete.AppNameComplete,
|
||||||
Action: func(c *cli.Context) error {
|
Action: func(c *cli.Context) error {
|
||||||
app := internal.ValidateApp(c)
|
app := internal.ValidateApp(c)
|
||||||
|
|
||||||
if c.Args().Len() == 1 && !allSecrets {
|
if len(c.Args()) == 1 && !allSecrets {
|
||||||
err := errors.New("missing arguments <secret>/<version> or '--all'")
|
err := errors.New("missing arguments <secret>/<version> or '--all'")
|
||||||
internal.ShowSubcommandHelpAndError(c, err)
|
internal.ShowSubcommandHelpAndError(c, err)
|
||||||
}
|
}
|
||||||
|
@ -57,10 +71,12 @@ var appSecretGenerateCommand = &cli.Command{
|
||||||
parsed := secret.ParseSecretEnvVarName(sec)
|
parsed := secret.ParseSecretEnvVarName(sec)
|
||||||
if secretName == parsed {
|
if secretName == parsed {
|
||||||
secretsToCreate[sec] = secretVersion
|
secretsToCreate[sec] = secretVersion
|
||||||
|
matches = true
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if !matches {
|
if !matches {
|
||||||
logrus.Fatalf("'%s' doesn't exist in the env config?", secretName)
|
logrus.Fatalf("%s doesn't exist in the env config?", secretName)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -71,7 +87,7 @@ var appSecretGenerateCommand = &cli.Command{
|
||||||
|
|
||||||
if internal.Pass {
|
if internal.Pass {
|
||||||
for name, data := range secretVals {
|
for name, data := range secretVals {
|
||||||
if err := secret.PassInsertSecret(data, name, app.StackName(), app.Server); err != nil {
|
if err := secret.PassInsertSecret(data, name, app.Name, app.Server); err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -83,7 +99,7 @@ var appSecretGenerateCommand = &cli.Command{
|
||||||
}
|
}
|
||||||
|
|
||||||
tableCol := []string{"name", "value"}
|
tableCol := []string{"name", "value"}
|
||||||
table := abraFormatter.CreateTable(tableCol)
|
table := formatter.CreateTable(tableCol)
|
||||||
for name, val := range secretVals {
|
for name, val := range secretVals {
|
||||||
table.Append([]string{name, val})
|
table.Append([]string{name, val})
|
||||||
}
|
}
|
||||||
|
@ -94,12 +110,17 @@ var appSecretGenerateCommand = &cli.Command{
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
var appSecretInsertCommand = &cli.Command{
|
var appSecretInsertCommand = cli.Command{
|
||||||
Name: "insert",
|
Name: "insert",
|
||||||
Aliases: []string{"i"},
|
Aliases: []string{"i"},
|
||||||
Usage: "Insert secret",
|
Usage: "Insert secret",
|
||||||
Flags: []cli.Flag{internal.PassFlag},
|
Flags: []cli.Flag{
|
||||||
ArgsUsage: "<app> <secret-name> <version> <data>",
|
internal.DebugFlag,
|
||||||
|
internal.PassFlag,
|
||||||
|
},
|
||||||
|
Before: internal.SubCommandBefore,
|
||||||
|
ArgsUsage: "<domain> <secret-name> <version> <data>",
|
||||||
|
BashComplete: autocomplete.AppNameComplete,
|
||||||
Description: `
|
Description: `
|
||||||
This command inserts a secret into an app environment.
|
This command inserts a secret into an app environment.
|
||||||
|
|
||||||
|
@ -115,7 +136,7 @@ Example:
|
||||||
Action: func(c *cli.Context) error {
|
Action: func(c *cli.Context) error {
|
||||||
app := internal.ValidateApp(c)
|
app := internal.ValidateApp(c)
|
||||||
|
|
||||||
if c.Args().Len() != 4 {
|
if len(c.Args()) != 4 {
|
||||||
internal.ShowSubcommandHelpAndError(c, errors.New("missing arguments?"))
|
internal.ShowSubcommandHelpAndError(c, errors.New("missing arguments?"))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -128,8 +149,10 @@ Example:
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
logrus.Infof("%s successfully stored on server", secretName)
|
||||||
|
|
||||||
if internal.Pass {
|
if internal.Pass {
|
||||||
if err := secret.PassInsertSecret(data, name, app.StackName(), app.Server); err != nil {
|
if err := secret.PassInsertSecret(data, name, app.Name, app.Server); err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -138,28 +161,54 @@ Example:
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
var appSecretRmCommand = &cli.Command{
|
// secretRm removes a secret.
|
||||||
Name: "remove",
|
func secretRm(cl *dockerClient.Client, app config.App, secretName, parsed string) error {
|
||||||
Usage: "Remove a secret",
|
if err := cl.SecretRemove(context.Background(), secretName); err != nil {
|
||||||
Aliases: []string{"rm"},
|
return err
|
||||||
Flags: []cli.Flag{allSecretsFlag, internal.PassFlag},
|
}
|
||||||
ArgsUsage: "<app> <secret-name>",
|
|
||||||
|
logrus.Infof("deleted %s successfully from server", secretName)
|
||||||
|
|
||||||
|
if internal.PassRemove {
|
||||||
|
if err := secret.PassRmSecret(parsed, app.StackName(), app.Server); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
logrus.Infof("deleted %s successfully from local pass store", secretName)
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
var appSecretRmCommand = cli.Command{
|
||||||
|
Name: "remove",
|
||||||
|
Aliases: []string{"rm"},
|
||||||
|
Usage: "Remove a secret",
|
||||||
|
Flags: []cli.Flag{
|
||||||
|
internal.DebugFlag,
|
||||||
|
internal.NoInputFlag,
|
||||||
|
rmAllSecretsFlag,
|
||||||
|
internal.PassRemoveFlag,
|
||||||
|
},
|
||||||
|
Before: internal.SubCommandBefore,
|
||||||
|
ArgsUsage: "<domain> [<secret-name>]",
|
||||||
|
BashComplete: autocomplete.AppNameComplete,
|
||||||
Description: `
|
Description: `
|
||||||
This command removes a secret from an app environment.
|
This command removes app secrets.
|
||||||
|
|
||||||
Example:
|
Example:
|
||||||
|
|
||||||
abra app secret remove myapp db_pass
|
abra app secret remove myapp db_pass
|
||||||
|
|
||||||
`,
|
`,
|
||||||
Action: func(c *cli.Context) error {
|
Action: func(c *cli.Context) error {
|
||||||
app := internal.ValidateApp(c)
|
app := internal.ValidateApp(c)
|
||||||
|
secrets := secret.ReadSecretEnvVars(app.Env)
|
||||||
|
|
||||||
if c.Args().Get(1) != "" && allSecrets {
|
if c.Args().Get(1) != "" && rmAllSecrets {
|
||||||
internal.ShowSubcommandHelpAndError(c, errors.New("cannot use '<secret-name>' and '--all' together"))
|
internal.ShowSubcommandHelpAndError(c, errors.New("cannot use '<secret-name>' and '--all' together"))
|
||||||
}
|
}
|
||||||
|
|
||||||
if c.Args().Get(1) == "" && !allSecrets {
|
if c.Args().Get(1) == "" && !rmAllSecrets {
|
||||||
internal.ShowSubcommandHelpAndError(c, errors.New("no secret(s) specified?"))
|
internal.ShowSubcommandHelpAndError(c, errors.New("no secret(s) specified?"))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -170,52 +219,72 @@ Example:
|
||||||
|
|
||||||
filters := filters.NewArgs()
|
filters := filters.NewArgs()
|
||||||
filters.Add("name", app.StackName())
|
filters.Add("name", app.StackName())
|
||||||
secretList, err := cl.SecretList(c.Context, types.SecretListOptions{Filters: filters})
|
secretList, err := cl.SecretList(context.Background(), types.SecretListOptions{Filters: filters})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
secretToRm := c.Args().Get(1)
|
remoteSecretNames := make(map[string]bool)
|
||||||
for _, cont := range secretList {
|
for _, cont := range secretList {
|
||||||
secretName := cont.Spec.Annotations.Name
|
remoteSecretNames[cont.Spec.Annotations.Name] = true
|
||||||
parsed := secret.ParseGeneratedSecretName(secretName, app)
|
}
|
||||||
if allSecrets {
|
|
||||||
if err := cl.SecretRemove(c.Context, secretName); err != nil {
|
match := false
|
||||||
logrus.Fatal(err)
|
secretToRm := c.Args().Get(1)
|
||||||
}
|
for sec := range secrets {
|
||||||
if internal.Pass {
|
secretName := secret.ParseSecretEnvVarName(sec)
|
||||||
if err := secret.PassRmSecret(parsed, app.StackName(), app.Server); err != nil {
|
|
||||||
logrus.Fatal(err)
|
secVal, err := secret.ParseSecretEnvVarValue(secrets[sec])
|
||||||
}
|
if err != nil {
|
||||||
}
|
logrus.Fatal(err)
|
||||||
} else {
|
}
|
||||||
if parsed == secretToRm {
|
|
||||||
if err := cl.SecretRemove(c.Context, secretName); err != nil {
|
secretRemoteName := fmt.Sprintf("%s_%s_%s", app.StackName(), secretName, secVal.Version)
|
||||||
logrus.Fatal(err)
|
if _, ok := remoteSecretNames[secretRemoteName]; ok {
|
||||||
}
|
if secretToRm != "" {
|
||||||
if internal.Pass {
|
if secretName == secretToRm {
|
||||||
if err := secret.PassRmSecret(parsed, app.StackName(), app.Server); err != nil {
|
if err := secretRm(cl, app, secretRemoteName, secretName); err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
match = true
|
||||||
|
|
||||||
|
if err := secretRm(cl, app, secretRemoteName, secretName); err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if !match && secretToRm != "" {
|
||||||
|
logrus.Fatalf("%s doesn't exist on server?", secretToRm)
|
||||||
|
}
|
||||||
|
|
||||||
|
if !match {
|
||||||
|
logrus.Fatal("no secrets to remove?")
|
||||||
|
}
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
var appSecretLsCommand = &cli.Command{
|
var appSecretLsCommand = cli.Command{
|
||||||
Name: "list",
|
Name: "list",
|
||||||
Usage: "List all secrets",
|
|
||||||
Aliases: []string{"ls"},
|
Aliases: []string{"ls"},
|
||||||
|
Flags: []cli.Flag{
|
||||||
|
internal.DebugFlag,
|
||||||
|
},
|
||||||
|
Before: internal.SubCommandBefore,
|
||||||
|
Usage: "List all secrets",
|
||||||
Action: func(c *cli.Context) error {
|
Action: func(c *cli.Context) error {
|
||||||
app := internal.ValidateApp(c)
|
app := internal.ValidateApp(c)
|
||||||
secrets := secret.ReadSecretEnvVars(app.Env)
|
secrets := secret.ReadSecretEnvVars(app.Env)
|
||||||
|
|
||||||
tableCol := []string{"Name", "Version", "Generated Name", "Created On Server"}
|
tableCol := []string{"Name", "Version", "Generated Name", "Created On Server"}
|
||||||
table := abraFormatter.CreateTable(tableCol)
|
table := formatter.CreateTable(tableCol)
|
||||||
|
|
||||||
cl, err := client.New(app.Server)
|
cl, err := client.New(app.Server)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
@ -224,7 +293,7 @@ var appSecretLsCommand = &cli.Command{
|
||||||
|
|
||||||
filters := filters.NewArgs()
|
filters := filters.NewArgs()
|
||||||
filters.Add("name", app.StackName())
|
filters.Add("name", app.StackName())
|
||||||
secretList, err := cl.SecretList(c.Context, types.SecretListOptions{Filters: filters})
|
secretList, err := cl.SecretList(context.Background(), types.SecretListOptions{Filters: filters})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
|
@ -249,29 +318,23 @@ var appSecretLsCommand = &cli.Command{
|
||||||
table.Append(tableRow)
|
table.Append(tableRow)
|
||||||
}
|
}
|
||||||
|
|
||||||
table.Render()
|
if table.NumLines() > 0 {
|
||||||
|
table.Render()
|
||||||
|
} else {
|
||||||
|
logrus.Warnf("no secrets stored for %s", app.Name)
|
||||||
|
}
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
},
|
},
|
||||||
BashComplete: func(c *cli.Context) {
|
BashComplete: autocomplete.AppNameComplete,
|
||||||
appNames, err := config.GetAppNames()
|
|
||||||
if err != nil {
|
|
||||||
logrus.Warn(err)
|
|
||||||
}
|
|
||||||
if c.NArg() > 0 {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
for _, a := range appNames {
|
|
||||||
fmt.Println(a)
|
|
||||||
}
|
|
||||||
},
|
|
||||||
}
|
}
|
||||||
|
|
||||||
var appSecretCommand = &cli.Command{
|
var appSecretCommand = cli.Command{
|
||||||
Name: "secret",
|
Name: "secret",
|
||||||
Aliases: []string{"s"},
|
Aliases: []string{"s"},
|
||||||
Usage: "Manage app secrets",
|
Usage: "Manage app secrets",
|
||||||
ArgsUsage: "<command>",
|
ArgsUsage: "<domain>",
|
||||||
Subcommands: []*cli.Command{
|
Subcommands: []cli.Command{
|
||||||
appSecretGenerateCommand,
|
appSecretGenerateCommand,
|
||||||
appSecretInsertCommand,
|
appSecretInsertCommand,
|
||||||
appSecretRmCommand,
|
appSecretRmCommand,
|
||||||
|
|
|
@ -1,20 +1,26 @@
|
||||||
package app
|
package app
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"fmt"
|
"context"
|
||||||
|
|
||||||
"coopcloud.tech/abra/cli/internal"
|
"coopcloud.tech/abra/cli/internal"
|
||||||
|
"coopcloud.tech/abra/pkg/autocomplete"
|
||||||
"coopcloud.tech/abra/pkg/client"
|
"coopcloud.tech/abra/pkg/client"
|
||||||
"coopcloud.tech/abra/pkg/config"
|
|
||||||
stack "coopcloud.tech/abra/pkg/upstream/stack"
|
stack "coopcloud.tech/abra/pkg/upstream/stack"
|
||||||
"github.com/sirupsen/logrus"
|
"github.com/sirupsen/logrus"
|
||||||
"github.com/urfave/cli/v2"
|
"github.com/urfave/cli"
|
||||||
)
|
)
|
||||||
|
|
||||||
var appUndeployCommand = &cli.Command{
|
var appUndeployCommand = cli.Command{
|
||||||
Name: "undeploy",
|
Name: "undeploy",
|
||||||
Aliases: []string{"u"},
|
Aliases: []string{"un"},
|
||||||
Usage: "Undeploy an app",
|
ArgsUsage: "<domain>",
|
||||||
|
Flags: []cli.Flag{
|
||||||
|
internal.DebugFlag,
|
||||||
|
internal.NoInputFlag,
|
||||||
|
},
|
||||||
|
Before: internal.SubCommandBefore,
|
||||||
|
Usage: "Undeploy an app",
|
||||||
Description: `
|
Description: `
|
||||||
This does not destroy any of the application data. However, you should remain
|
This does not destroy any of the application data. However, you should remain
|
||||||
vigilant, as your swarm installation will consider any previously attached
|
vigilant, as your swarm installation will consider any previously attached
|
||||||
|
@ -29,15 +35,15 @@ volumes as eligiblef or pruning once undeployed.
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
logrus.Debugf("checking whether '%s' is already deployed", stackName)
|
logrus.Debugf("checking whether %s is already deployed", stackName)
|
||||||
|
|
||||||
isDeployed, deployedVersion, err := stack.IsDeployed(c.Context, cl, stackName)
|
isDeployed, deployedVersion, err := stack.IsDeployed(context.Background(), cl, stackName)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
if !isDeployed {
|
if !isDeployed {
|
||||||
logrus.Fatalf("'%s' is not deployed?", stackName)
|
logrus.Fatalf("%s is not deployed?", app.Name)
|
||||||
}
|
}
|
||||||
|
|
||||||
if err := internal.DeployOverview(app, deployedVersion, "continue with undeploy?"); err != nil {
|
if err := internal.DeployOverview(app, deployedVersion, "continue with undeploy?"); err != nil {
|
||||||
|
@ -45,22 +51,11 @@ volumes as eligiblef or pruning once undeployed.
|
||||||
}
|
}
|
||||||
|
|
||||||
rmOpts := stack.Remove{Namespaces: []string{app.StackName()}}
|
rmOpts := stack.Remove{Namespaces: []string{app.StackName()}}
|
||||||
if err := stack.RunRemove(c.Context, cl, rmOpts); err != nil {
|
if err := stack.RunRemove(context.Background(), cl, rmOpts); err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
},
|
},
|
||||||
BashComplete: func(c *cli.Context) {
|
BashComplete: autocomplete.AppNameComplete,
|
||||||
appNames, err := config.GetAppNames()
|
|
||||||
if err != nil {
|
|
||||||
logrus.Warn(err)
|
|
||||||
}
|
|
||||||
if c.NArg() > 0 {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
for _, a := range appNames {
|
|
||||||
fmt.Println(a)
|
|
||||||
}
|
|
||||||
},
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,42 +1,49 @@
|
||||||
package app
|
package app
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"context"
|
||||||
"fmt"
|
"fmt"
|
||||||
|
|
||||||
"coopcloud.tech/abra/cli/internal"
|
"coopcloud.tech/abra/cli/internal"
|
||||||
"coopcloud.tech/abra/pkg/catalogue"
|
"coopcloud.tech/abra/pkg/autocomplete"
|
||||||
"coopcloud.tech/abra/pkg/client"
|
"coopcloud.tech/abra/pkg/client"
|
||||||
"coopcloud.tech/abra/pkg/config"
|
"coopcloud.tech/abra/pkg/config"
|
||||||
|
"coopcloud.tech/abra/pkg/lint"
|
||||||
"coopcloud.tech/abra/pkg/recipe"
|
"coopcloud.tech/abra/pkg/recipe"
|
||||||
stack "coopcloud.tech/abra/pkg/upstream/stack"
|
stack "coopcloud.tech/abra/pkg/upstream/stack"
|
||||||
"coopcloud.tech/tagcmp"
|
"coopcloud.tech/tagcmp"
|
||||||
"github.com/AlecAivazis/survey/v2"
|
"github.com/AlecAivazis/survey/v2"
|
||||||
"github.com/sirupsen/logrus"
|
"github.com/sirupsen/logrus"
|
||||||
"github.com/urfave/cli/v2"
|
"github.com/urfave/cli"
|
||||||
)
|
)
|
||||||
|
|
||||||
var appUpgradeCommand = &cli.Command{
|
var appUpgradeCommand = cli.Command{
|
||||||
Name: "upgrade",
|
Name: "upgrade",
|
||||||
Aliases: []string{"u"},
|
Aliases: []string{"up"},
|
||||||
Usage: "Upgrade an app",
|
Usage: "Upgrade an app",
|
||||||
ArgsUsage: "<app>",
|
ArgsUsage: "<domain>",
|
||||||
Flags: []cli.Flag{
|
Flags: []cli.Flag{
|
||||||
|
internal.DebugFlag,
|
||||||
|
internal.NoInputFlag,
|
||||||
internal.ForceFlag,
|
internal.ForceFlag,
|
||||||
internal.ChaosFlag,
|
internal.ChaosFlag,
|
||||||
|
internal.NoDomainChecksFlag,
|
||||||
|
internal.DontWaitConvergeFlag,
|
||||||
},
|
},
|
||||||
|
Before: internal.SubCommandBefore,
|
||||||
Description: `
|
Description: `
|
||||||
This command supports upgrading an app. You can use it to choose and roll out a
|
This command supports upgrading an app. You can use it to choose and roll out a
|
||||||
new upgrade to an existing app.
|
new upgrade to an existing app.
|
||||||
|
|
||||||
This command specifically supports changing the version of running apps, as
|
This command specifically supports incrementing the version of running apps, as
|
||||||
opposed to "abra app deploy <app>" which will not change the version of a
|
opposed to "abra app deploy <domain>" which will not change the version of a
|
||||||
deployed app.
|
deployed app.
|
||||||
|
|
||||||
You may pass "--force/-f" to upgrade to the same version again. This can be
|
You may pass "--force/-f" to upgrade to the same version again. This can be
|
||||||
useful if the container runtime has gotten into a weird state.
|
useful if the container runtime has gotten into a weird state.
|
||||||
|
|
||||||
This action could be destructive, please ensure you have a copy of your app
|
This action could be destructive, please ensure you have a copy of your app
|
||||||
data beforehand - see "abra app backup <app>" for more.
|
data beforehand.
|
||||||
|
|
||||||
Chas mode ("--chaos") will deploy your local checkout of a recipe as-is,
|
Chas mode ("--chaos") will deploy your local checkout of a recipe as-is,
|
||||||
including unstaged changes and can be useful for live hacking and testing new
|
including unstaged changes and can be useful for live hacking and testing new
|
||||||
|
@ -46,36 +53,55 @@ recipes.
|
||||||
app := internal.ValidateApp(c)
|
app := internal.ValidateApp(c)
|
||||||
stackName := app.StackName()
|
stackName := app.StackName()
|
||||||
|
|
||||||
|
if !internal.Chaos {
|
||||||
|
if err := recipe.EnsureUpToDate(app.Recipe); err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
r, err := recipe.Get(app.Recipe)
|
||||||
|
if err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := lint.LintForErrors(r); err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
cl, err := client.New(app.Server)
|
cl, err := client.New(app.Server)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
logrus.Debugf("checking whether '%s' is already deployed", stackName)
|
logrus.Debugf("checking whether %s is already deployed", stackName)
|
||||||
|
|
||||||
isDeployed, deployedVersion, err := stack.IsDeployed(c.Context, cl, stackName)
|
isDeployed, deployedVersion, err := stack.IsDeployed(context.Background(), cl, stackName)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
if !isDeployed {
|
if !isDeployed {
|
||||||
logrus.Fatalf("'%s' is not deployed?", app.Name)
|
logrus.Fatalf("%s is not deployed?", app.Name)
|
||||||
}
|
}
|
||||||
|
|
||||||
versions, err := catalogue.GetRecipeCatalogueVersions(app.Type)
|
catl, err := recipe.ReadRecipeCatalogue()
|
||||||
|
if err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
versions, err := recipe.GetRecipeCatalogueVersions(app.Recipe, catl)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
if len(versions) == 0 && !internal.Chaos {
|
if len(versions) == 0 && !internal.Chaos {
|
||||||
logrus.Fatalf("no versions available '%s' in recipe catalogue?", app.Type)
|
logrus.Fatalf("no published releases for %s in the recipe catalogue?", app.Recipe)
|
||||||
}
|
}
|
||||||
|
|
||||||
var availableUpgrades []string
|
var availableUpgrades []string
|
||||||
if deployedVersion == "" {
|
if deployedVersion == "unknown" {
|
||||||
deployedVersion = "unknown"
|
|
||||||
availableUpgrades = versions
|
availableUpgrades = versions
|
||||||
logrus.Warnf("failed to determine version of deployed '%s'", app.Name)
|
logrus.Warnf("failed to determine version of deployed %s", app.Name)
|
||||||
}
|
}
|
||||||
|
|
||||||
if deployedVersion != "unknown" && !internal.Chaos {
|
if deployedVersion != "unknown" && !internal.Chaos {
|
||||||
|
@ -94,19 +120,21 @@ recipes.
|
||||||
}
|
}
|
||||||
|
|
||||||
if len(availableUpgrades) == 0 && !internal.Force {
|
if len(availableUpgrades) == 0 && !internal.Force {
|
||||||
logrus.Fatal("no available upgrades, you're on latest")
|
logrus.Infof("no available upgrades, you're on latest (%s) ✌️", deployedVersion)
|
||||||
availableUpgrades = versions
|
return nil
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
availableUpgrades = internal.ReverseStringList(availableUpgrades)
|
||||||
|
|
||||||
var chosenUpgrade string
|
var chosenUpgrade string
|
||||||
if len(availableUpgrades) > 0 && !internal.Chaos {
|
if len(availableUpgrades) > 0 && !internal.Chaos {
|
||||||
if internal.Force {
|
if internal.Force || internal.NoInput {
|
||||||
chosenUpgrade = availableUpgrades[len(availableUpgrades)-1]
|
chosenUpgrade = availableUpgrades[len(availableUpgrades)-1]
|
||||||
logrus.Debugf("choosing '%s' as version to upgrade to", chosenUpgrade)
|
logrus.Debugf("choosing %s as version to upgrade to", chosenUpgrade)
|
||||||
} else {
|
} else {
|
||||||
prompt := &survey.Select{
|
prompt := &survey.Select{
|
||||||
Message: fmt.Sprintf("Please select an upgrade (current version: '%s'):", deployedVersion),
|
Message: fmt.Sprintf("Please select an upgrade (current version: %s):", deployedVersion),
|
||||||
Options: availableUpgrades,
|
Options: availableUpgrades,
|
||||||
}
|
}
|
||||||
if err := survey.AskOne(prompt, &chosenUpgrade); err != nil {
|
if err := survey.AskOne(prompt, &chosenUpgrade); err != nil {
|
||||||
|
@ -115,8 +143,16 @@ recipes.
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// if release notes written after git tag published, read them before we
|
||||||
|
// check out the tag and then they'll appear to be missing. this covers
|
||||||
|
// when we obviously will forget to write release notes before publishing
|
||||||
|
releaseNotes, err := internal.GetReleaseNotes(app.Recipe, chosenUpgrade)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
if !internal.Chaos {
|
if !internal.Chaos {
|
||||||
if err := recipe.EnsureVersion(app.Type, chosenUpgrade); err != nil {
|
if err := recipe.EnsureVersion(app.Recipe, chosenUpgrade); err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -124,13 +160,13 @@ recipes.
|
||||||
if internal.Chaos {
|
if internal.Chaos {
|
||||||
logrus.Warn("chaos mode engaged")
|
logrus.Warn("chaos mode engaged")
|
||||||
var err error
|
var err error
|
||||||
chosenUpgrade, err = recipe.ChaosVersion(app.Type)
|
chosenUpgrade, err = recipe.ChaosVersion(app.Recipe)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
abraShPath := fmt.Sprintf("%s/%s/%s", config.APPS_DIR, app.Type, "abra.sh")
|
abraShPath := fmt.Sprintf("%s/%s/%s", config.RECIPES_DIR, app.Recipe, "abra.sh")
|
||||||
abraShEnv, err := config.ReadAbraShEnvVars(abraShPath)
|
abraShEnv, err := config.ReadAbraShEnvVars(abraShPath)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
|
@ -139,7 +175,7 @@ recipes.
|
||||||
app.Env[k] = v
|
app.Env[k] = v
|
||||||
}
|
}
|
||||||
|
|
||||||
composeFiles, err := config.GetAppComposeFiles(app.Type, app.Env)
|
composeFiles, err := config.GetAppComposeFiles(app.Recipe, app.Env)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
|
@ -154,26 +190,15 @@ recipes.
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
if err := internal.NewVersionOverview(app, deployedVersion, chosenUpgrade); err != nil {
|
if err := internal.NewVersionOverview(app, deployedVersion, chosenUpgrade, releaseNotes); err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
if err := stack.RunDeploy(cl, deployOpts, compose); err != nil {
|
if err := stack.RunDeploy(cl, deployOpts, compose, app.StackName(), internal.DontWaitConverge); err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
},
|
},
|
||||||
BashComplete: func(c *cli.Context) {
|
BashComplete: autocomplete.AppNameComplete,
|
||||||
appNames, err := config.GetAppNames()
|
|
||||||
if err != nil {
|
|
||||||
logrus.Warn(err)
|
|
||||||
}
|
|
||||||
if c.NArg() > 0 {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
for _, a := range appNames {
|
|
||||||
fmt.Println(a)
|
|
||||||
}
|
|
||||||
},
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,18 +1,17 @@
|
||||||
package app
|
package app
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"fmt"
|
"context"
|
||||||
"strings"
|
|
||||||
|
|
||||||
abraFormatter "coopcloud.tech/abra/cli/formatter"
|
|
||||||
"coopcloud.tech/abra/cli/internal"
|
"coopcloud.tech/abra/cli/internal"
|
||||||
"coopcloud.tech/abra/pkg/catalogue"
|
"coopcloud.tech/abra/pkg/autocomplete"
|
||||||
"coopcloud.tech/abra/pkg/client"
|
"coopcloud.tech/abra/pkg/client"
|
||||||
"coopcloud.tech/abra/pkg/config"
|
"coopcloud.tech/abra/pkg/formatter"
|
||||||
|
"coopcloud.tech/abra/pkg/recipe"
|
||||||
"coopcloud.tech/abra/pkg/upstream/stack"
|
"coopcloud.tech/abra/pkg/upstream/stack"
|
||||||
"github.com/docker/distribution/reference"
|
"github.com/docker/distribution/reference"
|
||||||
"github.com/sirupsen/logrus"
|
"github.com/sirupsen/logrus"
|
||||||
"github.com/urfave/cli/v2"
|
"github.com/urfave/cli"
|
||||||
)
|
)
|
||||||
|
|
||||||
// getImagePath returns the image name
|
// getImagePath returns the image name
|
||||||
|
@ -21,18 +20,26 @@ func getImagePath(image string) (string, error) {
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return "", err
|
return "", err
|
||||||
}
|
}
|
||||||
|
|
||||||
path := reference.Path(img)
|
path := reference.Path(img)
|
||||||
if strings.Contains(path, "library") {
|
|
||||||
path = strings.Split(path, "/")[1]
|
path = formatter.StripTagMeta(path)
|
||||||
}
|
|
||||||
logrus.Debugf("parsed '%s' from '%s'", path, image)
|
logrus.Debugf("parsed %s from %s", path, image)
|
||||||
|
|
||||||
return path, nil
|
return path, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
var appVersionCommand = &cli.Command{
|
var appVersionCommand = cli.Command{
|
||||||
Name: "version",
|
Name: "version",
|
||||||
Aliases: []string{"v"},
|
Aliases: []string{"v"},
|
||||||
Usage: "Show app versions",
|
ArgsUsage: "<domain>",
|
||||||
|
Flags: []cli.Flag{
|
||||||
|
internal.DebugFlag,
|
||||||
|
internal.NoInputFlag,
|
||||||
|
},
|
||||||
|
Before: internal.SubCommandBefore,
|
||||||
|
Usage: "Show app versions",
|
||||||
Description: `
|
Description: `
|
||||||
This command shows all information about versioning related to a deployed app.
|
This command shows all information about versioning related to a deployed app.
|
||||||
This includes the individual image names, tags and digests. But also the Co-op
|
This includes the individual image names, tags and digests. But also the Co-op
|
||||||
|
@ -47,27 +54,27 @@ Cloud recipe version.
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
logrus.Debugf("checking whether '%s' is already deployed", stackName)
|
logrus.Debugf("checking whether %s is already deployed", stackName)
|
||||||
|
|
||||||
isDeployed, deployedVersion, err := stack.IsDeployed(c.Context, cl, stackName)
|
isDeployed, deployedVersion, err := stack.IsDeployed(context.Background(), cl, stackName)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
if deployedVersion == "" {
|
if deployedVersion == "unknown" {
|
||||||
logrus.Fatalf("failed to determine version of deployed '%s'", app.Name)
|
logrus.Fatalf("failed to determine version of deployed %s", app.Name)
|
||||||
}
|
}
|
||||||
|
|
||||||
if !isDeployed {
|
if !isDeployed {
|
||||||
logrus.Fatalf("'%s' is not deployed?", app.Name)
|
logrus.Fatalf("%s is not deployed?", app.Name)
|
||||||
}
|
}
|
||||||
|
|
||||||
recipeMeta, err := catalogue.GetRecipeMeta(app.Type)
|
recipeMeta, err := recipe.GetRecipeMeta(app.Recipe)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
versionsMeta := make(map[string]catalogue.ServiceMeta)
|
versionsMeta := make(map[string]recipe.ServiceMeta)
|
||||||
for _, recipeVersion := range recipeMeta.Versions {
|
for _, recipeVersion := range recipeMeta.Versions {
|
||||||
if currentVersion, exists := recipeVersion[deployedVersion]; exists {
|
if currentVersion, exists := recipeVersion[deployedVersion]; exists {
|
||||||
versionsMeta = currentVersion
|
versionsMeta = currentVersion
|
||||||
|
@ -75,30 +82,20 @@ Cloud recipe version.
|
||||||
}
|
}
|
||||||
|
|
||||||
if len(versionsMeta) == 0 {
|
if len(versionsMeta) == 0 {
|
||||||
logrus.Fatalf("PANIC: could not retrieve deployed version ('%s') from recipe catalogue?", deployedVersion)
|
logrus.Fatalf("could not retrieve deployed version (%s) from recipe catalogue?", deployedVersion)
|
||||||
}
|
}
|
||||||
|
|
||||||
tableCol := []string{"name", "image", "version", "tag", "digest"}
|
tableCol := []string{"version", "service", "image", "digest"}
|
||||||
table := abraFormatter.CreateTable(tableCol)
|
table := formatter.CreateTable(tableCol)
|
||||||
|
table.SetAutoMergeCellsByColumnIndex([]int{0})
|
||||||
|
|
||||||
for serviceName, versionMeta := range versionsMeta {
|
for serviceName, versionMeta := range versionsMeta {
|
||||||
table.Append([]string{serviceName, versionMeta.Image, deployedVersion, versionMeta.Tag, versionMeta.Digest})
|
table.Append([]string{deployedVersion, serviceName, versionMeta.Image, versionMeta.Digest})
|
||||||
}
|
}
|
||||||
|
|
||||||
table.Render()
|
table.Render()
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
},
|
},
|
||||||
BashComplete: func(c *cli.Context) {
|
BashComplete: autocomplete.AppNameComplete,
|
||||||
appNames, err := config.GetAppNames()
|
|
||||||
if err != nil {
|
|
||||||
logrus.Warn(err)
|
|
||||||
}
|
|
||||||
if c.NArg() > 0 {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
for _, a := range appNames {
|
|
||||||
fmt.Println(a)
|
|
||||||
}
|
|
||||||
},
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,77 +1,105 @@
|
||||||
package app
|
package app
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"fmt"
|
"context"
|
||||||
|
|
||||||
abraFormatter "coopcloud.tech/abra/cli/formatter"
|
|
||||||
"coopcloud.tech/abra/cli/internal"
|
"coopcloud.tech/abra/cli/internal"
|
||||||
|
"coopcloud.tech/abra/pkg/autocomplete"
|
||||||
"coopcloud.tech/abra/pkg/client"
|
"coopcloud.tech/abra/pkg/client"
|
||||||
"coopcloud.tech/abra/pkg/config"
|
"coopcloud.tech/abra/pkg/formatter"
|
||||||
"github.com/AlecAivazis/survey/v2"
|
"github.com/AlecAivazis/survey/v2"
|
||||||
"github.com/sirupsen/logrus"
|
"github.com/sirupsen/logrus"
|
||||||
"github.com/urfave/cli/v2"
|
"github.com/urfave/cli"
|
||||||
)
|
)
|
||||||
|
|
||||||
var appVolumeListCommand = &cli.Command{
|
var appVolumeListCommand = cli.Command{
|
||||||
Name: "list",
|
Name: "list",
|
||||||
Usage: "List volumes associated with an app",
|
Aliases: []string{"ls"},
|
||||||
Aliases: []string{"ls"},
|
ArgsUsage: "<domain>",
|
||||||
|
Flags: []cli.Flag{
|
||||||
|
internal.DebugFlag,
|
||||||
|
internal.NoInputFlag,
|
||||||
|
},
|
||||||
|
Before: internal.SubCommandBefore,
|
||||||
|
Usage: "List volumes associated with an app",
|
||||||
|
BashComplete: autocomplete.AppNameComplete,
|
||||||
Action: func(c *cli.Context) error {
|
Action: func(c *cli.Context) error {
|
||||||
app := internal.ValidateApp(c)
|
app := internal.ValidateApp(c)
|
||||||
|
|
||||||
volumeList, err := client.GetVolumes(c.Context, app.Server, app.Name)
|
volumeList, err := client.GetVolumes(context.Background(), app.Server, app.StackName())
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
table := abraFormatter.CreateTable([]string{"driver", "volume name"})
|
table := formatter.CreateTable([]string{"name", "created", "mounted"})
|
||||||
var volTable [][]string
|
var volTable [][]string
|
||||||
for _, volume := range volumeList {
|
for _, volume := range volumeList {
|
||||||
volRow := []string{
|
volRow := []string{volume.Name, volume.CreatedAt, volume.Mountpoint}
|
||||||
volume.Driver,
|
|
||||||
volume.Name,
|
|
||||||
}
|
|
||||||
volTable = append(volTable, volRow)
|
volTable = append(volTable, volRow)
|
||||||
}
|
}
|
||||||
|
|
||||||
table.AppendBulk(volTable)
|
table.AppendBulk(volTable)
|
||||||
table.Render()
|
|
||||||
|
if table.NumLines() > 0 {
|
||||||
|
table.Render()
|
||||||
|
} else {
|
||||||
|
logrus.Warnf("no volumes created for %s", app.Name)
|
||||||
|
}
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
var appVolumeRemoveCommand = &cli.Command{
|
var appVolumeRemoveCommand = cli.Command{
|
||||||
Name: "remove",
|
Name: "remove",
|
||||||
Usage: "Remove volume(s) associated with an app",
|
Usage: "Remove volume(s) associated with an app",
|
||||||
Aliases: []string{"rm"},
|
Description: `
|
||||||
|
This command supports removing volumes associated with an app. The app in
|
||||||
|
question must be undeployed before you try to remove volumes. See "abra app
|
||||||
|
undeploy <domain>" for more.
|
||||||
|
|
||||||
|
The command is interactive and will show a multiple select input which allows
|
||||||
|
you to make a seclection. Use the "?" key to see more help on navigating this
|
||||||
|
interface.
|
||||||
|
|
||||||
|
Passing "--force/-f" will select all volumes for removal. Be careful.
|
||||||
|
`,
|
||||||
|
ArgsUsage: "<domain>",
|
||||||
|
Aliases: []string{"rm"},
|
||||||
Flags: []cli.Flag{
|
Flags: []cli.Flag{
|
||||||
|
internal.DebugFlag,
|
||||||
|
internal.NoInputFlag,
|
||||||
internal.ForceFlag,
|
internal.ForceFlag,
|
||||||
},
|
},
|
||||||
|
Before: internal.SubCommandBefore,
|
||||||
Action: func(c *cli.Context) error {
|
Action: func(c *cli.Context) error {
|
||||||
app := internal.ValidateApp(c)
|
app := internal.ValidateApp(c)
|
||||||
|
|
||||||
volumeList, err := client.GetVolumes(c.Context, app.Server, app.Name)
|
volumeList, err := client.GetVolumes(context.Background(), app.Server, app.StackName())
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
volumeNames := client.GetVolumeNames(volumeList)
|
volumeNames := client.GetVolumeNames(volumeList)
|
||||||
|
|
||||||
var volumesToRemove []string
|
var volumesToRemove []string
|
||||||
if !internal.Force {
|
if !internal.Force && !internal.NoInput {
|
||||||
volumesPrompt := &survey.MultiSelect{
|
volumesPrompt := &survey.MultiSelect{
|
||||||
Message: "which volumes do you want to remove?",
|
Message: "which volumes do you want to remove?",
|
||||||
|
Help: "'x' indicates selected, enter / return to confirm, ctrl-c to exit, vim mode is enabled",
|
||||||
|
VimMode: true,
|
||||||
Options: volumeNames,
|
Options: volumeNames,
|
||||||
Default: volumeNames,
|
Default: volumeNames,
|
||||||
}
|
}
|
||||||
if err := survey.AskOne(volumesPrompt, &volumesToRemove); err != nil {
|
if err := survey.AskOne(volumesPrompt, &volumesToRemove); err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
} else {
|
}
|
||||||
|
|
||||||
|
if internal.Force || internal.NoInput {
|
||||||
volumesToRemove = volumeNames
|
volumesToRemove = volumeNames
|
||||||
}
|
}
|
||||||
|
|
||||||
err = client.RemoveVolumes(c.Context, app.Server, volumesToRemove, internal.Force)
|
err = client.RemoveVolumes(context.Background(), app.Server, volumesToRemove, internal.Force)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
|
@ -80,26 +108,15 @@ var appVolumeRemoveCommand = &cli.Command{
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
},
|
},
|
||||||
BashComplete: func(c *cli.Context) {
|
BashComplete: autocomplete.AppNameComplete,
|
||||||
appNames, err := config.GetAppNames()
|
|
||||||
if err != nil {
|
|
||||||
logrus.Warn(err)
|
|
||||||
}
|
|
||||||
if c.NArg() > 0 {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
for _, a := range appNames {
|
|
||||||
fmt.Println(a)
|
|
||||||
}
|
|
||||||
},
|
|
||||||
}
|
}
|
||||||
|
|
||||||
var appVolumeCommand = &cli.Command{
|
var appVolumeCommand = cli.Command{
|
||||||
Name: "volume",
|
Name: "volume",
|
||||||
Aliases: []string{"vl"},
|
Aliases: []string{"vl"},
|
||||||
Usage: "Manage app volumes",
|
Usage: "Manage app volumes",
|
||||||
ArgsUsage: "<command>",
|
ArgsUsage: "<domain>",
|
||||||
Subcommands: []*cli.Command{
|
Subcommands: []cli.Command{
|
||||||
appVolumeListCommand,
|
appVolumeListCommand,
|
||||||
appVolumeRemoveCommand,
|
appVolumeRemoveCommand,
|
||||||
},
|
},
|
||||||
|
|
|
@ -1,121 +0,0 @@
|
||||||
package cli
|
|
||||||
|
|
||||||
import (
|
|
||||||
"errors"
|
|
||||||
"fmt"
|
|
||||||
"io"
|
|
||||||
"net/http"
|
|
||||||
"os"
|
|
||||||
"path"
|
|
||||||
|
|
||||||
"coopcloud.tech/abra/cli/internal"
|
|
||||||
"coopcloud.tech/abra/pkg/config"
|
|
||||||
"github.com/sirupsen/logrus"
|
|
||||||
"github.com/urfave/cli/v2"
|
|
||||||
)
|
|
||||||
|
|
||||||
// downloadFile downloads a file brah
|
|
||||||
func downloadFile(filepath string, url string) (err error) {
|
|
||||||
out, err := os.Create(filepath)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
defer out.Close()
|
|
||||||
|
|
||||||
resp, err := http.Get(url)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
defer resp.Body.Close()
|
|
||||||
|
|
||||||
if resp.StatusCode != http.StatusOK {
|
|
||||||
return fmt.Errorf("bad status: %s", resp.Status)
|
|
||||||
}
|
|
||||||
|
|
||||||
_, err = io.Copy(out, resp.Body)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// AutoCompleteCommand helps people set up auto-complete in their shells
|
|
||||||
var AutoCompleteCommand = &cli.Command{
|
|
||||||
Name: "autocomplete",
|
|
||||||
Usage: "Help set up shell autocompletion",
|
|
||||||
Aliases: []string{"ac"},
|
|
||||||
Description: `
|
|
||||||
This command helps set up autocompletion in your shell by downloading the
|
|
||||||
relevant autocompletion files and laying out what additional information must
|
|
||||||
be loaded.
|
|
||||||
|
|
||||||
Example:
|
|
||||||
|
|
||||||
abra autocomplete bash
|
|
||||||
|
|
||||||
Supported shells are as follows:
|
|
||||||
|
|
||||||
fish
|
|
||||||
zsh
|
|
||||||
bash
|
|
||||||
`,
|
|
||||||
ArgsUsage: "<shell>",
|
|
||||||
Action: func(c *cli.Context) error {
|
|
||||||
shellType := c.Args().First()
|
|
||||||
|
|
||||||
if shellType == "" {
|
|
||||||
internal.ShowSubcommandHelpAndError(c, errors.New("no shell provided"))
|
|
||||||
}
|
|
||||||
|
|
||||||
supportedShells := map[string]bool{
|
|
||||||
"bash": true,
|
|
||||||
"zsh": true,
|
|
||||||
"fish": true,
|
|
||||||
}
|
|
||||||
|
|
||||||
if _, ok := supportedShells[shellType]; !ok {
|
|
||||||
logrus.Fatalf("%s is not a supported shell right now, sorry", shellType)
|
|
||||||
}
|
|
||||||
|
|
||||||
if shellType == "fish" {
|
|
||||||
shellType = "zsh" // handled the same on the autocompletion side
|
|
||||||
}
|
|
||||||
|
|
||||||
autocompletionDir := path.Join(config.ABRA_DIR, "autocompletion")
|
|
||||||
if err := os.Mkdir(autocompletionDir, 0755); err != nil {
|
|
||||||
if !os.IsExist(err) {
|
|
||||||
logrus.Fatal(err)
|
|
||||||
}
|
|
||||||
logrus.Debugf("'%s' already created, moving on...", autocompletionDir)
|
|
||||||
}
|
|
||||||
|
|
||||||
autocompletionFile := path.Join(config.ABRA_DIR, "autocompletion", shellType)
|
|
||||||
if _, err := os.Stat(autocompletionFile); err != nil && os.IsNotExist(err) {
|
|
||||||
url := fmt.Sprintf("https://git.coopcloud.tech/coop-cloud/abra/raw/branch/main/scripts/autocomplete/%s", shellType)
|
|
||||||
logrus.Infof("fetching %s", url)
|
|
||||||
if err := downloadFile(autocompletionFile, url); err != nil {
|
|
||||||
logrus.Fatal(err)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
switch shellType {
|
|
||||||
case "bash":
|
|
||||||
fmt.Println(fmt.Sprintf(`
|
|
||||||
# Run the following commands to install autocompletion
|
|
||||||
sudo mkdir /etc/bash/completion.d/
|
|
||||||
sudo cp %s /etc/bash_completion.d/abra
|
|
||||||
echo "source /etc/bash/completion.d/abra" >> ~/.bashrc
|
|
||||||
`, autocompletionFile))
|
|
||||||
case "zsh":
|
|
||||||
fmt.Println(fmt.Sprintf(`
|
|
||||||
# Run the following commands to install autocompletion
|
|
||||||
sudo mkdir /etc/zsh/completion.d/
|
|
||||||
sudo cp %s /etc/zsh/completion.d/abra
|
|
||||||
echo "PROG=abra\n_CLI_ZSH_AUTOCOMPLETE_HACK=1\nsource /etc/zsh/completion.d/abra" >> ~/.zshrc
|
|
||||||
`, autocompletionFile))
|
|
||||||
}
|
|
||||||
|
|
||||||
return nil
|
|
||||||
},
|
|
||||||
}
|
|
|
@ -1,17 +1,317 @@
|
||||||
package catalogue
|
package catalogue
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"github.com/urfave/cli/v2"
|
"encoding/json"
|
||||||
|
"fmt"
|
||||||
|
"io/ioutil"
|
||||||
|
"path"
|
||||||
|
|
||||||
|
"coopcloud.tech/abra/cli/internal"
|
||||||
|
"coopcloud.tech/abra/pkg/autocomplete"
|
||||||
|
"coopcloud.tech/abra/pkg/config"
|
||||||
|
"coopcloud.tech/abra/pkg/formatter"
|
||||||
|
gitPkg "coopcloud.tech/abra/pkg/git"
|
||||||
|
"coopcloud.tech/abra/pkg/limit"
|
||||||
|
"coopcloud.tech/abra/pkg/recipe"
|
||||||
|
"github.com/go-git/go-git/v5"
|
||||||
|
"github.com/sirupsen/logrus"
|
||||||
|
"github.com/urfave/cli"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
// CatalogueSkipList is all the repos that are not recipes.
|
||||||
|
var CatalogueSkipList = map[string]bool{
|
||||||
|
"abra": true,
|
||||||
|
"abra-apps": true,
|
||||||
|
"abra-aur": true,
|
||||||
|
"abra-bash": true,
|
||||||
|
"abra-capsul": true,
|
||||||
|
"abra-gandi": true,
|
||||||
|
"abra-hetzner": true,
|
||||||
|
"apps": true,
|
||||||
|
"aur-abra-git": true,
|
||||||
|
"auto-apps-json": true,
|
||||||
|
"auto-mirror": true,
|
||||||
|
"backup-bot": true,
|
||||||
|
"backup-bot-two": true,
|
||||||
|
"beta.coopcloud.tech": true,
|
||||||
|
"comrade-renovate-bot": true,
|
||||||
|
"coopcloud.tech": true,
|
||||||
|
"coturn": true,
|
||||||
|
"docker-cp-deploy": true,
|
||||||
|
"docker-dind-bats-kcov": true,
|
||||||
|
"docs.coopcloud.tech": true,
|
||||||
|
"drone-abra": true,
|
||||||
|
"example": true,
|
||||||
|
"gardening": true,
|
||||||
|
"go-abra": true,
|
||||||
|
"organising": true,
|
||||||
|
"outline-with-patch": true,
|
||||||
|
"pyabra": true,
|
||||||
|
"radicle-seed-node": true,
|
||||||
|
"recipes-catalogue-json": true,
|
||||||
|
"recipes-wishlist": true,
|
||||||
|
"recipes.coopcloud.tech": true,
|
||||||
|
"stack-ssh-deploy": true,
|
||||||
|
"swarm-cronjob": true,
|
||||||
|
"tagcmp": true,
|
||||||
|
"traefik-cert-dumper": true,
|
||||||
|
"tyop": true,
|
||||||
|
}
|
||||||
|
|
||||||
|
var catalogueGenerateCommand = cli.Command{
|
||||||
|
Name: "generate",
|
||||||
|
Aliases: []string{"g"},
|
||||||
|
Usage: "Generate the recipe catalogue",
|
||||||
|
Flags: []cli.Flag{
|
||||||
|
internal.DebugFlag,
|
||||||
|
internal.NoInputFlag,
|
||||||
|
internal.PublishFlag,
|
||||||
|
internal.DryFlag,
|
||||||
|
internal.SkipUpdatesFlag,
|
||||||
|
},
|
||||||
|
Before: internal.SubCommandBefore,
|
||||||
|
Description: `
|
||||||
|
This command generates a new copy of the recipe catalogue which can be found on:
|
||||||
|
|
||||||
|
https://recipes.coopcloud.tech
|
||||||
|
|
||||||
|
It polls the entire git.coopcloud.tech/coop-cloud/... recipe repository
|
||||||
|
listing, parses README.md and git tags of those repositories to produce recipe
|
||||||
|
metadata and produces a recipes JSON file.
|
||||||
|
|
||||||
|
It is possible to generate new metadata for a single recipe by passing
|
||||||
|
<recipe>. The existing local catalogue will be updated, not overwritten.
|
||||||
|
|
||||||
|
It is quite easy to get rate limited by Docker Hub when running this command.
|
||||||
|
If you have a Hub account you can have Abra log you in to avoid this. Pass
|
||||||
|
"--user" and "--pass".
|
||||||
|
|
||||||
|
Push your new release git.coopcloud.tech with "-p/--publish". This requires
|
||||||
|
that you have permission to git push to these repositories and have your SSH
|
||||||
|
keys configured on your account.
|
||||||
|
`,
|
||||||
|
ArgsUsage: "[<recipe>]",
|
||||||
|
Action: func(c *cli.Context) error {
|
||||||
|
recipeName := c.Args().First()
|
||||||
|
if recipeName != "" {
|
||||||
|
internal.ValidateRecipe(c, true)
|
||||||
|
}
|
||||||
|
|
||||||
|
repos, err := recipe.ReadReposMetadata()
|
||||||
|
if err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
var barLength int
|
||||||
|
var logMsg string
|
||||||
|
if recipeName != "" {
|
||||||
|
barLength = 1
|
||||||
|
logMsg = fmt.Sprintf("ensuring %v recipe is cloned & up-to-date", barLength)
|
||||||
|
} else {
|
||||||
|
barLength = len(repos)
|
||||||
|
logMsg = fmt.Sprintf("ensuring %v recipes are cloned & up-to-date, this could take some time...", barLength)
|
||||||
|
}
|
||||||
|
|
||||||
|
if !internal.SkipUpdates {
|
||||||
|
logrus.Warn(logMsg)
|
||||||
|
if err := updateRepositories(repos, recipeName); err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
catl := make(recipe.RecipeCatalogue)
|
||||||
|
catlBar := formatter.CreateProgressbar(barLength, "generating catalogue metadata...")
|
||||||
|
for _, recipeMeta := range repos {
|
||||||
|
if recipeName != "" && recipeName != recipeMeta.Name {
|
||||||
|
catlBar.Add(1)
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
|
||||||
|
if _, exists := CatalogueSkipList[recipeMeta.Name]; exists {
|
||||||
|
catlBar.Add(1)
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
|
||||||
|
versions, err := recipe.GetRecipeVersions(recipeMeta.Name)
|
||||||
|
if err != nil {
|
||||||
|
logrus.Warn(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
features, category, err := recipe.GetRecipeFeaturesAndCategory(recipeMeta.Name)
|
||||||
|
if err != nil {
|
||||||
|
logrus.Warn(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
catl[recipeMeta.Name] = recipe.RecipeMeta{
|
||||||
|
Name: recipeMeta.Name,
|
||||||
|
Repository: recipeMeta.CloneURL,
|
||||||
|
SSHURL: recipeMeta.SSHURL,
|
||||||
|
Icon: recipeMeta.AvatarURL,
|
||||||
|
DefaultBranch: recipeMeta.DefaultBranch,
|
||||||
|
Description: recipeMeta.Description,
|
||||||
|
Website: recipeMeta.Website,
|
||||||
|
Versions: versions,
|
||||||
|
Category: category,
|
||||||
|
Features: features,
|
||||||
|
}
|
||||||
|
|
||||||
|
catlBar.Add(1)
|
||||||
|
}
|
||||||
|
|
||||||
|
recipesJSON, err := json.MarshalIndent(catl, "", " ")
|
||||||
|
if err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if recipeName == "" {
|
||||||
|
if err := ioutil.WriteFile(config.RECIPES_JSON, recipesJSON, 0764); err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
catlFS, err := recipe.ReadRecipeCatalogue()
|
||||||
|
if err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
catlFS[recipeName] = catl[recipeName]
|
||||||
|
|
||||||
|
updatedRecipesJSON, err := json.MarshalIndent(catlFS, "", " ")
|
||||||
|
if err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := ioutil.WriteFile(config.RECIPES_JSON, updatedRecipesJSON, 0764); err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
logrus.Infof("generated new recipe catalogue in %s", config.RECIPES_JSON)
|
||||||
|
|
||||||
|
cataloguePath := path.Join(config.ABRA_DIR, "catalogue")
|
||||||
|
if internal.Publish {
|
||||||
|
|
||||||
|
isClean, err := gitPkg.IsClean(cataloguePath)
|
||||||
|
if err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if isClean {
|
||||||
|
if !internal.Dry {
|
||||||
|
logrus.Fatalf("no changes discovered in %s, nothing to publish?", cataloguePath)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
msg := "chore: publish new catalogue release changes"
|
||||||
|
if err := gitPkg.Commit(cataloguePath, "**.json", msg, internal.Dry); err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
repo, err := git.PlainOpen(cataloguePath)
|
||||||
|
if err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
sshURL := fmt.Sprintf(config.SSH_URL_TEMPLATE, config.CATALOGUE_JSON_REPO_NAME)
|
||||||
|
if err := gitPkg.CreateRemote(repo, "origin-ssh", sshURL, internal.Dry); err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := gitPkg.Push(cataloguePath, "origin-ssh", false, internal.Dry); err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
repo, err := git.PlainOpen(cataloguePath)
|
||||||
|
if err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
head, err := repo.Head()
|
||||||
|
if err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if !internal.Dry && internal.Publish {
|
||||||
|
url := fmt.Sprintf("%s/%s/commit/%s", config.REPOS_BASE_URL, config.CATALOGUE_JSON_REPO_NAME, head.Hash())
|
||||||
|
logrus.Infof("new changes published: %s", url)
|
||||||
|
}
|
||||||
|
|
||||||
|
if internal.Dry {
|
||||||
|
logrus.Info("dry run: no changes published")
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil
|
||||||
|
},
|
||||||
|
BashComplete: autocomplete.RecipeNameComplete,
|
||||||
|
}
|
||||||
|
|
||||||
// CatalogueCommand defines the `abra catalogue` command and sub-commands.
|
// CatalogueCommand defines the `abra catalogue` command and sub-commands.
|
||||||
var CatalogueCommand = &cli.Command{
|
var CatalogueCommand = cli.Command{
|
||||||
Name: "catalogue",
|
Name: "catalogue",
|
||||||
Usage: "Manage the recipe catalogue (for maintainers)",
|
Usage: "Manage the recipe catalogue",
|
||||||
Aliases: []string{"c"},
|
Aliases: []string{"c"},
|
||||||
ArgsUsage: "<recipe>",
|
ArgsUsage: "<recipe>",
|
||||||
Description: "This command helps recipe packagers interact with the recipe catalogue",
|
Description: "This command helps recipe packagers interact with the recipe catalogue",
|
||||||
Subcommands: []*cli.Command{
|
Subcommands: []cli.Command{
|
||||||
catalogueGenerateCommand,
|
catalogueGenerateCommand,
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func updateRepositories(repos recipe.RepoCatalogue, recipeName string) error {
|
||||||
|
var barLength int
|
||||||
|
if recipeName != "" {
|
||||||
|
barLength = 1
|
||||||
|
} else {
|
||||||
|
barLength = len(repos)
|
||||||
|
}
|
||||||
|
|
||||||
|
cloneLimiter := limit.New(10)
|
||||||
|
|
||||||
|
retrieveBar := formatter.CreateProgressbar(barLength, "ensuring recipes are cloned & up-to-date...")
|
||||||
|
ch := make(chan string, barLength)
|
||||||
|
for _, repoMeta := range repos {
|
||||||
|
go func(rm recipe.RepoMeta) {
|
||||||
|
cloneLimiter.Begin()
|
||||||
|
defer cloneLimiter.End()
|
||||||
|
|
||||||
|
if recipeName != "" && recipeName != rm.Name {
|
||||||
|
ch <- rm.Name
|
||||||
|
retrieveBar.Add(1)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if _, exists := CatalogueSkipList[rm.Name]; exists {
|
||||||
|
ch <- rm.Name
|
||||||
|
retrieveBar.Add(1)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
recipeDir := path.Join(config.RECIPES_DIR, rm.Name)
|
||||||
|
|
||||||
|
if err := gitPkg.Clone(recipeDir, rm.CloneURL); err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
isClean, err := gitPkg.IsClean(recipeDir)
|
||||||
|
if err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if !isClean {
|
||||||
|
logrus.Fatalf("%s has locally unstaged changes", rm.Name)
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := recipe.EnsureUpToDate(rm.Name); err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
ch <- rm.Name
|
||||||
|
retrieveBar.Add(1)
|
||||||
|
}(repoMeta)
|
||||||
|
}
|
||||||
|
|
||||||
|
for range repos {
|
||||||
|
<-ch // wait for everything
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
|
@ -1,261 +0,0 @@
|
||||||
package catalogue
|
|
||||||
|
|
||||||
import (
|
|
||||||
"encoding/json"
|
|
||||||
"fmt"
|
|
||||||
"io/ioutil"
|
|
||||||
"os"
|
|
||||||
"path"
|
|
||||||
|
|
||||||
"coopcloud.tech/abra/cli/formatter"
|
|
||||||
"coopcloud.tech/abra/cli/internal"
|
|
||||||
"coopcloud.tech/abra/pkg/catalogue"
|
|
||||||
"coopcloud.tech/abra/pkg/config"
|
|
||||||
gitPkg "coopcloud.tech/abra/pkg/git"
|
|
||||||
"coopcloud.tech/abra/pkg/limit"
|
|
||||||
"github.com/AlecAivazis/survey/v2"
|
|
||||||
"github.com/go-git/go-git/v5"
|
|
||||||
"github.com/sirupsen/logrus"
|
|
||||||
"github.com/urfave/cli/v2"
|
|
||||||
)
|
|
||||||
|
|
||||||
// CatalogueSkipList is all the repos that are not recipes.
|
|
||||||
var CatalogueSkipList = map[string]bool{
|
|
||||||
"abra": true,
|
|
||||||
"abra-bash": true,
|
|
||||||
"abra-apps": true,
|
|
||||||
"abra-aur": true,
|
|
||||||
"abra-capsul": true,
|
|
||||||
"abra-gandi": true,
|
|
||||||
"abra-hetzner": true,
|
|
||||||
"apps": true,
|
|
||||||
"aur-abra-git": true,
|
|
||||||
"auto-apps-json": true,
|
|
||||||
"auto-mirror": true,
|
|
||||||
"backup-bot": true,
|
|
||||||
"backup-bot-two": true,
|
|
||||||
"coopcloud.tech": true,
|
|
||||||
"coturn": true,
|
|
||||||
"docker-cp-deploy": true,
|
|
||||||
"docker-dind-bats-kcov": true,
|
|
||||||
"docs.coopcloud.tech": true,
|
|
||||||
"example": true,
|
|
||||||
"gardening": true,
|
|
||||||
"go-abra": true,
|
|
||||||
"organising": true,
|
|
||||||
"pyabra": true,
|
|
||||||
"radicle-seed-node": true,
|
|
||||||
"stack-ssh-deploy": true,
|
|
||||||
"swarm-cronjob": true,
|
|
||||||
"tagcmp": true,
|
|
||||||
"tyop": true,
|
|
||||||
}
|
|
||||||
|
|
||||||
var commit bool
|
|
||||||
var commitFlag = &cli.BoolFlag{
|
|
||||||
Name: "commit",
|
|
||||||
Usage: "Commits new generated catalogue changes",
|
|
||||||
Value: false,
|
|
||||||
Aliases: []string{"c"},
|
|
||||||
Destination: &commit,
|
|
||||||
}
|
|
||||||
|
|
||||||
var catalogueGenerateCommand = &cli.Command{
|
|
||||||
Name: "generate",
|
|
||||||
Aliases: []string{"g"},
|
|
||||||
Usage: "Generate a new copy of the catalogue",
|
|
||||||
Flags: []cli.Flag{
|
|
||||||
internal.PushFlag,
|
|
||||||
commitFlag,
|
|
||||||
internal.CommitMessageFlag,
|
|
||||||
},
|
|
||||||
Description: `
|
|
||||||
This command generates a new copy of the recipe catalogue which can be found on:
|
|
||||||
|
|
||||||
https://recipes.coopcloud.tech
|
|
||||||
|
|
||||||
It polls the entire git.coopcloud.tech/coop-cloud/... recipe repository
|
|
||||||
listing, parses README and tags to produce recipe metadata and produces a
|
|
||||||
apps.json file which is placed in your ~/.abra/catalogue/recipes.json.
|
|
||||||
|
|
||||||
It is possible to generate new metadata for a single recipe by passing
|
|
||||||
<recipe>. The existing local catalogue will be updated, not overwritten.
|
|
||||||
|
|
||||||
A new catalogue copy can be published to the recipes repository by passing the
|
|
||||||
"--commit" and "--push" flags. The recipes repository is available here:
|
|
||||||
|
|
||||||
https://git.coopcloud.tech/coop-cloud/recipes
|
|
||||||
|
|
||||||
`,
|
|
||||||
ArgsUsage: "[<recipe>]",
|
|
||||||
Action: func(c *cli.Context) error {
|
|
||||||
recipeName := c.Args().First()
|
|
||||||
|
|
||||||
catalogueDir := path.Join(config.ABRA_DIR, "catalogue")
|
|
||||||
url := fmt.Sprintf("%s/%s.git", config.REPOS_BASE_URL, "recipes")
|
|
||||||
if err := gitPkg.Clone(catalogueDir, url); err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
repos, err := catalogue.ReadReposMetadata()
|
|
||||||
if err != nil {
|
|
||||||
logrus.Fatal(err)
|
|
||||||
}
|
|
||||||
|
|
||||||
logrus.Debugf("ensuring '%v' recipe(s) are locally present and up-to-date", len(repos))
|
|
||||||
|
|
||||||
cloneLimiter := limit.New(10)
|
|
||||||
retrieveBar := formatter.CreateProgressbar(len(repos), "retrieving recipes...")
|
|
||||||
ch := make(chan string, len(repos))
|
|
||||||
for _, repoMeta := range repos {
|
|
||||||
go func(rm catalogue.RepoMeta) {
|
|
||||||
cloneLimiter.Begin()
|
|
||||||
defer cloneLimiter.End()
|
|
||||||
|
|
||||||
if recipeName != "" && recipeName != rm.Name {
|
|
||||||
ch <- rm.Name
|
|
||||||
retrieveBar.Add(1)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
if _, exists := CatalogueSkipList[rm.Name]; exists {
|
|
||||||
ch <- rm.Name
|
|
||||||
retrieveBar.Add(1)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
recipeDir := path.Join(config.ABRA_DIR, "apps", rm.Name)
|
|
||||||
|
|
||||||
if err := gitPkg.Clone(recipeDir, rm.SSHURL); err != nil {
|
|
||||||
logrus.Fatal(err)
|
|
||||||
}
|
|
||||||
|
|
||||||
if err := gitPkg.EnsureUpToDate(recipeDir); err != nil {
|
|
||||||
logrus.Fatal(err)
|
|
||||||
}
|
|
||||||
|
|
||||||
ch <- rm.Name
|
|
||||||
retrieveBar.Add(1)
|
|
||||||
}(repoMeta)
|
|
||||||
}
|
|
||||||
|
|
||||||
for range repos {
|
|
||||||
<-ch // wait for everything
|
|
||||||
}
|
|
||||||
|
|
||||||
catl := make(catalogue.RecipeCatalogue)
|
|
||||||
catlBar := formatter.CreateProgressbar(len(repos), "generating catalogue...")
|
|
||||||
for _, recipeMeta := range repos {
|
|
||||||
if recipeName != "" && recipeName != recipeMeta.Name {
|
|
||||||
catlBar.Add(1)
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
|
|
||||||
if _, exists := CatalogueSkipList[recipeMeta.Name]; exists {
|
|
||||||
catlBar.Add(1)
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
|
|
||||||
versions, err := catalogue.GetRecipeVersions(recipeMeta.Name)
|
|
||||||
if err != nil {
|
|
||||||
logrus.Fatal(err)
|
|
||||||
}
|
|
||||||
|
|
||||||
catl[recipeMeta.Name] = catalogue.RecipeMeta{
|
|
||||||
Name: recipeMeta.Name,
|
|
||||||
Repository: recipeMeta.CloneURL,
|
|
||||||
Icon: recipeMeta.AvatarURL,
|
|
||||||
DefaultBranch: recipeMeta.DefaultBranch,
|
|
||||||
Description: recipeMeta.Description,
|
|
||||||
Website: recipeMeta.Website,
|
|
||||||
Versions: versions,
|
|
||||||
// Category: ..., // FIXME: parse & load
|
|
||||||
// Features: ..., // FIXME: parse & load
|
|
||||||
}
|
|
||||||
catlBar.Add(1)
|
|
||||||
}
|
|
||||||
|
|
||||||
recipesJSON, err := json.MarshalIndent(catl, "", " ")
|
|
||||||
if err != nil {
|
|
||||||
logrus.Fatal(err)
|
|
||||||
}
|
|
||||||
|
|
||||||
if _, err := os.Stat(config.APPS_JSON); err != nil && os.IsNotExist(err) {
|
|
||||||
if err := ioutil.WriteFile(config.APPS_JSON, recipesJSON, 0644); err != nil {
|
|
||||||
logrus.Fatal(err)
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
if recipeName != "" {
|
|
||||||
catlFS, err := catalogue.ReadRecipeCatalogue()
|
|
||||||
if err != nil {
|
|
||||||
logrus.Fatal(err)
|
|
||||||
}
|
|
||||||
catlFS[recipeName] = catl[recipeName]
|
|
||||||
|
|
||||||
updatedRecipesJSON, err := json.MarshalIndent(catlFS, "", " ")
|
|
||||||
if err != nil {
|
|
||||||
logrus.Fatal(err)
|
|
||||||
}
|
|
||||||
if err := ioutil.WriteFile(config.APPS_JSON, updatedRecipesJSON, 0644); err != nil {
|
|
||||||
logrus.Fatal(err)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
cataloguePath := path.Join(config.ABRA_DIR, "catalogue", "recipes.json")
|
|
||||||
logrus.Infof("generated new recipe catalogue in %s", cataloguePath)
|
|
||||||
|
|
||||||
if commit {
|
|
||||||
repoPath := path.Join(config.ABRA_DIR, "catalogue")
|
|
||||||
commitRepo, err := git.PlainOpen(repoPath)
|
|
||||||
if err != nil {
|
|
||||||
logrus.Fatal(err)
|
|
||||||
}
|
|
||||||
|
|
||||||
commitWorktree, err := commitRepo.Worktree()
|
|
||||||
if err != nil {
|
|
||||||
logrus.Fatal(err)
|
|
||||||
}
|
|
||||||
|
|
||||||
if internal.CommitMessage == "" {
|
|
||||||
prompt := &survey.Input{
|
|
||||||
Message: "commit message",
|
|
||||||
Default: "chore: publish new catalogue changes",
|
|
||||||
}
|
|
||||||
if err := survey.AskOne(prompt, &internal.CommitMessage); err != nil {
|
|
||||||
logrus.Fatal(err)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
err = commitWorktree.AddGlob("**.json")
|
|
||||||
if err != nil {
|
|
||||||
logrus.Fatal(err)
|
|
||||||
}
|
|
||||||
logrus.Debug("staged **.json for commit")
|
|
||||||
|
|
||||||
_, err = commitWorktree.Commit(internal.CommitMessage, &git.CommitOptions{})
|
|
||||||
if err != nil {
|
|
||||||
logrus.Fatal(err)
|
|
||||||
}
|
|
||||||
logrus.Info("changes commited")
|
|
||||||
|
|
||||||
if err := commitRepo.Push(&git.PushOptions{}); err != nil {
|
|
||||||
logrus.Fatal(err)
|
|
||||||
}
|
|
||||||
logrus.Info("changes pushed")
|
|
||||||
}
|
|
||||||
|
|
||||||
return nil
|
|
||||||
},
|
|
||||||
BashComplete: func(c *cli.Context) {
|
|
||||||
catl, err := catalogue.ReadRecipeCatalogue()
|
|
||||||
if err != nil {
|
|
||||||
logrus.Warn(err)
|
|
||||||
}
|
|
||||||
if c.NArg() > 0 {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
for name := range catl {
|
|
||||||
fmt.Println(name)
|
|
||||||
}
|
|
||||||
},
|
|
||||||
}
|
|
174
cli/cli.go
174
cli/cli.go
|
@ -2,8 +2,10 @@
|
||||||
package cli
|
package cli
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"errors"
|
||||||
"fmt"
|
"fmt"
|
||||||
"os"
|
"os"
|
||||||
|
"os/exec"
|
||||||
"path"
|
"path"
|
||||||
|
|
||||||
"coopcloud.tech/abra/cli/app"
|
"coopcloud.tech/abra/cli/app"
|
||||||
|
@ -12,50 +14,145 @@ import (
|
||||||
"coopcloud.tech/abra/cli/recipe"
|
"coopcloud.tech/abra/cli/recipe"
|
||||||
"coopcloud.tech/abra/cli/record"
|
"coopcloud.tech/abra/cli/record"
|
||||||
"coopcloud.tech/abra/cli/server"
|
"coopcloud.tech/abra/cli/server"
|
||||||
|
"coopcloud.tech/abra/pkg/autocomplete"
|
||||||
"coopcloud.tech/abra/pkg/config"
|
"coopcloud.tech/abra/pkg/config"
|
||||||
logrusStack "github.com/Gurpartap/logrus-stack"
|
"coopcloud.tech/abra/pkg/web"
|
||||||
"github.com/sirupsen/logrus"
|
"github.com/sirupsen/logrus"
|
||||||
"github.com/urfave/cli/v2"
|
"github.com/urfave/cli"
|
||||||
)
|
)
|
||||||
|
|
||||||
// Verbose stores the variable from VerboseFlag.
|
// AutoCompleteCommand helps people set up auto-complete in their shells
|
||||||
var Verbose bool
|
var AutoCompleteCommand = cli.Command{
|
||||||
|
Name: "autocomplete",
|
||||||
|
Aliases: []string{"ac"},
|
||||||
|
Usage: "Configure shell autocompletion (recommended)",
|
||||||
|
Description: `
|
||||||
|
This command helps set up autocompletion in your shell by downloading the
|
||||||
|
relevant autocompletion files and laying out what additional information must
|
||||||
|
be loaded.
|
||||||
|
|
||||||
// VerboseFlag turns on/off verbose logging down to the INFO level.
|
Example:
|
||||||
var VerboseFlag = &cli.BoolFlag{
|
|
||||||
Name: "verbose",
|
abra autocomplete bash
|
||||||
Aliases: []string{"V"},
|
|
||||||
Value: false,
|
Supported shells are as follows:
|
||||||
Destination: &Verbose,
|
|
||||||
Usage: "Show INFO messages",
|
fizsh
|
||||||
|
zsh
|
||||||
|
bash
|
||||||
|
`,
|
||||||
|
ArgsUsage: "<shell>",
|
||||||
|
Flags: []cli.Flag{
|
||||||
|
internal.DebugFlag,
|
||||||
|
},
|
||||||
|
Action: func(c *cli.Context) error {
|
||||||
|
shellType := c.Args().First()
|
||||||
|
|
||||||
|
if shellType == "" {
|
||||||
|
internal.ShowSubcommandHelpAndError(c, errors.New("no shell provided"))
|
||||||
|
}
|
||||||
|
|
||||||
|
supportedShells := map[string]bool{
|
||||||
|
"bash": true,
|
||||||
|
"zsh": true,
|
||||||
|
"fizsh": true,
|
||||||
|
}
|
||||||
|
|
||||||
|
if _, ok := supportedShells[shellType]; !ok {
|
||||||
|
logrus.Fatalf("%s is not a supported shell right now, sorry", shellType)
|
||||||
|
}
|
||||||
|
|
||||||
|
if shellType == "fizsh" {
|
||||||
|
shellType = "zsh" // handled the same on the autocompletion side
|
||||||
|
}
|
||||||
|
|
||||||
|
autocompletionDir := path.Join(config.ABRA_DIR, "autocompletion")
|
||||||
|
if err := os.Mkdir(autocompletionDir, 0764); err != nil {
|
||||||
|
if !os.IsExist(err) {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
logrus.Debugf("%s already created", autocompletionDir)
|
||||||
|
}
|
||||||
|
|
||||||
|
autocompletionFile := path.Join(config.ABRA_DIR, "autocompletion", shellType)
|
||||||
|
if _, err := os.Stat(autocompletionFile); err != nil && os.IsNotExist(err) {
|
||||||
|
url := fmt.Sprintf("https://git.coopcloud.tech/coop-cloud/abra/raw/branch/main/scripts/autocomplete/%s", shellType)
|
||||||
|
logrus.Infof("fetching %s", url)
|
||||||
|
if err := web.GetFile(autocompletionFile, url); err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
switch shellType {
|
||||||
|
case "bash":
|
||||||
|
fmt.Println(fmt.Sprintf(`
|
||||||
|
# Run the following commands to install autocompletion
|
||||||
|
sudo mkdir /etc/bash_completion.d/
|
||||||
|
sudo cp %s /etc/bash_completion.d/abra
|
||||||
|
echo "source /etc/bash_completion.d/abra" >> ~/.bashrc
|
||||||
|
# And finally run "abra app ps <hit tab key>" to test things are working, you should see app domains listed!
|
||||||
|
`, autocompletionFile))
|
||||||
|
case "zsh":
|
||||||
|
fmt.Println(fmt.Sprintf(`
|
||||||
|
# Run the following commands to install autocompletion
|
||||||
|
sudo mkdir /etc/zsh/completion.d/
|
||||||
|
sudo cp %s /etc/zsh/completion.d/abra
|
||||||
|
echo "PROG=abra\n_CLI_ZSH_AUTOCOMPLETE_HACK=1\nsource /etc/zsh/completion.d/abra" >> ~/.zshrc
|
||||||
|
# And finally run "abra app ps <hit tab key>" to test things are working, you should see app domains listed!
|
||||||
|
`, autocompletionFile))
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil
|
||||||
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
// Debug stores the variable from DebugFlag.
|
// UpgradeCommand upgrades abra in-place.
|
||||||
var Debug bool
|
var UpgradeCommand = cli.Command{
|
||||||
|
Name: "upgrade",
|
||||||
|
Aliases: []string{"u"},
|
||||||
|
Usage: "Upgrade Abra itself",
|
||||||
|
Description: `
|
||||||
|
This command allows you to upgrade Abra in-place with the latest stable or
|
||||||
|
release candidate.
|
||||||
|
|
||||||
// DebugFlag turns on/off verbose logging down to the DEBUG level.
|
If you would like to install the latest release candidate, please pass the
|
||||||
var DebugFlag = &cli.BoolFlag{
|
"-r/--rc" option. Please bear in mind that the latest release candidate may
|
||||||
Name: "debug",
|
have some catastrophic bugs contained in it. In any case, thank you very much
|
||||||
Aliases: []string{"d"},
|
for the testing efforts!
|
||||||
Value: false,
|
`,
|
||||||
Destination: &Debug,
|
Flags: []cli.Flag{internal.RCFlag},
|
||||||
Usage: "Show DEBUG messages",
|
Action: func(c *cli.Context) error {
|
||||||
|
mainURL := "https://install.abra.coopcloud.tech"
|
||||||
|
cmd := exec.Command("bash", "-c", fmt.Sprintf("wget -q -O- %s | bash", mainURL))
|
||||||
|
|
||||||
|
if internal.RC {
|
||||||
|
releaseCandidateURL := "https://git.coopcloud.tech/coop-cloud/abra/raw/branch/main/scripts/installer/installer"
|
||||||
|
cmd = exec.Command("bash", "-c", fmt.Sprintf("wget -q -O- %s | bash -s -- --rc", releaseCandidateURL))
|
||||||
|
}
|
||||||
|
|
||||||
|
logrus.Debugf("attempting to run %s", cmd)
|
||||||
|
|
||||||
|
if err := internal.RunCmd(cmd); err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil
|
||||||
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
func newAbraApp(version, commit string) *cli.App {
|
func newAbraApp(version, commit string) *cli.App {
|
||||||
app := &cli.App{
|
app := &cli.App{
|
||||||
Name: "abra",
|
Name: "abra",
|
||||||
Usage: `The Co-op Cloud command-line utility belt 🎩🐇
|
Usage: `The Co-op Cloud command-line utility belt 🎩🐇
|
||||||
|
|
||||||
____ ____ _ _
|
____ ____ _ _
|
||||||
/ ___|___ ___ _ __ / ___| | ___ _ _ __| |
|
/ ___|___ ___ _ __ / ___| | ___ _ _ __| |
|
||||||
| | / _ \ _____ / _ \| '_ \ | | | |/ _ \| | | |/ _' |
|
| | / _ \ _____ / _ \| '_ \ | | | |/ _ \| | | |/ _' |
|
||||||
| |__| (_) |_____| (_) | |_) | | |___| | (_) | |_| | (_| |
|
| |__| (_) |_____| (_) | |_) | | |___| | (_) | |_| | (_| |
|
||||||
\____\___/ \___/| .__/ \____|_|\___/ \__,_|\__,_|
|
\____\___/ \___/| .__/ \____|_|\___/ \__,_|\__,_|
|
||||||
|_|
|
|_|
|
||||||
`,
|
`,
|
||||||
Version: fmt.Sprintf("%s-%s", version, commit[:7]),
|
Version: fmt.Sprintf("%s-%s", version, commit[:7]),
|
||||||
Commands: []*cli.Command{
|
Commands: []cli.Command{
|
||||||
app.AppCommand,
|
app.AppCommand,
|
||||||
server.ServerCommand,
|
server.ServerCommand,
|
||||||
recipe.RecipeCommand,
|
recipe.RecipeCommand,
|
||||||
|
@ -64,48 +161,29 @@ func newAbraApp(version, commit string) *cli.App {
|
||||||
UpgradeCommand,
|
UpgradeCommand,
|
||||||
AutoCompleteCommand,
|
AutoCompleteCommand,
|
||||||
},
|
},
|
||||||
Flags: []cli.Flag{
|
BashComplete: autocomplete.SubcommandComplete,
|
||||||
VerboseFlag,
|
|
||||||
DebugFlag,
|
|
||||||
internal.NoInputFlag,
|
|
||||||
},
|
|
||||||
Authors: []*cli.Author{
|
|
||||||
{Name: "3wordchant"},
|
|
||||||
{Name: "decentral1se"},
|
|
||||||
{Name: "knoflook"},
|
|
||||||
{Name: "roxxers"},
|
|
||||||
},
|
|
||||||
}
|
}
|
||||||
|
|
||||||
app.EnableBashCompletion = true
|
app.EnableBashCompletion = true
|
||||||
|
|
||||||
app.Before = func(c *cli.Context) error {
|
app.Before = func(c *cli.Context) error {
|
||||||
if Debug {
|
|
||||||
logrus.SetLevel(logrus.DebugLevel)
|
|
||||||
logrus.SetFormatter(&logrus.TextFormatter{})
|
|
||||||
logrus.SetOutput(os.Stderr)
|
|
||||||
logrus.AddHook(logrusStack.StandardHook())
|
|
||||||
}
|
|
||||||
|
|
||||||
paths := []string{
|
paths := []string{
|
||||||
config.ABRA_DIR,
|
config.ABRA_DIR,
|
||||||
path.Join(config.ABRA_DIR, "servers"),
|
path.Join(config.SERVERS_DIR),
|
||||||
path.Join(config.ABRA_DIR, "apps"),
|
path.Join(config.RECIPES_DIR),
|
||||||
path.Join(config.ABRA_DIR, "vendor"),
|
path.Join(config.VENDOR_DIR),
|
||||||
}
|
}
|
||||||
|
|
||||||
for _, path := range paths {
|
for _, path := range paths {
|
||||||
if err := os.Mkdir(path, 0755); err != nil {
|
if err := os.Mkdir(path, 0764); err != nil {
|
||||||
if !os.IsExist(err) {
|
if !os.IsExist(err) {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
logrus.Debugf("'%s' already created, moving on...", path)
|
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
logrus.Debugf("'%s' is missing, creating...", path)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
logrus.Debugf("abra version '%s', commit '%s'", version, commit)
|
logrus.Debugf("abra version %s, commit %s", version, commit)
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
|
@ -0,0 +1,433 @@
|
||||||
|
package internal
|
||||||
|
|
||||||
|
import (
|
||||||
|
"os"
|
||||||
|
|
||||||
|
logrusStack "github.com/Gurpartap/logrus-stack"
|
||||||
|
"github.com/sirupsen/logrus"
|
||||||
|
"github.com/urfave/cli"
|
||||||
|
)
|
||||||
|
|
||||||
|
// Secrets stores the variable from SecretsFlag
|
||||||
|
var Secrets bool
|
||||||
|
|
||||||
|
// SecretsFlag turns on/off automatically generating secrets
|
||||||
|
var SecretsFlag = &cli.BoolFlag{
|
||||||
|
Name: "secrets, S",
|
||||||
|
Usage: "Automatically generate secrets",
|
||||||
|
Destination: &Secrets,
|
||||||
|
}
|
||||||
|
|
||||||
|
// Pass stores the variable from PassFlag
|
||||||
|
var Pass bool
|
||||||
|
|
||||||
|
// PassFlag turns on/off storing generated secrets in pass
|
||||||
|
var PassFlag = &cli.BoolFlag{
|
||||||
|
Name: "pass, p",
|
||||||
|
Usage: "Store the generated secrets in a local pass store",
|
||||||
|
Destination: &Pass,
|
||||||
|
}
|
||||||
|
|
||||||
|
// PassRemove stores the variable for PassRemoveFlag
|
||||||
|
var PassRemove bool
|
||||||
|
|
||||||
|
// PassRemoveFlag turns on/off removing generated secrets from pass
|
||||||
|
var PassRemoveFlag = &cli.BoolFlag{
|
||||||
|
Name: "pass, p",
|
||||||
|
Usage: "Remove generated secrets from a local pass store",
|
||||||
|
Destination: &PassRemove,
|
||||||
|
}
|
||||||
|
|
||||||
|
// Force force functionality without asking.
|
||||||
|
var Force bool
|
||||||
|
|
||||||
|
// ForceFlag turns on/off force functionality.
|
||||||
|
var ForceFlag = &cli.BoolFlag{
|
||||||
|
Name: "force, f",
|
||||||
|
Usage: "Perform action without further prompt. Use with care!",
|
||||||
|
Destination: &Force,
|
||||||
|
}
|
||||||
|
|
||||||
|
// Chaos engages chaos mode.
|
||||||
|
var Chaos bool
|
||||||
|
|
||||||
|
// ChaosFlag turns on/off chaos functionality.
|
||||||
|
var ChaosFlag = &cli.BoolFlag{
|
||||||
|
Name: "chaos, C",
|
||||||
|
Usage: "Deploy uncommitted recipes changes. Use with care!",
|
||||||
|
Destination: &Chaos,
|
||||||
|
}
|
||||||
|
|
||||||
|
// DNSProvider specifies a DNS provider.
|
||||||
|
var DNSProvider string
|
||||||
|
|
||||||
|
// DNSProviderFlag selects a DNS provider.
|
||||||
|
var DNSProviderFlag = &cli.StringFlag{
|
||||||
|
Name: "provider, p",
|
||||||
|
Value: "",
|
||||||
|
Usage: "DNS provider",
|
||||||
|
Destination: &DNSProvider,
|
||||||
|
}
|
||||||
|
|
||||||
|
var NoInput bool
|
||||||
|
var NoInputFlag = &cli.BoolFlag{
|
||||||
|
Name: "no-input, n",
|
||||||
|
Usage: "Toggle non-interactive mode",
|
||||||
|
Destination: &NoInput,
|
||||||
|
}
|
||||||
|
|
||||||
|
var DNSType string
|
||||||
|
|
||||||
|
var DNSTypeFlag = &cli.StringFlag{
|
||||||
|
Name: "record-type, rt",
|
||||||
|
Value: "",
|
||||||
|
Usage: "Domain name record type (e.g. A)",
|
||||||
|
Destination: &DNSType,
|
||||||
|
}
|
||||||
|
|
||||||
|
var DNSName string
|
||||||
|
|
||||||
|
var DNSNameFlag = &cli.StringFlag{
|
||||||
|
Name: "record-name, rn",
|
||||||
|
Value: "",
|
||||||
|
Usage: "Domain name record name (e.g. mysubdomain)",
|
||||||
|
Destination: &DNSName,
|
||||||
|
}
|
||||||
|
|
||||||
|
var DNSValue string
|
||||||
|
|
||||||
|
var DNSValueFlag = &cli.StringFlag{
|
||||||
|
Name: "record-value, rv",
|
||||||
|
Value: "",
|
||||||
|
Usage: "Domain name record value (e.g. 192.168.1.1)",
|
||||||
|
Destination: &DNSValue,
|
||||||
|
}
|
||||||
|
|
||||||
|
var DNSTTL string
|
||||||
|
var DNSTTLFlag = &cli.StringFlag{
|
||||||
|
Name: "record-ttl, rl",
|
||||||
|
Value: "600s",
|
||||||
|
Usage: "Domain name TTL value (seconds)",
|
||||||
|
Destination: &DNSTTL,
|
||||||
|
}
|
||||||
|
|
||||||
|
var DNSPriority int
|
||||||
|
|
||||||
|
var DNSPriorityFlag = &cli.IntFlag{
|
||||||
|
Name: "record-priority, rp",
|
||||||
|
Value: 10,
|
||||||
|
Usage: "Domain name priority value",
|
||||||
|
Destination: &DNSPriority,
|
||||||
|
}
|
||||||
|
|
||||||
|
var ServerProvider string
|
||||||
|
|
||||||
|
var ServerProviderFlag = &cli.StringFlag{
|
||||||
|
Name: "provider, p",
|
||||||
|
Usage: "3rd party server provider",
|
||||||
|
Destination: &ServerProvider,
|
||||||
|
}
|
||||||
|
|
||||||
|
var CapsulInstanceURL string
|
||||||
|
|
||||||
|
var CapsulInstanceURLFlag = &cli.StringFlag{
|
||||||
|
Name: "capsul-url, cu",
|
||||||
|
Value: "yolo.servers.coop",
|
||||||
|
Usage: "capsul instance URL",
|
||||||
|
Destination: &CapsulInstanceURL,
|
||||||
|
}
|
||||||
|
|
||||||
|
var CapsulName string
|
||||||
|
|
||||||
|
var CapsulNameFlag = &cli.StringFlag{
|
||||||
|
Name: "capsul-name, cn",
|
||||||
|
Value: "",
|
||||||
|
Usage: "capsul name",
|
||||||
|
Destination: &CapsulName,
|
||||||
|
}
|
||||||
|
|
||||||
|
var CapsulType string
|
||||||
|
|
||||||
|
var CapsulTypeFlag = &cli.StringFlag{
|
||||||
|
Name: "capsul-type, ct",
|
||||||
|
Value: "f1-xs",
|
||||||
|
Usage: "capsul type",
|
||||||
|
Destination: &CapsulType,
|
||||||
|
}
|
||||||
|
|
||||||
|
var CapsulImage string
|
||||||
|
|
||||||
|
var CapsulImageFlag = &cli.StringFlag{
|
||||||
|
Name: "capsul-image, ci",
|
||||||
|
Value: "debian10",
|
||||||
|
Usage: "capsul image",
|
||||||
|
Destination: &CapsulImage,
|
||||||
|
}
|
||||||
|
|
||||||
|
var CapsulSSHKeys cli.StringSlice
|
||||||
|
var CapsulSSHKeysFlag = &cli.StringSliceFlag{
|
||||||
|
Name: "capsul-ssh-keys, cs",
|
||||||
|
Usage: "capsul SSH key",
|
||||||
|
Value: &CapsulSSHKeys,
|
||||||
|
}
|
||||||
|
|
||||||
|
var CapsulAPIToken string
|
||||||
|
|
||||||
|
var CapsulAPITokenFlag = &cli.StringFlag{
|
||||||
|
Name: "capsul-token, ca",
|
||||||
|
Usage: "capsul API token",
|
||||||
|
EnvVar: "CAPSUL_TOKEN",
|
||||||
|
Destination: &CapsulAPIToken,
|
||||||
|
}
|
||||||
|
|
||||||
|
var HetznerCloudName string
|
||||||
|
|
||||||
|
var HetznerCloudNameFlag = &cli.StringFlag{
|
||||||
|
Name: "hetzner-name, hn",
|
||||||
|
Value: "",
|
||||||
|
Usage: "hetzner cloud name",
|
||||||
|
Destination: &HetznerCloudName,
|
||||||
|
}
|
||||||
|
|
||||||
|
var HetznerCloudType string
|
||||||
|
|
||||||
|
var HetznerCloudTypeFlag = &cli.StringFlag{
|
||||||
|
Name: "hetzner-type, ht",
|
||||||
|
Usage: "hetzner cloud type",
|
||||||
|
Destination: &HetznerCloudType,
|
||||||
|
Value: "cx11",
|
||||||
|
}
|
||||||
|
|
||||||
|
var HetznerCloudImage string
|
||||||
|
|
||||||
|
var HetznerCloudImageFlag = &cli.StringFlag{
|
||||||
|
Name: "hetzner-image, hi",
|
||||||
|
Usage: "hetzner cloud image",
|
||||||
|
Value: "debian-10",
|
||||||
|
Destination: &HetznerCloudImage,
|
||||||
|
}
|
||||||
|
|
||||||
|
var HetznerCloudSSHKeys cli.StringSlice
|
||||||
|
|
||||||
|
var HetznerCloudSSHKeysFlag = &cli.StringSliceFlag{
|
||||||
|
Name: "hetzner-ssh-keys, hs",
|
||||||
|
Usage: "hetzner cloud SSH keys (e.g. me@foo.com)",
|
||||||
|
Value: &HetznerCloudSSHKeys,
|
||||||
|
}
|
||||||
|
|
||||||
|
var HetznerCloudLocation string
|
||||||
|
|
||||||
|
var HetznerCloudLocationFlag = &cli.StringFlag{
|
||||||
|
Name: "hetzner-location, hl",
|
||||||
|
Usage: "hetzner cloud server location",
|
||||||
|
Value: "hel1",
|
||||||
|
Destination: &HetznerCloudLocation,
|
||||||
|
}
|
||||||
|
|
||||||
|
var HetznerCloudAPIToken string
|
||||||
|
|
||||||
|
var HetznerCloudAPITokenFlag = &cli.StringFlag{
|
||||||
|
Name: "hetzner-token, ha",
|
||||||
|
Usage: "hetzner cloud API token",
|
||||||
|
EnvVar: "HCLOUD_TOKEN",
|
||||||
|
Destination: &HetznerCloudAPIToken,
|
||||||
|
}
|
||||||
|
|
||||||
|
// Debug stores the variable from DebugFlag.
|
||||||
|
var Debug bool
|
||||||
|
|
||||||
|
// DebugFlag turns on/off verbose logging down to the DEBUG level.
|
||||||
|
var DebugFlag = &cli.BoolFlag{
|
||||||
|
Name: "debug, d",
|
||||||
|
Destination: &Debug,
|
||||||
|
Usage: "Show DEBUG messages",
|
||||||
|
}
|
||||||
|
|
||||||
|
// RC signifies the latest release candidate
|
||||||
|
var RC bool
|
||||||
|
|
||||||
|
// RCFlag chooses the latest release candidate for install
|
||||||
|
var RCFlag = &cli.BoolFlag{
|
||||||
|
Name: "rc, r",
|
||||||
|
Destination: &RC,
|
||||||
|
Usage: "Insatll the latest release candidate",
|
||||||
|
}
|
||||||
|
|
||||||
|
var Major bool
|
||||||
|
var MajorFlag = &cli.BoolFlag{
|
||||||
|
Name: "major, x",
|
||||||
|
Usage: "Increase the major part of the version",
|
||||||
|
Destination: &Major,
|
||||||
|
}
|
||||||
|
|
||||||
|
var Minor bool
|
||||||
|
var MinorFlag = &cli.BoolFlag{
|
||||||
|
Name: "minor, y",
|
||||||
|
Usage: "Increase the minor part of the version",
|
||||||
|
Destination: &Minor,
|
||||||
|
}
|
||||||
|
|
||||||
|
var Patch bool
|
||||||
|
var PatchFlag = &cli.BoolFlag{
|
||||||
|
Name: "patch, z",
|
||||||
|
Usage: "Increase the patch part of the version",
|
||||||
|
Destination: &Patch,
|
||||||
|
}
|
||||||
|
|
||||||
|
var Dry bool
|
||||||
|
var DryFlag = &cli.BoolFlag{
|
||||||
|
Name: "dry-run, r",
|
||||||
|
Usage: "Only reports changes that would be made",
|
||||||
|
Destination: &Dry,
|
||||||
|
}
|
||||||
|
|
||||||
|
var Publish bool
|
||||||
|
var PublishFlag = &cli.BoolFlag{
|
||||||
|
Name: "publish, p",
|
||||||
|
Usage: "Publish changes to git.coopcloud.tech",
|
||||||
|
Destination: &Publish,
|
||||||
|
}
|
||||||
|
|
||||||
|
var Domain string
|
||||||
|
var DomainFlag = &cli.StringFlag{
|
||||||
|
Name: "domain, D",
|
||||||
|
Value: "",
|
||||||
|
Usage: "Choose a domain name",
|
||||||
|
Destination: &Domain,
|
||||||
|
}
|
||||||
|
|
||||||
|
var NewAppServer string
|
||||||
|
var NewAppServerFlag = &cli.StringFlag{
|
||||||
|
Name: "server, s",
|
||||||
|
Value: "",
|
||||||
|
Usage: "Show apps of a specific server",
|
||||||
|
Destination: &NewAppServer,
|
||||||
|
}
|
||||||
|
|
||||||
|
var NoDomainChecks bool
|
||||||
|
var NoDomainChecksFlag = &cli.BoolFlag{
|
||||||
|
Name: "no-domain-checks, D",
|
||||||
|
Usage: "Disable app domain sanity checks",
|
||||||
|
Destination: &NoDomainChecks,
|
||||||
|
}
|
||||||
|
|
||||||
|
var StdErrOnly bool
|
||||||
|
var StdErrOnlyFlag = &cli.BoolFlag{
|
||||||
|
Name: "stderr, s",
|
||||||
|
Usage: "Only tail stderr",
|
||||||
|
Destination: &StdErrOnly,
|
||||||
|
}
|
||||||
|
|
||||||
|
var DontWaitConverge bool
|
||||||
|
var DontWaitConvergeFlag = &cli.BoolFlag{
|
||||||
|
Name: "no-converge-checks, c",
|
||||||
|
Usage: "Don't wait for converge logic checks",
|
||||||
|
Destination: &DontWaitConverge,
|
||||||
|
}
|
||||||
|
|
||||||
|
var Watch bool
|
||||||
|
var WatchFlag = &cli.BoolFlag{
|
||||||
|
Name: "watch, w",
|
||||||
|
Usage: "Watch status by polling repeatedly",
|
||||||
|
Destination: &Watch,
|
||||||
|
}
|
||||||
|
|
||||||
|
var OnlyErrors bool
|
||||||
|
var OnlyErrorFlag = &cli.BoolFlag{
|
||||||
|
Name: "errors, e",
|
||||||
|
Usage: "Only show errors",
|
||||||
|
Destination: &OnlyErrors,
|
||||||
|
}
|
||||||
|
|
||||||
|
var SkipUpdates bool
|
||||||
|
var SkipUpdatesFlag = &cli.BoolFlag{
|
||||||
|
Name: "skip-updates, s",
|
||||||
|
Usage: "Skip updating recipe repositories",
|
||||||
|
Destination: &SkipUpdates,
|
||||||
|
}
|
||||||
|
|
||||||
|
var AllTags bool
|
||||||
|
var AllTagsFlag = &cli.BoolFlag{
|
||||||
|
Name: "all-tags, a",
|
||||||
|
Usage: "List all tags, not just upgrades",
|
||||||
|
Destination: &AllTags,
|
||||||
|
}
|
||||||
|
|
||||||
|
// SSHFailMsg is a hopefully helpful SSH failure message
|
||||||
|
var SSHFailMsg = `
|
||||||
|
Woops, Abra is unable to connect to connect to %s.
|
||||||
|
|
||||||
|
Here are a few tips for debugging your local SSH config. Abra uses plain 'ol
|
||||||
|
SSH to make connections to servers, so if your SSH config is working, Abra is
|
||||||
|
working.
|
||||||
|
|
||||||
|
In the first place, Abra will always try to read your Docker context connection
|
||||||
|
string for SSH connection details. You can view your server context configs
|
||||||
|
with the following command. Are they correct?
|
||||||
|
|
||||||
|
abra server ls
|
||||||
|
|
||||||
|
Is your ssh-agent running? You can start it by running the following command:
|
||||||
|
|
||||||
|
eval "$(ssh-agent)"
|
||||||
|
|
||||||
|
If your SSH private key loaded? You can check by running the following command:
|
||||||
|
|
||||||
|
ssh-add -L
|
||||||
|
|
||||||
|
If, you can add it with:
|
||||||
|
|
||||||
|
ssh-add ~/.ssh/<private-key-part>
|
||||||
|
|
||||||
|
If you are using a non-default public/private key, you can configure this in
|
||||||
|
your ~/.ssh/config file which Abra will read in order to figure out connection
|
||||||
|
details:
|
||||||
|
|
||||||
|
Host foo.coopcloud.tech
|
||||||
|
Hostname foo.coopcloud.tech
|
||||||
|
User bar
|
||||||
|
Port 12345
|
||||||
|
IdentityFile ~/.ssh/bar@foo.coopcloud.tech
|
||||||
|
|
||||||
|
If you're only using password authentication, you can use the following config:
|
||||||
|
|
||||||
|
Host foo.coopcloud.tech
|
||||||
|
Hostname foo.coopcloud.tech
|
||||||
|
User bar
|
||||||
|
Port 12345
|
||||||
|
PreferredAuthentications=password
|
||||||
|
PubkeyAuthentication=no
|
||||||
|
|
||||||
|
Good luck!
|
||||||
|
|
||||||
|
`
|
||||||
|
|
||||||
|
var ServerAddFailMsg = `
|
||||||
|
Failed to add server %s.
|
||||||
|
|
||||||
|
This could be caused by two things.
|
||||||
|
|
||||||
|
Abra isn't picking up your SSH configuration or you need to specify it on the
|
||||||
|
command-line (e.g you use a non-standard port or username to connect). Run
|
||||||
|
"server add" with "-d/--debug" to learn more about what Abra is doing under the
|
||||||
|
hood.
|
||||||
|
|
||||||
|
Docker is not installed on your server. You can pass "-p/--provision" to
|
||||||
|
install Docker and initialise Docker Swarm mode. See help output for "server
|
||||||
|
add"
|
||||||
|
|
||||||
|
See "abra server add -h" for more.
|
||||||
|
|
||||||
|
`
|
||||||
|
|
||||||
|
// SubCommandBefore wires up pre-action machinery (e.g. --debug handling).
|
||||||
|
func SubCommandBefore(c *cli.Context) error {
|
||||||
|
if Debug {
|
||||||
|
logrus.SetLevel(logrus.DebugLevel)
|
||||||
|
logrus.SetFormatter(&logrus.TextFormatter{})
|
||||||
|
logrus.SetOutput(os.Stderr)
|
||||||
|
logrus.AddHook(logrusStack.StandardHook())
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
|
@ -1,261 +0,0 @@
|
||||||
package internal
|
|
||||||
|
|
||||||
import (
|
|
||||||
"github.com/urfave/cli/v2"
|
|
||||||
)
|
|
||||||
|
|
||||||
// Secrets stores the variable from SecretsFlag
|
|
||||||
var Secrets bool
|
|
||||||
|
|
||||||
// SecretsFlag turns on/off automatically generating secrets
|
|
||||||
var SecretsFlag = &cli.BoolFlag{
|
|
||||||
Name: "secrets",
|
|
||||||
Aliases: []string{"S"},
|
|
||||||
Value: false,
|
|
||||||
Usage: "Automatically generate secrets",
|
|
||||||
Destination: &Secrets,
|
|
||||||
}
|
|
||||||
|
|
||||||
// Pass stores the variable from PassFlag
|
|
||||||
var Pass bool
|
|
||||||
|
|
||||||
// PassFlag turns on/off storing generated secrets in pass
|
|
||||||
var PassFlag = &cli.BoolFlag{
|
|
||||||
Name: "pass",
|
|
||||||
Aliases: []string{"P"},
|
|
||||||
Value: false,
|
|
||||||
Usage: "Store the generated secrets in a local pass store",
|
|
||||||
Destination: &Pass,
|
|
||||||
}
|
|
||||||
|
|
||||||
// Context is temp
|
|
||||||
var Context string
|
|
||||||
|
|
||||||
// ContextFlag is temp
|
|
||||||
var ContextFlag = &cli.StringFlag{
|
|
||||||
Name: "context",
|
|
||||||
Value: "",
|
|
||||||
Aliases: []string{"c"},
|
|
||||||
Destination: &Context,
|
|
||||||
}
|
|
||||||
|
|
||||||
// Force force functionality without asking.
|
|
||||||
var Force bool
|
|
||||||
|
|
||||||
// ForceFlag turns on/off force functionality.
|
|
||||||
var ForceFlag = &cli.BoolFlag{
|
|
||||||
Name: "force",
|
|
||||||
Value: false,
|
|
||||||
Aliases: []string{"f"},
|
|
||||||
Destination: &Force,
|
|
||||||
}
|
|
||||||
|
|
||||||
// Chaos engages chaos mode.
|
|
||||||
var Chaos bool
|
|
||||||
|
|
||||||
// ChaosFlag turns on/off chaos functionality.
|
|
||||||
var ChaosFlag = &cli.BoolFlag{
|
|
||||||
Name: "chaos",
|
|
||||||
Value: false,
|
|
||||||
Aliases: []string{"ch"},
|
|
||||||
Usage: "Deploy uncommitted recipes changes. Use with care!",
|
|
||||||
Destination: &Chaos,
|
|
||||||
}
|
|
||||||
|
|
||||||
// DNSProvider specifies a DNS provider.
|
|
||||||
var DNSProvider string
|
|
||||||
|
|
||||||
// DNSProviderFlag selects a DNS provider.
|
|
||||||
var DNSProviderFlag = &cli.StringFlag{
|
|
||||||
Name: "provider",
|
|
||||||
Value: "",
|
|
||||||
Aliases: []string{"p"},
|
|
||||||
Usage: "DNS provider",
|
|
||||||
Destination: &DNSProvider,
|
|
||||||
}
|
|
||||||
|
|
||||||
var NoInput bool
|
|
||||||
var NoInputFlag = &cli.BoolFlag{
|
|
||||||
Name: "no-input",
|
|
||||||
Value: false,
|
|
||||||
Aliases: []string{"n"},
|
|
||||||
Usage: "Toggle non-interactive mode",
|
|
||||||
Destination: &NoInput,
|
|
||||||
}
|
|
||||||
|
|
||||||
var DNSType string
|
|
||||||
|
|
||||||
var DNSTypeFlag = &cli.StringFlag{
|
|
||||||
Name: "type",
|
|
||||||
Value: "",
|
|
||||||
Aliases: []string{"t"},
|
|
||||||
Usage: "Domain name record type (e.g. A)",
|
|
||||||
Destination: &DNSType,
|
|
||||||
}
|
|
||||||
|
|
||||||
var DNSName string
|
|
||||||
|
|
||||||
var DNSNameFlag = &cli.StringFlag{
|
|
||||||
Name: "name",
|
|
||||||
Value: "",
|
|
||||||
Aliases: []string{"n"},
|
|
||||||
Usage: "Domain name record name (e.g. mysubdomain)",
|
|
||||||
Destination: &DNSName,
|
|
||||||
}
|
|
||||||
|
|
||||||
var DNSValue string
|
|
||||||
|
|
||||||
var DNSValueFlag = &cli.StringFlag{
|
|
||||||
Name: "value",
|
|
||||||
Value: "",
|
|
||||||
Aliases: []string{"v"},
|
|
||||||
Usage: "Domain name record value (e.g. 192.168.1.1)",
|
|
||||||
Destination: &DNSValue,
|
|
||||||
}
|
|
||||||
|
|
||||||
var DNSTTL int
|
|
||||||
|
|
||||||
var DNSTTLFlag = &cli.IntFlag{
|
|
||||||
Name: "ttl",
|
|
||||||
Value: 86400,
|
|
||||||
Aliases: []string{"T"},
|
|
||||||
Usage: "Domain name TTL value)",
|
|
||||||
Destination: &DNSTTL,
|
|
||||||
}
|
|
||||||
|
|
||||||
var DNSPriority int
|
|
||||||
|
|
||||||
var DNSPriorityFlag = &cli.IntFlag{
|
|
||||||
Name: "priority",
|
|
||||||
Value: 10,
|
|
||||||
Aliases: []string{"P"},
|
|
||||||
Usage: "Domain name priority value",
|
|
||||||
Destination: &DNSPriority,
|
|
||||||
}
|
|
||||||
|
|
||||||
var ServerProvider string
|
|
||||||
|
|
||||||
var ServerProviderFlag = &cli.StringFlag{
|
|
||||||
Name: "provider",
|
|
||||||
Aliases: []string{"p"},
|
|
||||||
Usage: "3rd party server provider",
|
|
||||||
Destination: &ServerProvider,
|
|
||||||
}
|
|
||||||
|
|
||||||
var CapsulInstanceURL string
|
|
||||||
|
|
||||||
var CapsulInstanceURLFlag = &cli.StringFlag{
|
|
||||||
Name: "capsul-url",
|
|
||||||
Value: "yolo.servers.coop",
|
|
||||||
Aliases: []string{"cu"},
|
|
||||||
Usage: "capsul instance URL",
|
|
||||||
Destination: &CapsulInstanceURL,
|
|
||||||
}
|
|
||||||
|
|
||||||
var CapsulName string
|
|
||||||
|
|
||||||
var CapsulNameFlag = &cli.StringFlag{
|
|
||||||
Name: "capsul-name",
|
|
||||||
Value: "",
|
|
||||||
Aliases: []string{"cn"},
|
|
||||||
Usage: "capsul name",
|
|
||||||
Destination: &CapsulName,
|
|
||||||
}
|
|
||||||
|
|
||||||
var CapsulType string
|
|
||||||
|
|
||||||
var CapsulTypeFlag = &cli.StringFlag{
|
|
||||||
Name: "capsul-type",
|
|
||||||
Value: "f1-xs",
|
|
||||||
Aliases: []string{"ct"},
|
|
||||||
Usage: "capsul type",
|
|
||||||
Destination: &CapsulType,
|
|
||||||
}
|
|
||||||
|
|
||||||
var CapsulImage string
|
|
||||||
|
|
||||||
var CapsulImageFlag = &cli.StringFlag{
|
|
||||||
Name: "capsul-image",
|
|
||||||
Value: "debian10",
|
|
||||||
Aliases: []string{"ci"},
|
|
||||||
Usage: "capsul image",
|
|
||||||
Destination: &CapsulImage,
|
|
||||||
}
|
|
||||||
|
|
||||||
var CapsulSSHKeys cli.StringSlice
|
|
||||||
|
|
||||||
var CapsulSSHKeysFlag = &cli.StringSliceFlag{
|
|
||||||
Name: "capsul-ssh-keys",
|
|
||||||
Aliases: []string{"cs"},
|
|
||||||
Usage: "capsul SSH key",
|
|
||||||
Destination: &CapsulSSHKeys,
|
|
||||||
}
|
|
||||||
|
|
||||||
var CapsulAPIToken string
|
|
||||||
|
|
||||||
var CapsulAPITokenFlag = &cli.StringFlag{
|
|
||||||
Name: "capsul-token",
|
|
||||||
Aliases: []string{"ca"},
|
|
||||||
Usage: "capsul API token",
|
|
||||||
EnvVars: []string{"CAPSUL_TOKEN"},
|
|
||||||
Destination: &CapsulAPIToken,
|
|
||||||
}
|
|
||||||
|
|
||||||
var HetznerCloudName string
|
|
||||||
|
|
||||||
var HetznerCloudNameFlag = &cli.StringFlag{
|
|
||||||
Name: "hetzner-name",
|
|
||||||
Value: "",
|
|
||||||
Aliases: []string{"hn"},
|
|
||||||
Usage: "hetzner cloud name",
|
|
||||||
Destination: &HetznerCloudName,
|
|
||||||
}
|
|
||||||
|
|
||||||
var HetznerCloudType string
|
|
||||||
|
|
||||||
var HetznerCloudTypeFlag = &cli.StringFlag{
|
|
||||||
Name: "hetzner-type",
|
|
||||||
Aliases: []string{"ht"},
|
|
||||||
Usage: "hetzner cloud type",
|
|
||||||
Destination: &HetznerCloudType,
|
|
||||||
Value: "cx11",
|
|
||||||
}
|
|
||||||
|
|
||||||
var HetznerCloudImage string
|
|
||||||
|
|
||||||
var HetznerCloudImageFlag = &cli.StringFlag{
|
|
||||||
Name: "hetzner-image",
|
|
||||||
Aliases: []string{"hi"},
|
|
||||||
Usage: "hetzner cloud image",
|
|
||||||
Value: "debian-10",
|
|
||||||
Destination: &HetznerCloudImage,
|
|
||||||
}
|
|
||||||
|
|
||||||
var HetznerCloudSSHKeys cli.StringSlice
|
|
||||||
|
|
||||||
var HetznerCloudSSHKeysFlag = &cli.StringSliceFlag{
|
|
||||||
Name: "hetzner-ssh-keys",
|
|
||||||
Aliases: []string{"hs"},
|
|
||||||
Usage: "hetzner cloud SSH keys (e.g. me@foo.com)",
|
|
||||||
Destination: &HetznerCloudSSHKeys,
|
|
||||||
}
|
|
||||||
|
|
||||||
var HetznerCloudLocation string
|
|
||||||
|
|
||||||
var HetznerCloudLocationFlag = &cli.StringFlag{
|
|
||||||
Name: "hetzner-location",
|
|
||||||
Aliases: []string{"hl"},
|
|
||||||
Usage: "hetzner cloud server location",
|
|
||||||
Value: "hel1",
|
|
||||||
Destination: &HetznerCloudLocation,
|
|
||||||
}
|
|
||||||
|
|
||||||
var HetznerCloudAPIToken string
|
|
||||||
|
|
||||||
var HetznerCloudAPITokenFlag = &cli.StringFlag{
|
|
||||||
Name: "hetzner-token",
|
|
||||||
Aliases: []string{"ha"},
|
|
||||||
Usage: "hetzner cloud API token",
|
|
||||||
EnvVars: []string{"HCLOUD_TOKEN"},
|
|
||||||
Destination: &HetznerCloudAPIToken,
|
|
||||||
}
|
|
|
@ -1,71 +1,103 @@
|
||||||
package internal
|
package internal
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"context"
|
||||||
"fmt"
|
"fmt"
|
||||||
|
"io/ioutil"
|
||||||
|
"os"
|
||||||
|
"path"
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
abraFormatter "coopcloud.tech/abra/cli/formatter"
|
|
||||||
"coopcloud.tech/abra/pkg/catalogue"
|
|
||||||
"coopcloud.tech/abra/pkg/client"
|
"coopcloud.tech/abra/pkg/client"
|
||||||
"coopcloud.tech/abra/pkg/config"
|
"coopcloud.tech/abra/pkg/config"
|
||||||
|
"coopcloud.tech/abra/pkg/dns"
|
||||||
|
"coopcloud.tech/abra/pkg/formatter"
|
||||||
|
"coopcloud.tech/abra/pkg/git"
|
||||||
|
"coopcloud.tech/abra/pkg/lint"
|
||||||
"coopcloud.tech/abra/pkg/recipe"
|
"coopcloud.tech/abra/pkg/recipe"
|
||||||
"coopcloud.tech/abra/pkg/upstream/stack"
|
"coopcloud.tech/abra/pkg/upstream/stack"
|
||||||
"github.com/AlecAivazis/survey/v2"
|
"github.com/AlecAivazis/survey/v2"
|
||||||
"github.com/sirupsen/logrus"
|
"github.com/sirupsen/logrus"
|
||||||
"github.com/urfave/cli/v2"
|
"github.com/urfave/cli"
|
||||||
)
|
)
|
||||||
|
|
||||||
// DeployAction is the main command-line action for this package
|
// DeployAction is the main command-line action for this package
|
||||||
func DeployAction(c *cli.Context) error {
|
func DeployAction(c *cli.Context) error {
|
||||||
app := ValidateApp(c)
|
app := ValidateApp(c)
|
||||||
stackName := app.StackName()
|
|
||||||
|
if !Chaos {
|
||||||
|
if err := recipe.EnsureUpToDate(app.Recipe); err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
r, err := recipe.Get(app.Recipe)
|
||||||
|
if err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := lint.LintForErrors(r); err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
cl, err := client.New(app.Server)
|
cl, err := client.New(app.Server)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
logrus.Debugf("checking whether '%s' is already deployed", stackName)
|
logrus.Debugf("checking whether %s is already deployed", app.StackName())
|
||||||
|
|
||||||
isDeployed, deployedVersion, err := stack.IsDeployed(c.Context, cl, stackName)
|
isDeployed, deployedVersion, err := stack.IsDeployed(context.Background(), cl, app.StackName())
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
if isDeployed {
|
if isDeployed {
|
||||||
if Force {
|
if Force || Chaos {
|
||||||
logrus.Warnf("'%s' already deployed but continuing (--force)", stackName)
|
logrus.Warnf("%s is already deployed but continuing (--force/--chaos)", app.Name)
|
||||||
} else if Chaos {
|
|
||||||
logrus.Warnf("'%s' already deployed but continuing (--chaos)", stackName)
|
|
||||||
} else {
|
} else {
|
||||||
logrus.Fatalf("'%s' is already deployed", stackName)
|
logrus.Fatalf("%s is already deployed", app.Name)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
version := deployedVersion
|
version := deployedVersion
|
||||||
if version == "" && !Chaos {
|
if version == "unknown" && !Chaos {
|
||||||
versions, err := catalogue.GetRecipeCatalogueVersions(app.Type)
|
catl, err := recipe.ReadRecipeCatalogue()
|
||||||
|
if err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
versions, err := recipe.GetRecipeCatalogueVersions(app.Recipe, catl)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
if len(versions) > 0 {
|
if len(versions) > 0 {
|
||||||
version = versions[len(versions)-1]
|
version = versions[len(versions)-1]
|
||||||
logrus.Debugf("choosing '%s' as version to deploy", version)
|
logrus.Debugf("choosing %s as version to deploy", version)
|
||||||
if err := recipe.EnsureVersion(app.Type, version); err != nil {
|
if err := recipe.EnsureVersion(app.Recipe, version); err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
version = "latest commit"
|
head, err := git.GetRecipeHead(app.Recipe)
|
||||||
|
if err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
version = formatter.SmallSHA(head.String())
|
||||||
logrus.Warn("no versions detected, using latest commit")
|
logrus.Warn("no versions detected, using latest commit")
|
||||||
if err := recipe.EnsureLatest(app.Type); err != nil {
|
if err := recipe.EnsureLatest(app.Recipe); err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if version == "" && !Chaos {
|
if version == "unknown" && !Chaos {
|
||||||
logrus.Debugf("choosing '%s' as version to deploy", version)
|
logrus.Debugf("choosing %s as version to deploy", version)
|
||||||
if err := recipe.EnsureVersion(app.Type, version); err != nil {
|
if err := recipe.EnsureVersion(app.Recipe, version); err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if version != "unknown" && !Chaos {
|
||||||
|
if err := recipe.EnsureVersion(app.Recipe, version); err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -73,13 +105,13 @@ func DeployAction(c *cli.Context) error {
|
||||||
if Chaos {
|
if Chaos {
|
||||||
logrus.Warnf("chaos mode engaged")
|
logrus.Warnf("chaos mode engaged")
|
||||||
var err error
|
var err error
|
||||||
version, err = recipe.ChaosVersion(app.Type)
|
version, err = recipe.ChaosVersion(app.Recipe)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
abraShPath := fmt.Sprintf("%s/%s/%s", config.APPS_DIR, app.Type, "abra.sh")
|
abraShPath := fmt.Sprintf("%s/%s/%s", config.RECIPES_DIR, app.Recipe, "abra.sh")
|
||||||
abraShEnv, err := config.ReadAbraShEnvVars(abraShPath)
|
abraShEnv, err := config.ReadAbraShEnvVars(abraShPath)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
|
@ -88,13 +120,13 @@ func DeployAction(c *cli.Context) error {
|
||||||
app.Env[k] = v
|
app.Env[k] = v
|
||||||
}
|
}
|
||||||
|
|
||||||
composeFiles, err := config.GetAppComposeFiles(app.Type, app.Env)
|
composeFiles, err := config.GetAppComposeFiles(app.Recipe, app.Env)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
deployOpts := stack.Deploy{
|
deployOpts := stack.Deploy{
|
||||||
Composefiles: composeFiles,
|
Composefiles: composeFiles,
|
||||||
Namespace: stackName,
|
Namespace: app.StackName(),
|
||||||
Prune: false,
|
Prune: false,
|
||||||
ResolveImage: stack.ResolveImageAlways,
|
ResolveImage: stack.ResolveImageAlways,
|
||||||
}
|
}
|
||||||
|
@ -107,7 +139,16 @@ func DeployAction(c *cli.Context) error {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
if err := stack.RunDeploy(cl, deployOpts, compose); err != nil {
|
if !NoDomainChecks {
|
||||||
|
domainName := app.Env["DOMAIN"]
|
||||||
|
if _, err = dns.EnsureDomainsResolveSameIPv4(domainName, app.Server); err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
logrus.Warn("skipping domain checks as requested")
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := stack.RunDeploy(cl, deployOpts, compose, app.Name, DontWaitConverge); err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -116,8 +157,8 @@ func DeployAction(c *cli.Context) error {
|
||||||
|
|
||||||
// DeployOverview shows a deployment overview
|
// DeployOverview shows a deployment overview
|
||||||
func DeployOverview(app config.App, version, message string) error {
|
func DeployOverview(app config.App, version, message string) error {
|
||||||
tableCol := []string{"server", "compose", "domain", "stack", "version"}
|
tableCol := []string{"server", "recipe", "config", "domain", "version"}
|
||||||
table := abraFormatter.CreateTable(tableCol)
|
table := formatter.CreateTable(tableCol)
|
||||||
|
|
||||||
deployConfig := "compose.yml"
|
deployConfig := "compose.yml"
|
||||||
if composeFiles, ok := app.Env["COMPOSE_FILE"]; ok {
|
if composeFiles, ok := app.Env["COMPOSE_FILE"]; ok {
|
||||||
|
@ -129,7 +170,7 @@ func DeployOverview(app config.App, version, message string) error {
|
||||||
server = "local"
|
server = "local"
|
||||||
}
|
}
|
||||||
|
|
||||||
table.Append([]string{server, deployConfig, app.Domain, app.StackName(), version})
|
table.Append([]string{server, app.Recipe, deployConfig, app.Domain, version})
|
||||||
table.Render()
|
table.Render()
|
||||||
|
|
||||||
if NoInput {
|
if NoInput {
|
||||||
|
@ -153,9 +194,9 @@ func DeployOverview(app config.App, version, message string) error {
|
||||||
}
|
}
|
||||||
|
|
||||||
// NewVersionOverview shows an upgrade or downgrade overview
|
// NewVersionOverview shows an upgrade or downgrade overview
|
||||||
func NewVersionOverview(app config.App, currentVersion, newVersion string) error {
|
func NewVersionOverview(app config.App, currentVersion, newVersion, releaseNotes string) error {
|
||||||
tableCol := []string{"server", "compose", "domain", "stack", "current version", "to be deployed"}
|
tableCol := []string{"server", "recipe", "config", "domain", "current version", "to be deployed"}
|
||||||
table := abraFormatter.CreateTable(tableCol)
|
table := formatter.CreateTable(tableCol)
|
||||||
|
|
||||||
deployConfig := "compose.yml"
|
deployConfig := "compose.yml"
|
||||||
if composeFiles, ok := app.Env["COMPOSE_FILE"]; ok {
|
if composeFiles, ok := app.Env["COMPOSE_FILE"]; ok {
|
||||||
|
@ -167,9 +208,24 @@ func NewVersionOverview(app config.App, currentVersion, newVersion string) error
|
||||||
server = "local"
|
server = "local"
|
||||||
}
|
}
|
||||||
|
|
||||||
table.Append([]string{server, deployConfig, app.Domain, app.StackName(), currentVersion, newVersion})
|
table.Append([]string{server, app.Recipe, deployConfig, app.Domain, currentVersion, newVersion})
|
||||||
table.Render()
|
table.Render()
|
||||||
|
|
||||||
|
if releaseNotes == "" {
|
||||||
|
var err error
|
||||||
|
releaseNotes, err = GetReleaseNotes(app.Recipe, newVersion)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if releaseNotes != "" && newVersion != "" {
|
||||||
|
fmt.Println()
|
||||||
|
fmt.Println(fmt.Sprintf("%s release notes:\n\n%s", newVersion, releaseNotes))
|
||||||
|
} else {
|
||||||
|
logrus.Warnf("no release notes available for %s", newVersion)
|
||||||
|
}
|
||||||
|
|
||||||
if NoInput {
|
if NoInput {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
@ -189,3 +245,22 @@ func NewVersionOverview(app config.App, currentVersion, newVersion string) error
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// GetReleaseNotes prints release notes for a recipe version
|
||||||
|
func GetReleaseNotes(recipeName, version string) (string, error) {
|
||||||
|
if version == "" {
|
||||||
|
return "", nil
|
||||||
|
}
|
||||||
|
|
||||||
|
fpath := path.Join(config.RECIPES_DIR, recipeName, "release", version)
|
||||||
|
|
||||||
|
if _, err := os.Stat(fpath); !os.IsNotExist(err) {
|
||||||
|
releaseNotes, err := ioutil.ReadFile(fpath)
|
||||||
|
if err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
return string(releaseNotes), nil
|
||||||
|
}
|
||||||
|
|
||||||
|
return "", nil
|
||||||
|
}
|
||||||
|
|
|
@ -4,7 +4,7 @@ import (
|
||||||
"os"
|
"os"
|
||||||
|
|
||||||
"github.com/sirupsen/logrus"
|
"github.com/sirupsen/logrus"
|
||||||
"github.com/urfave/cli/v2"
|
"github.com/urfave/cli"
|
||||||
)
|
)
|
||||||
|
|
||||||
// ShowSubcommandHelpAndError exits the program on error, logs the error to the
|
// ShowSubcommandHelpAndError exits the program on error, logs the error to the
|
||||||
|
|
|
@ -1,38 +0,0 @@
|
||||||
package internal
|
|
||||||
|
|
||||||
import (
|
|
||||||
"github.com/urfave/cli/v2"
|
|
||||||
)
|
|
||||||
|
|
||||||
// Testing functions that call os.Exit
|
|
||||||
// https://stackoverflow.com/questions/26225513/how-to-test-os-exit-scenarios-in-go
|
|
||||||
// https://talks.golang.org/2014/testing.slide#23
|
|
||||||
|
|
||||||
var testapp = &cli.App{
|
|
||||||
Name: "abra",
|
|
||||||
Usage: `The Co-op Cloud command-line utility belt 🎩🐇`,
|
|
||||||
}
|
|
||||||
|
|
||||||
// not testing output as that changes. just if it exits with code 1
|
|
||||||
// does not work because of some weird errors on cli's part. Its a hard lib to test effectively.
|
|
||||||
// func TestShowSubcommandHelpAndError(t *testing.T) {
|
|
||||||
// if os.Getenv("HelpAndError") == "1" {
|
|
||||||
// ShowSubcommandHelpAndError(cli.NewContext(testapp, nil, nil), errors.New("Test error"))
|
|
||||||
// return
|
|
||||||
// }
|
|
||||||
// cmd := exec.Command(os.Args[0], "-test.run=TestShowSubcommandHelpAndError")
|
|
||||||
// cmd.Env = append(os.Environ(), "HelpAndError=1")
|
|
||||||
// var out bytes.Buffer
|
|
||||||
// cmd.Stderr = &out
|
|
||||||
// err := cmd.Run()
|
|
||||||
// println(out.String())
|
|
||||||
// if !strings.Contains(out.String(), "Test error") {
|
|
||||||
|
|
||||||
// t.Fatalf("expected command to show the error causing the exit, did not get correct stdout output")
|
|
||||||
// }
|
|
||||||
|
|
||||||
// if e, ok := err.(*exec.ExitError); ok && !e.Success() {
|
|
||||||
// return
|
|
||||||
// }
|
|
||||||
// t.Fatalf("process ran with err %v, want exit status 1", err)
|
|
||||||
// }
|
|
|
@ -0,0 +1,10 @@
|
||||||
|
package internal
|
||||||
|
|
||||||
|
// ReverseStringList reverses a list of a strings. Roll on Go generics.
|
||||||
|
func ReverseStringList(strings []string) []string {
|
||||||
|
for i, j := 0, len(strings)-1; i < j; i, j = i+1, j-1 {
|
||||||
|
strings[i], strings[j] = strings[j], strings[i]
|
||||||
|
}
|
||||||
|
|
||||||
|
return strings
|
||||||
|
}
|
|
@ -4,50 +4,28 @@ import (
|
||||||
"fmt"
|
"fmt"
|
||||||
"path"
|
"path"
|
||||||
|
|
||||||
abraFormatter "coopcloud.tech/abra/cli/formatter"
|
"coopcloud.tech/abra/pkg/app"
|
||||||
"coopcloud.tech/abra/pkg/config"
|
"coopcloud.tech/abra/pkg/config"
|
||||||
|
"coopcloud.tech/abra/pkg/formatter"
|
||||||
"coopcloud.tech/abra/pkg/recipe"
|
"coopcloud.tech/abra/pkg/recipe"
|
||||||
|
recipePkg "coopcloud.tech/abra/pkg/recipe"
|
||||||
"coopcloud.tech/abra/pkg/secret"
|
"coopcloud.tech/abra/pkg/secret"
|
||||||
|
"coopcloud.tech/abra/pkg/ssh"
|
||||||
"github.com/AlecAivazis/survey/v2"
|
"github.com/AlecAivazis/survey/v2"
|
||||||
|
"github.com/olekukonko/tablewriter"
|
||||||
"github.com/sirupsen/logrus"
|
"github.com/sirupsen/logrus"
|
||||||
"github.com/urfave/cli/v2"
|
"github.com/urfave/cli"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
// AppSecrets represents all app secrest
|
||||||
type AppSecrets map[string]string
|
type AppSecrets map[string]string
|
||||||
|
|
||||||
var Domain string
|
|
||||||
var DomainFlag = &cli.StringFlag{
|
|
||||||
Name: "domain",
|
|
||||||
Aliases: []string{"d"},
|
|
||||||
Value: "",
|
|
||||||
Usage: "Choose a domain name",
|
|
||||||
Destination: &Domain,
|
|
||||||
}
|
|
||||||
|
|
||||||
var NewAppServer string
|
|
||||||
var NewAppServerFlag = &cli.StringFlag{
|
|
||||||
Name: "server",
|
|
||||||
Aliases: []string{"s"},
|
|
||||||
Value: "",
|
|
||||||
Usage: "Show apps of a specific server",
|
|
||||||
Destination: &NewAppServer,
|
|
||||||
}
|
|
||||||
|
|
||||||
var NewAppName string
|
|
||||||
var NewAppNameFlag = &cli.StringFlag{
|
|
||||||
Name: "app-name",
|
|
||||||
Aliases: []string{"a"},
|
|
||||||
Value: "",
|
|
||||||
Usage: "Choose an app name",
|
|
||||||
Destination: &NewAppName,
|
|
||||||
}
|
|
||||||
|
|
||||||
// RecipeName is used for configuring recipe name programmatically
|
// RecipeName is used for configuring recipe name programmatically
|
||||||
var RecipeName string
|
var RecipeName string
|
||||||
|
|
||||||
// createSecrets creates all secrets for a new app.
|
// createSecrets creates all secrets for a new app.
|
||||||
func createSecrets(sanitisedAppName string) (AppSecrets, error) {
|
func createSecrets(sanitisedAppName string) (AppSecrets, error) {
|
||||||
appEnvPath := path.Join(config.ABRA_DIR, "servers", NewAppServer, fmt.Sprintf("%s.env", sanitisedAppName))
|
appEnvPath := path.Join(config.ABRA_DIR, "servers", NewAppServer, fmt.Sprintf("%s.env", Domain))
|
||||||
appEnv, err := config.ReadEnv(appEnvPath)
|
appEnv, err := config.ReadEnv(appEnvPath)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
|
@ -62,7 +40,7 @@ func createSecrets(sanitisedAppName string) (AppSecrets, error) {
|
||||||
if Pass {
|
if Pass {
|
||||||
for secretName := range secrets {
|
for secretName := range secrets {
|
||||||
secretValue := secrets[secretName]
|
secretValue := secrets[secretName]
|
||||||
if err := secret.PassInsertSecret(secretValue, secretName, sanitisedAppName, NewAppServer); err != nil {
|
if err := secret.PassInsertSecret(secretValue, secretName, Domain, NewAppServer); err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -89,6 +67,31 @@ func ensureDomainFlag(recipe recipe.Recipe, server string) error {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// promptForSecrets asks if we should generate secrets for a new app.
|
||||||
|
func promptForSecrets(appName string) error {
|
||||||
|
app, err := app.Get(appName)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
secretEnvVars := secret.ReadSecretEnvVars(app.Env)
|
||||||
|
if len(secretEnvVars) == 0 {
|
||||||
|
logrus.Debugf("%s has no secrets to generate, skipping...", app.Recipe)
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
if !Secrets && !NoInput {
|
||||||
|
prompt := &survey.Confirm{
|
||||||
|
Message: "Generate app secrets?",
|
||||||
|
}
|
||||||
|
if err := survey.AskOne(prompt, &Secrets); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
// ensureServerFlag checks if the server flag was used. if not, asks the user for it.
|
// ensureServerFlag checks if the server flag was used. if not, asks the user for it.
|
||||||
func ensureServerFlag() error {
|
func ensureServerFlag() error {
|
||||||
servers, err := config.GetServers()
|
servers, err := config.GetServers()
|
||||||
|
@ -113,30 +116,11 @@ func ensureServerFlag() error {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// ensureServerFlag checks if the AppName flag was used. if not, asks the user for it.
|
|
||||||
func ensureAppNameFlag() error {
|
|
||||||
if NewAppName == "" && !NoInput {
|
|
||||||
prompt := &survey.Input{
|
|
||||||
Message: "Specify app name:",
|
|
||||||
Default: config.SanitiseAppName(Domain),
|
|
||||||
}
|
|
||||||
if err := survey.AskOne(prompt, &NewAppName); err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if NewAppName == "" {
|
|
||||||
return fmt.Errorf("no app name provided")
|
|
||||||
}
|
|
||||||
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// NewAction is the new app creation logic
|
// NewAction is the new app creation logic
|
||||||
func NewAction(c *cli.Context) error {
|
func NewAction(c *cli.Context) error {
|
||||||
recipe := ValidateRecipeWithPrompt(c)
|
recipe := ValidateRecipeWithPrompt(c, false)
|
||||||
|
|
||||||
if err := config.EnsureAbraDirExists(); err != nil {
|
if err := recipePkg.EnsureUpToDate(recipe.Name); err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -148,44 +132,45 @@ func NewAction(c *cli.Context) error {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
if err := ensureAppNameFlag(); err != nil {
|
if err := promptForSecrets(Domain); err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
sanitisedAppName := config.SanitiseAppName(NewAppName)
|
sanitisedAppName := config.SanitiseAppName(Domain)
|
||||||
if len(sanitisedAppName) > 45 {
|
logrus.Debugf("%s sanitised as %s for new app", Domain, sanitisedAppName)
|
||||||
logrus.Fatalf("'%s' cannot be longer than 45 characters", sanitisedAppName)
|
|
||||||
}
|
|
||||||
logrus.Debugf("'%s' sanitised as '%s' for new app", NewAppName, sanitisedAppName)
|
|
||||||
|
|
||||||
if err := config.TemplateAppEnvSample(recipe.Name, NewAppName, NewAppServer, Domain, recipe.Name); err != nil {
|
if err := config.TemplateAppEnvSample(recipe.Name, Domain, NewAppServer, Domain); err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
var secrets AppSecrets
|
||||||
|
var secretTable *tablewriter.Table
|
||||||
if Secrets {
|
if Secrets {
|
||||||
secrets, err := createSecrets(sanitisedAppName)
|
if err := ssh.EnsureHostKey(NewAppServer); err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
var err error
|
||||||
|
secrets, err = createSecrets(sanitisedAppName)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
secretCols := []string{"Name", "Value"}
|
secretCols := []string{"Name", "Value"}
|
||||||
secretTable := abraFormatter.CreateTable(secretCols)
|
secretTable = formatter.CreateTable(secretCols)
|
||||||
for secret := range secrets {
|
for secret := range secrets {
|
||||||
secretTable.Append([]string{secret, secrets[secret]})
|
secretTable.Append([]string{secret, secrets[secret]})
|
||||||
}
|
}
|
||||||
|
|
||||||
if len(secrets) > 0 {
|
|
||||||
defer secretTable.Render()
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if NewAppServer == "default" {
|
if NewAppServer == "default" {
|
||||||
NewAppServer = "local"
|
NewAppServer = "local"
|
||||||
}
|
}
|
||||||
|
|
||||||
tableCol := []string{"Name", "Domain", "Type", "Server"}
|
tableCol := []string{"server", "recipe", "domain"}
|
||||||
table := abraFormatter.CreateTable(tableCol)
|
table := formatter.CreateTable(tableCol)
|
||||||
table.Append([]string{sanitisedAppName, Domain, recipe.Name, NewAppServer})
|
table.Append([]string{NewAppServer, recipe.Name, Domain})
|
||||||
|
|
||||||
fmt.Println("")
|
fmt.Println("")
|
||||||
fmt.Println(fmt.Sprintf("A new %s app has been created! Here is an overview:", recipe.Name))
|
fmt.Println(fmt.Sprintf("A new %s app has been created! Here is an overview:", recipe.Name))
|
||||||
|
@ -193,11 +178,19 @@ func NewAction(c *cli.Context) error {
|
||||||
table.Render()
|
table.Render()
|
||||||
fmt.Println("")
|
fmt.Println("")
|
||||||
fmt.Println("You can configure this app by running the following:")
|
fmt.Println("You can configure this app by running the following:")
|
||||||
fmt.Println(fmt.Sprintf("\n abra app config %s", sanitisedAppName))
|
fmt.Println(fmt.Sprintf("\n abra app config %s", Domain))
|
||||||
fmt.Println("")
|
fmt.Println("")
|
||||||
fmt.Println("You can deploy this app by running the following:")
|
fmt.Println("You can deploy this app by running the following:")
|
||||||
fmt.Println(fmt.Sprintf("\n abra app deploy %s", sanitisedAppName))
|
fmt.Println(fmt.Sprintf("\n abra app deploy %s", Domain))
|
||||||
fmt.Println("")
|
fmt.Println("")
|
||||||
|
|
||||||
|
if len(secrets) > 0 {
|
||||||
|
fmt.Println("Here are your generated secrets:")
|
||||||
|
fmt.Println("")
|
||||||
|
secretTable.Render()
|
||||||
|
fmt.Println("")
|
||||||
|
logrus.Warn("generated secrets are not shown again, please take note of them *now*")
|
||||||
|
}
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
|
@ -2,104 +2,55 @@ package internal
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"fmt"
|
"fmt"
|
||||||
"strings"
|
|
||||||
|
|
||||||
|
"coopcloud.tech/abra/pkg/formatter"
|
||||||
"coopcloud.tech/abra/pkg/recipe"
|
"coopcloud.tech/abra/pkg/recipe"
|
||||||
"github.com/AlecAivazis/survey/v2"
|
"github.com/AlecAivazis/survey/v2"
|
||||||
|
"github.com/docker/distribution/reference"
|
||||||
"github.com/sirupsen/logrus"
|
"github.com/sirupsen/logrus"
|
||||||
"github.com/urfave/cli/v2"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
var Major bool
|
|
||||||
var MajorFlag = &cli.BoolFlag{
|
|
||||||
Name: "major",
|
|
||||||
Usage: "Increase the major part of the version",
|
|
||||||
Value: false,
|
|
||||||
Aliases: []string{"ma", "x"},
|
|
||||||
Destination: &Major,
|
|
||||||
}
|
|
||||||
|
|
||||||
var Minor bool
|
|
||||||
var MinorFlag = &cli.BoolFlag{
|
|
||||||
Name: "minor",
|
|
||||||
Usage: "Increase the minor part of the version",
|
|
||||||
Value: false,
|
|
||||||
Aliases: []string{"mi", "y"},
|
|
||||||
Destination: &Minor,
|
|
||||||
}
|
|
||||||
|
|
||||||
var Patch bool
|
|
||||||
var PatchFlag = &cli.BoolFlag{
|
|
||||||
Name: "patch",
|
|
||||||
Usage: "Increase the patch part of the version",
|
|
||||||
Value: false,
|
|
||||||
Aliases: []string{"p", "z"},
|
|
||||||
Destination: &Patch,
|
|
||||||
}
|
|
||||||
|
|
||||||
var Dry bool
|
|
||||||
var DryFlag = &cli.BoolFlag{
|
|
||||||
Name: "dry-run",
|
|
||||||
Usage: "No changes are made, only reports changes that would be made",
|
|
||||||
Value: false,
|
|
||||||
Aliases: []string{"d"},
|
|
||||||
Destination: &Dry,
|
|
||||||
}
|
|
||||||
|
|
||||||
var Push bool
|
|
||||||
var PushFlag = &cli.BoolFlag{
|
|
||||||
Name: "push",
|
|
||||||
Usage: "Git push changes",
|
|
||||||
Value: false,
|
|
||||||
Aliases: []string{"P"},
|
|
||||||
Destination: &Push,
|
|
||||||
}
|
|
||||||
|
|
||||||
var CommitMessage string
|
|
||||||
var CommitMessageFlag = &cli.StringFlag{
|
|
||||||
Name: "commit-message",
|
|
||||||
Usage: "Commit message (implies --commit)",
|
|
||||||
Aliases: []string{"cm"},
|
|
||||||
Destination: &CommitMessage,
|
|
||||||
}
|
|
||||||
|
|
||||||
var Commit bool
|
|
||||||
var CommitFlag = &cli.BoolFlag{
|
|
||||||
Name: "commit",
|
|
||||||
Usage: "Commits compose.**yml file changes to recipe repository",
|
|
||||||
Value: false,
|
|
||||||
Aliases: []string{"c"},
|
|
||||||
Destination: &Commit,
|
|
||||||
}
|
|
||||||
|
|
||||||
var TagMessage string
|
|
||||||
var TagMessageFlag = &cli.StringFlag{
|
|
||||||
Name: "tag-comment",
|
|
||||||
Usage: "Description for release tag",
|
|
||||||
Aliases: []string{"t", "tm"},
|
|
||||||
Destination: &TagMessage,
|
|
||||||
}
|
|
||||||
|
|
||||||
// PromptBumpType prompts for version bump type
|
// PromptBumpType prompts for version bump type
|
||||||
func PromptBumpType(tagString string) error {
|
func PromptBumpType(tagString, latestRelease string) error {
|
||||||
if (!Major && !Minor && !Patch) && tagString == "" {
|
if (!Major && !Minor && !Patch) && tagString == "" {
|
||||||
fmt.Printf(`
|
fmt.Printf(`
|
||||||
semver cheat sheet (more via semver.org):
|
You need to make a decision about what kind of an update this new recipe
|
||||||
major: new features/bug fixes, backwards incompatible
|
version is. If someone else performs this upgrade, do they have to do some
|
||||||
minor: new features/bug fixes, backwards compatible
|
migration work or take care of some breaking changes? This can be signaled in
|
||||||
patch: bug fixes, backwards compatible
|
the version you specify on the recipe deploy label and is called a semantic
|
||||||
|
version.
|
||||||
|
|
||||||
|
The latest published version is %s.
|
||||||
|
|
||||||
|
Here is a semver cheat sheet (more on https://semver.org):
|
||||||
|
|
||||||
|
major: new features/bug fixes, backwards incompatible (e.g 1.0.0 -> 2.0.0).
|
||||||
|
the upgrade won't work without some preparation work and others need
|
||||||
|
to take care when performing it. "it could go wrong".
|
||||||
|
|
||||||
|
minor: new features/bug fixes, backwards compatible (e.g. 0.1.0 -> 0.2.0).
|
||||||
|
the upgrade should Just Work and there are no breaking changes in
|
||||||
|
the app and the recipe config. "it should go fine".
|
||||||
|
|
||||||
|
patch: bug fixes, backwards compatible (e.g. 0.0.1 -> 0.0.2). this upgrade
|
||||||
|
should also Just Work and is mostly to do with minor bug fixes
|
||||||
|
and/or security patches. "nothing to worry about".
|
||||||
|
|
||||||
|
`, latestRelease)
|
||||||
|
|
||||||
`)
|
|
||||||
var chosenBumpType string
|
var chosenBumpType string
|
||||||
prompt := &survey.Select{
|
prompt := &survey.Select{
|
||||||
Message: fmt.Sprintf("select recipe version increment type"),
|
Message: fmt.Sprintf("select recipe version increment type"),
|
||||||
Options: []string{"major", "minor", "patch"},
|
Options: []string{"major", "minor", "patch"},
|
||||||
}
|
}
|
||||||
|
|
||||||
if err := survey.AskOne(prompt, &chosenBumpType); err != nil {
|
if err := survey.AskOne(prompt, &chosenBumpType); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
SetBumpType(chosenBumpType)
|
SetBumpType(chosenBumpType)
|
||||||
}
|
}
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -133,20 +84,27 @@ func SetBumpType(bumpType string) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// GetMainApp retrieves the main 'app' image name
|
// GetMainAppImage retrieves the main 'app' image name
|
||||||
func GetMainApp(recipe recipe.Recipe) string {
|
func GetMainAppImage(recipe recipe.Recipe) (string, error) {
|
||||||
var app string
|
var path string
|
||||||
|
|
||||||
for _, service := range recipe.Config.Services {
|
for _, service := range recipe.Config.Services {
|
||||||
name := service.Name
|
if service.Name == "app" {
|
||||||
if name == "app" {
|
img, err := reference.ParseNormalizedNamed(service.Image)
|
||||||
app = strings.Split(service.Image, ":")[0]
|
if err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
|
||||||
|
path = reference.Path(img)
|
||||||
|
path = formatter.StripTagMeta(path)
|
||||||
|
|
||||||
|
return path, nil
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if app == "" {
|
if path == "" {
|
||||||
logrus.Fatalf("%s has no main 'app' service?", recipe.Name)
|
return path, fmt.Errorf("%s has no main 'app' service?", recipe.Name)
|
||||||
}
|
}
|
||||||
|
|
||||||
return app
|
return path, nil
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,106 +0,0 @@
|
||||||
package internal
|
|
||||||
|
|
||||||
import (
|
|
||||||
"errors"
|
|
||||||
"fmt"
|
|
||||||
|
|
||||||
"github.com/AlecAivazis/survey/v2"
|
|
||||||
"github.com/urfave/cli/v2"
|
|
||||||
)
|
|
||||||
|
|
||||||
// EnsureDNSProvider ensures a DNS provider is chosen.
|
|
||||||
func EnsureDNSProvider() error {
|
|
||||||
if DNSProvider == "" && !NoInput {
|
|
||||||
prompt := &survey.Select{
|
|
||||||
Message: "Select DNS provider",
|
|
||||||
Options: []string{"gandi"},
|
|
||||||
}
|
|
||||||
|
|
||||||
if err := survey.AskOne(prompt, &DNSProvider); err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if DNSProvider == "" {
|
|
||||||
return fmt.Errorf("missing DNS provider?")
|
|
||||||
}
|
|
||||||
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// EnsureDNSTypeFlag ensures a DNS type flag is present.
|
|
||||||
func EnsureDNSTypeFlag(c *cli.Context) error {
|
|
||||||
if DNSType == "" && !NoInput {
|
|
||||||
prompt := &survey.Input{
|
|
||||||
Message: "Specify DNS record type",
|
|
||||||
Default: "A",
|
|
||||||
}
|
|
||||||
if err := survey.AskOne(prompt, &DNSType); err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if DNSType == "" {
|
|
||||||
ShowSubcommandHelpAndError(c, errors.New("no record type provided"))
|
|
||||||
}
|
|
||||||
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// EnsureDNSNameFlag ensures a DNS name flag is present.
|
|
||||||
func EnsureDNSNameFlag(c *cli.Context) error {
|
|
||||||
if DNSName == "" && !NoInput {
|
|
||||||
prompt := &survey.Input{
|
|
||||||
Message: "Specify DNS record name",
|
|
||||||
Default: "mysubdomain",
|
|
||||||
}
|
|
||||||
if err := survey.AskOne(prompt, &DNSName); err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if DNSName == "" {
|
|
||||||
ShowSubcommandHelpAndError(c, errors.New("no record name provided"))
|
|
||||||
}
|
|
||||||
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// EnsureDNSValueFlag ensures a DNS value flag is present.
|
|
||||||
func EnsureDNSValueFlag(c *cli.Context) error {
|
|
||||||
if DNSValue == "" && !NoInput {
|
|
||||||
prompt := &survey.Input{
|
|
||||||
Message: "Specify DNS record value",
|
|
||||||
Default: "192.168.1.2",
|
|
||||||
}
|
|
||||||
if err := survey.AskOne(prompt, &DNSValue); err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if DNSName == "" {
|
|
||||||
ShowSubcommandHelpAndError(c, errors.New("no record value provided"))
|
|
||||||
}
|
|
||||||
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// EnsureZoneArgument ensures a zone argument is present.
|
|
||||||
func EnsureZoneArgument(c *cli.Context) (string, error) {
|
|
||||||
var zone string
|
|
||||||
if c.Args().First() == "" && !NoInput {
|
|
||||||
prompt := &survey.Input{
|
|
||||||
Message: "Specify a domain name zone",
|
|
||||||
Default: "example.com",
|
|
||||||
}
|
|
||||||
if err := survey.AskOne(prompt, &zone); err != nil {
|
|
||||||
return zone, err
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if zone == "" {
|
|
||||||
ShowSubcommandHelpAndError(c, errors.New("no zone value provided"))
|
|
||||||
}
|
|
||||||
|
|
||||||
return zone, nil
|
|
||||||
}
|
|
|
@ -1,208 +0,0 @@
|
||||||
package internal
|
|
||||||
|
|
||||||
import (
|
|
||||||
"fmt"
|
|
||||||
"os"
|
|
||||||
"strings"
|
|
||||||
|
|
||||||
"github.com/AlecAivazis/survey/v2"
|
|
||||||
"github.com/urfave/cli/v2"
|
|
||||||
)
|
|
||||||
|
|
||||||
// EnsureServerProvider ensures a 3rd party server provider is chosen.
|
|
||||||
func EnsureServerProvider() error {
|
|
||||||
if ServerProvider == "" && !NoInput {
|
|
||||||
prompt := &survey.Select{
|
|
||||||
Message: "Select server provider",
|
|
||||||
Options: []string{"capsul", "hetzner-cloud"},
|
|
||||||
}
|
|
||||||
|
|
||||||
if err := survey.AskOne(prompt, &ServerProvider); err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if ServerProvider == "" {
|
|
||||||
return fmt.Errorf("missing server provider?")
|
|
||||||
}
|
|
||||||
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// EnsureNewCapsulVPSFlags ensure all flags are present.
|
|
||||||
func EnsureNewCapsulVPSFlags(c *cli.Context) error {
|
|
||||||
if CapsulName == "" && !NoInput {
|
|
||||||
prompt := &survey.Input{
|
|
||||||
Message: "specify capsul name",
|
|
||||||
}
|
|
||||||
if err := survey.AskOne(prompt, &CapsulName); err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if !NoInput {
|
|
||||||
prompt := &survey.Input{
|
|
||||||
Message: "specify capsul instance URL",
|
|
||||||
Default: CapsulInstanceURL,
|
|
||||||
}
|
|
||||||
if err := survey.AskOne(prompt, &CapsulInstanceURL); err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if !NoInput {
|
|
||||||
prompt := &survey.Input{
|
|
||||||
Message: "specify capsul type",
|
|
||||||
Default: CapsulType,
|
|
||||||
}
|
|
||||||
if err := survey.AskOne(prompt, &CapsulType); err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if !NoInput {
|
|
||||||
prompt := &survey.Input{
|
|
||||||
Message: "specify capsul image",
|
|
||||||
Default: CapsulImage,
|
|
||||||
}
|
|
||||||
if err := survey.AskOne(prompt, &CapsulImage); err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if len(CapsulSSHKeys.Value()) == 0 && !NoInput {
|
|
||||||
var sshKeys string
|
|
||||||
prompt := &survey.Input{
|
|
||||||
Message: "specify capsul SSH keys (e.g. me@foo.com)",
|
|
||||||
Default: "",
|
|
||||||
}
|
|
||||||
if err := survey.AskOne(prompt, &CapsulSSHKeys); err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
CapsulSSHKeys = *cli.NewStringSlice(strings.Split(sshKeys, ",")...)
|
|
||||||
}
|
|
||||||
|
|
||||||
if CapsulAPIToken == "" && !NoInput {
|
|
||||||
token, ok := os.LookupEnv("CAPSUL_TOKEN")
|
|
||||||
if !ok {
|
|
||||||
prompt := &survey.Input{
|
|
||||||
Message: "specify capsul API token",
|
|
||||||
}
|
|
||||||
if err := survey.AskOne(prompt, &CapsulAPIToken); err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
CapsulAPIToken = token
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if CapsulName == "" {
|
|
||||||
ShowSubcommandHelpAndError(c, fmt.Errorf("missing capsul name?"))
|
|
||||||
}
|
|
||||||
if CapsulInstanceURL == "" {
|
|
||||||
ShowSubcommandHelpAndError(c, fmt.Errorf("missing capsul instance url?"))
|
|
||||||
}
|
|
||||||
if CapsulType == "" {
|
|
||||||
ShowSubcommandHelpAndError(c, fmt.Errorf("missing capsul type?"))
|
|
||||||
}
|
|
||||||
if CapsulImage == "" {
|
|
||||||
ShowSubcommandHelpAndError(c, fmt.Errorf("missing capsul image?"))
|
|
||||||
}
|
|
||||||
if len(CapsulSSHKeys.Value()) == 0 {
|
|
||||||
ShowSubcommandHelpAndError(c, fmt.Errorf("missing capsul ssh keys?"))
|
|
||||||
}
|
|
||||||
if CapsulAPIToken == "" {
|
|
||||||
ShowSubcommandHelpAndError(c, fmt.Errorf("missing capsul API token?"))
|
|
||||||
}
|
|
||||||
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// EnsureNewHetznerCloudVPSFlags ensure all flags are present.
|
|
||||||
func EnsureNewHetznerCloudVPSFlags(c *cli.Context) error {
|
|
||||||
if HetznerCloudName == "" && !NoInput {
|
|
||||||
prompt := &survey.Input{
|
|
||||||
Message: "specify hetzner cloud VPS name",
|
|
||||||
}
|
|
||||||
if err := survey.AskOne(prompt, &HetznerCloudName); err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if !NoInput {
|
|
||||||
prompt := &survey.Input{
|
|
||||||
Message: "specify hetzner cloud VPS type",
|
|
||||||
Default: HetznerCloudType,
|
|
||||||
}
|
|
||||||
if err := survey.AskOne(prompt, &HetznerCloudType); err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if !NoInput {
|
|
||||||
prompt := &survey.Input{
|
|
||||||
Message: "specify hetzner cloud VPS image",
|
|
||||||
Default: HetznerCloudImage,
|
|
||||||
}
|
|
||||||
if err := survey.AskOne(prompt, &HetznerCloudImage); err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if len(HetznerCloudSSHKeys.Value()) == 0 && !NoInput {
|
|
||||||
var sshKeys string
|
|
||||||
prompt := &survey.Input{
|
|
||||||
Message: "specify hetzner cloud SSH keys (e.g. me@foo.com)",
|
|
||||||
Default: "",
|
|
||||||
}
|
|
||||||
if err := survey.AskOne(prompt, &sshKeys); err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
HetznerCloudSSHKeys = *cli.NewStringSlice(strings.Split(sshKeys, ",")...)
|
|
||||||
}
|
|
||||||
|
|
||||||
if !NoInput {
|
|
||||||
prompt := &survey.Input{
|
|
||||||
Message: "specify hetzner cloud VPS location",
|
|
||||||
Default: HetznerCloudLocation,
|
|
||||||
}
|
|
||||||
if err := survey.AskOne(prompt, &HetznerCloudLocation); err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if HetznerCloudAPIToken == "" && !NoInput {
|
|
||||||
token, ok := os.LookupEnv("HCLOUD_TOKEN")
|
|
||||||
if !ok {
|
|
||||||
prompt := &survey.Input{
|
|
||||||
Message: "specify hetzner cloud API token",
|
|
||||||
}
|
|
||||||
if err := survey.AskOne(prompt, &HetznerCloudAPIToken); err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
HetznerCloudAPIToken = token
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if HetznerCloudName == "" {
|
|
||||||
ShowSubcommandHelpAndError(c, fmt.Errorf("missing hetzner cloud VPS name?"))
|
|
||||||
}
|
|
||||||
if HetznerCloudType == "" {
|
|
||||||
ShowSubcommandHelpAndError(c, fmt.Errorf("missing hetzner cloud VPS type?"))
|
|
||||||
}
|
|
||||||
if HetznerCloudImage == "" {
|
|
||||||
ShowSubcommandHelpAndError(c, fmt.Errorf("missing hetzner cloud image?"))
|
|
||||||
}
|
|
||||||
if len(HetznerCloudSSHKeys.Value()) == 0 {
|
|
||||||
ShowSubcommandHelpAndError(c, fmt.Errorf("missing hetzner cloud ssh keys?"))
|
|
||||||
}
|
|
||||||
if HetznerCloudLocation == "" {
|
|
||||||
ShowSubcommandHelpAndError(c, fmt.Errorf("missing hetzner cloud VPS location?"))
|
|
||||||
}
|
|
||||||
if HetznerCloudAPIToken == "" {
|
|
||||||
ShowSubcommandHelpAndError(c, fmt.Errorf("missing hetzner cloud API token?"))
|
|
||||||
}
|
|
||||||
|
|
||||||
return nil
|
|
||||||
}
|
|
|
@ -2,52 +2,86 @@ package internal
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"errors"
|
"errors"
|
||||||
|
"fmt"
|
||||||
|
"os"
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
"coopcloud.tech/abra/pkg/app"
|
"coopcloud.tech/abra/pkg/app"
|
||||||
"coopcloud.tech/abra/pkg/catalogue"
|
|
||||||
"coopcloud.tech/abra/pkg/config"
|
"coopcloud.tech/abra/pkg/config"
|
||||||
"coopcloud.tech/abra/pkg/recipe"
|
"coopcloud.tech/abra/pkg/recipe"
|
||||||
|
"coopcloud.tech/abra/pkg/ssh"
|
||||||
"github.com/AlecAivazis/survey/v2"
|
"github.com/AlecAivazis/survey/v2"
|
||||||
"github.com/sirupsen/logrus"
|
"github.com/sirupsen/logrus"
|
||||||
"github.com/urfave/cli/v2"
|
"github.com/urfave/cli"
|
||||||
)
|
)
|
||||||
|
|
||||||
// AppName is used for configuring app name programmatically
|
// AppName is used for configuring app name programmatically
|
||||||
var AppName string
|
var AppName string
|
||||||
|
|
||||||
// ValidateRecipe ensures the recipe arg is valid.
|
// ValidateRecipe ensures the recipe arg is valid.
|
||||||
func ValidateRecipe(c *cli.Context) recipe.Recipe {
|
func ValidateRecipe(c *cli.Context, ensureLatest bool) recipe.Recipe {
|
||||||
recipeName := c.Args().First()
|
recipeName := c.Args().First()
|
||||||
|
|
||||||
if recipeName == "" {
|
if recipeName == "" {
|
||||||
ShowSubcommandHelpAndError(c, errors.New("no recipe provided"))
|
ShowSubcommandHelpAndError(c, errors.New("no recipe name provided"))
|
||||||
}
|
}
|
||||||
|
|
||||||
recipe, err := recipe.Get(recipeName)
|
chosenRecipe, err := recipe.Get(recipeName)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logrus.Fatal(err)
|
if c.Command.Name == "generate" {
|
||||||
|
if strings.Contains(err.Error(), "missing a compose") {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
logrus.Warn(err)
|
||||||
|
} else {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
logrus.Debugf("validated '%s' as recipe argument", recipeName)
|
if ensureLatest {
|
||||||
|
if err := recipe.EnsureLatest(recipeName); err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
return recipe
|
logrus.Debugf("validated %s as recipe argument", recipeName)
|
||||||
|
|
||||||
|
return chosenRecipe
|
||||||
}
|
}
|
||||||
|
|
||||||
// ValidateRecipeWithPrompt ensures a recipe argument is present before
|
// ValidateRecipeWithPrompt ensures a recipe argument is present before
|
||||||
// validating, asking for input if required.
|
// validating, asking for input if required.
|
||||||
func ValidateRecipeWithPrompt(c *cli.Context) recipe.Recipe {
|
func ValidateRecipeWithPrompt(c *cli.Context, ensureLatest bool) recipe.Recipe {
|
||||||
recipeName := c.Args().First()
|
recipeName := c.Args().First()
|
||||||
|
|
||||||
if recipeName == "" && !NoInput {
|
if recipeName == "" && !NoInput {
|
||||||
catl, err := catalogue.ReadRecipeCatalogue()
|
var recipes []string
|
||||||
|
|
||||||
|
catl, err := recipe.ReadRecipeCatalogue()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
var recipes []string
|
|
||||||
|
knownRecipes := make(map[string]bool)
|
||||||
for name := range catl {
|
for name := range catl {
|
||||||
recipes = append(recipes, name)
|
knownRecipes[name] = true
|
||||||
}
|
}
|
||||||
|
|
||||||
|
localRecipes, err := recipe.GetRecipesLocal()
|
||||||
|
if err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, recipeLocal := range localRecipes {
|
||||||
|
if _, ok := knownRecipes[recipeLocal]; !ok {
|
||||||
|
knownRecipes[recipeLocal] = true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
for recipeName := range knownRecipes {
|
||||||
|
recipes = append(recipes, recipeName)
|
||||||
|
}
|
||||||
|
|
||||||
prompt := &survey.Select{
|
prompt := &survey.Select{
|
||||||
Message: "Select recipe",
|
Message: "Select recipe",
|
||||||
Options: recipes,
|
Options: recipes,
|
||||||
|
@ -63,17 +97,23 @@ func ValidateRecipeWithPrompt(c *cli.Context) recipe.Recipe {
|
||||||
}
|
}
|
||||||
|
|
||||||
if recipeName == "" {
|
if recipeName == "" {
|
||||||
ShowSubcommandHelpAndError(c, errors.New("no recipe provided"))
|
ShowSubcommandHelpAndError(c, errors.New("no recipe name provided"))
|
||||||
}
|
}
|
||||||
|
|
||||||
recipe, err := recipe.Get(recipeName)
|
chosenRecipe, err := recipe.Get(recipeName)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
logrus.Debugf("validated '%s' as recipe argument", recipeName)
|
if ensureLatest {
|
||||||
|
if err := recipe.EnsureLatest(recipeName); err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
return recipe
|
logrus.Debugf("validated %s as recipe argument", recipeName)
|
||||||
|
|
||||||
|
return chosenRecipe
|
||||||
}
|
}
|
||||||
|
|
||||||
// ValidateApp ensures the app name arg is valid.
|
// ValidateApp ensures the app name arg is valid.
|
||||||
|
@ -94,17 +134,21 @@ func ValidateApp(c *cli.Context) config.App {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
if err := recipe.EnsureExists(app.Type); err != nil {
|
if err := recipe.EnsureExists(app.Recipe); err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
logrus.Debugf("validated '%s' as app argument", appName)
|
if err := ssh.EnsureHostKey(app.Server); err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
logrus.Debugf("validated %s as app argument", appName)
|
||||||
|
|
||||||
return app
|
return app
|
||||||
}
|
}
|
||||||
|
|
||||||
// ValidateDomain ensures the domain name arg is valid.
|
// ValidateDomain ensures the domain name arg is valid.
|
||||||
func ValidateDomain(c *cli.Context) (string, error) {
|
func ValidateDomain(c *cli.Context) string {
|
||||||
domainName := c.Args().First()
|
domainName := c.Args().First()
|
||||||
|
|
||||||
if domainName == "" && !NoInput {
|
if domainName == "" && !NoInput {
|
||||||
|
@ -113,7 +157,7 @@ func ValidateDomain(c *cli.Context) (string, error) {
|
||||||
Default: "example.com",
|
Default: "example.com",
|
||||||
}
|
}
|
||||||
if err := survey.AskOne(prompt, &domainName); err != nil {
|
if err := survey.AskOne(prompt, &domainName); err != nil {
|
||||||
return domainName, err
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -121,16 +165,16 @@ func ValidateDomain(c *cli.Context) (string, error) {
|
||||||
ShowSubcommandHelpAndError(c, errors.New("no domain provided"))
|
ShowSubcommandHelpAndError(c, errors.New("no domain provided"))
|
||||||
}
|
}
|
||||||
|
|
||||||
logrus.Debugf("validated '%s' as domain argument", domainName)
|
logrus.Debugf("validated %s as domain argument", domainName)
|
||||||
|
|
||||||
return domainName, nil
|
return domainName
|
||||||
}
|
}
|
||||||
|
|
||||||
// ValidateSubCmdFlags ensures flag order conforms to correct order
|
// ValidateSubCmdFlags ensures flag order conforms to correct order
|
||||||
func ValidateSubCmdFlags(c *cli.Context) bool {
|
func ValidateSubCmdFlags(c *cli.Context) bool {
|
||||||
for argIdx, arg := range c.Args().Slice() {
|
for argIdx, arg := range c.Args() {
|
||||||
if !strings.HasPrefix(arg, "--") {
|
if !strings.HasPrefix(arg, "--") {
|
||||||
for _, flag := range c.Args().Slice()[argIdx:] {
|
for _, flag := range c.Args()[argIdx:] {
|
||||||
if strings.HasPrefix(flag, "--") {
|
if strings.HasPrefix(flag, "--") {
|
||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
|
@ -141,12 +185,12 @@ func ValidateSubCmdFlags(c *cli.Context) bool {
|
||||||
}
|
}
|
||||||
|
|
||||||
// ValidateServer ensures the server name arg is valid.
|
// ValidateServer ensures the server name arg is valid.
|
||||||
func ValidateServer(c *cli.Context) (string, error) {
|
func ValidateServer(c *cli.Context) string {
|
||||||
serverName := c.Args().First()
|
serverName := c.Args().First()
|
||||||
|
|
||||||
serverNames, err := config.ReadServerNames()
|
serverNames, err := config.ReadServerNames()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return serverName, err
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
if serverName == "" && !NoInput {
|
if serverName == "" && !NoInput {
|
||||||
|
@ -155,15 +199,320 @@ func ValidateServer(c *cli.Context) (string, error) {
|
||||||
Options: serverNames,
|
Options: serverNames,
|
||||||
}
|
}
|
||||||
if err := survey.AskOne(prompt, &serverName); err != nil {
|
if err := survey.AskOne(prompt, &serverName); err != nil {
|
||||||
return serverName, err
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
matched := false
|
||||||
|
for _, name := range serverNames {
|
||||||
|
if name == serverName {
|
||||||
|
matched = true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if !matched {
|
||||||
|
ShowSubcommandHelpAndError(c, errors.New("server doesn't exist?"))
|
||||||
|
}
|
||||||
|
|
||||||
if serverName == "" {
|
if serverName == "" {
|
||||||
ShowSubcommandHelpAndError(c, errors.New("no server provided"))
|
ShowSubcommandHelpAndError(c, errors.New("no server provided"))
|
||||||
}
|
}
|
||||||
|
|
||||||
logrus.Debugf("validated '%s' as server argument", serverName)
|
logrus.Debugf("validated %s as server argument", serverName)
|
||||||
|
|
||||||
return serverName, nil
|
return serverName
|
||||||
|
}
|
||||||
|
|
||||||
|
// EnsureDNSProvider ensures a DNS provider is chosen.
|
||||||
|
func EnsureDNSProvider() error {
|
||||||
|
if DNSProvider == "" && !NoInput {
|
||||||
|
prompt := &survey.Select{
|
||||||
|
Message: "Select DNS provider",
|
||||||
|
Options: []string{"gandi"},
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := survey.AskOne(prompt, &DNSProvider); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if DNSProvider == "" {
|
||||||
|
return fmt.Errorf("missing DNS provider?")
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// EnsureDNSTypeFlag ensures a DNS type flag is present.
|
||||||
|
func EnsureDNSTypeFlag(c *cli.Context) error {
|
||||||
|
if DNSType == "" && !NoInput {
|
||||||
|
prompt := &survey.Input{
|
||||||
|
Message: "Specify DNS record type",
|
||||||
|
Default: "A",
|
||||||
|
}
|
||||||
|
if err := survey.AskOne(prompt, &DNSType); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if DNSType == "" {
|
||||||
|
ShowSubcommandHelpAndError(c, errors.New("no record type provided"))
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// EnsureDNSNameFlag ensures a DNS name flag is present.
|
||||||
|
func EnsureDNSNameFlag(c *cli.Context) error {
|
||||||
|
if DNSName == "" && !NoInput {
|
||||||
|
prompt := &survey.Input{
|
||||||
|
Message: "Specify DNS record name",
|
||||||
|
Default: "mysubdomain",
|
||||||
|
}
|
||||||
|
if err := survey.AskOne(prompt, &DNSName); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if DNSName == "" {
|
||||||
|
ShowSubcommandHelpAndError(c, errors.New("no record name provided"))
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// EnsureDNSValueFlag ensures a DNS value flag is present.
|
||||||
|
func EnsureDNSValueFlag(c *cli.Context) error {
|
||||||
|
if DNSValue == "" && !NoInput {
|
||||||
|
prompt := &survey.Input{
|
||||||
|
Message: "Specify DNS record value",
|
||||||
|
Default: "192.168.1.2",
|
||||||
|
}
|
||||||
|
if err := survey.AskOne(prompt, &DNSValue); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if DNSValue == "" {
|
||||||
|
ShowSubcommandHelpAndError(c, errors.New("no record value provided"))
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// EnsureZoneArgument ensures a zone argument is present.
|
||||||
|
func EnsureZoneArgument(c *cli.Context) (string, error) {
|
||||||
|
zone := c.Args().First()
|
||||||
|
|
||||||
|
if zone == "" && !NoInput {
|
||||||
|
prompt := &survey.Input{
|
||||||
|
Message: "Specify a domain name zone",
|
||||||
|
Default: "example.com",
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := survey.AskOne(prompt, &zone); err != nil {
|
||||||
|
return zone, err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if zone == "" {
|
||||||
|
ShowSubcommandHelpAndError(c, errors.New("no zone value provided"))
|
||||||
|
}
|
||||||
|
|
||||||
|
return zone, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// EnsureServerProvider ensures a 3rd party server provider is chosen.
|
||||||
|
func EnsureServerProvider() error {
|
||||||
|
if ServerProvider == "" && !NoInput {
|
||||||
|
prompt := &survey.Select{
|
||||||
|
Message: "Select server provider",
|
||||||
|
Options: []string{"capsul", "hetzner-cloud"},
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := survey.AskOne(prompt, &ServerProvider); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if ServerProvider == "" {
|
||||||
|
return fmt.Errorf("missing server provider?")
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// EnsureNewCapsulVPSFlags ensure all flags are present.
|
||||||
|
func EnsureNewCapsulVPSFlags(c *cli.Context) error {
|
||||||
|
if CapsulName == "" && !NoInput {
|
||||||
|
prompt := &survey.Input{
|
||||||
|
Message: "specify capsul name",
|
||||||
|
}
|
||||||
|
if err := survey.AskOne(prompt, &CapsulName); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if !NoInput {
|
||||||
|
prompt := &survey.Input{
|
||||||
|
Message: "specify capsul instance URL",
|
||||||
|
Default: CapsulInstanceURL,
|
||||||
|
}
|
||||||
|
if err := survey.AskOne(prompt, &CapsulInstanceURL); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if !NoInput {
|
||||||
|
prompt := &survey.Input{
|
||||||
|
Message: "specify capsul type",
|
||||||
|
Default: CapsulType,
|
||||||
|
}
|
||||||
|
if err := survey.AskOne(prompt, &CapsulType); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if !NoInput {
|
||||||
|
prompt := &survey.Input{
|
||||||
|
Message: "specify capsul image",
|
||||||
|
Default: CapsulImage,
|
||||||
|
}
|
||||||
|
if err := survey.AskOne(prompt, &CapsulImage); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if len(CapsulSSHKeys.Value()) == 0 && !NoInput {
|
||||||
|
var sshKeys string
|
||||||
|
prompt := &survey.Input{
|
||||||
|
Message: "specify capsul SSH keys (e.g. me@foo.com)",
|
||||||
|
Default: "",
|
||||||
|
}
|
||||||
|
if err := survey.AskOne(prompt, &CapsulSSHKeys); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
CapsulSSHKeys = cli.StringSlice(strings.Split(sshKeys, ","))
|
||||||
|
}
|
||||||
|
|
||||||
|
if CapsulAPIToken == "" && !NoInput {
|
||||||
|
token, ok := os.LookupEnv("CAPSUL_TOKEN")
|
||||||
|
if !ok {
|
||||||
|
prompt := &survey.Input{
|
||||||
|
Message: "specify capsul API token",
|
||||||
|
}
|
||||||
|
if err := survey.AskOne(prompt, &CapsulAPIToken); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
CapsulAPIToken = token
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if CapsulName == "" {
|
||||||
|
ShowSubcommandHelpAndError(c, fmt.Errorf("missing capsul name?"))
|
||||||
|
}
|
||||||
|
if CapsulInstanceURL == "" {
|
||||||
|
ShowSubcommandHelpAndError(c, fmt.Errorf("missing capsul instance url?"))
|
||||||
|
}
|
||||||
|
if CapsulType == "" {
|
||||||
|
ShowSubcommandHelpAndError(c, fmt.Errorf("missing capsul type?"))
|
||||||
|
}
|
||||||
|
if CapsulImage == "" {
|
||||||
|
ShowSubcommandHelpAndError(c, fmt.Errorf("missing capsul image?"))
|
||||||
|
}
|
||||||
|
if len(CapsulSSHKeys.Value()) == 0 {
|
||||||
|
ShowSubcommandHelpAndError(c, fmt.Errorf("missing capsul ssh keys?"))
|
||||||
|
}
|
||||||
|
if CapsulAPIToken == "" {
|
||||||
|
ShowSubcommandHelpAndError(c, fmt.Errorf("missing capsul API token?"))
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// EnsureNewHetznerCloudVPSFlags ensure all flags are present.
|
||||||
|
func EnsureNewHetznerCloudVPSFlags(c *cli.Context) error {
|
||||||
|
if HetznerCloudName == "" && !NoInput {
|
||||||
|
prompt := &survey.Input{
|
||||||
|
Message: "specify hetzner cloud VPS name",
|
||||||
|
}
|
||||||
|
if err := survey.AskOne(prompt, &HetznerCloudName); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if !NoInput {
|
||||||
|
prompt := &survey.Input{
|
||||||
|
Message: "specify hetzner cloud VPS type",
|
||||||
|
Default: HetznerCloudType,
|
||||||
|
}
|
||||||
|
if err := survey.AskOne(prompt, &HetznerCloudType); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if !NoInput {
|
||||||
|
prompt := &survey.Input{
|
||||||
|
Message: "specify hetzner cloud VPS image",
|
||||||
|
Default: HetznerCloudImage,
|
||||||
|
}
|
||||||
|
if err := survey.AskOne(prompt, &HetznerCloudImage); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if len(HetznerCloudSSHKeys.Value()) == 0 && !NoInput {
|
||||||
|
var sshKeys string
|
||||||
|
prompt := &survey.Input{
|
||||||
|
Message: "specify hetzner cloud SSH keys (e.g. me@foo.com)",
|
||||||
|
Default: "",
|
||||||
|
}
|
||||||
|
if err := survey.AskOne(prompt, &sshKeys); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
HetznerCloudSSHKeys = cli.StringSlice(strings.Split(sshKeys, ","))
|
||||||
|
}
|
||||||
|
|
||||||
|
if !NoInput {
|
||||||
|
prompt := &survey.Input{
|
||||||
|
Message: "specify hetzner cloud VPS location",
|
||||||
|
Default: HetznerCloudLocation,
|
||||||
|
}
|
||||||
|
if err := survey.AskOne(prompt, &HetznerCloudLocation); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if HetznerCloudAPIToken == "" && !NoInput {
|
||||||
|
token, ok := os.LookupEnv("HCLOUD_TOKEN")
|
||||||
|
if !ok {
|
||||||
|
prompt := &survey.Input{
|
||||||
|
Message: "specify hetzner cloud API token",
|
||||||
|
}
|
||||||
|
if err := survey.AskOne(prompt, &HetznerCloudAPIToken); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
HetznerCloudAPIToken = token
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if HetznerCloudName == "" {
|
||||||
|
ShowSubcommandHelpAndError(c, fmt.Errorf("missing hetzner cloud VPS name?"))
|
||||||
|
}
|
||||||
|
if HetznerCloudType == "" {
|
||||||
|
ShowSubcommandHelpAndError(c, fmt.Errorf("missing hetzner cloud VPS type?"))
|
||||||
|
}
|
||||||
|
if HetznerCloudImage == "" {
|
||||||
|
ShowSubcommandHelpAndError(c, fmt.Errorf("missing hetzner cloud image?"))
|
||||||
|
}
|
||||||
|
if HetznerCloudLocation == "" {
|
||||||
|
ShowSubcommandHelpAndError(c, fmt.Errorf("missing hetzner cloud VPS location?"))
|
||||||
|
}
|
||||||
|
if HetznerCloudAPIToken == "" {
|
||||||
|
ShowSubcommandHelpAndError(c, fmt.Errorf("missing hetzner cloud API token?"))
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil
|
||||||
}
|
}
|
||||||
|
|
|
@ -2,112 +2,78 @@ package recipe
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"fmt"
|
"fmt"
|
||||||
"os"
|
|
||||||
"strconv"
|
|
||||||
|
|
||||||
"coopcloud.tech/abra/cli/formatter"
|
|
||||||
"coopcloud.tech/abra/cli/internal"
|
"coopcloud.tech/abra/cli/internal"
|
||||||
"coopcloud.tech/abra/pkg/catalogue"
|
"coopcloud.tech/abra/pkg/autocomplete"
|
||||||
"coopcloud.tech/abra/pkg/config"
|
"coopcloud.tech/abra/pkg/formatter"
|
||||||
"coopcloud.tech/tagcmp"
|
"coopcloud.tech/abra/pkg/lint"
|
||||||
"github.com/docker/distribution/reference"
|
recipePkg "coopcloud.tech/abra/pkg/recipe"
|
||||||
"github.com/sirupsen/logrus"
|
"github.com/sirupsen/logrus"
|
||||||
"github.com/urfave/cli/v2"
|
"github.com/urfave/cli"
|
||||||
)
|
)
|
||||||
|
|
||||||
var recipeLintCommand = &cli.Command{
|
var recipeLintCommand = cli.Command{
|
||||||
Name: "lint",
|
Name: "lint",
|
||||||
Usage: "Lint a recipe",
|
Usage: "Lint a recipe",
|
||||||
Aliases: []string{"l"},
|
Aliases: []string{"l"},
|
||||||
ArgsUsage: "<recipe>",
|
ArgsUsage: "<recipe>",
|
||||||
|
Flags: []cli.Flag{
|
||||||
|
internal.DebugFlag,
|
||||||
|
internal.OnlyErrorFlag,
|
||||||
|
},
|
||||||
|
Before: internal.SubCommandBefore,
|
||||||
|
BashComplete: autocomplete.RecipeNameComplete,
|
||||||
Action: func(c *cli.Context) error {
|
Action: func(c *cli.Context) error {
|
||||||
recipe := internal.ValidateRecipe(c)
|
recipe := internal.ValidateRecipe(c, true)
|
||||||
|
|
||||||
expectedVersion := false
|
if err := recipePkg.EnsureUpToDate(recipe.Name); err != nil {
|
||||||
if recipe.Config.Version == "3.8" {
|
|
||||||
expectedVersion = true
|
|
||||||
}
|
|
||||||
|
|
||||||
envSampleProvided := false
|
|
||||||
envSample := fmt.Sprintf("%s/%s/.env.sample", config.APPS_DIR, recipe.Name)
|
|
||||||
if _, err := os.Stat(envSample); !os.IsNotExist(err) {
|
|
||||||
envSampleProvided = true
|
|
||||||
} else if err != nil {
|
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
serviceNamedApp := false
|
tableCol := []string{"ref", "rule", "satisfied", "severity", "resolve"}
|
||||||
traefikEnabled := false
|
table := formatter.CreateTable(tableCol)
|
||||||
healthChecksForAllServices := true
|
|
||||||
allImagesTagged := true
|
|
||||||
noUnstableTags := true
|
|
||||||
semverLikeTags := true
|
|
||||||
for _, service := range recipe.Config.Services {
|
|
||||||
if service.Name == "app" {
|
|
||||||
serviceNamedApp = true
|
|
||||||
}
|
|
||||||
|
|
||||||
for label := range service.Deploy.Labels {
|
hasError := false
|
||||||
if label == "traefik.enable" {
|
bar := formatter.CreateProgressbar(-1, "running recipe lint rules...")
|
||||||
if service.Deploy.Labels[label] == "true" {
|
for level := range lint.LintRules {
|
||||||
traefikEnabled = true
|
for _, rule := range lint.LintRules[level] {
|
||||||
}
|
ok, err := rule.Function(recipe)
|
||||||
|
if err != nil {
|
||||||
|
logrus.Warn(err)
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
img, err := reference.ParseNormalizedNamed(service.Image)
|
if !ok && rule.Level == "error" {
|
||||||
if err != nil {
|
hasError = true
|
||||||
logrus.Fatal(err)
|
}
|
||||||
}
|
|
||||||
if reference.IsNameOnly(img) {
|
|
||||||
allImagesTagged = false
|
|
||||||
}
|
|
||||||
|
|
||||||
var tag string
|
var result string
|
||||||
switch img.(type) {
|
if ok {
|
||||||
case reference.NamedTagged:
|
result = "yes"
|
||||||
tag = img.(reference.NamedTagged).Tag()
|
} else {
|
||||||
case reference.Named:
|
result = "NO"
|
||||||
noUnstableTags = false
|
}
|
||||||
}
|
|
||||||
|
|
||||||
if tag == "latest" {
|
if internal.OnlyErrors {
|
||||||
noUnstableTags = false
|
if !ok && rule.Level == "error" {
|
||||||
}
|
table.Append([]string{rule.Ref, rule.Description, result, rule.Level, rule.HowToResolve})
|
||||||
|
bar.Add(1)
|
||||||
if !tagcmp.IsParsable(tag) {
|
}
|
||||||
semverLikeTags = false
|
} else {
|
||||||
}
|
table.Append([]string{rule.Ref, rule.Description, result, rule.Level, rule.HowToResolve})
|
||||||
|
bar.Add(1)
|
||||||
if service.HealthCheck == nil {
|
}
|
||||||
healthChecksForAllServices = false
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
tableCol := []string{"rule", "satisfied"}
|
if table.NumLines() > 0 {
|
||||||
table := formatter.CreateTable(tableCol)
|
fmt.Println()
|
||||||
table.Append([]string{"compose files have the expected version", strconv.FormatBool(expectedVersion)})
|
table.Render()
|
||||||
table.Append([]string{"environment configuration is provided", strconv.FormatBool(envSampleProvided)})
|
}
|
||||||
table.Append([]string{"recipe contains a service named 'app'", strconv.FormatBool(serviceNamedApp)})
|
|
||||||
table.Append([]string{"traefik routing enabled on at least one service", strconv.FormatBool(traefikEnabled)})
|
if hasError {
|
||||||
table.Append([]string{"all services have a healthcheck enabled", strconv.FormatBool(healthChecksForAllServices)})
|
logrus.Warn("watch out, some critical errors are present in your recipe config")
|
||||||
table.Append([]string{"all images are using a tag", strconv.FormatBool(allImagesTagged)})
|
}
|
||||||
table.Append([]string{"no usage of unstable 'latest' tags", strconv.FormatBool(noUnstableTags)})
|
|
||||||
table.Append([]string{"all tags are using a semver-like format", strconv.FormatBool(semverLikeTags)})
|
|
||||||
table.Render()
|
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
},
|
},
|
||||||
BashComplete: func(c *cli.Context) {
|
|
||||||
catl, err := catalogue.ReadRecipeCatalogue()
|
|
||||||
if err != nil {
|
|
||||||
logrus.Warn(err)
|
|
||||||
}
|
|
||||||
if c.NArg() > 0 {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
for name := range catl {
|
|
||||||
fmt.Println(name)
|
|
||||||
}
|
|
||||||
},
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -3,36 +3,74 @@ package recipe
|
||||||
import (
|
import (
|
||||||
"fmt"
|
"fmt"
|
||||||
"sort"
|
"sort"
|
||||||
|
"strconv"
|
||||||
|
"strings"
|
||||||
|
|
||||||
"coopcloud.tech/abra/cli/formatter"
|
"coopcloud.tech/abra/cli/internal"
|
||||||
"coopcloud.tech/abra/pkg/catalogue"
|
"coopcloud.tech/abra/pkg/formatter"
|
||||||
|
"coopcloud.tech/abra/pkg/recipe"
|
||||||
"github.com/sirupsen/logrus"
|
"github.com/sirupsen/logrus"
|
||||||
"github.com/urfave/cli/v2"
|
"github.com/urfave/cli"
|
||||||
)
|
)
|
||||||
|
|
||||||
var recipeListCommand = &cli.Command{
|
var pattern string
|
||||||
|
var patternFlag = &cli.StringFlag{
|
||||||
|
Name: "pattern, p",
|
||||||
|
Value: "",
|
||||||
|
Usage: "Simple string to filter recipes",
|
||||||
|
Destination: &pattern,
|
||||||
|
}
|
||||||
|
|
||||||
|
var recipeListCommand = cli.Command{
|
||||||
Name: "list",
|
Name: "list",
|
||||||
Usage: "List available recipes",
|
Usage: "List available recipes",
|
||||||
Aliases: []string{"ls"},
|
Aliases: []string{"ls"},
|
||||||
|
Flags: []cli.Flag{
|
||||||
|
internal.DebugFlag,
|
||||||
|
patternFlag,
|
||||||
|
},
|
||||||
|
Before: internal.SubCommandBefore,
|
||||||
Action: func(c *cli.Context) error {
|
Action: func(c *cli.Context) error {
|
||||||
catl, err := catalogue.ReadRecipeCatalogue()
|
catl, err := recipe.ReadRecipeCatalogue()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logrus.Fatal(err.Error())
|
logrus.Fatal(err.Error())
|
||||||
}
|
}
|
||||||
|
|
||||||
recipes := catl.Flatten()
|
recipes := catl.Flatten()
|
||||||
sort.Sort(catalogue.ByRecipeName(recipes))
|
sort.Sort(recipe.ByRecipeName(recipes))
|
||||||
|
|
||||||
tableCol := []string{"name", "category", "status"}
|
tableCol := []string{"name", "category", "status", "healthcheck", "backups", "email", "tests", "SSO"}
|
||||||
table := formatter.CreateTable(tableCol)
|
table := formatter.CreateTable(tableCol)
|
||||||
|
|
||||||
|
len := 0
|
||||||
for _, recipe := range recipes {
|
for _, recipe := range recipes {
|
||||||
status := fmt.Sprintf("%v", recipe.Features.Status)
|
tableRow := []string{
|
||||||
tableRow := []string{recipe.Name, recipe.Category, status}
|
recipe.Name,
|
||||||
table.Append(tableRow)
|
recipe.Category,
|
||||||
|
strconv.Itoa(recipe.Features.Status),
|
||||||
|
recipe.Features.Healthcheck,
|
||||||
|
recipe.Features.Backups,
|
||||||
|
recipe.Features.Email,
|
||||||
|
recipe.Features.Tests,
|
||||||
|
recipe.Features.SSO,
|
||||||
|
}
|
||||||
|
|
||||||
|
if pattern != "" {
|
||||||
|
if strings.Contains(recipe.Name, pattern) {
|
||||||
|
table.Append(tableRow)
|
||||||
|
len++
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
table.Append(tableRow)
|
||||||
|
len++
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
table.Render()
|
table.SetCaption(true, fmt.Sprintf("total recipes: %v", len))
|
||||||
|
|
||||||
|
if table.NumLines() > 0 {
|
||||||
|
table.Render()
|
||||||
|
}
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
},
|
},
|
||||||
|
|
|
@ -1,8 +1,10 @@
|
||||||
package recipe
|
package recipe
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"bytes"
|
||||||
"errors"
|
"errors"
|
||||||
"fmt"
|
"fmt"
|
||||||
|
"io/ioutil"
|
||||||
"os"
|
"os"
|
||||||
"path"
|
"path"
|
||||||
"text/template"
|
"text/template"
|
||||||
|
@ -11,13 +13,32 @@ import (
|
||||||
"coopcloud.tech/abra/pkg/config"
|
"coopcloud.tech/abra/pkg/config"
|
||||||
"coopcloud.tech/abra/pkg/git"
|
"coopcloud.tech/abra/pkg/git"
|
||||||
"github.com/sirupsen/logrus"
|
"github.com/sirupsen/logrus"
|
||||||
"github.com/urfave/cli/v2"
|
"github.com/urfave/cli"
|
||||||
)
|
)
|
||||||
|
|
||||||
var recipeNewCommand = &cli.Command{
|
// recipeMetadata is the recipe metadata for the README.md
|
||||||
Name: "new",
|
type recipeMetadata struct {
|
||||||
|
Name string
|
||||||
|
Description string
|
||||||
|
Category string
|
||||||
|
Status string
|
||||||
|
Image string
|
||||||
|
Healthcheck string
|
||||||
|
Backups string
|
||||||
|
Email string
|
||||||
|
Tests string
|
||||||
|
SSO string
|
||||||
|
}
|
||||||
|
|
||||||
|
var recipeNewCommand = cli.Command{
|
||||||
|
Name: "new",
|
||||||
|
Aliases: []string{"n"},
|
||||||
|
Flags: []cli.Flag{
|
||||||
|
internal.DebugFlag,
|
||||||
|
internal.NoInputFlag,
|
||||||
|
},
|
||||||
|
Before: internal.SubCommandBefore,
|
||||||
Usage: "Create a new recipe",
|
Usage: "Create a new recipe",
|
||||||
Aliases: []string{"n"},
|
|
||||||
ArgsUsage: "<recipe>",
|
ArgsUsage: "<recipe>",
|
||||||
Description: `
|
Description: `
|
||||||
This command creates a new recipe.
|
This command creates a new recipe.
|
||||||
|
@ -29,19 +50,17 @@ Abra uses our built-in example repository which is available here:
|
||||||
Files within the example repository make use of the Golang templating system
|
Files within the example repository make use of the Golang templating system
|
||||||
which Abra uses to inject values into the generated recipe folder (e.g. name of
|
which Abra uses to inject values into the generated recipe folder (e.g. name of
|
||||||
recipe and domain in the sample environment config).
|
recipe and domain in the sample environment config).
|
||||||
|
|
||||||
The new example repository is cloned to ~/.abra/apps/<recipe>.
|
|
||||||
`,
|
`,
|
||||||
Action: func(c *cli.Context) error {
|
Action: func(c *cli.Context) error {
|
||||||
recipeName := c.Args().First()
|
recipeName := c.Args().First()
|
||||||
|
|
||||||
if recipeName == "" {
|
if recipeName == "" {
|
||||||
internal.ShowSubcommandHelpAndError(c, errors.New("no recipe provided"))
|
internal.ShowSubcommandHelpAndError(c, errors.New("no recipe name provided"))
|
||||||
}
|
}
|
||||||
|
|
||||||
directory := path.Join(config.APPS_DIR, recipeName)
|
directory := path.Join(config.RECIPES_DIR, recipeName)
|
||||||
if _, err := os.Stat(directory); !os.IsNotExist(err) {
|
if _, err := os.Stat(directory); !os.IsNotExist(err) {
|
||||||
logrus.Fatalf("'%s' recipe directory already exists?", directory)
|
logrus.Fatalf("%s recipe directory already exists?", directory)
|
||||||
}
|
}
|
||||||
|
|
||||||
url := fmt.Sprintf("%s/example.git", config.REPOS_BASE_URL)
|
url := fmt.Sprintf("%s/example.git", config.REPOS_BASE_URL)
|
||||||
|
@ -49,44 +68,73 @@ The new example repository is cloned to ~/.abra/apps/<recipe>.
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
gitRepo := path.Join(config.APPS_DIR, recipeName, ".git")
|
gitRepo := path.Join(config.RECIPES_DIR, recipeName, ".git")
|
||||||
if err := os.RemoveAll(gitRepo); err != nil {
|
if err := os.RemoveAll(gitRepo); err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
logrus.Debugf("removed git repo in '%s'", gitRepo)
|
logrus.Debugf("removed example git repo in %s", gitRepo)
|
||||||
|
|
||||||
|
meta := newRecipeMeta(recipeName)
|
||||||
|
|
||||||
toParse := []string{
|
toParse := []string{
|
||||||
path.Join(config.APPS_DIR, recipeName, "README.md"),
|
path.Join(config.RECIPES_DIR, recipeName, "README.md"),
|
||||||
path.Join(config.APPS_DIR, recipeName, ".env.sample"),
|
path.Join(config.RECIPES_DIR, recipeName, ".env.sample"),
|
||||||
path.Join(config.APPS_DIR, recipeName, ".drone.yml"),
|
|
||||||
}
|
}
|
||||||
for _, path := range toParse {
|
for _, path := range toParse {
|
||||||
file, err := os.OpenFile(path, os.O_RDWR, 0755)
|
|
||||||
if err != nil {
|
|
||||||
logrus.Fatal(err)
|
|
||||||
}
|
|
||||||
|
|
||||||
tpl, err := template.ParseFiles(path)
|
tpl, err := template.ParseFiles(path)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
// TODO: ask for description and probably other things so that the
|
var templated bytes.Buffer
|
||||||
// template repository is more "ready" to go than the current best-guess
|
if err := tpl.Execute(&templated, meta); err != nil {
|
||||||
// mode of templating
|
|
||||||
if err := tpl.Execute(file, struct {
|
|
||||||
Name string
|
|
||||||
Description string
|
|
||||||
}{recipeName, "TODO"}); err != nil {
|
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if err := ioutil.WriteFile(path, templated.Bytes(), 0644); err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
logrus.Infof(
|
newGitRepo := path.Join(config.RECIPES_DIR, recipeName)
|
||||||
"new recipe '%s' created in %s, happy hacking!\n",
|
if err := git.Init(newGitRepo, true); err != nil {
|
||||||
recipeName, path.Join(config.APPS_DIR, recipeName),
|
logrus.Fatal(err)
|
||||||
)
|
}
|
||||||
|
|
||||||
|
fmt.Print(fmt.Sprintf(`
|
||||||
|
Your new %s recipe has been created in %s.
|
||||||
|
|
||||||
|
In order to share your recipe, you can upload it the git repository to:
|
||||||
|
|
||||||
|
https://git.coopcloud.tech/coop-cloud/%s
|
||||||
|
|
||||||
|
If you're not sure how to do that, come chat with us:
|
||||||
|
|
||||||
|
https://docs.coopcloud.tech/contact
|
||||||
|
|
||||||
|
See "abra recipe -h" for additional recipe maintainer commands.
|
||||||
|
|
||||||
|
Happy Hacking!
|
||||||
|
|
||||||
|
`, recipeName, path.Join(config.RECIPES_DIR, recipeName), recipeName))
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// newRecipeMeta creates a new recipeMetadata instance with defaults
|
||||||
|
func newRecipeMeta(recipeName string) recipeMetadata {
|
||||||
|
return recipeMetadata{
|
||||||
|
Name: recipeName,
|
||||||
|
Description: "> One line description of the recipe",
|
||||||
|
Category: "Apps",
|
||||||
|
Status: "0",
|
||||||
|
Image: fmt.Sprintf("[`%s`](https://hub.docker.com/r/%s), 4, upstream", recipeName, recipeName),
|
||||||
|
Healthcheck: "No",
|
||||||
|
Backups: "No",
|
||||||
|
Email: "No",
|
||||||
|
Tests: "No",
|
||||||
|
SSO: "No",
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
|
@ -1,21 +1,26 @@
|
||||||
package recipe
|
package recipe
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"github.com/urfave/cli/v2"
|
"github.com/urfave/cli"
|
||||||
)
|
)
|
||||||
|
|
||||||
// RecipeCommand defines all recipe related sub-commands.
|
// RecipeCommand defines all recipe related sub-commands.
|
||||||
var RecipeCommand = &cli.Command{
|
var RecipeCommand = cli.Command{
|
||||||
Name: "recipe",
|
Name: "recipe",
|
||||||
Usage: "Manage recipes (for maintainers)",
|
|
||||||
ArgsUsage: "<recipe>",
|
|
||||||
Aliases: []string{"r"},
|
Aliases: []string{"r"},
|
||||||
|
Usage: "Manage recipes",
|
||||||
|
ArgsUsage: "<recipe>",
|
||||||
Description: `
|
Description: `
|
||||||
A recipe is a blueprint for an app. It is a bunch of configuration files which
|
A recipe is a blueprint for an app. It is a bunch of config files which
|
||||||
describe how to deploy and maintain an app. Recipes are maintained by the Co-op
|
describe how to deploy and maintain an app. Recipes are maintained by the Co-op
|
||||||
Cloud community and you can use Abra to read them and create apps for you.
|
Cloud community and you can use Abra to read them and create apps for you.
|
||||||
|
|
||||||
|
Anyone who uses a recipe can become a maintainer. Maintainers typically make
|
||||||
|
sure the recipe is in good working order and the config upgraded in a timely
|
||||||
|
manner. Abra supports convenient automation for recipe maintainenace, see the
|
||||||
|
"abra recipe upgrade", "abra recipe sync" and "abra recipe release" commands.
|
||||||
`,
|
`,
|
||||||
Subcommands: []*cli.Command{
|
Subcommands: []cli.Command{
|
||||||
recipeListCommand,
|
recipeListCommand,
|
||||||
recipeVersionCommand,
|
recipeVersionCommand,
|
||||||
recipeReleaseCommand,
|
recipeReleaseCommand,
|
||||||
|
|
|
@ -6,290 +6,120 @@ import (
|
||||||
"strconv"
|
"strconv"
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
abraFormatter "coopcloud.tech/abra/cli/formatter"
|
|
||||||
"coopcloud.tech/abra/cli/internal"
|
"coopcloud.tech/abra/cli/internal"
|
||||||
|
"coopcloud.tech/abra/pkg/autocomplete"
|
||||||
"coopcloud.tech/abra/pkg/config"
|
"coopcloud.tech/abra/pkg/config"
|
||||||
|
"coopcloud.tech/abra/pkg/formatter"
|
||||||
|
gitPkg "coopcloud.tech/abra/pkg/git"
|
||||||
"coopcloud.tech/abra/pkg/recipe"
|
"coopcloud.tech/abra/pkg/recipe"
|
||||||
recipePkg "coopcloud.tech/abra/pkg/recipe"
|
recipePkg "coopcloud.tech/abra/pkg/recipe"
|
||||||
"coopcloud.tech/tagcmp"
|
"coopcloud.tech/tagcmp"
|
||||||
"github.com/AlecAivazis/survey/v2"
|
"github.com/AlecAivazis/survey/v2"
|
||||||
"github.com/docker/distribution/reference"
|
"github.com/docker/distribution/reference"
|
||||||
"github.com/go-git/go-git/v5"
|
"github.com/go-git/go-git/v5"
|
||||||
"github.com/go-git/go-git/v5/plumbing"
|
|
||||||
"github.com/sirupsen/logrus"
|
"github.com/sirupsen/logrus"
|
||||||
"github.com/urfave/cli/v2"
|
"github.com/urfave/cli"
|
||||||
)
|
)
|
||||||
|
|
||||||
var recipeReleaseCommand = &cli.Command{
|
var recipeReleaseCommand = cli.Command{
|
||||||
Name: "release",
|
Name: "release",
|
||||||
Usage: "Release a new recipe version",
|
|
||||||
Aliases: []string{"rl"},
|
Aliases: []string{"rl"},
|
||||||
|
Usage: "Release a new recipe version",
|
||||||
ArgsUsage: "<recipe> [<version>]",
|
ArgsUsage: "<recipe> [<version>]",
|
||||||
Description: `
|
Description: `
|
||||||
This command is used to specify a new tag for a recipe. These tags are used to
|
This command is used to specify a new version of a recipe. These versions are
|
||||||
identify different versions of the recipe and are published on the Co-op Cloud
|
then published on the Co-op Cloud recipe catalogue. These versions take the
|
||||||
recipe catalogue.
|
following form:
|
||||||
|
|
||||||
These tags take the following form:
|
|
||||||
|
|
||||||
a.b.c+x.y.z
|
a.b.c+x.y.z
|
||||||
|
|
||||||
Where the "a.b.c" part is maintained as a semantic version of the recipe by the
|
Where the "a.b.c" part is a semantic version determined by the maintainer. And
|
||||||
recipe maintainer. And the "x.y.z" part is the image tag of the recipe "app"
|
the "x.y.z" part is the image tag of the recipe "app" service (the main
|
||||||
service (the main container which contains the software to be used).
|
container which contains the software to be used).
|
||||||
|
|
||||||
We maintain a semantic versioning scheme ("a.b.c") alongside the libre app
|
We maintain a semantic versioning scheme ("a.b.c") alongside the libre app
|
||||||
versioning scheme in order to maximise the chances that the nature of recipe
|
versioning scheme ("x.y.z") in order to maximise the chances that the nature of
|
||||||
updates are properly communicated.
|
recipe updates are properly communicated. I.e. developers of an app might
|
||||||
|
publish a minor version but that might lead to changes in the recipe which are
|
||||||
Abra does its best to read the "a.b.c" version scheme and communicate what
|
major and therefore require intervention while doing the upgrade work.
|
||||||
action needs to be taken when performing different operations such as an update
|
|
||||||
or a rollback of an app.
|
|
||||||
|
|
||||||
You may invoke this command in "wizard" mode and be prompted for input:
|
|
||||||
|
|
||||||
abra recipe release gitea
|
|
||||||
|
|
||||||
|
Publish your new release to git.coopcloud.tech with "-p/--publish". This
|
||||||
|
requires that you have permission to git push to these repositories and have
|
||||||
|
your SSH keys configured on your account.
|
||||||
`,
|
`,
|
||||||
Flags: []cli.Flag{
|
Flags: []cli.Flag{
|
||||||
|
internal.DebugFlag,
|
||||||
|
internal.NoInputFlag,
|
||||||
internal.DryFlag,
|
internal.DryFlag,
|
||||||
internal.MajorFlag,
|
internal.MajorFlag,
|
||||||
internal.MinorFlag,
|
internal.MinorFlag,
|
||||||
internal.PatchFlag,
|
internal.PatchFlag,
|
||||||
internal.PushFlag,
|
internal.PublishFlag,
|
||||||
internal.CommitFlag,
|
|
||||||
internal.CommitMessageFlag,
|
|
||||||
internal.TagMessageFlag,
|
|
||||||
},
|
},
|
||||||
|
Before: internal.SubCommandBefore,
|
||||||
|
BashComplete: autocomplete.RecipeNameComplete,
|
||||||
Action: func(c *cli.Context) error {
|
Action: func(c *cli.Context) error {
|
||||||
recipe := internal.ValidateRecipeWithPrompt(c)
|
recipe := internal.ValidateRecipeWithPrompt(c, false)
|
||||||
directory := path.Join(config.APPS_DIR, recipe.Name)
|
|
||||||
tagString := c.Args().Get(1)
|
|
||||||
mainApp := internal.GetMainApp(recipe)
|
|
||||||
|
|
||||||
imagesTmp, err := getImageVersions(recipe)
|
imagesTmp, err := getImageVersions(recipe)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
mainAppVersion := imagesTmp[mainApp]
|
|
||||||
|
|
||||||
if err := recipePkg.EnsureExists(recipe.Name); err != nil {
|
mainApp, err := internal.GetMainAppImage(recipe)
|
||||||
|
if err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
mainAppVersion := imagesTmp[mainApp]
|
||||||
if mainAppVersion == "" {
|
if mainAppVersion == "" {
|
||||||
logrus.Fatalf("main 'app' service version for %s is empty?", recipe.Name)
|
logrus.Fatalf("main app service version for %s is empty?", recipe.Name)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
tagString := c.Args().Get(1)
|
||||||
if tagString != "" {
|
if tagString != "" {
|
||||||
if _, err := tagcmp.Parse(tagString); err != nil {
|
if _, err := tagcmp.Parse(tagString); err != nil {
|
||||||
logrus.Fatal("invalid tag specified")
|
logrus.Fatalf("cannot parse %s, invalid tag specified?", tagString)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!internal.Major && !internal.Minor && !internal.Patch) && tagString != "" {
|
|
||||||
logrus.Fatal("please specify <version> or bump type (--major/--minor/--patch)")
|
|
||||||
}
|
|
||||||
|
|
||||||
if (internal.Major || internal.Minor || internal.Patch) && tagString != "" {
|
if (internal.Major || internal.Minor || internal.Patch) && tagString != "" {
|
||||||
logrus.Fatal("cannot specify tag and bump type at the same time")
|
logrus.Fatal("cannot specify tag and bump type at the same time")
|
||||||
}
|
}
|
||||||
|
|
||||||
// bumpType is used to decide what part of the tag should be incremented
|
|
||||||
bumpType := btoi(internal.Major)*4 + btoi(internal.Minor)*2 + btoi(internal.Patch)
|
|
||||||
if bumpType != 0 {
|
|
||||||
// a bitwise check if the number is a power of 2
|
|
||||||
if (bumpType & (bumpType - 1)) != 0 {
|
|
||||||
logrus.Fatal("you can only use one of: --major, --minor, --patch.")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if err := internal.PromptBumpType(tagString); err != nil {
|
|
||||||
logrus.Fatal(err)
|
|
||||||
}
|
|
||||||
|
|
||||||
if internal.TagMessage == "" {
|
|
||||||
prompt := &survey.Input{
|
|
||||||
Message: "tag message",
|
|
||||||
Default: fmt.Sprintf("chore: publish new %s version", internal.GetBumpType()),
|
|
||||||
}
|
|
||||||
if err := survey.AskOne(prompt, &internal.TagMessage); err != nil {
|
|
||||||
logrus.Fatal(err)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
var createTagOptions git.CreateTagOptions
|
|
||||||
createTagOptions.Message = internal.TagMessage
|
|
||||||
|
|
||||||
if !internal.Commit {
|
|
||||||
prompt := &survey.Confirm{
|
|
||||||
Message: "git commit changes also?",
|
|
||||||
}
|
|
||||||
if err := survey.AskOne(prompt, &internal.Commit); err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if !internal.Push {
|
|
||||||
prompt := &survey.Confirm{
|
|
||||||
Message: "git push changes also?",
|
|
||||||
}
|
|
||||||
if err := survey.AskOne(prompt, &internal.Push); err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if internal.Commit || internal.CommitMessage != "" {
|
|
||||||
commitRepo, err := git.PlainOpen(directory)
|
|
||||||
if err != nil {
|
|
||||||
logrus.Fatal(err)
|
|
||||||
}
|
|
||||||
commitWorktree, err := commitRepo.Worktree()
|
|
||||||
if err != nil {
|
|
||||||
logrus.Fatal(err)
|
|
||||||
}
|
|
||||||
|
|
||||||
if internal.CommitMessage == "" {
|
|
||||||
prompt := &survey.Input{
|
|
||||||
Message: "commit message",
|
|
||||||
Default: fmt.Sprintf("chore: publish new %s version", internal.GetBumpType()),
|
|
||||||
}
|
|
||||||
if err := survey.AskOne(prompt, &internal.CommitMessage); err != nil {
|
|
||||||
logrus.Fatal(err)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
err = commitWorktree.AddGlob("compose.**yml")
|
|
||||||
if err != nil {
|
|
||||||
logrus.Fatal(err)
|
|
||||||
}
|
|
||||||
logrus.Debug("staged compose.**yml for commit")
|
|
||||||
|
|
||||||
if !internal.Dry {
|
|
||||||
_, err = commitWorktree.Commit(internal.CommitMessage, &git.CommitOptions{})
|
|
||||||
if err != nil {
|
|
||||||
logrus.Fatal(err)
|
|
||||||
}
|
|
||||||
logrus.Info("changes commited")
|
|
||||||
} else {
|
|
||||||
logrus.Info("dry run only: NOT committing changes")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
repo, err := git.PlainOpen(directory)
|
|
||||||
if err != nil {
|
|
||||||
logrus.Fatal(err)
|
|
||||||
}
|
|
||||||
head, err := repo.Head()
|
|
||||||
if err != nil {
|
|
||||||
logrus.Fatal(err)
|
|
||||||
}
|
|
||||||
|
|
||||||
if tagString != "" {
|
if tagString != "" {
|
||||||
tag, err := tagcmp.Parse(tagString)
|
if err := createReleaseFromTag(recipe, tagString, mainAppVersion); err != nil {
|
||||||
if err != nil {
|
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
if tag.MissingMinor {
|
|
||||||
tag.Minor = "0"
|
|
||||||
tag.MissingMinor = false
|
|
||||||
}
|
|
||||||
if tag.MissingPatch {
|
|
||||||
tag.Patch = "0"
|
|
||||||
tag.MissingPatch = false
|
|
||||||
}
|
|
||||||
tagString = fmt.Sprintf("%s+%s", tag.String(), mainAppVersion)
|
|
||||||
if internal.Dry {
|
|
||||||
hash := abraFormatter.SmallSHA(head.Hash().String())
|
|
||||||
logrus.Info(fmt.Sprintf("dry run only: NOT creating tag %s at %s", tagString, hash))
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
repo.CreateTag(tagString, head.Hash(), &createTagOptions)
|
|
||||||
hash := abraFormatter.SmallSHA(head.Hash().String())
|
|
||||||
logrus.Info(fmt.Sprintf("created tag %s at %s", tagString, hash))
|
|
||||||
if internal.Push && !internal.Dry {
|
|
||||||
if err := repo.Push(&git.PushOptions{}); err != nil {
|
|
||||||
logrus.Fatal(err)
|
|
||||||
}
|
|
||||||
logrus.Info(fmt.Sprintf("pushed tag %s to remote", tagString))
|
|
||||||
} else {
|
|
||||||
logrus.Info("dry run only: NOT pushing changes")
|
|
||||||
}
|
|
||||||
|
|
||||||
return nil
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// get the latest tag with its hash, name etc
|
tags, err := recipe.Tags()
|
||||||
var lastGitTag tagcmp.Tag
|
|
||||||
iter, err := repo.Tags()
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
if err := iter.ForEach(func(ref *plumbing.Reference) error {
|
|
||||||
obj, err := repo.TagObject(ref.Hash())
|
if tagString == "" && (!internal.Major && !internal.Minor && !internal.Patch) {
|
||||||
|
var err error
|
||||||
|
tagString, err = getLabelVersion(recipe, false)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
|
||||||
}
|
|
||||||
tagcmpTag, err := tagcmp.Parse(obj.Name)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
if (lastGitTag == tagcmp.Tag{}) {
|
|
||||||
lastGitTag = tagcmpTag
|
|
||||||
} else if tagcmpTag.IsGreaterThan(lastGitTag) {
|
|
||||||
lastGitTag = tagcmpTag
|
|
||||||
}
|
|
||||||
return nil
|
|
||||||
}); err != nil {
|
|
||||||
logrus.Fatal(err)
|
|
||||||
}
|
|
||||||
|
|
||||||
newTag := lastGitTag
|
|
||||||
var newtagString string
|
|
||||||
if bumpType > 0 {
|
|
||||||
if internal.Patch {
|
|
||||||
now, err := strconv.Atoi(newTag.Patch)
|
|
||||||
if err != nil {
|
|
||||||
logrus.Fatal(err)
|
|
||||||
}
|
|
||||||
newTag.Patch = strconv.Itoa(now + 1)
|
|
||||||
} else if internal.Minor {
|
|
||||||
now, err := strconv.Atoi(newTag.Minor)
|
|
||||||
if err != nil {
|
|
||||||
logrus.Fatal(err)
|
|
||||||
}
|
|
||||||
newTag.Patch = "0"
|
|
||||||
newTag.Minor = strconv.Itoa(now + 1)
|
|
||||||
} else if internal.Major {
|
|
||||||
now, err := strconv.Atoi(newTag.Major)
|
|
||||||
if err != nil {
|
|
||||||
logrus.Fatal(err)
|
|
||||||
}
|
|
||||||
newTag.Patch = "0"
|
|
||||||
newTag.Minor = "0"
|
|
||||||
newTag.Major = strconv.Itoa(now + 1)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
newTag.Metadata = mainAppVersion
|
|
||||||
newtagString = newTag.String()
|
|
||||||
if internal.Dry {
|
|
||||||
hash := abraFormatter.SmallSHA(head.Hash().String())
|
|
||||||
logrus.Info(fmt.Sprintf("dry run only: NOT creating tag %s at %s", newtagString, hash))
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
repo.CreateTag(newtagString, head.Hash(), &createTagOptions)
|
|
||||||
hash := abraFormatter.SmallSHA(head.Hash().String())
|
|
||||||
logrus.Info(fmt.Sprintf("created tag %s at %s", newtagString, hash))
|
|
||||||
if internal.Push && !internal.Dry {
|
|
||||||
if err := repo.Push(&git.PushOptions{}); err != nil {
|
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
logrus.Info(fmt.Sprintf("pushed tag %s to remote", newtagString))
|
}
|
||||||
|
|
||||||
|
if len(tags) > 0 {
|
||||||
|
logrus.Warnf("previous git tags detected, assuming this is a new semver release")
|
||||||
|
if err := createReleaseFromPreviousTag(tagString, mainAppVersion, recipe, tags); err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
logrus.Info("gry run only: NOT pushing changes")
|
logrus.Warnf("no tag specified and no previous tag available for %s, assuming this is the initial release", recipe.Name)
|
||||||
|
|
||||||
|
if err := createReleaseFromTag(recipe, tagString, mainAppVersion); err != nil {
|
||||||
|
if cleanUpErr := cleanUpTag(tagString, recipe.Name); err != nil {
|
||||||
|
logrus.Fatal(cleanUpErr)
|
||||||
|
}
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
|
@ -300,6 +130,7 @@ You may invoke this command in "wizard" mode and be prompted for input:
|
||||||
func getImageVersions(recipe recipe.Recipe) (map[string]string, error) {
|
func getImageVersions(recipe recipe.Recipe) (map[string]string, error) {
|
||||||
var services = make(map[string]string)
|
var services = make(map[string]string)
|
||||||
|
|
||||||
|
missingTag := false
|
||||||
for _, service := range recipe.Config.Services {
|
for _, service := range recipe.Config.Services {
|
||||||
if service.Image == "" {
|
if service.Image == "" {
|
||||||
continue
|
continue
|
||||||
|
@ -311,24 +142,74 @@ func getImageVersions(recipe recipe.Recipe) (map[string]string, error) {
|
||||||
}
|
}
|
||||||
|
|
||||||
path := reference.Path(img)
|
path := reference.Path(img)
|
||||||
if strings.Contains(path, "library") {
|
|
||||||
path = strings.Split(path, "/")[1]
|
path = formatter.StripTagMeta(path)
|
||||||
}
|
|
||||||
|
|
||||||
var tag string
|
var tag string
|
||||||
switch img.(type) {
|
switch img.(type) {
|
||||||
case reference.NamedTagged:
|
case reference.NamedTagged:
|
||||||
tag = img.(reference.NamedTagged).Tag()
|
tag = img.(reference.NamedTagged).Tag()
|
||||||
case reference.Named:
|
case reference.Named:
|
||||||
logrus.Fatalf("%s service is missing image tag?", path)
|
if service.Name == "app" {
|
||||||
|
missingTag = true
|
||||||
|
}
|
||||||
|
continue
|
||||||
}
|
}
|
||||||
|
|
||||||
services[path] = tag
|
services[path] = tag
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if missingTag {
|
||||||
|
return services, fmt.Errorf("app service is missing image tag?")
|
||||||
|
}
|
||||||
|
|
||||||
return services, nil
|
return services, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// createReleaseFromTag creates a new release based on a supplied recipe version string
|
||||||
|
func createReleaseFromTag(recipe recipe.Recipe, tagString, mainAppVersion string) error {
|
||||||
|
var err error
|
||||||
|
|
||||||
|
directory := path.Join(config.RECIPES_DIR, recipe.Name)
|
||||||
|
repo, err := git.PlainOpen(directory)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
tag, err := tagcmp.Parse(tagString)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
if tag.MissingMinor {
|
||||||
|
tag.Minor = "0"
|
||||||
|
tag.MissingMinor = false
|
||||||
|
}
|
||||||
|
|
||||||
|
if tag.MissingPatch {
|
||||||
|
tag.Patch = "0"
|
||||||
|
tag.MissingPatch = false
|
||||||
|
}
|
||||||
|
|
||||||
|
if tagString == "" {
|
||||||
|
tagString = fmt.Sprintf("%s+%s", tag.String(), mainAppVersion)
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := commitRelease(recipe, tagString); err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := tagRelease(tagString, repo); err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := pushRelease(recipe, tagString); err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
// btoi converts a boolean value into an integer
|
// btoi converts a boolean value into an integer
|
||||||
func btoi(b bool) int {
|
func btoi(b bool) int {
|
||||||
if b {
|
if b {
|
||||||
|
@ -337,3 +218,237 @@ func btoi(b bool) int {
|
||||||
|
|
||||||
return 0
|
return 0
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// getTagCreateOptions constructs git tag create options
|
||||||
|
func getTagCreateOptions(tag string) (git.CreateTagOptions, error) {
|
||||||
|
msg := fmt.Sprintf("chore: publish %s release", tag)
|
||||||
|
return git.CreateTagOptions{Message: msg}, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func commitRelease(recipe recipe.Recipe, tag string) error {
|
||||||
|
if internal.Dry {
|
||||||
|
logrus.Debugf("dry run: no changes committed")
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
isClean, err := gitPkg.IsClean(recipe.Dir())
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
if isClean {
|
||||||
|
if !internal.Dry {
|
||||||
|
return fmt.Errorf("no changes discovered in %s, nothing to publish?", recipe.Dir())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
msg := fmt.Sprintf("chore: publish %s release", tag)
|
||||||
|
repoPath := path.Join(config.RECIPES_DIR, recipe.Name)
|
||||||
|
if err := gitPkg.Commit(repoPath, ".", msg, internal.Dry); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func tagRelease(tagString string, repo *git.Repository) error {
|
||||||
|
if internal.Dry {
|
||||||
|
logrus.Debugf("dry run: no git tag created (%s)", tagString)
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
head, err := repo.Head()
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
createTagOptions, err := getTagCreateOptions(tagString)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
_, err = repo.CreateTag(tagString, head.Hash(), &createTagOptions)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
hash := formatter.SmallSHA(head.Hash().String())
|
||||||
|
logrus.Debugf(fmt.Sprintf("created tag %s at %s", tagString, hash))
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func pushRelease(recipe recipe.Recipe, tagString string) error {
|
||||||
|
if internal.Dry {
|
||||||
|
logrus.Info("dry run: no changes published")
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
if !internal.Publish && !internal.NoInput {
|
||||||
|
prompt := &survey.Confirm{
|
||||||
|
Message: "publish new release?",
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := survey.AskOne(prompt, &internal.Publish); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if internal.Publish {
|
||||||
|
if err := recipe.Push(internal.Dry); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
url := fmt.Sprintf("%s/%s/src/tag/%s", config.REPOS_BASE_URL, recipe.Name, tagString)
|
||||||
|
logrus.Infof("new release published: %s", url)
|
||||||
|
} else {
|
||||||
|
logrus.Info("no -p/--publish passed, not publishing")
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func createReleaseFromPreviousTag(tagString, mainAppVersion string, recipe recipe.Recipe, tags []string) error {
|
||||||
|
directory := path.Join(config.RECIPES_DIR, recipe.Name)
|
||||||
|
repo, err := git.PlainOpen(directory)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
bumpType := btoi(internal.Major)*4 + btoi(internal.Minor)*2 + btoi(internal.Patch)
|
||||||
|
if bumpType != 0 {
|
||||||
|
if (bumpType & (bumpType - 1)) != 0 {
|
||||||
|
return fmt.Errorf("you can only use one of: --major, --minor, --patch")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
var lastGitTag tagcmp.Tag
|
||||||
|
for _, tag := range tags {
|
||||||
|
parsed, err := tagcmp.Parse(tag)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
if (lastGitTag == tagcmp.Tag{}) {
|
||||||
|
lastGitTag = parsed
|
||||||
|
} else if parsed.IsGreaterThan(lastGitTag) {
|
||||||
|
lastGitTag = parsed
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
newTag := lastGitTag
|
||||||
|
if internal.Patch {
|
||||||
|
now, err := strconv.Atoi(newTag.Patch)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
newTag.Patch = strconv.Itoa(now + 1)
|
||||||
|
} else if internal.Minor {
|
||||||
|
now, err := strconv.Atoi(newTag.Minor)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
newTag.Patch = "0"
|
||||||
|
newTag.Minor = strconv.Itoa(now + 1)
|
||||||
|
} else if internal.Major {
|
||||||
|
now, err := strconv.Atoi(newTag.Major)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
newTag.Patch = "0"
|
||||||
|
newTag.Minor = "0"
|
||||||
|
newTag.Major = strconv.Itoa(now + 1)
|
||||||
|
}
|
||||||
|
|
||||||
|
if tagString == "" {
|
||||||
|
if err := internal.PromptBumpType(tagString, lastGitTag.String()); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if internal.Major || internal.Minor || internal.Patch {
|
||||||
|
newTag.Metadata = mainAppVersion
|
||||||
|
tagString = newTag.String()
|
||||||
|
}
|
||||||
|
|
||||||
|
if lastGitTag.String() == tagString {
|
||||||
|
logrus.Fatalf("latest git tag (%s) and synced lable (%s) are the same?", lastGitTag, tagString)
|
||||||
|
}
|
||||||
|
|
||||||
|
if !internal.NoInput {
|
||||||
|
prompt := &survey.Confirm{
|
||||||
|
Message: fmt.Sprintf("current: %s, new: %s, correct?", lastGitTag, tagString),
|
||||||
|
}
|
||||||
|
|
||||||
|
var ok bool
|
||||||
|
if err := survey.AskOne(prompt, &ok); err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if !ok {
|
||||||
|
logrus.Fatal("exiting as requested")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := commitRelease(recipe, tagString); err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := tagRelease(tagString, repo); err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := pushRelease(recipe, tagString); err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// cleanUpTag removes a freshly created tag
|
||||||
|
func cleanUpTag(tag, recipeName string) error {
|
||||||
|
directory := path.Join(config.RECIPES_DIR, recipeName)
|
||||||
|
repo, err := git.PlainOpen(directory)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := repo.DeleteTag(tag); err != nil {
|
||||||
|
if !strings.Contains(err.Error(), "not found") {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
logrus.Debugf("removed freshly created tag %s", tag)
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func getLabelVersion(recipe recipe.Recipe, prompt bool) (string, error) {
|
||||||
|
initTag, err := recipePkg.GetVersionLabelLocal(recipe)
|
||||||
|
if err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
|
||||||
|
if initTag == "" {
|
||||||
|
logrus.Fatalf("unable to read version for %s from synced label. Did you try running \"abra recipe sync %s\" already?", recipe.Name, recipe.Name)
|
||||||
|
}
|
||||||
|
|
||||||
|
logrus.Warnf("discovered %s as currently synced recipe label", initTag)
|
||||||
|
|
||||||
|
if prompt && !internal.NoInput {
|
||||||
|
var response bool
|
||||||
|
prompt := &survey.Confirm{Message: fmt.Sprintf("use %s as the new version?", initTag)}
|
||||||
|
if err := survey.AskOne(prompt, &response); err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
|
||||||
|
if !response {
|
||||||
|
return "", fmt.Errorf("please fix your synced label for %s and re-run this command", recipe.Name)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return initTag, nil
|
||||||
|
}
|
||||||
|
|
|
@ -6,51 +6,53 @@ import (
|
||||||
"strconv"
|
"strconv"
|
||||||
|
|
||||||
"coopcloud.tech/abra/cli/internal"
|
"coopcloud.tech/abra/cli/internal"
|
||||||
"coopcloud.tech/abra/pkg/catalogue"
|
"coopcloud.tech/abra/pkg/autocomplete"
|
||||||
"coopcloud.tech/abra/pkg/config"
|
"coopcloud.tech/abra/pkg/config"
|
||||||
"coopcloud.tech/tagcmp"
|
"coopcloud.tech/tagcmp"
|
||||||
"github.com/AlecAivazis/survey/v2"
|
"github.com/AlecAivazis/survey/v2"
|
||||||
"github.com/go-git/go-git/v5"
|
"github.com/go-git/go-git/v5"
|
||||||
"github.com/go-git/go-git/v5/plumbing"
|
"github.com/go-git/go-git/v5/plumbing"
|
||||||
"github.com/sirupsen/logrus"
|
"github.com/sirupsen/logrus"
|
||||||
"github.com/urfave/cli/v2"
|
"github.com/urfave/cli"
|
||||||
)
|
)
|
||||||
|
|
||||||
var recipeSyncCommand = &cli.Command{
|
var recipeSyncCommand = cli.Command{
|
||||||
Name: "sync",
|
Name: "sync",
|
||||||
Usage: "Ensure recipe version labels are up-to-date",
|
|
||||||
Aliases: []string{"s"},
|
Aliases: []string{"s"},
|
||||||
|
Usage: "Sync recipe version label",
|
||||||
ArgsUsage: "<recipe> [<version>]",
|
ArgsUsage: "<recipe> [<version>]",
|
||||||
Flags: []cli.Flag{
|
Flags: []cli.Flag{
|
||||||
|
internal.DebugFlag,
|
||||||
|
internal.NoInputFlag,
|
||||||
internal.DryFlag,
|
internal.DryFlag,
|
||||||
internal.MajorFlag,
|
internal.MajorFlag,
|
||||||
internal.MinorFlag,
|
internal.MinorFlag,
|
||||||
internal.PatchFlag,
|
internal.PatchFlag,
|
||||||
},
|
},
|
||||||
|
Before: internal.SubCommandBefore,
|
||||||
Description: `
|
Description: `
|
||||||
This command will generate labels for the main recipe service (i.e. by
|
This command will generate labels for the main recipe service (i.e. by
|
||||||
convention, the service named "app") which corresponds to the following format:
|
convention, the service named 'app') which corresponds to the following format:
|
||||||
|
|
||||||
coop-cloud.${STACK_NAME}.version=<version>
|
coop-cloud.${STACK_NAME}.version=<version>
|
||||||
|
|
||||||
The <version> is determined by the recipe maintainer and is specified on the
|
Where <version> can be specifed on the command-line or Abra can attempt to
|
||||||
command-line. The <recipe> configuration will be updated on the local file
|
auto-generate it for you. The <recipe> configuration will be updated on the
|
||||||
system.
|
local file system.
|
||||||
|
|
||||||
You may invoke this command in "wizard" mode and be prompted for input:
|
|
||||||
|
|
||||||
abra recipe sync gitea
|
|
||||||
|
|
||||||
`,
|
`,
|
||||||
Action: func(c *cli.Context) error {
|
Action: func(c *cli.Context) error {
|
||||||
recipe := internal.ValidateRecipeWithPrompt(c)
|
recipe := internal.ValidateRecipeWithPrompt(c, false)
|
||||||
|
|
||||||
mainApp := internal.GetMainApp(recipe)
|
mainApp, err := internal.GetMainAppImage(recipe)
|
||||||
|
if err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
imagesTmp, err := getImageVersions(recipe)
|
imagesTmp, err := getImageVersions(recipe)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
mainAppVersion := imagesTmp[mainApp]
|
mainAppVersion := imagesTmp[mainApp]
|
||||||
|
|
||||||
tags, err := recipe.Tags()
|
tags, err := recipe.Tags()
|
||||||
|
@ -60,49 +62,75 @@ You may invoke this command in "wizard" mode and be prompted for input:
|
||||||
|
|
||||||
nextTag := c.Args().Get(1)
|
nextTag := c.Args().Get(1)
|
||||||
if len(tags) == 0 && nextTag == "" {
|
if len(tags) == 0 && nextTag == "" {
|
||||||
logrus.Warnf("no tags found for %s", recipe.Name)
|
logrus.Warnf("no git tags found for %s", recipe.Name)
|
||||||
|
fmt.Println(fmt.Sprintf(`
|
||||||
|
The following options are two types of initial semantic version that you can
|
||||||
|
pick for %s that will be published in the recipe catalogue. This follows the
|
||||||
|
semver convention (more on https://semver.org), here is a short cheatsheet
|
||||||
|
|
||||||
|
0.1.0: development release, still hacking. when you make a major upgrade
|
||||||
|
you increment the "y" part (i.e. 0.1.0 -> 0.2.0) and only move to
|
||||||
|
using the "x" part when things are stable.
|
||||||
|
|
||||||
|
1.0.0: public release, assumed to be working. you already have a stable
|
||||||
|
and reliable deployment of this app and feel relatively confident
|
||||||
|
about it.
|
||||||
|
|
||||||
|
If you want people to be able alpha test your current config for %s but don't
|
||||||
|
think it is quite reliable, go with 0.1.0 and people will know that things are
|
||||||
|
likely to change.
|
||||||
|
|
||||||
|
`, recipe.Name, recipe.Name))
|
||||||
var chosenVersion string
|
var chosenVersion string
|
||||||
edPrompt := &survey.Select{
|
edPrompt := &survey.Select{
|
||||||
Message: "which version do you want to begin with?",
|
Message: "which version do you want to begin with?",
|
||||||
Options: []string{"0.1.0", "1.0.0"},
|
Options: []string{"0.1.0", "1.0.0"},
|
||||||
}
|
}
|
||||||
|
|
||||||
if err := survey.AskOne(edPrompt, &chosenVersion); err != nil {
|
if err := survey.AskOne(edPrompt, &chosenVersion); err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
nextTag = fmt.Sprintf("%s+%s", chosenVersion, mainAppVersion)
|
nextTag = fmt.Sprintf("%s+%s", chosenVersion, mainAppVersion)
|
||||||
}
|
}
|
||||||
|
|
||||||
if nextTag == "" && (!internal.Major && !internal.Minor && !internal.Patch) {
|
if nextTag == "" && (!internal.Major && !internal.Minor && !internal.Patch) {
|
||||||
if err := internal.PromptBumpType(""); err != nil {
|
latestRelease := tags[len(tags)-1]
|
||||||
|
if err := internal.PromptBumpType("", latestRelease); err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if nextTag == "" {
|
if nextTag == "" {
|
||||||
recipeDir := path.Join(config.APPS_DIR, recipe.Name)
|
recipeDir := path.Join(config.RECIPES_DIR, recipe.Name)
|
||||||
repo, err := git.PlainOpen(recipeDir)
|
repo, err := git.PlainOpen(recipeDir)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
var lastGitTag tagcmp.Tag
|
var lastGitTag tagcmp.Tag
|
||||||
iter, err := repo.Tags()
|
iter, err := repo.Tags()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
if err := iter.ForEach(func(ref *plumbing.Reference) error {
|
if err := iter.ForEach(func(ref *plumbing.Reference) error {
|
||||||
obj, err := repo.TagObject(ref.Hash())
|
obj, err := repo.TagObject(ref.Hash())
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
tagcmpTag, err := tagcmp.Parse(obj.Name)
|
tagcmpTag, err := tagcmp.Parse(obj.Name)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
if (lastGitTag == tagcmp.Tag{}) {
|
if (lastGitTag == tagcmp.Tag{}) {
|
||||||
lastGitTag = tagcmpTag
|
lastGitTag = tagcmpTag
|
||||||
} else if tagcmpTag.IsGreaterThan(lastGitTag) {
|
} else if tagcmpTag.IsGreaterThan(lastGitTag) {
|
||||||
lastGitTag = tagcmpTag
|
lastGitTag = tagcmpTag
|
||||||
}
|
}
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
}); err != nil {
|
}); err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
|
@ -113,7 +141,7 @@ You may invoke this command in "wizard" mode and be prompted for input:
|
||||||
if bumpType != 0 {
|
if bumpType != 0 {
|
||||||
// a bitwise check if the number is a power of 2
|
// a bitwise check if the number is a power of 2
|
||||||
if (bumpType & (bumpType - 1)) != 0 {
|
if (bumpType & (bumpType - 1)) != 0 {
|
||||||
logrus.Fatal("you can only use one of: --major, --minor, --patch.")
|
logrus.Fatal("you can only use one version flag: --major, --minor or --patch")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -124,12 +152,14 @@ You may invoke this command in "wizard" mode and be prompted for input:
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
newTag.Patch = strconv.Itoa(now + 1)
|
newTag.Patch = strconv.Itoa(now + 1)
|
||||||
} else if internal.Minor {
|
} else if internal.Minor {
|
||||||
now, err := strconv.Atoi(newTag.Minor)
|
now, err := strconv.Atoi(newTag.Minor)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
newTag.Patch = "0"
|
newTag.Patch = "0"
|
||||||
newTag.Minor = strconv.Itoa(now + 1)
|
newTag.Minor = strconv.Itoa(now + 1)
|
||||||
} else if internal.Major {
|
} else if internal.Major {
|
||||||
|
@ -137,6 +167,7 @@ You may invoke this command in "wizard" mode and be prompted for input:
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
newTag.Patch = "0"
|
newTag.Patch = "0"
|
||||||
newTag.Minor = "0"
|
newTag.Minor = "0"
|
||||||
newTag.Major = strconv.Itoa(now + 1)
|
newTag.Major = strconv.Itoa(now + 1)
|
||||||
|
@ -153,44 +184,16 @@ You may invoke this command in "wizard" mode and be prompted for input:
|
||||||
}
|
}
|
||||||
|
|
||||||
mainService := "app"
|
mainService := "app"
|
||||||
var services []string
|
|
||||||
hasAppService := false
|
|
||||||
for _, service := range recipe.Config.Services {
|
|
||||||
services = append(services, service.Name)
|
|
||||||
if service.Name == "app" {
|
|
||||||
hasAppService = true
|
|
||||||
logrus.Debugf("detected app service in %s", recipe.Name)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if !hasAppService {
|
|
||||||
logrus.Fatalf("%s has no main 'app' service?", recipe.Name)
|
|
||||||
}
|
|
||||||
|
|
||||||
logrus.Debugf("selecting %s as the service to sync version label", mainService)
|
|
||||||
|
|
||||||
label := fmt.Sprintf("coop-cloud.${STACK_NAME}.version=%s", nextTag)
|
label := fmt.Sprintf("coop-cloud.${STACK_NAME}.version=%s", nextTag)
|
||||||
if !internal.Dry {
|
if !internal.Dry {
|
||||||
if err := recipe.UpdateLabel(mainService, label); err != nil {
|
if err := recipe.UpdateLabel("compose.y*ml", mainService, label); err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
logrus.Infof("synced label '%s' to service '%s'", label, mainService)
|
|
||||||
} else {
|
} else {
|
||||||
logrus.Infof("dry run only: NOT syncing label %s for recipe %s", nextTag, recipe.Name)
|
logrus.Infof("dry run: not syncing label %s for recipe %s", nextTag, recipe.Name)
|
||||||
}
|
}
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
},
|
},
|
||||||
BashComplete: func(c *cli.Context) {
|
BashComplete: autocomplete.RecipeNameComplete,
|
||||||
catl, err := catalogue.ReadRecipeCatalogue()
|
|
||||||
if err != nil {
|
|
||||||
logrus.Warn(err)
|
|
||||||
}
|
|
||||||
if c.NArg() > 0 {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
for name := range catl {
|
|
||||||
fmt.Println(name)
|
|
||||||
}
|
|
||||||
},
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -9,14 +9,16 @@ import (
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
"coopcloud.tech/abra/cli/internal"
|
"coopcloud.tech/abra/cli/internal"
|
||||||
"coopcloud.tech/abra/pkg/catalogue"
|
"coopcloud.tech/abra/pkg/autocomplete"
|
||||||
"coopcloud.tech/abra/pkg/client"
|
"coopcloud.tech/abra/pkg/client"
|
||||||
"coopcloud.tech/abra/pkg/config"
|
"coopcloud.tech/abra/pkg/config"
|
||||||
|
"coopcloud.tech/abra/pkg/formatter"
|
||||||
|
recipePkg "coopcloud.tech/abra/pkg/recipe"
|
||||||
"coopcloud.tech/tagcmp"
|
"coopcloud.tech/tagcmp"
|
||||||
"github.com/AlecAivazis/survey/v2"
|
"github.com/AlecAivazis/survey/v2"
|
||||||
"github.com/docker/distribution/reference"
|
"github.com/docker/distribution/reference"
|
||||||
"github.com/sirupsen/logrus"
|
"github.com/sirupsen/logrus"
|
||||||
"github.com/urfave/cli/v2"
|
"github.com/urfave/cli"
|
||||||
)
|
)
|
||||||
|
|
||||||
type imgPin struct {
|
type imgPin struct {
|
||||||
|
@ -24,10 +26,10 @@ type imgPin struct {
|
||||||
version tagcmp.Tag
|
version tagcmp.Tag
|
||||||
}
|
}
|
||||||
|
|
||||||
var recipeUpgradeCommand = &cli.Command{
|
var recipeUpgradeCommand = cli.Command{
|
||||||
Name: "upgrade",
|
Name: "upgrade",
|
||||||
Usage: "Upgrade recipe image tags",
|
|
||||||
Aliases: []string{"u"},
|
Aliases: []string{"u"},
|
||||||
|
Usage: "Upgrade recipe image tags",
|
||||||
Description: `
|
Description: `
|
||||||
This command reads and attempts to parse all image tags within the given
|
This command reads and attempts to parse all image tags within the given
|
||||||
<recipe> configuration and prompt with more recent tags to upgrade to. It will
|
<recipe> configuration and prompt with more recent tags to upgrade to. It will
|
||||||
|
@ -36,15 +38,28 @@ update the relevant compose file tags on the local file system.
|
||||||
Some image tags cannot be parsed because they do not follow some sort of
|
Some image tags cannot be parsed because they do not follow some sort of
|
||||||
semver-like convention. In this case, all possible tags will be listed and it
|
semver-like convention. In this case, all possible tags will be listed and it
|
||||||
is up to the end-user to decide.
|
is up to the end-user to decide.
|
||||||
|
|
||||||
|
The command is interactive and will show a select input which allows you to
|
||||||
|
make a seclection. Use the "?" key to see more help on navigating this
|
||||||
|
interface.
|
||||||
|
|
||||||
|
You may invoke this command in "wizard" mode and be prompted for input:
|
||||||
|
|
||||||
|
abra recipe upgrade
|
||||||
`,
|
`,
|
||||||
ArgsUsage: "<recipe>",
|
BashComplete: autocomplete.RecipeNameComplete,
|
||||||
|
ArgsUsage: "<recipe>",
|
||||||
Flags: []cli.Flag{
|
Flags: []cli.Flag{
|
||||||
|
internal.DebugFlag,
|
||||||
|
internal.NoInputFlag,
|
||||||
internal.PatchFlag,
|
internal.PatchFlag,
|
||||||
internal.MinorFlag,
|
internal.MinorFlag,
|
||||||
internal.MajorFlag,
|
internal.MajorFlag,
|
||||||
|
internal.AllTagsFlag,
|
||||||
},
|
},
|
||||||
|
Before: internal.SubCommandBefore,
|
||||||
Action: func(c *cli.Context) error {
|
Action: func(c *cli.Context) error {
|
||||||
recipe := internal.ValidateRecipe(c)
|
recipe := internal.ValidateRecipeWithPrompt(c, true)
|
||||||
|
|
||||||
bumpType := btoi(internal.Major)*4 + btoi(internal.Minor)*2 + btoi(internal.Patch)
|
bumpType := btoi(internal.Major)*4 + btoi(internal.Minor)*2 + btoi(internal.Patch)
|
||||||
if bumpType != 0 {
|
if bumpType != 0 {
|
||||||
|
@ -56,7 +71,7 @@ is up to the end-user to decide.
|
||||||
|
|
||||||
// check for versions file and load pinned versions
|
// check for versions file and load pinned versions
|
||||||
versionsPresent := false
|
versionsPresent := false
|
||||||
recipeDir := path.Join(config.ABRA_DIR, "apps", recipe.Name)
|
recipeDir := path.Join(config.RECIPES_DIR, recipe.Name)
|
||||||
versionsPath := path.Join(recipeDir, "versions")
|
versionsPath := path.Join(recipeDir, "versions")
|
||||||
var servicePins = make(map[string]imgPin)
|
var servicePins = make(map[string]imgPin)
|
||||||
if _, err := os.Stat(versionsPath); err == nil {
|
if _, err := os.Stat(versionsPath); err == nil {
|
||||||
|
@ -92,43 +107,41 @@ is up to the end-user to decide.
|
||||||
}
|
}
|
||||||
|
|
||||||
for _, service := range recipe.Config.Services {
|
for _, service := range recipe.Config.Services {
|
||||||
catlVersions, err := catalogue.VersionsOfService(recipe.Name, service.Name)
|
|
||||||
if err != nil {
|
|
||||||
logrus.Fatal(err)
|
|
||||||
}
|
|
||||||
|
|
||||||
img, err := reference.ParseNormalizedNamed(service.Image)
|
img, err := reference.ParseNormalizedNamed(service.Image)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
image := reference.Path(img)
|
regVersions, err := client.GetRegistryTags(img)
|
||||||
regVersions, err := client.GetRegistryTags(image)
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
logrus.Debugf("retrieved '%s' from remote registry for '%s'", regVersions, image)
|
|
||||||
|
|
||||||
if strings.Contains(image, "library") {
|
image := reference.Path(img)
|
||||||
// ParseNormalizedNamed prepends 'library' to images like nginx:<tag>,
|
logrus.Debugf("retrieved %s from remote registry for %s", regVersions, image)
|
||||||
// postgres:<tag>, i.e. images which do not have a username in the
|
image = formatter.StripTagMeta(image)
|
||||||
// first position of the string
|
|
||||||
image = strings.Split(image, "/")[1]
|
switch img.(type) {
|
||||||
}
|
case reference.NamedTagged:
|
||||||
semverLikeTag := true
|
if !tagcmp.IsParsable(img.(reference.NamedTagged).Tag()) {
|
||||||
if !tagcmp.IsParsable(img.(reference.NamedTagged).Tag()) {
|
logrus.Debugf("%s not considered semver-like", img.(reference.NamedTagged).Tag())
|
||||||
logrus.Debugf("'%s' not considered semver-like", img.(reference.NamedTagged).Tag())
|
}
|
||||||
semverLikeTag = false
|
default:
|
||||||
|
logrus.Warnf("unable to read tag for image %s, is it missing? skipping upgrade for %s", image, service.Name)
|
||||||
|
continue
|
||||||
}
|
}
|
||||||
|
|
||||||
tag, err := tagcmp.Parse(img.(reference.NamedTagged).Tag())
|
tag, err := tagcmp.Parse(img.(reference.NamedTagged).Tag())
|
||||||
if err != nil && semverLikeTag {
|
if err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Warnf("unable to parse %s, error was: %s, skipping upgrade for %s", image, err.Error(), service.Name)
|
||||||
|
continue
|
||||||
}
|
}
|
||||||
logrus.Debugf("parsed '%s' for '%s'", tag, service.Name)
|
|
||||||
|
logrus.Debugf("parsed %s for %s", tag, service.Name)
|
||||||
|
|
||||||
var compatible []tagcmp.Tag
|
var compatible []tagcmp.Tag
|
||||||
for _, regVersion := range regVersions {
|
for _, regVersion := range regVersions {
|
||||||
other, err := tagcmp.Parse(regVersion.Name)
|
other, err := tagcmp.Parse(regVersion)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
continue // skip tags that cannot be parsed
|
continue // skip tags that cannot be parsed
|
||||||
}
|
}
|
||||||
|
@ -138,16 +151,21 @@ is up to the end-user to decide.
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
logrus.Debugf("detected potential upgradable tags '%s' for '%s'", compatible, service.Name)
|
logrus.Debugf("detected potential upgradable tags %s for %s", compatible, service.Name)
|
||||||
|
|
||||||
sort.Sort(tagcmp.ByTagDesc(compatible))
|
sort.Sort(tagcmp.ByTagDesc(compatible))
|
||||||
|
|
||||||
if len(compatible) == 0 && semverLikeTag {
|
if len(compatible) == 0 && !internal.AllTags {
|
||||||
logrus.Info(fmt.Sprintf("no new versions available for '%s', '%s' is the latest", image, tag))
|
logrus.Info(fmt.Sprintf("no new versions available for %s, assuming %s is the latest (use -a/--all-tags to see all anyway)", image, tag))
|
||||||
continue // skip on to the next tag and don't update any compose files
|
continue // skip on to the next tag and don't update any compose files
|
||||||
}
|
}
|
||||||
|
|
||||||
var compatibleStrings []string
|
catlVersions, err := recipePkg.VersionsOfService(recipe.Name, service.Name)
|
||||||
|
if err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
compatibleStrings := []string{"skip"}
|
||||||
for _, compat := range compatible {
|
for _, compat := range compatible {
|
||||||
skip := false
|
skip := false
|
||||||
for _, catlVersion := range catlVersions {
|
for _, catlVersion := range catlVersions {
|
||||||
|
@ -160,7 +178,7 @@ is up to the end-user to decide.
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
logrus.Debugf("detected compatible upgradable tags '%s' for '%s'", compatibleStrings, service.Name)
|
logrus.Debugf("detected compatible upgradable tags %s for %s", compatibleStrings, service.Name)
|
||||||
|
|
||||||
var upgradeTag string
|
var upgradeTag string
|
||||||
_, ok := servicePins[service.Name]
|
_, ok := servicePins[service.Name]
|
||||||
|
@ -177,13 +195,13 @@ is up to the end-user to decide.
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if contains {
|
if contains {
|
||||||
logrus.Infof("Upgrading service %s from %s to %s (pinned tag: %s)", service.Name, tag.String(), upgradeTag, pinnedTagString)
|
logrus.Infof("upgrading service %s from %s to %s (pinned tag: %s)", service.Name, tag.String(), upgradeTag, pinnedTagString)
|
||||||
} else {
|
} else {
|
||||||
logrus.Infof("service %s, image %s pinned to %s, no compatible upgrade found", service.Name, servicePins[service.Name].image, pinnedTagString)
|
logrus.Infof("service %s, image %s pinned to %s, no compatible upgrade found", service.Name, servicePins[service.Name].image, pinnedTagString)
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
logrus.Fatalf("Service %s is at version %s, but pinned to %s, please correct your compose.yml file manually!", service.Name, tag.String(), pinnedTag.String())
|
logrus.Fatalf("service %s is at version %s, but pinned to %s, please correct your compose.yml file manually!", service.Name, tag.String(), pinnedTag.String())
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
|
@ -200,23 +218,27 @@ is up to the end-user to decide.
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if upgradeTag == "" {
|
if upgradeTag == "" {
|
||||||
logrus.Warnf("not upgrading from '%s' to '%s' for '%s', because the upgrade type is more serious than what user wants.", tag.String(), compatible[0].String(), image)
|
logrus.Warnf("not upgrading from %s to %s for %s, because the upgrade type is more serious than what user wants", tag.String(), compatible[0].String(), image)
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
msg := fmt.Sprintf("upgrade to which tag? (service: %s, tag: %s)", service.Name, tag)
|
msg := fmt.Sprintf("upgrade to which tag? (service: %s, image: %s, tag: %s)", service.Name, image, tag)
|
||||||
if !tagcmp.IsParsable(img.(reference.NamedTagged).Tag()) {
|
if !tagcmp.IsParsable(img.(reference.NamedTagged).Tag()) || internal.AllTags {
|
||||||
tag := img.(reference.NamedTagged).Tag()
|
tag := img.(reference.NamedTagged).Tag()
|
||||||
logrus.Warning(fmt.Sprintf("unable to determine versioning semantics of '%s', listing all tags", tag))
|
if !internal.AllTags {
|
||||||
|
logrus.Warning(fmt.Sprintf("unable to determine versioning semantics of %s, listing all tags", tag))
|
||||||
|
}
|
||||||
msg = fmt.Sprintf("upgrade to which tag? (service: %s, tag: %s)", service.Name, tag)
|
msg = fmt.Sprintf("upgrade to which tag? (service: %s, tag: %s)", service.Name, tag)
|
||||||
compatibleStrings = []string{}
|
compatibleStrings = []string{"skip"}
|
||||||
for _, regVersion := range regVersions {
|
for _, regVersion := range regVersions {
|
||||||
compatibleStrings = append(compatibleStrings, regVersion.Name)
|
compatibleStrings = append(compatibleStrings, regVersion)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
prompt := &survey.Select{
|
prompt := &survey.Select{
|
||||||
Message: msg,
|
Message: msg,
|
||||||
|
Help: "enter / return to confirm, choose 'skip' to not upgrade this tag, vim mode is enabled",
|
||||||
|
VimMode: true,
|
||||||
Options: compatibleStrings,
|
Options: compatibleStrings,
|
||||||
}
|
}
|
||||||
if err := survey.AskOne(prompt, &upgradeTag); err != nil {
|
if err := survey.AskOne(prompt, &upgradeTag); err != nil {
|
||||||
|
@ -224,10 +246,17 @@ is up to the end-user to decide.
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if err := recipe.UpdateTag(image, upgradeTag); err != nil {
|
if upgradeTag != "skip" {
|
||||||
logrus.Fatal(err)
|
ok, err := recipe.UpdateTag(image, upgradeTag)
|
||||||
|
if err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
if ok {
|
||||||
|
logrus.Infof("tag upgraded from %s to %s for %s", tag.String(), upgradeTag, image)
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
logrus.Warnf("not upgrading %s, skipping as requested", image)
|
||||||
}
|
}
|
||||||
logrus.Infof("tag upgraded from '%s' to '%s' for '%s'", tag.String(), upgradeTag, image)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
|
|
|
@ -1,36 +1,42 @@
|
||||||
package recipe
|
package recipe
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"coopcloud.tech/abra/cli/formatter"
|
|
||||||
"coopcloud.tech/abra/cli/internal"
|
"coopcloud.tech/abra/cli/internal"
|
||||||
"coopcloud.tech/abra/pkg/catalogue"
|
"coopcloud.tech/abra/pkg/autocomplete"
|
||||||
|
"coopcloud.tech/abra/pkg/formatter"
|
||||||
|
recipePkg "coopcloud.tech/abra/pkg/recipe"
|
||||||
"github.com/sirupsen/logrus"
|
"github.com/sirupsen/logrus"
|
||||||
"github.com/urfave/cli/v2"
|
"github.com/urfave/cli"
|
||||||
)
|
)
|
||||||
|
|
||||||
var recipeVersionCommand = &cli.Command{
|
var recipeVersionCommand = cli.Command{
|
||||||
Name: "versions",
|
Name: "versions",
|
||||||
Usage: "List recipe versions",
|
|
||||||
Aliases: []string{"v"},
|
Aliases: []string{"v"},
|
||||||
|
Usage: "List recipe versions",
|
||||||
ArgsUsage: "<recipe>",
|
ArgsUsage: "<recipe>",
|
||||||
|
Flags: []cli.Flag{
|
||||||
|
internal.DebugFlag,
|
||||||
|
},
|
||||||
|
Before: internal.SubCommandBefore,
|
||||||
|
BashComplete: autocomplete.RecipeNameComplete,
|
||||||
Action: func(c *cli.Context) error {
|
Action: func(c *cli.Context) error {
|
||||||
recipe := internal.ValidateRecipe(c)
|
recipe := internal.ValidateRecipe(c, false)
|
||||||
|
|
||||||
catalogue, err := catalogue.ReadRecipeCatalogue()
|
catalogue, err := recipePkg.ReadRecipeCatalogue()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
recipeMeta, ok := catalogue[recipe.Name]
|
recipeMeta, ok := catalogue[recipe.Name]
|
||||||
if !ok {
|
if !ok {
|
||||||
logrus.Fatalf("'%s' recipe doesn't exist?", recipe.Name)
|
logrus.Fatalf("%s recipe doesn't exist?", recipe.Name)
|
||||||
}
|
}
|
||||||
|
|
||||||
tableCol := []string{"Version", "Service", "Image", "Tag", "Digest"}
|
tableCol := []string{"Version", "Service", "Image", "Tag", "Digest"}
|
||||||
table := formatter.CreateTable(tableCol)
|
table := formatter.CreateTable(tableCol)
|
||||||
|
|
||||||
for _, serviceVersion := range recipeMeta.Versions {
|
for i := len(recipeMeta.Versions) - 1; i >= 0; i-- {
|
||||||
for tag, meta := range serviceVersion {
|
for tag, meta := range recipeMeta.Versions[i] {
|
||||||
for service, serviceMeta := range meta {
|
for service, serviceMeta := range meta {
|
||||||
table.Append([]string{tag, service, serviceMeta.Image, serviceMeta.Tag, serviceMeta.Digest})
|
table.Append([]string{tag, service, serviceMeta.Image, serviceMeta.Tag, serviceMeta.Digest})
|
||||||
}
|
}
|
||||||
|
@ -38,7 +44,12 @@ var recipeVersionCommand = &cli.Command{
|
||||||
}
|
}
|
||||||
|
|
||||||
table.SetAutoMergeCells(true)
|
table.SetAutoMergeCells(true)
|
||||||
table.Render()
|
|
||||||
|
if table.NumLines() > 0 {
|
||||||
|
table.Render()
|
||||||
|
} else {
|
||||||
|
logrus.Fatalf("%s has no published versions?", recipe.Name)
|
||||||
|
}
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
},
|
},
|
||||||
|
|
|
@ -1,26 +1,29 @@
|
||||||
package record
|
package record
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"context"
|
||||||
"fmt"
|
"fmt"
|
||||||
"strconv"
|
"strconv"
|
||||||
|
|
||||||
abraFormatter "coopcloud.tech/abra/cli/formatter"
|
|
||||||
"coopcloud.tech/abra/cli/internal"
|
"coopcloud.tech/abra/cli/internal"
|
||||||
gandiPkg "coopcloud.tech/abra/pkg/dns/gandi"
|
gandiPkg "coopcloud.tech/abra/pkg/dns/gandi"
|
||||||
|
"coopcloud.tech/abra/pkg/formatter"
|
||||||
"github.com/libdns/gandi"
|
"github.com/libdns/gandi"
|
||||||
"github.com/sirupsen/logrus"
|
"github.com/sirupsen/logrus"
|
||||||
"github.com/urfave/cli/v2"
|
"github.com/urfave/cli"
|
||||||
)
|
)
|
||||||
|
|
||||||
// RecordListCommand lists domains.
|
// RecordListCommand lists domains.
|
||||||
var RecordListCommand = &cli.Command{
|
var RecordListCommand = cli.Command{
|
||||||
Name: "list",
|
Name: "list",
|
||||||
Usage: "List domain name records",
|
Usage: "List domain name records",
|
||||||
Aliases: []string{"ls"},
|
Aliases: []string{"ls"},
|
||||||
ArgsUsage: "<zone>",
|
ArgsUsage: "<zone>",
|
||||||
Flags: []cli.Flag{
|
Flags: []cli.Flag{
|
||||||
|
internal.DebugFlag,
|
||||||
internal.DNSProviderFlag,
|
internal.DNSProviderFlag,
|
||||||
},
|
},
|
||||||
|
Before: internal.SubCommandBefore,
|
||||||
Description: `
|
Description: `
|
||||||
This command lists all domain name records managed by a 3rd party provider for
|
This command lists all domain name records managed by a 3rd party provider for
|
||||||
a specific zone.
|
a specific zone.
|
||||||
|
@ -46,16 +49,16 @@ are listed. This zone must already be created on your provider account.
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
default:
|
default:
|
||||||
logrus.Fatalf("'%s' is not a supported DNS provider", internal.DNSProvider)
|
logrus.Fatalf("%s is not a supported DNS provider", internal.DNSProvider)
|
||||||
}
|
}
|
||||||
|
|
||||||
records, err := provider.GetRecords(c.Context, zone)
|
records, err := provider.GetRecords(context.Background(), zone)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
tableCol := []string{"type", "name", "value", "TTL", "priority"}
|
tableCol := []string{"type", "name", "value", "TTL", "priority"}
|
||||||
table := abraFormatter.CreateTable(tableCol)
|
table := formatter.CreateTable(tableCol)
|
||||||
|
|
||||||
for _, record := range records {
|
for _, record := range records {
|
||||||
value := record.Value
|
value := record.Value
|
||||||
|
|
|
@ -1,26 +1,29 @@
|
||||||
package record
|
package record
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"context"
|
||||||
"fmt"
|
"fmt"
|
||||||
"strconv"
|
"strconv"
|
||||||
"time"
|
|
||||||
|
|
||||||
abraFormatter "coopcloud.tech/abra/cli/formatter"
|
|
||||||
"coopcloud.tech/abra/cli/internal"
|
"coopcloud.tech/abra/cli/internal"
|
||||||
|
"coopcloud.tech/abra/pkg/dns"
|
||||||
gandiPkg "coopcloud.tech/abra/pkg/dns/gandi"
|
gandiPkg "coopcloud.tech/abra/pkg/dns/gandi"
|
||||||
|
"coopcloud.tech/abra/pkg/formatter"
|
||||||
"github.com/libdns/gandi"
|
"github.com/libdns/gandi"
|
||||||
"github.com/libdns/libdns"
|
"github.com/libdns/libdns"
|
||||||
"github.com/sirupsen/logrus"
|
"github.com/sirupsen/logrus"
|
||||||
"github.com/urfave/cli/v2"
|
"github.com/urfave/cli"
|
||||||
)
|
)
|
||||||
|
|
||||||
// RecordNewCommand creates a new domain name record.
|
// RecordNewCommand creates a new domain name record.
|
||||||
var RecordNewCommand = &cli.Command{
|
var RecordNewCommand = cli.Command{
|
||||||
Name: "new",
|
Name: "new",
|
||||||
Usage: "Create a new domain record",
|
Usage: "Create a new domain record",
|
||||||
Aliases: []string{"n"},
|
Aliases: []string{"n"},
|
||||||
ArgsUsage: "<zone>",
|
ArgsUsage: "<zone>",
|
||||||
Flags: []cli.Flag{
|
Flags: []cli.Flag{
|
||||||
|
internal.DebugFlag,
|
||||||
|
internal.NoInputFlag,
|
||||||
internal.DNSProviderFlag,
|
internal.DNSProviderFlag,
|
||||||
internal.DNSTypeFlag,
|
internal.DNSTypeFlag,
|
||||||
internal.DNSNameFlag,
|
internal.DNSNameFlag,
|
||||||
|
@ -28,6 +31,7 @@ var RecordNewCommand = &cli.Command{
|
||||||
internal.DNSTTLFlag,
|
internal.DNSTTLFlag,
|
||||||
internal.DNSPriorityFlag,
|
internal.DNSPriorityFlag,
|
||||||
},
|
},
|
||||||
|
Before: internal.SubCommandBefore,
|
||||||
Description: `
|
Description: `
|
||||||
This command creates a new domain name record for a specific zone.
|
This command creates a new domain name record for a specific zone.
|
||||||
|
|
||||||
|
@ -38,7 +42,7 @@ Example:
|
||||||
|
|
||||||
abra record new foo.com -p gandi -t A -n myapp -v 192.168.178.44
|
abra record new foo.com -p gandi -t A -n myapp -v 192.168.178.44
|
||||||
|
|
||||||
You may also invoke this command in "wizard" mode and be prompted for input
|
You may also invoke this command in "wizard" mode and be prompted for input:
|
||||||
|
|
||||||
abra record new
|
abra record new
|
||||||
`,
|
`,
|
||||||
|
@ -60,7 +64,7 @@ You may also invoke this command in "wizard" mode and be prompted for input
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
default:
|
default:
|
||||||
logrus.Fatalf("'%s' is not a supported DNS provider", internal.DNSProvider)
|
logrus.Fatalf("%s is not a supported DNS provider", internal.DNSProvider)
|
||||||
}
|
}
|
||||||
|
|
||||||
if err := internal.EnsureDNSTypeFlag(c); err != nil {
|
if err := internal.EnsureDNSTypeFlag(c); err != nil {
|
||||||
|
@ -75,18 +79,23 @@ You may also invoke this command in "wizard" mode and be prompted for input
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
ttl, err := dns.GetTTL(internal.DNSTTL)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
record := libdns.Record{
|
record := libdns.Record{
|
||||||
Type: internal.DNSType,
|
Type: internal.DNSType,
|
||||||
Name: internal.DNSName,
|
Name: internal.DNSName,
|
||||||
Value: internal.DNSValue,
|
Value: internal.DNSValue,
|
||||||
TTL: time.Duration(internal.DNSTTL),
|
TTL: ttl,
|
||||||
}
|
}
|
||||||
|
|
||||||
if internal.DNSType == "MX" || internal.DNSType == "SRV" || internal.DNSType == "URI" {
|
if internal.DNSType == "MX" || internal.DNSType == "SRV" || internal.DNSType == "URI" {
|
||||||
record.Priority = internal.DNSPriority
|
record.Priority = internal.DNSPriority
|
||||||
}
|
}
|
||||||
|
|
||||||
records, err := provider.GetRecords(c.Context, zone)
|
records, err := provider.GetRecords(context.Background(), zone)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
|
@ -95,15 +104,18 @@ You may also invoke this command in "wizard" mode and be prompted for input
|
||||||
if existingRecord.Type == record.Type &&
|
if existingRecord.Type == record.Type &&
|
||||||
existingRecord.Name == record.Name &&
|
existingRecord.Name == record.Name &&
|
||||||
existingRecord.Value == record.Value {
|
existingRecord.Value == record.Value {
|
||||||
logrus.Fatal("provider library reports that this record already exists?")
|
logrus.Fatalf("%s record for %s already exists?", record.Type, zone)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
createdRecords, err := provider.SetRecords(
|
createdRecords, err := provider.SetRecords(
|
||||||
c.Context,
|
context.Background(),
|
||||||
zone,
|
zone,
|
||||||
[]libdns.Record{record},
|
[]libdns.Record{record},
|
||||||
)
|
)
|
||||||
|
if err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
if len(createdRecords) == 0 {
|
if len(createdRecords) == 0 {
|
||||||
logrus.Fatal("provider library reports that no record was created?")
|
logrus.Fatal("provider library reports that no record was created?")
|
||||||
|
@ -112,7 +124,7 @@ You may also invoke this command in "wizard" mode and be prompted for input
|
||||||
createdRecord := createdRecords[0]
|
createdRecord := createdRecords[0]
|
||||||
|
|
||||||
tableCol := []string{"type", "name", "value", "TTL", "priority"}
|
tableCol := []string{"type", "name", "value", "TTL", "priority"}
|
||||||
table := abraFormatter.CreateTable(tableCol)
|
table := formatter.CreateTable(tableCol)
|
||||||
|
|
||||||
value := createdRecord.Value
|
value := createdRecord.Value
|
||||||
if len(createdRecord.Value) > 30 {
|
if len(createdRecord.Value) > 30 {
|
||||||
|
|
|
@ -1,13 +1,13 @@
|
||||||
package record
|
package record
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"github.com/urfave/cli/v2"
|
"github.com/urfave/cli"
|
||||||
)
|
)
|
||||||
|
|
||||||
// RecordCommand supports managing DNS entries.
|
// RecordCommand supports managing DNS entries.
|
||||||
var RecordCommand = &cli.Command{
|
var RecordCommand = cli.Command{
|
||||||
Name: "record",
|
Name: "record",
|
||||||
Usage: "Manage domain name records via 3rd party providers",
|
Usage: "Manage domain name records",
|
||||||
Aliases: []string{"rc"},
|
Aliases: []string{"rc"},
|
||||||
ArgsUsage: "<record>",
|
ArgsUsage: "<record>",
|
||||||
Description: `
|
Description: `
|
||||||
|
@ -28,9 +28,8 @@ library documentation for more. It supports many existing providers and allows
|
||||||
to implement new provider support easily.
|
to implement new provider support easily.
|
||||||
|
|
||||||
https://pkg.go.dev/github.com/libdns/libdns
|
https://pkg.go.dev/github.com/libdns/libdns
|
||||||
|
|
||||||
`,
|
`,
|
||||||
Subcommands: []*cli.Command{
|
Subcommands: []cli.Command{
|
||||||
RecordListCommand,
|
RecordListCommand,
|
||||||
RecordNewCommand,
|
RecordNewCommand,
|
||||||
RecordRemoveCommand,
|
RecordRemoveCommand,
|
||||||
|
|
|
@ -1,30 +1,34 @@
|
||||||
package record
|
package record
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"context"
|
||||||
"fmt"
|
"fmt"
|
||||||
"strconv"
|
"strconv"
|
||||||
|
|
||||||
abraFormatter "coopcloud.tech/abra/cli/formatter"
|
|
||||||
"coopcloud.tech/abra/cli/internal"
|
"coopcloud.tech/abra/cli/internal"
|
||||||
gandiPkg "coopcloud.tech/abra/pkg/dns/gandi"
|
gandiPkg "coopcloud.tech/abra/pkg/dns/gandi"
|
||||||
|
"coopcloud.tech/abra/pkg/formatter"
|
||||||
"github.com/AlecAivazis/survey/v2"
|
"github.com/AlecAivazis/survey/v2"
|
||||||
"github.com/libdns/gandi"
|
"github.com/libdns/gandi"
|
||||||
"github.com/libdns/libdns"
|
"github.com/libdns/libdns"
|
||||||
"github.com/sirupsen/logrus"
|
"github.com/sirupsen/logrus"
|
||||||
"github.com/urfave/cli/v2"
|
"github.com/urfave/cli"
|
||||||
)
|
)
|
||||||
|
|
||||||
// RecordRemoveCommand lists domains.
|
// RecordRemoveCommand lists domains.
|
||||||
var RecordRemoveCommand = &cli.Command{
|
var RecordRemoveCommand = cli.Command{
|
||||||
Name: "remove",
|
Name: "remove",
|
||||||
Usage: "Remove a domain name record",
|
Usage: "Remove a domain name record",
|
||||||
Aliases: []string{"rm"},
|
Aliases: []string{"rm"},
|
||||||
ArgsUsage: "<zone>",
|
ArgsUsage: "<zone>",
|
||||||
Flags: []cli.Flag{
|
Flags: []cli.Flag{
|
||||||
|
internal.DebugFlag,
|
||||||
|
internal.NoInputFlag,
|
||||||
internal.DNSProviderFlag,
|
internal.DNSProviderFlag,
|
||||||
internal.DNSTypeFlag,
|
internal.DNSTypeFlag,
|
||||||
internal.DNSNameFlag,
|
internal.DNSNameFlag,
|
||||||
},
|
},
|
||||||
|
Before: internal.SubCommandBefore,
|
||||||
Description: `
|
Description: `
|
||||||
This command removes a domain name record for a specific zone.
|
This command removes a domain name record for a specific zone.
|
||||||
|
|
||||||
|
@ -37,7 +41,7 @@ Example:
|
||||||
|
|
||||||
abra record remove foo.com -p gandi -t A -n myapp
|
abra record remove foo.com -p gandi -t A -n myapp
|
||||||
|
|
||||||
You may also invoke this command in "wizard" mode and be prompted for input
|
You may also invoke this command in "wizard" mode and be prompted for input:
|
||||||
|
|
||||||
abra record rm
|
abra record rm
|
||||||
`,
|
`,
|
||||||
|
@ -59,7 +63,7 @@ You may also invoke this command in "wizard" mode and be prompted for input
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
default:
|
default:
|
||||||
logrus.Fatalf("'%s' is not a supported DNS provider", internal.DNSProvider)
|
logrus.Fatalf("%s is not a supported DNS provider", internal.DNSProvider)
|
||||||
}
|
}
|
||||||
|
|
||||||
if err := internal.EnsureDNSTypeFlag(c); err != nil {
|
if err := internal.EnsureDNSTypeFlag(c); err != nil {
|
||||||
|
@ -70,7 +74,7 @@ You may also invoke this command in "wizard" mode and be prompted for input
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
records, err := provider.GetRecords(c.Context, zone)
|
records, err := provider.GetRecords(context.Background(), zone)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
|
@ -88,7 +92,7 @@ You may also invoke this command in "wizard" mode and be prompted for input
|
||||||
}
|
}
|
||||||
|
|
||||||
tableCol := []string{"type", "name", "value", "TTL", "priority"}
|
tableCol := []string{"type", "name", "value", "TTL", "priority"}
|
||||||
table := abraFormatter.CreateTable(tableCol)
|
table := formatter.CreateTable(tableCol)
|
||||||
|
|
||||||
value := toDelete.Value
|
value := toDelete.Value
|
||||||
if len(toDelete.Value) > 30 {
|
if len(toDelete.Value) > 30 {
|
||||||
|
@ -105,20 +109,22 @@ You may also invoke this command in "wizard" mode and be prompted for input
|
||||||
|
|
||||||
table.Render()
|
table.Render()
|
||||||
|
|
||||||
response := false
|
if !internal.NoInput {
|
||||||
prompt := &survey.Confirm{
|
response := false
|
||||||
Message: "continue with record deletion?",
|
prompt := &survey.Confirm{
|
||||||
|
Message: "continue with record deletion?",
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := survey.AskOne(prompt, &response); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
if !response {
|
||||||
|
logrus.Fatal("exiting as requested")
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if err := survey.AskOne(prompt, &response); err != nil {
|
_, err = provider.DeleteRecords(context.Background(), zone, []libdns.Record{toDelete})
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
if !response {
|
|
||||||
logrus.Fatal("exiting as requested")
|
|
||||||
}
|
|
||||||
|
|
||||||
_, err = provider.DeleteRecords(c.Context, zone, []libdns.Record{toDelete})
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
|
|
|
@ -4,20 +4,17 @@ import (
|
||||||
"context"
|
"context"
|
||||||
"errors"
|
"errors"
|
||||||
"fmt"
|
"fmt"
|
||||||
"net"
|
|
||||||
"os"
|
"os"
|
||||||
"os/exec"
|
"os/exec"
|
||||||
"os/user"
|
"os/user"
|
||||||
"path"
|
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
"strings"
|
"strings"
|
||||||
"time"
|
|
||||||
|
|
||||||
abraFormatter "coopcloud.tech/abra/cli/formatter"
|
|
||||||
"coopcloud.tech/abra/cli/internal"
|
"coopcloud.tech/abra/cli/internal"
|
||||||
"coopcloud.tech/abra/pkg/client"
|
"coopcloud.tech/abra/pkg/client"
|
||||||
"coopcloud.tech/abra/pkg/config"
|
"coopcloud.tech/abra/pkg/config"
|
||||||
contextPkg "coopcloud.tech/abra/pkg/context"
|
contextPkg "coopcloud.tech/abra/pkg/context"
|
||||||
|
"coopcloud.tech/abra/pkg/dns"
|
||||||
"coopcloud.tech/abra/pkg/server"
|
"coopcloud.tech/abra/pkg/server"
|
||||||
"coopcloud.tech/abra/pkg/ssh"
|
"coopcloud.tech/abra/pkg/ssh"
|
||||||
"github.com/AlecAivazis/survey/v2"
|
"github.com/AlecAivazis/survey/v2"
|
||||||
|
@ -25,7 +22,7 @@ import (
|
||||||
"github.com/docker/docker/api/types/swarm"
|
"github.com/docker/docker/api/types/swarm"
|
||||||
dockerClient "github.com/docker/docker/client"
|
dockerClient "github.com/docker/docker/client"
|
||||||
"github.com/sirupsen/logrus"
|
"github.com/sirupsen/logrus"
|
||||||
"github.com/urfave/cli/v2"
|
"github.com/urfave/cli"
|
||||||
)
|
)
|
||||||
|
|
||||||
var (
|
var (
|
||||||
|
@ -44,32 +41,26 @@ such purposes. Docker stable is now installed by default by this script. The
|
||||||
source for this script can be seen here:
|
source for this script can be seen here:
|
||||||
|
|
||||||
https://github.com/docker/docker-install
|
https://github.com/docker/docker-install
|
||||||
|
|
||||||
`
|
`
|
||||||
)
|
)
|
||||||
|
|
||||||
var local bool
|
var local bool
|
||||||
var localFlag = &cli.BoolFlag{
|
var localFlag = &cli.BoolFlag{
|
||||||
Name: "local",
|
Name: "local, l",
|
||||||
Aliases: []string{"l"},
|
|
||||||
Value: false,
|
|
||||||
Usage: "Use local server",
|
Usage: "Use local server",
|
||||||
Destination: &local,
|
Destination: &local,
|
||||||
}
|
}
|
||||||
|
|
||||||
var provision bool
|
var provision bool
|
||||||
var provisionFlag = &cli.BoolFlag{
|
var provisionFlag = &cli.BoolFlag{
|
||||||
Name: "provision",
|
Name: "provision, p",
|
||||||
Aliases: []string{"p"},
|
|
||||||
Value: false,
|
|
||||||
Usage: "Provision server so it can deploy apps",
|
Usage: "Provision server so it can deploy apps",
|
||||||
Destination: &provision,
|
Destination: &provision,
|
||||||
}
|
}
|
||||||
|
|
||||||
var sshAuth string
|
var sshAuth string
|
||||||
var sshAuthFlag = &cli.StringFlag{
|
var sshAuthFlag = &cli.StringFlag{
|
||||||
Name: "ssh-auth",
|
Name: "ssh-auth, s",
|
||||||
Aliases: []string{"sh"},
|
|
||||||
Value: "identity-file",
|
Value: "identity-file",
|
||||||
Usage: "Select SSH authentication method (identity-file, password)",
|
Usage: "Select SSH authentication method (identity-file, password)",
|
||||||
Destination: &sshAuth,
|
Destination: &sshAuth,
|
||||||
|
@ -77,22 +68,11 @@ var sshAuthFlag = &cli.StringFlag{
|
||||||
|
|
||||||
var askSudoPass bool
|
var askSudoPass bool
|
||||||
var askSudoPassFlag = &cli.BoolFlag{
|
var askSudoPassFlag = &cli.BoolFlag{
|
||||||
Name: "ask-sudo-pass",
|
Name: "ask-sudo-pass, a",
|
||||||
Aliases: []string{"as"},
|
|
||||||
Value: false,
|
|
||||||
Usage: "Ask for sudo password",
|
Usage: "Ask for sudo password",
|
||||||
Destination: &askSudoPass,
|
Destination: &askSudoPass,
|
||||||
}
|
}
|
||||||
|
|
||||||
var traefik bool
|
|
||||||
var traefikFlag = &cli.BoolFlag{
|
|
||||||
Name: "traefik",
|
|
||||||
Aliases: []string{"t"},
|
|
||||||
Value: false,
|
|
||||||
Usage: "Deploy traefik",
|
|
||||||
Destination: &traefik,
|
|
||||||
}
|
|
||||||
|
|
||||||
func cleanUp(domainName string) {
|
func cleanUp(domainName string) {
|
||||||
logrus.Warnf("cleaning up context for %s", domainName)
|
logrus.Warnf("cleaning up context for %s", domainName)
|
||||||
if err := client.DeleteContext(domainName); err != nil {
|
if err := client.DeleteContext(domainName); err != nil {
|
||||||
|
@ -100,7 +80,7 @@ func cleanUp(domainName string) {
|
||||||
}
|
}
|
||||||
|
|
||||||
logrus.Warnf("cleaning up server directory for %s", domainName)
|
logrus.Warnf("cleaning up server directory for %s", domainName)
|
||||||
if err := os.RemoveAll(filepath.Join(config.ABRA_SERVER_FOLDER, domainName)); err != nil {
|
if err := os.RemoveAll(filepath.Join(config.SERVERS_DIR, domainName)); err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -119,7 +99,17 @@ func installDockerLocal(c *cli.Context) error {
|
||||||
logrus.Fatal("exiting as requested")
|
logrus.Fatal("exiting as requested")
|
||||||
}
|
}
|
||||||
|
|
||||||
cmd := exec.Command("bash", "-c", "curl -s https://get.docker.com | bash")
|
for _, exe := range []string{"wget", "bash"} {
|
||||||
|
exists, err := ensureLocalExecutable(exe)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if !exists {
|
||||||
|
return fmt.Errorf("%s missing, please install it", exe)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
cmd := exec.Command("bash", "-c", "wget -O- https://get.docker.com | bash")
|
||||||
if err := internal.RunCmd(cmd); err != nil {
|
if err := internal.RunCmd(cmd); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
@ -138,15 +128,17 @@ func newLocalServer(c *cli.Context, domainName string) error {
|
||||||
}
|
}
|
||||||
|
|
||||||
if provision {
|
if provision {
|
||||||
out, err := exec.Command("which", "docker").Output()
|
exists, err := ensureLocalExecutable("docker")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
if string(out) == "" {
|
|
||||||
|
if !exists {
|
||||||
if err := installDockerLocal(c); err != nil {
|
if err := installDockerLocal(c); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if err := initSwarmLocal(c, cl, domainName); err != nil {
|
if err := initSwarmLocal(c, cl, domainName); err != nil {
|
||||||
if !strings.Contains(err.Error(), "proxy already exists") {
|
if !strings.Contains(err.Error(), "proxy already exists") {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
|
@ -154,12 +146,6 @@ func newLocalServer(c *cli.Context, domainName string) error {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if traefik {
|
|
||||||
if err := deployTraefik(c, cl, domainName); err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
logrus.Info("local server has been added")
|
logrus.Info("local server has been added")
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
|
@ -197,65 +183,133 @@ func newClient(c *cli.Context, domainName string) (*dockerClient.Client, error)
|
||||||
}
|
}
|
||||||
|
|
||||||
func installDocker(c *cli.Context, cl *dockerClient.Client, sshCl *ssh.Client, domainName string) error {
|
func installDocker(c *cli.Context, cl *dockerClient.Client, sshCl *ssh.Client, domainName string) error {
|
||||||
result, err := sshCl.Exec("which docker")
|
exists, err := ensureRemoteExecutable("docker", sshCl)
|
||||||
if err != nil && string(result) != "" {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
if string(result) == "" {
|
if !exists {
|
||||||
fmt.Println(fmt.Sprintf(dockerInstallMsg, domainName))
|
fmt.Println(fmt.Sprintf(dockerInstallMsg, domainName))
|
||||||
|
|
||||||
response := false
|
response := false
|
||||||
prompt := &survey.Confirm{
|
prompt := &survey.Confirm{
|
||||||
Message: fmt.Sprintf("attempt install docker on %s?", domainName),
|
Message: fmt.Sprintf("attempt install docker on %s?", domainName),
|
||||||
}
|
}
|
||||||
|
|
||||||
if err := survey.AskOne(prompt, &response); err != nil {
|
if err := survey.AskOne(prompt, &response); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
if !response {
|
if !response {
|
||||||
logrus.Fatal("exiting as requested")
|
logrus.Fatal("exiting as requested")
|
||||||
}
|
}
|
||||||
|
|
||||||
cmd := "curl -s https://get.docker.com | bash"
|
exes := []string{"wget", "bash"}
|
||||||
|
if askSudoPass {
|
||||||
|
exes = append(exes, "ssh-askpass")
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, exe := range exes {
|
||||||
|
exists, err := ensureRemoteExecutable(exe, sshCl)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if !exists {
|
||||||
|
return fmt.Errorf("%s missing on remote, please install it", exe)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
var sudoPass string
|
var sudoPass string
|
||||||
if askSudoPass {
|
if askSudoPass {
|
||||||
|
cmd := "wget -O- https://get.docker.com | bash"
|
||||||
|
|
||||||
prompt := &survey.Password{
|
prompt := &survey.Password{
|
||||||
Message: "sudo password?",
|
Message: "sudo password?",
|
||||||
}
|
}
|
||||||
|
|
||||||
if err := survey.AskOne(prompt, &sudoPass); err != nil {
|
if err := survey.AskOne(prompt, &sudoPass); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
logrus.Debugf("running '%s' on %s now with sudo password", cmd, domainName)
|
|
||||||
|
logrus.Debugf("running %s on %s now with sudo password", cmd, domainName)
|
||||||
|
|
||||||
|
if sudoPass == "" {
|
||||||
|
return fmt.Errorf("missing sudo password but requested --ask-sudo-pass?")
|
||||||
|
}
|
||||||
|
|
||||||
|
logrus.Warn("installing docker, this could take some time...")
|
||||||
|
|
||||||
if err := ssh.RunSudoCmd(cmd, sudoPass, sshCl); err != nil {
|
if err := ssh.RunSudoCmd(cmd, sudoPass, sshCl); err != nil {
|
||||||
|
fmt.Print(fmt.Sprintf(`
|
||||||
|
Abra was unable to bootstrap Docker, see below for logs:
|
||||||
|
|
||||||
|
|
||||||
|
%s
|
||||||
|
|
||||||
|
If nothing works, you try running the Docker install script manually on your server:
|
||||||
|
|
||||||
|
wget -O- https://get.docker.com | bash
|
||||||
|
|
||||||
|
`, string(err.Error())))
|
||||||
|
logrus.Fatal("Process exited with status 1")
|
||||||
|
}
|
||||||
|
|
||||||
|
logrus.Infof("docker is installed on %s", domainName)
|
||||||
|
|
||||||
|
remoteUser := sshCl.SSHClient.Conn.User()
|
||||||
|
logrus.Infof("adding %s to docker group", remoteUser)
|
||||||
|
permsCmd := fmt.Sprintf("sudo usermod -aG docker %s", remoteUser)
|
||||||
|
if err := ssh.RunSudoCmd(permsCmd, sudoPass, sshCl); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
logrus.Debugf("running '%s' on %s now without sudo password", cmd, domainName)
|
cmd := "wget -O- https://get.docker.com | bash"
|
||||||
if err := ssh.Exec(cmd, sshCl); err != nil {
|
|
||||||
return err
|
logrus.Debugf("running %s on %s now without sudo password", cmd, domainName)
|
||||||
|
|
||||||
|
logrus.Warn("installing docker, this could take some time...")
|
||||||
|
|
||||||
|
if out, err := sshCl.Exec(cmd); err != nil {
|
||||||
|
fmt.Print(fmt.Sprintf(`
|
||||||
|
Abra was unable to bootstrap Docker, see below for logs:
|
||||||
|
|
||||||
|
|
||||||
|
%s
|
||||||
|
|
||||||
|
This could be due to a number of things but one of the most common is that your
|
||||||
|
server user account does not have sudo access, and if it does, you need to pass
|
||||||
|
"--ask-sudo-pass" in order to supply Abra with your password.
|
||||||
|
|
||||||
|
If nothing works, you try running the Docker install script manually on your server:
|
||||||
|
|
||||||
|
wget -O- https://get.docker.com | bash
|
||||||
|
|
||||||
|
`, string(out)))
|
||||||
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
logrus.Infof("docker is installed on %s", domainName)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
logrus.Infof("docker is installed on %s", domainName)
|
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func initSwarmLocal(c *cli.Context, cl *dockerClient.Client, domainName string) error {
|
func initSwarmLocal(c *cli.Context, cl *dockerClient.Client, domainName string) error {
|
||||||
initReq := swarm.InitRequest{ListenAddr: "0.0.0.0:2377"}
|
initReq := swarm.InitRequest{ListenAddr: "0.0.0.0:2377"}
|
||||||
if _, err := cl.SwarmInit(c.Context, initReq); err != nil {
|
if _, err := cl.SwarmInit(context.Background(), initReq); err != nil {
|
||||||
if !strings.Contains(err.Error(), "is already part of a swarm") {
|
if strings.Contains(err.Error(), "is already part of a swarm") ||
|
||||||
|
strings.Contains(err.Error(), "must specify a listening address") {
|
||||||
|
logrus.Infof("swarm mode already initialised on %s", domainName)
|
||||||
|
} else {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
logrus.Info("swarm mode already initialised on local server")
|
|
||||||
} else {
|
} else {
|
||||||
logrus.Infof("initialised swarm mode on local server")
|
logrus.Infof("initialised swarm mode on local server")
|
||||||
}
|
}
|
||||||
|
|
||||||
netOpts := types.NetworkCreate{Driver: "overlay", Scope: "swarm"}
|
netOpts := types.NetworkCreate{Driver: "overlay", Scope: "swarm"}
|
||||||
if _, err := cl.NetworkCreate(c.Context, "proxy", netOpts); err != nil {
|
if _, err := cl.NetworkCreate(context.Background(), "proxy", netOpts); err != nil {
|
||||||
if !strings.Contains(err.Error(), "proxy already exists") {
|
if !strings.Contains(err.Error(), "proxy already exists") {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
@ -268,48 +322,28 @@ func initSwarmLocal(c *cli.Context, cl *dockerClient.Client, domainName string)
|
||||||
}
|
}
|
||||||
|
|
||||||
func initSwarm(c *cli.Context, cl *dockerClient.Client, domainName string) error {
|
func initSwarm(c *cli.Context, cl *dockerClient.Client, domainName string) error {
|
||||||
// comrade librehosters DNS resolver -> https://www.privacy-handbuch.de/handbuch_93d.htm
|
ipv4, err := dns.EnsureIPv4(domainName)
|
||||||
freifunkDNS := "5.1.66.255:53"
|
|
||||||
|
|
||||||
resolver := &net.Resolver{
|
|
||||||
PreferGo: false,
|
|
||||||
Dial: func(ctx context.Context, network, address string) (net.Conn, error) {
|
|
||||||
d := net.Dialer{
|
|
||||||
Timeout: time.Millisecond * time.Duration(10000),
|
|
||||||
}
|
|
||||||
return d.DialContext(ctx, "udp", freifunkDNS)
|
|
||||||
},
|
|
||||||
}
|
|
||||||
|
|
||||||
logrus.Debugf("created DNS resolver via '%s'", freifunkDNS)
|
|
||||||
|
|
||||||
ips, err := resolver.LookupIPAddr(c.Context, domainName)
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
if len(ips) == 0 {
|
|
||||||
return fmt.Errorf("unable to retrieve ipv4 address for %s", domainName)
|
|
||||||
}
|
|
||||||
|
|
||||||
ipv4 := ips[0].IP.To4().String()
|
|
||||||
logrus.Debugf("discovered the following ipv4 addr: %s", ipv4)
|
|
||||||
|
|
||||||
initReq := swarm.InitRequest{
|
initReq := swarm.InitRequest{
|
||||||
ListenAddr: "0.0.0.0:2377",
|
ListenAddr: "0.0.0.0:2377",
|
||||||
AdvertiseAddr: ipv4,
|
AdvertiseAddr: ipv4,
|
||||||
}
|
}
|
||||||
if _, err := cl.SwarmInit(c.Context, initReq); err != nil {
|
if _, err := cl.SwarmInit(context.Background(), initReq); err != nil {
|
||||||
if !strings.Contains(err.Error(), "is already part of a swarm") {
|
if strings.Contains(err.Error(), "is already part of a swarm") ||
|
||||||
|
strings.Contains(err.Error(), "must specify a listening address") {
|
||||||
|
logrus.Infof("swarm mode already initialised on %s", domainName)
|
||||||
|
} else {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
logrus.Infof("swarm mode already initialised on %s", domainName)
|
|
||||||
} else {
|
} else {
|
||||||
logrus.Infof("initialised swarm mode on %s", domainName)
|
logrus.Infof("initialised swarm mode on %s", domainName)
|
||||||
}
|
}
|
||||||
|
|
||||||
netOpts := types.NetworkCreate{Driver: "overlay", Scope: "swarm"}
|
netOpts := types.NetworkCreate{Driver: "overlay", Scope: "swarm"}
|
||||||
if _, err := cl.NetworkCreate(c.Context, "proxy", netOpts); err != nil {
|
if _, err := cl.NetworkCreate(context.Background(), "proxy", netOpts); err != nil {
|
||||||
if !strings.Contains(err.Error(), "proxy already exists") {
|
if !strings.Contains(err.Error(), "proxy already exists") {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
@ -331,78 +365,33 @@ func createServerDir(domainName string) error {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func deployTraefik(c *cli.Context, cl *dockerClient.Client, domainName string) error {
|
var serverAddCommand = cli.Command{
|
||||||
internal.NoInput = true
|
Name: "add",
|
||||||
|
Aliases: []string{"a"},
|
||||||
internal.RecipeName = "traefik"
|
Usage: "Add a server to your configuration",
|
||||||
internal.NewAppServer = domainName
|
|
||||||
internal.Domain = fmt.Sprintf("%s.%s", "traefik", domainName)
|
|
||||||
internal.NewAppName = fmt.Sprintf("%s_%s", "traefik", config.SanitiseAppName(domainName))
|
|
||||||
|
|
||||||
appEnvPath := path.Join(config.ABRA_DIR, "servers", internal.Domain, fmt.Sprintf("%s.env", internal.NewAppName))
|
|
||||||
if _, err := os.Stat(appEnvPath); !os.IsNotExist(err) {
|
|
||||||
fmt.Println(fmt.Sprintf(`
|
|
||||||
You specified "--traefik/-t" and that means that Abra will now try to
|
|
||||||
automatically create a new Traefik app on %s.
|
|
||||||
`, internal.NewAppServer))
|
|
||||||
|
|
||||||
tableCol := []string{"recipe", "domain", "server", "name"}
|
|
||||||
table := abraFormatter.CreateTable(tableCol)
|
|
||||||
table.Append([]string{internal.RecipeName, internal.Domain, internal.NewAppServer, internal.NewAppName})
|
|
||||||
|
|
||||||
if err := internal.NewAction(c); err != nil {
|
|
||||||
logrus.Fatal(err)
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
logrus.Infof("%s already exists, not creating again", appEnvPath)
|
|
||||||
}
|
|
||||||
|
|
||||||
internal.AppName = internal.NewAppName
|
|
||||||
if err := internal.DeployAction(c); err != nil {
|
|
||||||
logrus.Fatal(err)
|
|
||||||
}
|
|
||||||
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
var serverAddCommand = &cli.Command{
|
|
||||||
Name: "add",
|
|
||||||
Usage: "Add a server to your configuration",
|
|
||||||
Description: `
|
Description: `
|
||||||
This command adds a new server to your configuration so that it can be managed
|
This command adds a new server to your configuration so that it can be managed
|
||||||
by Abra. This can be useful when you already have a server provisioned and want
|
by Abra. This command can also provision your server ("--provision/-p") with a
|
||||||
to start running Abra commands against it.
|
Docker installation so that it is capable of hosting Co-op Cloud apps.
|
||||||
|
|
||||||
This command can also provision your server ("--provision/-p") so that it is
|
Abra will default to expecting that you have a running ssh-agent and are using
|
||||||
capable of hosting Co-op Cloud apps. Abra will default to expecting that you
|
SSH keys to connect to your new server. Abra will also read your SSH config
|
||||||
have a running ssh-agent and are using SSH keys to connect to your new server.
|
(matching "Host" as <domain>). SSH connection details precedence follows as
|
||||||
Abra will also read your SSH config (matching "Host" as <domain>). SSH
|
such: command-line > SSH config > guessed defaults.
|
||||||
connection details precedence follows as such: command-line > SSH config >
|
|
||||||
guessed defaults.
|
|
||||||
|
|
||||||
If you have no SSH key configured for this host and are instead using password
|
If you have no SSH key configured for this host and are instead using password
|
||||||
authentication, you may pass "--ssh-auth password" to have Abra ask you for the
|
authentication, you may pass "--ssh-auth password" to have Abra ask you for the
|
||||||
password. "--ask-sudo-pass" may be passed if you run your provisioning commands
|
password. "--ask-sudo-pass" may be passed if you run your provisioning commands
|
||||||
via sudo privilege escalation.
|
via sudo privilege escalation.
|
||||||
|
|
||||||
If "--local" is passed, then Abra assumes that the current local server is
|
The <domain> argument must be a publicy accessible domain name which points to
|
||||||
intended as the target server. This is useful when you want to have your entire
|
your server. You should working SSH access to this server already, Abra will
|
||||||
Co-op Cloud config located on the server itself, and not on your local
|
assume port 22 and will use your current system username to make an initial
|
||||||
developer machine.
|
connection. You can use the <user> and <port> arguments to adjust this.
|
||||||
|
|
||||||
Example:
|
Example:
|
||||||
|
|
||||||
abra server add --local
|
abra server add varia.zone glodemodem 12345 -p
|
||||||
|
|
||||||
Otherwise, you may specify a remote server. The <domain> argument must be a
|
|
||||||
publicy accessible domain name which points to your server. You should have SSH
|
|
||||||
access to this server, Abra will assume port 22 and will use your current
|
|
||||||
system username to make an initial connection. You can use the <user> and
|
|
||||||
<port> arguments to adjust this.
|
|
||||||
|
|
||||||
Example:
|
|
||||||
|
|
||||||
abra server add --provision --traefik varia.zone glodemodem 12345
|
|
||||||
|
|
||||||
Abra will construct the following SSH connection and Docker context:
|
Abra will construct the following SSH connection and Docker context:
|
||||||
|
|
||||||
|
@ -410,34 +399,34 @@ Abra will construct the following SSH connection and Docker context:
|
||||||
|
|
||||||
All communication between Abra and the server will use this SSH connection.
|
All communication between Abra and the server will use this SSH connection.
|
||||||
|
|
||||||
In this example, Abra will run the following operations:
|
If "--local" is passed, then Abra assumes that the current local server is
|
||||||
|
intended as the target server. This is useful when you want to have your entire
|
||||||
1. Install Docker
|
Co-op Cloud config located on the server itself, and not on your local
|
||||||
2. Initialise Swarm mode
|
developer machine.
|
||||||
3. Deploy Traefik (core web proxy)
|
|
||||||
|
|
||||||
You may omit flags to avoid performing this provisioning logic.
|
|
||||||
`,
|
`,
|
||||||
Aliases: []string{"a"},
|
|
||||||
Flags: []cli.Flag{
|
Flags: []cli.Flag{
|
||||||
|
internal.DebugFlag,
|
||||||
|
internal.NoInputFlag,
|
||||||
localFlag,
|
localFlag,
|
||||||
provisionFlag,
|
provisionFlag,
|
||||||
sshAuthFlag,
|
sshAuthFlag,
|
||||||
askSudoPassFlag,
|
askSudoPassFlag,
|
||||||
traefikFlag,
|
|
||||||
},
|
},
|
||||||
|
Before: internal.SubCommandBefore,
|
||||||
ArgsUsage: "<domain> [<user>] [<port>]",
|
ArgsUsage: "<domain> [<user>] [<port>]",
|
||||||
Action: func(c *cli.Context) error {
|
Action: func(c *cli.Context) error {
|
||||||
if c.Args().Len() > 0 && local || !internal.ValidateSubCmdFlags(c) {
|
if len(c.Args()) > 0 && local || !internal.ValidateSubCmdFlags(c) {
|
||||||
err := errors.New("cannot use '<domain>' and '--local' together")
|
err := errors.New("cannot use <domain> and --local together")
|
||||||
internal.ShowSubcommandHelpAndError(c, err)
|
internal.ShowSubcommandHelpAndError(c, err)
|
||||||
}
|
}
|
||||||
|
|
||||||
if sshAuth != "password" && sshAuth != "identity-file" {
|
if sshAuth != "password" && sshAuth != "identity-file" {
|
||||||
err := errors.New("--ssh-auth only accepts 'identity-file' or 'password'")
|
err := errors.New("--ssh-auth only accepts identity-file or password")
|
||||||
internal.ShowSubcommandHelpAndError(c, err)
|
internal.ShowSubcommandHelpAndError(c, err)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
domainName := internal.ValidateDomain(c)
|
||||||
|
|
||||||
if local {
|
if local {
|
||||||
if err := newLocalServer(c, "default"); err != nil {
|
if err := newLocalServer(c, "default"); err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
|
@ -445,11 +434,6 @@ You may omit flags to avoid performing this provisioning logic.
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
domainName, err := internal.ValidateDomain(c)
|
|
||||||
if err != nil {
|
|
||||||
logrus.Fatal(err)
|
|
||||||
}
|
|
||||||
|
|
||||||
username := c.Args().Get(1)
|
username := c.Args().Get(1)
|
||||||
if username == "" {
|
if username == "" {
|
||||||
systemUser, err := user.Current()
|
systemUser, err := user.Current()
|
||||||
|
@ -474,14 +458,17 @@ You may omit flags to avoid performing this provisioning logic.
|
||||||
|
|
||||||
cl, err := newClient(c, domainName)
|
cl, err := newClient(c, domainName)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logrus.Fatal(err)
|
cleanUp(domainName)
|
||||||
|
logrus.Debugf("failed to construct client for %s, saw %s", domainName, err.Error())
|
||||||
|
logrus.Fatalf(fmt.Sprintf(internal.ServerAddFailMsg, domainName))
|
||||||
}
|
}
|
||||||
|
|
||||||
if provision {
|
if provision {
|
||||||
logrus.Debugf("attempting to construct SSH client for %s", domainName)
|
logrus.Debugf("attempting to construct SSH client for %s", domainName)
|
||||||
sshCl, err := ssh.New(domainName, sshAuth, username, port)
|
sshCl, err := ssh.New(domainName, sshAuth, username, port)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logrus.Fatal(err)
|
cleanUp(domainName)
|
||||||
|
logrus.Fatalf(fmt.Sprintf(internal.ServerAddFailMsg, domainName))
|
||||||
}
|
}
|
||||||
defer sshCl.Close()
|
defer sshCl.Close()
|
||||||
logrus.Debugf("successfully created SSH client for %s", domainName)
|
logrus.Debugf("successfully created SSH client for %s", domainName)
|
||||||
|
@ -494,17 +481,31 @@ You may omit flags to avoid performing this provisioning logic.
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if _, err := cl.Info(c.Context); err != nil {
|
if _, err := cl.Info(context.Background()); err != nil {
|
||||||
cleanUp(domainName)
|
cleanUp(domainName)
|
||||||
logrus.Fatalf("couldn't make a remote docker connection to %s? use --provision/-p to attempt to install", domainName)
|
logrus.Fatalf(fmt.Sprintf(internal.ServerAddFailMsg, domainName))
|
||||||
}
|
|
||||||
|
|
||||||
if traefik {
|
|
||||||
if err := deployTraefik(c, cl, domainName); err != nil {
|
|
||||||
logrus.Fatal(err)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// ensureLocalExecutable ensures that an executable is present on the local machine
|
||||||
|
func ensureLocalExecutable(exe string) (bool, error) {
|
||||||
|
out, err := exec.Command("which", exe).Output()
|
||||||
|
if err != nil {
|
||||||
|
return false, err
|
||||||
|
}
|
||||||
|
|
||||||
|
return string(out) != "", nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// ensureRemoteExecutable ensures that an executable is present on a remote machine
|
||||||
|
func ensureRemoteExecutable(exe string, sshCl *ssh.Client) (bool, error) {
|
||||||
|
out, err := sshCl.Exec(fmt.Sprintf("which %s", exe))
|
||||||
|
if err != nil && string(out) != "" {
|
||||||
|
return false, err
|
||||||
|
}
|
||||||
|
|
||||||
|
return string(out) != "", nil
|
||||||
|
}
|
||||||
|
|
|
@ -3,20 +3,23 @@ package server
|
||||||
import (
|
import (
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
"coopcloud.tech/abra/cli/formatter"
|
"coopcloud.tech/abra/cli/internal"
|
||||||
"coopcloud.tech/abra/pkg/config"
|
"coopcloud.tech/abra/pkg/config"
|
||||||
"coopcloud.tech/abra/pkg/context"
|
"coopcloud.tech/abra/pkg/context"
|
||||||
|
"coopcloud.tech/abra/pkg/formatter"
|
||||||
"github.com/docker/cli/cli/connhelper/ssh"
|
"github.com/docker/cli/cli/connhelper/ssh"
|
||||||
"github.com/sirupsen/logrus"
|
"github.com/sirupsen/logrus"
|
||||||
"github.com/urfave/cli/v2"
|
"github.com/urfave/cli"
|
||||||
)
|
)
|
||||||
|
|
||||||
var serverListCommand = &cli.Command{
|
var serverListCommand = cli.Command{
|
||||||
Name: "list",
|
Name: "list",
|
||||||
Aliases: []string{"ls"},
|
Aliases: []string{"ls"},
|
||||||
Usage: "List managed servers",
|
Usage: "List managed servers",
|
||||||
ArgsUsage: " ",
|
Flags: []cli.Flag{
|
||||||
HideHelp: true,
|
internal.DebugFlag,
|
||||||
|
},
|
||||||
|
Before: internal.SubCommandBefore,
|
||||||
Action: func(c *cli.Context) error {
|
Action: func(c *cli.Context) error {
|
||||||
dockerContextStore := context.NewDefaultDockerContextStore()
|
dockerContextStore := context.NewDefaultDockerContextStore()
|
||||||
contexts, err := dockerContextStore.Store.List()
|
contexts, err := dockerContextStore.Store.List()
|
||||||
|
|
|
@ -1,16 +1,17 @@
|
||||||
package server
|
package server
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"context"
|
||||||
"fmt"
|
"fmt"
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
"coopcloud.tech/abra/cli/formatter"
|
|
||||||
"coopcloud.tech/abra/cli/internal"
|
"coopcloud.tech/abra/cli/internal"
|
||||||
|
"coopcloud.tech/abra/pkg/formatter"
|
||||||
"coopcloud.tech/libcapsul"
|
"coopcloud.tech/libcapsul"
|
||||||
"github.com/AlecAivazis/survey/v2"
|
"github.com/AlecAivazis/survey/v2"
|
||||||
"github.com/hetznercloud/hcloud-go/hcloud"
|
"github.com/hetznercloud/hcloud-go/hcloud"
|
||||||
"github.com/sirupsen/logrus"
|
"github.com/sirupsen/logrus"
|
||||||
"github.com/urfave/cli/v2"
|
"github.com/urfave/cli"
|
||||||
)
|
)
|
||||||
|
|
||||||
func newHetznerCloudVPS(c *cli.Context) error {
|
func newHetznerCloudVPS(c *cli.Context) error {
|
||||||
|
@ -27,7 +28,7 @@ func newHetznerCloudVPS(c *cli.Context) error {
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
|
||||||
sshKey, _, err := client.SSHKey.GetByName(c.Context, sshKey)
|
sshKey, _, err := client.SSHKey.GetByName(context.Background(), sshKey)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
@ -43,13 +44,18 @@ func newHetznerCloudVPS(c *cli.Context) error {
|
||||||
Location: &hcloud.Location{Name: internal.HetznerCloudLocation},
|
Location: &hcloud.Location{Name: internal.HetznerCloudLocation},
|
||||||
}
|
}
|
||||||
|
|
||||||
|
sshKeyIDs := strings.Join(sshKeysRaw, "\n")
|
||||||
|
if sshKeyIDs == "" {
|
||||||
|
sshKeyIDs = "N/A (password auth)"
|
||||||
|
}
|
||||||
|
|
||||||
tableColumns := []string{"name", "type", "image", "ssh-keys", "location"}
|
tableColumns := []string{"name", "type", "image", "ssh-keys", "location"}
|
||||||
table := formatter.CreateTable(tableColumns)
|
table := formatter.CreateTable(tableColumns)
|
||||||
table.Append([]string{
|
table.Append([]string{
|
||||||
internal.HetznerCloudName,
|
internal.HetznerCloudName,
|
||||||
internal.HetznerCloudType,
|
internal.HetznerCloudType,
|
||||||
internal.HetznerCloudImage,
|
internal.HetznerCloudImage,
|
||||||
strings.Join(sshKeysRaw, "\n"),
|
sshKeyIDs,
|
||||||
internal.HetznerCloudLocation,
|
internal.HetznerCloudLocation,
|
||||||
})
|
})
|
||||||
table.Render()
|
table.Render()
|
||||||
|
@ -67,7 +73,7 @@ func newHetznerCloudVPS(c *cli.Context) error {
|
||||||
logrus.Fatal("exiting as requested")
|
logrus.Fatal("exiting as requested")
|
||||||
}
|
}
|
||||||
|
|
||||||
res, _, err := client.Server.Create(c.Context, serverOpts)
|
res, _, err := client.Server.Create(context.Background(), serverOpts)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
@ -96,9 +102,18 @@ Please note, this server is not managed by Abra yet (i.e. "abra server ls" will
|
||||||
not list this server)! You will need to assign a domain name record ("abra
|
not list this server)! You will need to assign a domain name record ("abra
|
||||||
record new") and add the server to your Abra configuration ("abra server add")
|
record new") and add the server to your Abra configuration ("abra server add")
|
||||||
to have a working server that you can deploy Co-op Cloud apps to.
|
to have a working server that you can deploy Co-op Cloud apps to.
|
||||||
|
|
||||||
|
When setting up domain name records, you probably want to set up the following
|
||||||
|
2 A records. This supports deploying apps to your root domain (e.g.
|
||||||
|
example.com) and other apps on sub-domains (e.g. foo.example.com,
|
||||||
|
bar.example.com).
|
||||||
|
|
||||||
|
@ 1800 IN A %s
|
||||||
|
* 1800 IN A %s
|
||||||
|
|
||||||
`,
|
`,
|
||||||
internal.HetznerCloudName, ip, rootPassword,
|
internal.HetznerCloudName, ip, rootPassword,
|
||||||
ip,
|
ip, ip, ip,
|
||||||
))
|
))
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
|
@ -169,12 +184,21 @@ Please note, this server is not managed by Abra yet (i.e. "abra server ls" will
|
||||||
not list this server)! You will need to assign a domain name record ("abra
|
not list this server)! You will need to assign a domain name record ("abra
|
||||||
record new") and add the server to your Abra configuration ("abra server add")
|
record new") and add the server to your Abra configuration ("abra server add")
|
||||||
to have a working server that you can deploy Co-op Cloud apps to.
|
to have a working server that you can deploy Co-op Cloud apps to.
|
||||||
|
|
||||||
|
When setting up domain name records, you probably want to set up the following
|
||||||
|
2 A records. This supports deploying apps to your root domain (e.g.
|
||||||
|
example.com) and other apps on sub-domains (e.g. foo.example.com,
|
||||||
|
bar.example.com).
|
||||||
|
|
||||||
|
@ 1800 IN A <your-capsul-ip>
|
||||||
|
* 1800 IN A <your-capsul-ip>
|
||||||
|
|
||||||
`, internal.CapsulName, resp.ID, internal.CapsulInstanceURL))
|
`, internal.CapsulName, resp.ID, internal.CapsulInstanceURL))
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
var serverNewCommand = &cli.Command{
|
var serverNewCommand = cli.Command{
|
||||||
Name: "new",
|
Name: "new",
|
||||||
Aliases: []string{"n"},
|
Aliases: []string{"n"},
|
||||||
Usage: "Create a new server using a 3rd party provider",
|
Usage: "Create a new server using a 3rd party provider",
|
||||||
|
@ -196,8 +220,9 @@ API tokens are read from the environment if specified, e.g.
|
||||||
|
|
||||||
Where "$provider_TOKEN" is the expected env var format.
|
Where "$provider_TOKEN" is the expected env var format.
|
||||||
`,
|
`,
|
||||||
ArgsUsage: "<provider>",
|
|
||||||
Flags: []cli.Flag{
|
Flags: []cli.Flag{
|
||||||
|
internal.DebugFlag,
|
||||||
|
internal.NoInputFlag,
|
||||||
internal.ServerProviderFlag,
|
internal.ServerProviderFlag,
|
||||||
|
|
||||||
// Capsul
|
// Capsul
|
||||||
|
@ -215,6 +240,7 @@ Where "$provider_TOKEN" is the expected env var format.
|
||||||
internal.HetznerCloudLocationFlag,
|
internal.HetznerCloudLocationFlag,
|
||||||
internal.HetznerCloudAPITokenFlag,
|
internal.HetznerCloudAPITokenFlag,
|
||||||
},
|
},
|
||||||
|
Before: internal.SubCommandBefore,
|
||||||
Action: func(c *cli.Context) error {
|
Action: func(c *cli.Context) error {
|
||||||
if err := internal.EnsureServerProvider(); err != nil {
|
if err := internal.EnsureServerProvider(); err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
|
|
|
@ -1,25 +1,24 @@
|
||||||
package server
|
package server
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"context"
|
||||||
"fmt"
|
"fmt"
|
||||||
"os"
|
"os"
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
|
|
||||||
"coopcloud.tech/abra/cli/formatter"
|
|
||||||
"coopcloud.tech/abra/cli/internal"
|
"coopcloud.tech/abra/cli/internal"
|
||||||
"coopcloud.tech/abra/pkg/client"
|
"coopcloud.tech/abra/pkg/client"
|
||||||
"coopcloud.tech/abra/pkg/config"
|
"coopcloud.tech/abra/pkg/config"
|
||||||
|
"coopcloud.tech/abra/pkg/formatter"
|
||||||
"github.com/AlecAivazis/survey/v2"
|
"github.com/AlecAivazis/survey/v2"
|
||||||
"github.com/hetznercloud/hcloud-go/hcloud"
|
"github.com/hetznercloud/hcloud-go/hcloud"
|
||||||
"github.com/sirupsen/logrus"
|
"github.com/sirupsen/logrus"
|
||||||
"github.com/urfave/cli/v2"
|
"github.com/urfave/cli"
|
||||||
)
|
)
|
||||||
|
|
||||||
var rmServer bool
|
var rmServer bool
|
||||||
var rmServerFlag = &cli.BoolFlag{
|
var rmServerFlag = &cli.BoolFlag{
|
||||||
Name: "server",
|
Name: "server, s",
|
||||||
Aliases: []string{"s"},
|
|
||||||
Value: false,
|
|
||||||
Usage: "remove the actual server also",
|
Usage: "remove the actual server also",
|
||||||
Destination: &rmServer,
|
Destination: &rmServer,
|
||||||
}
|
}
|
||||||
|
@ -50,7 +49,7 @@ func rmHetznerCloudVPS(c *cli.Context) error {
|
||||||
|
|
||||||
client := hcloud.NewClient(hcloud.WithToken(internal.HetznerCloudAPIToken))
|
client := hcloud.NewClient(hcloud.WithToken(internal.HetznerCloudAPIToken))
|
||||||
|
|
||||||
server, _, err := client.Server.Get(c.Context, internal.HetznerCloudName)
|
server, _, err := client.Server.Get(context.Background(), internal.HetznerCloudName)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
@ -89,7 +88,7 @@ destroyed.
|
||||||
logrus.Fatal("exiting as requested")
|
logrus.Fatal("exiting as requested")
|
||||||
}
|
}
|
||||||
|
|
||||||
_, err = client.Server.Delete(c.Context, server)
|
_, err = client.Server.Delete(context.Background(), server)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
@ -99,10 +98,10 @@ destroyed.
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
var serverRemoveCommand = &cli.Command{
|
var serverRemoveCommand = cli.Command{
|
||||||
Name: "remove",
|
Name: "remove",
|
||||||
Aliases: []string{"rm"},
|
Aliases: []string{"rm"},
|
||||||
ArgsUsage: "<server>",
|
ArgsUsage: "[<server>]",
|
||||||
Usage: "Remove a managed server",
|
Usage: "Remove a managed server",
|
||||||
Description: `
|
Description: `
|
||||||
This command removes a server from Abra management.
|
This command removes a server from Abra management.
|
||||||
|
@ -116,16 +115,43 @@ underlying client connection context. This server will then be lost in time,
|
||||||
like tears in rain.
|
like tears in rain.
|
||||||
`,
|
`,
|
||||||
Flags: []cli.Flag{
|
Flags: []cli.Flag{
|
||||||
|
internal.DebugFlag,
|
||||||
|
internal.NoInputFlag,
|
||||||
rmServerFlag,
|
rmServerFlag,
|
||||||
|
internal.ServerProviderFlag,
|
||||||
|
|
||||||
// Hetzner
|
// Hetzner
|
||||||
internal.HetznerCloudNameFlag,
|
internal.HetznerCloudNameFlag,
|
||||||
internal.HetznerCloudAPITokenFlag,
|
internal.HetznerCloudAPITokenFlag,
|
||||||
},
|
},
|
||||||
|
Before: internal.SubCommandBefore,
|
||||||
Action: func(c *cli.Context) error {
|
Action: func(c *cli.Context) error {
|
||||||
serverName, err := internal.ValidateServer(c)
|
serverName := internal.ValidateServer(c)
|
||||||
if err != nil {
|
|
||||||
logrus.Fatal(err)
|
warnMsg := `Did not pass -s/--server for actual server deletion, prompting!
|
||||||
|
|
||||||
|
Abra doesn't currently know if it helped you create this server with one of the
|
||||||
|
3rd party integrations (e.g. Capsul). You have a choice here to actually,
|
||||||
|
really and finally destroy this server using those integrations. If you want to
|
||||||
|
do this, choose Yes.
|
||||||
|
|
||||||
|
If you just want to remove the server config files & context, choose No.
|
||||||
|
`
|
||||||
|
|
||||||
|
if !rmServer {
|
||||||
|
logrus.Warn(fmt.Sprintf(warnMsg))
|
||||||
|
|
||||||
|
response := false
|
||||||
|
prompt := &survey.Confirm{
|
||||||
|
Message: "delete actual live server?",
|
||||||
|
}
|
||||||
|
if err := survey.AskOne(prompt, &response); err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
if response {
|
||||||
|
logrus.Info("setting -s/--server and attempting to remove actual server")
|
||||||
|
rmServer = true
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if rmServer {
|
if rmServer {
|
||||||
|
@ -141,18 +167,17 @@ like tears in rain.
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if err := client.DeleteContext(serverName); err != nil {
|
if err := client.DeleteContext(serverName); err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
if err := os.RemoveAll(filepath.Join(config.ABRA_SERVER_FOLDER, serverName)); err != nil {
|
if err := os.RemoveAll(filepath.Join(config.SERVERS_DIR, serverName)); err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
logrus.Infof("server at '%s' has been lost in time, like tears in rain", serverName)
|
logrus.Infof("server at %s has been lost in time, like tears in rain", serverName)
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
},
|
},
|
||||||
|
|
|
@ -1,14 +1,14 @@
|
||||||
package server
|
package server
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"github.com/urfave/cli/v2"
|
"github.com/urfave/cli"
|
||||||
)
|
)
|
||||||
|
|
||||||
// ServerCommand defines the `abra server` command and its subcommands
|
// ServerCommand defines the `abra server` command and its subcommands
|
||||||
var ServerCommand = &cli.Command{
|
var ServerCommand = cli.Command{
|
||||||
Name: "server",
|
Name: "server",
|
||||||
Aliases: []string{"s"},
|
Aliases: []string{"s"},
|
||||||
Usage: "Manage servers via 3rd party providers",
|
Usage: "Manage servers",
|
||||||
Description: `
|
Description: `
|
||||||
These commands support creating, managing and removing servers using 3rd party
|
These commands support creating, managing and removing servers using 3rd party
|
||||||
integrations.
|
integrations.
|
||||||
|
@ -18,7 +18,7 @@ already have a server, you can add it to your configuration using "abra server
|
||||||
add". Abra can provision servers so that they are ready to deploy Co-op Cloud
|
add". Abra can provision servers so that they are ready to deploy Co-op Cloud
|
||||||
apps, see available flags on "server add" for more.
|
apps, see available flags on "server add" for more.
|
||||||
`,
|
`,
|
||||||
Subcommands: []*cli.Command{
|
Subcommands: []cli.Command{
|
||||||
serverNewCommand,
|
serverNewCommand,
|
||||||
serverAddCommand,
|
serverAddCommand,
|
||||||
serverListCommand,
|
serverListCommand,
|
||||||
|
|
|
@ -1,23 +0,0 @@
|
||||||
package cli
|
|
||||||
|
|
||||||
import (
|
|
||||||
"os/exec"
|
|
||||||
|
|
||||||
"coopcloud.tech/abra/cli/internal"
|
|
||||||
"github.com/sirupsen/logrus"
|
|
||||||
"github.com/urfave/cli/v2"
|
|
||||||
)
|
|
||||||
|
|
||||||
// UpgradeCommand upgrades abra in-place.
|
|
||||||
var UpgradeCommand = &cli.Command{
|
|
||||||
Name: "upgrade",
|
|
||||||
Usage: "Upgrade abra",
|
|
||||||
Action: func(c *cli.Context) error {
|
|
||||||
cmd := exec.Command("bash", "-c", "curl -s https://install.abra.coopcloud.tech | bash")
|
|
||||||
logrus.Debugf("attempting to run '%s'", cmd)
|
|
||||||
if err := internal.RunCmd(cmd); err != nil {
|
|
||||||
logrus.Fatal(err)
|
|
||||||
}
|
|
||||||
return nil
|
|
||||||
},
|
|
||||||
}
|
|
|
@ -5,14 +5,13 @@ import (
|
||||||
"coopcloud.tech/abra/cli"
|
"coopcloud.tech/abra/cli"
|
||||||
)
|
)
|
||||||
|
|
||||||
// Version is the current version of abra.
|
// Version is the current version of Abra
|
||||||
var Version string
|
var Version string
|
||||||
|
|
||||||
// Commit is the current commit of abra.
|
// Commit is the current git commit of Abra
|
||||||
var Commit string
|
var Commit string
|
||||||
|
|
||||||
func main() {
|
func main() {
|
||||||
// If not set in the ld-flags
|
|
||||||
if Version == "" {
|
if Version == "" {
|
||||||
Version = "dev"
|
Version = "dev"
|
||||||
}
|
}
|
||||||
|
|
44
go.mod
44
go.mod
|
@ -4,44 +4,50 @@ go 1.16
|
||||||
|
|
||||||
require (
|
require (
|
||||||
coopcloud.tech/tagcmp v0.0.0-20211103052201-885b22f77d52
|
coopcloud.tech/tagcmp v0.0.0-20211103052201-885b22f77d52
|
||||||
github.com/AlecAivazis/survey/v2 v2.3.1
|
github.com/AlecAivazis/survey/v2 v2.3.2
|
||||||
github.com/Autonomic-Cooperative/godotenv v1.3.1-0.20210731170023-c37c0920d1a4
|
github.com/Autonomic-Cooperative/godotenv v1.3.1-0.20210731094149-b031ea1211e7
|
||||||
github.com/Gurpartap/logrus-stack v0.0.0-20170710170904-89c00d8a28f4
|
github.com/Gurpartap/logrus-stack v0.0.0-20170710170904-89c00d8a28f4
|
||||||
github.com/docker/cli v20.10.8+incompatible
|
github.com/docker/cli v20.10.13+incompatible
|
||||||
github.com/docker/distribution v2.7.1+incompatible
|
github.com/docker/distribution v2.8.1+incompatible
|
||||||
github.com/docker/docker v20.10.8+incompatible
|
github.com/docker/docker v20.10.13+incompatible
|
||||||
github.com/docker/go-units v0.4.0
|
github.com/docker/go-units v0.4.0
|
||||||
github.com/go-git/go-git/v5 v5.4.2
|
github.com/go-git/go-git/v5 v5.4.2
|
||||||
github.com/hetznercloud/hcloud-go v1.32.0
|
github.com/hetznercloud/hcloud-go v1.33.1
|
||||||
github.com/moby/sys/signal v0.5.0
|
github.com/moby/sys/signal v0.7.0
|
||||||
github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6
|
github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6
|
||||||
github.com/olekukonko/tablewriter v0.0.5
|
github.com/olekukonko/tablewriter v0.0.5
|
||||||
github.com/pkg/errors v0.9.1
|
github.com/pkg/errors v0.9.1
|
||||||
github.com/schollz/progressbar/v3 v3.8.3
|
github.com/schollz/progressbar/v3 v3.8.6
|
||||||
github.com/schultz-is/passgen v1.0.1
|
github.com/schultz-is/passgen v1.0.1
|
||||||
github.com/sirupsen/logrus v1.8.1
|
github.com/sirupsen/logrus v1.8.1
|
||||||
github.com/urfave/cli/v2 v2.3.0
|
gotest.tools/v3 v3.1.0
|
||||||
gotest.tools/v3 v3.0.3
|
|
||||||
)
|
)
|
||||||
|
|
||||||
require (
|
require (
|
||||||
coopcloud.tech/libcapsul v0.0.0-20211022074848-c35e78fe3f3e
|
coopcloud.tech/libcapsul v0.0.0-20211022074848-c35e78fe3f3e
|
||||||
github.com/Microsoft/hcsshim v0.8.21 // indirect
|
github.com/ProtonMail/go-crypto v0.0.0-20211112122917-428f8eabeeb3 // indirect
|
||||||
github.com/containerd/containerd v1.5.5 // indirect
|
github.com/buger/goterm v1.0.4
|
||||||
|
github.com/containerd/containerd v1.5.9 // indirect
|
||||||
|
github.com/containers/image v3.0.2+incompatible
|
||||||
|
github.com/containers/storage v1.38.2 // indirect
|
||||||
github.com/docker/docker-credential-helpers v0.6.4 // indirect
|
github.com/docker/docker-credential-helpers v0.6.4 // indirect
|
||||||
github.com/facebookgo/stack v0.0.0-20160209184415-751773369052 // indirect
|
github.com/facebookgo/stack v0.0.0-20160209184415-751773369052 // indirect
|
||||||
github.com/fvbommel/sortorder v1.0.2 // indirect
|
github.com/fvbommel/sortorder v1.0.2 // indirect
|
||||||
github.com/gliderlabs/ssh v0.2.2
|
github.com/gliderlabs/ssh v0.3.3
|
||||||
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
|
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
|
||||||
github.com/gorilla/mux v1.8.0 // indirect
|
github.com/gorilla/mux v1.8.0 // indirect
|
||||||
github.com/kevinburke/ssh_config v0.0.0-20201106050909-4977a11b4351
|
github.com/hashicorp/go-retryablehttp v0.7.0
|
||||||
|
github.com/kevinburke/ssh_config v1.1.0
|
||||||
github.com/libdns/gandi v1.0.2
|
github.com/libdns/gandi v1.0.2
|
||||||
github.com/libdns/libdns v0.2.1
|
github.com/libdns/libdns v0.2.1
|
||||||
github.com/moby/sys/mount v0.2.0 // indirect
|
github.com/moby/sys/mount v0.2.0 // indirect
|
||||||
github.com/morikuni/aec v1.0.0 // indirect
|
github.com/opencontainers/image-spec v1.0.3-0.20211202193544-a5463b7f9c84 // indirect
|
||||||
github.com/opencontainers/runc v1.0.2 // indirect
|
github.com/sergi/go-diff v1.2.0 // indirect
|
||||||
|
github.com/spf13/cobra v1.3.0 // indirect
|
||||||
github.com/theupdateframework/notary v0.7.0 // indirect
|
github.com/theupdateframework/notary v0.7.0 // indirect
|
||||||
github.com/xeipuuv/gojsonschema v1.2.0 // indirect
|
github.com/urfave/cli v1.22.5
|
||||||
golang.org/x/crypto v0.0.0-20210817164053-32db794688a5
|
github.com/xanzy/ssh-agent v0.3.1 // indirect
|
||||||
golang.org/x/sys v0.0.0-20210910150752-751e447fb3d0
|
github.com/xeipuuv/gojsonpointer v0.0.0-20190809123943-df4f5c81cb3b // indirect
|
||||||
|
golang.org/x/crypto v0.0.0-20220131195533-30dcbda58838
|
||||||
|
golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27
|
||||||
)
|
)
|
||||||
|
|
|
@ -23,7 +23,7 @@ func Get(appName string) (config.App, error) {
|
||||||
return config.App{}, err
|
return config.App{}, err
|
||||||
}
|
}
|
||||||
|
|
||||||
logrus.Debugf("retrieved '%s' for '%s'", app, appName)
|
logrus.Debugf("retrieved %s for %s", app, appName)
|
||||||
|
|
||||||
return app, nil
|
return app, nil
|
||||||
}
|
}
|
||||||
|
@ -57,9 +57,9 @@ func DeployedVersions(ctx context.Context, cl *apiclient.Client, app config.App)
|
||||||
deployed := len(services) > 0
|
deployed := len(services) > 0
|
||||||
|
|
||||||
if deployed {
|
if deployed {
|
||||||
logrus.Debugf("detected '%s' as deployed versions of '%s'", appSpec, app.Name)
|
logrus.Debugf("detected %s as deployed versions of %s", appSpec, app.Name)
|
||||||
} else {
|
} else {
|
||||||
logrus.Debugf("detected '%s' as not deployed", app.Name)
|
logrus.Debugf("detected %s as not deployed", app.Name)
|
||||||
}
|
}
|
||||||
|
|
||||||
return appSpec, len(services) > 0, nil
|
return appSpec, len(services) > 0, nil
|
||||||
|
@ -71,15 +71,15 @@ func ParseVersionLabel(label string) (string, string) {
|
||||||
idx := strings.LastIndex(label, "-")
|
idx := strings.LastIndex(label, "-")
|
||||||
version := label[:idx]
|
version := label[:idx]
|
||||||
digest := label[idx+1:]
|
digest := label[idx+1:]
|
||||||
logrus.Debugf("parsed '%s' as version from '%s'", version, label)
|
logrus.Debugf("parsed %s as version from %s", version, label)
|
||||||
logrus.Debugf("parsed '%s' as digest from '%s'", digest, label)
|
logrus.Debugf("parsed %s as digest from %s", digest, label)
|
||||||
return version, digest
|
return version, digest
|
||||||
}
|
}
|
||||||
|
|
||||||
// ParseVersionName parses a $STACK_NAME_$SERVICE_NAME service label.
|
// ParseServiceName parses a $STACK_NAME_$SERVICE_NAME service label.
|
||||||
func ParseServiceName(label string) string {
|
func ParseServiceName(label string) string {
|
||||||
idx := strings.LastIndex(label, "_")
|
idx := strings.LastIndex(label, "_")
|
||||||
serviceName := label[idx+1:]
|
serviceName := label[idx+1:]
|
||||||
logrus.Debugf("parsed '%s' as service name from '%s'", serviceName, label)
|
logrus.Debugf("parsed %s as service name from %s", serviceName, label)
|
||||||
return serviceName
|
return serviceName
|
||||||
}
|
}
|
||||||
|
|
|
@ -0,0 +1,63 @@
|
||||||
|
package autocomplete
|
||||||
|
|
||||||
|
import (
|
||||||
|
"fmt"
|
||||||
|
|
||||||
|
"coopcloud.tech/abra/pkg/config"
|
||||||
|
"coopcloud.tech/abra/pkg/recipe"
|
||||||
|
"github.com/sirupsen/logrus"
|
||||||
|
"github.com/urfave/cli"
|
||||||
|
)
|
||||||
|
|
||||||
|
// AppNameComplete copletes app names
|
||||||
|
func AppNameComplete(c *cli.Context) {
|
||||||
|
appNames, err := config.GetAppNames()
|
||||||
|
if err != nil {
|
||||||
|
logrus.Warn(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if c.NArg() > 0 {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, a := range appNames {
|
||||||
|
fmt.Println(a)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// RecipeNameComplete completes recipe names
|
||||||
|
func RecipeNameComplete(c *cli.Context) {
|
||||||
|
catl, err := recipe.ReadRecipeCatalogue()
|
||||||
|
if err != nil {
|
||||||
|
logrus.Warn(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if c.NArg() > 0 {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
for name := range catl {
|
||||||
|
fmt.Println(name)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// SubcommandComplete completes subcommands.
|
||||||
|
func SubcommandComplete(c *cli.Context) {
|
||||||
|
if c.NArg() > 0 {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
subcmds := []string{
|
||||||
|
"app",
|
||||||
|
"autocomplete",
|
||||||
|
"catalogue",
|
||||||
|
"recipe",
|
||||||
|
"record",
|
||||||
|
"server",
|
||||||
|
"upgrade",
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, cmd := range subcmds {
|
||||||
|
fmt.Println(cmd)
|
||||||
|
}
|
||||||
|
}
|
|
@ -1,500 +0,0 @@
|
||||||
// Package catalogue provides ways of interacting with recipe catalogues which
|
|
||||||
// are JSON data structures which contain meta information about recipes (e.g.
|
|
||||||
// what versions of the Nextcloud recipe are available?).
|
|
||||||
package catalogue
|
|
||||||
|
|
||||||
import (
|
|
||||||
"encoding/json"
|
|
||||||
"fmt"
|
|
||||||
"io/ioutil"
|
|
||||||
"net/http"
|
|
||||||
"os"
|
|
||||||
"path"
|
|
||||||
"strings"
|
|
||||||
"time"
|
|
||||||
|
|
||||||
"coopcloud.tech/abra/pkg/client"
|
|
||||||
"coopcloud.tech/abra/pkg/config"
|
|
||||||
"coopcloud.tech/abra/pkg/recipe"
|
|
||||||
"coopcloud.tech/abra/pkg/web"
|
|
||||||
"github.com/docker/distribution/reference"
|
|
||||||
"github.com/go-git/go-git/v5"
|
|
||||||
"github.com/go-git/go-git/v5/plumbing"
|
|
||||||
"github.com/sirupsen/logrus"
|
|
||||||
)
|
|
||||||
|
|
||||||
// RecipeCatalogueURL is the only current recipe catalogue available.
|
|
||||||
const RecipeCatalogueURL = "https://apps.coopcloud.tech"
|
|
||||||
|
|
||||||
// ReposMetadataURL is the recipe repository metadata
|
|
||||||
const ReposMetadataURL = "https://git.coopcloud.tech/api/v1/orgs/coop-cloud/repos"
|
|
||||||
|
|
||||||
// image represents a recipe container image.
|
|
||||||
type image struct {
|
|
||||||
Image string `json:"image"`
|
|
||||||
Rating string `json:"rating"`
|
|
||||||
Source string `json:"source"`
|
|
||||||
URL string `json:"url"`
|
|
||||||
}
|
|
||||||
|
|
||||||
// features represent what top-level features a recipe supports (e.g. does this
|
|
||||||
// recipe support backups?).
|
|
||||||
type features struct {
|
|
||||||
Backups string `json:"backups"`
|
|
||||||
Email string `json:"email"`
|
|
||||||
Healthcheck string `json:"healthcheck"`
|
|
||||||
Image image `json:"image"`
|
|
||||||
Status int `json:"status"`
|
|
||||||
Tests string `json:"tests"`
|
|
||||||
}
|
|
||||||
|
|
||||||
// tag represents a git tag.
|
|
||||||
type tag = string
|
|
||||||
|
|
||||||
// service represents a service within a recipe.
|
|
||||||
type service = string
|
|
||||||
|
|
||||||
// ServiceMeta represents meta info associated with a service.
|
|
||||||
type ServiceMeta struct {
|
|
||||||
Digest string `json:"digest"`
|
|
||||||
Image string `json:"image"`
|
|
||||||
Tag string `json:"tag"`
|
|
||||||
}
|
|
||||||
|
|
||||||
// RecipeVersions are the versions associated with a recipe.
|
|
||||||
type RecipeVersions []map[tag]map[service]ServiceMeta
|
|
||||||
|
|
||||||
// RecipeMeta represents metadata for a recipe in the abra catalogue.
|
|
||||||
type RecipeMeta struct {
|
|
||||||
Category string `json:"category"`
|
|
||||||
DefaultBranch string `json:"default_branch"`
|
|
||||||
Description string `json:"description"`
|
|
||||||
Features features `json:"features"`
|
|
||||||
Icon string `json:"icon"`
|
|
||||||
Name string `json:"name"`
|
|
||||||
Repository string `json:"repository"`
|
|
||||||
Versions RecipeVersions `json:"versions"`
|
|
||||||
Website string `json:"website"`
|
|
||||||
}
|
|
||||||
|
|
||||||
// LatestVersion returns the latest version of a recipe.
|
|
||||||
func (r RecipeMeta) LatestVersion() string {
|
|
||||||
var version string
|
|
||||||
|
|
||||||
// apps.json versions are sorted so the last key is latest
|
|
||||||
latest := r.Versions[len(r.Versions)-1]
|
|
||||||
|
|
||||||
for tag := range latest {
|
|
||||||
version = tag
|
|
||||||
}
|
|
||||||
|
|
||||||
logrus.Debugf("choosing '%s' as latest version of '%s'", version, r.Name)
|
|
||||||
|
|
||||||
return version
|
|
||||||
}
|
|
||||||
|
|
||||||
// Name represents a recipe name.
|
|
||||||
type Name = string
|
|
||||||
|
|
||||||
// RecipeCatalogue represents the entire recipe catalogue.
|
|
||||||
type RecipeCatalogue map[Name]RecipeMeta
|
|
||||||
|
|
||||||
// Flatten converts AppCatalogue to slice
|
|
||||||
func (r RecipeCatalogue) Flatten() []RecipeMeta {
|
|
||||||
recipes := make([]RecipeMeta, 0, len(r))
|
|
||||||
|
|
||||||
for name := range r {
|
|
||||||
recipes = append(recipes, r[name])
|
|
||||||
}
|
|
||||||
|
|
||||||
return recipes
|
|
||||||
}
|
|
||||||
|
|
||||||
// ByRecipeName sorts recipes by name.
|
|
||||||
type ByRecipeName []RecipeMeta
|
|
||||||
|
|
||||||
func (r ByRecipeName) Len() int { return len(r) }
|
|
||||||
func (r ByRecipeName) Swap(i, j int) { r[i], r[j] = r[j], r[i] }
|
|
||||||
func (r ByRecipeName) Less(i, j int) bool {
|
|
||||||
return strings.ToLower(r[i].Name) < strings.ToLower(r[j].Name)
|
|
||||||
}
|
|
||||||
|
|
||||||
// recipeCatalogueFSIsLatest checks whether the recipe catalogue stored locally
|
|
||||||
// is up to date.
|
|
||||||
func recipeCatalogueFSIsLatest() (bool, error) {
|
|
||||||
httpClient := &http.Client{Timeout: web.Timeout}
|
|
||||||
res, err := httpClient.Head(RecipeCatalogueURL)
|
|
||||||
if err != nil {
|
|
||||||
return false, err
|
|
||||||
}
|
|
||||||
|
|
||||||
lastModified := res.Header["Last-Modified"][0]
|
|
||||||
parsed, err := time.Parse(time.RFC1123, lastModified)
|
|
||||||
if err != nil {
|
|
||||||
return false, err
|
|
||||||
}
|
|
||||||
|
|
||||||
info, err := os.Stat(config.APPS_JSON)
|
|
||||||
if err != nil {
|
|
||||||
if os.IsNotExist(err) {
|
|
||||||
logrus.Debugf("no recipe catalogue found in file system cache")
|
|
||||||
return false, nil
|
|
||||||
}
|
|
||||||
return false, err
|
|
||||||
}
|
|
||||||
|
|
||||||
localModifiedTime := info.ModTime().Unix()
|
|
||||||
remoteModifiedTime := parsed.Unix()
|
|
||||||
|
|
||||||
if localModifiedTime < remoteModifiedTime {
|
|
||||||
logrus.Debug("file system cached recipe catalogue is out-of-date")
|
|
||||||
return false, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
logrus.Debug("file system cached recipe catalogue is up-to-date")
|
|
||||||
|
|
||||||
return true, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// ReadRecipeCatalogue reads the recipe catalogue.
|
|
||||||
func ReadRecipeCatalogue() (RecipeCatalogue, error) {
|
|
||||||
recipes := make(RecipeCatalogue)
|
|
||||||
|
|
||||||
recipeFSIsLatest, err := recipeCatalogueFSIsLatest()
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
if !recipeFSIsLatest {
|
|
||||||
logrus.Debugf("reading recipe catalogue from web to get latest")
|
|
||||||
if err := readRecipeCatalogueWeb(&recipes); err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
return recipes, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
logrus.Debugf("reading recipe catalogue from file system cache to get latest")
|
|
||||||
if err := readRecipeCatalogueFS(&recipes); err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
return recipes, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// readRecipeCatalogueFS reads the catalogue from the file system.
|
|
||||||
func readRecipeCatalogueFS(target interface{}) error {
|
|
||||||
recipesJSONFS, err := ioutil.ReadFile(config.APPS_JSON)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
if err := json.Unmarshal(recipesJSONFS, &target); err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
logrus.Debugf("read recipe catalogue from file system cache in '%s'", config.APPS_JSON)
|
|
||||||
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// readRecipeCatalogueWeb reads the catalogue from the web.
|
|
||||||
func readRecipeCatalogueWeb(target interface{}) error {
|
|
||||||
if err := web.ReadJSON(RecipeCatalogueURL, &target); err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
recipesJSON, err := json.MarshalIndent(target, "", " ")
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
if err := ioutil.WriteFile(config.APPS_JSON, recipesJSON, 0644); err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
logrus.Debugf("read recipe catalogue from web at '%s'", RecipeCatalogueURL)
|
|
||||||
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// VersionsOfService lists the version of a service.
|
|
||||||
func VersionsOfService(recipe, serviceName string) ([]string, error) {
|
|
||||||
catalogue, err := ReadRecipeCatalogue()
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
rec, ok := catalogue[recipe]
|
|
||||||
if !ok {
|
|
||||||
return nil, fmt.Errorf("recipe '%s' does not exist?", recipe)
|
|
||||||
}
|
|
||||||
|
|
||||||
versions := []string{}
|
|
||||||
alreadySeen := make(map[string]bool)
|
|
||||||
for _, serviceVersion := range rec.Versions {
|
|
||||||
for tag := range serviceVersion {
|
|
||||||
if _, ok := alreadySeen[tag]; !ok {
|
|
||||||
alreadySeen[tag] = true
|
|
||||||
versions = append(versions, tag)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
logrus.Debugf("detected versions '%s' for '%s'", strings.Join(versions, ", "), recipe)
|
|
||||||
|
|
||||||
return versions, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetRecipeMeta retrieves the recipe metadata from the recipe catalogue.
|
|
||||||
func GetRecipeMeta(recipeName string) (RecipeMeta, error) {
|
|
||||||
catl, err := ReadRecipeCatalogue()
|
|
||||||
if err != nil {
|
|
||||||
return RecipeMeta{}, err
|
|
||||||
}
|
|
||||||
|
|
||||||
recipeMeta, ok := catl[recipeName]
|
|
||||||
if !ok {
|
|
||||||
err := fmt.Errorf("recipe '%s' does not exist?", recipeName)
|
|
||||||
return RecipeMeta{}, err
|
|
||||||
}
|
|
||||||
|
|
||||||
if err := recipe.EnsureExists(recipeName); err != nil {
|
|
||||||
return RecipeMeta{}, err
|
|
||||||
}
|
|
||||||
|
|
||||||
logrus.Debugf("recipe metadata retrieved for '%s'", recipeName)
|
|
||||||
|
|
||||||
return recipeMeta, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// RepoMeta is a single recipe repo metadata.
|
|
||||||
type RepoMeta struct {
|
|
||||||
ID int `json:"id"`
|
|
||||||
Owner Owner
|
|
||||||
Name string `json:"name"`
|
|
||||||
FullName string `json:"full_name"`
|
|
||||||
Description string `json:"description"`
|
|
||||||
Empty bool `json:"empty"`
|
|
||||||
Private bool `json:"private"`
|
|
||||||
Fork bool `json:"fork"`
|
|
||||||
Template bool `json:"template"`
|
|
||||||
Parent interface{} `json:"parent"`
|
|
||||||
Mirror bool `json:"mirror"`
|
|
||||||
Size int `json:"size"`
|
|
||||||
HTMLURL string `json:"html_url"`
|
|
||||||
SSHURL string `json:"ssh_url"`
|
|
||||||
CloneURL string `json:"clone_url"`
|
|
||||||
OriginalURL string `json:"original_url"`
|
|
||||||
Website string `json:"website"`
|
|
||||||
StarsCount int `json:"stars_count"`
|
|
||||||
ForksCount int `json:"forks_count"`
|
|
||||||
WatchersCount int `json:"watchers_count"`
|
|
||||||
OpenIssuesCount int `json:"open_issues_count"`
|
|
||||||
OpenPRCount int `json:"open_pr_counter"`
|
|
||||||
ReleaseCounter int `json:"release_counter"`
|
|
||||||
DefaultBranch string `json:"default_branch"`
|
|
||||||
Archived bool `json:"archived"`
|
|
||||||
CreatedAt string `json:"created_at"`
|
|
||||||
UpdatedAt string `json:"updated_at"`
|
|
||||||
Permissions Permissions
|
|
||||||
HasIssues bool `json:"has_issues"`
|
|
||||||
InternalTracker InternalTracker
|
|
||||||
HasWiki bool `json:"has_wiki"`
|
|
||||||
HasPullRequests bool `json:"has_pull_requests"`
|
|
||||||
HasProjects bool `json:"has_projects"`
|
|
||||||
IgnoreWhitespaceConflicts bool `json:"ignore_whitespace_conflicts"`
|
|
||||||
AllowMergeCommits bool `json:"allow_merge_commits"`
|
|
||||||
AllowRebase bool `json:"allow_rebase"`
|
|
||||||
AllowRebaseExplicit bool `json:"allow_rebase_explicit"`
|
|
||||||
AllowSquashMerge bool `json:"allow_squash_merge"`
|
|
||||||
AvatarURL string `json:"avatar_url"`
|
|
||||||
Internal bool `json:"internal"`
|
|
||||||
MirrorInterval string `json:"mirror_interval"`
|
|
||||||
}
|
|
||||||
|
|
||||||
// Owner is the repo organisation owner metadata.
|
|
||||||
type Owner struct {
|
|
||||||
ID int `json:"id"`
|
|
||||||
Login string `json:"login"`
|
|
||||||
FullName string `json:"full_name"`
|
|
||||||
Email string `json:"email"`
|
|
||||||
AvatarURL string `json:"avatar_url"`
|
|
||||||
Language string `json:"language"`
|
|
||||||
IsAdmin bool `json:"is_admin"`
|
|
||||||
LastLogin string `json:"last_login"`
|
|
||||||
Created string `json:"created"`
|
|
||||||
Restricted bool `json:"restricted"`
|
|
||||||
Username string `json:"username"`
|
|
||||||
}
|
|
||||||
|
|
||||||
// Permissions is perms metadata for a repo.
|
|
||||||
type Permissions struct {
|
|
||||||
Admin bool `json:"admin"`
|
|
||||||
Push bool `json:"push"`
|
|
||||||
Pull bool `json:"pull"`
|
|
||||||
}
|
|
||||||
|
|
||||||
// InternalTracker is issue tracker metadata for a repo.
|
|
||||||
type InternalTracker struct {
|
|
||||||
EnableTimeTracker bool `json:"enable_time_tracker"`
|
|
||||||
AllowOnlyContributorsToTrackTime bool `json:"allow_only_contributors_to_track_time"`
|
|
||||||
EnableIssuesDependencies bool `json:"enable_issue_dependencies"`
|
|
||||||
}
|
|
||||||
|
|
||||||
// RepoCatalogue represents all the recipe repo metadata.
|
|
||||||
type RepoCatalogue map[string]RepoMeta
|
|
||||||
|
|
||||||
// ReadReposMetadata retrieves coop-cloud/... repo metadata from Gitea.
|
|
||||||
func ReadReposMetadata() (RepoCatalogue, error) {
|
|
||||||
reposMeta := make(RepoCatalogue)
|
|
||||||
|
|
||||||
pageIdx := 1
|
|
||||||
for {
|
|
||||||
var reposList []RepoMeta
|
|
||||||
|
|
||||||
pagedURL := fmt.Sprintf("%s?page=%v", ReposMetadataURL, pageIdx)
|
|
||||||
|
|
||||||
logrus.Debugf("fetching repo metadata from '%s'", pagedURL)
|
|
||||||
|
|
||||||
if err := web.ReadJSON(pagedURL, &reposList); err != nil {
|
|
||||||
return reposMeta, err
|
|
||||||
}
|
|
||||||
|
|
||||||
if len(reposList) == 0 {
|
|
||||||
break
|
|
||||||
}
|
|
||||||
|
|
||||||
for idx, repo := range reposList {
|
|
||||||
reposMeta[repo.Name] = reposList[idx]
|
|
||||||
}
|
|
||||||
|
|
||||||
pageIdx++
|
|
||||||
}
|
|
||||||
|
|
||||||
return reposMeta, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetRecipeVersions retrieves all recipe versions.
|
|
||||||
func GetRecipeVersions(recipeName string) (RecipeVersions, error) {
|
|
||||||
versions := RecipeVersions{}
|
|
||||||
|
|
||||||
recipeDir := path.Join(config.ABRA_DIR, "apps", recipeName)
|
|
||||||
|
|
||||||
logrus.Debugf("attempting to open git repository in '%s'", recipeDir)
|
|
||||||
|
|
||||||
repo, err := git.PlainOpen(recipeDir)
|
|
||||||
if err != nil {
|
|
||||||
return versions, err
|
|
||||||
}
|
|
||||||
|
|
||||||
worktree, err := repo.Worktree()
|
|
||||||
if err != nil {
|
|
||||||
logrus.Fatal(err)
|
|
||||||
}
|
|
||||||
|
|
||||||
gitTags, err := repo.Tags()
|
|
||||||
if err != nil {
|
|
||||||
return versions, err
|
|
||||||
}
|
|
||||||
|
|
||||||
if err := gitTags.ForEach(func(ref *plumbing.Reference) (err error) {
|
|
||||||
tag := strings.TrimPrefix(string(ref.Name()), "refs/tags/")
|
|
||||||
|
|
||||||
logrus.Debugf("processing '%s' for '%s'", tag, recipeName)
|
|
||||||
|
|
||||||
checkOutOpts := &git.CheckoutOptions{
|
|
||||||
Create: false,
|
|
||||||
Force: true,
|
|
||||||
Branch: plumbing.ReferenceName(ref.Name()),
|
|
||||||
}
|
|
||||||
if err := worktree.Checkout(checkOutOpts); err != nil {
|
|
||||||
logrus.Debugf("failed to check out '%s' in '%s'", tag, recipeDir)
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
logrus.Debugf("successfully checked out '%s' in '%s'", ref.Name(), recipeDir)
|
|
||||||
|
|
||||||
recipe, err := recipe.Get(recipeName)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
versionMeta := make(map[string]ServiceMeta)
|
|
||||||
for _, service := range recipe.Config.Services {
|
|
||||||
|
|
||||||
img, err := reference.ParseNormalizedNamed(service.Image)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
path := reference.Path(img)
|
|
||||||
if strings.Contains(path, "library") {
|
|
||||||
path = strings.Split(path, "/")[1]
|
|
||||||
}
|
|
||||||
|
|
||||||
digest, err := client.GetTagDigest(img)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
versionMeta[service.Name] = ServiceMeta{
|
|
||||||
Digest: digest,
|
|
||||||
Image: path,
|
|
||||||
Tag: img.(reference.NamedTagged).Tag(),
|
|
||||||
}
|
|
||||||
|
|
||||||
logrus.Debugf("collecting digest: '%s', image: '%s', tag: '%s'", digest, path, tag)
|
|
||||||
}
|
|
||||||
|
|
||||||
versions = append(versions, map[string]map[string]ServiceMeta{tag: versionMeta})
|
|
||||||
|
|
||||||
return nil
|
|
||||||
}); err != nil {
|
|
||||||
return versions, err
|
|
||||||
}
|
|
||||||
|
|
||||||
branch := "master"
|
|
||||||
if _, err := repo.Branch("master"); err != nil {
|
|
||||||
if _, err := repo.Branch("main"); err != nil {
|
|
||||||
logrus.Debugf("failed to select branch in '%s'", recipeDir)
|
|
||||||
logrus.Fatal(err)
|
|
||||||
}
|
|
||||||
branch = "main"
|
|
||||||
}
|
|
||||||
|
|
||||||
refName := fmt.Sprintf("refs/heads/%s", branch)
|
|
||||||
checkOutOpts := &git.CheckoutOptions{
|
|
||||||
Create: false,
|
|
||||||
Force: true,
|
|
||||||
Branch: plumbing.ReferenceName(refName),
|
|
||||||
}
|
|
||||||
if err := worktree.Checkout(checkOutOpts); err != nil {
|
|
||||||
logrus.Debugf("failed to check out '%s' in '%s'", branch, recipeDir)
|
|
||||||
logrus.Fatal(err)
|
|
||||||
}
|
|
||||||
|
|
||||||
logrus.Debugf("switched back to '%s' in '%s'", branch, recipeDir)
|
|
||||||
logrus.Debugf("collected '%s' for '%s'", versions, recipeName)
|
|
||||||
|
|
||||||
return versions, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetRecipeCatalogueVersions list the recipe versions listed in the recipe catalogue.
|
|
||||||
func GetRecipeCatalogueVersions(recipeName string) ([]string, error) {
|
|
||||||
var versions []string
|
|
||||||
|
|
||||||
catl, err := ReadRecipeCatalogue()
|
|
||||||
if err != nil {
|
|
||||||
return versions, err
|
|
||||||
}
|
|
||||||
|
|
||||||
if recipeMeta, exists := catl[recipeName]; exists {
|
|
||||||
for _, versionMeta := range recipeMeta.Versions {
|
|
||||||
for tag := range versionMeta {
|
|
||||||
versions = append(versions, tag)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return versions, nil
|
|
||||||
}
|
|
|
@ -27,7 +27,11 @@ func New(contextName string) (*client.Client, error) {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
helper := commandconnPkg.NewConnectionHelper(ctxEndpoint)
|
helper, err := commandconnPkg.NewConnectionHelper(ctxEndpoint)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
httpClient := &http.Client{
|
httpClient := &http.Client{
|
||||||
// No tls, no proxy
|
// No tls, no proxy
|
||||||
Transport: &http.Transport{
|
Transport: &http.Transport{
|
||||||
|
@ -55,7 +59,7 @@ func New(contextName string) (*client.Client, error) {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
logrus.Debugf("created client for '%s'", contextName)
|
logrus.Debugf("created client for %s", contextName)
|
||||||
|
|
||||||
return cl, nil
|
return cl, nil
|
||||||
}
|
}
|
||||||
|
|
|
@ -26,7 +26,7 @@ func CreateContext(contextName string, user string, port string) error {
|
||||||
if err := createContext(contextName, host); err != nil {
|
if err := createContext(contextName, host); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
logrus.Debugf("created the '%s' context", contextName)
|
logrus.Debugf("created the %s context", contextName)
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -72,8 +72,6 @@ func DeleteContext(name string) error {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
// remove any context that might be loaded
|
|
||||||
// TODO: Check if the context we are removing is the active one rather than doing it all the time
|
|
||||||
cfg := dConfig.LoadDefaultConfigFile(nil)
|
cfg := dConfig.LoadDefaultConfigFile(nil)
|
||||||
cfg.CurrentContext = ""
|
cfg.CurrentContext = ""
|
||||||
if err := cfg.Save(); err != nil {
|
if err := cfg.Save(); err != nil {
|
||||||
|
|
|
@ -1,170 +1,57 @@
|
||||||
package client
|
package client
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"encoding/json"
|
"context"
|
||||||
"fmt"
|
"fmt"
|
||||||
"io/ioutil"
|
|
||||||
"net/http"
|
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
"coopcloud.tech/abra/pkg/web"
|
"github.com/containers/image/docker"
|
||||||
|
"github.com/containers/image/types"
|
||||||
"github.com/docker/distribution/reference"
|
"github.com/docker/distribution/reference"
|
||||||
|
"github.com/docker/docker/client"
|
||||||
|
"github.com/sirupsen/logrus"
|
||||||
)
|
)
|
||||||
|
|
||||||
type RawTag struct {
|
// GetRegistryTags retrieves all tags of an image from a container registry.
|
||||||
Layer string
|
func GetRegistryTags(img reference.Named) ([]string, error) {
|
||||||
Name string
|
var tags []string
|
||||||
}
|
|
||||||
|
|
||||||
type RawTags []RawTag
|
ref, err := docker.ParseReference(fmt.Sprintf("//%s", img))
|
||||||
|
if err != nil {
|
||||||
|
return tags, fmt.Errorf("failed to parse image %s, saw: %s", img, err.Error())
|
||||||
|
}
|
||||||
|
|
||||||
var registryURL = "https://registry.hub.docker.com/v1/repositories/%s/tags"
|
ctx := context.Background()
|
||||||
|
tags, err = docker.GetRepositoryTags(ctx, &types.SystemContext{}, ref)
|
||||||
func GetRegistryTags(image string) (RawTags, error) {
|
if err != nil {
|
||||||
var tags RawTags
|
|
||||||
|
|
||||||
tagsUrl := fmt.Sprintf(registryURL, image)
|
|
||||||
if err := web.ReadJSON(tagsUrl, &tags); err != nil {
|
|
||||||
return tags, err
|
return tags, err
|
||||||
}
|
}
|
||||||
|
|
||||||
return tags, nil
|
return tags, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// getRegv2Token retrieves a registry v2 authentication token.
|
// GetTagDigest retrieves an image digest from a container registry.
|
||||||
func getRegv2Token(image reference.Named) (string, error) {
|
func GetTagDigest(cl *client.Client, image reference.Named) (string, error) {
|
||||||
img := reference.Path(image)
|
target := fmt.Sprintf("//%s", reference.Path(image))
|
||||||
authTokenURL := fmt.Sprintf("https://auth.docker.io/token?service=registry.docker.io&scope=repository:%s:pull", img)
|
|
||||||
req, err := http.NewRequest("GET", authTokenURL, nil)
|
ref, err := docker.ParseReference(target)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return "", err
|
return "", fmt.Errorf("failed to parse image %s, saw: %s", image, err.Error())
|
||||||
}
|
}
|
||||||
|
|
||||||
client := &http.Client{Timeout: web.Timeout}
|
ctx := context.Background()
|
||||||
res, err := client.Do(req)
|
img, err := ref.NewImage(ctx, nil)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return "", err
|
logrus.Debugf("failed to query remote registry for %s, saw: %s", image, err.Error())
|
||||||
|
return "", fmt.Errorf("unable to read digest for %s", image)
|
||||||
}
|
}
|
||||||
defer res.Body.Close()
|
defer img.Close()
|
||||||
|
|
||||||
if res.StatusCode != http.StatusOK {
|
digest := img.ConfigInfo().Digest.String()
|
||||||
_, err := ioutil.ReadAll(res.Body)
|
|
||||||
if err != nil {
|
|
||||||
return "", err
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
body, err := ioutil.ReadAll(res.Body)
|
|
||||||
if err != nil {
|
|
||||||
return "", nil
|
|
||||||
}
|
|
||||||
|
|
||||||
tokenRes := struct {
|
|
||||||
Token string
|
|
||||||
Expiry string
|
|
||||||
Issued string
|
|
||||||
}{}
|
|
||||||
|
|
||||||
if err := json.Unmarshal(body, &tokenRes); err != nil {
|
|
||||||
return "", err
|
|
||||||
}
|
|
||||||
|
|
||||||
return tokenRes.Token, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetTagDigest retrieves an image digest from a v2 registry
|
|
||||||
func GetTagDigest(image reference.Named) (string, error) {
|
|
||||||
img := reference.Path(image)
|
|
||||||
tag := image.(reference.NamedTagged).Tag()
|
|
||||||
manifestURL := fmt.Sprintf("https://index.docker.io/v2/%s/manifests/%s", img, tag)
|
|
||||||
|
|
||||||
req, err := http.NewRequest("GET", manifestURL, nil)
|
|
||||||
if err != nil {
|
|
||||||
return "", err
|
|
||||||
}
|
|
||||||
|
|
||||||
token, err := getRegv2Token(image)
|
|
||||||
if err != nil {
|
|
||||||
return "", err
|
|
||||||
}
|
|
||||||
|
|
||||||
req.Header = http.Header{
|
|
||||||
"Accept": []string{
|
|
||||||
"application/vnd.docker.distribution.manifest.v2+json",
|
|
||||||
"application/vnd.docker.distribution.manifest.list.v2+json",
|
|
||||||
},
|
|
||||||
"Authorization": []string{fmt.Sprintf("Bearer %s", token)},
|
|
||||||
}
|
|
||||||
|
|
||||||
client := &http.Client{Timeout: web.Timeout}
|
|
||||||
res, err := client.Do(req)
|
|
||||||
if err != nil {
|
|
||||||
return "", err
|
|
||||||
}
|
|
||||||
defer res.Body.Close()
|
|
||||||
|
|
||||||
if res.StatusCode != http.StatusOK {
|
|
||||||
_, err := ioutil.ReadAll(res.Body)
|
|
||||||
if err != nil {
|
|
||||||
return "", err
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
body, err := ioutil.ReadAll(res.Body)
|
|
||||||
if err != nil {
|
|
||||||
return "", err
|
|
||||||
}
|
|
||||||
|
|
||||||
registryResT1 := struct {
|
|
||||||
SchemaVersion int
|
|
||||||
MediaType string
|
|
||||||
Manifests []struct {
|
|
||||||
MediaType string
|
|
||||||
Size int
|
|
||||||
Digest string
|
|
||||||
Platform struct {
|
|
||||||
Architecture string
|
|
||||||
Os string
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}{}
|
|
||||||
|
|
||||||
registryResT2 := struct {
|
|
||||||
SchemaVersion int
|
|
||||||
MediaType string
|
|
||||||
Config struct {
|
|
||||||
MediaType string
|
|
||||||
Size int
|
|
||||||
Digest string
|
|
||||||
}
|
|
||||||
Layers []struct {
|
|
||||||
MediaType string
|
|
||||||
Size int
|
|
||||||
Digest string
|
|
||||||
}
|
|
||||||
}{}
|
|
||||||
|
|
||||||
if err := json.Unmarshal(body, ®istryResT1); err != nil {
|
|
||||||
return "", err
|
|
||||||
}
|
|
||||||
|
|
||||||
var digest string
|
|
||||||
for _, manifest := range registryResT1.Manifests {
|
|
||||||
if string(manifest.Platform.Architecture) == "amd64" {
|
|
||||||
digest = strings.Split(manifest.Digest, ":")[1][:7]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if digest == "" {
|
if digest == "" {
|
||||||
if err := json.Unmarshal(body, ®istryResT2); err != nil {
|
return digest, fmt.Errorf("unable to read digest for %s", image)
|
||||||
return "", err
|
|
||||||
}
|
|
||||||
digest = strings.Split(registryResT2.Config.Digest, ":")[1][:7]
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if digest == "" {
|
return strings.Split(digest, ":")[1][:7], nil
|
||||||
return "", fmt.Errorf("Unable to retrieve amd64 digest for '%s'", image)
|
|
||||||
}
|
|
||||||
|
|
||||||
return digest, nil
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -5,11 +5,9 @@ import (
|
||||||
|
|
||||||
"github.com/docker/docker/api/types"
|
"github.com/docker/docker/api/types"
|
||||||
"github.com/docker/docker/api/types/filters"
|
"github.com/docker/docker/api/types/filters"
|
||||||
"github.com/sirupsen/logrus"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
func GetVolumes(ctx context.Context, server string, appName string) ([]*types.Volume, error) {
|
func GetVolumes(ctx context.Context, server string, appName string) ([]*types.Volume, error) {
|
||||||
|
|
||||||
cl, err := New(server)
|
cl, err := New(server)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
|
@ -21,7 +19,7 @@ func GetVolumes(ctx context.Context, server string, appName string) ([]*types.Vo
|
||||||
volumeListOKBody, err := cl.VolumeList(ctx, fs)
|
volumeListOKBody, err := cl.VolumeList(ctx, fs)
|
||||||
volumeList := volumeListOKBody.Volumes
|
volumeList := volumeListOKBody.Volumes
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logrus.Fatal(err)
|
return volumeList, err
|
||||||
}
|
}
|
||||||
|
|
||||||
return volumeList, nil
|
return volumeList, nil
|
||||||
|
@ -29,9 +27,11 @@ func GetVolumes(ctx context.Context, server string, appName string) ([]*types.Vo
|
||||||
|
|
||||||
func GetVolumeNames(volumes []*types.Volume) []string {
|
func GetVolumeNames(volumes []*types.Volume) []string {
|
||||||
var volumeNames []string
|
var volumeNames []string
|
||||||
|
|
||||||
for _, vol := range volumes {
|
for _, vol := range volumes {
|
||||||
volumeNames = append(volumeNames, vol.Name)
|
volumeNames = append(volumeNames, vol.Name)
|
||||||
}
|
}
|
||||||
|
|
||||||
return volumeNames
|
return volumeNames
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -40,12 +40,13 @@ func RemoveVolumes(ctx context.Context, server string, volumeNames []string, for
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
for _, volName := range volumeNames {
|
for _, volName := range volumeNames {
|
||||||
err := cl.VolumeRemove(ctx, volName, force)
|
err := cl.VolumeRemove(ctx, volName, force)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return nil
|
|
||||||
|
|
||||||
|
return nil
|
||||||
}
|
}
|
||||||
|
|
|
@ -8,6 +8,7 @@ import (
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
"coopcloud.tech/abra/pkg/config"
|
"coopcloud.tech/abra/pkg/config"
|
||||||
|
"coopcloud.tech/abra/pkg/formatter"
|
||||||
"coopcloud.tech/abra/pkg/upstream/stack"
|
"coopcloud.tech/abra/pkg/upstream/stack"
|
||||||
loader "coopcloud.tech/abra/pkg/upstream/stack"
|
loader "coopcloud.tech/abra/pkg/upstream/stack"
|
||||||
composetypes "github.com/docker/cli/cli/compose/types"
|
composetypes "github.com/docker/cli/cli/compose/types"
|
||||||
|
@ -16,26 +17,26 @@ import (
|
||||||
)
|
)
|
||||||
|
|
||||||
// UpdateTag updates an image tag in-place on file system local compose files.
|
// UpdateTag updates an image tag in-place on file system local compose files.
|
||||||
func UpdateTag(pattern, image, tag, recipeName string) error {
|
func UpdateTag(pattern, image, tag, recipeName string) (bool, error) {
|
||||||
composeFiles, err := filepath.Glob(pattern)
|
composeFiles, err := filepath.Glob(pattern)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return false, err
|
||||||
}
|
}
|
||||||
|
|
||||||
logrus.Debugf("considering '%s' config(s) for tag update", strings.Join(composeFiles, ", "))
|
logrus.Debugf("considering %s config(s) for tag update", strings.Join(composeFiles, ", "))
|
||||||
|
|
||||||
for _, composeFile := range composeFiles {
|
for _, composeFile := range composeFiles {
|
||||||
opts := stack.Deploy{Composefiles: []string{composeFile}}
|
opts := stack.Deploy{Composefiles: []string{composeFile}}
|
||||||
|
|
||||||
envSamplePath := path.Join(config.ABRA_DIR, "apps", recipeName, ".env.sample")
|
envSamplePath := path.Join(config.RECIPES_DIR, recipeName, ".env.sample")
|
||||||
sampleEnv, err := config.ReadEnv(envSamplePath)
|
sampleEnv, err := config.ReadEnv(envSamplePath)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return false, err
|
||||||
}
|
}
|
||||||
|
|
||||||
compose, err := loader.LoadComposefile(opts, sampleEnv)
|
compose, err := loader.LoadComposefile(opts, sampleEnv)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return false, err
|
||||||
}
|
}
|
||||||
|
|
||||||
for _, service := range compose.Services {
|
for _, service := range compose.Services {
|
||||||
|
@ -45,40 +46,42 @@ func UpdateTag(pattern, image, tag, recipeName string) error {
|
||||||
|
|
||||||
img, _ := reference.ParseNormalizedNamed(service.Image)
|
img, _ := reference.ParseNormalizedNamed(service.Image)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return false, err
|
||||||
}
|
}
|
||||||
|
|
||||||
composeImage := reference.Path(img)
|
var composeTag string
|
||||||
if strings.Contains(composeImage, "library") {
|
switch img.(type) {
|
||||||
// ParseNormalizedNamed prepends 'library' to images like nginx:<tag>,
|
case reference.NamedTagged:
|
||||||
// postgres:<tag>, i.e. images which do not have a username in the
|
composeTag = img.(reference.NamedTagged).Tag()
|
||||||
// first position of the string
|
default:
|
||||||
composeImage = strings.Split(composeImage, "/")[1]
|
logrus.Debugf("unable to parse %s, skipping", img)
|
||||||
|
continue
|
||||||
}
|
}
|
||||||
composeTag := img.(reference.NamedTagged).Tag()
|
|
||||||
|
|
||||||
logrus.Debugf("parsed '%s' from '%s'", composeTag, service.Image)
|
composeImage := formatter.StripTagMeta(reference.Path(img))
|
||||||
|
|
||||||
|
logrus.Debugf("parsed %s from %s", composeTag, service.Image)
|
||||||
|
|
||||||
if image == composeImage {
|
if image == composeImage {
|
||||||
bytes, err := ioutil.ReadFile(composeFile)
|
bytes, err := ioutil.ReadFile(composeFile)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return false, err
|
||||||
}
|
}
|
||||||
|
|
||||||
old := fmt.Sprintf("%s:%s", composeImage, composeTag)
|
old := fmt.Sprintf("%s:%s", composeImage, composeTag)
|
||||||
new := fmt.Sprintf("%s:%s", composeImage, tag)
|
new := fmt.Sprintf("%s:%s", composeImage, tag)
|
||||||
replacedBytes := strings.Replace(string(bytes), old, new, -1)
|
replacedBytes := strings.Replace(string(bytes), old, new, -1)
|
||||||
|
|
||||||
logrus.Debugf("updating '%s' to '%s' in '%s'", old, new, compose.Filename)
|
logrus.Debugf("updating %s to %s in %s", old, new, compose.Filename)
|
||||||
|
|
||||||
if err := ioutil.WriteFile(compose.Filename, []byte(replacedBytes), 0644); err != nil {
|
if err := ioutil.WriteFile(compose.Filename, []byte(replacedBytes), 0764); err != nil {
|
||||||
return err
|
return false, err
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return nil
|
return false, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// UpdateLabel updates a label in-place on file system local compose files.
|
// UpdateLabel updates a label in-place on file system local compose files.
|
||||||
|
@ -88,12 +91,12 @@ func UpdateLabel(pattern, serviceName, label, recipeName string) error {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
logrus.Debugf("considering '%s' config(s) for label update", strings.Join(composeFiles, ", "))
|
logrus.Debugf("considering %s config(s) for label update", strings.Join(composeFiles, ", "))
|
||||||
|
|
||||||
for _, composeFile := range composeFiles {
|
for _, composeFile := range composeFiles {
|
||||||
opts := stack.Deploy{Composefiles: []string{composeFile}}
|
opts := stack.Deploy{Composefiles: []string{composeFile}}
|
||||||
|
|
||||||
envSamplePath := path.Join(config.ABRA_DIR, "apps", recipeName, ".env.sample")
|
envSamplePath := path.Join(config.RECIPES_DIR, recipeName, ".env.sample")
|
||||||
sampleEnv, err := config.ReadEnv(envSamplePath)
|
sampleEnv, err := config.ReadEnv(envSamplePath)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
|
@ -130,19 +133,25 @@ func UpdateLabel(pattern, serviceName, label, recipeName string) error {
|
||||||
old := fmt.Sprintf("coop-cloud.${STACK_NAME}.version=%s", value)
|
old := fmt.Sprintf("coop-cloud.${STACK_NAME}.version=%s", value)
|
||||||
replacedBytes := strings.Replace(string(bytes), old, label, -1)
|
replacedBytes := strings.Replace(string(bytes), old, label, -1)
|
||||||
|
|
||||||
|
if old == label {
|
||||||
|
logrus.Warnf("%s is already set, nothing to do?", label)
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
logrus.Debugf("updating %s to %s in %s", old, label, compose.Filename)
|
logrus.Debugf("updating %s to %s in %s", old, label, compose.Filename)
|
||||||
|
|
||||||
if err := ioutil.WriteFile(compose.Filename, []byte(replacedBytes), 0644); err != nil {
|
if err := ioutil.WriteFile(compose.Filename, []byte(replacedBytes), 0764); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
logrus.Infof("synced label %s to service %s", label, serviceName)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if !discovered {
|
if !discovered {
|
||||||
logrus.Warn("no existing label found, cannot continue...")
|
logrus.Warn("no existing label found, automagic insertion not supported yet")
|
||||||
logrus.Fatalf("add '%s' manually, automagic insertion not supported yet", label)
|
logrus.Fatalf("add '- \"%s\"' manually to the 'app' service in %s", label, composeFile)
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
|
|
|
@ -1,15 +1,14 @@
|
||||||
package config
|
package config
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"errors"
|
|
||||||
"fmt"
|
"fmt"
|
||||||
|
"html/template"
|
||||||
"io/ioutil"
|
"io/ioutil"
|
||||||
"os"
|
"os"
|
||||||
"path"
|
"path"
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
"coopcloud.tech/abra/cli/formatter"
|
"coopcloud.tech/abra/pkg/formatter"
|
||||||
"coopcloud.tech/abra/pkg/ssh"
|
|
||||||
"coopcloud.tech/abra/pkg/upstream/convert"
|
"coopcloud.tech/abra/pkg/upstream/convert"
|
||||||
loader "coopcloud.tech/abra/pkg/upstream/stack"
|
loader "coopcloud.tech/abra/pkg/upstream/stack"
|
||||||
stack "coopcloud.tech/abra/pkg/upstream/stack"
|
stack "coopcloud.tech/abra/pkg/upstream/stack"
|
||||||
|
@ -37,25 +36,33 @@ type AppFiles map[AppName]AppFile
|
||||||
// App reprents an app with its env file read into memory
|
// App reprents an app with its env file read into memory
|
||||||
type App struct {
|
type App struct {
|
||||||
Name AppName
|
Name AppName
|
||||||
Type string
|
Recipe string
|
||||||
Domain string
|
Domain string
|
||||||
Env AppEnv
|
Env AppEnv
|
||||||
Server string
|
Server string
|
||||||
Path string
|
Path string
|
||||||
}
|
}
|
||||||
|
|
||||||
// StackName gets what the docker safe stack name is for the app
|
// StackName gets what the docker safe stack name is for the app. This should
|
||||||
|
// not not shown to the user, use a.Name for that. Give the output of this
|
||||||
|
// command to Docker only.
|
||||||
func (a App) StackName() string {
|
func (a App) StackName() string {
|
||||||
if _, exists := a.Env["STACK_NAME"]; exists {
|
if _, exists := a.Env["STACK_NAME"]; exists {
|
||||||
return a.Env["STACK_NAME"]
|
return a.Env["STACK_NAME"]
|
||||||
}
|
}
|
||||||
|
|
||||||
stackName := SanitiseAppName(a.Name)
|
stackName := SanitiseAppName(a.Name)
|
||||||
|
|
||||||
|
if len(stackName) > 45 {
|
||||||
|
logrus.Debugf("trimming %s to %s to avoid runtime limits", stackName, stackName[:45])
|
||||||
|
stackName = stackName[:45]
|
||||||
|
}
|
||||||
|
|
||||||
a.Env["STACK_NAME"] = stackName
|
a.Env["STACK_NAME"] = stackName
|
||||||
|
|
||||||
return stackName
|
return stackName
|
||||||
}
|
}
|
||||||
|
|
||||||
// SORTING TYPES
|
|
||||||
|
|
||||||
// ByServer sort a slice of Apps
|
// ByServer sort a slice of Apps
|
||||||
type ByServer []App
|
type ByServer []App
|
||||||
|
|
||||||
|
@ -65,25 +72,25 @@ func (a ByServer) Less(i, j int) bool {
|
||||||
return strings.ToLower(a[i].Server) < strings.ToLower(a[j].Server)
|
return strings.ToLower(a[i].Server) < strings.ToLower(a[j].Server)
|
||||||
}
|
}
|
||||||
|
|
||||||
// ByServerAndType sort a slice of Apps
|
// ByServerAndRecipe sort a slice of Apps
|
||||||
type ByServerAndType []App
|
type ByServerAndRecipe []App
|
||||||
|
|
||||||
func (a ByServerAndType) Len() int { return len(a) }
|
func (a ByServerAndRecipe) Len() int { return len(a) }
|
||||||
func (a ByServerAndType) Swap(i, j int) { a[i], a[j] = a[j], a[i] }
|
func (a ByServerAndRecipe) Swap(i, j int) { a[i], a[j] = a[j], a[i] }
|
||||||
func (a ByServerAndType) Less(i, j int) bool {
|
func (a ByServerAndRecipe) Less(i, j int) bool {
|
||||||
if a[i].Server == a[j].Server {
|
if a[i].Server == a[j].Server {
|
||||||
return strings.ToLower(a[i].Type) < strings.ToLower(a[j].Type)
|
return strings.ToLower(a[i].Recipe) < strings.ToLower(a[j].Recipe)
|
||||||
}
|
}
|
||||||
return strings.ToLower(a[i].Server) < strings.ToLower(a[j].Server)
|
return strings.ToLower(a[i].Server) < strings.ToLower(a[j].Server)
|
||||||
}
|
}
|
||||||
|
|
||||||
// ByType sort a slice of Apps
|
// ByRecipe sort a slice of Apps
|
||||||
type ByType []App
|
type ByRecipe []App
|
||||||
|
|
||||||
func (a ByType) Len() int { return len(a) }
|
func (a ByRecipe) Len() int { return len(a) }
|
||||||
func (a ByType) Swap(i, j int) { a[i], a[j] = a[j], a[i] }
|
func (a ByRecipe) Swap(i, j int) { a[i], a[j] = a[j], a[i] }
|
||||||
func (a ByType) Less(i, j int) bool {
|
func (a ByRecipe) Less(i, j int) bool {
|
||||||
return strings.ToLower(a[i].Type) < strings.ToLower(a[j].Type)
|
return strings.ToLower(a[i].Recipe) < strings.ToLower(a[j].Recipe)
|
||||||
}
|
}
|
||||||
|
|
||||||
// ByName sort a slice of Apps
|
// ByName sort a slice of Apps
|
||||||
|
@ -98,14 +105,14 @@ func (a ByName) Less(i, j int) bool {
|
||||||
func readAppEnvFile(appFile AppFile, name AppName) (App, error) {
|
func readAppEnvFile(appFile AppFile, name AppName) (App, error) {
|
||||||
env, err := ReadEnv(appFile.Path)
|
env, err := ReadEnv(appFile.Path)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return App{}, fmt.Errorf("env file for '%s' couldn't be read: %s", name, err.Error())
|
return App{}, fmt.Errorf("env file for %s couldn't be read: %s", name, err.Error())
|
||||||
}
|
}
|
||||||
|
|
||||||
logrus.Debugf("read env '%s' from '%s'", env, appFile.Path)
|
logrus.Debugf("read env %s from %s", env, appFile.Path)
|
||||||
|
|
||||||
app, err := newApp(env, name, appFile)
|
app, err := newApp(env, name, appFile)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return App{}, fmt.Errorf("env file for '%s' has issues: %s", name, err.Error())
|
return App{}, fmt.Errorf("env file for %s has issues: %s", name, err.Error())
|
||||||
}
|
}
|
||||||
|
|
||||||
return app, nil
|
return app, nil
|
||||||
|
@ -113,17 +120,20 @@ func readAppEnvFile(appFile AppFile, name AppName) (App, error) {
|
||||||
|
|
||||||
// newApp creates new App object
|
// newApp creates new App object
|
||||||
func newApp(env AppEnv, name string, appFile AppFile) (App, error) {
|
func newApp(env AppEnv, name string, appFile AppFile) (App, error) {
|
||||||
// Checking for type as it is required - apps wont work without it
|
|
||||||
domain := env["DOMAIN"]
|
domain := env["DOMAIN"]
|
||||||
apptype, ok := env["TYPE"]
|
|
||||||
if !ok {
|
recipe, exists := env["RECIPE"]
|
||||||
return App{}, errors.New("missing TYPE variable")
|
if !exists {
|
||||||
|
recipe, exists = env["TYPE"]
|
||||||
|
if !exists {
|
||||||
|
return App{}, fmt.Errorf("%s is missing the RECIPE env var", name)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return App{
|
return App{
|
||||||
Name: name,
|
Name: name,
|
||||||
Domain: domain,
|
Domain: domain,
|
||||||
Type: apptype,
|
Recipe: recipe,
|
||||||
Env: env,
|
Env: env,
|
||||||
Server: appFile.Server,
|
Server: appFile.Server,
|
||||||
Path: appFile.Path,
|
Path: appFile.Path,
|
||||||
|
@ -137,28 +147,24 @@ func LoadAppFiles(servers ...string) (AppFiles, error) {
|
||||||
if servers[0] == "" {
|
if servers[0] == "" {
|
||||||
// Empty servers flag, one string will always be passed
|
// Empty servers flag, one string will always be passed
|
||||||
var err error
|
var err error
|
||||||
servers, err = getAllFoldersInDirectory(ABRA_SERVER_FOLDER)
|
servers, err = GetAllFoldersInDirectory(SERVERS_DIR)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
logrus.Debugf("collecting metadata from '%v' servers: '%s'", len(servers), strings.Join(servers, ", "))
|
logrus.Debugf("collecting metadata from %v servers: %s", len(servers), strings.Join(servers, ", "))
|
||||||
|
|
||||||
if err := EnsureHostKeysAllServers(servers...); err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
for _, server := range servers {
|
for _, server := range servers {
|
||||||
serverDir := path.Join(ABRA_SERVER_FOLDER, server)
|
serverDir := path.Join(SERVERS_DIR, server)
|
||||||
files, err := getAllFilesInDirectory(serverDir)
|
files, err := getAllFilesInDirectory(serverDir)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, fmt.Errorf("server %s doesn't exist? Run \"abra server ls\" to check", server)
|
||||||
}
|
}
|
||||||
for _, file := range files {
|
for _, file := range files {
|
||||||
appName := strings.TrimSuffix(file.Name(), ".env")
|
appName := strings.TrimSuffix(file.Name(), ".env")
|
||||||
appFilePath := path.Join(ABRA_SERVER_FOLDER, server, file.Name())
|
appFilePath := path.Join(SERVERS_DIR, server, file.Name())
|
||||||
appFiles[appName] = AppFile{
|
appFiles[appName] = AppFile{
|
||||||
Path: appFilePath,
|
Path: appFilePath,
|
||||||
Server: server,
|
Server: server,
|
||||||
|
@ -174,7 +180,7 @@ func LoadAppFiles(servers ...string) (AppFiles, error) {
|
||||||
func GetApp(apps AppFiles, name AppName) (App, error) {
|
func GetApp(apps AppFiles, name AppName) (App, error) {
|
||||||
appFile, exists := apps[name]
|
appFile, exists := apps[name]
|
||||||
if !exists {
|
if !exists {
|
||||||
return App{}, fmt.Errorf("cannot find app with name '%s'", name)
|
return App{}, fmt.Errorf("cannot find app with name %s", name)
|
||||||
}
|
}
|
||||||
|
|
||||||
app, err := readAppEnvFile(appFile, name)
|
app, err := readAppEnvFile(appFile, name)
|
||||||
|
@ -214,13 +220,13 @@ func GetAppServiceNames(appName string) ([]string, error) {
|
||||||
return serviceNames, err
|
return serviceNames, err
|
||||||
}
|
}
|
||||||
|
|
||||||
composeFiles, err := GetAppComposeFiles(app.Type, app.Env)
|
composeFiles, err := GetAppComposeFiles(app.Recipe, app.Env)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return serviceNames, err
|
return serviceNames, err
|
||||||
}
|
}
|
||||||
|
|
||||||
opts := stack.Deploy{Composefiles: composeFiles}
|
opts := stack.Deploy{Composefiles: composeFiles}
|
||||||
compose, err := GetAppComposeConfig(app.Type, opts, app.Env)
|
compose, err := GetAppComposeConfig(app.Recipe, opts, app.Env)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return serviceNames, err
|
return serviceNames, err
|
||||||
}
|
}
|
||||||
|
@ -254,27 +260,39 @@ func GetAppNames() ([]string, error) {
|
||||||
}
|
}
|
||||||
|
|
||||||
// TemplateAppEnvSample copies the example env file for the app into the users env files
|
// TemplateAppEnvSample copies the example env file for the app into the users env files
|
||||||
func TemplateAppEnvSample(appType, appName, server, domain, recipe string) error {
|
func TemplateAppEnvSample(recipeName, appName, server, domain string) error {
|
||||||
envSamplePath := path.Join(ABRA_DIR, "apps", appType, ".env.sample")
|
envSamplePath := path.Join(RECIPES_DIR, recipeName, ".env.sample")
|
||||||
envSample, err := ioutil.ReadFile(envSamplePath)
|
envSample, err := ioutil.ReadFile(envSamplePath)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
appEnvPath := path.Join(ABRA_DIR, "servers", server, fmt.Sprintf("%s.env", appName))
|
appEnvPath := path.Join(ABRA_DIR, "servers", server, fmt.Sprintf("%s.env", appName))
|
||||||
if _, err := os.Stat(appEnvPath); err == nil {
|
if _, err := os.Stat(appEnvPath); os.IsExist(err) {
|
||||||
return fmt.Errorf("%s already exists?", appEnvPath)
|
return fmt.Errorf("%s already exists?", appEnvPath)
|
||||||
}
|
}
|
||||||
|
|
||||||
envSample = []byte(strings.Replace(string(envSample), fmt.Sprintf("%s.example.com", recipe), domain, -1))
|
err = ioutil.WriteFile(appEnvPath, envSample, 0664)
|
||||||
envSample = []byte(strings.Replace(string(envSample), "example.com", domain, -1))
|
|
||||||
|
|
||||||
err = ioutil.WriteFile(appEnvPath, envSample, 0755)
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
logrus.Debugf("copied '%s' to '%s'", envSamplePath, appEnvPath)
|
file, err := os.OpenFile(appEnvPath, os.O_RDWR, 0664)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
defer file.Close()
|
||||||
|
|
||||||
|
tpl, err := template.ParseFiles(appEnvPath)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := tpl.Execute(file, struct{ Name string }{recipeName}); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
logrus.Debugf("copied & templated %s to %s", envSamplePath, appEnvPath)
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
@ -320,9 +338,6 @@ func GetAppStatuses(appFiles AppFiles) (map[string]map[string]string, error) {
|
||||||
if version, ok := service.Spec.Labels[labelKey]; ok {
|
if version, ok := service.Spec.Labels[labelKey]; ok {
|
||||||
result["version"] = version
|
result["version"] = version
|
||||||
} else {
|
} else {
|
||||||
//FIXME: we only need to check containers with the version label not
|
|
||||||
// every single container and then skip when we see no label perf gains
|
|
||||||
// to be had here
|
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -330,7 +345,7 @@ func GetAppStatuses(appFiles AppFiles) (map[string]map[string]string, error) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
logrus.Debugf("retrieved app statuses: '%s'", statuses)
|
logrus.Debugf("retrieved app statuses: %s", statuses)
|
||||||
|
|
||||||
return statuses, nil
|
return statuses, nil
|
||||||
}
|
}
|
||||||
|
@ -342,20 +357,20 @@ func GetAppComposeFiles(recipe string, appEnv AppEnv) ([]string, error) {
|
||||||
|
|
||||||
if _, ok := appEnv["COMPOSE_FILE"]; !ok {
|
if _, ok := appEnv["COMPOSE_FILE"]; !ok {
|
||||||
logrus.Debug("no COMPOSE_FILE detected, loading compose.yml")
|
logrus.Debug("no COMPOSE_FILE detected, loading compose.yml")
|
||||||
path := fmt.Sprintf("%s/%s/compose.yml", APPS_DIR, recipe)
|
path := fmt.Sprintf("%s/%s/compose.yml", RECIPES_DIR, recipe)
|
||||||
composeFiles = append(composeFiles, path)
|
composeFiles = append(composeFiles, path)
|
||||||
return composeFiles, nil
|
return composeFiles, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
composeFileEnvVar := appEnv["COMPOSE_FILE"]
|
composeFileEnvVar := appEnv["COMPOSE_FILE"]
|
||||||
envVars := strings.Split(composeFileEnvVar, ":")
|
envVars := strings.Split(composeFileEnvVar, ":")
|
||||||
logrus.Debugf("COMPOSE_FILE detected ('%s'), loading '%s'", composeFileEnvVar, strings.Join(envVars, ", "))
|
logrus.Debugf("COMPOSE_FILE detected (%s), loading %s", composeFileEnvVar, strings.Join(envVars, ", "))
|
||||||
for _, file := range strings.Split(composeFileEnvVar, ":") {
|
for _, file := range strings.Split(composeFileEnvVar, ":") {
|
||||||
path := fmt.Sprintf("%s/%s/%s", APPS_DIR, recipe, file)
|
path := fmt.Sprintf("%s/%s/%s", RECIPES_DIR, recipe, file)
|
||||||
composeFiles = append(composeFiles, path)
|
composeFiles = append(composeFiles, path)
|
||||||
}
|
}
|
||||||
|
|
||||||
logrus.Debugf("retrieved '%s' configs for '%s'", strings.Join(composeFiles, ", "), recipe)
|
logrus.Debugf("retrieved %s configs for %s", strings.Join(composeFiles, ", "), recipe)
|
||||||
|
|
||||||
return composeFiles, nil
|
return composeFiles, nil
|
||||||
}
|
}
|
||||||
|
@ -369,19 +384,7 @@ func GetAppComposeConfig(recipe string, opts stack.Deploy, appEnv AppEnv) (*comp
|
||||||
return &composetypes.Config{}, err
|
return &composetypes.Config{}, err
|
||||||
}
|
}
|
||||||
|
|
||||||
logrus.Debugf("retrieved '%s' for '%s'", compose.Filename, recipe)
|
logrus.Debugf("retrieved %s for %s", compose.Filename, recipe)
|
||||||
|
|
||||||
return compose, nil
|
return compose, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// EnsureHostKeysAllServers ensures all configured servers have server SSH host keys validated
|
|
||||||
func EnsureHostKeysAllServers(servers ...string) error {
|
|
||||||
for _, serverName := range servers {
|
|
||||||
logrus.Debugf("ensuring server SSH host key available for %s", serverName)
|
|
||||||
if err := ssh.EnsureHostKey(serverName); err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
|
@ -26,7 +26,6 @@ func TestReadAppEnvFile(t *testing.T) {
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestGetApp(t *testing.T) {
|
func TestGetApp(t *testing.T) {
|
||||||
// TODO: Test failures as well as successes
|
|
||||||
app, err := GetApp(expectedAppFiles, appName)
|
app, err := GetApp(expectedAppFiles, appName)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatal(err)
|
t.Fatal(err)
|
||||||
|
|
|
@ -15,21 +15,24 @@ import (
|
||||||
)
|
)
|
||||||
|
|
||||||
var ABRA_DIR = os.ExpandEnv("$HOME/.abra")
|
var ABRA_DIR = os.ExpandEnv("$HOME/.abra")
|
||||||
var ABRA_SERVER_FOLDER = path.Join(ABRA_DIR, "servers")
|
var SERVERS_DIR = path.Join(ABRA_DIR, "servers")
|
||||||
var APPS_JSON = path.Join(ABRA_DIR, "apps.json")
|
var RECIPES_DIR = path.Join(ABRA_DIR, "recipes")
|
||||||
var APPS_DIR = path.Join(ABRA_DIR, "apps")
|
var VENDOR_DIR = path.Join(ABRA_DIR, "vendor")
|
||||||
|
var RECIPES_JSON = path.Join(ABRA_DIR, "catalogue", "recipes.json")
|
||||||
var REPOS_BASE_URL = "https://git.coopcloud.tech/coop-cloud"
|
var REPOS_BASE_URL = "https://git.coopcloud.tech/coop-cloud"
|
||||||
|
var CATALOGUE_JSON_REPO_NAME = "recipes-catalogue-json"
|
||||||
|
var SSH_URL_TEMPLATE = "ssh://git@git.coopcloud.tech:2222/coop-cloud/%s.git"
|
||||||
|
|
||||||
// GetServers retrieves all servers.
|
// GetServers retrieves all servers.
|
||||||
func GetServers() ([]string, error) {
|
func GetServers() ([]string, error) {
|
||||||
var servers []string
|
var servers []string
|
||||||
|
|
||||||
servers, err := getAllFoldersInDirectory(ABRA_SERVER_FOLDER)
|
servers, err := GetAllFoldersInDirectory(SERVERS_DIR)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return servers, err
|
return servers, err
|
||||||
}
|
}
|
||||||
|
|
||||||
logrus.Debugf("retrieved '%v' servers: '%s'", len(servers), servers)
|
logrus.Debugf("retrieved %v servers: %s", len(servers), servers)
|
||||||
|
|
||||||
return servers, nil
|
return servers, nil
|
||||||
}
|
}
|
||||||
|
@ -43,20 +46,20 @@ func ReadEnv(filePath string) (AppEnv, error) {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
logrus.Debugf("read '%s' from '%s'", envFile, filePath)
|
logrus.Debugf("read %s from %s", envFile, filePath)
|
||||||
|
|
||||||
return envFile, nil
|
return envFile, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// ReadServerNames retrieves all server names.
|
// ReadServerNames retrieves all server names.
|
||||||
func ReadServerNames() ([]string, error) {
|
func ReadServerNames() ([]string, error) {
|
||||||
serverNames, err := getAllFoldersInDirectory(ABRA_SERVER_FOLDER)
|
serverNames, err := GetAllFoldersInDirectory(SERVERS_DIR)
|
||||||
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
logrus.Debugf("read '%s' from '%s'", strings.Join(serverNames, ","), ABRA_SERVER_FOLDER)
|
logrus.Debugf("read %s from %s", strings.Join(serverNames, ","), SERVERS_DIR)
|
||||||
|
|
||||||
return serverNames, nil
|
return serverNames, nil
|
||||||
}
|
}
|
||||||
|
@ -80,7 +83,7 @@ func getAllFilesInDirectory(directory string) ([]fs.FileInfo, error) {
|
||||||
|
|
||||||
realPath, err := filepath.EvalSymlinks(filePath)
|
realPath, err := filepath.EvalSymlinks(filePath)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logrus.Warningf("broken symlink in your abra config folders: '%s'", filePath)
|
logrus.Warningf("broken symlink in your abra config folders: %s", filePath)
|
||||||
} else {
|
} else {
|
||||||
realFile, err := os.Stat(realPath)
|
realFile, err := os.Stat(realPath)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
@ -95,8 +98,8 @@ func getAllFilesInDirectory(directory string) ([]fs.FileInfo, error) {
|
||||||
return realFiles, nil
|
return realFiles, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// getAllFoldersInDirectory returns both folder and symlink paths
|
// GetAllFoldersInDirectory returns both folder and symlink paths
|
||||||
func getAllFoldersInDirectory(directory string) ([]string, error) {
|
func GetAllFoldersInDirectory(directory string) ([]string, error) {
|
||||||
var folders []string
|
var folders []string
|
||||||
|
|
||||||
files, err := ioutil.ReadDir(directory)
|
files, err := ioutil.ReadDir(directory)
|
||||||
|
@ -104,7 +107,7 @@ func getAllFoldersInDirectory(directory string) ([]string, error) {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
if len(files) == 0 {
|
if len(files) == 0 {
|
||||||
return nil, fmt.Errorf("directory is empty: '%s'", directory)
|
return nil, fmt.Errorf("directory is empty: %s", directory)
|
||||||
}
|
}
|
||||||
|
|
||||||
for _, file := range files {
|
for _, file := range files {
|
||||||
|
@ -113,7 +116,7 @@ func getAllFoldersInDirectory(directory string) ([]string, error) {
|
||||||
filePath := path.Join(directory, file.Name())
|
filePath := path.Join(directory, file.Name())
|
||||||
realDir, err := filepath.EvalSymlinks(filePath)
|
realDir, err := filepath.EvalSymlinks(filePath)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logrus.Warningf("broken symlink in your abra config folders: '%s'", filePath)
|
logrus.Warningf("broken symlink in your abra config folders: %s", filePath)
|
||||||
} else if stat, err := os.Stat(realDir); err == nil && stat.IsDir() {
|
} else if stat, err := os.Stat(realDir); err == nil && stat.IsDir() {
|
||||||
// path is a directory
|
// path is a directory
|
||||||
folders = append(folders, file.Name())
|
folders = append(folders, file.Name())
|
||||||
|
@ -124,17 +127,6 @@ func getAllFoldersInDirectory(directory string) ([]string, error) {
|
||||||
return folders, nil
|
return folders, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// EnsureAbraDirExists checks for the abra config folder and throws error if not
|
|
||||||
func EnsureAbraDirExists() error {
|
|
||||||
if _, err := os.Stat(ABRA_DIR); os.IsNotExist(err) {
|
|
||||||
logrus.Debugf("'%s' does not exist, creating it", ABRA_DIR)
|
|
||||||
if err := os.Mkdir(ABRA_DIR, 0777); err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// ReadAbraShEnvVars reads env vars from an abra.sh recipe file.
|
// ReadAbraShEnvVars reads env vars from an abra.sh recipe file.
|
||||||
func ReadAbraShEnvVars(abraSh string) (map[string]string, error) {
|
func ReadAbraShEnvVars(abraSh string) (map[string]string, error) {
|
||||||
envVars := make(map[string]string)
|
envVars := make(map[string]string)
|
||||||
|
@ -161,7 +153,7 @@ func ReadAbraShEnvVars(abraSh string) (map[string]string, error) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
logrus.Debugf("read '%s' from '%s'", envVars, abraSh)
|
logrus.Debugf("read %s from %s", envVars, abraSh)
|
||||||
|
|
||||||
return envVars, nil
|
return envVars, nil
|
||||||
}
|
}
|
||||||
|
|
|
@ -20,12 +20,12 @@ var serverName = "evil.corp"
|
||||||
|
|
||||||
var expectedAppEnv = AppEnv{
|
var expectedAppEnv = AppEnv{
|
||||||
"DOMAIN": "ecloud.evil.corp",
|
"DOMAIN": "ecloud.evil.corp",
|
||||||
"TYPE": "ecloud",
|
"RECIPE": "ecloud",
|
||||||
}
|
}
|
||||||
|
|
||||||
var expectedApp = App{
|
var expectedApp = App{
|
||||||
Name: appName,
|
Name: appName,
|
||||||
Type: expectedAppEnv["TYPE"],
|
Recipe: expectedAppEnv["RECIPE"],
|
||||||
Domain: expectedAppEnv["DOMAIN"],
|
Domain: expectedAppEnv["DOMAIN"],
|
||||||
Env: expectedAppEnv,
|
Env: expectedAppEnv,
|
||||||
Path: expectedAppFile.Path,
|
Path: expectedAppFile.Path,
|
||||||
|
@ -44,7 +44,7 @@ var expectedAppFiles = map[string]AppFile{
|
||||||
// var expectedServerNames = []string{"evil.corp"}
|
// var expectedServerNames = []string{"evil.corp"}
|
||||||
|
|
||||||
func TestGetAllFoldersInDirectory(t *testing.T) {
|
func TestGetAllFoldersInDirectory(t *testing.T) {
|
||||||
folders, err := getAllFoldersInDirectory(testFolder)
|
folders, err := GetAllFoldersInDirectory(testFolder)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatal(err)
|
t.Fatal(err)
|
||||||
}
|
}
|
||||||
|
@ -74,11 +74,11 @@ func TestReadEnv(t *testing.T) {
|
||||||
}
|
}
|
||||||
if !reflect.DeepEqual(env, expectedAppEnv) {
|
if !reflect.DeepEqual(env, expectedAppEnv) {
|
||||||
t.Fatalf(
|
t.Fatalf(
|
||||||
"did not get expected application settings. Expected: DOMAIN=%s TYPE=%s; Got: DOMAIN=%s TYPE=%s",
|
"did not get expected application settings. Expected: DOMAIN=%s RECIPE=%s; Got: DOMAIN=%s RECIPE=%s",
|
||||||
expectedAppEnv["DOMAIN"],
|
expectedAppEnv["DOMAIN"],
|
||||||
expectedAppEnv["TYPE"],
|
expectedAppEnv["RECIPE"],
|
||||||
env["DOMAIN"],
|
env["DOMAIN"],
|
||||||
env["TYPE"],
|
env["RECIPE"],
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -0,0 +1,70 @@
|
||||||
|
package container
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"fmt"
|
||||||
|
"strings"
|
||||||
|
|
||||||
|
"coopcloud.tech/abra/pkg/formatter"
|
||||||
|
"github.com/AlecAivazis/survey/v2"
|
||||||
|
"github.com/docker/docker/api/types"
|
||||||
|
"github.com/docker/docker/api/types/filters"
|
||||||
|
"github.com/docker/docker/client"
|
||||||
|
"github.com/sirupsen/logrus"
|
||||||
|
)
|
||||||
|
|
||||||
|
// GetContainer retrieves a container. If noInput is false and the retrievd
|
||||||
|
// count of containers does not match 1, then a prompt is presented to let the
|
||||||
|
// user choose. A count of 0 is handled gracefully.
|
||||||
|
func GetContainer(c context.Context, cl *client.Client, filters filters.Args, noInput bool) (types.Container, error) {
|
||||||
|
containerOpts := types.ContainerListOptions{Filters: filters}
|
||||||
|
containers, err := cl.ContainerList(c, containerOpts)
|
||||||
|
if err != nil {
|
||||||
|
return types.Container{}, err
|
||||||
|
}
|
||||||
|
|
||||||
|
if len(containers) == 0 {
|
||||||
|
filter := filters.Get("name")[0]
|
||||||
|
return types.Container{}, fmt.Errorf("no containers matching the %v filter found?", filter)
|
||||||
|
}
|
||||||
|
|
||||||
|
if len(containers) != 1 {
|
||||||
|
var containersRaw []string
|
||||||
|
for _, container := range containers {
|
||||||
|
containerName := strings.Join(container.Names, " ")
|
||||||
|
trimmed := strings.TrimPrefix(containerName, "/")
|
||||||
|
created := formatter.HumanDuration(container.Created)
|
||||||
|
containersRaw = append(containersRaw, fmt.Sprintf("%s (created %v)", trimmed, created))
|
||||||
|
}
|
||||||
|
|
||||||
|
if noInput {
|
||||||
|
err := fmt.Errorf("expected 1 container but found %v: %s", len(containers), strings.Join(containersRaw, " "))
|
||||||
|
return types.Container{}, err
|
||||||
|
}
|
||||||
|
|
||||||
|
logrus.Warnf("ambiguous container list received, prompting for input")
|
||||||
|
|
||||||
|
var response string
|
||||||
|
prompt := &survey.Select{
|
||||||
|
Message: "which container are you looking for?",
|
||||||
|
Options: containersRaw,
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := survey.AskOne(prompt, &response); err != nil {
|
||||||
|
return types.Container{}, err
|
||||||
|
}
|
||||||
|
|
||||||
|
chosenContainer := strings.TrimSpace(strings.Split(response, " ")[0])
|
||||||
|
for _, container := range containers {
|
||||||
|
containerName := strings.TrimSpace(strings.Join(container.Names, " "))
|
||||||
|
trimmed := strings.TrimPrefix(containerName, "/")
|
||||||
|
if trimmed == chosenContainer {
|
||||||
|
return container, nil
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
logrus.Panic("failed to match chosen container")
|
||||||
|
}
|
||||||
|
|
||||||
|
return containers[0], nil
|
||||||
|
}
|
|
@ -1,8 +1,11 @@
|
||||||
package dns
|
package dns
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"context"
|
||||||
"fmt"
|
"fmt"
|
||||||
|
"net"
|
||||||
"os"
|
"os"
|
||||||
|
"time"
|
||||||
|
|
||||||
"github.com/AlecAivazis/survey/v2"
|
"github.com/AlecAivazis/survey/v2"
|
||||||
"github.com/sirupsen/logrus"
|
"github.com/sirupsen/logrus"
|
||||||
|
@ -26,3 +29,75 @@ func NewToken(provider, providerTokenEnvVar string) (string, error) {
|
||||||
|
|
||||||
return token, nil
|
return token, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// EnsureIPv4 ensures that an ipv4 address is set for a domain name
|
||||||
|
func EnsureIPv4(domainName string) (string, error) {
|
||||||
|
var ipv4 string
|
||||||
|
|
||||||
|
// comrade librehosters DNS resolver -> https://www.privacy-handbuch.de/handbuch_93d.htm
|
||||||
|
freifunkDNS := "5.1.66.255:53"
|
||||||
|
|
||||||
|
resolver := &net.Resolver{
|
||||||
|
PreferGo: false,
|
||||||
|
Dial: func(ctx context.Context, network, address string) (net.Conn, error) {
|
||||||
|
d := net.Dialer{
|
||||||
|
Timeout: time.Millisecond * time.Duration(10000),
|
||||||
|
}
|
||||||
|
return d.DialContext(ctx, "udp", freifunkDNS)
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
ctx := context.Background()
|
||||||
|
ips, err := resolver.LookupIPAddr(ctx, domainName)
|
||||||
|
if err != nil {
|
||||||
|
return ipv4, err
|
||||||
|
}
|
||||||
|
|
||||||
|
if len(ips) == 0 {
|
||||||
|
return ipv4, fmt.Errorf("unable to retrieve ipv4 address for %s", domainName)
|
||||||
|
}
|
||||||
|
|
||||||
|
ipv4 = ips[0].IP.To4().String()
|
||||||
|
logrus.Debugf("%s points to %s (resolver: %s)", domainName, ipv4, freifunkDNS)
|
||||||
|
|
||||||
|
return ipv4, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// EnsureDomainsResolveSameIPv4 ensures that domains resolve to the same ipv4 address
|
||||||
|
func EnsureDomainsResolveSameIPv4(domainName, server string) (string, error) {
|
||||||
|
var ipv4 string
|
||||||
|
|
||||||
|
domainIPv4, err := EnsureIPv4(domainName)
|
||||||
|
if err != nil {
|
||||||
|
return ipv4, err
|
||||||
|
}
|
||||||
|
|
||||||
|
if domainIPv4 == "" {
|
||||||
|
return ipv4, fmt.Errorf("cannot resolve ipv4 for %s?", domainName)
|
||||||
|
}
|
||||||
|
|
||||||
|
serverIPv4, err := EnsureIPv4(server)
|
||||||
|
if err != nil {
|
||||||
|
return ipv4, err
|
||||||
|
}
|
||||||
|
|
||||||
|
if serverIPv4 == "" {
|
||||||
|
return ipv4, fmt.Errorf("cannot resolve ipv4 for %s?", server)
|
||||||
|
}
|
||||||
|
|
||||||
|
if domainIPv4 != serverIPv4 {
|
||||||
|
err := "app domain %s (%s) does not appear to resolve to app server %s (%s)?"
|
||||||
|
return ipv4, fmt.Errorf(err, domainName, domainIPv4, server, serverIPv4)
|
||||||
|
}
|
||||||
|
|
||||||
|
return ipv4, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetTTL parses a ttl string into a duration
|
||||||
|
func GetTTL(ttl string) (time.Duration, error) {
|
||||||
|
val, err := time.ParseDuration(ttl)
|
||||||
|
if err != nil {
|
||||||
|
return val, err
|
||||||
|
}
|
||||||
|
return val, nil
|
||||||
|
}
|
||||||
|
|
|
@ -1,25 +1,20 @@
|
||||||
package formatter
|
package formatter
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"fmt"
|
|
||||||
"os"
|
"os"
|
||||||
"strings"
|
"strings"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/docker/cli/cli/command/formatter"
|
|
||||||
"github.com/docker/go-units"
|
"github.com/docker/go-units"
|
||||||
"github.com/olekukonko/tablewriter"
|
"github.com/olekukonko/tablewriter"
|
||||||
"github.com/schollz/progressbar/v3"
|
"github.com/schollz/progressbar/v3"
|
||||||
|
"github.com/sirupsen/logrus"
|
||||||
)
|
)
|
||||||
|
|
||||||
func ShortenID(str string) string {
|
func ShortenID(str string) string {
|
||||||
return str[:12]
|
return str[:12]
|
||||||
}
|
}
|
||||||
|
|
||||||
func Truncate(str string) string {
|
|
||||||
return fmt.Sprintf(`"%s"`, formatter.Ellipsis(str, 19))
|
|
||||||
}
|
|
||||||
|
|
||||||
func SmallSHA(hash string) string {
|
func SmallSHA(hash string) string {
|
||||||
return hash[:8]
|
return hash[:8]
|
||||||
}
|
}
|
||||||
|
@ -39,6 +34,7 @@ func HumanDuration(timestamp int64) string {
|
||||||
// CreateTable prepares a table layout for output.
|
// CreateTable prepares a table layout for output.
|
||||||
func CreateTable(columns []string) *tablewriter.Table {
|
func CreateTable(columns []string) *tablewriter.Table {
|
||||||
table := tablewriter.NewWriter(os.Stdout)
|
table := tablewriter.NewWriter(os.Stdout)
|
||||||
|
table.SetAutoWrapText(false)
|
||||||
table.SetHeader(columns)
|
table.SetHeader(columns)
|
||||||
return table
|
return table
|
||||||
}
|
}
|
||||||
|
@ -54,3 +50,22 @@ func CreateProgressbar(length int, title string) *progressbar.ProgressBar {
|
||||||
progressbar.OptionSetDescription(title),
|
progressbar.OptionSetDescription(title),
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// StripTagMeta strips front-matter image tag data that we don't need for parsing.
|
||||||
|
func StripTagMeta(image string) string {
|
||||||
|
originalImage := image
|
||||||
|
|
||||||
|
if strings.Contains(image, "docker.io") {
|
||||||
|
image = strings.Split(image, "/")[1]
|
||||||
|
}
|
||||||
|
|
||||||
|
if strings.Contains(image, "library") {
|
||||||
|
image = strings.Split(image, "/")[1]
|
||||||
|
}
|
||||||
|
|
||||||
|
if originalImage != image {
|
||||||
|
logrus.Debugf("stripped %s to %s for parsing", originalImage, image)
|
||||||
|
}
|
||||||
|
|
||||||
|
return image
|
||||||
|
}
|
|
@ -0,0 +1,35 @@
|
||||||
|
package git
|
||||||
|
|
||||||
|
import (
|
||||||
|
"github.com/go-git/go-git/v5"
|
||||||
|
"github.com/go-git/go-git/v5/plumbing"
|
||||||
|
)
|
||||||
|
|
||||||
|
// GetCurrentBranch retrieves the current branch of a repository
|
||||||
|
func GetCurrentBranch(repository *git.Repository) (string, error) {
|
||||||
|
branchRefs, err := repository.Branches()
|
||||||
|
if err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
|
||||||
|
headRef, err := repository.Head()
|
||||||
|
if err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
|
||||||
|
var currentBranchName string
|
||||||
|
err = branchRefs.ForEach(func(branchRef *plumbing.Reference) error {
|
||||||
|
if branchRef.Hash() == headRef.Hash() {
|
||||||
|
currentBranchName = branchRef.Name().String()
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil
|
||||||
|
})
|
||||||
|
if err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
|
||||||
|
return currentBranchName, nil
|
||||||
|
}
|
|
@ -7,7 +7,6 @@ import (
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
"github.com/go-git/go-git/v5"
|
"github.com/go-git/go-git/v5"
|
||||||
"github.com/go-git/go-git/v5/config"
|
|
||||||
"github.com/go-git/go-git/v5/plumbing"
|
"github.com/go-git/go-git/v5/plumbing"
|
||||||
"github.com/sirupsen/logrus"
|
"github.com/sirupsen/logrus"
|
||||||
)
|
)
|
||||||
|
@ -15,10 +14,10 @@ import (
|
||||||
// Clone runs a git clone which accounts for different default branches.
|
// Clone runs a git clone which accounts for different default branches.
|
||||||
func Clone(dir, url string) error {
|
func Clone(dir, url string) error {
|
||||||
if _, err := os.Stat(dir); os.IsNotExist(err) {
|
if _, err := os.Stat(dir); os.IsNotExist(err) {
|
||||||
logrus.Debugf("'%s' does not exist, attempting to git clone from '%s'", dir, url)
|
logrus.Debugf("%s does not exist, attempting to git clone from %s", dir, url)
|
||||||
_, err := git.PlainClone(dir, false, &git.CloneOptions{URL: url, Tags: git.AllTags})
|
_, err := git.PlainClone(dir, false, &git.CloneOptions{URL: url, Tags: git.AllTags})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logrus.Debugf("cloning '%s' default branch failed, attempting from main branch", url)
|
logrus.Debugf("cloning %s default branch failed, attempting from main branch", url)
|
||||||
_, err := git.PlainClone(dir, false, &git.CloneOptions{
|
_, err := git.PlainClone(dir, false, &git.CloneOptions{
|
||||||
URL: url,
|
URL: url,
|
||||||
Tags: git.AllTags,
|
Tags: git.AllTags,
|
||||||
|
@ -32,67 +31,10 @@ func Clone(dir, url string) error {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
logrus.Debugf("'%s' has been git cloned successfully", dir)
|
logrus.Debugf("%s has been git cloned successfully", dir)
|
||||||
} else {
|
} else {
|
||||||
logrus.Debugf("'%s' already exists, doing nothing", dir)
|
logrus.Debugf("%s already exists", dir)
|
||||||
}
|
}
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// EnsureUpToDate ensures that a git repo on disk has the latest changes (git-fetch).
|
|
||||||
func EnsureUpToDate(dir string) error {
|
|
||||||
repo, err := git.PlainOpen(dir)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
branch := "master"
|
|
||||||
if _, err := repo.Branch("master"); err != nil {
|
|
||||||
if _, err := repo.Branch("main"); err != nil {
|
|
||||||
logrus.Debugf("failed to select branch in '%s'", dir)
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
branch = "main"
|
|
||||||
}
|
|
||||||
|
|
||||||
logrus.Debugf("choosing '%s' as main git branch in '%s'", branch, dir)
|
|
||||||
|
|
||||||
worktree, err := repo.Worktree()
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
refName := fmt.Sprintf("refs/heads/%s", branch)
|
|
||||||
checkOutOpts := &git.CheckoutOptions{
|
|
||||||
Create: false,
|
|
||||||
Force: true,
|
|
||||||
Branch: plumbing.ReferenceName(refName),
|
|
||||||
}
|
|
||||||
if err := worktree.Checkout(checkOutOpts); err != nil {
|
|
||||||
logrus.Debugf("failed to check out '%s' in '%s'", refName, dir)
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
logrus.Debugf("successfully checked out '%s' in '%s'", branch, dir)
|
|
||||||
|
|
||||||
remote, err := repo.Remote("origin")
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
fetchOpts := &git.FetchOptions{
|
|
||||||
RemoteName: "origin",
|
|
||||||
RefSpecs: []config.RefSpec{"refs/heads/*:refs/remotes/origin/*"},
|
|
||||||
Force: true,
|
|
||||||
}
|
|
||||||
if err := remote.Fetch(fetchOpts); err != nil {
|
|
||||||
if !strings.Contains(err.Error(), "already up-to-date") {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
logrus.Debugf("successfully fetched all changes in '%s'", dir)
|
|
||||||
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
|
@ -0,0 +1,56 @@
|
||||||
|
package git
|
||||||
|
|
||||||
|
import (
|
||||||
|
"fmt"
|
||||||
|
|
||||||
|
"github.com/go-git/go-git/v5"
|
||||||
|
"github.com/sirupsen/logrus"
|
||||||
|
)
|
||||||
|
|
||||||
|
// Commit runs a git commit
|
||||||
|
func Commit(repoPath, glob, commitMessage string, dryRun bool) error {
|
||||||
|
if commitMessage == "" {
|
||||||
|
return fmt.Errorf("no commit message specified?")
|
||||||
|
}
|
||||||
|
|
||||||
|
commitRepo, err := git.PlainOpen(repoPath)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
commitWorktree, err := commitRepo.Worktree()
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
patterns, err := GetExcludesFiles()
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
if len(patterns) > 0 {
|
||||||
|
commitWorktree.Excludes = append(patterns, commitWorktree.Excludes...)
|
||||||
|
}
|
||||||
|
|
||||||
|
if !dryRun {
|
||||||
|
err = commitWorktree.AddGlob(glob)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
logrus.Debugf("staged %s for commit", glob)
|
||||||
|
} else {
|
||||||
|
logrus.Debugf("dry run: did not stage %s for commit", glob)
|
||||||
|
}
|
||||||
|
|
||||||
|
if !dryRun {
|
||||||
|
_, err = commitWorktree.Commit(commitMessage, &git.CommitOptions{})
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
logrus.Debug("git changes commited")
|
||||||
|
} else {
|
||||||
|
logrus.Debug("dry run: no changes commited")
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
|
@ -0,0 +1,14 @@
|
||||||
|
package git
|
||||||
|
|
||||||
|
import (
|
||||||
|
"fmt"
|
||||||
|
"os"
|
||||||
|
)
|
||||||
|
|
||||||
|
// EnsureGitRepo ensures a git repo .git folder exists
|
||||||
|
func EnsureGitRepo(repoPath string) error {
|
||||||
|
if _, err := os.Stat(repoPath); os.IsNotExist(err) {
|
||||||
|
return fmt.Errorf("no .git directory in %s?", repoPath)
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
|
@ -0,0 +1,38 @@
|
||||||
|
package git
|
||||||
|
|
||||||
|
import (
|
||||||
|
"github.com/go-git/go-git/v5"
|
||||||
|
gitPkg "github.com/go-git/go-git/v5"
|
||||||
|
"github.com/sirupsen/logrus"
|
||||||
|
)
|
||||||
|
|
||||||
|
// Init inits a new repo and commits all the stuff if you want
|
||||||
|
func Init(repoPath string, commit bool) error {
|
||||||
|
if _, err := gitPkg.PlainInit(repoPath, false); err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
logrus.Debugf("initialised new git repo in %s", repoPath)
|
||||||
|
|
||||||
|
if commit {
|
||||||
|
commitRepo, err := git.PlainOpen(repoPath)
|
||||||
|
if err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
commitWorktree, err := commitRepo.Worktree()
|
||||||
|
if err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := commitWorktree.AddWithOptions(&git.AddOptions{All: true}); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
if _, err = commitWorktree.Commit("init", &git.CommitOptions{}); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
logrus.Debugf("init committed all files for new git repo in %s", repoPath)
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
|
@ -0,0 +1,43 @@
|
||||||
|
package git
|
||||||
|
|
||||||
|
import (
|
||||||
|
"github.com/go-git/go-git/v5"
|
||||||
|
"github.com/go-git/go-git/v5/config"
|
||||||
|
"github.com/sirupsen/logrus"
|
||||||
|
)
|
||||||
|
|
||||||
|
// Push pushes the latest changes & optionally tags to the default remote
|
||||||
|
func Push(repoDir string, remote string, tags bool, dryRun bool) error {
|
||||||
|
if dryRun {
|
||||||
|
logrus.Debugf("dry run: no git changes pushed in %s", repoDir)
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
commitRepo, err := git.PlainOpen(repoDir)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
opts := &git.PushOptions{}
|
||||||
|
if remote != "" {
|
||||||
|
opts.RemoteName = remote
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := commitRepo.Push(opts); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
logrus.Debugf("git changes pushed")
|
||||||
|
|
||||||
|
if tags {
|
||||||
|
opts.RefSpecs = append(opts.RefSpecs, config.RefSpec("+refs/tags/*:refs/tags/*"))
|
||||||
|
|
||||||
|
if err := commitRepo.Push(opts); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
logrus.Debugf("git tags pushed")
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
146
pkg/git/read.go
146
pkg/git/read.go
|
@ -1,17 +1,24 @@
|
||||||
package git
|
package git
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"io/ioutil"
|
||||||
|
"os"
|
||||||
|
"os/user"
|
||||||
"path"
|
"path"
|
||||||
|
"path/filepath"
|
||||||
|
"strings"
|
||||||
|
|
||||||
"coopcloud.tech/abra/pkg/config"
|
"coopcloud.tech/abra/pkg/config"
|
||||||
"github.com/go-git/go-git/v5"
|
"github.com/go-git/go-git/v5"
|
||||||
|
gitConfigPkg "github.com/go-git/go-git/v5/config"
|
||||||
"github.com/go-git/go-git/v5/plumbing"
|
"github.com/go-git/go-git/v5/plumbing"
|
||||||
|
"github.com/go-git/go-git/v5/plumbing/format/gitignore"
|
||||||
"github.com/sirupsen/logrus"
|
"github.com/sirupsen/logrus"
|
||||||
)
|
)
|
||||||
|
|
||||||
// GetRecipeHead retrieves latest HEAD metadata.
|
// GetRecipeHead retrieves latest HEAD metadata.
|
||||||
func GetRecipeHead(recipeName string) (*plumbing.Reference, error) {
|
func GetRecipeHead(recipeName string) (*plumbing.Reference, error) {
|
||||||
recipeDir := path.Join(config.ABRA_DIR, "apps", recipeName)
|
recipeDir := path.Join(config.RECIPES_DIR, recipeName)
|
||||||
|
|
||||||
repo, err := git.PlainOpen(recipeDir)
|
repo, err := git.PlainOpen(recipeDir)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
@ -27,10 +34,8 @@ func GetRecipeHead(recipeName string) (*plumbing.Reference, error) {
|
||||||
}
|
}
|
||||||
|
|
||||||
// IsClean checks if a repo has unstaged changes
|
// IsClean checks if a repo has unstaged changes
|
||||||
func IsClean(recipeName string) (bool, error) {
|
func IsClean(repoPath string) (bool, error) {
|
||||||
recipeDir := path.Join(config.ABRA_DIR, "apps", recipeName)
|
repo, err := git.PlainOpen(repoPath)
|
||||||
|
|
||||||
repo, err := git.PlainOpen(recipeDir)
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return false, err
|
return false, err
|
||||||
}
|
}
|
||||||
|
@ -40,16 +45,143 @@ func IsClean(recipeName string) (bool, error) {
|
||||||
return false, err
|
return false, err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
patterns, err := GetExcludesFiles()
|
||||||
|
if err != nil {
|
||||||
|
return false, err
|
||||||
|
}
|
||||||
|
|
||||||
|
if len(patterns) > 0 {
|
||||||
|
worktree.Excludes = append(patterns, worktree.Excludes...)
|
||||||
|
}
|
||||||
|
|
||||||
status, err := worktree.Status()
|
status, err := worktree.Status()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return false, err
|
return false, err
|
||||||
}
|
}
|
||||||
|
|
||||||
if status.String() != "" {
|
if status.String() != "" {
|
||||||
logrus.Debugf("discovered git status for %s repository: %s", recipeName, status.String())
|
logrus.Debugf("discovered git status in %s: %s", repoPath, status.String())
|
||||||
} else {
|
} else {
|
||||||
logrus.Debugf("discovered clean git status for %s repository", recipeName)
|
logrus.Debugf("discovered clean git status in %s", repoPath)
|
||||||
}
|
}
|
||||||
|
|
||||||
return status.IsClean(), nil
|
return status.IsClean(), nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// GetExcludesFiles reads the exlude files from a global gitignore
|
||||||
|
func GetExcludesFiles() ([]gitignore.Pattern, error) {
|
||||||
|
var err error
|
||||||
|
var patterns []gitignore.Pattern
|
||||||
|
|
||||||
|
cfg, err := parseGitConfig()
|
||||||
|
if err != nil {
|
||||||
|
return patterns, err
|
||||||
|
}
|
||||||
|
|
||||||
|
excludesfile := getExcludesFile(cfg)
|
||||||
|
patterns, err = parseExcludesFile(excludesfile)
|
||||||
|
if err != nil {
|
||||||
|
return patterns, err
|
||||||
|
}
|
||||||
|
|
||||||
|
return patterns, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func parseGitConfig() (*gitConfigPkg.Config, error) {
|
||||||
|
cfg := gitConfigPkg.NewConfig()
|
||||||
|
|
||||||
|
usr, err := user.Current()
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
globalGitConfig := filepath.Join(usr.HomeDir, ".gitconfig")
|
||||||
|
if _, err := os.Stat(globalGitConfig); err != nil {
|
||||||
|
if os.IsNotExist(err) {
|
||||||
|
logrus.Debugf("no %s exists, not reading any global gitignore config", globalGitConfig)
|
||||||
|
return cfg, nil
|
||||||
|
}
|
||||||
|
return cfg, err
|
||||||
|
}
|
||||||
|
|
||||||
|
b, err := ioutil.ReadFile(globalGitConfig)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := cfg.Unmarshal(b); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
return cfg, err
|
||||||
|
}
|
||||||
|
|
||||||
|
func getExcludesFile(cfg *gitConfigPkg.Config) string {
|
||||||
|
for _, sec := range cfg.Raw.Sections {
|
||||||
|
if sec.Name == "core" {
|
||||||
|
for _, opt := range sec.Options {
|
||||||
|
if opt.Key == "excludesfile" {
|
||||||
|
return opt.Value
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return "~/.gitignore"
|
||||||
|
}
|
||||||
|
|
||||||
|
func parseExcludesFile(excludesfile string) ([]gitignore.Pattern, error) {
|
||||||
|
var ps []gitignore.Pattern
|
||||||
|
|
||||||
|
excludesfile, err := expandTilde(excludesfile)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
if _, err := os.Stat(excludesfile); err != nil {
|
||||||
|
if os.IsNotExist(err) {
|
||||||
|
logrus.Debugf("no %s exists, skipping reading gitignore paths", excludesfile)
|
||||||
|
return ps, nil
|
||||||
|
}
|
||||||
|
return ps, err
|
||||||
|
}
|
||||||
|
|
||||||
|
data, err := ioutil.ReadFile(excludesfile)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
var pathsRaw []string
|
||||||
|
for _, s := range strings.Split(string(data), "\n") {
|
||||||
|
if !strings.HasPrefix(s, "#") && len(strings.TrimSpace(s)) > 0 {
|
||||||
|
pathsRaw = append(pathsRaw, s)
|
||||||
|
ps = append(ps, gitignore.ParsePattern(s, nil))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
logrus.Debugf("read global ignore paths: %s", strings.Join(pathsRaw, " "))
|
||||||
|
|
||||||
|
return ps, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func expandTilde(path string) (string, error) {
|
||||||
|
if !strings.HasPrefix(path, "~") {
|
||||||
|
return path, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
var paths []string
|
||||||
|
u, err := user.Current()
|
||||||
|
if err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, p := range strings.Split(path, string(filepath.Separator)) {
|
||||||
|
if p == "~" {
|
||||||
|
paths = append(paths, u.HomeDir)
|
||||||
|
} else {
|
||||||
|
paths = append(paths, p)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return filepath.Join(paths...), nil
|
||||||
|
}
|
||||||
|
|
|
@ -0,0 +1,28 @@
|
||||||
|
package git
|
||||||
|
|
||||||
|
import (
|
||||||
|
"strings"
|
||||||
|
|
||||||
|
"github.com/go-git/go-git/v5"
|
||||||
|
"github.com/go-git/go-git/v5/config"
|
||||||
|
"github.com/sirupsen/logrus"
|
||||||
|
)
|
||||||
|
|
||||||
|
// CreateRemote creates a new git remote in a repository
|
||||||
|
func CreateRemote(repo *git.Repository, name, url string, dryRun bool) error {
|
||||||
|
if dryRun {
|
||||||
|
logrus.Debugf("dry run: remote %s (%s) not created", name, url)
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
if _, err := repo.CreateRemote(&config.RemoteConfig{
|
||||||
|
Name: name,
|
||||||
|
URLs: []string{url},
|
||||||
|
}); err != nil {
|
||||||
|
if !strings.Contains(err.Error(), "remote already exists") {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
|
@ -0,0 +1,12 @@
|
||||||
|
package integration
|
||||||
|
|
||||||
|
import (
|
||||||
|
"os"
|
||||||
|
"testing"
|
||||||
|
)
|
||||||
|
|
||||||
|
func skipIfNotIntegration(t *testing.T) {
|
||||||
|
if os.Getenv("ABRA_INTEGRATION") == "" {
|
||||||
|
t.Skip("missing 'ABRA_INTEGRATION', not running integration tests")
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,338 @@
|
||||||
|
package lint
|
||||||
|
|
||||||
|
import (
|
||||||
|
"fmt"
|
||||||
|
"net/http"
|
||||||
|
"os"
|
||||||
|
"path"
|
||||||
|
|
||||||
|
"coopcloud.tech/abra/pkg/config"
|
||||||
|
"coopcloud.tech/abra/pkg/recipe"
|
||||||
|
recipePkg "coopcloud.tech/abra/pkg/recipe"
|
||||||
|
"coopcloud.tech/tagcmp"
|
||||||
|
"github.com/docker/distribution/reference"
|
||||||
|
"github.com/sirupsen/logrus"
|
||||||
|
)
|
||||||
|
|
||||||
|
var Warn = "warn"
|
||||||
|
var Critical = "critical"
|
||||||
|
|
||||||
|
type LintFunction func(recipe.Recipe) (bool, error)
|
||||||
|
|
||||||
|
type LintRule struct {
|
||||||
|
Ref string
|
||||||
|
Level string
|
||||||
|
Description string
|
||||||
|
HowToResolve string
|
||||||
|
Function LintFunction
|
||||||
|
}
|
||||||
|
|
||||||
|
var LintRules = map[string][]LintRule{
|
||||||
|
"warn": {
|
||||||
|
{
|
||||||
|
Ref: "R001",
|
||||||
|
Level: "warn",
|
||||||
|
Description: "compose config has expected version",
|
||||||
|
HowToResolve: "ensure 'version: \"3.8\"' in compose configs",
|
||||||
|
Function: LintComposeVersion,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
Ref: "R002",
|
||||||
|
Level: "warn",
|
||||||
|
Description: "healthcheck enabled for all services",
|
||||||
|
HowToResolve: "wire up healthchecks",
|
||||||
|
Function: LintHealthchecks,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
Ref: "R003",
|
||||||
|
Level: "warn",
|
||||||
|
Description: "all images use a tag",
|
||||||
|
HowToResolve: "use a tag for all images",
|
||||||
|
Function: LintAllImagesTagged,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
Ref: "R004",
|
||||||
|
Level: "warn",
|
||||||
|
Description: "no unstable tags",
|
||||||
|
HowToResolve: "tag all images with stable tags",
|
||||||
|
Function: LintNoUnstableTags,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
Ref: "R005",
|
||||||
|
Level: "warn",
|
||||||
|
Description: "tags use semver-like format",
|
||||||
|
HowToResolve: "use semver-like tags",
|
||||||
|
Function: LintSemverLikeTags,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
Ref: "R006",
|
||||||
|
Level: "warn",
|
||||||
|
Description: "has published catalogue version",
|
||||||
|
HowToResolve: "publish a recipe version to the catalogue",
|
||||||
|
Function: LintHasPublishedVersion,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
Ref: "R007",
|
||||||
|
Level: "warn",
|
||||||
|
Description: "README.md metadata filled in",
|
||||||
|
HowToResolve: "fill out all the metadata",
|
||||||
|
Function: LintMetadataFilledIn,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
Ref: "R013",
|
||||||
|
Level: "warn",
|
||||||
|
Description: "git.coopcloud.tech repo exists",
|
||||||
|
HowToResolve: "upload your recipe to git.coopcloud.tech/coop-cloud/...",
|
||||||
|
Function: LintHasRecipeRepo,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
"error": {
|
||||||
|
{
|
||||||
|
Ref: "R008",
|
||||||
|
Level: "error",
|
||||||
|
Description: ".env.sample provided",
|
||||||
|
HowToResolve: "create an example .env.sample",
|
||||||
|
Function: LintEnvConfigPresent,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
Ref: "R009",
|
||||||
|
Level: "error",
|
||||||
|
Description: "one service named 'app'",
|
||||||
|
HowToResolve: "name a servce 'app'",
|
||||||
|
Function: LintAppService,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
Ref: "R010",
|
||||||
|
Level: "error",
|
||||||
|
Description: "traefik routing enabled",
|
||||||
|
HowToResolve: "include \"traefik.enable=true\" deploy label",
|
||||||
|
Function: LintTraefikEnabled,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
Ref: "R011",
|
||||||
|
Level: "error",
|
||||||
|
Description: "all services have images",
|
||||||
|
HowToResolve: "ensure \"image: ...\" set on all services",
|
||||||
|
Function: LintImagePresent,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
Ref: "R012",
|
||||||
|
Level: "error",
|
||||||
|
Description: "config version are vendored",
|
||||||
|
HowToResolve: "vendor config versions in an abra.sh",
|
||||||
|
Function: LintAbraShVendors,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
func LintForErrors(recipe recipe.Recipe) error {
|
||||||
|
logrus.Debugf("linting for critical errors in %s configs", recipe.Name)
|
||||||
|
|
||||||
|
for level := range LintRules {
|
||||||
|
if level != "error" {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
for _, rule := range LintRules[level] {
|
||||||
|
ok, err := rule.Function(recipe)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if !ok {
|
||||||
|
return fmt.Errorf("lint error in %s configs: \"%s\" failed lint checks (%s)", recipe.Name, rule.Description, rule.Ref)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
logrus.Debugf("linting successful, %s is well configured", recipe.Name)
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func LintComposeVersion(recipe recipe.Recipe) (bool, error) {
|
||||||
|
if recipe.Config.Version == "3.8" {
|
||||||
|
return true, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
return true, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func LintEnvConfigPresent(recipe recipe.Recipe) (bool, error) {
|
||||||
|
envSample := fmt.Sprintf("%s/%s/.env.sample", config.RECIPES_DIR, recipe.Name)
|
||||||
|
if _, err := os.Stat(envSample); !os.IsNotExist(err) {
|
||||||
|
return true, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
return false, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func LintAppService(recipe recipe.Recipe) (bool, error) {
|
||||||
|
for _, service := range recipe.Config.Services {
|
||||||
|
if service.Name == "app" {
|
||||||
|
return true, nil
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return false, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func LintTraefikEnabled(recipe recipe.Recipe) (bool, error) {
|
||||||
|
for _, service := range recipe.Config.Services {
|
||||||
|
for label := range service.Deploy.Labels {
|
||||||
|
if label == "traefik.enable" {
|
||||||
|
if service.Deploy.Labels[label] == "true" {
|
||||||
|
return true, nil
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return false, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func LintHealthchecks(recipe recipe.Recipe) (bool, error) {
|
||||||
|
for _, service := range recipe.Config.Services {
|
||||||
|
if service.HealthCheck == nil {
|
||||||
|
return false, nil
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return true, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func LintAllImagesTagged(recipe recipe.Recipe) (bool, error) {
|
||||||
|
for _, service := range recipe.Config.Services {
|
||||||
|
img, err := reference.ParseNormalizedNamed(service.Image)
|
||||||
|
if err != nil {
|
||||||
|
return false, err
|
||||||
|
}
|
||||||
|
if reference.IsNameOnly(img) {
|
||||||
|
return false, nil
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return true, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func LintNoUnstableTags(recipe recipe.Recipe) (bool, error) {
|
||||||
|
for _, service := range recipe.Config.Services {
|
||||||
|
img, err := reference.ParseNormalizedNamed(service.Image)
|
||||||
|
if err != nil {
|
||||||
|
return false, err
|
||||||
|
}
|
||||||
|
|
||||||
|
var tag string
|
||||||
|
switch img.(type) {
|
||||||
|
case reference.NamedTagged:
|
||||||
|
tag = img.(reference.NamedTagged).Tag()
|
||||||
|
case reference.Named:
|
||||||
|
return false, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
if tag == "latest" {
|
||||||
|
return false, nil
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return true, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func LintSemverLikeTags(recipe recipe.Recipe) (bool, error) {
|
||||||
|
for _, service := range recipe.Config.Services {
|
||||||
|
img, err := reference.ParseNormalizedNamed(service.Image)
|
||||||
|
if err != nil {
|
||||||
|
return false, err
|
||||||
|
}
|
||||||
|
|
||||||
|
var tag string
|
||||||
|
switch img.(type) {
|
||||||
|
case reference.NamedTagged:
|
||||||
|
tag = img.(reference.NamedTagged).Tag()
|
||||||
|
case reference.Named:
|
||||||
|
return false, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
if !tagcmp.IsParsable(tag) {
|
||||||
|
return false, nil
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return true, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func LintImagePresent(recipe recipe.Recipe) (bool, error) {
|
||||||
|
for _, service := range recipe.Config.Services {
|
||||||
|
if service.Image == "" {
|
||||||
|
return false, nil
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return true, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func LintHasPublishedVersion(recipe recipe.Recipe) (bool, error) {
|
||||||
|
catl, err := recipePkg.ReadRecipeCatalogue()
|
||||||
|
if err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
versions, err := recipePkg.GetRecipeCatalogueVersions(recipe.Name, catl)
|
||||||
|
if err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if len(versions) == 0 {
|
||||||
|
return false, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
return true, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func LintMetadataFilledIn(r recipe.Recipe) (bool, error) {
|
||||||
|
features, category, err := recipe.GetRecipeFeaturesAndCategory(r.Name)
|
||||||
|
if err != nil {
|
||||||
|
return false, err
|
||||||
|
}
|
||||||
|
|
||||||
|
if category == "" {
|
||||||
|
return false, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
if features.Backups == "" ||
|
||||||
|
features.Email == "" ||
|
||||||
|
features.Healthcheck == "" ||
|
||||||
|
features.Image.Image == "" ||
|
||||||
|
features.SSO == "" {
|
||||||
|
return false, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
return true, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func LintAbraShVendors(recipe recipe.Recipe) (bool, error) {
|
||||||
|
for _, service := range recipe.Config.Services {
|
||||||
|
if len(service.Configs) > 0 {
|
||||||
|
abraSh := path.Join(config.RECIPES_DIR, recipe.Name, "abra.sh")
|
||||||
|
if _, err := os.Stat(abraSh); err != nil {
|
||||||
|
if os.IsNotExist(err) {
|
||||||
|
return false, err
|
||||||
|
}
|
||||||
|
return false, err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return true, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func LintHasRecipeRepo(recipe recipe.Recipe) (bool, error) {
|
||||||
|
url := fmt.Sprintf("%s/%s.git", config.REPOS_BASE_URL, recipe.Name)
|
||||||
|
|
||||||
|
res, err := http.Get(url)
|
||||||
|
if err != nil {
|
||||||
|
return false, err
|
||||||
|
}
|
||||||
|
|
||||||
|
if res.StatusCode != 200 {
|
||||||
|
return false, err
|
||||||
|
}
|
||||||
|
|
||||||
|
return true, nil
|
||||||
|
}
|
File diff suppressed because it is too large
Load Diff
|
@ -19,13 +19,13 @@ func PassInsertSecret(secretValue, secretName, appName, server string) error {
|
||||||
secretValue, server, appName, secretName,
|
secretValue, server, appName, secretName,
|
||||||
)
|
)
|
||||||
|
|
||||||
logrus.Debugf("attempting to run '%s'", cmd)
|
logrus.Debugf("attempting to run %s", cmd)
|
||||||
|
|
||||||
if err := exec.Command("bash", "-c", cmd).Run(); err != nil {
|
if err := exec.Command("bash", "-c", cmd).Run(); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
logrus.Infof("'%s' inserted into pass store", secretName)
|
logrus.Infof("%s inserted into pass store", secretName)
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
@ -41,13 +41,13 @@ func PassRmSecret(secretName, appName, server string) error {
|
||||||
server, appName, secretName,
|
server, appName, secretName,
|
||||||
)
|
)
|
||||||
|
|
||||||
logrus.Debugf("attempting to run '%s'", cmd)
|
logrus.Debugf("attempting to run %s", cmd)
|
||||||
|
|
||||||
if err := exec.Command("bash", "-c", cmd).Run(); err != nil {
|
if err := exec.Command("bash", "-c", cmd).Run(); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
logrus.Infof("'%s' removed from pass store", secretName)
|
logrus.Infof("%s removed from pass store", secretName)
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
|
@ -8,6 +8,7 @@ import (
|
||||||
"regexp"
|
"regexp"
|
||||||
"strconv"
|
"strconv"
|
||||||
"strings"
|
"strings"
|
||||||
|
"sync"
|
||||||
|
|
||||||
"coopcloud.tech/abra/pkg/client"
|
"coopcloud.tech/abra/pkg/client"
|
||||||
"coopcloud.tech/abra/pkg/config"
|
"coopcloud.tech/abra/pkg/config"
|
||||||
|
@ -34,7 +35,7 @@ func GeneratePasswords(count, length uint) ([]string, error) {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
logrus.Debugf("generated '%s'", strings.Join(passwords, ", "))
|
logrus.Debugf("generated %s", strings.Join(passwords, ", "))
|
||||||
|
|
||||||
return passwords, nil
|
return passwords, nil
|
||||||
}
|
}
|
||||||
|
@ -53,7 +54,7 @@ func GeneratePassphrases(count uint) ([]string, error) {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
logrus.Debugf("generated '%s'", strings.Join(passphrases, ", "))
|
logrus.Debugf("generated %s", strings.Join(passphrases, ", "))
|
||||||
|
|
||||||
return passphrases, nil
|
return passphrases, nil
|
||||||
}
|
}
|
||||||
|
@ -69,35 +70,32 @@ func ReadSecretEnvVars(appEnv config.AppEnv) map[string]string {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
logrus.Debugf("read '%s' as secrets from '%s'", secretEnvVars, appEnv)
|
logrus.Debugf("read %s as secrets from %s", secretEnvVars, appEnv)
|
||||||
|
|
||||||
return secretEnvVars
|
return secretEnvVars
|
||||||
}
|
}
|
||||||
|
|
||||||
// TODO: should probably go in the config/app package?
|
|
||||||
func ParseSecretEnvVarName(secretEnvVar string) string {
|
func ParseSecretEnvVarName(secretEnvVar string) string {
|
||||||
withoutPrefix := strings.TrimPrefix(secretEnvVar, "SECRET_")
|
withoutPrefix := strings.TrimPrefix(secretEnvVar, "SECRET_")
|
||||||
withoutSuffix := strings.TrimSuffix(withoutPrefix, "_VERSION")
|
withoutSuffix := strings.TrimSuffix(withoutPrefix, "_VERSION")
|
||||||
name := strings.ToLower(withoutSuffix)
|
name := strings.ToLower(withoutSuffix)
|
||||||
logrus.Debugf("parsed '%s' as name from '%s'", name, secretEnvVar)
|
logrus.Debugf("parsed %s as name from %s", name, secretEnvVar)
|
||||||
return name
|
return name
|
||||||
}
|
}
|
||||||
|
|
||||||
// TODO: should probably go in the config/app package?
|
|
||||||
func ParseGeneratedSecretName(secret string, appEnv config.App) string {
|
func ParseGeneratedSecretName(secret string, appEnv config.App) string {
|
||||||
name := fmt.Sprintf("%s_", appEnv.StackName())
|
name := fmt.Sprintf("%s_", appEnv.StackName())
|
||||||
withoutAppName := strings.TrimPrefix(secret, name)
|
withoutAppName := strings.TrimPrefix(secret, name)
|
||||||
idx := strings.LastIndex(withoutAppName, "_")
|
idx := strings.LastIndex(withoutAppName, "_")
|
||||||
parsed := withoutAppName[:idx]
|
parsed := withoutAppName[:idx]
|
||||||
logrus.Debugf("parsed '%s' as name from '%s'", parsed, secret)
|
logrus.Debugf("parsed %s as name from %s", parsed, secret)
|
||||||
return parsed
|
return parsed
|
||||||
}
|
}
|
||||||
|
|
||||||
// TODO: should probably go in the config/app package?
|
|
||||||
func ParseSecretEnvVarValue(secret string) (secretValue, error) {
|
func ParseSecretEnvVarValue(secret string) (secretValue, error) {
|
||||||
values := strings.Split(secret, "#")
|
values := strings.Split(secret, "#")
|
||||||
if len(values) == 0 {
|
if len(values) == 0 {
|
||||||
return secretValue{}, fmt.Errorf("unable to parse '%s'", secret)
|
return secretValue{}, fmt.Errorf("unable to parse %s", secret)
|
||||||
}
|
}
|
||||||
|
|
||||||
if len(values) == 1 {
|
if len(values) == 1 {
|
||||||
|
@ -113,7 +111,7 @@ func ParseSecretEnvVarValue(secret string) (secretValue, error) {
|
||||||
}
|
}
|
||||||
version := strings.ReplaceAll(values[0], " ", "")
|
version := strings.ReplaceAll(values[0], " ", "")
|
||||||
|
|
||||||
logrus.Debugf("parsed version '%s' and length '%v' from '%s'", version, length, secret)
|
logrus.Debugf("parsed version %s and length '%v' from %s", version, length, secret)
|
||||||
|
|
||||||
return secretValue{Version: version, Length: length}, nil
|
return secretValue{Version: version, Length: length}, nil
|
||||||
}
|
}
|
||||||
|
@ -122,27 +120,44 @@ func ParseSecretEnvVarValue(secret string) (secretValue, error) {
|
||||||
func GenerateSecrets(secretEnvVars map[string]string, appName, server string) (map[string]string, error) {
|
func GenerateSecrets(secretEnvVars map[string]string, appName, server string) (map[string]string, error) {
|
||||||
secrets := make(map[string]string)
|
secrets := make(map[string]string)
|
||||||
|
|
||||||
|
var mutex sync.Mutex
|
||||||
|
var wg sync.WaitGroup
|
||||||
ch := make(chan error, len(secretEnvVars))
|
ch := make(chan error, len(secretEnvVars))
|
||||||
for secretEnvVar := range secretEnvVars {
|
for secretEnvVar := range secretEnvVars {
|
||||||
|
wg.Add(1)
|
||||||
|
|
||||||
go func(s string) {
|
go func(s string) {
|
||||||
|
defer wg.Done()
|
||||||
|
|
||||||
secretName := ParseSecretEnvVarName(s)
|
secretName := ParseSecretEnvVarName(s)
|
||||||
secretValue, err := ParseSecretEnvVarValue(secretEnvVars[s])
|
secretValue, err := ParseSecretEnvVarValue(secretEnvVars[s])
|
||||||
if err != nil {
|
if err != nil {
|
||||||
ch <- err
|
ch <- err
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
secretRemoteName := fmt.Sprintf("%s_%s_%s", appName, secretName, secretValue.Version)
|
secretRemoteName := fmt.Sprintf("%s_%s_%s", appName, secretName, secretValue.Version)
|
||||||
logrus.Debugf("attempting to generate and store '%s' on '%s'", secretRemoteName, server)
|
logrus.Debugf("attempting to generate and store %s on %s", secretRemoteName, server)
|
||||||
|
|
||||||
if secretValue.Length > 0 {
|
if secretValue.Length > 0 {
|
||||||
passwords, err := GeneratePasswords(1, uint(secretValue.Length))
|
passwords, err := GeneratePasswords(1, uint(secretValue.Length))
|
||||||
if err != nil {
|
if err != nil {
|
||||||
ch <- err
|
ch <- err
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
if err := client.StoreSecret(secretRemoteName, passwords[0], server); err != nil {
|
if err := client.StoreSecret(secretRemoteName, passwords[0], server); err != nil {
|
||||||
ch <- err
|
if strings.Contains(err.Error(), "AlreadyExists") {
|
||||||
|
logrus.Warnf("%s already exists, moving on...", secretRemoteName)
|
||||||
|
ch <- nil
|
||||||
|
} else {
|
||||||
|
ch <- err
|
||||||
|
}
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
mutex.Lock()
|
||||||
|
defer mutex.Unlock()
|
||||||
secrets[secretName] = passwords[0]
|
secrets[secretName] = passwords[0]
|
||||||
} else {
|
} else {
|
||||||
passphrases, err := GeneratePassphrases(1)
|
passphrases, err := GeneratePassphrases(1)
|
||||||
|
@ -150,15 +165,27 @@ func GenerateSecrets(secretEnvVars map[string]string, appName, server string) (m
|
||||||
ch <- err
|
ch <- err
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
if err := client.StoreSecret(secretRemoteName, passphrases[0], server); err != nil {
|
if err := client.StoreSecret(secretRemoteName, passphrases[0], server); err != nil {
|
||||||
ch <- err
|
if strings.Contains(err.Error(), "AlreadyExists") {
|
||||||
|
logrus.Warnf("%s already exists, moving on...", secretRemoteName)
|
||||||
|
ch <- nil
|
||||||
|
} else {
|
||||||
|
ch <- err
|
||||||
|
}
|
||||||
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
mutex.Lock()
|
||||||
|
defer mutex.Unlock()
|
||||||
secrets[secretName] = passphrases[0]
|
secrets[secretName] = passphrases[0]
|
||||||
}
|
}
|
||||||
ch <- nil
|
ch <- nil
|
||||||
}(secretEnvVar)
|
}(secretEnvVar)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
wg.Wait()
|
||||||
|
|
||||||
for range secretEnvVars {
|
for range secretEnvVars {
|
||||||
err := <-ch
|
err := <-ch
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
@ -166,7 +193,7 @@ func GenerateSecrets(secretEnvVars map[string]string, appName, server string) (m
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
logrus.Debugf("generated and stored '%s' on '%s'", secrets, server)
|
logrus.Debugf("generated and stored %s on %s", secrets, server)
|
||||||
|
|
||||||
return secrets, nil
|
return secrets, nil
|
||||||
}
|
}
|
||||||
|
|
|
@ -12,7 +12,7 @@ import (
|
||||||
func CreateServerDir(serverName string) error {
|
func CreateServerDir(serverName string) error {
|
||||||
serverPath := path.Join(config.ABRA_DIR, "servers", serverName)
|
serverPath := path.Join(config.ABRA_DIR, "servers", serverName)
|
||||||
|
|
||||||
if err := os.Mkdir(serverPath, 0755); err != nil {
|
if err := os.Mkdir(serverPath, 0764); err != nil {
|
||||||
if !os.IsExist(err) {
|
if !os.IsExist(err) {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
|
@ -0,0 +1,78 @@
|
||||||
|
package service
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"fmt"
|
||||||
|
"strings"
|
||||||
|
|
||||||
|
"coopcloud.tech/abra/pkg/formatter"
|
||||||
|
"github.com/AlecAivazis/survey/v2"
|
||||||
|
"github.com/docker/docker/api/types"
|
||||||
|
"github.com/docker/docker/api/types/filters"
|
||||||
|
"github.com/docker/docker/api/types/swarm"
|
||||||
|
"github.com/docker/docker/client"
|
||||||
|
"github.com/sirupsen/logrus"
|
||||||
|
)
|
||||||
|
|
||||||
|
// GetService retrieves a service container. If prompt is true and the retrievd
|
||||||
|
// count of service containers does not match 1, then a prompt is presented to
|
||||||
|
// let the user choose. A count of 0 is handled gracefully.
|
||||||
|
func GetService(c context.Context, cl *client.Client, filters filters.Args, prompt bool) (swarm.Service, error) {
|
||||||
|
serviceOpts := types.ServiceListOptions{Filters: filters}
|
||||||
|
services, err := cl.ServiceList(c, serviceOpts)
|
||||||
|
if err != nil {
|
||||||
|
return swarm.Service{}, err
|
||||||
|
}
|
||||||
|
|
||||||
|
if len(services) == 0 {
|
||||||
|
filter := filters.Get("name")[0]
|
||||||
|
return swarm.Service{}, fmt.Errorf("no services matching the %v filter found?", filter)
|
||||||
|
}
|
||||||
|
|
||||||
|
if len(services) != 1 {
|
||||||
|
var servicesRaw []string
|
||||||
|
for _, service := range services {
|
||||||
|
serviceName := service.Spec.Name
|
||||||
|
created := formatter.HumanDuration(service.CreatedAt.Unix())
|
||||||
|
servicesRaw = append(servicesRaw, fmt.Sprintf("%s (created %v)", serviceName, created))
|
||||||
|
}
|
||||||
|
|
||||||
|
if !prompt {
|
||||||
|
err := fmt.Errorf("expected 1 service but found %v: %s", len(services), strings.Join(servicesRaw, " "))
|
||||||
|
return swarm.Service{}, err
|
||||||
|
}
|
||||||
|
|
||||||
|
logrus.Warnf("ambiguous service list received, prompting for input")
|
||||||
|
|
||||||
|
var response string
|
||||||
|
prompt := &survey.Select{
|
||||||
|
Message: "which service are you looking for?",
|
||||||
|
Options: servicesRaw,
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := survey.AskOne(prompt, &response); err != nil {
|
||||||
|
return swarm.Service{}, err
|
||||||
|
}
|
||||||
|
|
||||||
|
chosenService := strings.TrimSpace(strings.Split(response, " ")[0])
|
||||||
|
for _, service := range services {
|
||||||
|
serviceName := strings.ToLower(service.Spec.Name)
|
||||||
|
if serviceName == chosenService {
|
||||||
|
return service, nil
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
logrus.Panic("failed to match chosen service")
|
||||||
|
}
|
||||||
|
|
||||||
|
return services[0], nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// ContainerToServiceName converts a container name to a service name.
|
||||||
|
func ContainerToServiceName(containerNames []string, stackName string) string {
|
||||||
|
containerName := strings.Join(containerNames, "")
|
||||||
|
trimmed := strings.TrimPrefix(containerName, "/")
|
||||||
|
stackNameServiceName := strings.Split(trimmed, ".")[0]
|
||||||
|
splitter := fmt.Sprintf("%s_", stackName)
|
||||||
|
return strings.Split(stackNameServiceName, splitter)[1]
|
||||||
|
}
|
187
pkg/ssh/ssh.go
187
pkg/ssh/ssh.go
|
@ -111,7 +111,7 @@ type sudoWriter struct {
|
||||||
|
|
||||||
// Write satisfies the write interface for sudoWriter
|
// Write satisfies the write interface for sudoWriter
|
||||||
func (w *sudoWriter) Write(p []byte) (int, error) {
|
func (w *sudoWriter) Write(p []byte) (int, error) {
|
||||||
if string(p) == "sudo_password" {
|
if strings.Contains(string(p), "sudo_password") {
|
||||||
w.stdin.Write([]byte(w.pw + "\n"))
|
w.stdin.Write([]byte(w.pw + "\n"))
|
||||||
w.pw = ""
|
w.pw = ""
|
||||||
return len(p), nil
|
return len(p), nil
|
||||||
|
@ -131,11 +131,9 @@ func RunSudoCmd(cmd, passwd string, cl *Client) error {
|
||||||
}
|
}
|
||||||
defer session.Close()
|
defer session.Close()
|
||||||
|
|
||||||
cmd = "sudo -p " + "sudo_password" + " -S " + cmd
|
sudoCmd := fmt.Sprintf("SSH_ASKPASS=/usr/bin/ssh-askpass; sudo -p sudo_password -S %s", cmd)
|
||||||
|
|
||||||
w := &sudoWriter{
|
w := &sudoWriter{pw: passwd}
|
||||||
pw: passwd,
|
|
||||||
}
|
|
||||||
w.stdin, err = session.StdinPipe()
|
w.stdin, err = session.StdinPipe()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
|
@ -144,79 +142,19 @@ func RunSudoCmd(cmd, passwd string, cl *Client) error {
|
||||||
session.Stdout = w
|
session.Stdout = w
|
||||||
session.Stderr = w
|
session.Stderr = w
|
||||||
|
|
||||||
done := make(chan struct{})
|
modes := ssh.TerminalModes{
|
||||||
scanner := bufio.NewScanner(session.Stdin)
|
ssh.ECHO: 0,
|
||||||
|
ssh.TTY_OP_ISPEED: 14400,
|
||||||
go func() {
|
ssh.TTY_OP_OSPEED: 14400,
|
||||||
for scanner.Scan() {
|
|
||||||
line := scanner.Text()
|
|
||||||
fmt.Println(line)
|
|
||||||
}
|
|
||||||
done <- struct{}{}
|
|
||||||
}()
|
|
||||||
|
|
||||||
if err := session.Start(cmd); err != nil {
|
|
||||||
return err
|
|
||||||
}
|
}
|
||||||
|
|
||||||
<-done
|
err = session.RequestPty("xterm", 80, 40, modes)
|
||||||
|
|
||||||
if err := session.Wait(); err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
// Exec runs a command on a remote and streams output
|
|
||||||
func Exec(cmd string, cl *Client) error {
|
|
||||||
session, err := cl.SSHClient.NewSession()
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
defer session.Close()
|
|
||||||
|
|
||||||
stdout, err := session.StdoutPipe()
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
stderr, err := session.StdoutPipe()
|
if err := session.Run(sudoCmd); err != nil {
|
||||||
if err != nil {
|
return fmt.Errorf("%s", string(w.b.Bytes()))
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
stdoutDone := make(chan struct{})
|
|
||||||
stdoutScanner := bufio.NewScanner(stdout)
|
|
||||||
|
|
||||||
go func() {
|
|
||||||
for stdoutScanner.Scan() {
|
|
||||||
line := stdoutScanner.Text()
|
|
||||||
fmt.Println(line)
|
|
||||||
}
|
|
||||||
stdoutDone <- struct{}{}
|
|
||||||
}()
|
|
||||||
|
|
||||||
stderrDone := make(chan struct{})
|
|
||||||
stderrScanner := bufio.NewScanner(stderr)
|
|
||||||
|
|
||||||
go func() {
|
|
||||||
for stderrScanner.Scan() {
|
|
||||||
line := stderrScanner.Text()
|
|
||||||
fmt.Println(line)
|
|
||||||
}
|
|
||||||
stderrDone <- struct{}{}
|
|
||||||
}()
|
|
||||||
|
|
||||||
if err := session.Start(cmd); err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
<-stdoutDone
|
|
||||||
<-stderrDone
|
|
||||||
|
|
||||||
if err := session.Wait(); err != nil {
|
|
||||||
return err
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
|
@ -320,7 +258,7 @@ func HostKeyAddCallback(hostnameAndPort string, remote net.Addr, pubKey ssh.Publ
|
||||||
|
|
||||||
if exists {
|
if exists {
|
||||||
hostname := strings.Split(hostnameAndPort, ":")[0]
|
hostname := strings.Split(hostnameAndPort, ":")[0]
|
||||||
logrus.Debugf("server SSH host key found for %s, moving on", hostname)
|
logrus.Debugf("server SSH host key found for %s", hostname)
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -330,9 +268,9 @@ func HostKeyAddCallback(hostnameAndPort string, remote net.Addr, pubKey ssh.Publ
|
||||||
|
|
||||||
fmt.Printf(fmt.Sprintf(`
|
fmt.Printf(fmt.Sprintf(`
|
||||||
You are attempting to make an SSH connection to a server but there is no entry
|
You are attempting to make an SSH connection to a server but there is no entry
|
||||||
in your ~/.ssh/known_hosts file which confirms that this is indeed the server
|
in your ~/.ssh/known_hosts file which confirms that you have already validated
|
||||||
you want to connect to. Please take a moment to validate the following SSH host
|
that this is indeed the server you want to connect to. Please take a moment to
|
||||||
key, it is important.
|
validate the following SSH host key, it is important.
|
||||||
|
|
||||||
Host: %s
|
Host: %s
|
||||||
Fingerprint: %s
|
Fingerprint: %s
|
||||||
|
@ -387,7 +325,7 @@ func connect(username, host, port string, authMethod ssh.AuthMethod, timeout tim
|
||||||
conn, err = net.DialTimeout("tcp", hostnameAndPort, timeout)
|
conn, err = net.DialTimeout("tcp", hostnameAndPort, timeout)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logrus.Debugf("tcp dialing %s failed, trying via ~/.ssh/config", hostnameAndPort)
|
logrus.Debugf("tcp dialing %s failed, trying via ~/.ssh/config", hostnameAndPort)
|
||||||
hostConfig, err := GetHostConfig(host, username, port)
|
hostConfig, err := GetHostConfig(host, username, port, true)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
@ -409,12 +347,31 @@ func connect(username, host, port string, authMethod ssh.AuthMethod, timeout tim
|
||||||
}
|
}
|
||||||
|
|
||||||
func connectWithAgentTimeout(host, username, port string, timeout time.Duration) (*Client, error) {
|
func connectWithAgentTimeout(host, username, port string, timeout time.Duration) (*Client, error) {
|
||||||
|
logrus.Debugf("using ssh-agent to make an SSH connection for %s", host)
|
||||||
|
|
||||||
sshAgent, err := net.Dial("unix", os.Getenv("SSH_AUTH_SOCK"))
|
sshAgent, err := net.Dial("unix", os.Getenv("SSH_AUTH_SOCK"))
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
authMethod := ssh.PublicKeysCallback(agent.NewClient(sshAgent).Signers)
|
agentCl := agent.NewClient(sshAgent)
|
||||||
|
authMethod := ssh.PublicKeysCallback(agentCl.Signers)
|
||||||
|
|
||||||
|
loadedKeys, err := agentCl.List()
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
var convertedKeys []string
|
||||||
|
for _, key := range loadedKeys {
|
||||||
|
convertedKeys = append(convertedKeys, key.String())
|
||||||
|
}
|
||||||
|
|
||||||
|
if len(convertedKeys) > 0 {
|
||||||
|
logrus.Debugf("ssh-agent has these keys loaded: %s", strings.Join(convertedKeys, ","))
|
||||||
|
} else {
|
||||||
|
logrus.Debug("ssh-agent has no keys loaded")
|
||||||
|
}
|
||||||
|
|
||||||
return connect(username, host, port, authMethod, timeout)
|
return connect(username, host, port, authMethod, timeout)
|
||||||
}
|
}
|
||||||
|
@ -427,6 +384,11 @@ func connectWithPasswordTimeout(host, username, port, pass string, timeout time.
|
||||||
|
|
||||||
// EnsureHostKey ensures that a host key trusted and added to the ~/.ssh/known_hosts file
|
// EnsureHostKey ensures that a host key trusted and added to the ~/.ssh/known_hosts file
|
||||||
func EnsureHostKey(hostname string) error {
|
func EnsureHostKey(hostname string) error {
|
||||||
|
if hostname == "default" || hostname == "local" {
|
||||||
|
logrus.Debugf("not checking server SSH host key against local/default target")
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
exists, _, err := GetHostKey(hostname)
|
exists, _, err := GetHostKey(hostname)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
|
@ -490,7 +452,7 @@ func GetContextConnDetails(serverName string) (*dockerSSHPkg.Spec, error) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
hostConfig, err := GetHostConfig(serverName, "", "")
|
hostConfig, err := GetHostConfig(serverName, "", "", false)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return &dockerSSHPkg.Spec{}, err
|
return &dockerSSHPkg.Spec{}, err
|
||||||
}
|
}
|
||||||
|
@ -510,40 +472,51 @@ func GetContextConnDetails(serverName string) (*dockerSSHPkg.Spec, error) {
|
||||||
}
|
}
|
||||||
|
|
||||||
// GetHostConfig retrieves a ~/.ssh/config config for a host.
|
// GetHostConfig retrieves a ~/.ssh/config config for a host.
|
||||||
func GetHostConfig(hostname, username, port string) (HostConfig, error) {
|
func GetHostConfig(hostname, username, port string, override bool) (HostConfig, error) {
|
||||||
var hostConfig HostConfig
|
var hostConfig HostConfig
|
||||||
|
|
||||||
var host, idf string
|
if hostname == "" || override {
|
||||||
|
if sshHost := ssh_config.Get(hostname, "Hostname"); sshHost != "" {
|
||||||
if host = ssh_config.Get(hostname, "Hostname"); host == "" {
|
hostname = sshHost
|
||||||
logrus.Debugf("no hostname found in SSH config, assuming %s", hostname)
|
}
|
||||||
host = hostname
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if username == "" {
|
if username == "" || override {
|
||||||
if username = ssh_config.Get(hostname, "User"); username == "" {
|
if sshUser := ssh_config.Get(hostname, "User"); sshUser != "" {
|
||||||
|
username = sshUser
|
||||||
|
} else {
|
||||||
systemUser, err := user.Current()
|
systemUser, err := user.Current()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return hostConfig, err
|
return hostConfig, err
|
||||||
}
|
}
|
||||||
logrus.Debugf("no username found in SSH config or passed on command-line, assuming %s", username)
|
|
||||||
username = systemUser.Username
|
username = systemUser.Username
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if port == "" {
|
if port == "" || override {
|
||||||
if port = ssh_config.Get(hostname, "Port"); port == "" {
|
if sshPort := ssh_config.Get(hostname, "Port"); sshPort != "" {
|
||||||
logrus.Debugf("no port found in SSH config or passed on command-line, assuming 22")
|
// skip override probably correct port with dummy default value from
|
||||||
port = "22"
|
// ssh_config which is 22. only when the original port number is empty
|
||||||
|
// should we try this default. this might not cover all cases
|
||||||
|
// unfortunately.
|
||||||
|
if port != "" && sshPort != "22" {
|
||||||
|
port = sshPort
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
idf = ssh_config.Get(hostname, "IdentityFile")
|
if idf := ssh_config.Get(hostname, "IdentityFile"); idf != "" && idf != "~/.ssh/identity" {
|
||||||
|
var err error
|
||||||
hostConfig.Host = host
|
idf, err = identityFileAbsPath(idf)
|
||||||
if idf != "" {
|
if err != nil {
|
||||||
|
return hostConfig, err
|
||||||
|
}
|
||||||
hostConfig.IdentityFile = idf
|
hostConfig.IdentityFile = idf
|
||||||
|
} else {
|
||||||
|
hostConfig.IdentityFile = ""
|
||||||
}
|
}
|
||||||
|
|
||||||
|
hostConfig.Host = hostname
|
||||||
hostConfig.Port = port
|
hostConfig.Port = port
|
||||||
hostConfig.User = username
|
hostConfig.User = username
|
||||||
|
|
||||||
|
@ -551,3 +524,25 @@ func GetHostConfig(hostname, username, port string) (HostConfig, error) {
|
||||||
|
|
||||||
return hostConfig, nil
|
return hostConfig, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func identityFileAbsPath(relPath string) (string, error) {
|
||||||
|
var err error
|
||||||
|
var absPath string
|
||||||
|
|
||||||
|
if strings.HasPrefix(relPath, "~/") {
|
||||||
|
systemUser, err := user.Current()
|
||||||
|
if err != nil {
|
||||||
|
return absPath, err
|
||||||
|
}
|
||||||
|
absPath = filepath.Join(systemUser.HomeDir, relPath[2:])
|
||||||
|
} else {
|
||||||
|
absPath, err = filepath.Abs(relPath)
|
||||||
|
if err != nil {
|
||||||
|
return absPath, err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
logrus.Debugf("resolved %s to %s to read the ssh identity file", relPath, absPath)
|
||||||
|
|
||||||
|
return absPath, nil
|
||||||
|
}
|
||||||
|
|
|
@ -188,14 +188,14 @@ func ignorableCloseError(err error) bool {
|
||||||
func (c *commandConn) CloseRead() error {
|
func (c *commandConn) CloseRead() error {
|
||||||
// NOTE: maybe already closed here
|
// NOTE: maybe already closed here
|
||||||
if err := c.stdout.Close(); err != nil && !ignorableCloseError(err) {
|
if err := c.stdout.Close(); err != nil && !ignorableCloseError(err) {
|
||||||
// TODO: muted because https://github.com/docker/compose/issues/8544
|
// muted because https://github.com/docker/compose/issues/8544
|
||||||
// logrus.Warnf("commandConn.CloseRead: %v", err)
|
// logrus.Warnf("commandConn.CloseRead: %v", err)
|
||||||
}
|
}
|
||||||
c.stdioClosedMu.Lock()
|
c.stdioClosedMu.Lock()
|
||||||
c.stdoutClosed = true
|
c.stdoutClosed = true
|
||||||
c.stdioClosedMu.Unlock()
|
c.stdioClosedMu.Unlock()
|
||||||
if err := c.killIfStdioClosed(); err != nil {
|
if err := c.killIfStdioClosed(); err != nil {
|
||||||
// TODO: muted because https://github.com/docker/compose/issues/8544
|
// muted because https://github.com/docker/compose/issues/8544
|
||||||
// logrus.Warnf("commandConn.CloseRead: %v", err)
|
// logrus.Warnf("commandConn.CloseRead: %v", err)
|
||||||
}
|
}
|
||||||
return nil
|
return nil
|
||||||
|
@ -212,14 +212,14 @@ func (c *commandConn) Read(p []byte) (int, error) {
|
||||||
func (c *commandConn) CloseWrite() error {
|
func (c *commandConn) CloseWrite() error {
|
||||||
// NOTE: maybe already closed here
|
// NOTE: maybe already closed here
|
||||||
if err := c.stdin.Close(); err != nil && !ignorableCloseError(err) {
|
if err := c.stdin.Close(); err != nil && !ignorableCloseError(err) {
|
||||||
// TODO: muted because https://github.com/docker/compose/issues/8544
|
// muted because https://github.com/docker/compose/issues/8544
|
||||||
// logrus.Warnf("commandConn.CloseWrite: %v", err)
|
// logrus.Warnf("commandConn.CloseWrite: %v", err)
|
||||||
}
|
}
|
||||||
c.stdioClosedMu.Lock()
|
c.stdioClosedMu.Lock()
|
||||||
c.stdinClosed = true
|
c.stdinClosed = true
|
||||||
c.stdioClosedMu.Unlock()
|
c.stdioClosedMu.Unlock()
|
||||||
if err := c.killIfStdioClosed(); err != nil {
|
if err := c.killIfStdioClosed(); err != nil {
|
||||||
// TODO: muted because https://github.com/docker/compose/issues/8544
|
// muted because https://github.com/docker/compose/issues/8544
|
||||||
// logrus.Warnf("commandConn.CloseWrite: %v", err)
|
// logrus.Warnf("commandConn.CloseWrite: %v", err)
|
||||||
}
|
}
|
||||||
return nil
|
return nil
|
||||||
|
@ -239,7 +239,7 @@ func (c *commandConn) Close() error {
|
||||||
logrus.Warnf("commandConn.Close: CloseRead: %v", err)
|
logrus.Warnf("commandConn.Close: CloseRead: %v", err)
|
||||||
}
|
}
|
||||||
if err = c.CloseWrite(); err != nil {
|
if err = c.CloseWrite(); err != nil {
|
||||||
// TODO: muted because https://github.com/docker/compose/issues/8544
|
// muted because https://github.com/docker/compose/issues/8544
|
||||||
// logrus.Warnf("commandConn.Close: CloseWrite: %v", err)
|
// logrus.Warnf("commandConn.Close: CloseWrite: %v", err)
|
||||||
}
|
}
|
||||||
return err
|
return err
|
||||||
|
|
|
@ -2,6 +2,7 @@ package commandconn
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
|
"fmt"
|
||||||
"net"
|
"net"
|
||||||
"net/url"
|
"net/url"
|
||||||
|
|
||||||
|
@ -34,9 +35,26 @@ func getConnectionHelper(daemonURL string, sshFlags []string) (*connhelper.Conne
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, errors.Wrap(err, "ssh host connection is not valid")
|
return nil, errors.Wrap(err, "ssh host connection is not valid")
|
||||||
}
|
}
|
||||||
|
|
||||||
if err := sshPkg.EnsureHostKey(ctxConnDetails.Host); err != nil {
|
if err := sshPkg.EnsureHostKey(ctxConnDetails.Host); err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
hostConfig, err := sshPkg.GetHostConfig(
|
||||||
|
ctxConnDetails.Host,
|
||||||
|
ctxConnDetails.User,
|
||||||
|
ctxConnDetails.Port,
|
||||||
|
false,
|
||||||
|
)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
if hostConfig.IdentityFile != "" {
|
||||||
|
msg := "discovered %s as identity file for %s, using for ssh connection"
|
||||||
|
logrus.Debugf(msg, hostConfig.IdentityFile, ctxConnDetails.Host)
|
||||||
|
sshFlags = append(sshFlags, fmt.Sprintf("-o IdentityFile=%s", hostConfig.IdentityFile))
|
||||||
|
}
|
||||||
|
|
||||||
return &connhelper.ConnectionHelper{
|
return &connhelper.ConnectionHelper{
|
||||||
Dialer: func(ctx context.Context, network, addr string) (net.Conn, error) {
|
Dialer: func(ctx context.Context, network, addr string) (net.Conn, error) {
|
||||||
return New(ctx, "ssh", append(sshFlags, ctxConnDetails.Args("docker", "system", "dial-stdio")...)...)
|
return New(ctx, "ssh", append(sshFlags, ctxConnDetails.Args("docker", "system", "dial-stdio")...)...)
|
||||||
|
@ -49,13 +67,13 @@ func getConnectionHelper(daemonURL string, sshFlags []string) (*connhelper.Conne
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
func NewConnectionHelper(daemonURL string) *connhelper.ConnectionHelper {
|
func NewConnectionHelper(daemonURL string) (*connhelper.ConnectionHelper, error) {
|
||||||
helper, err := GetConnectionHelper(daemonURL)
|
helper, err := GetConnectionHelper(daemonURL)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logrus.Fatal(err)
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
return helper
|
return helper, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func getDockerEndpoint(host string) (docker.Endpoint, error) {
|
func getDockerEndpoint(host string) (docker.Endpoint, error) {
|
||||||
|
|
|
@ -16,7 +16,6 @@ import (
|
||||||
)
|
)
|
||||||
|
|
||||||
// The default escape key sequence: ctrl-p, ctrl-q
|
// The default escape key sequence: ctrl-p, ctrl-q
|
||||||
// TODO: This could be moved to `pkg/term`.
|
|
||||||
var defaultEscapeKeys = []byte{16, 17}
|
var defaultEscapeKeys = []byte{16, 17}
|
||||||
|
|
||||||
// A hijackedIOStreamer handles copying input to and output from streams to the
|
// A hijackedIOStreamer handles copying input to and output from streams to the
|
||||||
|
|
|
@ -399,7 +399,6 @@ func convertServiceNetworks(
|
||||||
return nets, nil
|
return nets, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// TODO: fix secrets API so that SecretAPIClient is not required here
|
|
||||||
func convertServiceSecrets(
|
func convertServiceSecrets(
|
||||||
client client.SecretAPIClient,
|
client client.SecretAPIClient,
|
||||||
namespace Namespace,
|
namespace Namespace,
|
||||||
|
@ -421,6 +420,12 @@ func convertServiceSecrets(
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// NOTE(d1): strip # length=... modifiers
|
||||||
|
if strings.Contains(obj.Name, "#") {
|
||||||
|
vals := strings.Split(obj.Name, "#")
|
||||||
|
obj.Name = strings.TrimSpace(vals[0])
|
||||||
|
}
|
||||||
|
|
||||||
file := swarm.SecretReferenceFileTarget(obj.File)
|
file := swarm.SecretReferenceFileTarget(obj.File)
|
||||||
refs = append(refs, &swarm.SecretReference{
|
refs = append(refs, &swarm.SecretReference{
|
||||||
File: &file,
|
File: &file,
|
||||||
|
@ -442,8 +447,6 @@ func convertServiceSecrets(
|
||||||
// required by the serivce. Unlike convertServiceSecrets, this takes the whole
|
// required by the serivce. Unlike convertServiceSecrets, this takes the whole
|
||||||
// ServiceConfig, because some Configs may be needed as a result of other
|
// ServiceConfig, because some Configs may be needed as a result of other
|
||||||
// fields (like CredentialSpecs).
|
// fields (like CredentialSpecs).
|
||||||
//
|
|
||||||
// TODO: fix configs API so that ConfigsAPIClient is not required here
|
|
||||||
func convertServiceConfigObjs(
|
func convertServiceConfigObjs(
|
||||||
client client.ConfigAPIClient,
|
client client.ConfigAPIClient,
|
||||||
namespace Namespace,
|
namespace Namespace,
|
||||||
|
@ -626,7 +629,6 @@ func convertHealthcheck(healthcheck *composetypes.HealthCheckConfig) (*container
|
||||||
}
|
}
|
||||||
|
|
||||||
func convertRestartPolicy(restart string, source *composetypes.RestartPolicy) (*swarm.RestartPolicy, error) {
|
func convertRestartPolicy(restart string, source *composetypes.RestartPolicy) (*swarm.RestartPolicy, error) {
|
||||||
// TODO: log if restart is being ignored
|
|
||||||
if source == nil {
|
if source == nil {
|
||||||
policy, err := opts.ParseRestartPolicy(restart)
|
policy, err := opts.ParseRestartPolicy(restart)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|
|
@ -0,0 +1,44 @@
|
||||||
|
package upstream
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"fmt"
|
||||||
|
|
||||||
|
"github.com/docker/docker/api/types"
|
||||||
|
"github.com/docker/docker/client"
|
||||||
|
"github.com/sirupsen/logrus"
|
||||||
|
)
|
||||||
|
|
||||||
|
// RunServiceScale scales a service (useful for restart action)
|
||||||
|
func RunServiceScale(ctx context.Context, cl *client.Client, serviceID string, scale uint64) error {
|
||||||
|
service, _, err := cl.ServiceInspectWithRaw(ctx, serviceID, types.ServiceInspectOptions{})
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
serviceMode := &service.Spec.Mode
|
||||||
|
if serviceMode.Replicated != nil {
|
||||||
|
serviceMode.Replicated.Replicas = &scale
|
||||||
|
} else if serviceMode.ReplicatedJob != nil {
|
||||||
|
serviceMode.ReplicatedJob.TotalCompletions = &scale
|
||||||
|
} else {
|
||||||
|
return fmt.Errorf("scale can only be used with replicated or replicated-job mode")
|
||||||
|
}
|
||||||
|
|
||||||
|
response, err := cl.ServiceUpdate(
|
||||||
|
ctx,
|
||||||
|
service.ID,
|
||||||
|
service.Version,
|
||||||
|
service.Spec,
|
||||||
|
types.ServiceUpdateOptions{},
|
||||||
|
)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, warning := range response.Warnings {
|
||||||
|
logrus.Warn(warning)
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
|
@ -13,6 +13,11 @@ import (
|
||||||
"github.com/sirupsen/logrus"
|
"github.com/sirupsen/logrus"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
// DontSkipValidation ensures validation is done for compose file loading
|
||||||
|
func DontSkipValidation(opts *loader.Options) {
|
||||||
|
opts.SkipValidation = false
|
||||||
|
}
|
||||||
|
|
||||||
// LoadComposefile parse the composefile specified in the cli and returns its Config and version.
|
// LoadComposefile parse the composefile specified in the cli and returns its Config and version.
|
||||||
func LoadComposefile(opts Deploy, appEnv map[string]string) (*composetypes.Config, error) {
|
func LoadComposefile(opts Deploy, appEnv map[string]string) (*composetypes.Config, error) {
|
||||||
configDetails, err := getConfigDetails(opts.Composefiles, appEnv)
|
configDetails, err := getConfigDetails(opts.Composefiles, appEnv)
|
||||||
|
@ -21,26 +26,30 @@ func LoadComposefile(opts Deploy, appEnv map[string]string) (*composetypes.Confi
|
||||||
}
|
}
|
||||||
|
|
||||||
dicts := getDictsFrom(configDetails.ConfigFiles)
|
dicts := getDictsFrom(configDetails.ConfigFiles)
|
||||||
config, err := loader.Load(configDetails)
|
config, err := loader.Load(configDetails, DontSkipValidation)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
if fpe, ok := err.(*loader.ForbiddenPropertiesError); ok {
|
if fpe, ok := err.(*loader.ForbiddenPropertiesError); ok {
|
||||||
return nil, fmt.Errorf("compose file contains unsupported options:\n\n%s",
|
return nil, fmt.Errorf("compose file contains unsupported options: %s",
|
||||||
propertyWarnings(fpe.Properties))
|
propertyWarnings(fpe.Properties))
|
||||||
}
|
}
|
||||||
|
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
recipeName, exists := appEnv["RECIPE"]
|
||||||
|
if !exists {
|
||||||
|
recipeName, _ = appEnv["TYPE"]
|
||||||
|
}
|
||||||
|
|
||||||
unsupportedProperties := loader.GetUnsupportedProperties(dicts...)
|
unsupportedProperties := loader.GetUnsupportedProperties(dicts...)
|
||||||
if len(unsupportedProperties) > 0 {
|
if len(unsupportedProperties) > 0 {
|
||||||
logrus.Warnf("Ignoring unsupported options: %s\n\n",
|
logrus.Warnf("%s: ignoring unsupported options: %s",
|
||||||
strings.Join(unsupportedProperties, ", "))
|
recipeName, strings.Join(unsupportedProperties, ", "))
|
||||||
}
|
}
|
||||||
|
|
||||||
deprecatedProperties := loader.GetDeprecatedProperties(dicts...)
|
deprecatedProperties := loader.GetDeprecatedProperties(dicts...)
|
||||||
if len(deprecatedProperties) > 0 {
|
if len(deprecatedProperties) > 0 {
|
||||||
logrus.Warnf("Ignoring deprecated options:\n\n%s\n\n",
|
logrus.Warnf("%s: ignoring deprecated options: %s",
|
||||||
propertyWarnings(deprecatedProperties))
|
recipeName, propertyWarnings(deprecatedProperties))
|
||||||
}
|
}
|
||||||
return config, nil
|
return config, nil
|
||||||
}
|
}
|
||||||
|
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue