Compare commits
1300 Commits
0.1.3-alph
...
main
Author | SHA1 | Date |
---|---|---|
Moritz | e6b35e8524 | |
Moritz | 8a0274cac0 | |
Moritz | e609924af0 | |
Moritz | 70e2943301 | |
Moritz | 0590c1824d | |
Moritz | 459abecfa5 | |
Moritz | 183ad8f576 | |
decentral1se | 03f94da2d8 | |
f | 766f69b0fd | |
decentral1se | 004cd70aed | |
decentral1se | a4de446f58 | |
Rich M | d21c35965d | |
Mayel de Borniol | 63ea58ffaa | |
decentral1se | 2ecace3e90 | |
p4u1 | d5ac3958a4 | |
3wc | 72c20e0039 | |
decentral1se | 575f9905f1 | |
decentral1se | e3a0af5840 | |
decentral1se | 9a3a39a185 | |
decentral1se | cea56dddde | |
decentral1se | 2c515ce70a | |
p4u1 | 40c0fb4bac | |
p4u1 | 0643df6d73 | |
basebuilder | e9b99fe921 | |
p4u1 | 4920dfedb3 | |
p4u1 | 0a3624c15b | |
decentral1se | c5687dfbd7 | |
p4u1 | ca91abbed9 | |
p4u1 | d4727db8f9 | |
p4u1 | af8cd1f67a | |
decentral1se | cdd7516e54 | |
test | 99e3ed416f | |
p4u1 | 02b726db02 | |
p4u1 | 2de6934322 | |
decentral1se | cb49cf06d1 | |
decentral1se | 9affda8a70 | |
p4u1 | 3957b7c965 | |
Moritz | 0d83339d80 | |
decentral1se | 6e54ec7213 | |
decentral1se | 66b40a9189 | |
decentral1se | 049f02f063 | |
decentral1se | 15857e6453 | |
decentral1se | 31e0ed75b0 | |
p4u1 | b1d3fcbb0b | |
p4u1 | 7b6134f35e | |
decentral1se | 316b59b465 | |
decentral1se | 92b073d5b6 | |
Comrade Renovate Bot | 9b0dd933b5 | |
Comrade Renovate Bot | f255fa1555 | |
Comrade Renovate Bot | 74200318ab | |
Comrade Renovate Bot | 609656b4e1 | |
decentral1se | 856c9f2f7d | |
Comrade Renovate Bot | bd5cdd3443 | |
Comrade Renovate Bot | 79d274e074 | |
Comrade Renovate Bot | 51e3df17f1 | |
knoflook | ccf0215495 | |
decentral1se | 254df7f2be | |
decentral1se | 6a673ef101 | |
decentral1se | 7f7f7224c6 | |
decentral1se | f96bf9a8ac | |
decentral1se | dcecf32999 | |
decentral1se | bc88dac150 | |
decentral1se | 704c0e9c74 | |
decentral1se | c9bb7e15c2 | |
decentral1se | d90c9b88f1 | |
decentral1se | 69ce07f81f | |
decentral1se | 85b90ef80c | |
decentral1se | 3e511446aa | |
decentral1se | 7566b4262b | |
decentral1se | c249c6ae9c | |
decentral1se | be693e9df0 | |
decentral1se | a43125701c | |
decentral1se | b57edb440a | |
decentral1se | 6fc4573a71 | |
Comrade Renovate Bot | cbe6676881 | |
decentral1se | b4fd39828f | |
decentral1se | 14f2d72aba | |
decentral1se | 57692ec3c9 | |
decentral1se | 47d3b77003 | |
decentral1se | 8078e91e52 | |
decentral1se | dc5d3a8dd6 | |
decentral1se | ab6107610c | |
decentral1se | e837835e00 | |
decentral1se | c646263e9e | |
decentral1se | 422c642949 | |
decentral1se | 379915587c | |
decentral1se | 970ae0fc4e | |
decentral1se | d11ad61efb | |
decentral1se | 54dc696c69 | |
decentral1se | 7e3ce9c42a | |
Comrade Renovate Bot | 7751423c7d | |
decentral1se | f18f0b6f82 | |
decentral1se | 892f6c0730 | |
decentral1se | b53fd2689c | |
decentral1se | 906bf65d47 | |
decentral1se | 1e6a6e6174 | |
decentral1se | 1e4f1b4ade | |
decentral1se | 306fe02d1c | |
decentral1se | e4610f8ad5 | |
decentral1se | e1f900de14 | |
decentral1se | d5b18d74ef | |
decentral1se | 776a83d8d1 | |
decentral1se | 810cea8269 | |
decentral1se | c0f3e6f2a4 | |
decentral1se | 7b240059b0 | |
decentral1se | c456d13881 | |
decentral1se | c7c553164d | |
decentral1se | 7616528f4e | |
decentral1se | 6cd85f7239 | |
decentral1se | b1774cc44b | |
decentral1se | e438fc6e8e | |
decentral1se | c065ceb1f0 | |
decentral1se | ce4b775428 | |
decentral1se | d02f659bf8 | |
decentral1se | f3ded88ed8 | |
decentral1se | bf648eeb5d | |
decentral1se | 533edbf172 | |
decentral1se | 78b8cf9725 | |
decentral1se | f0560ca975 | |
decentral1se | ce7b4733d7 | |
decentral1se | 575bfbb0fb | |
decentral1se | 510ce66570 | |
decentral1se | 82631d9ab1 | |
decentral1se | 358490e939 | |
decentral1se | 79b9cc9be7 | |
decentral1se | 9b6eb613aa | |
decentral1se | 8f1231e409 | |
decentral1se | aa37c936eb | |
decentral1se | 3d1158a425 | |
decentral1se | 8788558cf1 | |
decentral1se | 76035e003e | |
decentral1se | b708382d26 | |
decentral1se | 557b670fc5 | |
decentral1se | e116148c49 | |
decentral1se | d5593b69e0 | |
decentral1se | 0be532692d | |
decentral1se | 7a9224b2b2 | |
Comrade Renovate Bot | e73d1a8359 | |
decentral1se | f8c49c82c8 | |
decentral1se | ab7edd2a62 | |
decentral1se | b1888dcf0f | |
Comrade Renovate Bot | e5e122296f | |
decentral1se | 83bf148304 | |
Comrade Renovate Bot | d80b882b83 | |
Comrade Renovate Bot | c345c6f5f1 | |
decentral1se | f8c4fd72a3 | |
decentral1se | 10f612f998 | |
decentral1se | 58e78e4d7c | |
decentral1se | 25258d3d64 | |
decentral1se | b3bd058962 | |
decentral1se | b4fd7fd77c | |
decentral1se | 64cfdae6b7 | |
decentral1se | 0a765794f2 | |
decentral1se | 18dc6e9434 | |
Comrade Renovate Bot | 4ba4107288 | |
decentral1se | d9b4f4ef3b | |
Comrade Renovate Bot | c365dcf96d | |
Comrade Renovate Bot | 0c6a7cc0b8 | |
decentral1se | 6640cfab64 | |
Comrade Renovate Bot | 71addcd1b2 | |
decentral1se | 60c0e55e3d | |
Comrade Renovate Bot | e42139fd83 | |
Comrade Renovate Bot | 2d826e47d0 | |
Rich M | 2db172ea5a | |
Richard M | 2077658f6a | |
Richard M | 502e26b534 | |
Rich M | e22b692ada | |
decentral1se | 5ae73f700e | |
decentral1se | 63d419caae | |
decentral1se | 179b66d65c | |
decentral1se | c9144d90f3 | |
decentral1se | ebf5d82c56 | |
decentral1se | 8bb98ed0ed | |
decentral1se | 23f5745cb8 | |
decentral1se | 2cd453ae8d | |
decentral1se | e42cc0f91d | |
Comrade Renovate Bot | 1de45a6508 | |
decentral1se | 55c7aca3c0 | |
decentral1se | 8fa9419c99 | |
decentral1se | 73ad0a802e | |
decentral1se | 798fd2336c | |
Comrade Renovate Bot | 70e65d6667 | |
decentral1se | efc9602808 | |
decentral1se | 1e110f1375 | |
decentral1se | 473cae0146 | |
decentral1se | 2da859896a | |
decentral1se | ab00578ee1 | |
decentral1se | 3dc5662821 | |
decentral1se | ab64eb2e8d | |
decentral1se | 4f22228aab | |
decentral1se | a7f1af7476 | |
decentral1se | 949510d4c3 | |
decentral1se | 9f478dac1d | |
decentral1se | 69f38ea445 | |
decentral1se | 0582147874 | |
decentral1se | bdeeb75973 | |
decentral1se | 2518e65e3e | |
decentral1se | 8354c92654 | |
Comrade Renovate Bot | 173e81b885 | |
Comrade Renovate Bot | d91731518b | |
Comrade Renovate Bot | 2bfee5058d | |
Richard M | a7ce71d6cf | |
Richard M | 10f60fee1d | |
Richard M | 6025ab443f | |
Richard M | 43ecf35449 | |
Richard M | 4d2a1065d2 | |
Richard M | 0b67500cab | |
decentral1se | e0c3a06182 | |
Comrade Renovate Bot | a86ba4e97b | |
Comrade Renovate Bot | b5b3395138 | |
decentral1se | 502b78ef5c | |
Comrade Renovate Bot | 3e2b4dae6a | |
Comrade Renovate Bot | 573fe403b3 | |
decentral1se | 76862e9d66 | |
Comrade Renovate Bot | e8e337a608 | |
Comrade Renovate Bot | 500389c5f5 | |
decentral1se | dea665652c | |
Comrade Renovate Bot | e8cf84b523 | |
Comrade Renovate Bot | fab25a6124 | |
Comrade Renovate Bot | e71377539c | |
decentral1se | 497ecf476a | |
decentral1se | ff1c043ec5 | |
decentral1se | c4d2e297f8 | |
Comrade Renovate Bot | e98b8e3666 | |
Comrade Renovate Bot | f5835fe404 | |
Comrade Renovate Bot | 07bbe9394f | |
knoflook | 6974681af5 | |
Comrade Renovate Bot | 73250fb899 | |
Comrade Renovate Bot | 4ce377cffe | |
Comrade Renovate Bot | c7dd029689 | |
Comrade Renovate Bot | 51319d2ae2 | |
Comrade Renovate Bot | d1c2343a54 | |
Comrade Renovate Bot | 135ffde0e5 | |
decentral1se | 6e4dd51b27 | |
Comrade Renovate Bot | 81b652718b | |
decentral1se | 442f46e17f | |
decentral1se | 574794d4e8 | |
Comrade Renovate Bot | 88184125c4 | |
Comrade Renovate Bot | 8a4baa66ee | |
Comrade Renovate Bot | 16ecbd0291 | |
Comrade Renovate Bot | f65b262c11 | |
Cassowary | c5d9d88359 | |
Cassowary | 87e5909363 | |
Cassowary | 152c5d4563 | |
Cassowary | 34b274bc52 | |
Cassowary | 62f8103fc2 | |
Comrade Renovate Bot | 2dcbfa1d65 | |
moritz | 049da94629 | |
Moritz | b2739dcdf2 | |
decentral1se | 343b2bfb91 | |
decentral1se | 17aeed6dbd | |
Moritz | 27cac81830 | |
moritz | 31ec322c55 | |
moritz | 18615eaaef | |
Comrade Renovate Bot | 5e508538f3 | |
Moritz | 9e05000476 | |
decentral1se | f088a0d327 | |
Comrade Renovate Bot | 3832403c97 | |
Comrade Renovate Bot | 47058c897c | |
Comrade Renovate Bot | 5d4c7f8ef0 | |
Moritz | ee4315adb3 | |
Moritz | 9ade250f01 | |
decentral1se | 81b032be85 | |
Comrade Renovate Bot | 5409990a68 | |
Comrade Renovate Bot | b1595c0ec9 | |
decentral1se | 6c99a2980b | |
decentral1se | a9405a36c6 | |
Moritz | 15a417d9bd | |
moritz | 0ce8b3a5c2 | |
Moritz | edff63b446 | |
Moritz | d5979436c1 | |
Moritz | cb33edaac3 | |
Moritz | e9879e2226 | |
Moritz | 5428ebf43b | |
Moritz | d120299929 | |
Moritz | 3753357ef8 | |
Moritz | 611430aab2 | |
Comrade Renovate Bot | f56b02b951 | |
decentral1se | f29278f80a | |
Comrade Renovate Bot | a9a294cbb7 | |
decentral1se | 73004789a4 | |
Comrade Renovate Bot | 440aba77d5 | |
Moritz | e4a89bcc4f | |
decentral1se | eb07617e73 | |
decentral1se | 9fca4e56fb | |
decentral1se | f17523010a | |
decentral1se | 3058178d84 | |
decentral1se | d62c4e3400 | |
decentral1se | 5739758c3a | |
decentral1se | a6b5566fa6 | |
decentral1se | 4dbe1362a8 | |
decentral1se | 98fc36c830 | |
decentral1se | b8abc8705c | |
decentral1se | 636261934f | |
decentral1se | 6381b73a6a | |
decentral1se | 1a72e27045 | |
decentral1se | 9754c1b2d1 | |
vera | b14ec0cda4 | |
vera | c7730ba604 | |
decentral1se | 47c61df444 | |
decentral1se | 312b93e794 | |
decentral1se | 992e675921 | |
decentral1se | d4f3a7be31 | |
codegod100 | d619f399e7 | |
decentral1se | 96a8cb7aff | |
Comrade Renovate Bot | 9b51d22c20 | |
Philipp Rothmann | d789830ce4 | |
decentral1se | e4b4084dfd | |
decentral1se | ff58646cfc | |
decentral1se | eec6469ba1 | |
decentral1se | e94f947d20 | |
decentral1se | cccbe4a2ec | |
decentral1se | f53cfb6c36 | |
decentral1se | f55f01a25c | |
decentral1se | ce5c1a9ebb | |
decentral1se | 5e3b039f93 | |
decentral1se | 0e9d218bbc | |
decentral1se | e1c635af86 | |
decentral1se | f6b139dfea | |
decentral1se | 3d2b8fa446 | |
decentral1se | 2eebac6fc0 | |
decentral1se | f5e2710138 | |
decentral1se | 986470784d | |
moritz | e76ed771df | |
decentral1se | f28af5e42f | |
decentral1se | fdf4854b0c | |
decentral1se | 6b9512d09c | |
decentral1se | 21a86731d0 | |
decentral1se | 91102e6607 | |
decentral1se | fadafda0b8 | |
decentral1se | c03cf76702 | |
decentral1se | ebb748b7e7 | |
decentral1se | 2b3dbee24c | |
decentral1se | a448cfdd0d | |
Comrade Renovate Bot | 5ee6eb53b2 | |
Comrade Renovate Bot | 7b2880d425 | |
Comrade Renovate Bot | 928d6f5d7f | |
decentral1se | 29fa607190 | |
decentral1se | 7c541ffdfa | |
decentral1se | 7ccc4b4c08 | |
decentral1se | ef4df35995 | |
decentral1se | 71a9155042 | |
decentral1se | 2a88491d7c | |
decentral1se | bf79552204 | |
decentral1se | 0a7fa54759 | |
decentral1se | 7c1a97be72 | |
Comrade Renovate Bot | f20fbbc913 | |
Moritz | 76717531bd | |
Moritz | 6774893412 | |
moritz | ebb86391af | |
moritz | 50db39424c | |
moritz | ca1ea32c46 | |
Moritz | 32851d4d99 | |
decentral1se | c47aa49373 | |
decentral1se | cdee6b00c4 | |
decentral1se | a3e9383a4a | |
decentral1se | b4cce7dcf4 | |
decentral1se | b089109c94 | |
decentral1se | 27e0708ac7 | |
decentral1se | a93786c6be | |
decentral1se | 521570224b | |
decentral1se | c72462e0b6 | |
decentral1se | 54646650c7 | |
decentral1se | 903aac9d7a | |
decentral1se | 49865c6a97 | |
decentral1se | a694c8c20e | |
decentral1se | d4a42d8378 | |
decentral1se | e16ca45fa7 | |
decentral1se | 32de2ee5de | |
decentral1se | 834d41ef50 | |
decentral1se | 6fe5aed408 | |
decentral1se | 03041b88d0 | |
decentral1se | 9338afb492 | |
Comrade Renovate Bot | 313ae0dbe2 | |
Comrade Renovate Bot | 0dc7ec8570 | |
decentral1se | 8a1a3aeb12 | |
3wc | 910469cfa0 | |
3wc | 4f055096e9 | |
3wc | 6c93f980dc | |
3wc | 57f52bbf33 | |
3wc | 9f5620d881 | |
3wc | 44c4555aae | |
3wc | 025d1e0a8c | |
3wc | f484021148 | |
3wc | 1403eac72c | |
Cassowary | a6e23938eb | |
Cassowary | cae0d9ef79 | |
decentral1se | 89fcb5b216 | |
Comrade Renovate Bot | 56b3e9bb19 | |
decentral1se | 9aa4a98b0b | |
decentral1se | 5fbba0c934 | |
decentral1se | d772f4b2c6 | |
Comrade Renovate Bot | 7513fbd57d | |
Comrade Renovate Bot | 9082761f86 | |
Comrade Renovate Bot | a3bd6e14d0 | |
decentral1se | 49dd702d98 | |
decentral1se | e4cd5e3efe | |
Comrade Renovate Bot | 1db4602020 | |
Comrade Renovate Bot | b50718050b | |
3wc | 9e39e1dc88 | |
decentral1se | 1a3a53cfc2 | |
Comrade Renovate Bot | 5f53d591f8 | |
Comrade Renovate Bot | d7013518cc | |
3wc | b204b289d1 | |
decentral1se | 3a0d9f7ed7 | |
decentral1se | e794c17fb4 | |
moritz | e788ac21f6 | |
decentral1se | 4e78b060e0 | |
decentral1se | 4fada9c1b7 | |
decentral1se | 08d26e1a39 | |
decentral1se | 581b28a2b1 | |
Comrade Renovate Bot | e4d58849ce | |
Comrade Renovate Bot | 5e8b9d9bf7 | |
Comrade Renovate Bot | 11dd665794 | |
Comrade Renovate Bot | ba163e9bf3 | |
Cassowary | 09048ee223 | |
Cassowary | 19a055b59b | |
Cassowary | 1b28a07e17 | |
Cassowary | 82866cd213 | |
decentral1se | 47f3d2638b | |
decentral1se | a3b894320a | |
Comrade Renovate Bot | 9424a58c52 | |
Comrade Renovate Bot | 1751ba534e | |
3wc | a21d431541 | |
3wc | 8fad34e430 | |
decentral1se | a036de3c26 | |
Comrade Renovate Bot | 4c2109e8ce | |
Moritz | 7f745ff19f | |
Moritz | 521d3d1259 | |
decentral1se | 14187449a5 | |
decentral1se | 2037f4cc19 | |
Comrade Renovate Bot | 05d492d30b | |
Moritz | 9591e91ed6 | |
decentral1se | f6f587e506 | |
Comrade Renovate Bot | 4f28dbee87 | |
Comrade Renovate Bot | ad1cc038e3 | |
Comrade Renovate Bot | 15dbd85d25 | |
Comrade Renovate Bot | 2a97955586 | |
decentral1se | 9e44d1dfba | |
Comrade Renovate Bot | 87ad8e2761 | |
Comrade Renovate Bot | cfe703b15d | |
Comrade Renovate Bot | 96503fa9e9 | |
decentral1se | 07d49d8566 | |
decentral1se | 5a7c25375a | |
decentral1se | 652143e76c | |
decentral1se | 8afce6eebf | |
decentral1se | d3e6c9dc94 | |
Comrade Renovate Bot | 4fd0ca3dd1 | |
Comrade Renovate Bot | dc0b6c2c8c | |
Comrade Renovate Bot | 54f242baf7 | |
Comrade Renovate Bot | 07620c7d89 | |
Comrade Renovate Bot | 1cae4cce4e | |
decentral1se | 9347ade82c | |
decentral1se | 3fa18a8050 | |
decentral1se | 4ac67662a2 | |
decentral1se | d1be4077c5 | |
decentral1se | 5a88c34a7c | |
decentral1se | 2e452e3213 | |
decentral1se | 9d16a8e10c | |
Comrade Renovate Bot | 8755a6c3b4 | |
Comrade Renovate Bot | 8cee8ae33a | |
Comrade Renovate Bot | 15b138e026 | |
Comrade Renovate Bot | 4a8ed36dea | |
Comrade Renovate Bot | 7d0c3cc496 | |
Comrade Renovate Bot | 3cf479ffd5 | |
Comrade Renovate Bot | d402050a40 | |
decentral1se | 664edce09d | |
decentral1se | e41caa891d | |
decentral1se | 42a6818ff4 | |
decentral1se | 8f709c05bf | |
decentral1se | a4ebf7befc | |
Franz Heinzmann (Frando) | 8458e61d17 | |
decentral1se | b42d5bf113 | |
decentral1se | f684c6d6e4 | |
Comrade Renovate Bot | 6593baf9f4 | |
decentral1se | 50123f3810 | |
decentral1se | d132e87f14 | |
Comrade Renovate Bot | 37a1c3fb85 | |
Comrade Renovate Bot | c8183aa6d1 | |
decentral1se | 4711de29ae | |
decentral1se | b719aaba41 | |
Comrade Renovate Bot | 074c51b672 | |
Comrade Renovate Bot | 1aa6be704a | |
decentral1se | e8e3cb8598 | |
decentral1se | 85fec6b107 | |
Comrade Renovate Bot | 12dbb061a9 | |
Comrade Renovate Bot | 351bd7d4ba | |
decentral1se | cdc7037c25 | |
Comrade Renovate Bot | 682237c98e | |
decentral1se | 08d97be43a | |
decentral1se | 786dfde27e | |
Comrade Renovate Bot | 6e012b910e | |
Comrade Renovate Bot | c153c5da2e | |
decentral1se | 0540e42168 | |
decentral1se | 4bc95a5b52 | |
decentral1se | febc6e2874 | |
decentral1se | b2c990bf12 | |
decentral1se | 3b8893502a | |
Comrade Renovate Bot | e0a0378f73 | |
Comrade Renovate Bot | 0837045d44 | |
decentral1se | cd8137a7d8 | |
decentral1se | ece4537a2d | |
decentral1se | 16fe1b68c6 | |
Comrade Renovate Bot | e37f235fd4 | |
decentral1se | 0423ce7e84 | |
decentral1se | d46ac22bd7 | |
decentral1se | cef5cd8611 | |
Comrade Renovate Bot | 8b38dac9ab | |
Comrade Renovate Bot | 89fc875088 | |
decentral1se | 026a9ba2d7 | |
Comrade Renovate Bot | 99f2b9c6dc | |
decentral1se | 578e91eeec | |
decentral1se | 49f79dbd45 | |
decentral1se | 574d556bb9 | |
decentral1se | 801aad64df | |
decentral1se | b0a0829712 | |
Comrade Renovate Bot | 6aae06c3ec | |
Comrade Renovate Bot | d0c6fa5b45 | |
Comrade Renovate Bot | c947354ee3 | |
decentral1se | 9b7e5752fb | |
Comrade Renovate Bot | 9bc51629d4 | |
decentral1se | 4ba15df9b7 | |
knoflook | 5721b357a2 | |
decentral1se | 6140abbcac | |
decentral1se | 996255188b | |
knoflook | 11d78234b2 | |
knoflook | c214937e4a | |
decentral1se | 3a3f41988b | |
decentral1se | f6690a80bd | |
decentral1se | 2337c4648b | |
decentral1se | a1190f1352 | |
decentral1se | e421922f5b | |
decentral1se | 10d5705d1a | |
decentral1se | a4f1634b24 | |
decentral1se | cbd924060f | |
decentral1se | 3c4bb6a55e | |
decentral1se | a0d7a76f9d | |
decentral1se | c71efb46ba | |
decentral1se | ce69967ec5 | |
Comrade Renovate Bot | 1a04439b1f | |
decentral1se | 979f417a63 | |
decentral1se | b27acb2f61 | |
decentral1se | 622ecc4885 | |
decentral1se | ed5bbda811 | |
decentral1se | 7b627ea518 | |
decentral1se | 1ac66da83f | |
Comrade Renovate Bot | 061de96b62 | |
decentral1se | 6998298d32 | |
decentral1se | 323f4467c8 | |
decentral1se | e8e41850b5 | |
decentral1se | 0e23ec53d7 | |
decentral1se | b943a8b9b1 | |
decentral1se | acc665f054 | |
decentral1se | 860f1d6376 | |
decentral1se | 2122f0e67c | |
decentral1se | 6aa23a76a1 | |
decentral1se | 338360096c | |
decentral1se | 7a8c7cd50f | |
decentral1se | bafc8a8e34 | |
decentral1se | 3d44d8c9fd | |
decentral1se | b8b4616498 | |
Comrade Renovate Bot | da97117929 | |
Comrade Renovate Bot | 978297c464 | |
Comrade Renovate Bot | 11da4808fc | |
decentral1se | 4023e6a066 | |
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 | |
knoflook | 17a5f1529a | |
decentral1se | 2ba6445daa | |
decentral1se | edb427a7ae | |
decentral1se | 3dc186e231 | |
decentral1se | 1467ae5007 | |
decentral1se | 2b9395be1a | |
decentral1se | a539033b55 | |
decentral1se | 63d9703d9d | |
decentral1se | f9726b6643 | |
decentral1se | 4a0761926c | |
decentral1se | de7054fd74 | |
decentral1se | 0e0e2db755 | |
decentral1se | 04e24022f5 | |
decentral1se | c227972c12 | |
decentral1se | 911f22233f | |
decentral1se | 7d8e2d9dd1 | |
decentral1se | f041083604 | |
decentral1se | f57ae1e904 | |
decentral1se | 49a87cae2e | |
decentral1se | f0de18a7f0 | |
decentral1se | 1caef09cd2 | |
decentral1se | e4e606efb0 | |
decentral1se | 08aca28d9d | |
knoflook | f02ea7ca0d | |
decentral1se | 3d3c4b3aae | |
decentral1se | e37b49201f | |
decentral1se | ede5a59562 | |
decentral1se | fc2deda1f6 | |
decentral1se | c76601c9ce | |
decentral1se | 7f176d8e2f | |
decentral1se | 9b704b002b | |
decentral1se | ab02c5f0dd | |
decentral1se | f2b02e39a7 | |
decentral1se | 31f6bd06a5 | |
decentral1se | bd92c52eed | |
decentral1se | 0486091768 | |
decentral1se | 3b77607f36 | |
decentral1se | f833ccb864 | |
decentral1se | 7022f42711 | |
decentral1se | c76bd25c1d | |
3wc | a6b5ac3410 | |
knoflook | 71225d2099 | |
knoflook | 5d59d12d75 | |
decentral1se | d56400eea8 | |
decentral1se | b3496ad286 | |
decentral1se | 066b2b9373 | |
decentral1se | aec11bda28 | |
decentral1se | 9a513a0700 | |
decentral1se | 9f3ab0de9e | |
decentral1se | e26afb97af | |
decentral1se | 960e47437c | |
decentral1se | 8e3f90a7f3 | |
decentral1se | 1d7cb0d9b6 | |
decentral1se | 4d2a2d42fb | |
decentral1se | bdae61ed51 | |
decentral1se | 766e3008f6 | |
knoflook | 383f857f4a | |
decentral1se | 3d46ce6db2 | |
decentral1se | 9e0d77d5c6 | |
decentral1se | f9e2d24550 | |
decentral1se | 8772217f41 | |
decentral1se | a7970132c2 | |
decentral1se | 2d091a6b00 | |
decentral1se | 147687d7ce | |
decentral1se | 9a0e12258a | |
decentral1se | 1396f15c78 | |
decentral1se | 2e2560dea7 | |
decentral1se | c789a70653 | |
decentral1se | 8f55330210 | |
decentral1se | d54a45bef7 | |
decentral1se | fdc0246f1d | |
decentral1se | a394618965 | |
decentral1se | 8cd9f2700f | |
decentral1se | b72fa28ddb | |
decentral1se | 313e3beb1e | |
decentral1se | 94c7f59113 | |
decentral1se | 5ae06bbd42 | |
decentral1se | 9f9248b987 | |
decentral1se | 2bb4a9c063 | |
decentral1se | 0c8dba0681 | |
decentral1se | a491332c1c | |
decentral1se | 6a75ffc051 | |
decentral1se | 5261d1a033 | |
decentral1se | a458a5d9f7 | |
decentral1se | 5ce2419354 | |
decentral1se | 963f8dcc73 | |
decentral1se | dc04cf5ff7 | |
decentral1se | 80921c9f55 | |
decentral1se | 8b15f2de5b | |
decentral1se | cdb76e7276 | |
decentral1se | a170e26e27 | |
decentral1se | 03b1882b81 | |
decentral1se | 2fcdaca75f | |
decentral1se | c5f44cf340 | |
decentral1se | 7a5ad65178 | |
decentral1se | 6d4ee3de0d | |
decentral1se | 63318fb6ff | |
decentral1se | 07ffa08a07 | |
decentral1se | 0e5e7490b3 | |
decentral1se | 640032b8fe | |
decentral1se | 39babea963 | |
decentral1se | 07613f5163 | |
decentral1se | 7f1d9eeaec | |
decentral1se | 02d24104e1 | |
Roxie Gibson | da8d72620a | |
Roxie Gibson | 96ccadc70f | |
decentral1se | 8703370785 | |
decentral1se | 7d8c53299d | |
decentral1se | 0110aceb1f | |
decentral1se | aec1e4520d | |
decentral1se | 74bcb99c70 | |
decentral1se | dd4f2b48ec | |
decentral1se | 7f3f41ede4 | |
decentral1se | 597b4b586e | |
decentral1se | 7ea3df45d4 | |
decentral1se | 5941ed9728 | |
decentral1se | d1e42752e2 | |
decentral1se | 9dfbd21c61 | |
decentral1se | 9526d1fde6 | |
decentral1se | 62cc7ef92d | |
decentral1se | c5a7a831d2 | |
decentral1se | 4aae186f5f | |
decentral1se | 2f9b11f389 | |
decentral1se | 6d42e72f16 | |
decentral1se | 5be190e110 | |
decentral1se | c1390f232e | |
3wc | 95e19f03c4 | |
knoflook | dc040a0b38 | |
knoflook | e6e2e5214f | |
knoflook | 61452b5f32 | |
knoflook | 78460ac0ba | |
decentral1se | 0615c3f745 | |
3wc | e820e0219d | |
decentral1se | 75fb9a2774 | |
decentral1se | 0d500b636d | |
decentral1se | 5dd97cace0 | |
decentral1se | ae32b1eed2 | |
decentral1se | 113bdf9e86 | |
decentral1se | d4d4da19b7 | |
decentral1se | 454ee696d6 | |
decentral1se | ca16c002ba | |
decentral1se | 91cc8b00b3 | |
decentral1se | d0828c4d8d | |
decentral1se | b69aed3bcf | |
decentral1se | 875255fd8c | |
decentral1se | 2dca602c0b | |
decentral1se | 1dca8a1067 | |
decentral1se | 37022bf0c8 | |
knoflook | eb5b35d47f | |
knoflook | ece1130797 | |
knoflook | c266316f7e | |
decentral1se | d804276cf2 | |
decentral1se | 4235e06943 | |
decentral1se | a9af0b3627 | |
3wc | a0b4886eba | |
decentral1se | 84489495dc | |
decentral1se | a8683dc38a | |
decentral1se | e2128ea5b6 | |
decentral1se | ca3c5fef0f | |
decentral1se | 4a01e411be | |
decentral1se | 777d49ac1d | |
decentral1se | deb7d21158 | |
knoflook | 6db1fdcfba | |
decentral1se | 44dc0edf7b | |
knoflook | 36ff50312c | |
decentral1se | ff4b978876 | |
decentral1se | b68547b2c2 | |
decentral1se | 0140f96ca1 | |
3wc | 1cb45113db | |
decentral1se | c764243f3a | |
decentral1se | dde8afcd43 | |
decentral1se | 98ffc210e1 | |
decentral1se | 7c0d883135 | |
decentral1se | e78ced41fb | |
decentral1se | e9113500d8 | |
decentral1se | 7368cabc49 | |
decentral1se | f75e264811 | |
decentral1se | 8bfd76fd04 | |
knoflook | 1cb5e3509d | |
decentral1se | 3cd2399cca | |
knoflook | 11c4651a3b | |
knoflook | 49f90674f2 | |
knoflook | 74a70edb03 | |
knoflook | 6fc5c31347 | |
decentral1se | c616907b71 | |
decentral1se | a58cea3e0a | |
decentral1se | 700f89425a | |
decentral1se | 8cc0a350e6 | |
decentral1se | 46e67fa420 | |
decentral1se | cacbb5a0f1 | |
decentral1se | e7046a15aa | |
decentral1se | c1fd97c427 | |
decentral1se | 2f218bd99f | |
decentral1se | 48290aa316 | |
decentral1se | db5cbfa992 | |
decentral1se | 4c11e813e8 | |
knoflook | 6ae75e013a | |
decentral1se | 09f49cdc76 | |
decentral1se | 22118b88e4 | |
decentral1se | e6db064149 | |
3wc | 3688ea9d69 | |
3wc | 7c4cdc530c | |
3wc | 49781c7e3f | |
decentral1se | 10b15d65b4 | |
decentral1se | 1c5d6d6357 | |
decentral1se | 75bdd59585 | |
knoflook | 96bb145981 | |
knoflook | c4c76f4848 | |
decentral1se | 2076c566bb | |
decentral1se | 62f6327b66 | |
decentral1se | 6f9120b59c | |
decentral1se | 8c617a9f12 | |
knoflook | 857d12d23c | |
knoflook | 22c4d0d864 | |
knoflook | e700e44363 | |
knoflook | 9faefd2592 | |
knoflook | cd179175f5 | |
knoflook | c0f92ca13d | |
knoflook | 48d28c8dd1 | |
decentral1se | e840328e44 | |
decentral1se | 6f43778691 | |
decentral1se | 9783563fa6 | |
decentral1se | 1392afc015 | |
decentral1se | 886009975d | |
decentral1se | b1147cd136 | |
decentral1se | 95a9013658 | |
decentral1se | bd1bf3b0d6 | |
decentral1se | 7b349732ac | |
decentral1se | a8ce64a9db | |
decentral1se | 96aa74a977 | |
decentral1se | 700f022790 | |
decentral1se | d188327b17 | |
decentral1se | fdd46a4d98 | |
decentral1se | e00920643e | |
3wc | 754fe81e01 | |
decentral1se | bece2e8351 | |
Roxie Gibson | e47d7029d7 | |
Roxie Gibson | 31edbbd32e | |
Roxie Gibson | 0a1c73bf00 | |
decentral1se | a74a8bc21b |
|
@ -1,40 +0,0 @@
|
||||||
{{ range .Versions }}
|
|
||||||
<a name="{{ .Tag.Name }}"></a>
|
|
||||||
## {{ if .Tag.Previous }}[{{ .Tag.Name }}]({{ $.Info.RepositoryURL }}/compare/{{ .Tag.Previous.Name }}...{{ .Tag.Name }}){{ else }}{{ .Tag.Name }}{{ end }}
|
|
||||||
|
|
||||||
> {{ datetime "2006-01-02" .Tag.Date }}
|
|
||||||
|
|
||||||
{{ range .CommitGroups -}}
|
|
||||||
### {{ .Title }}
|
|
||||||
|
|
||||||
{{ range .Commits -}}
|
|
||||||
* {{ .Subject }}
|
|
||||||
{{ end }}
|
|
||||||
{{ end -}}
|
|
||||||
|
|
||||||
{{- if .RevertCommits -}}
|
|
||||||
### Reverts
|
|
||||||
|
|
||||||
{{ range .RevertCommits -}}
|
|
||||||
* {{ .Revert.Header }}
|
|
||||||
{{ end }}
|
|
||||||
{{ end -}}
|
|
||||||
|
|
||||||
{{- if .MergeCommits -}}
|
|
||||||
### Pull Requests
|
|
||||||
|
|
||||||
{{ range .MergeCommits -}}
|
|
||||||
* {{ .Header }}
|
|
||||||
{{ end }}
|
|
||||||
{{ end -}}
|
|
||||||
|
|
||||||
{{- if .NoteGroups -}}
|
|
||||||
{{ range .NoteGroups -}}
|
|
||||||
### {{ .Title }}
|
|
||||||
|
|
||||||
{{ range .Notes }}
|
|
||||||
{{ .Body }}
|
|
||||||
{{ end }}
|
|
||||||
{{ end -}}
|
|
||||||
{{ end -}}
|
|
||||||
{{ end -}}
|
|
|
@ -1,27 +0,0 @@
|
||||||
style: github
|
|
||||||
template: CHANGELOG.tpl.md
|
|
||||||
info:
|
|
||||||
title: CHANGELOG
|
|
||||||
repository_url: https://git.autonomic.zone:2222/coop-cloud/go-abra
|
|
||||||
options:
|
|
||||||
commits:
|
|
||||||
# filters:
|
|
||||||
# Type:
|
|
||||||
# - feat
|
|
||||||
# - fix
|
|
||||||
# - perf
|
|
||||||
# - refactor
|
|
||||||
commit_groups:
|
|
||||||
# title_maps:
|
|
||||||
# feat: Features
|
|
||||||
# fix: Bug Fixes
|
|
||||||
# perf: Performance Improvements
|
|
||||||
# refactor: Code Refactoring
|
|
||||||
header:
|
|
||||||
pattern: "^(\\w*)\\:\\s(.*)$"
|
|
||||||
pattern_maps:
|
|
||||||
- Type
|
|
||||||
- Subject
|
|
||||||
notes:
|
|
||||||
keywords:
|
|
||||||
- BREAKING CHANGE
|
|
|
@ -0,0 +1,8 @@
|
||||||
|
*.swo
|
||||||
|
*.swp
|
||||||
|
.dockerignore
|
||||||
|
Dockerfile
|
||||||
|
abra
|
||||||
|
dist
|
||||||
|
kadabra
|
||||||
|
tags
|
59
.drone.yml
59
.drone.yml
|
@ -3,45 +3,20 @@ 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.21
|
||||||
commands:
|
commands:
|
||||||
- make check
|
- make check
|
||||||
|
|
||||||
- name: make static
|
|
||||||
image: golang:1.17
|
|
||||||
ignore: true # until we decide we all want this check
|
|
||||||
environment:
|
|
||||||
STATIC_CHECK_URL: honnef.co/go/tools/cmd/staticcheck
|
|
||||||
STATIC_CHECK_VERSION: v0.2.0
|
|
||||||
commands:
|
|
||||||
- go install $STATIC_CHECK_URL@$STATIC_CHECK_VERSION
|
|
||||||
- make static
|
|
||||||
|
|
||||||
- name: make build
|
|
||||||
image: golang:1.17
|
|
||||||
commands:
|
|
||||||
- make build
|
|
||||||
|
|
||||||
- name: make test
|
- name: make test
|
||||||
image: golang:1.17
|
image: golang:1.21
|
||||||
|
environment:
|
||||||
|
ABRA_DIR: "/root/.abra"
|
||||||
commands:
|
commands:
|
||||||
|
- make build-abra
|
||||||
|
- ./abra help # show version, initialise $ABRA_DIR
|
||||||
- make test
|
- make test
|
||||||
|
|
||||||
- name: notify on failure
|
|
||||||
image: plugins/matrix
|
|
||||||
settings:
|
|
||||||
homeserver: https://matrix.autonomic.zone
|
|
||||||
roomid: "IFazIpLtxiScqbHqoa:autonomic.zone"
|
|
||||||
userid: "@autono-bot:autonomic.zone"
|
|
||||||
accesstoken:
|
|
||||||
from_secret: autono_bot_access_token
|
|
||||||
depends_on:
|
depends_on:
|
||||||
- make check
|
- make check
|
||||||
- make build
|
|
||||||
- make test
|
|
||||||
when:
|
|
||||||
status:
|
|
||||||
- failure
|
|
||||||
|
|
||||||
- name: fetch
|
- name: fetch
|
||||||
image: docker:git
|
image: docker:git
|
||||||
|
@ -49,13 +24,12 @@ steps:
|
||||||
- git fetch --tags
|
- git fetch --tags
|
||||||
depends_on:
|
depends_on:
|
||||||
- make check
|
- make check
|
||||||
- make build
|
|
||||||
- make test
|
- make test
|
||||||
when:
|
when:
|
||||||
event: tag
|
event: tag
|
||||||
|
|
||||||
- name: release
|
- name: release
|
||||||
image: golang:1.17
|
image: goreleaser/goreleaser:v1.24.0
|
||||||
environment:
|
environment:
|
||||||
GITEA_TOKEN:
|
GITEA_TOKEN:
|
||||||
from_secret: goreleaser_gitea_token
|
from_secret: goreleaser_gitea_token
|
||||||
|
@ -63,12 +37,29 @@ steps:
|
||||||
- name: deps
|
- name: deps
|
||||||
path: /go
|
path: /go
|
||||||
commands:
|
commands:
|
||||||
- curl -sL https://git.io/goreleaser | bash
|
- goreleaser release
|
||||||
depends_on:
|
depends_on:
|
||||||
- fetch
|
- fetch
|
||||||
when:
|
when:
|
||||||
event: tag
|
event: tag
|
||||||
|
|
||||||
|
- name: publish image
|
||||||
|
image: plugins/docker
|
||||||
|
settings:
|
||||||
|
auto_tag: true
|
||||||
|
username: 3wordchant
|
||||||
|
password:
|
||||||
|
from_secret: git_coopcloud_tech_token_3wc
|
||||||
|
repo: git.coopcloud.tech/coop-cloud/abra
|
||||||
|
tags: dev
|
||||||
|
registry: git.coopcloud.tech
|
||||||
|
when:
|
||||||
|
event:
|
||||||
|
exclude:
|
||||||
|
- pull_request
|
||||||
|
depends_on:
|
||||||
|
- make check
|
||||||
|
|
||||||
volumes:
|
volumes:
|
||||||
- name: deps
|
- name: deps
|
||||||
temp: {}
|
temp: {}
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
go env -w GOPRIVATE=coopcloud.tech
|
go env -w GOPRIVATE=coopcloud.tech
|
||||||
|
|
||||||
# export PASSWORD_STORE_DIR=$(pwd)/../../autonomic/passwords/passwords/
|
# export PASSWORD_STORE_DIR=$(pwd)/../../autonomic/passwords/passwords/
|
||||||
# export HCLOUD_TOKEN=$(pass show logins/hetzner/cicd/api_key)
|
|
||||||
# export CAPSUL_TOKEN=...
|
# export ABRA_DIR="$HOME/.abra_test"
|
||||||
# export GITEA_TOKEN=...
|
# export ABRA_TEST_DOMAIN=test.example.com
|
||||||
|
# export ABRA_SKIP_TEARDOWN=1 # for faster feedback when developing tests
|
||||||
|
|
|
@ -1,5 +1,9 @@
|
||||||
abra
|
*fmtcoverage.html
|
||||||
.vscode/
|
.e2e.env
|
||||||
vendor/
|
|
||||||
.envrc
|
.envrc
|
||||||
|
.vscode/
|
||||||
|
/kadabra
|
||||||
|
abra
|
||||||
dist/
|
dist/
|
||||||
|
tests/integration/.bats
|
||||||
|
vendor/
|
||||||
|
|
|
@ -1,35 +1,74 @@
|
||||||
---
|
---
|
||||||
project_name: abra
|
|
||||||
gitea_urls:
|
gitea_urls:
|
||||||
api: https://git.coopcloud.tech/api/v1
|
api: https://git.coopcloud.tech/api/v1
|
||||||
download: https://git.coopcloud.tech/
|
download: https://git.coopcloud.tech/
|
||||||
skip_tls_verify: false
|
skip_tls_verify: false
|
||||||
|
|
||||||
before:
|
before:
|
||||||
hooks:
|
hooks:
|
||||||
- go mod tidy
|
- go mod tidy
|
||||||
- go generate ./...
|
|
||||||
builds:
|
builds:
|
||||||
- env:
|
- id: abra
|
||||||
- CGO_ENABLED=0
|
binary: abra
|
||||||
dir: cmd/abra
|
dir: cmd/abra
|
||||||
|
env:
|
||||||
|
- CGO_ENABLED=0
|
||||||
goos:
|
goos:
|
||||||
- linux
|
- linux
|
||||||
|
- darwin
|
||||||
|
goarch:
|
||||||
|
- 386
|
||||||
|
- amd64
|
||||||
|
- arm
|
||||||
|
- arm64
|
||||||
|
goarm:
|
||||||
|
- 5
|
||||||
|
- 6
|
||||||
|
- 7
|
||||||
ldflags:
|
ldflags:
|
||||||
- "-X 'main.Commit={{ .Commit }}'"
|
- "-X 'main.Commit={{ .Commit }}'"
|
||||||
- "-X 'main.Version={{ .Version }}'"
|
- "-X 'main.Version={{ .Version }}'"
|
||||||
archives:
|
- "-s"
|
||||||
- replacements:
|
- "-w"
|
||||||
linux: Linux
|
|
||||||
386: i386
|
- id: kadabra
|
||||||
amd64: x86_64
|
binary: kadabra
|
||||||
format: binary
|
dir: cmd/kadabra
|
||||||
|
env:
|
||||||
|
- CGO_ENABLED=0
|
||||||
|
goos:
|
||||||
|
- linux
|
||||||
|
- darwin
|
||||||
|
goarch:
|
||||||
|
- 386
|
||||||
|
- amd64
|
||||||
|
- arm
|
||||||
|
- arm64
|
||||||
|
goarm:
|
||||||
|
- 5
|
||||||
|
- 6
|
||||||
|
- 7
|
||||||
|
ldflags:
|
||||||
|
- "-X 'main.Commit={{ .Commit }}'"
|
||||||
|
- "-X 'main.Version={{ .Version }}'"
|
||||||
|
- "-s"
|
||||||
|
- "-w"
|
||||||
|
|
||||||
checksum:
|
checksum:
|
||||||
name_template: "checksums.txt"
|
name_template: "checksums.txt"
|
||||||
|
|
||||||
snapshot:
|
snapshot:
|
||||||
name_template: "{{ incpatch .Version }}-next"
|
name_template: "{{ incpatch .Version }}-next"
|
||||||
|
|
||||||
changelog:
|
changelog:
|
||||||
sort: asc
|
sort: desc
|
||||||
filters:
|
filters:
|
||||||
exclude:
|
exclude:
|
||||||
- "^docs:"
|
- "^Merge"
|
||||||
|
- "^Revert"
|
||||||
|
- "^WIP:"
|
||||||
|
- "^chore(deps):"
|
||||||
|
- "^style:"
|
||||||
- "^test:"
|
- "^test:"
|
||||||
|
- "^tests:"
|
||||||
|
|
|
@ -0,0 +1,19 @@
|
||||||
|
# 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 some 💞
|
||||||
|
|
||||||
|
- 3wordchant
|
||||||
|
- cassowary
|
||||||
|
- codegod100
|
||||||
|
- decentral1se
|
||||||
|
- fauno
|
||||||
|
- frando
|
||||||
|
- kawaiipunk
|
||||||
|
- knoflook
|
||||||
|
- moritz
|
||||||
|
- p4u1
|
||||||
|
- rix
|
||||||
|
- roxxers
|
||||||
|
- vera
|
||||||
|
- yksflip
|
|
@ -0,0 +1,30 @@
|
||||||
|
# Build image
|
||||||
|
FROM golang:1.21-alpine AS build
|
||||||
|
|
||||||
|
ENV GOPRIVATE coopcloud.tech
|
||||||
|
|
||||||
|
RUN apk add --no-cache \
|
||||||
|
gcc \
|
||||||
|
git \
|
||||||
|
make \
|
||||||
|
musl-dev
|
||||||
|
|
||||||
|
COPY . /app
|
||||||
|
|
||||||
|
WORKDIR /app
|
||||||
|
|
||||||
|
RUN CGO_ENABLED=0 make build
|
||||||
|
|
||||||
|
# Release image ("slim")
|
||||||
|
FROM alpine:3.19.1
|
||||||
|
|
||||||
|
RUN apk add --no-cache \
|
||||||
|
ca-certificates \
|
||||||
|
git \
|
||||||
|
openssh
|
||||||
|
|
||||||
|
RUN update-ca-certificates
|
||||||
|
|
||||||
|
COPY --from=build /app/abra /abra
|
||||||
|
|
||||||
|
ENTRYPOINT ["/abra"]
|
|
@ -0,0 +1,15 @@
|
||||||
|
Abra: The Co-op Cloud utility belt
|
||||||
|
Copyright (C) 2022 Co-op Cloud <helo@coopcloud.tech>
|
||||||
|
|
||||||
|
This program is free software: you can redistribute it and/or modify
|
||||||
|
it under the terms of the GNU General Public License as published by
|
||||||
|
the Free Software Foundation, either version 3 of the License, or
|
||||||
|
(at your option) any later version.
|
||||||
|
|
||||||
|
This program is distributed in the hope that it will be useful,
|
||||||
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
GNU General Public License for more details.
|
||||||
|
|
||||||
|
You should have received a copy of the GNU General Public License
|
||||||
|
along with this program. If not, see <https://www.gnu.org/licenses/>.
|
49
Makefile
49
Makefile
|
@ -1,38 +1,55 @@
|
||||||
ABRA := ./cmd/abra
|
ABRA := ./cmd/abra
|
||||||
COMMIT := $(shell git rev-list -1 HEAD)
|
KADABRA := ./cmd/kadabra
|
||||||
GOPATH := $(shell go env GOPATH)
|
COMMIT := $(shell git rev-list -1 HEAD)
|
||||||
LDFLAGS := "-X 'main.Commit=$(COMMIT)'"
|
GOPATH := $(shell go env GOPATH)
|
||||||
|
GOVERSION := 1.21
|
||||||
|
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
|
# NOTE(d1): default `make` optimised for Abra hacking
|
||||||
|
all: format check build-abra test
|
||||||
|
|
||||||
run:
|
run-abra:
|
||||||
@go run -ldflags=$(LDFLAGS) $(ABRA)
|
@go run -ldflags=$(LDFLAGS) $(ABRA)
|
||||||
|
|
||||||
install:
|
run-kadabra:
|
||||||
|
@go run -ldflags=$(LDFLAGS) $(KADABRA)
|
||||||
|
|
||||||
|
install-abra:
|
||||||
@go install -ldflags=$(LDFLAGS) $(ABRA)
|
@go install -ldflags=$(LDFLAGS) $(ABRA)
|
||||||
|
|
||||||
build-dev:
|
install-kadabra:
|
||||||
@go build -ldflags=$(LDFLAGS) $(ABRA)
|
@go install -ldflags=$(LDFLAGS) $(KADABRA)
|
||||||
|
|
||||||
build:
|
build-abra:
|
||||||
@go build -ldflags=$(DIST_LDFLAGS) $(ABRA)
|
@go build -v -ldflags=$(DIST_LDFLAGS) $(ABRA)
|
||||||
|
|
||||||
|
build-kadabra:
|
||||||
|
@go build -v -ldflags=$(DIST_LDFLAGS) $(KADABRA)
|
||||||
|
|
||||||
|
build: build-abra build-kadabra
|
||||||
|
|
||||||
|
build-docker-abra:
|
||||||
|
@docker run -it -v $(PWD):/abra golang:$(GOVERSION) \
|
||||||
|
bash -c 'cd /abra; ./scripts/docker/build.sh'
|
||||||
|
|
||||||
|
build-docker: build-docker-abra
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
@rm '$(GOPATH)/bin/abra'
|
@rm '$(GOPATH)/bin/abra'
|
||||||
|
@rm '$(GOPATH)/bin/kadabra'
|
||||||
|
|
||||||
format:
|
format:
|
||||||
@gofmt -s -w .
|
@gofmt -s -w .
|
||||||
|
|
||||||
check:
|
check:
|
||||||
@test -z $$(gofmt -l .) || (echo "gofmt: formatting issue - run 'make format' to resolve" && exit 1)
|
@test -z $$(gofmt -l .) || \
|
||||||
|
(echo "gofmt: formatting issue - run 'make format' to resolve" && exit 1)
|
||||||
static:
|
|
||||||
@staticcheck $(ABRA)
|
|
||||||
|
|
||||||
test:
|
test:
|
||||||
@go test ./... -cover
|
@go test ./... -cover -v
|
||||||
|
|
||||||
loc:
|
loc:
|
||||||
@find . -name "*.go" | xargs wc -l
|
@find . -name "*.go" | xargs wc -l
|
||||||
|
|
100
README.md
100
README.md
|
@ -1,103 +1,13 @@
|
||||||
# abra
|
# `abra`
|
||||||
|
|
||||||
> https://coopcloud.tech
|
|
||||||
|
|
||||||
[![Build Status](https://build.coopcloud.tech/api/badges/coop-cloud/abra/status.svg?ref=refs/heads/main)](https://build.coopcloud.tech/coop-cloud/abra)
|
[![Build Status](https://build.coopcloud.tech/api/badges/coop-cloud/abra/status.svg?ref=refs/heads/main)](https://build.coopcloud.tech/coop-cloud/abra)
|
||||||
[![Go Report Card](https://goreportcard.com/badge/git.coopcloud.tech/coop-cloud/abra)](https://goreportcard.com/report/git.coopcloud.tech/coop-cloud/abra)
|
[![Go Report Card](https://goreportcard.com/badge/git.coopcloud.tech/coop-cloud/abra)](https://goreportcard.com/report/git.coopcloud.tech/coop-cloud/abra)
|
||||||
|
[![Go Reference](https://pkg.go.dev/badge/coopcloud.tech/abra.svg)](https://pkg.go.dev/coopcloud.tech/abra)
|
||||||
|
|
||||||
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 applications, deploy them, run backup and restore operations and a whole lot of other things. It is the go-to tool for day-to-day operations when managing a Co-op Cloud instance.
|
<a href="https://github.com/egonelbre/gophers"><img align="right" width="150" src="https://github.com/egonelbre/gophers/raw/master/.thumb/sketch/adventure/poking-fire.png"/></a>
|
||||||
|
|
||||||
## Install
|
`abra` is the flagship client & command-line tool for Co-op Cloud. It has been developed specifically for the purpose of making the day-to-day operations of [operators](https://docs.coopcloud.tech/operators/) and [maintainers](https://docs.coopcloud.tech/maintainers/) pleasant & convenient. It is libre software, written in [Go](https://go.dev) and maintained and extended by the community 💖
|
||||||
|
|
||||||
### Arch-based Linux Distros
|
Please see [docs.coopcloud.tech/abra](https://docs.coopcloud.tech/abra) for help on install, upgrade, hacking, troubleshooting & more!
|
||||||
|
|
||||||
[abra (coming-soon)](https://aur.archlinux.org/packages/abra/) or for the latest version on git [abra-git](https://aur.archlinux.org/packages/abra-git/)
|
|
||||||
|
|
||||||
```sh
|
|
||||||
yay -S abra-git # or abra
|
|
||||||
```
|
|
||||||
|
|
||||||
### Debian-based Linux Distros
|
|
||||||
|
|
||||||
**Coming Soon**
|
|
||||||
|
|
||||||
### Homebrew
|
|
||||||
|
|
||||||
**Coming Soon**
|
|
||||||
|
|
||||||
### Build from source
|
|
||||||
|
|
||||||
```sh
|
|
||||||
git clone https://git.coopcloud.tech/coop-cloud/abra
|
|
||||||
cd abra
|
|
||||||
go env -w GOPRIVATE=coopcloud.tech
|
|
||||||
make install
|
|
||||||
```
|
|
||||||
|
|
||||||
The abra binary will be in `$GOPATH/bin`.
|
|
||||||
|
|
||||||
## Autocompletion
|
|
||||||
|
|
||||||
**bash**
|
|
||||||
|
|
||||||
Copy `scripts/autocomplete/bash` into `/etc/bash_completion.d/` and rename
|
|
||||||
it to abra.
|
|
||||||
|
|
||||||
```
|
|
||||||
sudo cp scripts/autocomplete/bash /etc/bash_completion.d/abra
|
|
||||||
source /etc/bash_completion.d/abra
|
|
||||||
```
|
|
||||||
|
|
||||||
**(fi)zsh**
|
|
||||||
|
|
||||||
(fi)zsh doesn't have an autocompletion folder by default but you can create one, then copy `scripts/autocomplete/zsh` into it and add a couple lines to your `~/.zshrc` or `~/.fizsh/.fizshrc`
|
|
||||||
|
|
||||||
```
|
|
||||||
sudo mkdir /etc/zsh/completion.d/
|
|
||||||
sudo cp scripts/autocomplete/zsh /etc/zsh/completion.d/abra
|
|
||||||
echo "PROG=abra\n_CLI_ZSH_AUTOCOMPLETE_HACK=1\nsource /etc/zsh/completion.d/abra" >> ~/.zshrc
|
|
||||||
```
|
|
||||||
|
|
||||||
(replace .zshrc with ~/.fizsh/.fizshrc if you use fizsh)
|
|
||||||
|
|
||||||
## Hacking
|
|
||||||
|
|
||||||
Install direnv, 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
|
|
||||||
|
|
||||||
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 0.3.1-alpha'`)
|
|
||||||
- Make a new tag (e.g. `git tag 0.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)
|
|
||||||
- Check the release worked, (e.g. `abra upgrade; abra version`)
|
|
||||||
|
|
||||||
## Fork maintenance
|
|
||||||
|
|
||||||
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.
|
|
||||||
|
|
|
@ -1,37 +1,37 @@
|
||||||
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 apps",
|
Usage: "Manage apps",
|
||||||
Aliases: []string{"a"},
|
ArgsUsage: "<domain>",
|
||||||
ArgsUsage: "<app>",
|
Description: "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,
|
|
||||||
appConfigCommand,
|
|
||||||
appDeployCommand,
|
|
||||||
appUndeployCommand,
|
|
||||||
appBackupCommand,
|
appBackupCommand,
|
||||||
appRestoreCommand,
|
|
||||||
appRemoveCommand,
|
|
||||||
appCheckCommand,
|
appCheckCommand,
|
||||||
appListCommand,
|
appCmdCommand,
|
||||||
appPsCommand,
|
appConfigCommand,
|
||||||
appLogsCommand,
|
|
||||||
appCpCommand,
|
appCpCommand,
|
||||||
appRunCommand,
|
appDeployCommand,
|
||||||
|
appErrorsCommand,
|
||||||
|
appListCommand,
|
||||||
|
appLogsCommand,
|
||||||
|
appNewCommand,
|
||||||
|
appPsCommand,
|
||||||
|
appRemoveCommand,
|
||||||
|
appRestartCommand,
|
||||||
|
appRestoreCommand,
|
||||||
appRollbackCommand,
|
appRollbackCommand,
|
||||||
|
appRunCommand,
|
||||||
appSecretCommand,
|
appSecretCommand,
|
||||||
appVolumeCommand,
|
appServicesCommand,
|
||||||
|
appUndeployCommand,
|
||||||
|
appUpgradeCommand,
|
||||||
appVersionCommand,
|
appVersionCommand,
|
||||||
|
appVolumeCommand,
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,87 +1,296 @@
|
||||||
package app
|
package app
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"errors"
|
|
||||||
"fmt"
|
"fmt"
|
||||||
"io/ioutil"
|
|
||||||
"os"
|
|
||||||
"os/exec"
|
|
||||||
"path"
|
|
||||||
"strings"
|
|
||||||
|
|
||||||
"coopcloud.tech/abra/cli/internal"
|
"coopcloud.tech/abra/cli/internal"
|
||||||
"coopcloud.tech/abra/pkg/config"
|
"coopcloud.tech/abra/pkg/autocomplete"
|
||||||
|
"coopcloud.tech/abra/pkg/client"
|
||||||
|
"coopcloud.tech/abra/pkg/recipe"
|
||||||
"github.com/sirupsen/logrus"
|
"github.com/sirupsen/logrus"
|
||||||
"github.com/urfave/cli/v2"
|
"github.com/urfave/cli"
|
||||||
)
|
)
|
||||||
|
|
||||||
var backupAllServices bool
|
var snapshot string
|
||||||
var backupAllServicesFlag = &cli.BoolFlag{
|
var snapshotFlag = &cli.StringFlag{
|
||||||
Name: "all",
|
Name: "snapshot, s",
|
||||||
Value: false,
|
Usage: "Lists specific snapshot",
|
||||||
Destination: &backupAllServices,
|
Destination: &snapshot,
|
||||||
Aliases: []string{"a"},
|
|
||||||
Usage: "Backup all services",
|
|
||||||
}
|
}
|
||||||
|
|
||||||
var appBackupCommand = &cli.Command{
|
var includePath string
|
||||||
Name: "backup",
|
var includePathFlag = &cli.StringFlag{
|
||||||
Usage: "Backup an app",
|
Name: "path, p",
|
||||||
Aliases: []string{"b"},
|
Usage: "Include path",
|
||||||
Flags: []cli.Flag{backupAllServicesFlag},
|
Destination: &includePath,
|
||||||
ArgsUsage: "<service>",
|
}
|
||||||
|
|
||||||
|
var resticRepo string
|
||||||
|
var resticRepoFlag = &cli.StringFlag{
|
||||||
|
Name: "repo, r",
|
||||||
|
Usage: "Restic repository",
|
||||||
|
Destination: &resticRepo,
|
||||||
|
}
|
||||||
|
|
||||||
|
var appBackupListCommand = cli.Command{
|
||||||
|
Name: "list",
|
||||||
|
Aliases: []string{"ls"},
|
||||||
|
Flags: []cli.Flag{
|
||||||
|
internal.DebugFlag,
|
||||||
|
internal.OfflineFlag,
|
||||||
|
snapshotFlag,
|
||||||
|
includePathFlag,
|
||||||
|
},
|
||||||
|
Before: internal.SubCommandBefore,
|
||||||
|
Usage: "List all backups",
|
||||||
|
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().Get(1) != "" && backupAllServices {
|
if err := recipe.EnsureExists(app.Recipe); err != nil {
|
||||||
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)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
sourceCmd := fmt.Sprintf("source %s", abraSh)
|
if !internal.Chaos {
|
||||||
|
if err := recipe.EnsureIsClean(app.Recipe); err != nil {
|
||||||
execCmd := "abra_backup"
|
logrus.Fatal(err)
|
||||||
if !backupAllServices {
|
}
|
||||||
serviceName := c.Args().Get(1)
|
|
||||||
if serviceName == "" {
|
if !internal.Offline {
|
||||||
internal.ShowSubcommandHelpAndError(c, errors.New("no service(s) target provided"))
|
if err := recipe.EnsureUpToDate(app.Recipe); err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := recipe.EnsureLatest(app.Recipe); err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
execCmd = fmt.Sprintf("abra_backup_%s", serviceName)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
bytes, err := ioutil.ReadFile(abraSh)
|
cl, err := client.New(app.Server)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
if !strings.Contains(string(bytes), execCmd) {
|
|
||||||
logrus.Fatalf("%s doesn't have a '%s' function", app.Type, execCmd)
|
targetContainer, err := internal.RetrieveBackupBotContainer(cl)
|
||||||
|
if err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
sourceAndExec := fmt.Sprintf("%s; %s", sourceCmd, execCmd)
|
execEnv := []string{fmt.Sprintf("SERVICE=%s", app.Domain)}
|
||||||
cmd := exec.Command("bash", "-c", sourceAndExec)
|
if snapshot != "" {
|
||||||
if err := internal.RunCmd(cmd); err != nil {
|
logrus.Debugf("including SNAPSHOT=%s in backupbot exec invocation", snapshot)
|
||||||
|
execEnv = append(execEnv, fmt.Sprintf("SNAPSHOT=%s", snapshot))
|
||||||
|
}
|
||||||
|
if includePath != "" {
|
||||||
|
logrus.Debugf("including INCLUDE_PATH=%s in backupbot exec invocation", includePath)
|
||||||
|
execEnv = append(execEnv, fmt.Sprintf("INCLUDE_PATH=%s", includePath))
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := internal.RunBackupCmdRemote(cl, "ls", targetContainer.ID, execEnv); err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
},
|
},
|
||||||
BashComplete: func(c *cli.Context) {
|
}
|
||||||
appNames, err := config.GetAppNames()
|
|
||||||
|
var appBackupDownloadCommand = cli.Command{
|
||||||
|
Name: "download",
|
||||||
|
Aliases: []string{"d"},
|
||||||
|
Flags: []cli.Flag{
|
||||||
|
internal.DebugFlag,
|
||||||
|
internal.OfflineFlag,
|
||||||
|
snapshotFlag,
|
||||||
|
includePathFlag,
|
||||||
|
},
|
||||||
|
Before: internal.SubCommandBefore,
|
||||||
|
Usage: "Download a backup",
|
||||||
|
BashComplete: autocomplete.AppNameComplete,
|
||||||
|
Action: func(c *cli.Context) error {
|
||||||
|
app := internal.ValidateApp(c)
|
||||||
|
|
||||||
|
if err := recipe.EnsureExists(app.Recipe); err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if !internal.Chaos {
|
||||||
|
if err := recipe.EnsureIsClean(app.Recipe); err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if !internal.Offline {
|
||||||
|
if err := recipe.EnsureUpToDate(app.Recipe); err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := recipe.EnsureLatest(app.Recipe); err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
cl, err := client.New(app.Server)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logrus.Warn(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
if c.NArg() > 0 {
|
|
||||||
return
|
targetContainer, err := internal.RetrieveBackupBotContainer(cl)
|
||||||
|
if err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
for _, a := range appNames {
|
|
||||||
fmt.Println(a)
|
execEnv := []string{fmt.Sprintf("SERVICE=%s", app.Domain)}
|
||||||
|
if snapshot != "" {
|
||||||
|
logrus.Debugf("including SNAPSHOT=%s in backupbot exec invocation", snapshot)
|
||||||
|
execEnv = append(execEnv, fmt.Sprintf("SNAPSHOT=%s", snapshot))
|
||||||
}
|
}
|
||||||
|
if includePath != "" {
|
||||||
|
logrus.Debugf("including INCLUDE_PATH=%s in backupbot exec invocation", includePath)
|
||||||
|
execEnv = append(execEnv, fmt.Sprintf("INCLUDE_PATH=%s", includePath))
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := internal.RunBackupCmdRemote(cl, "download", targetContainer.ID, execEnv); err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
remoteBackupDir := "/tmp/backup.tar.gz"
|
||||||
|
currentWorkingDir := "."
|
||||||
|
if err = CopyFromContainer(cl, targetContainer.ID, remoteBackupDir, currentWorkingDir); err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
fmt.Println("backup successfully downloaded to current working directory")
|
||||||
|
|
||||||
|
return nil
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
var appBackupCreateCommand = cli.Command{
|
||||||
|
Name: "create",
|
||||||
|
Aliases: []string{"c"},
|
||||||
|
Flags: []cli.Flag{
|
||||||
|
internal.DebugFlag,
|
||||||
|
internal.OfflineFlag,
|
||||||
|
resticRepoFlag,
|
||||||
|
},
|
||||||
|
Before: internal.SubCommandBefore,
|
||||||
|
Usage: "Create a new backup",
|
||||||
|
BashComplete: autocomplete.AppNameComplete,
|
||||||
|
Action: func(c *cli.Context) error {
|
||||||
|
app := internal.ValidateApp(c)
|
||||||
|
|
||||||
|
if err := recipe.EnsureExists(app.Recipe); err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if !internal.Chaos {
|
||||||
|
if err := recipe.EnsureIsClean(app.Recipe); err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if !internal.Offline {
|
||||||
|
if err := recipe.EnsureUpToDate(app.Recipe); err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := recipe.EnsureLatest(app.Recipe); err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
cl, err := client.New(app.Server)
|
||||||
|
if err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
targetContainer, err := internal.RetrieveBackupBotContainer(cl)
|
||||||
|
if err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
execEnv := []string{fmt.Sprintf("SERVICE=%s", app.Domain)}
|
||||||
|
if resticRepo != "" {
|
||||||
|
logrus.Debugf("including RESTIC_REPO=%s in backupbot exec invocation", resticRepo)
|
||||||
|
execEnv = append(execEnv, fmt.Sprintf("RESTIC_REPO=%s", resticRepo))
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := internal.RunBackupCmdRemote(cl, "create", targetContainer.ID, execEnv); err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
var appBackupSnapshotsCommand = cli.Command{
|
||||||
|
Name: "snapshots",
|
||||||
|
Aliases: []string{"s"},
|
||||||
|
Flags: []cli.Flag{
|
||||||
|
internal.DebugFlag,
|
||||||
|
internal.OfflineFlag,
|
||||||
|
snapshotFlag,
|
||||||
|
},
|
||||||
|
Before: internal.SubCommandBefore,
|
||||||
|
Usage: "List backup snapshots",
|
||||||
|
BashComplete: autocomplete.AppNameComplete,
|
||||||
|
Action: func(c *cli.Context) error {
|
||||||
|
app := internal.ValidateApp(c)
|
||||||
|
|
||||||
|
if err := recipe.EnsureExists(app.Recipe); err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if !internal.Chaos {
|
||||||
|
if err := recipe.EnsureIsClean(app.Recipe); err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if !internal.Offline {
|
||||||
|
if err := recipe.EnsureUpToDate(app.Recipe); err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := recipe.EnsureLatest(app.Recipe); err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
cl, err := client.New(app.Server)
|
||||||
|
if err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
targetContainer, err := internal.RetrieveBackupBotContainer(cl)
|
||||||
|
if err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
execEnv := []string{fmt.Sprintf("SERVICE=%s", app.Domain)}
|
||||||
|
if snapshot != "" {
|
||||||
|
logrus.Debugf("including SNAPSHOT=%s in backupbot exec invocation", snapshot)
|
||||||
|
execEnv = append(execEnv, fmt.Sprintf("SNAPSHOT=%s", snapshot))
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := internal.RunBackupCmdRemote(cl, "snapshots", targetContainer.ID, execEnv); err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
var appBackupCommand = cli.Command{
|
||||||
|
Name: "backup",
|
||||||
|
Aliases: []string{"b"},
|
||||||
|
Usage: "Manage app backups",
|
||||||
|
ArgsUsage: "<domain>",
|
||||||
|
Subcommands: []cli.Command{
|
||||||
|
appBackupListCommand,
|
||||||
|
appBackupSnapshotsCommand,
|
||||||
|
appBackupDownloadCommand,
|
||||||
|
appBackupCreateCommand,
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,64 +1,81 @@
|
||||||
package app
|
package app
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"fmt"
|
|
||||||
"os"
|
|
||||||
"path"
|
|
||||||
"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"
|
||||||
|
"coopcloud.tech/abra/pkg/formatter"
|
||||||
|
"coopcloud.tech/abra/pkg/recipe"
|
||||||
|
recipePkg "coopcloud.tech/abra/pkg/recipe"
|
||||||
"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{"chk"},
|
||||||
Aliases: []string{"c"},
|
Usage: "Ensure an app is well configured",
|
||||||
ArgsUsage: "<service>",
|
Description: `
|
||||||
|
This command compares env vars in both the app ".env" and recipe ".env.sample"
|
||||||
|
file.
|
||||||
|
|
||||||
|
The goal is to ensure that recipe ".env.sample" env vars are defined in your
|
||||||
|
app ".env" file. Only env var definitions in the ".env.sample" which are
|
||||||
|
uncommented, e.g. "FOO=bar" are checked. If an app ".env" file does not include
|
||||||
|
these env vars, then "check" will complain.
|
||||||
|
|
||||||
|
Recipe maintainers may or may not provide defaults for env vars within their
|
||||||
|
recipes regardless of commenting or not (e.g. through the use of
|
||||||
|
${FOO:<default>} syntax). "check" does not confirm or deny this for you.`,
|
||||||
|
ArgsUsage: "<domain>",
|
||||||
|
Flags: []cli.Flag{
|
||||||
|
internal.DebugFlag,
|
||||||
|
internal.ChaosFlag,
|
||||||
|
internal.OfflineFlag,
|
||||||
|
},
|
||||||
|
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)
|
||||||
|
|
||||||
envSamplePath := path.Join(config.ABRA_DIR, "apps", app.Type, ".env.sample")
|
if err := recipe.EnsureExists(app.Recipe); err != nil {
|
||||||
if _, err := os.Stat(envSamplePath); err != nil {
|
|
||||||
if os.IsNotExist(err) {
|
|
||||||
logrus.Fatalf("'%s' does not exist?", envSamplePath)
|
|
||||||
}
|
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
envSample, err := config.ReadEnv(envSamplePath)
|
if !internal.Chaos {
|
||||||
|
if err := recipePkg.EnsureIsClean(app.Recipe); err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if !internal.Offline {
|
||||||
|
if err := recipePkg.EnsureUpToDate(app.Recipe); err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := recipePkg.EnsureLatest(app.Recipe); err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
tableCol := []string{"recipe env sample", "app env"}
|
||||||
|
table := formatter.CreateTable(tableCol)
|
||||||
|
|
||||||
|
envVars, err := config.CheckEnv(app)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
var missing []string
|
for _, envVar := range envVars {
|
||||||
for k := range envSample {
|
if envVar.Present {
|
||||||
if _, ok := app.Env[k]; !ok {
|
table.Append([]string{envVar.Name, "✅"})
|
||||||
missing = append(missing, k)
|
} else {
|
||||||
|
table.Append([]string{envVar.Name, "❌"})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if len(missing) > 0 {
|
table.Render()
|
||||||
missingEnvVars := strings.Join(missing, ", ")
|
|
||||||
logrus.Fatalf("%s is missing %s", app.Path, missingEnvVars)
|
|
||||||
}
|
|
||||||
|
|
||||||
logrus.Infof("all necessary environment variables defined for '%s'", app.Name)
|
|
||||||
|
|
||||||
return nil
|
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)
|
|
||||||
}
|
|
||||||
},
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -0,0 +1,273 @@
|
||||||
|
package app
|
||||||
|
|
||||||
|
import (
|
||||||
|
"errors"
|
||||||
|
"fmt"
|
||||||
|
"os"
|
||||||
|
"os/exec"
|
||||||
|
"path"
|
||||||
|
"sort"
|
||||||
|
"strings"
|
||||||
|
|
||||||
|
"coopcloud.tech/abra/cli/internal"
|
||||||
|
"coopcloud.tech/abra/pkg/app"
|
||||||
|
"coopcloud.tech/abra/pkg/autocomplete"
|
||||||
|
"coopcloud.tech/abra/pkg/client"
|
||||||
|
"coopcloud.tech/abra/pkg/config"
|
||||||
|
"coopcloud.tech/abra/pkg/recipe"
|
||||||
|
recipePkg "coopcloud.tech/abra/pkg/recipe"
|
||||||
|
"github.com/sirupsen/logrus"
|
||||||
|
"github.com/urfave/cli"
|
||||||
|
)
|
||||||
|
|
||||||
|
var appCmdCommand = cli.Command{
|
||||||
|
Name: "command",
|
||||||
|
Aliases: []string{"cmd"},
|
||||||
|
Usage: "Run app commands",
|
||||||
|
Description: `Run an app specific command.
|
||||||
|
|
||||||
|
These commands are bash functions, defined in the abra.sh of the recipe itself.
|
||||||
|
They can be run within the context of a service (e.g. app) or locally on your
|
||||||
|
work station by passing "--local". Arguments can be passed into these functions
|
||||||
|
using the "-- <args>" syntax.
|
||||||
|
|
||||||
|
Example:
|
||||||
|
|
||||||
|
abra app cmd example.com app create_user -- me@example.com
|
||||||
|
`,
|
||||||
|
ArgsUsage: "<domain> [<service>] <command> [-- <args>]",
|
||||||
|
Flags: []cli.Flag{
|
||||||
|
internal.DebugFlag,
|
||||||
|
internal.LocalCmdFlag,
|
||||||
|
internal.RemoteUserFlag,
|
||||||
|
internal.TtyFlag,
|
||||||
|
internal.OfflineFlag,
|
||||||
|
internal.ChaosFlag,
|
||||||
|
},
|
||||||
|
Before: internal.SubCommandBefore,
|
||||||
|
Subcommands: []cli.Command{appCmdListCommand},
|
||||||
|
BashComplete: func(ctx *cli.Context) {
|
||||||
|
args := ctx.Args()
|
||||||
|
switch len(args) {
|
||||||
|
case 0:
|
||||||
|
autocomplete.AppNameComplete(ctx)
|
||||||
|
case 1:
|
||||||
|
autocomplete.ServiceNameComplete(args.Get(0))
|
||||||
|
case 2:
|
||||||
|
cmdNameComplete(args.Get(0))
|
||||||
|
}
|
||||||
|
},
|
||||||
|
Action: func(c *cli.Context) error {
|
||||||
|
app := internal.ValidateApp(c)
|
||||||
|
|
||||||
|
if err := recipe.EnsureExists(app.Recipe); err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if !internal.Chaos {
|
||||||
|
if err := recipePkg.EnsureIsClean(app.Recipe); err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if !internal.Offline {
|
||||||
|
if err := recipePkg.EnsureUpToDate(app.Recipe); err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := recipePkg.EnsureLatest(app.Recipe); err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if internal.LocalCmd && internal.RemoteUser != "" {
|
||||||
|
internal.ShowSubcommandHelpAndError(c, errors.New("cannot use --local & --user together"))
|
||||||
|
}
|
||||||
|
|
||||||
|
hasCmdArgs, parsedCmdArgs := parseCmdArgs(c.Args(), internal.LocalCmd)
|
||||||
|
|
||||||
|
abraSh := path.Join(config.RECIPES_DIR, app.Recipe, "abra.sh")
|
||||||
|
if _, err := os.Stat(abraSh); err != nil {
|
||||||
|
if os.IsNotExist(err) {
|
||||||
|
logrus.Fatalf("%s does not exist for %s?", abraSh, app.Name)
|
||||||
|
}
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if internal.LocalCmd {
|
||||||
|
if !(len(c.Args()) >= 2) {
|
||||||
|
internal.ShowSubcommandHelpAndError(c, errors.New("missing arguments"))
|
||||||
|
}
|
||||||
|
|
||||||
|
cmdName := c.Args().Get(1)
|
||||||
|
if err := internal.EnsureCommand(abraSh, app.Recipe, cmdName); err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
logrus.Debugf("--local detected, running %s on local work station", cmdName)
|
||||||
|
|
||||||
|
var exportEnv string
|
||||||
|
for k, v := range app.Env {
|
||||||
|
exportEnv = exportEnv + fmt.Sprintf("%s='%s'; ", k, v)
|
||||||
|
}
|
||||||
|
|
||||||
|
var sourceAndExec string
|
||||||
|
if hasCmdArgs {
|
||||||
|
logrus.Debugf("parsed following command arguments: %s", parsedCmdArgs)
|
||||||
|
sourceAndExec = fmt.Sprintf("TARGET=local; APP_NAME=%s; STACK_NAME=%s; %s . %s; %s %s", app.Name, app.StackName(), exportEnv, abraSh, cmdName, parsedCmdArgs)
|
||||||
|
} else {
|
||||||
|
logrus.Debug("did not detect any command arguments")
|
||||||
|
sourceAndExec = fmt.Sprintf("TARGET=local; APP_NAME=%s; STACK_NAME=%s; %s . %s; %s", app.Name, app.StackName(), exportEnv, abraSh, cmdName)
|
||||||
|
}
|
||||||
|
|
||||||
|
shell := "/bin/bash"
|
||||||
|
if _, err := os.Stat(shell); errors.Is(err, os.ErrNotExist) {
|
||||||
|
logrus.Debugf("%s does not exist locally, use /bin/sh as fallback", shell)
|
||||||
|
shell = "/bin/sh"
|
||||||
|
}
|
||||||
|
cmd := exec.Command(shell, "-c", sourceAndExec)
|
||||||
|
|
||||||
|
if err := internal.RunCmd(cmd); err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
if !(len(c.Args()) >= 3) {
|
||||||
|
internal.ShowSubcommandHelpAndError(c, errors.New("missing arguments"))
|
||||||
|
}
|
||||||
|
|
||||||
|
targetServiceName := c.Args().Get(1)
|
||||||
|
|
||||||
|
cmdName := c.Args().Get(2)
|
||||||
|
if err := internal.EnsureCommand(abraSh, app.Recipe, cmdName); err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
serviceNames, err := config.GetAppServiceNames(app.Name)
|
||||||
|
if err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
matchingServiceName := false
|
||||||
|
for _, serviceName := range serviceNames {
|
||||||
|
if serviceName == targetServiceName {
|
||||||
|
matchingServiceName = true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if !matchingServiceName {
|
||||||
|
logrus.Fatalf("no service %s for %s?", targetServiceName, app.Name)
|
||||||
|
}
|
||||||
|
|
||||||
|
logrus.Debugf("running command %s within the context of %s_%s", cmdName, app.StackName(), targetServiceName)
|
||||||
|
|
||||||
|
if hasCmdArgs {
|
||||||
|
logrus.Debugf("parsed following command arguments: %s", parsedCmdArgs)
|
||||||
|
} else {
|
||||||
|
logrus.Debug("did not detect any command arguments")
|
||||||
|
}
|
||||||
|
|
||||||
|
cl, err := client.New(app.Server)
|
||||||
|
if err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := internal.RunCmdRemote(cl, app, abraSh, targetServiceName, cmdName, parsedCmdArgs); err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
func parseCmdArgs(args []string, isLocal bool) (bool, string) {
|
||||||
|
var (
|
||||||
|
parsedCmdArgs string
|
||||||
|
hasCmdArgs bool
|
||||||
|
)
|
||||||
|
|
||||||
|
if isLocal {
|
||||||
|
if len(args) > 2 {
|
||||||
|
return true, fmt.Sprintf("%s ", strings.Join(args[2:], " "))
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
if len(args) > 3 {
|
||||||
|
return true, fmt.Sprintf("%s ", strings.Join(args[3:], " "))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return hasCmdArgs, parsedCmdArgs
|
||||||
|
}
|
||||||
|
|
||||||
|
func cmdNameComplete(appName string) {
|
||||||
|
app, err := app.Get(appName)
|
||||||
|
if err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
cmdNames, _ := getShCmdNames(app)
|
||||||
|
if err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
for _, n := range cmdNames {
|
||||||
|
fmt.Println(n)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
var appCmdListCommand = cli.Command{
|
||||||
|
Name: "list",
|
||||||
|
Aliases: []string{"ls"},
|
||||||
|
Usage: "List all available commands",
|
||||||
|
ArgsUsage: "<domain>",
|
||||||
|
Flags: []cli.Flag{
|
||||||
|
internal.DebugFlag,
|
||||||
|
internal.OfflineFlag,
|
||||||
|
internal.ChaosFlag,
|
||||||
|
},
|
||||||
|
BashComplete: autocomplete.AppNameComplete,
|
||||||
|
Before: internal.SubCommandBefore,
|
||||||
|
Action: func(c *cli.Context) error {
|
||||||
|
app := internal.ValidateApp(c)
|
||||||
|
|
||||||
|
if err := recipe.EnsureExists(app.Recipe); err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if !internal.Chaos {
|
||||||
|
if err := recipePkg.EnsureIsClean(app.Recipe); err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if !internal.Offline {
|
||||||
|
if err := recipePkg.EnsureUpToDate(app.Recipe); err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := recipePkg.EnsureLatest(app.Recipe); err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
cmdNames, err := getShCmdNames(app)
|
||||||
|
if err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, cmdName := range cmdNames {
|
||||||
|
fmt.Println(cmdName)
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
func getShCmdNames(app config.App) ([]string, error) {
|
||||||
|
abraShPath := fmt.Sprintf("%s/%s/%s", config.RECIPES_DIR, app.Recipe, "abra.sh")
|
||||||
|
cmdNames, err := config.ReadAbraShCmdNames(abraShPath)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
sort.Strings(cmdNames)
|
||||||
|
return cmdNames, nil
|
||||||
|
}
|
|
@ -0,0 +1,31 @@
|
||||||
|
package app
|
||||||
|
|
||||||
|
import (
|
||||||
|
"strings"
|
||||||
|
"testing"
|
||||||
|
)
|
||||||
|
|
||||||
|
func TestParseCmdArgs(t *testing.T) {
|
||||||
|
tests := []struct {
|
||||||
|
input []string
|
||||||
|
shouldParse bool
|
||||||
|
expectedOutput string
|
||||||
|
}{
|
||||||
|
// `--` is not parsed when passed in from the command-line e.g. -- foo bar baz
|
||||||
|
// so we need to eumlate that as missing when testing if bash args are passed in
|
||||||
|
// see https://git.coopcloud.tech/coop-cloud/organising/issues/336 for more
|
||||||
|
{[]string{"foo.com", "app", "test"}, false, ""},
|
||||||
|
{[]string{"foo.com", "app", "test", "foo"}, true, "foo "},
|
||||||
|
{[]string{"foo.com", "app", "test", "foo", "bar", "baz"}, true, "foo bar baz "},
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, test := range tests {
|
||||||
|
ok, parsed := parseCmdArgs(test.input, false)
|
||||||
|
if ok != test.shouldParse {
|
||||||
|
t.Fatalf("[%s] should not parse", strings.Join(test.input, " "))
|
||||||
|
}
|
||||||
|
if parsed != test.expectedOutput {
|
||||||
|
t.Fatalf("%s does not match %s", parsed, test.expectedOutput)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
|
@ -1,23 +1,44 @@
|
||||||
package app
|
package app
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"fmt"
|
"errors"
|
||||||
"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{"cfg"},
|
||||||
Usage: "Edit app config",
|
Usage: "Edit app config",
|
||||||
|
ArgsUsage: "<domain>",
|
||||||
|
Flags: []cli.Flag{
|
||||||
|
internal.DebugFlag,
|
||||||
|
},
|
||||||
|
Before: internal.SubCommandBefore,
|
||||||
|
BashComplete: autocomplete.AppNameComplete,
|
||||||
Action: func(c *cli.Context) error {
|
Action: func(c *cli.Context) error {
|
||||||
app := internal.ValidateApp(c)
|
appName := c.Args().First()
|
||||||
|
|
||||||
|
if appName == "" {
|
||||||
|
internal.ShowSubcommandHelpAndError(c, errors.New("no app provided"))
|
||||||
|
}
|
||||||
|
|
||||||
|
files, err := config.LoadAppFiles("")
|
||||||
|
if err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
appFile, exists := files[appName]
|
||||||
|
if !exists {
|
||||||
|
logrus.Fatalf("cannot find app with name %s", appName)
|
||||||
|
}
|
||||||
|
|
||||||
ed, ok := os.LookupEnv("EDITOR")
|
ed, ok := os.LookupEnv("EDITOR")
|
||||||
if !ok {
|
if !ok {
|
||||||
|
@ -30,7 +51,7 @@ var appConfigCommand = &cli.Command{
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
cmd := exec.Command(ed, app.Path)
|
cmd := exec.Command(ed, appFile.Path)
|
||||||
cmd.Stdin = os.Stdin
|
cmd.Stdin = os.Stdin
|
||||||
cmd.Stdout = os.Stdout
|
cmd.Stdout = os.Stdout
|
||||||
cmd.Stderr = os.Stderr
|
cmd.Stderr = os.Stderr
|
||||||
|
@ -40,16 +61,4 @@ var appConfigCommand = &cli.Command{
|
||||||
|
|
||||||
return nil
|
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)
|
|
||||||
}
|
|
||||||
},
|
|
||||||
}
|
}
|
||||||
|
|
419
cli/app/cp.go
419
cli/app/cp.go
|
@ -2,26 +2,51 @@ package app
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
|
"errors"
|
||||||
"fmt"
|
"fmt"
|
||||||
|
"io"
|
||||||
"os"
|
"os"
|
||||||
|
"path"
|
||||||
|
"path/filepath"
|
||||||
"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"
|
containerPkg "coopcloud.tech/abra/pkg/container"
|
||||||
|
"coopcloud.tech/abra/pkg/formatter"
|
||||||
|
"coopcloud.tech/abra/pkg/upstream/container"
|
||||||
|
"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"
|
dockerClient "github.com/docker/docker/client"
|
||||||
|
"github.com/docker/docker/errdefs"
|
||||||
"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 deployed app service",
|
||||||
|
Description: `
|
||||||
|
Copy 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 .
|
||||||
|
`,
|
||||||
|
BashComplete: autocomplete.AppNameComplete,
|
||||||
Action: func(c *cli.Context) error {
|
Action: func(c *cli.Context) error {
|
||||||
app := internal.ValidateApp(c)
|
app := internal.ValidateApp(c)
|
||||||
|
|
||||||
|
@ -29,98 +54,326 @@ var appCpCommand = &cli.Command{
|
||||||
dst := c.Args().Get(2)
|
dst := c.Args().Get(2)
|
||||||
if src == "" {
|
if src == "" {
|
||||||
logrus.Fatal("missing <src> argument")
|
logrus.Fatal("missing <src> argument")
|
||||||
} else if dst == "" {
|
}
|
||||||
|
if dst == "" {
|
||||||
logrus.Fatal("missing <dest> argument")
|
logrus.Fatal("missing <dest> argument")
|
||||||
}
|
}
|
||||||
|
|
||||||
parsedSrc := strings.SplitN(src, ":", 2)
|
srcPath, dstPath, service, toContainer, err := parseSrcAndDst(src, dst)
|
||||||
parsedDst := strings.SplitN(dst, ":", 2)
|
|
||||||
errorMsg := "one of <src>/<dest> arguments must take $SERVICE:$PATH form"
|
|
||||||
if len(parsedSrc) == 2 && len(parsedDst) == 2 {
|
|
||||||
logrus.Fatal(errorMsg)
|
|
||||||
} else if len(parsedSrc) != 2 {
|
|
||||||
if len(parsedDst) != 2 {
|
|
||||||
logrus.Fatal(errorMsg)
|
|
||||||
}
|
|
||||||
} else if len(parsedDst) != 2 {
|
|
||||||
if len(parsedSrc) != 2 {
|
|
||||||
logrus.Fatal(errorMsg)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
var service string
|
|
||||||
var srcPath string
|
|
||||||
var dstPath string
|
|
||||||
isToContainer := false // <container:src> <dst>
|
|
||||||
if len(parsedSrc) == 2 {
|
|
||||||
service = parsedSrc[0]
|
|
||||||
srcPath = parsedSrc[1]
|
|
||||||
dstPath = dst
|
|
||||||
logrus.Debugf("assuming transfer is coming FROM the container")
|
|
||||||
} else if len(parsedDst) == 2 {
|
|
||||||
service = parsedDst[0]
|
|
||||||
dstPath = parsedDst[1]
|
|
||||||
srcPath = src
|
|
||||||
isToContainer = true // <src> <container:dst>
|
|
||||||
logrus.Debugf("assuming transfer is going TO the container")
|
|
||||||
}
|
|
||||||
|
|
||||||
appFiles, err := config.LoadAppFiles("")
|
|
||||||
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)
|
|
||||||
}
|
|
||||||
|
|
||||||
ctx := context.Background()
|
|
||||||
cl, err := client.New(app.Server)
|
cl, err := client.New(app.Server)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
filters := filters.NewArgs()
|
container, err := containerPkg.GetContainerFromStackAndService(cl, app.StackName(), service)
|
||||||
filters.Add("name", fmt.Sprintf("%s_%s", appEnv.StackName(), service))
|
if err != nil {
|
||||||
containers, err := cl.ContainerList(ctx, types.ContainerListOptions{Filters: filters})
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
logrus.Debugf("retrieved %s as target container on %s", formatter.ShortenID(container.ID), app.Server)
|
||||||
|
|
||||||
|
if toContainer {
|
||||||
|
err = CopyToContainer(cl, container.ID, srcPath, dstPath)
|
||||||
|
} else {
|
||||||
|
err = CopyFromContainer(cl, container.ID, srcPath, dstPath)
|
||||||
|
}
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logrus.Fatal(err)
|
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(ctx, container.ID, dstPath, content, copyOpts); err != nil {
|
|
||||||
logrus.Fatal(err)
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
content, _, err := cl.CopyFromContainer(ctx, 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
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
|
var errServiceMissing = errors.New("one of <src>/<dest> arguments must take $SERVICE:$PATH form")
|
||||||
|
|
||||||
|
// parseSrcAndDst parses src and dest string. One of src or dst must be of the form $SERVICE:$PATH
|
||||||
|
func parseSrcAndDst(src, dst string) (srcPath string, dstPath string, service string, toContainer bool, err error) {
|
||||||
|
parsedSrc := strings.SplitN(src, ":", 2)
|
||||||
|
parsedDst := strings.SplitN(dst, ":", 2)
|
||||||
|
if len(parsedSrc)+len(parsedDst) != 3 {
|
||||||
|
return "", "", "", false, errServiceMissing
|
||||||
|
}
|
||||||
|
if len(parsedSrc) == 2 {
|
||||||
|
return parsedSrc[1], dst, parsedSrc[0], false, nil
|
||||||
|
}
|
||||||
|
if len(parsedDst) == 2 {
|
||||||
|
return src, parsedDst[1], parsedDst[0], true, nil
|
||||||
|
}
|
||||||
|
return "", "", "", false, errServiceMissing
|
||||||
|
}
|
||||||
|
|
||||||
|
// CopyToContainer copies a file or directory from the local file system to the container.
|
||||||
|
// See the possible copy modes and their documentation.
|
||||||
|
func CopyToContainer(cl *dockerClient.Client, containerID, srcPath, dstPath string) error {
|
||||||
|
srcStat, err := os.Stat(srcPath)
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("local %s ", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
dstStat, err := cl.ContainerStatPath(context.Background(), containerID, dstPath)
|
||||||
|
dstExists := true
|
||||||
|
if err != nil {
|
||||||
|
if errdefs.IsNotFound(err) {
|
||||||
|
dstExists = false
|
||||||
|
} else {
|
||||||
|
return fmt.Errorf("remote path: %s", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
mode, err := copyMode(srcPath, dstPath, srcStat.Mode(), dstStat.Mode, dstExists)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
movePath := ""
|
||||||
|
switch mode {
|
||||||
|
case CopyModeDirToDir:
|
||||||
|
// Add the src directory to the destination path
|
||||||
|
_, srcDir := path.Split(srcPath)
|
||||||
|
dstPath = path.Join(dstPath, srcDir)
|
||||||
|
|
||||||
|
// Make sure the dst directory exits.
|
||||||
|
dcli, err := command.NewDockerCli()
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if _, err := container.RunExec(dcli, cl, containerID, &types.ExecConfig{
|
||||||
|
AttachStderr: true,
|
||||||
|
AttachStdin: true,
|
||||||
|
AttachStdout: true,
|
||||||
|
Cmd: []string{"mkdir", "-p", dstPath},
|
||||||
|
Detach: false,
|
||||||
|
Tty: true,
|
||||||
|
}); err != nil {
|
||||||
|
return fmt.Errorf("create remote directory: %s", err)
|
||||||
|
}
|
||||||
|
case CopyModeFileToFile:
|
||||||
|
// Remove the file component from the path, since docker can only copy
|
||||||
|
// to a directory.
|
||||||
|
dstPath, _ = path.Split(dstPath)
|
||||||
|
case CopyModeFileToFileRename:
|
||||||
|
// Copy the file to the temp directory and move it to its dstPath
|
||||||
|
// afterwards.
|
||||||
|
movePath = dstPath
|
||||||
|
dstPath = "/tmp"
|
||||||
|
}
|
||||||
|
|
||||||
|
toTarOpts := &archive.TarOptions{IncludeSourceDir: true, NoOverwriteDirNonDir: true, Compression: archive.Gzip}
|
||||||
|
content, err := archive.TarWithOptions(srcPath, toTarOpts)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
logrus.Debugf("copy %s from local to %s on container", srcPath, dstPath)
|
||||||
|
copyOpts := types.CopyToContainerOptions{AllowOverwriteDirWithFile: false, CopyUIDGID: false}
|
||||||
|
if err := cl.CopyToContainer(context.Background(), containerID, dstPath, content, copyOpts); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
if movePath != "" {
|
||||||
|
_, srcFile := path.Split(srcPath)
|
||||||
|
dcli, err := command.NewDockerCli()
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if _, err := container.RunExec(dcli, cl, containerID, &types.ExecConfig{
|
||||||
|
AttachStderr: true,
|
||||||
|
AttachStdin: true,
|
||||||
|
AttachStdout: true,
|
||||||
|
Cmd: []string{"mv", path.Join("/tmp", srcFile), movePath},
|
||||||
|
Detach: false,
|
||||||
|
Tty: true,
|
||||||
|
}); err != nil {
|
||||||
|
return fmt.Errorf("create remote directory: %s", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// CopyFromContainer copies a file or directory from the given container to the local file system.
|
||||||
|
// See the possible copy modes and their documentation.
|
||||||
|
func CopyFromContainer(cl *dockerClient.Client, containerID, srcPath, dstPath string) error {
|
||||||
|
srcStat, err := cl.ContainerStatPath(context.Background(), containerID, srcPath)
|
||||||
|
if err != nil {
|
||||||
|
if errdefs.IsNotFound(err) {
|
||||||
|
return fmt.Errorf("remote: %s does not exist", srcPath)
|
||||||
|
} else {
|
||||||
|
return fmt.Errorf("remote path: %s", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
dstStat, err := os.Stat(dstPath)
|
||||||
|
dstExists := true
|
||||||
|
var dstMode os.FileMode
|
||||||
|
if err != nil {
|
||||||
|
if os.IsNotExist(err) {
|
||||||
|
dstExists = false
|
||||||
|
} else {
|
||||||
|
return fmt.Errorf("remote path: %s", err)
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
dstMode = dstStat.Mode()
|
||||||
|
}
|
||||||
|
|
||||||
|
mode, err := copyMode(srcPath, dstPath, srcStat.Mode, dstMode, dstExists)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
moveDstDir := ""
|
||||||
|
moveDstFile := ""
|
||||||
|
switch mode {
|
||||||
|
case CopyModeFileToFile:
|
||||||
|
// Remove the file component from the path, since docker can only copy
|
||||||
|
// to a directory.
|
||||||
|
dstPath, _ = path.Split(dstPath)
|
||||||
|
case CopyModeFileToFileRename:
|
||||||
|
// Copy the file to the temp directory and move it to its dstPath
|
||||||
|
// afterwards.
|
||||||
|
moveDstFile = dstPath
|
||||||
|
dstPath = "/tmp"
|
||||||
|
case CopyModeFilesToDir:
|
||||||
|
// Copy the directory to the temp directory and move it to its
|
||||||
|
// dstPath afterwards.
|
||||||
|
moveDstDir = path.Join(dstPath, "/")
|
||||||
|
dstPath = "/tmp"
|
||||||
|
|
||||||
|
// Make sure the temp directory always gets removed
|
||||||
|
defer os.Remove(path.Join("/tmp"))
|
||||||
|
}
|
||||||
|
|
||||||
|
content, _, err := cl.CopyFromContainer(context.Background(), containerID, srcPath)
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("copy: %s", err)
|
||||||
|
}
|
||||||
|
defer content.Close()
|
||||||
|
if err := archive.Untar(content, dstPath, &archive.TarOptions{
|
||||||
|
NoOverwriteDirNonDir: true,
|
||||||
|
Compression: archive.Gzip,
|
||||||
|
NoLchown: true,
|
||||||
|
}); err != nil {
|
||||||
|
return fmt.Errorf("untar: %s", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if moveDstFile != "" {
|
||||||
|
_, srcFile := path.Split(strings.TrimSuffix(srcPath, "/"))
|
||||||
|
if err := moveFile(path.Join("/tmp", srcFile), moveDstFile); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if moveDstDir != "" {
|
||||||
|
_, srcDir := path.Split(strings.TrimSuffix(srcPath, "/"))
|
||||||
|
if err := moveDir(path.Join("/tmp", srcDir), moveDstDir); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
var (
|
||||||
|
ErrCopyDirToFile = fmt.Errorf("can't copy dir to file")
|
||||||
|
ErrDstDirNotExist = fmt.Errorf("destination directory does not exist")
|
||||||
|
)
|
||||||
|
|
||||||
|
type CopyMode int
|
||||||
|
|
||||||
|
const (
|
||||||
|
// Copy a src file to a dest file. The src and dest file names are the same.
|
||||||
|
// <dir_src>/<file> + <dir_dst>/<file> -> <dir_dst>/<file>
|
||||||
|
CopyModeFileToFile = CopyMode(iota)
|
||||||
|
// Copy a src file to a dest file. The src and dest file names are not the same.
|
||||||
|
// <dir_src>/<file_src> + <dir_dst>/<file_dst> -> <dir_dst>/<file_dst>
|
||||||
|
CopyModeFileToFileRename
|
||||||
|
// Copy a src file to dest directory. The dest file gets created in the dest
|
||||||
|
// folder with the src filename.
|
||||||
|
// <dir_src>/<file> + <dir_dst> -> <dir_dst>/<file>
|
||||||
|
CopyModeFileToDir
|
||||||
|
// Copy a src directory to dest directory.
|
||||||
|
// <dir_src> + <dir_dst> -> <dir_dst>/<dir_src>
|
||||||
|
CopyModeDirToDir
|
||||||
|
// Copy all files in the src directory to the dest directory. This works recursively.
|
||||||
|
// <dir_src>/ + <dir_dst> -> <dir_dst>/<files_from_dir_src>
|
||||||
|
CopyModeFilesToDir
|
||||||
|
)
|
||||||
|
|
||||||
|
// copyMode takes a src and dest path and file mode to determine the copy mode.
|
||||||
|
// See the possible copy modes and their documentation.
|
||||||
|
func copyMode(srcPath, dstPath string, srcMode os.FileMode, dstMode os.FileMode, dstExists bool) (CopyMode, error) {
|
||||||
|
_, srcFile := path.Split(srcPath)
|
||||||
|
_, dstFile := path.Split(dstPath)
|
||||||
|
if srcMode.IsDir() {
|
||||||
|
if !dstExists {
|
||||||
|
return -1, ErrDstDirNotExist
|
||||||
|
}
|
||||||
|
if dstMode.IsDir() {
|
||||||
|
if strings.HasSuffix(srcPath, "/") {
|
||||||
|
return CopyModeFilesToDir, nil
|
||||||
|
}
|
||||||
|
return CopyModeDirToDir, nil
|
||||||
|
}
|
||||||
|
return -1, ErrCopyDirToFile
|
||||||
|
}
|
||||||
|
|
||||||
|
if dstMode.IsDir() {
|
||||||
|
return CopyModeFileToDir, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
if srcFile != dstFile {
|
||||||
|
return CopyModeFileToFileRename, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
return CopyModeFileToFile, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// moveDir moves all files from a source path to the destination path recursively.
|
||||||
|
func moveDir(sourcePath, destPath string) error {
|
||||||
|
return filepath.Walk(sourcePath, func(p string, info os.FileInfo, err error) error {
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
newPath := path.Join(destPath, strings.TrimPrefix(p, sourcePath))
|
||||||
|
if info.IsDir() {
|
||||||
|
err := os.Mkdir(newPath, info.Mode())
|
||||||
|
if err != nil {
|
||||||
|
if os.IsExist(err) {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if info.Mode().IsRegular() {
|
||||||
|
return moveFile(p, newPath)
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
// moveFile moves a file from a source path to a destination path.
|
||||||
|
func moveFile(sourcePath, destPath string) error {
|
||||||
|
inputFile, err := os.Open(sourcePath)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
outputFile, err := os.Create(destPath)
|
||||||
|
if err != nil {
|
||||||
|
inputFile.Close()
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
defer outputFile.Close()
|
||||||
|
_, err = io.Copy(outputFile, inputFile)
|
||||||
|
inputFile.Close()
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
// Remove file after succesfull copy.
|
||||||
|
err = os.Remove(sourcePath)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
|
@ -0,0 +1,113 @@
|
||||||
|
package app
|
||||||
|
|
||||||
|
import (
|
||||||
|
"os"
|
||||||
|
"testing"
|
||||||
|
)
|
||||||
|
|
||||||
|
func TestParse(t *testing.T) {
|
||||||
|
tests := []struct {
|
||||||
|
src string
|
||||||
|
dst string
|
||||||
|
srcPath string
|
||||||
|
dstPath string
|
||||||
|
service string
|
||||||
|
toContainer bool
|
||||||
|
err error
|
||||||
|
}{
|
||||||
|
{src: "foo", dst: "bar", err: errServiceMissing},
|
||||||
|
{src: "app:foo", dst: "app:bar", err: errServiceMissing},
|
||||||
|
{src: "app:foo", dst: "bar", srcPath: "foo", dstPath: "bar", service: "app", toContainer: false},
|
||||||
|
{src: "foo", dst: "app:bar", srcPath: "foo", dstPath: "bar", service: "app", toContainer: true},
|
||||||
|
}
|
||||||
|
|
||||||
|
for i, tc := range tests {
|
||||||
|
srcPath, dstPath, service, toContainer, err := parseSrcAndDst(tc.src, tc.dst)
|
||||||
|
if srcPath != tc.srcPath {
|
||||||
|
t.Errorf("[%d] srcPath: want (%s), got(%s)", i, tc.srcPath, srcPath)
|
||||||
|
}
|
||||||
|
if dstPath != tc.dstPath {
|
||||||
|
t.Errorf("[%d] dstPath: want (%s), got(%s)", i, tc.dstPath, dstPath)
|
||||||
|
}
|
||||||
|
if service != tc.service {
|
||||||
|
t.Errorf("[%d] service: want (%s), got(%s)", i, tc.service, service)
|
||||||
|
}
|
||||||
|
if toContainer != tc.toContainer {
|
||||||
|
t.Errorf("[%d] toConainer: want (%t), got(%t)", i, tc.toContainer, toContainer)
|
||||||
|
}
|
||||||
|
if err == nil && tc.err != nil && err.Error() != tc.err.Error() {
|
||||||
|
t.Errorf("[%d] err: want (%s), got(%s)", i, tc.err, err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestCopyMode(t *testing.T) {
|
||||||
|
tests := []struct {
|
||||||
|
srcPath string
|
||||||
|
dstPath string
|
||||||
|
srcMode os.FileMode
|
||||||
|
dstMode os.FileMode
|
||||||
|
dstExists bool
|
||||||
|
mode CopyMode
|
||||||
|
err error
|
||||||
|
}{
|
||||||
|
{
|
||||||
|
srcPath: "foo.txt",
|
||||||
|
dstPath: "foo.txt",
|
||||||
|
srcMode: os.ModePerm,
|
||||||
|
dstMode: os.ModePerm,
|
||||||
|
dstExists: true,
|
||||||
|
mode: CopyModeFileToFile,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
srcPath: "foo.txt",
|
||||||
|
dstPath: "bar.txt",
|
||||||
|
srcMode: os.ModePerm,
|
||||||
|
dstExists: true,
|
||||||
|
mode: CopyModeFileToFileRename,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
srcPath: "foo",
|
||||||
|
dstPath: "foo",
|
||||||
|
srcMode: os.ModeDir,
|
||||||
|
dstMode: os.ModeDir,
|
||||||
|
dstExists: true,
|
||||||
|
mode: CopyModeDirToDir,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
srcPath: "foo/",
|
||||||
|
dstPath: "foo",
|
||||||
|
srcMode: os.ModeDir,
|
||||||
|
dstMode: os.ModeDir,
|
||||||
|
dstExists: true,
|
||||||
|
mode: CopyModeFilesToDir,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
srcPath: "foo",
|
||||||
|
dstPath: "foo",
|
||||||
|
srcMode: os.ModeDir,
|
||||||
|
dstExists: false,
|
||||||
|
mode: -1,
|
||||||
|
err: ErrDstDirNotExist,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
srcPath: "foo",
|
||||||
|
dstPath: "foo",
|
||||||
|
srcMode: os.ModeDir,
|
||||||
|
dstMode: os.ModePerm,
|
||||||
|
dstExists: true,
|
||||||
|
mode: -1,
|
||||||
|
err: ErrCopyDirToFile,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
for i, tc := range tests {
|
||||||
|
mode, err := copyMode(tc.srcPath, tc.dstPath, tc.srcMode, tc.dstMode, tc.dstExists)
|
||||||
|
if mode != tc.mode {
|
||||||
|
t.Errorf("[%d] mode: want (%d), got(%d)", i, tc.mode, mode)
|
||||||
|
}
|
||||||
|
if err != tc.err {
|
||||||
|
t.Errorf("[%d] err: want (%s), got(%s)", i, tc.err, err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
|
@ -1,29 +1,179 @@
|
||||||
package app
|
package app
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"context"
|
||||||
"fmt"
|
"fmt"
|
||||||
|
|
||||||
"coopcloud.tech/abra/cli/internal"
|
"coopcloud.tech/abra/cli/internal"
|
||||||
|
"coopcloud.tech/abra/pkg/autocomplete"
|
||||||
|
"coopcloud.tech/abra/pkg/secret"
|
||||||
|
|
||||||
"coopcloud.tech/abra/pkg/client"
|
"coopcloud.tech/abra/pkg/client"
|
||||||
stack "coopcloud.tech/abra/pkg/client/stack"
|
|
||||||
"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/upstream/stack"
|
||||||
"github.com/sirupsen/logrus"
|
"github.com/sirupsen/logrus"
|
||||||
"github.com/urfave/cli/v2"
|
"github.com/urfave/cli"
|
||||||
)
|
)
|
||||||
|
|
||||||
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> [<version>]",
|
||||||
|
Flags: []cli.Flag{
|
||||||
|
internal.DebugFlag,
|
||||||
|
internal.NoInputFlag,
|
||||||
|
internal.ForceFlag,
|
||||||
|
internal.ChaosFlag,
|
||||||
|
internal.NoDomainChecksFlag,
|
||||||
|
internal.DontWaitConvergeFlag,
|
||||||
|
internal.OfflineFlag,
|
||||||
|
},
|
||||||
|
Before: internal.SubCommandBefore,
|
||||||
|
Description: `
|
||||||
|
Deploy an app. It does not support incrementing the version of a deployed app,
|
||||||
|
for this you need to look at the "abra app upgrade <domain>" command.
|
||||||
|
|
||||||
|
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.
|
||||||
|
|
||||||
|
Chaos 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
|
||||||
|
recipes.
|
||||||
|
`,
|
||||||
|
BashComplete: autocomplete.AppNameComplete,
|
||||||
Action: func(c *cli.Context) error {
|
Action: func(c *cli.Context) error {
|
||||||
app := internal.ValidateApp(c)
|
app := internal.ValidateApp(c)
|
||||||
|
stackName := app.StackName()
|
||||||
|
|
||||||
|
specificVersion := c.Args().Get(1)
|
||||||
|
if specificVersion != "" && internal.Chaos {
|
||||||
|
logrus.Fatal("cannot use <version> and --chaos together")
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := recipe.EnsureExists(app.Recipe); err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if !internal.Chaos {
|
||||||
|
if err := recipe.EnsureIsClean(app.Recipe); err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if !internal.Offline {
|
||||||
|
if err := recipe.EnsureUpToDate(app.Recipe); err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := recipe.EnsureLatest(app.Recipe); err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
r, err := recipe.Get(app.Recipe, internal.Offline)
|
||||||
|
if err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := lint.LintForErrors(r); err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
logrus.Debugf("checking whether %s is already deployed", stackName)
|
||||||
|
|
||||||
cl, err := client.New(app.Server)
|
cl, err := client.New(app.Server)
|
||||||
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")
|
isDeployed, deployedVersion, err := stack.IsDeployed(context.Background(), cl, stackName)
|
||||||
|
if err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
secStats, err := secret.PollSecretsStatus(cl, app)
|
||||||
|
if err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, secStat := range secStats {
|
||||||
|
if !secStat.CreatedOnRemote {
|
||||||
|
logrus.Fatalf("unable to deploy, secrets not generated (%s)?", secStat.LocalName)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if isDeployed {
|
||||||
|
if internal.Force || internal.Chaos {
|
||||||
|
logrus.Warnf("%s is already deployed but continuing (--force/--chaos)", app.Name)
|
||||||
|
} else {
|
||||||
|
logrus.Fatalf("%s is already deployed", app.Name)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
version := deployedVersion
|
||||||
|
if specificVersion != "" {
|
||||||
|
version = specificVersion
|
||||||
|
logrus.Debugf("choosing %s as version to deploy", version)
|
||||||
|
if err := recipe.EnsureVersion(app.Recipe, version); err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if !internal.Chaos && specificVersion == "" {
|
||||||
|
catl, err := recipe.ReadRecipeCatalogue(internal.Offline)
|
||||||
|
if err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
versions, err := recipe.GetRecipeCatalogueVersions(app.Recipe, catl)
|
||||||
|
if err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if len(versions) == 0 && !internal.Chaos {
|
||||||
|
logrus.Warn("no published versions in catalogue, trying local recipe repository")
|
||||||
|
recipeVersions, err := recipe.GetRecipeVersions(app.Recipe, internal.Offline)
|
||||||
|
if err != nil {
|
||||||
|
logrus.Warn(err)
|
||||||
|
}
|
||||||
|
for _, recipeVersion := range recipeVersions {
|
||||||
|
for version := range recipeVersion {
|
||||||
|
versions = append(versions, version)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if len(versions) > 0 && !internal.Chaos {
|
||||||
|
version = versions[len(versions)-1]
|
||||||
|
logrus.Debugf("choosing %s as version to deploy", version)
|
||||||
|
if err := recipe.EnsureVersion(app.Recipe, version); err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
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")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if internal.Chaos {
|
||||||
|
logrus.Warnf("chaos mode engaged")
|
||||||
|
var err error
|
||||||
|
version, err = recipe.ChaosVersion(app.Recipe)
|
||||||
|
if err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
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)
|
||||||
|
@ -31,15 +181,15 @@ var appDeployCommand = &cli.Command{
|
||||||
for k, v := range abraShEnv {
|
for k, v := range abraShEnv {
|
||||||
app.Env[k] = v
|
app.Env[k] = v
|
||||||
}
|
}
|
||||||
app.Env["STACK_NAME"] = app.StackName()
|
|
||||||
|
|
||||||
composeFiles, err := config.GetAppComposeFiles(app.Type, app.Env)
|
composeFiles, err := config.GetComposeFiles(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: app.StackName(),
|
Namespace: stackName,
|
||||||
Prune: false,
|
Prune: false,
|
||||||
ResolveImage: stack.ResolveImageAlways,
|
ResolveImage: stack.ResolveImageAlways,
|
||||||
}
|
}
|
||||||
|
@ -48,22 +198,57 @@ var appDeployCommand = &cli.Command{
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
if err := stack.RunDeploy(cl, deployOpts, compose); err != nil {
|
config.ExposeAllEnv(stackName, compose, app.Env)
|
||||||
|
config.SetRecipeLabel(compose, stackName, app.Recipe)
|
||||||
|
config.SetChaosLabel(compose, stackName, internal.Chaos)
|
||||||
|
config.SetChaosVersionLabel(compose, stackName, version)
|
||||||
|
config.SetUpdateLabel(compose, stackName, app.Env)
|
||||||
|
|
||||||
|
envVars, err := config.CheckEnv(app)
|
||||||
|
if err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
for _, envVar := range envVars {
|
||||||
|
if !envVar.Present {
|
||||||
|
logrus.Warnf("env var %s missing from %s.env, present in recipe .env.sample", envVar.Name, app.Domain)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := internal.DeployOverview(app, version, "continue with deployment?"); err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if !internal.NoDomainChecks {
|
||||||
|
domainName, ok := app.Env["DOMAIN"]
|
||||||
|
if ok {
|
||||||
|
if _, err = dns.EnsureDomainsResolveSameIPv4(domainName, app.Server); err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
logrus.Warn("skipping domain checks as no DOMAIN=... configured for app")
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
logrus.Warn("skipping domain checks as requested")
|
||||||
|
}
|
||||||
|
|
||||||
|
stack.WaitTimeout, err = config.GetTimeoutFromLabel(compose, stackName)
|
||||||
|
if err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
logrus.Debugf("set waiting timeout to %d s", stack.WaitTimeout)
|
||||||
|
|
||||||
|
if err := stack.RunDeploy(cl, deployOpts, compose, app.Name, internal.DontWaitConverge); err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
postDeployCmds, ok := app.Env["POST_DEPLOY_CMDS"]
|
||||||
|
if ok && !internal.DontWaitConverge {
|
||||||
|
logrus.Debugf("run the following post-deploy commands: %s", postDeployCmds)
|
||||||
|
if err := internal.PostCmds(cl, app, postDeployCmds); err != nil {
|
||||||
|
logrus.Fatalf("attempting to run post deploy commands, saw: %s", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
return nil
|
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)
|
|
||||||
}
|
|
||||||
},
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -0,0 +1,142 @@
|
||||||
|
package app
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"fmt"
|
||||||
|
"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: `
|
||||||
|
List 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,
|
||||||
|
internal.OfflineFlag,
|
||||||
|
},
|
||||||
|
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)
|
||||||
|
}
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
func checkErrors(c *cli.Context, cl *dockerClient.Client, app config.App) error {
|
||||||
|
recipe, err := recipe.Get(app.Recipe, internal.Offline)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, service := range recipe.Config.Services {
|
||||||
|
filters := filters.NewArgs()
|
||||||
|
filters.Add("name", fmt.Sprintf("^%s_%s", app.StackName(), 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]
|
||||||
|
}
|
283
cli/app/list.go
283
cli/app/list.go
|
@ -1,100 +1,299 @@
|
||||||
package app
|
package app
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"encoding/json"
|
||||||
|
"fmt"
|
||||||
"sort"
|
"sort"
|
||||||
|
"strconv"
|
||||||
|
"strings"
|
||||||
|
|
||||||
abraFormatter "coopcloud.tech/abra/cli/formatter"
|
"coopcloud.tech/abra/cli/internal"
|
||||||
"coopcloud.tech/abra/pkg/config"
|
"coopcloud.tech/abra/pkg/config"
|
||||||
|
"coopcloud.tech/abra/pkg/formatter"
|
||||||
|
"coopcloud.tech/abra/pkg/recipe"
|
||||||
|
"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 recipeFilter 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: &recipeFilter,
|
||||||
}
|
}
|
||||||
|
|
||||||
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 `json:"server"`
|
||||||
Usage: "List all managed apps",
|
Recipe string `json:"recipe"`
|
||||||
|
AppName string `json:"appName"`
|
||||||
|
Domain string `json:"domain"`
|
||||||
|
Status string `json:"status"`
|
||||||
|
Chaos string `json:"chaos"`
|
||||||
|
ChaosVersion string `json:"chaosVersion"`
|
||||||
|
AutoUpdate string `json:"autoUpdate"`
|
||||||
|
Version string `json:"version"`
|
||||||
|
Upgrade string `json:"upgrade"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type serverStatus struct {
|
||||||
|
Apps []appStatus `json:"apps"`
|
||||||
|
AppCount int `json:"appCount"`
|
||||||
|
VersionCount int `json:"versionCount"`
|
||||||
|
UnversionedCount int `json:"unversionedCount"`
|
||||||
|
LatestCount int `json:"latestCount"`
|
||||||
|
UpgradeCount int `json:"upgradeCount"`
|
||||||
|
}
|
||||||
|
|
||||||
|
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.
|
Read the local file system listing of apps and servers (e.g. ~/.abra/) to
|
||||||
in ~/.abra/) to generate a report of all your apps.
|
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,
|
||||||
|
internal.MachineReadableFlag,
|
||||||
statusFlag,
|
statusFlag,
|
||||||
listAppServerFlag,
|
listAppServerFlag,
|
||||||
typeFlag,
|
recipeFlag,
|
||||||
|
internal.OfflineFlag,
|
||||||
},
|
},
|
||||||
|
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 {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
apps, err := config.GetApps(appFiles)
|
apps, err := config.GetApps(appFiles, recipeFilter)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
sort.Sort(config.ByServerAndType(apps))
|
|
||||||
|
|
||||||
statuses := map[string]string{}
|
sort.Sort(config.ByServerAndRecipe(apps))
|
||||||
tableCol := []string{"Server", "Type", "Domain"}
|
|
||||||
|
statuses := make(map[string]map[string]string)
|
||||||
|
var catl recipe.RecipeCatalogue
|
||||||
if status {
|
if status {
|
||||||
tableCol = append(tableCol, "Status")
|
alreadySeen := make(map[string]bool)
|
||||||
statuses, err = config.GetAppStatuses(appFiles)
|
for _, app := range apps {
|
||||||
|
if _, ok := alreadySeen[app.Server]; !ok {
|
||||||
|
alreadySeen[app.Server] = true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
statuses, err = config.GetAppStatuses(apps, internal.MachineReadable)
|
||||||
|
if err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
catl, err = recipe.ReadRecipeCatalogue(internal.Offline)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
table := abraFormatter.CreateTable(tableCol)
|
var totalServersCount int
|
||||||
table.SetAutoMergeCellsByColumnIndex([]int{0})
|
var totalAppsCount int
|
||||||
|
allStats := make(map[string]serverStatus)
|
||||||
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 status {
|
if recipeFilter == "" {
|
||||||
if status, ok := statuses[app.StackName()]; ok {
|
// count server, no filtering
|
||||||
tableRow = append(tableRow, status)
|
totalServersCount++
|
||||||
} else {
|
|
||||||
tableRow = append(tableRow, "unknown")
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
table.Append(tableRow)
|
|
||||||
|
if app.Recipe == recipeFilter || recipeFilter == "" {
|
||||||
|
if recipeFilter != "" {
|
||||||
|
// only count server if matches filter
|
||||||
|
totalServersCount++
|
||||||
|
}
|
||||||
|
|
||||||
|
appStats := appStatus{}
|
||||||
|
stats.AppCount++
|
||||||
|
totalAppsCount++
|
||||||
|
|
||||||
|
if status {
|
||||||
|
status := "unknown"
|
||||||
|
version := "unknown"
|
||||||
|
chaos := "unknown"
|
||||||
|
chaosVersion := "unknown"
|
||||||
|
autoUpdate := "unknown"
|
||||||
|
if statusMeta, ok := statuses[app.StackName()]; ok {
|
||||||
|
if currentVersion, exists := statusMeta["version"]; exists {
|
||||||
|
if currentVersion != "" {
|
||||||
|
version = currentVersion
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if chaosDeploy, exists := statusMeta["chaos"]; exists {
|
||||||
|
chaos = chaosDeploy
|
||||||
|
}
|
||||||
|
if chaosDeployVersion, exists := statusMeta["chaosVersion"]; exists {
|
||||||
|
chaosVersion = chaosDeployVersion
|
||||||
|
}
|
||||||
|
if autoUpdateState, exists := statusMeta["autoUpdate"]; exists {
|
||||||
|
autoUpdate = autoUpdateState
|
||||||
|
}
|
||||||
|
if statusMeta["status"] != "" {
|
||||||
|
status = statusMeta["status"]
|
||||||
|
}
|
||||||
|
stats.VersionCount++
|
||||||
|
} else {
|
||||||
|
stats.UnversionedCount++
|
||||||
|
}
|
||||||
|
|
||||||
|
appStats.Status = status
|
||||||
|
appStats.Chaos = chaos
|
||||||
|
appStats.ChaosVersion = chaosVersion
|
||||||
|
appStats.Version = version
|
||||||
|
appStats.AutoUpdate = autoUpdate
|
||||||
|
|
||||||
|
var newUpdates []string
|
||||||
|
if version != "unknown" {
|
||||||
|
updates, err := recipe.GetRecipeCatalogueVersions(app.Recipe, catl)
|
||||||
|
if err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
parsedVersion, err := tagcmp.Parse(version)
|
||||||
|
if err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, update := range updates {
|
||||||
|
parsedUpdate, err := tagcmp.Parse(update)
|
||||||
|
if err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if update != version && parsedUpdate.IsGreaterThan(parsedVersion) {
|
||||||
|
newUpdates = append(newUpdates, update)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if len(newUpdates) == 0 {
|
||||||
|
if version == "unknown" {
|
||||||
|
appStats.Upgrade = "unknown"
|
||||||
|
} else {
|
||||||
|
appStats.Upgrade = "latest"
|
||||||
|
stats.LatestCount++
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
newUpdates = internal.ReverseStringList(newUpdates)
|
||||||
|
appStats.Upgrade = strings.Join(newUpdates, "\n")
|
||||||
|
stats.UpgradeCount++
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
appStats.Server = app.Server
|
||||||
|
appStats.Recipe = app.Recipe
|
||||||
|
appStats.AppName = app.Name
|
||||||
|
appStats.Domain = app.Domain
|
||||||
|
|
||||||
|
stats.Apps = append(stats.Apps, appStats)
|
||||||
|
}
|
||||||
|
allStats[app.Server] = stats
|
||||||
}
|
}
|
||||||
|
|
||||||
table.Render()
|
if internal.MachineReadable {
|
||||||
|
jsonstring, err := json.Marshal(allStats)
|
||||||
|
if err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
} else {
|
||||||
|
fmt.Println(string(jsonstring))
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
alreadySeen := make(map[string]bool)
|
||||||
|
for _, app := range apps {
|
||||||
|
if _, ok := alreadySeen[app.Server]; ok {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
|
||||||
|
serverStat := allStats[app.Server]
|
||||||
|
|
||||||
|
tableCol := []string{"recipe", "domain"}
|
||||||
|
if status {
|
||||||
|
tableCol = append(tableCol, []string{"status", "chaos", "version", "upgrade", "autoupdate"}...)
|
||||||
|
}
|
||||||
|
|
||||||
|
table := formatter.CreateTable(tableCol)
|
||||||
|
|
||||||
|
for _, appStat := range serverStat.Apps {
|
||||||
|
tableRow := []string{appStat.Recipe, appStat.Domain}
|
||||||
|
if status {
|
||||||
|
chaosStatus := appStat.Chaos
|
||||||
|
if chaosStatus != "unknown" {
|
||||||
|
chaosEnabled, err := strconv.ParseBool(chaosStatus)
|
||||||
|
if err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
if chaosEnabled && appStat.ChaosVersion != "unknown" {
|
||||||
|
chaosStatus = appStat.ChaosVersion
|
||||||
|
}
|
||||||
|
}
|
||||||
|
tableRow = append(tableRow, []string{appStat.Status, chaosStatus, appStat.Version, appStat.Upgrade, appStat.AutoUpdate}...)
|
||||||
|
}
|
||||||
|
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
|
||||||
},
|
},
|
||||||
|
|
194
cli/app/logs.go
194
cli/app/logs.go
|
@ -2,49 +2,127 @@ package app
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
"fmt"
|
|
||||||
"io"
|
"io"
|
||||||
"os"
|
"os"
|
||||||
|
"slices"
|
||||||
"sync"
|
"sync"
|
||||||
|
"time"
|
||||||
|
|
||||||
"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/recipe"
|
||||||
|
"coopcloud.tech/abra/pkg/upstream/stack"
|
||||||
"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/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"
|
||||||
)
|
)
|
||||||
|
|
||||||
// stackLogs lists logs for all stack services
|
var appLogsCommand = cli.Command{
|
||||||
func stackLogs(stackName string, client *dockerClient.Client) {
|
Name: "logs",
|
||||||
ctx := context.Background()
|
Aliases: []string{"l"},
|
||||||
filters := filters.NewArgs()
|
ArgsUsage: "<domain> [<service>]",
|
||||||
filters.Add("name", stackName)
|
Usage: "Tail app logs",
|
||||||
serviceOpts := types.ServiceListOptions{Filters: filters}
|
Flags: []cli.Flag{
|
||||||
services, err := client.ServiceList(ctx, serviceOpts)
|
internal.StdErrOnlyFlag,
|
||||||
|
internal.SinceLogsFlag,
|
||||||
|
internal.DebugFlag,
|
||||||
|
},
|
||||||
|
Before: internal.SubCommandBefore,
|
||||||
|
BashComplete: autocomplete.AppNameComplete,
|
||||||
|
Action: func(c *cli.Context) error {
|
||||||
|
app := internal.ValidateApp(c)
|
||||||
|
stackName := app.StackName()
|
||||||
|
|
||||||
|
if err := recipe.EnsureExists(app.Recipe); err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
cl, err := client.New(app.Server)
|
||||||
|
if err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
isDeployed, _, err := stack.IsDeployed(context.Background(), cl, stackName)
|
||||||
|
if err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if !isDeployed {
|
||||||
|
logrus.Fatalf("%s is not deployed?", app.Name)
|
||||||
|
}
|
||||||
|
|
||||||
|
serviceName := c.Args().Get(1)
|
||||||
|
serviceNames := []string{}
|
||||||
|
if serviceName != "" {
|
||||||
|
serviceNames = []string{serviceName}
|
||||||
|
}
|
||||||
|
err = tailLogs(cl, app, serviceNames)
|
||||||
|
if err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
// tailLogs prints logs for the given app with optional service names to be
|
||||||
|
// filtered on. It also checks if the latest task is not runnning and then
|
||||||
|
// prints the past tasks.
|
||||||
|
func tailLogs(cl *dockerClient.Client, app config.App, serviceNames []string) error {
|
||||||
|
f, err := app.Filters(true, false, serviceNames...)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logrus.Fatal(err)
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
services, err := cl.ServiceList(context.Background(), types.ServiceListOptions{Filters: f})
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
var wg sync.WaitGroup
|
var wg sync.WaitGroup
|
||||||
for _, service := range services {
|
for _, service := range services {
|
||||||
wg.Add(1)
|
filters := filters.NewArgs()
|
||||||
go func(s string) {
|
filters.Add("name", service.Spec.Name)
|
||||||
logOpts := types.ContainerLogsOptions{
|
tasks, err := cl.TaskList(context.Background(), types.TaskListOptions{Filters: f})
|
||||||
Details: true,
|
if err != nil {
|
||||||
Follow: true,
|
return err
|
||||||
ShowStderr: true,
|
}
|
||||||
ShowStdout: true,
|
if len(tasks) > 0 {
|
||||||
Tail: "20",
|
// Need to sort the tasks by the CreatedAt field in the inverse order.
|
||||||
Timestamps: true,
|
// Otherwise they are in the reversed order and not sorted properly.
|
||||||
|
slices.SortFunc[[]swarm.Task](tasks, func(t1, t2 swarm.Task) int {
|
||||||
|
return int(t2.Meta.CreatedAt.Unix() - t1.Meta.CreatedAt.Unix())
|
||||||
|
})
|
||||||
|
lastTask := tasks[0].Status
|
||||||
|
if lastTask.State != swarm.TaskStateRunning {
|
||||||
|
for _, task := range tasks {
|
||||||
|
logrus.Errorf("[%s] %s State %s: %s", service.Spec.Name, task.Meta.CreatedAt.Format(time.RFC3339), task.Status.State, task.Status.Err)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
logs, err := client.ServiceLogs(ctx, s, logOpts)
|
}
|
||||||
|
|
||||||
|
// Collect the logs in a go routine, so the logs from all services are
|
||||||
|
// collected in parallel.
|
||||||
|
wg.Add(1)
|
||||||
|
go func(serviceID string) {
|
||||||
|
logs, err := cl.ServiceLogs(context.Background(), serviceID, types.ContainerLogsOptions{
|
||||||
|
ShowStderr: true,
|
||||||
|
ShowStdout: !internal.StdErrOnly,
|
||||||
|
Since: internal.SinceLogs,
|
||||||
|
Until: "",
|
||||||
|
Timestamps: true,
|
||||||
|
Follow: true,
|
||||||
|
Tail: "20",
|
||||||
|
Details: false,
|
||||||
|
})
|
||||||
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)
|
||||||
|
@ -53,75 +131,9 @@ func stackLogs(stackName string, client *dockerClient.Client) {
|
||||||
}
|
}
|
||||||
}(service.ID)
|
}(service.ID)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Wait for all log streams to be closed.
|
||||||
wg.Wait()
|
wg.Wait()
|
||||||
os.Exit(0)
|
|
||||||
}
|
return nil
|
||||||
|
|
||||||
var appLogsCommand = &cli.Command{
|
|
||||||
Name: "logs",
|
|
||||||
Aliases: []string{"l"},
|
|
||||||
ArgsUsage: "[<service>]",
|
|
||||||
Usage: "Tail app logs",
|
|
||||||
Action: func(c *cli.Context) error {
|
|
||||||
app := internal.ValidateApp(c)
|
|
||||||
|
|
||||||
ctx := context.Background()
|
|
||||||
cl, err := client.New(app.Server)
|
|
||||||
if err != nil {
|
|
||||||
logrus.Fatal(err)
|
|
||||||
}
|
|
||||||
|
|
||||||
serviceName := c.Args().Get(1)
|
|
||||||
if serviceName == "" {
|
|
||||||
logrus.Debug("tailing logs for all app services")
|
|
||||||
stackLogs(app.StackName(), cl)
|
|
||||||
}
|
|
||||||
logrus.Debugf("tailing logs for '%s'", serviceName)
|
|
||||||
|
|
||||||
service := fmt.Sprintf("%s_%s", app.StackName(), serviceName)
|
|
||||||
filters := filters.NewArgs()
|
|
||||||
filters.Add("name", service)
|
|
||||||
serviceOpts := types.ServiceListOptions{Filters: filters}
|
|
||||||
services, err := cl.ServiceList(ctx, 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(ctx, 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
|
|
||||||
},
|
|
||||||
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)
|
|
||||||
}
|
|
||||||
},
|
|
||||||
}
|
}
|
||||||
|
|
358
cli/app/new.go
358
cli/app/new.go
|
@ -4,52 +4,27 @@ import (
|
||||||
"fmt"
|
"fmt"
|
||||||
"path"
|
"path"
|
||||||
|
|
||||||
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/config"
|
"coopcloud.tech/abra/pkg/config"
|
||||||
|
"coopcloud.tech/abra/pkg/formatter"
|
||||||
|
"coopcloud.tech/abra/pkg/jsontable"
|
||||||
|
"coopcloud.tech/abra/pkg/recipe"
|
||||||
recipePkg "coopcloud.tech/abra/pkg/recipe"
|
recipePkg "coopcloud.tech/abra/pkg/recipe"
|
||||||
"coopcloud.tech/abra/pkg/secret"
|
"coopcloud.tech/abra/pkg/secret"
|
||||||
"github.com/AlecAivazis/survey/v2"
|
"github.com/AlecAivazis/survey/v2"
|
||||||
|
dockerClient "github.com/docker/docker/client"
|
||||||
"github.com/sirupsen/logrus"
|
"github.com/sirupsen/logrus"
|
||||||
"github.com/urfave/cli/v2"
|
"github.com/urfave/cli"
|
||||||
)
|
)
|
||||||
|
|
||||||
type secrets 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,
|
|
||||||
}
|
|
||||||
|
|
||||||
var appNewDescription = `
|
var appNewDescription = `
|
||||||
This command takes a recipe and uses it to create a new app. This new app
|
Take a recipe and uses it to create a new app. This new app configuration is
|
||||||
configuration is stored in your ~/.abra directory under the appropriate server.
|
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".
|
||||||
|
@ -64,44 +39,213 @@ 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{
|
||||||
newAppServerFlag,
|
internal.DebugFlag,
|
||||||
domainFlag,
|
internal.NoInputFlag,
|
||||||
newAppNameFlag,
|
internal.NewAppServerFlag,
|
||||||
|
internal.DomainFlag,
|
||||||
internal.PassFlag,
|
internal.PassFlag,
|
||||||
internal.SecretsFlag,
|
internal.SecretsFlag,
|
||||||
|
internal.OfflineFlag,
|
||||||
|
internal.ChaosFlag,
|
||||||
},
|
},
|
||||||
ArgsUsage: "<recipe>",
|
Before: internal.SubCommandBefore,
|
||||||
Action: action,
|
ArgsUsage: "[<recipe>] [<version>]",
|
||||||
BashComplete: func(c *cli.Context) {
|
BashComplete: func(ctx *cli.Context) {
|
||||||
catl, err := catalogue.ReadRecipeCatalogue()
|
args := ctx.Args()
|
||||||
if err != nil {
|
switch len(args) {
|
||||||
logrus.Warn(err)
|
case 0:
|
||||||
|
autocomplete.RecipeNameComplete(ctx)
|
||||||
|
case 1:
|
||||||
|
autocomplete.RecipeVersionComplete(ctx.Args().Get(0))
|
||||||
}
|
}
|
||||||
if c.NArg() > 0 {
|
},
|
||||||
return
|
Action: func(c *cli.Context) error {
|
||||||
|
recipe := internal.ValidateRecipe(c)
|
||||||
|
|
||||||
|
if !internal.Chaos {
|
||||||
|
if err := recipePkg.EnsureIsClean(recipe.Name); err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
if !internal.Offline {
|
||||||
|
if err := recipePkg.EnsureUpToDate(recipe.Name); err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if c.Args().Get(1) == "" {
|
||||||
|
if err := recipePkg.EnsureLatest(recipe.Name); err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
if err := recipePkg.EnsureVersion(recipe.Name, c.Args().Get(1)); err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
for name, _ := range catl {
|
|
||||||
fmt.Println(name)
|
if err := ensureServerFlag(); err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if err := ensureDomainFlag(recipe, internal.NewAppServer); err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
sanitisedAppName := config.SanitiseAppName(internal.Domain)
|
||||||
|
logrus.Debugf("%s sanitised as %s for new app", internal.Domain, sanitisedAppName)
|
||||||
|
|
||||||
|
if err := config.TemplateAppEnvSample(
|
||||||
|
recipe.Name,
|
||||||
|
internal.Domain,
|
||||||
|
internal.NewAppServer,
|
||||||
|
internal.Domain,
|
||||||
|
); err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
var secrets AppSecrets
|
||||||
|
var secretTable *jsontable.JSONTable
|
||||||
|
if internal.Secrets {
|
||||||
|
sampleEnv, err := recipe.SampleEnv()
|
||||||
|
if err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
composeFiles, err := config.GetComposeFiles(recipe.Name, sampleEnv)
|
||||||
|
if err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
envSamplePath := path.Join(config.RECIPES_DIR, recipe.Name, ".env.sample")
|
||||||
|
secretsConfig, err := secret.ReadSecretsConfig(envSamplePath, composeFiles, config.StackName(internal.Domain))
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := promptForSecrets(recipe.Name, secretsConfig); err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
cl, err := client.New(internal.NewAppServer)
|
||||||
|
if err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
secrets, err = createSecrets(cl, secretsConfig, sanitisedAppName)
|
||||||
|
if err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
secretCols := []string{"Name", "Value"}
|
||||||
|
secretTable = formatter.CreateTable(secretCols)
|
||||||
|
for name, val := range secrets {
|
||||||
|
secretTable.Append([]string{name, val})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if internal.NewAppServer == "default" {
|
||||||
|
internal.NewAppServer = "local"
|
||||||
|
}
|
||||||
|
|
||||||
|
tableCol := []string{"server", "recipe", "domain"}
|
||||||
|
table := formatter.CreateTable(tableCol)
|
||||||
|
table.Append([]string{internal.NewAppServer, recipe.Name, internal.Domain})
|
||||||
|
|
||||||
|
fmt.Println(fmt.Sprintf("A new %s app has been created! Here is an overview:", recipe.Name))
|
||||||
|
fmt.Println("")
|
||||||
|
table.Render()
|
||||||
|
fmt.Println("")
|
||||||
|
fmt.Println("You can configure this app by running the following:")
|
||||||
|
fmt.Println(fmt.Sprintf("\n abra app config %s", internal.Domain))
|
||||||
|
fmt.Println("")
|
||||||
|
fmt.Println("You can deploy this app by running the following:")
|
||||||
|
fmt.Println(fmt.Sprintf("\n abra app deploy %s", internal.Domain))
|
||||||
|
|
||||||
|
if len(secrets) > 0 {
|
||||||
|
fmt.Println("")
|
||||||
|
fmt.Println("Here are your generated secrets:")
|
||||||
|
fmt.Println("")
|
||||||
|
secretTable.Render()
|
||||||
|
logrus.Warn("generated secrets are not shown again, please take note of them NOW")
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// AppSecrets represents all app secrest
|
||||||
|
type AppSecrets map[string]string
|
||||||
|
|
||||||
|
// createSecrets creates all secrets for a new app.
|
||||||
|
func createSecrets(cl *dockerClient.Client, secretsConfig map[string]secret.Secret, sanitisedAppName string) (AppSecrets, error) {
|
||||||
|
// NOTE(d1): trim to match app.StackName() implementation
|
||||||
|
if len(sanitisedAppName) > config.MAX_SANITISED_APP_NAME_LENGTH {
|
||||||
|
logrus.Debugf("trimming %s to %s to avoid runtime limits", sanitisedAppName, sanitisedAppName[:config.MAX_SANITISED_APP_NAME_LENGTH])
|
||||||
|
sanitisedAppName = sanitisedAppName[:config.MAX_SANITISED_APP_NAME_LENGTH]
|
||||||
|
}
|
||||||
|
|
||||||
|
secrets, err := secret.GenerateSecrets(cl, secretsConfig, internal.NewAppServer)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
if internal.Pass {
|
||||||
|
for secretName := range secrets {
|
||||||
|
secretValue := secrets[secretName]
|
||||||
|
if err := secret.PassInsertSecret(
|
||||||
|
secretValue,
|
||||||
|
secretName,
|
||||||
|
internal.Domain,
|
||||||
|
internal.NewAppServer,
|
||||||
|
); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return secrets, nil
|
||||||
|
}
|
||||||
|
|
||||||
// ensureDomainFlag checks if the domain flag was used. if not, asks the user for it/
|
// ensureDomainFlag checks if the domain flag was used. if not, asks the user for it/
|
||||||
func ensureDomainFlag() error {
|
func ensureDomainFlag(recipe recipe.Recipe, server string) error {
|
||||||
if domain == "" {
|
if internal.Domain == "" && !internal.NoInput {
|
||||||
prompt := &survey.Input{
|
prompt := &survey.Input{
|
||||||
Message: "Specify app domain",
|
Message: "Specify app domain",
|
||||||
|
Default: fmt.Sprintf("%s.%s", recipe.Name, server),
|
||||||
}
|
}
|
||||||
if err := survey.AskOne(prompt, &domain); err != nil {
|
if err := survey.AskOne(prompt, &internal.Domain); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if internal.Domain == "" {
|
||||||
|
return fmt.Errorf("no domain provided")
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// promptForSecrets asks if we should generate secrets for a new app.
|
||||||
|
func promptForSecrets(recipeName string, secretsConfig map[string]secret.Secret) error {
|
||||||
|
if len(secretsConfig) == 0 {
|
||||||
|
logrus.Debugf("%s has no secrets to generate, skipping...", recipeName)
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
if !internal.Secrets && !internal.NoInput {
|
||||||
|
prompt := &survey.Confirm{
|
||||||
|
Message: "Generate app secrets?",
|
||||||
|
}
|
||||||
|
if err := survey.AskOne(prompt, &internal.Secrets); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -112,119 +256,19 @@ func ensureServerFlag() error {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
if newAppServer == "" {
|
if internal.NewAppServer == "" && !internal.NoInput {
|
||||||
prompt := &survey.Select{
|
prompt := &survey.Select{
|
||||||
Message: "Select app server:",
|
Message: "Select app server:",
|
||||||
Options: servers,
|
Options: servers,
|
||||||
}
|
}
|
||||||
if err := survey.AskOne(prompt, &newAppServer); err != nil {
|
if err := survey.AskOne(prompt, &internal.NewAppServer); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return nil
|
if internal.NewAppServer == "" {
|
||||||
}
|
return fmt.Errorf("no server provided")
|
||||||
|
|
||||||
// ensureServerFlag checks if the AppName flag was used. if not, asks the user for it.
|
|
||||||
func ensureAppNameFlag() error {
|
|
||||||
if newAppName == "" {
|
|
||||||
prompt := &survey.Input{
|
|
||||||
Message: "Specify app name:",
|
|
||||||
Default: config.SanitiseAppName(domain),
|
|
||||||
}
|
|
||||||
if err := survey.AskOne(prompt, &newAppName); err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// createSecrets creates all secrets for a new app.
|
|
||||||
func createSecrets(sanitisedAppName string) (secrets, error) {
|
|
||||||
appEnvPath := path.Join(config.ABRA_DIR, "servers", newAppServer, fmt.Sprintf("%s.env", sanitisedAppName))
|
|
||||||
appEnv, err := config.ReadEnv(appEnvPath)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
secretEnvVars := secret.ReadSecretEnvVars(appEnv)
|
|
||||||
secrets, err := secret.GenerateSecrets(secretEnvVars, sanitisedAppName, newAppServer)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
if internal.Pass {
|
|
||||||
for secretName := range secrets {
|
|
||||||
secretValue := secrets[secretName]
|
|
||||||
if err := secret.PassInsertSecret(secretValue, secretName, sanitisedAppName, newAppServer); err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return secrets, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// action is the main command-line action for this package
|
|
||||||
func action(c *cli.Context) error {
|
|
||||||
recipe := internal.ValidateRecipe(c)
|
|
||||||
|
|
||||||
if err := config.EnsureAbraDirExists(); err != nil {
|
|
||||||
logrus.Fatal(err)
|
|
||||||
}
|
|
||||||
|
|
||||||
recipeMeta, err := catalogue.GetRecipeMeta(recipe.Name)
|
|
||||||
if err != nil {
|
|
||||||
logrus.Fatal(err)
|
|
||||||
}
|
|
||||||
|
|
||||||
latestVersion := recipeMeta.LatestVersion()
|
|
||||||
if err := recipePkg.EnsureVersion(recipe.Name, latestVersion); err != nil {
|
|
||||||
logrus.Fatal(err)
|
|
||||||
}
|
|
||||||
|
|
||||||
if err := ensureServerFlag(); err != nil {
|
|
||||||
logrus.Fatal(err)
|
|
||||||
}
|
|
||||||
|
|
||||||
if err := ensureDomainFlag(); err != nil {
|
|
||||||
logrus.Fatal(err)
|
|
||||||
}
|
|
||||||
|
|
||||||
if err := ensureAppNameFlag(); err != nil {
|
|
||||||
logrus.Fatal(err)
|
|
||||||
}
|
|
||||||
|
|
||||||
sanitisedAppName := config.SanitiseAppName(newAppName)
|
|
||||||
if len(sanitisedAppName) > 45 {
|
|
||||||
logrus.Fatalf("'%s' cannot be longer than 45 characters", sanitisedAppName)
|
|
||||||
}
|
|
||||||
logrus.Debugf("'%s' sanitised as '%s' for new app", newAppName, sanitisedAppName)
|
|
||||||
|
|
||||||
if err := config.CopyAppEnvSample(recipe.Name, newAppName, newAppServer); err != nil {
|
|
||||||
logrus.Fatal(err)
|
|
||||||
}
|
|
||||||
|
|
||||||
if internal.Secrets {
|
|
||||||
secrets, err := createSecrets(sanitisedAppName)
|
|
||||||
if err != nil {
|
|
||||||
logrus.Fatal(err)
|
|
||||||
}
|
|
||||||
|
|
||||||
secretCols := []string{"Name", "Value"}
|
|
||||||
secretTable := abraFormatter.CreateTable(secretCols)
|
|
||||||
for secret := range secrets {
|
|
||||||
secretTable.Append([]string{secret, secrets[secret]})
|
|
||||||
}
|
|
||||||
|
|
||||||
if len(secrets) > 0 {
|
|
||||||
defer secretTable.Render()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
tableCol := []string{"Name", "Domain", "Type", "Server"}
|
|
||||||
table := abraFormatter.CreateTable(tableCol)
|
|
||||||
table.Append([]string{sanitisedAppName, domain, recipe.Name, newAppServer})
|
|
||||||
defer table.Render()
|
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
158
cli/app/ps.go
158
cli/app/ps.go
|
@ -2,70 +2,154 @@ package app
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
|
"encoding/json"
|
||||||
"fmt"
|
"fmt"
|
||||||
"strings"
|
"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/recipe"
|
||||||
|
abraService "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 appPsCommand = &cli.Command{
|
var appPsCommand = cli.Command{
|
||||||
Name: "ps",
|
Name: "ps",
|
||||||
Usage: "Check app status",
|
Aliases: []string{"p"},
|
||||||
Aliases: []string{"p"},
|
Usage: "Check app status",
|
||||||
|
ArgsUsage: "<domain>",
|
||||||
|
Description: "Show a more detailed status output of a specific deployed app",
|
||||||
|
Flags: []cli.Flag{
|
||||||
|
internal.MachineReadableFlag,
|
||||||
|
internal.WatchFlag,
|
||||||
|
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)
|
||||||
|
|
||||||
ctx := context.Background()
|
|
||||||
cl, err := client.New(app.Server)
|
cl, err := client.New(app.Server)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
filters := filters.NewArgs()
|
isDeployed, deployedVersion, err := stack.IsDeployed(context.Background(), cl, app.StackName())
|
||||||
filters.Add("name", app.StackName())
|
|
||||||
|
|
||||||
containers, err := cl.ContainerList(ctx, types.ContainerListOptions{Filters: filters})
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
tableCol := []string{"id", "image", "command", "created", "status", "ports", "names"}
|
if !isDeployed {
|
||||||
table := abraFormatter.CreateTable(tableCol)
|
logrus.Fatalf("%s is not deployed?", app.Name)
|
||||||
|
}
|
||||||
|
|
||||||
for _, container := range containers {
|
statuses, err := config.GetAppStatuses([]config.App{app}, true)
|
||||||
tableRow := []string{
|
if statusMeta, ok := statuses[app.StackName()]; ok {
|
||||||
abraFormatter.ShortenID(container.ID),
|
if _, exists := statusMeta["chaos"]; !exists {
|
||||||
abraFormatter.RemoveSha(container.Image),
|
if err := recipe.EnsureVersion(app.Recipe, deployedVersion); err != nil {
|
||||||
abraFormatter.Truncate(container.Command),
|
logrus.Fatal(err)
|
||||||
abraFormatter.HumanDuration(container.Created),
|
}
|
||||||
container.Status,
|
|
||||||
formatter.DisplayablePorts(container.Ports),
|
|
||||||
strings.Join(container.Names, ", "),
|
|
||||||
}
|
}
|
||||||
table.Append(tableRow)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
table.Render()
|
if !internal.Watch {
|
||||||
return nil
|
showPSOutput(c, app, cl)
|
||||||
},
|
return nil
|
||||||
BashComplete: func(c *cli.Context) {
|
|
||||||
appNames, err := config.GetAppNames()
|
|
||||||
if err != nil {
|
|
||||||
logrus.Warn(err)
|
|
||||||
}
|
}
|
||||||
if c.NArg() > 0 {
|
|
||||||
return
|
goterm.Clear()
|
||||||
}
|
for {
|
||||||
for _, a := range appNames {
|
goterm.MoveCursor(1, 1)
|
||||||
fmt.Println(a)
|
showPSOutput(c, app, cl)
|
||||||
|
goterm.Flush()
|
||||||
|
time.Sleep(2 * time.Second)
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// showPSOutput renders ps output.
|
||||||
|
func showPSOutput(c *cli.Context, app config.App, cl *dockerClient.Client) {
|
||||||
|
composeFiles, err := config.GetComposeFiles(app.Recipe, app.Env)
|
||||||
|
if err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
deployOpts := stack.Deploy{
|
||||||
|
Composefiles: composeFiles,
|
||||||
|
Namespace: app.StackName(),
|
||||||
|
Prune: false,
|
||||||
|
ResolveImage: stack.ResolveImageAlways,
|
||||||
|
}
|
||||||
|
compose, err := config.GetAppComposeConfig(app.Name, deployOpts, app.Env)
|
||||||
|
if err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
var tablerows [][]string
|
||||||
|
allContainerStats := make(map[string]map[string]string)
|
||||||
|
for _, service := range compose.Services {
|
||||||
|
filters := filters.NewArgs()
|
||||||
|
filters.Add("name", fmt.Sprintf("^%s_%s", app.StackName(), service.Name))
|
||||||
|
|
||||||
|
containers, err := cl.ContainerList(context.Background(), types.ContainerListOptions{Filters: filters})
|
||||||
|
if err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
var containerStats map[string]string
|
||||||
|
|
||||||
|
if len(containers) == 0 {
|
||||||
|
containerStats = map[string]string{
|
||||||
|
"service name": service.Name,
|
||||||
|
"image": "unknown",
|
||||||
|
"created": "unknown",
|
||||||
|
"status": "unknown",
|
||||||
|
"state": "unknown",
|
||||||
|
"ports": "unknown",
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
container := containers[0]
|
||||||
|
containerStats = map[string]string{
|
||||||
|
"service name": abraService.ContainerToServiceName(container.Names, app.StackName()),
|
||||||
|
"image": formatter.RemoveSha(container.Image),
|
||||||
|
"created": formatter.HumanDuration(container.Created),
|
||||||
|
"status": container.Status,
|
||||||
|
"state": container.State,
|
||||||
|
"ports": dockerFormatter.DisplayablePorts(container.Ports),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
allContainerStats[containerStats["service name"]] = containerStats
|
||||||
|
|
||||||
|
var tablerow []string = []string{containerStats["service name"], containerStats["image"], containerStats["created"], containerStats["status"], containerStats["state"], containerStats["ports"]}
|
||||||
|
tablerows = append(tablerows, tablerow)
|
||||||
|
}
|
||||||
|
if internal.MachineReadable {
|
||||||
|
jsonstring, err := json.Marshal(allContainerStats)
|
||||||
|
if err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
} else {
|
||||||
|
fmt.Println(string(jsonstring))
|
||||||
|
}
|
||||||
|
return
|
||||||
|
} else {
|
||||||
|
tableCol := []string{"service name", "image", "created", "status", "state", "ports"}
|
||||||
|
table := formatter.CreateTable(tableCol)
|
||||||
|
for _, row := range tablerows {
|
||||||
|
table.Append(row)
|
||||||
|
}
|
||||||
|
table.Render()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
|
@ -3,76 +3,84 @@ package app
|
||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
"fmt"
|
"fmt"
|
||||||
|
"log"
|
||||||
"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/sirupsen/logrus"
|
"github.com/sirupsen/logrus"
|
||||||
"github.com/urfave/cli/v2"
|
"github.com/urfave/cli"
|
||||||
)
|
)
|
||||||
|
|
||||||
// Volumes stores the variable from VolumesFlag
|
var appRemoveCommand = cli.Command{
|
||||||
var Volumes bool
|
Name: "remove",
|
||||||
|
Aliases: []string{"rm"},
|
||||||
|
ArgsUsage: "<domain>",
|
||||||
|
Usage: "Remove all app data, locally and remotely",
|
||||||
|
Description: `
|
||||||
|
This command removes everything related to an app which is already undeployed.
|
||||||
|
|
||||||
// VolumesFlag is used to specify if volumes should be deleted when deleting an app
|
By default, it will prompt for confirmation before proceeding. All secrets,
|
||||||
var VolumesFlag = &cli.BoolFlag{
|
volumes and the local app env file will be deleted.
|
||||||
Name: "volumes",
|
|
||||||
Value: false,
|
|
||||||
Destination: &Volumes,
|
|
||||||
}
|
|
||||||
|
|
||||||
var appRemoveCommand = &cli.Command{
|
Only run this command when you are sure you want to completely remove the app
|
||||||
Name: "remove",
|
and all associated app data. This is a destructive action, Be Careful!
|
||||||
Usage: "Remove an already undeployed app",
|
|
||||||
Aliases: []string{"rm"},
|
If you would like to delete specific volumes or secrets, please use removal
|
||||||
|
sub-commands under "app volume" and "app secret" instead.
|
||||||
|
|
||||||
|
Please note, if you delete the local app env file without removing volumes and
|
||||||
|
secrets first, Abra will *not* be able to help you remove them afterwards.
|
||||||
|
|
||||||
|
To delete everything without prompt, use the "--force/-f" or the "--no-input/n"
|
||||||
|
flag.
|
||||||
|
`,
|
||||||
Flags: []cli.Flag{
|
Flags: []cli.Flag{
|
||||||
VolumesFlag,
|
|
||||||
internal.ForceFlag,
|
internal.ForceFlag,
|
||||||
|
internal.DebugFlag,
|
||||||
|
internal.NoInputFlag,
|
||||||
|
internal.OfflineFlag,
|
||||||
},
|
},
|
||||||
|
BashComplete: autocomplete.AppNameComplete,
|
||||||
|
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{
|
msg := "ALERTA ALERTA: this will completely remove %s data and configurations locally and remotely, are you sure?"
|
||||||
Message: fmt.Sprintf("about to delete %s, are you sure?", app.Name),
|
prompt := &survey.Confirm{Message: fmt.Sprintf(msg, 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)
|
|
||||||
}
|
|
||||||
|
|
||||||
ctx := context.Background()
|
|
||||||
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] == "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, err := app.Filters(false, false)
|
||||||
fs.Add("name", app.Name)
|
if err != nil {
|
||||||
secretList, err := cl.SecretList(ctx, types.SecretListOptions{Filters: fs})
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
secretList, err := cl.SecretList(context.Background(), types.SecretListOptions{Filters: fs})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
|
@ -86,20 +94,8 @@ var appRemoveCommand = &cli.Command{
|
||||||
}
|
}
|
||||||
|
|
||||||
if len(secrets) > 0 {
|
if len(secrets) > 0 {
|
||||||
var secretNamesToRemove []string
|
for _, name := range secretNames {
|
||||||
if !internal.Force {
|
err := cl.SecretRemove(context.Background(), secrets[name])
|
||||||
secretsPrompt := &survey.MultiSelect{
|
|
||||||
Message: "which secrets do you want to remove?",
|
|
||||||
Options: secretNames,
|
|
||||||
Default: secretNames,
|
|
||||||
}
|
|
||||||
if err := survey.AskOne(secretsPrompt, &secretNamesToRemove); err != nil {
|
|
||||||
logrus.Fatal(err)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
for _, name := range secretNamesToRemove {
|
|
||||||
err := cl.SecretRemove(ctx, secrets[name])
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
|
@ -109,62 +105,34 @@ var appRemoveCommand = &cli.Command{
|
||||||
logrus.Info("no secrets to remove")
|
logrus.Info("no secrets to remove")
|
||||||
}
|
}
|
||||||
|
|
||||||
volumeListOKBody, err := cl.VolumeList(ctx, fs)
|
fs, err = app.Filters(false, true)
|
||||||
volumeList := volumeListOKBody.Volumes
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
var vols []string
|
volumeList, err := client.GetVolumes(cl, context.Background(), app.Server, fs)
|
||||||
for _, vol := range volumeList {
|
if err != nil {
|
||||||
vols = append(vols, vol.Name)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
|
volumeNames := client.GetVolumeNames(volumeList)
|
||||||
|
|
||||||
if len(vols) > 0 {
|
if len(volumeNames) > 0 {
|
||||||
if Volumes {
|
err := client.RemoveVolumes(cl, context.Background(), volumeNames, internal.Force, 5)
|
||||||
var removeVols []string
|
if err != nil {
|
||||||
if !internal.Force {
|
log.Fatalf("removing volumes failed: %s", err)
|
||||||
volumesPrompt := &survey.MultiSelect{
|
|
||||||
Message: "which volumes do you want to remove?",
|
|
||||||
Options: vols,
|
|
||||||
Default: vols,
|
|
||||||
}
|
|
||||||
if err := survey.AskOne(volumesPrompt, &removeVols); err != nil {
|
|
||||||
logrus.Fatal(err)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
for _, vol := range removeVols {
|
|
||||||
err := cl.VolumeRemove(ctx, vol, internal.Force) // last argument is for force removing
|
|
||||||
if err != nil {
|
|
||||||
logrus.Fatal(err)
|
|
||||||
}
|
|
||||||
logrus.Info(fmt.Sprintf("volume %s removed", vol))
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
logrus.Info("no volumes were removed")
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
logrus.Infof("%d volumes removed successfully", len(volumeNames))
|
||||||
} else {
|
} else {
|
||||||
logrus.Info("no volumes to remove")
|
logrus.Info("no volumes to remove")
|
||||||
}
|
}
|
||||||
|
|
||||||
err = os.Remove(app.Path)
|
if err = os.Remove(app.Path); err != nil {
|
||||||
if err != nil {
|
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
logrus.Info(fmt.Sprintf("file: %s removed", app.Path))
|
logrus.Info(fmt.Sprintf("file: %s removed", app.Path))
|
||||||
|
|
||||||
return nil
|
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)
|
|
||||||
}
|
|
||||||
},
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -0,0 +1,80 @@
|
||||||
|
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,
|
||||||
|
internal.OfflineFlag,
|
||||||
|
},
|
||||||
|
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)
|
||||||
|
}
|
||||||
|
|
||||||
|
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)
|
||||||
|
}
|
||||||
|
|
||||||
|
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,76 +1,79 @@
|
||||||
package app
|
package app
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"errors"
|
|
||||||
"fmt"
|
"fmt"
|
||||||
"io/ioutil"
|
|
||||||
"os"
|
|
||||||
"os/exec"
|
|
||||||
"path"
|
|
||||||
"strings"
|
|
||||||
|
|
||||||
"coopcloud.tech/abra/cli/internal"
|
"coopcloud.tech/abra/cli/internal"
|
||||||
"coopcloud.tech/abra/pkg/config"
|
"coopcloud.tech/abra/pkg/autocomplete"
|
||||||
|
"coopcloud.tech/abra/pkg/client"
|
||||||
|
"coopcloud.tech/abra/pkg/recipe"
|
||||||
"github.com/sirupsen/logrus"
|
"github.com/sirupsen/logrus"
|
||||||
"github.com/urfave/cli/v2"
|
"github.com/urfave/cli"
|
||||||
)
|
)
|
||||||
|
|
||||||
var restoreAllServices bool
|
var targetPath string
|
||||||
var restoreAllServicesFlag = &cli.BoolFlag{
|
var targetPathFlag = &cli.StringFlag{
|
||||||
Name: "all",
|
Name: "target, t",
|
||||||
Value: false,
|
Usage: "Target path",
|
||||||
Destination: &restoreAllServices,
|
Destination: &targetPath,
|
||||||
Aliases: []string{"a"},
|
|
||||||
Usage: "Restore all services",
|
|
||||||
}
|
}
|
||||||
|
|
||||||
var appRestoreCommand = &cli.Command{
|
var appRestoreCommand = cli.Command{
|
||||||
Name: "restore",
|
Name: "restore",
|
||||||
Usage: "Restore an app from a backup",
|
Aliases: []string{"rs"},
|
||||||
Aliases: []string{"r"},
|
Usage: "Restore an app backup",
|
||||||
Flags: []cli.Flag{restoreAllServicesFlag},
|
ArgsUsage: "<domain> <service>",
|
||||||
ArgsUsage: "<service> [<backup file>]",
|
Flags: []cli.Flag{
|
||||||
|
internal.DebugFlag,
|
||||||
|
internal.OfflineFlag,
|
||||||
|
targetPathFlag,
|
||||||
|
},
|
||||||
|
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 && restoreAllServices {
|
if err := recipe.EnsureExists(app.Recipe); err != nil {
|
||||||
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)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
sourceCmd := fmt.Sprintf("source %s", abraSh)
|
if !internal.Chaos {
|
||||||
execCmd := "abra_restore"
|
if err := recipe.EnsureIsClean(app.Recipe); err != nil {
|
||||||
if !restoreAllServices {
|
logrus.Fatal(err)
|
||||||
serviceName := c.Args().Get(1)
|
}
|
||||||
if serviceName == "" {
|
|
||||||
internal.ShowSubcommandHelpAndError(c, errors.New("no service(s) target provided"))
|
if !internal.Offline {
|
||||||
|
if err := recipe.EnsureUpToDate(app.Recipe); err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := recipe.EnsureLatest(app.Recipe); err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
execCmd = fmt.Sprintf("abra_restore_%s", serviceName)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
bytes, err := ioutil.ReadFile(abraSh)
|
cl, err := client.New(app.Server)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
if !strings.Contains(string(bytes), execCmd) {
|
|
||||||
logrus.Fatalf("%s doesn't have a '%s' function", app.Type, execCmd)
|
targetContainer, err := internal.RetrieveBackupBotContainer(cl)
|
||||||
|
if err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
backupFile := c.Args().Get(2)
|
execEnv := []string{fmt.Sprintf("SERVICE=%s", app.Domain)}
|
||||||
if backupFile != "" {
|
if snapshot != "" {
|
||||||
execCmd = fmt.Sprintf("%s %s", execCmd, backupFile)
|
logrus.Debugf("including SNAPSHOT=%s in backupbot exec invocation", snapshot)
|
||||||
|
execEnv = append(execEnv, fmt.Sprintf("SNAPSHOT=%s", snapshot))
|
||||||
|
}
|
||||||
|
if targetPath != "" {
|
||||||
|
logrus.Debugf("including TARGET=%s in backupbot exec invocation", targetPath)
|
||||||
|
execEnv = append(execEnv, fmt.Sprintf("TARGET=%s", targetPath))
|
||||||
}
|
}
|
||||||
|
|
||||||
sourceAndExec := fmt.Sprintf("%s; %s", sourceCmd, execCmd)
|
if err := internal.RunBackupCmdRemote(cl, "restore", targetContainer.ID, execEnv); err != nil {
|
||||||
cmd := exec.Command("bash", "-c", sourceAndExec)
|
|
||||||
if err := internal.RunCmd(cmd); err != nil {
|
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1,81 +1,239 @@
|
||||||
package app
|
package app
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"context"
|
||||||
"fmt"
|
"fmt"
|
||||||
|
|
||||||
"context"
|
"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"
|
||||||
|
stack "coopcloud.tech/abra/pkg/upstream/stack"
|
||||||
|
"coopcloud.tech/tagcmp"
|
||||||
|
|
||||||
"coopcloud.tech/abra/cli/internal"
|
"coopcloud.tech/abra/cli/internal"
|
||||||
appPkg "coopcloud.tech/abra/pkg/app"
|
|
||||||
"coopcloud.tech/abra/pkg/catalogue"
|
|
||||||
"coopcloud.tech/abra/pkg/client"
|
"coopcloud.tech/abra/pkg/client"
|
||||||
|
"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"},
|
ArgsUsage: "<domain> [<version>]",
|
||||||
ArgsUsage: "[<version>]",
|
Flags: []cli.Flag{
|
||||||
BashComplete: func(c *cli.Context) {
|
internal.DebugFlag,
|
||||||
appNames, err := config.GetAppNames()
|
internal.NoInputFlag,
|
||||||
if err != nil {
|
internal.ForceFlag,
|
||||||
logrus.Warn(err)
|
internal.ChaosFlag,
|
||||||
}
|
internal.NoDomainChecksFlag,
|
||||||
if c.NArg() > 0 {
|
internal.DontWaitConvergeFlag,
|
||||||
return
|
internal.OfflineFlag,
|
||||||
}
|
|
||||||
for _, a := range appNames {
|
|
||||||
fmt.Println(a)
|
|
||||||
}
|
|
||||||
},
|
},
|
||||||
|
Before: internal.SubCommandBefore,
|
||||||
|
Description: `
|
||||||
|
This command rolls an app back to a previous version if one exists.
|
||||||
|
|
||||||
|
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.
|
||||||
|
|
||||||
|
This action could be destructive, please ensure you have a copy of your app
|
||||||
|
data beforehand.
|
||||||
|
|
||||||
|
Chaos 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
|
||||||
|
recipes.
|
||||||
|
`,
|
||||||
|
BashComplete: autocomplete.AppNameComplete,
|
||||||
Action: func(c *cli.Context) error {
|
Action: func(c *cli.Context) error {
|
||||||
app := internal.ValidateApp(c)
|
app := internal.ValidateApp(c)
|
||||||
|
stackName := app.StackName()
|
||||||
|
|
||||||
|
specificVersion := c.Args().Get(1)
|
||||||
|
if specificVersion != "" && internal.Chaos {
|
||||||
|
logrus.Fatal("cannot use <version> and --chaos together")
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := recipe.EnsureExists(app.Recipe); err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if !internal.Chaos {
|
||||||
|
if err := recipe.EnsureIsClean(app.Recipe); err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if !internal.Offline {
|
||||||
|
if err := recipe.EnsureUpToDate(app.Recipe); err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := recipe.EnsureLatest(app.Recipe); err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
r, err := recipe.Get(app.Recipe, internal.Offline)
|
||||||
|
if err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := lint.LintForErrors(r); err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
ctx := context.Background()
|
|
||||||
cl, err := client.New(app.Server)
|
cl, err := client.New(app.Server)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
recipeMeta, err := catalogue.GetRecipeMeta(app.Type)
|
logrus.Debugf("checking whether %s is already deployed", stackName)
|
||||||
|
|
||||||
|
isDeployed, deployedVersion, err := stack.IsDeployed(context.Background(), cl, stackName)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
if len(recipeMeta.Versions) == 0 {
|
|
||||||
logrus.Fatalf("no catalogue versions available for '%s'", app.Type)
|
|
||||||
}
|
|
||||||
|
|
||||||
deployedVersions, isDeployed, err := appPkg.DeployedVersions(ctx, cl, app)
|
|
||||||
if err != nil {
|
|
||||||
logrus.Fatal(err)
|
|
||||||
}
|
|
||||||
if !isDeployed {
|
if !isDeployed {
|
||||||
logrus.Fatalf("'%s' is not deployed?", app.Name)
|
logrus.Fatalf("%s is not deployed?", app.Name)
|
||||||
}
|
|
||||||
if _, exists := deployedVersions["app"]; !exists {
|
|
||||||
logrus.Fatalf("no versioned 'app' service for '%s', cannot determine version", app.Name)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
version := c.Args().Get(1)
|
catl, err := recipe.ReadRecipeCatalogue(internal.Offline)
|
||||||
if version == "" {
|
if err != nil {
|
||||||
// TODO:
|
logrus.Fatal(err)
|
||||||
// using deployedVersions["app"], get index+1 version from catalogue
|
|
||||||
// otherwise bail out saying there is nothing to rollback to
|
|
||||||
} else {
|
|
||||||
// TODO
|
|
||||||
// ensure this version is listed in the catalogue
|
|
||||||
// ensure this version is "older" (lower down in the list)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// TODO
|
versions, err := recipe.GetRecipeCatalogueVersions(app.Recipe, catl)
|
||||||
// display table of existing state and expected state and prompt
|
if err != nil {
|
||||||
// run the deployment with this target version!
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
logrus.Fatal("command not implemented yet, coming soon TM")
|
if len(versions) == 0 && !internal.Chaos {
|
||||||
|
logrus.Warn("no published versions in catalogue, trying local recipe repository")
|
||||||
|
recipeVersions, err := recipe.GetRecipeVersions(app.Recipe, internal.Offline)
|
||||||
|
if err != nil {
|
||||||
|
logrus.Warn(err)
|
||||||
|
}
|
||||||
|
for _, recipeVersion := range recipeVersions {
|
||||||
|
for version := range recipeVersion {
|
||||||
|
versions = append(versions, version)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
var availableDowngrades []string
|
||||||
|
if deployedVersion == "unknown" {
|
||||||
|
availableDowngrades = versions
|
||||||
|
logrus.Warnf("failed to determine deployed version of %s", app.Name)
|
||||||
|
}
|
||||||
|
|
||||||
|
if specificVersion != "" {
|
||||||
|
parsedDeployedVersion, err := tagcmp.Parse(deployedVersion)
|
||||||
|
if err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
parsedSpecificVersion, err := tagcmp.Parse(specificVersion)
|
||||||
|
if err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
if parsedSpecificVersion.IsGreaterThan(parsedDeployedVersion) || parsedSpecificVersion.Equals(parsedDeployedVersion) {
|
||||||
|
logrus.Fatalf("%s is not a downgrade for %s?", deployedVersion, specificVersion)
|
||||||
|
}
|
||||||
|
availableDowngrades = append(availableDowngrades, specificVersion)
|
||||||
|
}
|
||||||
|
|
||||||
|
if deployedVersion != "unknown" && !internal.Chaos && specificVersion == "" {
|
||||||
|
for _, version := range versions {
|
||||||
|
parsedDeployedVersion, err := tagcmp.Parse(deployedVersion)
|
||||||
|
if err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
parsedVersion, err := tagcmp.Parse(version)
|
||||||
|
if err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
if parsedVersion.IsLessThan(parsedDeployedVersion) && !(parsedVersion.Equals(parsedDeployedVersion)) {
|
||||||
|
availableDowngrades = append(availableDowngrades, version)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if len(availableDowngrades) == 0 && !internal.Force {
|
||||||
|
logrus.Info("no available downgrades, you're on oldest ✌️")
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
var chosenDowngrade string
|
||||||
|
if len(availableDowngrades) > 0 && !internal.Chaos {
|
||||||
|
if internal.Force || internal.NoInput || specificVersion != "" {
|
||||||
|
chosenDowngrade = availableDowngrades[len(availableDowngrades)-1]
|
||||||
|
logrus.Debugf("choosing %s as version to downgrade to (--force/--no-input)", chosenDowngrade)
|
||||||
|
} else {
|
||||||
|
prompt := &survey.Select{
|
||||||
|
Message: fmt.Sprintf("Please select a downgrade (current version: %s):", deployedVersion),
|
||||||
|
Options: internal.ReverseStringList(availableDowngrades),
|
||||||
|
}
|
||||||
|
if err := survey.AskOne(prompt, &chosenDowngrade); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if !internal.Chaos {
|
||||||
|
if err := recipe.EnsureVersion(app.Recipe, chosenDowngrade); err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if internal.Chaos {
|
||||||
|
logrus.Warn("chaos mode engaged")
|
||||||
|
var err error
|
||||||
|
chosenDowngrade, err = recipe.ChaosVersion(app.Recipe)
|
||||||
|
if err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
abraShPath := fmt.Sprintf("%s/%s/%s", config.RECIPES_DIR, app.Recipe, "abra.sh")
|
||||||
|
abraShEnv, err := config.ReadAbraShEnvVars(abraShPath)
|
||||||
|
if err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
for k, v := range abraShEnv {
|
||||||
|
app.Env[k] = v
|
||||||
|
}
|
||||||
|
|
||||||
|
composeFiles, err := config.GetComposeFiles(app.Recipe, app.Env)
|
||||||
|
if err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
deployOpts := stack.Deploy{
|
||||||
|
Composefiles: composeFiles,
|
||||||
|
Namespace: stackName,
|
||||||
|
Prune: false,
|
||||||
|
ResolveImage: stack.ResolveImageAlways,
|
||||||
|
}
|
||||||
|
compose, err := config.GetAppComposeConfig(app.Name, deployOpts, app.Env)
|
||||||
|
if err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
config.ExposeAllEnv(stackName, compose, app.Env)
|
||||||
|
config.SetRecipeLabel(compose, stackName, app.Recipe)
|
||||||
|
config.SetChaosLabel(compose, stackName, internal.Chaos)
|
||||||
|
config.SetChaosVersionLabel(compose, stackName, chosenDowngrade)
|
||||||
|
config.SetUpdateLabel(compose, stackName, app.Env)
|
||||||
|
|
||||||
|
// NOTE(d1): no release notes implemeneted for rolling back
|
||||||
|
if err := internal.NewVersionOverview(app, deployedVersion, chosenDowngrade, ""); err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := stack.RunDeploy(cl, deployOpts, compose, stackName, internal.DontWaitConverge); err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
},
|
},
|
||||||
|
|
|
@ -6,69 +6,69 @@ import (
|
||||||
"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/client/container"
|
containerPkg "coopcloud.tech/abra/pkg/container"
|
||||||
"coopcloud.tech/abra/pkg/config"
|
"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?"))
|
||||||
}
|
}
|
||||||
|
|
||||||
ctx := context.Background()
|
|
||||||
cl, err := client.New(app.Server)
|
cl, err := client.New(app.Server)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
serviceName := c.Args().Get(1)
|
serviceName := c.Args().Get(1)
|
||||||
|
stackAndServiceName := fmt.Sprintf("^%s_%s", app.StackName(), serviceName)
|
||||||
filters := filters.NewArgs()
|
filters := filters.NewArgs()
|
||||||
filters.Add("name", fmt.Sprintf("%s_%s", app.StackName(), serviceName))
|
filters.Add("name", stackAndServiceName)
|
||||||
|
|
||||||
containers, err := cl.ContainerList(ctx, 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) > 1 {
|
|
||||||
logrus.Fatalf("expected 1 container but got %d", len(containers))
|
|
||||||
}
|
|
||||||
|
|
||||||
cmd := c.Args().Slice()[2:]
|
cmd := c.Args()[2:]
|
||||||
execCreateOpts := types.ExecConfig{
|
execCreateOpts := types.ExecConfig{
|
||||||
AttachStderr: true,
|
AttachStderr: true,
|
||||||
AttachStdin: true,
|
AttachStdin: true,
|
||||||
|
@ -85,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)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -7,36 +7,76 @@ import (
|
||||||
"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/recipe"
|
||||||
"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"
|
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 (
|
||||||
var allSecretsFlag = &cli.BoolFlag{
|
allSecrets bool
|
||||||
Name: "all",
|
allSecretsFlag = &cli.BoolFlag{
|
||||||
Aliases: []string{"A"},
|
Name: "all, a",
|
||||||
Value: false,
|
Destination: &allSecrets,
|
||||||
Destination: &allSecrets,
|
Usage: "Generate all secrets",
|
||||||
Usage: "Generate all secrets",
|
}
|
||||||
}
|
)
|
||||||
|
|
||||||
var appSecretGenerateCommand = &cli.Command{
|
var (
|
||||||
|
rmAllSecrets bool
|
||||||
|
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,
|
||||||
|
internal.MachineReadableFlag,
|
||||||
|
internal.OfflineFlag,
|
||||||
|
internal.ChaosFlag,
|
||||||
|
},
|
||||||
|
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 err := recipe.EnsureExists(app.Recipe); err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if !internal.Chaos {
|
||||||
|
if err := recipe.EnsureIsClean(app.Recipe); err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if !internal.Offline {
|
||||||
|
if err := recipe.EnsureUpToDate(app.Recipe); err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := recipe.EnsureLatest(app.Recipe); err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
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)
|
||||||
}
|
}
|
||||||
|
@ -46,33 +86,42 @@ var appSecretGenerateCommand = &cli.Command{
|
||||||
internal.ShowSubcommandHelpAndError(c, err)
|
internal.ShowSubcommandHelpAndError(c, err)
|
||||||
}
|
}
|
||||||
|
|
||||||
secretsToCreate := make(map[string]string)
|
composeFiles, err := config.GetComposeFiles(app.Recipe, app.Env)
|
||||||
secretEnvVars := secret.ReadSecretEnvVars(app.Env)
|
if err != nil {
|
||||||
if allSecrets {
|
logrus.Fatal(err)
|
||||||
secretsToCreate = secretEnvVars
|
}
|
||||||
} else {
|
|
||||||
|
secrets, err := secret.ReadSecretsConfig(app.Path, composeFiles, app.StackName())
|
||||||
|
if err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if !allSecrets {
|
||||||
secretName := c.Args().Get(1)
|
secretName := c.Args().Get(1)
|
||||||
secretVersion := c.Args().Get(2)
|
secretVersion := c.Args().Get(2)
|
||||||
matches := false
|
s, ok := secrets[secretName]
|
||||||
for sec := range secretEnvVars {
|
if !ok {
|
||||||
parsed := secret.ParseSecretEnvVarName(sec)
|
logrus.Fatalf("%s doesn't exist in the env config?", secretName)
|
||||||
if secretName == parsed {
|
|
||||||
secretsToCreate[sec] = secretVersion
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
if !matches {
|
s.Version = secretVersion
|
||||||
logrus.Fatalf("'%s' doesn't exist in the env config?", secretName)
|
secrets = map[string]secret.Secret{
|
||||||
|
secretName: s,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
secretVals, err := secret.GenerateSecrets(secretsToCreate, app.StackName(), app.Server)
|
cl, err := client.New(app.Server)
|
||||||
|
if err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
secretVals, err := secret.GenerateSecrets(cl, secrets, app.Server)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
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)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -84,41 +133,70 @@ 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})
|
||||||
}
|
}
|
||||||
table.Render()
|
|
||||||
logrus.Warn("generated secrets are not shown again, please take note of them *now*")
|
if internal.MachineReadable {
|
||||||
|
table.JSONRender()
|
||||||
|
} else {
|
||||||
|
table.Render()
|
||||||
|
}
|
||||||
|
logrus.Warn("generated secrets are not shown again, please take note of them NOW")
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
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: "<secret> <version> <data>",
|
internal.DebugFlag,
|
||||||
|
internal.PassFlag,
|
||||||
|
},
|
||||||
|
Before: internal.SubCommandBefore,
|
||||||
|
ArgsUsage: "<domain> <secret-name> <version> <data>",
|
||||||
|
BashComplete: autocomplete.AppNameComplete,
|
||||||
|
Description: `
|
||||||
|
This command inserts a secret into an app environment.
|
||||||
|
|
||||||
|
This can be useful when you want to manually generate secrets for an app
|
||||||
|
environment. Typically, you can let Abra generate them for you on app creation
|
||||||
|
(see "abra app new --secrets" for more).
|
||||||
|
|
||||||
|
Example:
|
||||||
|
|
||||||
|
abra app secret insert myapp db_pass v1 mySecretPassword
|
||||||
|
|
||||||
|
`,
|
||||||
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?"))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
cl, err := client.New(app.Server)
|
||||||
|
if err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
name := c.Args().Get(1)
|
name := c.Args().Get(1)
|
||||||
version := c.Args().Get(2)
|
version := c.Args().Get(2)
|
||||||
data := c.Args().Get(3)
|
data := c.Args().Get(3)
|
||||||
|
|
||||||
secretName := fmt.Sprintf("%s_%s_%s", app.StackName(), name, version)
|
secretName := fmt.Sprintf("%s_%s_%s", app.StackName(), name, version)
|
||||||
if err := client.StoreSecret(secretName, data, app.Server); err != nil {
|
if err := client.StoreSecret(cl, secretName, data, app.Server); err != nil {
|
||||||
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)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -127,87 +205,99 @@ var appSecretInsertCommand = &cli.Command{
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
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: "<secret>",
|
|
||||||
|
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,
|
||||||
|
internal.OfflineFlag,
|
||||||
|
internal.ChaosFlag,
|
||||||
|
},
|
||||||
|
Before: internal.SubCommandBefore,
|
||||||
|
ArgsUsage: "<domain> [<secret-name>]",
|
||||||
|
BashComplete: autocomplete.AppNameComplete,
|
||||||
|
Description: `
|
||||||
|
This command removes app secrets.
|
||||||
|
|
||||||
|
Example:
|
||||||
|
|
||||||
|
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)
|
||||||
|
|
||||||
if c.Args().Get(1) != "" && allSecrets {
|
if err := recipe.EnsureExists(app.Recipe); err != nil {
|
||||||
internal.ShowSubcommandHelpAndError(c, errors.New("cannot use '<secret>' and '--all' together"))
|
|
||||||
}
|
|
||||||
|
|
||||||
if c.Args().Get(1) == "" && !allSecrets {
|
|
||||||
internal.ShowSubcommandHelpAndError(c, errors.New("no secret(s) specified?"))
|
|
||||||
}
|
|
||||||
|
|
||||||
ctx := context.Background()
|
|
||||||
cl, err := client.New(app.Server)
|
|
||||||
if err != nil {
|
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
filters := filters.NewArgs()
|
if !internal.Chaos {
|
||||||
filters.Add("name", app.StackName())
|
if err := recipe.EnsureIsClean(app.Recipe); err != nil {
|
||||||
secretList, err := cl.SecretList(ctx, types.SecretListOptions{Filters: filters})
|
logrus.Fatal(err)
|
||||||
if err != nil {
|
}
|
||||||
logrus.Fatal(err)
|
|
||||||
}
|
|
||||||
|
|
||||||
secretToRm := c.Args().Get(1)
|
if !internal.Offline {
|
||||||
for _, cont := range secretList {
|
if err := recipe.EnsureUpToDate(app.Recipe); err != nil {
|
||||||
secretName := cont.Spec.Annotations.Name
|
|
||||||
parsed := secret.ParseGeneratedSecretName(secretName, app)
|
|
||||||
if allSecrets {
|
|
||||||
if err := cl.SecretRemove(ctx, secretName); err != nil {
|
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
if internal.Pass {
|
}
|
||||||
if err := secret.PassRmSecret(parsed, app.StackName(), app.Server); err != nil {
|
|
||||||
logrus.Fatal(err)
|
if err := recipe.EnsureLatest(app.Recipe); err != nil {
|
||||||
}
|
logrus.Fatal(err)
|
||||||
}
|
|
||||||
} else {
|
|
||||||
if parsed == secretToRm {
|
|
||||||
if err := cl.SecretRemove(ctx, secretName); err != nil {
|
|
||||||
logrus.Fatal(err)
|
|
||||||
}
|
|
||||||
if internal.Pass {
|
|
||||||
if err := secret.PassRmSecret(parsed, app.StackName(), app.Server); err != nil {
|
|
||||||
logrus.Fatal(err)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return nil
|
composeFiles, err := config.GetComposeFiles(app.Recipe, app.Env)
|
||||||
},
|
if err != nil {
|
||||||
}
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
var appSecretLsCommand = &cli.Command{
|
secrets, err := secret.ReadSecretsConfig(app.Path, composeFiles, app.StackName())
|
||||||
Name: "list",
|
if err != nil {
|
||||||
Usage: "List all secrets",
|
logrus.Fatal(err)
|
||||||
Aliases: []string{"ls"},
|
}
|
||||||
Action: func(c *cli.Context) error {
|
|
||||||
app := internal.ValidateApp(c)
|
|
||||||
secrets := secret.ReadSecretEnvVars(app.Env)
|
|
||||||
|
|
||||||
tableCol := []string{"Name", "Version", "Generated Name", "Created On Server"}
|
if c.Args().Get(1) != "" && rmAllSecrets {
|
||||||
table := abraFormatter.CreateTable(tableCol)
|
internal.ShowSubcommandHelpAndError(c, errors.New("cannot use '<secret-name>' and '--all' together"))
|
||||||
|
}
|
||||||
|
|
||||||
|
if c.Args().Get(1) == "" && !rmAllSecrets {
|
||||||
|
internal.ShowSubcommandHelpAndError(c, errors.New("no secret(s) specified?"))
|
||||||
|
}
|
||||||
|
|
||||||
ctx := context.Background()
|
|
||||||
cl, err := client.New(app.Server)
|
cl, err := client.New(app.Server)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
filters := filters.NewArgs()
|
filters, err := app.Filters(false, false)
|
||||||
filters.Add("name", app.StackName())
|
if err != nil {
|
||||||
secretList, err := cl.SecretList(ctx, types.SecretListOptions{Filters: filters})
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
secretList, err := cl.SecretList(context.Background(), types.SecretListOptions{Filters: filters})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
|
@ -217,44 +307,119 @@ var appSecretLsCommand = &cli.Command{
|
||||||
remoteSecretNames[cont.Spec.Annotations.Name] = true
|
remoteSecretNames[cont.Spec.Annotations.Name] = true
|
||||||
}
|
}
|
||||||
|
|
||||||
for sec := range secrets {
|
match := false
|
||||||
createdRemote := false
|
secretToRm := c.Args().Get(1)
|
||||||
secretName := secret.ParseSecretEnvVarName(sec)
|
for secretName, val := range secrets {
|
||||||
secVal, err := secret.ParseSecretEnvVarValue(secrets[sec])
|
secretRemoteName := fmt.Sprintf("%s_%s_%s", app.StackName(), secretName, val.Version)
|
||||||
if err != nil {
|
|
||||||
logrus.Fatal(err)
|
|
||||||
}
|
|
||||||
secretRemoteName := fmt.Sprintf("%s_%s_%s", app.StackName(), secretName, secVal.Version)
|
|
||||||
if _, ok := remoteSecretNames[secretRemoteName]; ok {
|
if _, ok := remoteSecretNames[secretRemoteName]; ok {
|
||||||
createdRemote = true
|
if secretToRm != "" {
|
||||||
|
if secretName == secretToRm {
|
||||||
|
if err := secretRm(cl, app, secretRemoteName, secretName); err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
match = true
|
||||||
|
|
||||||
|
if err := secretRm(cl, app, secretRemoteName, secretName); err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
tableRow := []string{secretName, secVal.Version, secretRemoteName, strconv.FormatBool(createdRemote)}
|
|
||||||
table.Append(tableRow)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
table.Render()
|
if !match && secretToRm != "" {
|
||||||
|
logrus.Fatalf("%s doesn't exist on server?", secretToRm)
|
||||||
|
}
|
||||||
|
|
||||||
|
if !match {
|
||||||
|
logrus.Fatal("no secrets to remove?")
|
||||||
|
}
|
||||||
|
|
||||||
return nil
|
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)
|
|
||||||
}
|
|
||||||
},
|
|
||||||
}
|
}
|
||||||
|
|
||||||
var appSecretCommand = &cli.Command{
|
var appSecretLsCommand = cli.Command{
|
||||||
|
Name: "list",
|
||||||
|
Aliases: []string{"ls"},
|
||||||
|
Flags: []cli.Flag{
|
||||||
|
internal.DebugFlag,
|
||||||
|
internal.OfflineFlag,
|
||||||
|
internal.ChaosFlag,
|
||||||
|
internal.MachineReadableFlag,
|
||||||
|
},
|
||||||
|
Before: internal.SubCommandBefore,
|
||||||
|
Usage: "List all secrets",
|
||||||
|
BashComplete: autocomplete.AppNameComplete,
|
||||||
|
Action: func(c *cli.Context) error {
|
||||||
|
app := internal.ValidateApp(c)
|
||||||
|
|
||||||
|
if err := recipe.EnsureExists(app.Recipe); err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if !internal.Chaos {
|
||||||
|
if err := recipe.EnsureIsClean(app.Recipe); err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if !internal.Offline {
|
||||||
|
if err := recipe.EnsureUpToDate(app.Recipe); err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := recipe.EnsureLatest(app.Recipe); err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
cl, err := client.New(app.Server)
|
||||||
|
if err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
tableCol := []string{"Name", "Version", "Generated Name", "Created On Server"}
|
||||||
|
table := formatter.CreateTable(tableCol)
|
||||||
|
|
||||||
|
secStats, err := secret.PollSecretsStatus(cl, app)
|
||||||
|
if err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, secStat := range secStats {
|
||||||
|
tableRow := []string{
|
||||||
|
secStat.LocalName,
|
||||||
|
secStat.Version,
|
||||||
|
secStat.RemoteName,
|
||||||
|
strconv.FormatBool(secStat.CreatedOnRemote),
|
||||||
|
}
|
||||||
|
table.Append(tableRow)
|
||||||
|
}
|
||||||
|
|
||||||
|
if table.NumLines() > 0 {
|
||||||
|
if internal.MachineReadable {
|
||||||
|
table.JSONRender()
|
||||||
|
} else {
|
||||||
|
table.Render()
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
logrus.Warnf("no secrets stored for %s", app.Name)
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
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,
|
||||||
|
|
|
@ -0,0 +1,80 @@
|
||||||
|
package app
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"fmt"
|
||||||
|
"strings"
|
||||||
|
|
||||||
|
"coopcloud.tech/abra/cli/internal"
|
||||||
|
"coopcloud.tech/abra/pkg/autocomplete"
|
||||||
|
"coopcloud.tech/abra/pkg/client"
|
||||||
|
"coopcloud.tech/abra/pkg/formatter"
|
||||||
|
"coopcloud.tech/abra/pkg/service"
|
||||||
|
stack "coopcloud.tech/abra/pkg/upstream/stack"
|
||||||
|
"github.com/docker/docker/api/types"
|
||||||
|
"github.com/sirupsen/logrus"
|
||||||
|
"github.com/urfave/cli"
|
||||||
|
)
|
||||||
|
|
||||||
|
var appServicesCommand = cli.Command{
|
||||||
|
Name: "services",
|
||||||
|
Aliases: []string{"sr"},
|
||||||
|
Usage: "Display all services of an app",
|
||||||
|
ArgsUsage: "<domain>",
|
||||||
|
Flags: []cli.Flag{
|
||||||
|
internal.DebugFlag,
|
||||||
|
},
|
||||||
|
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)
|
||||||
|
}
|
||||||
|
|
||||||
|
filters, err := app.Filters(true, true)
|
||||||
|
if err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
containers, err := cl.ContainerList(context.Background(), types.ContainerListOptions{Filters: filters})
|
||||||
|
if err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
tableCol := []string{"service name", "image"}
|
||||||
|
table := formatter.CreateTable(tableCol)
|
||||||
|
|
||||||
|
for _, container := range containers {
|
||||||
|
var containerNames []string
|
||||||
|
for _, containerName := range container.Names {
|
||||||
|
trimmed := strings.TrimPrefix(containerName, "/")
|
||||||
|
containerNames = append(containerNames, trimmed)
|
||||||
|
}
|
||||||
|
|
||||||
|
serviceShortName := service.ContainerToServiceName(container.Names, app.StackName())
|
||||||
|
serviceLongName := fmt.Sprintf("%s_%s", app.StackName(), serviceShortName)
|
||||||
|
|
||||||
|
tableRow := []string{
|
||||||
|
serviceLongName,
|
||||||
|
formatter.RemoveSha(container.Image),
|
||||||
|
}
|
||||||
|
table.Append(tableRow)
|
||||||
|
}
|
||||||
|
|
||||||
|
table.Render()
|
||||||
|
|
||||||
|
return nil
|
||||||
|
},
|
||||||
|
}
|
|
@ -3,50 +3,136 @@ package app
|
||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
"fmt"
|
"fmt"
|
||||||
|
"time"
|
||||||
|
|
||||||
"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"
|
||||||
stack "coopcloud.tech/abra/pkg/client/stack"
|
|
||||||
"coopcloud.tech/abra/pkg/config"
|
"coopcloud.tech/abra/pkg/config"
|
||||||
|
"coopcloud.tech/abra/pkg/formatter"
|
||||||
|
stack "coopcloud.tech/abra/pkg/upstream/stack"
|
||||||
|
"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 appUndeployCommand = &cli.Command{
|
var prune bool
|
||||||
Name: "undeploy",
|
|
||||||
Aliases: []string{"u"},
|
var pruneFlag = &cli.BoolFlag{
|
||||||
Usage: "Undeploy an app",
|
Name: "prune, p",
|
||||||
|
Destination: &prune,
|
||||||
|
Usage: "Prunes unused containers, networks, and dangling images for an app",
|
||||||
|
}
|
||||||
|
|
||||||
|
// pruneApp runs the equivalent of a "docker system prune" but only filtering
|
||||||
|
// against resources connected with the app deployment. It is not a system wide
|
||||||
|
// prune. Volumes are not pruned to avoid unwated data loss.
|
||||||
|
func pruneApp(c *cli.Context, cl *dockerClient.Client, app config.App) error {
|
||||||
|
stackName := app.StackName()
|
||||||
|
ctx := context.Background()
|
||||||
|
|
||||||
|
for {
|
||||||
|
logrus.Debugf("polling for %s stack, waiting to be undeployed...", stackName)
|
||||||
|
|
||||||
|
services, err := stack.GetStackServices(ctx, cl, stackName)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
if len(services) == 0 {
|
||||||
|
logrus.Debugf("%s undeployed, moving on with pruning logic", stackName)
|
||||||
|
time.Sleep(time.Second) // give runtime more time to tear down related state
|
||||||
|
break
|
||||||
|
}
|
||||||
|
|
||||||
|
time.Sleep(time.Second)
|
||||||
|
}
|
||||||
|
|
||||||
|
pruneFilters := filters.NewArgs()
|
||||||
|
stackSearch := fmt.Sprintf("%s*", stackName)
|
||||||
|
pruneFilters.Add("label", stackSearch)
|
||||||
|
cr, err := cl.ContainersPrune(ctx, pruneFilters)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
cntSpaceReclaimed := formatter.ByteCountSI(cr.SpaceReclaimed)
|
||||||
|
logrus.Infof("containers pruned: %d; space reclaimed: %s", len(cr.ContainersDeleted), cntSpaceReclaimed)
|
||||||
|
|
||||||
|
nr, err := cl.NetworksPrune(ctx, pruneFilters)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
logrus.Infof("networks pruned: %d", len(nr.NetworksDeleted))
|
||||||
|
|
||||||
|
ir, err := cl.ImagesPrune(ctx, pruneFilters)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
imgSpaceReclaimed := formatter.ByteCountSI(ir.SpaceReclaimed)
|
||||||
|
logrus.Infof("images pruned: %d; space reclaimed: %s", len(ir.ImagesDeleted), imgSpaceReclaimed)
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
var appUndeployCommand = cli.Command{
|
||||||
|
Name: "undeploy",
|
||||||
|
Aliases: []string{"un"},
|
||||||
|
ArgsUsage: "<domain>",
|
||||||
|
Flags: []cli.Flag{
|
||||||
|
internal.DebugFlag,
|
||||||
|
internal.NoInputFlag,
|
||||||
|
pruneFlag,
|
||||||
|
},
|
||||||
|
Before: internal.SubCommandBefore,
|
||||||
|
Usage: "Undeploy an app",
|
||||||
|
BashComplete: autocomplete.AppNameComplete,
|
||||||
Description: `
|
Description: `
|
||||||
This does not destroy any of the application data. However, you should remain
|
This does not destroy any of the application data.
|
||||||
vigilant, as your swarm installation will consider any previously attached
|
|
||||||
volumes as eligiblef or pruning once undeployed.
|
However, you should remain vigilant, as your swarm installation will consider
|
||||||
|
any previously attached volumes as eligible for pruning once undeployed.
|
||||||
|
|
||||||
|
Passing "-p/--prune" does not remove those volumes.
|
||||||
`,
|
`,
|
||||||
Action: func(c *cli.Context) error {
|
Action: func(c *cli.Context) error {
|
||||||
app := internal.ValidateApp(c)
|
app := internal.ValidateApp(c)
|
||||||
|
stackName := app.StackName()
|
||||||
|
|
||||||
ctx := context.Background()
|
|
||||||
cl, err := client.New(app.Server)
|
cl, err := client.New(app.Server)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
rmOpts := stack.Remove{Namespaces: []string{app.StackName()}}
|
logrus.Debugf("checking whether %s is already deployed", stackName)
|
||||||
if err := stack.RunRemove(ctx, cl, rmOpts); err != nil {
|
|
||||||
|
isDeployed, deployedVersion, err := stack.IsDeployed(context.Background(), cl, stackName)
|
||||||
|
if err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if !isDeployed {
|
||||||
|
logrus.Fatalf("%s is not deployed?", app.Name)
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := internal.DeployOverview(app, deployedVersion, "continue with undeploy?"); err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
rmOpts := stack.Remove{Namespaces: []string{app.StackName()}}
|
||||||
|
if err := stack.RunRemove(context.Background(), cl, rmOpts); err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if prune {
|
||||||
|
if err := pruneApp(c, cl, app); err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
return nil
|
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)
|
|
||||||
}
|
|
||||||
},
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -0,0 +1,304 @@
|
||||||
|
package app
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"fmt"
|
||||||
|
|
||||||
|
"coopcloud.tech/abra/cli/internal"
|
||||||
|
"coopcloud.tech/abra/pkg/autocomplete"
|
||||||
|
"coopcloud.tech/abra/pkg/client"
|
||||||
|
"coopcloud.tech/abra/pkg/config"
|
||||||
|
"coopcloud.tech/abra/pkg/lint"
|
||||||
|
"coopcloud.tech/abra/pkg/recipe"
|
||||||
|
recipePkg "coopcloud.tech/abra/pkg/recipe"
|
||||||
|
stack "coopcloud.tech/abra/pkg/upstream/stack"
|
||||||
|
"coopcloud.tech/tagcmp"
|
||||||
|
"github.com/AlecAivazis/survey/v2"
|
||||||
|
"github.com/sirupsen/logrus"
|
||||||
|
"github.com/urfave/cli"
|
||||||
|
)
|
||||||
|
|
||||||
|
var appUpgradeCommand = cli.Command{
|
||||||
|
Name: "upgrade",
|
||||||
|
Aliases: []string{"up"},
|
||||||
|
Usage: "Upgrade an app",
|
||||||
|
ArgsUsage: "<domain> [<version>]",
|
||||||
|
Flags: []cli.Flag{
|
||||||
|
internal.DebugFlag,
|
||||||
|
internal.NoInputFlag,
|
||||||
|
internal.ForceFlag,
|
||||||
|
internal.ChaosFlag,
|
||||||
|
internal.NoDomainChecksFlag,
|
||||||
|
internal.DontWaitConvergeFlag,
|
||||||
|
internal.OfflineFlag,
|
||||||
|
internal.ReleaseNotesFlag,
|
||||||
|
},
|
||||||
|
Before: internal.SubCommandBefore,
|
||||||
|
Description: `
|
||||||
|
Upgrade an app. You can use it to choose and roll out a new upgrade to an
|
||||||
|
existing app.
|
||||||
|
|
||||||
|
This command specifically supports incrementing the version of running apps, as
|
||||||
|
opposed to "abra app deploy <domain>" which will not change the version of a
|
||||||
|
deployed app.
|
||||||
|
|
||||||
|
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.
|
||||||
|
|
||||||
|
This action could be destructive, please ensure you have a copy of your app
|
||||||
|
data beforehand.
|
||||||
|
|
||||||
|
Chaos 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
|
||||||
|
recipes.
|
||||||
|
`,
|
||||||
|
BashComplete: autocomplete.AppNameComplete,
|
||||||
|
Action: func(c *cli.Context) error {
|
||||||
|
app := internal.ValidateApp(c)
|
||||||
|
stackName := app.StackName()
|
||||||
|
|
||||||
|
specificVersion := c.Args().Get(1)
|
||||||
|
if specificVersion != "" && internal.Chaos {
|
||||||
|
logrus.Fatal("cannot use <version> and --chaos together")
|
||||||
|
}
|
||||||
|
|
||||||
|
if !internal.Chaos {
|
||||||
|
if err := recipe.EnsureIsClean(app.Recipe); err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if !internal.Offline {
|
||||||
|
if err := recipe.EnsureUpToDate(app.Recipe); err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := recipe.EnsureLatest(app.Recipe); err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
recipe, err := recipePkg.Get(app.Recipe, internal.Offline)
|
||||||
|
if err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := lint.LintForErrors(recipe); err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
logrus.Debugf("checking whether %s is already deployed", stackName)
|
||||||
|
|
||||||
|
cl, err := client.New(app.Server)
|
||||||
|
if err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
isDeployed, deployedVersion, err := stack.IsDeployed(context.Background(), cl, stackName)
|
||||||
|
if err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if !isDeployed {
|
||||||
|
logrus.Fatalf("%s is not deployed?", app.Name)
|
||||||
|
}
|
||||||
|
|
||||||
|
catl, err := recipePkg.ReadRecipeCatalogue(internal.Offline)
|
||||||
|
if err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
versions, err := recipePkg.GetRecipeCatalogueVersions(app.Recipe, catl)
|
||||||
|
if err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if len(versions) == 0 && !internal.Chaos {
|
||||||
|
logrus.Warn("no published versions in catalogue, trying local recipe repository")
|
||||||
|
recipeVersions, err := recipePkg.GetRecipeVersions(app.Recipe, internal.Offline)
|
||||||
|
if err != nil {
|
||||||
|
logrus.Warn(err)
|
||||||
|
}
|
||||||
|
for _, recipeVersion := range recipeVersions {
|
||||||
|
for version := range recipeVersion {
|
||||||
|
versions = append(versions, version)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
var availableUpgrades []string
|
||||||
|
if deployedVersion == "unknown" {
|
||||||
|
availableUpgrades = versions
|
||||||
|
logrus.Warnf("failed to determine deployed version of %s", app.Name)
|
||||||
|
}
|
||||||
|
|
||||||
|
if specificVersion != "" {
|
||||||
|
parsedDeployedVersion, err := tagcmp.Parse(deployedVersion)
|
||||||
|
if err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
parsedSpecificVersion, err := tagcmp.Parse(specificVersion)
|
||||||
|
if err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
if parsedSpecificVersion.IsLessThan(parsedDeployedVersion) || parsedSpecificVersion.Equals(parsedDeployedVersion) {
|
||||||
|
logrus.Fatalf("%s is not an upgrade for %s?", deployedVersion, specificVersion)
|
||||||
|
}
|
||||||
|
availableUpgrades = append(availableUpgrades, specificVersion)
|
||||||
|
}
|
||||||
|
|
||||||
|
parsedDeployedVersion, err := tagcmp.Parse(deployedVersion)
|
||||||
|
if err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if deployedVersion != "unknown" && !internal.Chaos && specificVersion == "" {
|
||||||
|
for _, version := range versions {
|
||||||
|
parsedVersion, err := tagcmp.Parse(version)
|
||||||
|
if err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
if parsedVersion.IsGreaterThan(parsedDeployedVersion) && !(parsedVersion.Equals(parsedDeployedVersion)) {
|
||||||
|
availableUpgrades = append(availableUpgrades, version)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if len(availableUpgrades) == 0 && !internal.Force {
|
||||||
|
logrus.Infof("no available upgrades, you're on latest (%s) ✌️", deployedVersion)
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
var chosenUpgrade string
|
||||||
|
if len(availableUpgrades) > 0 && !internal.Chaos {
|
||||||
|
if internal.Force || internal.NoInput || specificVersion != "" {
|
||||||
|
chosenUpgrade = availableUpgrades[len(availableUpgrades)-1]
|
||||||
|
logrus.Debugf("choosing %s as version to upgrade to", chosenUpgrade)
|
||||||
|
} else {
|
||||||
|
prompt := &survey.Select{
|
||||||
|
Message: fmt.Sprintf("Please select an upgrade (current version: %s):", deployedVersion),
|
||||||
|
Options: internal.ReverseStringList(availableUpgrades),
|
||||||
|
}
|
||||||
|
if err := survey.AskOne(prompt, &chosenUpgrade); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if internal.Force && chosenUpgrade == "" {
|
||||||
|
logrus.Warnf("%s is already upgraded to latest but continuing (--force/--chaos)", app.Name)
|
||||||
|
chosenUpgrade = deployedVersion
|
||||||
|
}
|
||||||
|
|
||||||
|
// 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
|
||||||
|
var releaseNotes string
|
||||||
|
if chosenUpgrade != "" {
|
||||||
|
parsedChosenUpgrade, err := tagcmp.Parse(chosenUpgrade)
|
||||||
|
if err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
for _, version := range versions {
|
||||||
|
parsedVersion, err := tagcmp.Parse(version)
|
||||||
|
if err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
if parsedVersion.IsGreaterThan(parsedDeployedVersion) && parsedVersion.IsLessThan(parsedChosenUpgrade) {
|
||||||
|
note, err := internal.GetReleaseNotes(app.Recipe, version)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if note != "" {
|
||||||
|
releaseNotes += fmt.Sprintf("%s\n", note)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if !internal.Chaos {
|
||||||
|
if err := recipePkg.EnsureVersion(app.Recipe, chosenUpgrade); err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if internal.Chaos {
|
||||||
|
logrus.Warn("chaos mode engaged")
|
||||||
|
var err error
|
||||||
|
chosenUpgrade, err = recipePkg.ChaosVersion(app.Recipe)
|
||||||
|
if err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
abraShPath := fmt.Sprintf("%s/%s/%s", config.RECIPES_DIR, app.Recipe, "abra.sh")
|
||||||
|
abraShEnv, err := config.ReadAbraShEnvVars(abraShPath)
|
||||||
|
if err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
for k, v := range abraShEnv {
|
||||||
|
app.Env[k] = v
|
||||||
|
}
|
||||||
|
|
||||||
|
composeFiles, err := config.GetComposeFiles(app.Recipe, app.Env)
|
||||||
|
if err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
deployOpts := stack.Deploy{
|
||||||
|
Composefiles: composeFiles,
|
||||||
|
Namespace: stackName,
|
||||||
|
Prune: false,
|
||||||
|
ResolveImage: stack.ResolveImageAlways,
|
||||||
|
}
|
||||||
|
compose, err := config.GetAppComposeConfig(app.Name, deployOpts, app.Env)
|
||||||
|
if err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
config.ExposeAllEnv(stackName, compose, app.Env)
|
||||||
|
config.SetRecipeLabel(compose, stackName, app.Recipe)
|
||||||
|
config.SetChaosLabel(compose, stackName, internal.Chaos)
|
||||||
|
config.SetChaosVersionLabel(compose, stackName, chosenUpgrade)
|
||||||
|
config.SetUpdateLabel(compose, stackName, app.Env)
|
||||||
|
|
||||||
|
envVars, err := config.CheckEnv(app)
|
||||||
|
if err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, envVar := range envVars {
|
||||||
|
if !envVar.Present {
|
||||||
|
logrus.Warnf("env var %s missing from %s.env, present in recipe .env.sample", envVar.Name, app.Domain)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if internal.ReleaseNotes {
|
||||||
|
fmt.Println()
|
||||||
|
fmt.Print(releaseNotes)
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := internal.NewVersionOverview(app, deployedVersion, chosenUpgrade, releaseNotes); err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
stack.WaitTimeout, err = config.GetTimeoutFromLabel(compose, stackName)
|
||||||
|
if err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
logrus.Debugf("set waiting timeout to %d s", stack.WaitTimeout)
|
||||||
|
|
||||||
|
if err := stack.RunDeploy(cl, deployOpts, compose, stackName, internal.DontWaitConverge); err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
postDeployCmds, ok := app.Env["POST_UPGRADE_CMDS"]
|
||||||
|
if ok && !internal.DontWaitConverge {
|
||||||
|
logrus.Debugf("run the following post-deploy commands: %s", postDeployCmds)
|
||||||
|
if err := internal.PostCmds(cl, app, postDeployCmds); err != nil {
|
||||||
|
logrus.Fatalf("attempting to run post deploy commands, saw: %s", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil
|
||||||
|
},
|
||||||
|
}
|
|
@ -1,108 +1,117 @@
|
||||||
package app
|
package app
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"fmt"
|
"context"
|
||||||
"sort"
|
"sort"
|
||||||
"strings"
|
|
||||||
|
|
||||||
abraFormatter "coopcloud.tech/abra/cli/formatter"
|
|
||||||
"coopcloud.tech/abra/cli/internal"
|
"coopcloud.tech/abra/cli/internal"
|
||||||
appPkg "coopcloud.tech/abra/pkg/app"
|
"coopcloud.tech/abra/pkg/autocomplete"
|
||||||
"coopcloud.tech/abra/pkg/client/stack"
|
"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"
|
||||||
"github.com/docker/distribution/reference"
|
"github.com/docker/distribution/reference"
|
||||||
|
"github.com/olekukonko/tablewriter"
|
||||||
"github.com/sirupsen/logrus"
|
"github.com/sirupsen/logrus"
|
||||||
"github.com/urfave/cli/v2"
|
"github.com/urfave/cli"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
func sortServiceByName(versions [][]string) func(i, j int) bool {
|
||||||
|
return func(i, j int) bool {
|
||||||
|
// NOTE(d1): corresponds to the `tableCol` definition below
|
||||||
|
if versions[i][1] == "app" {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
return versions[i][1] < versions[j][1]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// getImagePath returns the image name
|
// getImagePath returns the image name
|
||||||
func getImagePath(image string) (string, error) {
|
func getImagePath(image string) (string, error) {
|
||||||
img, err := reference.ParseNormalizedNamed(image)
|
img, err := reference.ParseNormalizedNamed(image)
|
||||||
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 version of all services in app",
|
ArgsUsage: "<domain>",
|
||||||
|
Flags: []cli.Flag{
|
||||||
|
internal.DebugFlag,
|
||||||
|
internal.NoInputFlag,
|
||||||
|
internal.OfflineFlag,
|
||||||
|
},
|
||||||
|
Before: internal.SubCommandBefore,
|
||||||
|
Usage: "Show version info of a deployed app",
|
||||||
|
BashComplete: autocomplete.AppNameComplete,
|
||||||
Action: func(c *cli.Context) error {
|
Action: func(c *cli.Context) error {
|
||||||
app := internal.ValidateApp(c)
|
app := internal.ValidateApp(c)
|
||||||
|
stackName := app.StackName()
|
||||||
|
|
||||||
composeFiles, err := config.GetAppComposeFiles(app.Type, app.Env)
|
cl, err := client.New(app.Server)
|
||||||
if err != nil {
|
|
||||||
logrus.Fatal(err)
|
|
||||||
}
|
|
||||||
opts := stack.Deploy{Composefiles: composeFiles}
|
|
||||||
compose, err := config.GetAppComposeConfig(app.Type, opts, app.Env)
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
ch := make(chan stack.StackStatus, len(compose.Services))
|
logrus.Debugf("checking whether %s is already deployed", stackName)
|
||||||
for _, service := range compose.Services {
|
|
||||||
label := fmt.Sprintf("coop-cloud.%s.%s.version", app.StackName(), service.Name)
|
isDeployed, deployedVersion, err := stack.IsDeployed(context.Background(), cl, stackName)
|
||||||
go func(s string, l string) {
|
if err != nil {
|
||||||
ch <- stack.GetDeployedServicesByLabel(s, l)
|
logrus.Fatal(err)
|
||||||
}(app.Server, label)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
tableCol := []string{"name", "image", "version", "digest"}
|
if !isDeployed {
|
||||||
table := abraFormatter.CreateTable(tableCol)
|
logrus.Fatalf("%s is not deployed?", app.Name)
|
||||||
|
}
|
||||||
|
|
||||||
statuses := make(map[string]stack.StackStatus)
|
if deployedVersion == "unknown" {
|
||||||
for range compose.Services {
|
logrus.Fatalf("failed to determine version of deployed %s", app.Name)
|
||||||
status := <-ch
|
}
|
||||||
if len(status.Services) > 0 {
|
|
||||||
serviceName := appPkg.ParseServiceName(status.Services[0].Spec.Name)
|
recipeMeta, err := recipe.GetRecipeMeta(app.Recipe, internal.Offline)
|
||||||
statuses[serviceName] = status
|
if err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
versionsMeta := make(map[string]recipe.ServiceMeta)
|
||||||
|
for _, recipeVersion := range recipeMeta.Versions {
|
||||||
|
if currentVersion, exists := recipeVersion[deployedVersion]; exists {
|
||||||
|
versionsMeta = currentVersion
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
sort.SliceStable(compose.Services, func(i, j int) bool {
|
if len(versionsMeta) == 0 {
|
||||||
return compose.Services[i].Name < compose.Services[j].Name
|
logrus.Fatalf("could not retrieve deployed version (%s) from recipe catalogue?", deployedVersion)
|
||||||
})
|
|
||||||
|
|
||||||
for _, service := range compose.Services {
|
|
||||||
if status, ok := statuses[service.Name]; ok {
|
|
||||||
statusService := status.Services[0]
|
|
||||||
label := fmt.Sprintf("coop-cloud.%s.%s.version", app.StackName(), service.Name)
|
|
||||||
version, digest := appPkg.ParseVersionLabel(statusService.Spec.Labels[label])
|
|
||||||
image, err := getImagePath(statusService.Spec.Labels["com.docker.stack.image"])
|
|
||||||
if err != nil {
|
|
||||||
logrus.Fatal(err)
|
|
||||||
}
|
|
||||||
table.Append([]string{service.Name, image, version, digest})
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
|
|
||||||
image, err := getImagePath(service.Image)
|
|
||||||
if err != nil {
|
|
||||||
logrus.Fatal(err)
|
|
||||||
}
|
|
||||||
table.Append([]string{service.Name, image, "?", "?"})
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
tableCol := []string{"version", "service", "image", "tag"}
|
||||||
|
table := formatter.CreateTable(tableCol)
|
||||||
|
|
||||||
|
var versions [][]string
|
||||||
|
for serviceName, versionMeta := range versionsMeta {
|
||||||
|
versions = append(versions, []string{deployedVersion, serviceName, versionMeta.Image, versionMeta.Tag})
|
||||||
|
}
|
||||||
|
|
||||||
|
sort.Slice(versions, sortServiceByName(versions))
|
||||||
|
|
||||||
|
for _, version := range versions {
|
||||||
|
table.Append(version)
|
||||||
|
}
|
||||||
|
|
||||||
|
table.SetAutoMergeCellsByColumnIndex([]int{0})
|
||||||
|
table.SetAlignment(tablewriter.ALIGN_LEFT)
|
||||||
table.Render()
|
table.Render()
|
||||||
|
|
||||||
return nil
|
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)
|
|
||||||
}
|
|
||||||
},
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -2,107 +2,156 @@ package app
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
"fmt"
|
"log"
|
||||||
|
|
||||||
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"
|
||||||
|
"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"
|
||||||
)
|
)
|
||||||
|
|
||||||
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)
|
||||||
|
|
||||||
ctx := context.Background()
|
cl, err := client.New(app.Server)
|
||||||
volumeList, err := client.GetVolumes(ctx, app.Server, app.Name)
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
table := abraFormatter.CreateTable([]string{"driver", "volume name"})
|
filters, err := app.Filters(false, true)
|
||||||
|
if err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
volumeList, err := client.GetVolumes(cl, context.Background(), app.Server, filters)
|
||||||
|
if err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
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,
|
||||||
|
BashComplete: autocomplete.AppNameComplete,
|
||||||
Action: func(c *cli.Context) error {
|
Action: func(c *cli.Context) error {
|
||||||
app := internal.ValidateApp(c)
|
app := internal.ValidateApp(c)
|
||||||
|
|
||||||
ctx := context.Background()
|
cl, err := client.New(app.Server)
|
||||||
volumeList, err := client.GetVolumes(ctx, app.Server, app.Name)
|
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 still deployed. Run \"abra app undeploy %s\"", app.Name, app.Name)
|
||||||
|
}
|
||||||
|
|
||||||
|
filters, err := app.Filters(false, true)
|
||||||
|
if err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
volumeList, err := client.GetVolumes(cl, context.Background(), app.Server, filters)
|
||||||
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(ctx, app.Server, volumesToRemove, internal.Force)
|
if len(volumesToRemove) > 0 {
|
||||||
if err != nil {
|
err := client.RemoveVolumes(cl, context.Background(), volumesToRemove, internal.Force, 5)
|
||||||
logrus.Fatal(err)
|
if err != nil {
|
||||||
}
|
log.Fatalf("removing volumes failed: %s", err)
|
||||||
|
}
|
||||||
|
|
||||||
logrus.Info("volumes removed successfully")
|
logrus.Infof("%d volumes removed successfully", len(volumesToRemove))
|
||||||
|
} else {
|
||||||
|
logrus.Info("no volumes removed")
|
||||||
|
}
|
||||||
|
|
||||||
return nil
|
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)
|
|
||||||
}
|
|
||||||
},
|
|
||||||
}
|
}
|
||||||
|
|
||||||
var appVolumeCommand = &cli.Command{
|
var appVolumeCommand = cli.Command{
|
||||||
Name: "volume",
|
Name: "volume",
|
||||||
Aliases: []string{"v"},
|
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,17 +1,223 @@
|
||||||
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/catalogue"
|
||||||
|
"coopcloud.tech/abra/pkg/config"
|
||||||
|
"coopcloud.tech/abra/pkg/formatter"
|
||||||
|
gitPkg "coopcloud.tech/abra/pkg/git"
|
||||||
|
"coopcloud.tech/abra/pkg/recipe"
|
||||||
|
"github.com/go-git/go-git/v5"
|
||||||
|
"github.com/sirupsen/logrus"
|
||||||
|
"github.com/urfave/cli"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
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,
|
||||||
|
internal.ChaosFlag,
|
||||||
|
internal.OfflineFlag,
|
||||||
|
},
|
||||||
|
Before: internal.SubCommandBefore,
|
||||||
|
Description: `
|
||||||
|
Generate a new copy of the recipe catalogue which can be found on:
|
||||||
|
|
||||||
|
https://recipes.coopcloud.tech (website that humans read)
|
||||||
|
https://recipes.coopcloud.tech/recipes.json (JSON that Abra reads)
|
||||||
|
|
||||||
|
It polls the entire git.coopcloud.tech/coop-cloud/... recipe repository
|
||||||
|
listing, parses README.md and git tags to produce recipe metadata which is
|
||||||
|
loaded into the catalogue 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 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.
|
||||||
|
`,
|
||||||
|
ArgsUsage: "[<recipe>]",
|
||||||
|
BashComplete: autocomplete.RecipeNameComplete,
|
||||||
|
Action: func(c *cli.Context) error {
|
||||||
|
recipeName := c.Args().First()
|
||||||
|
|
||||||
|
if recipeName != "" {
|
||||||
|
internal.ValidateRecipe(c)
|
||||||
|
}
|
||||||
|
|
||||||
|
if !internal.Chaos {
|
||||||
|
if err := catalogue.EnsureIsClean(); err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
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 := recipe.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
|
||||||
|
}
|
||||||
|
|
||||||
|
versions, err := recipe.GetRecipeVersions(recipeMeta.Name, internal.Offline)
|
||||||
|
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(internal.Offline)
|
||||||
|
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, 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
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
// 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",
|
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,
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,41 +0,0 @@
|
||||||
package catalogue
|
|
||||||
|
|
||||||
import (
|
|
||||||
"path"
|
|
||||||
"strings"
|
|
||||||
|
|
||||||
"coopcloud.tech/abra/pkg/catalogue"
|
|
||||||
"coopcloud.tech/abra/pkg/config"
|
|
||||||
"coopcloud.tech/abra/pkg/git"
|
|
||||||
"github.com/sirupsen/logrus"
|
|
||||||
"github.com/urfave/cli/v2"
|
|
||||||
)
|
|
||||||
|
|
||||||
var catalogueGenerateCommand = &cli.Command{
|
|
||||||
Name: "generate",
|
|
||||||
Aliases: []string{"g"},
|
|
||||||
Usage: "Generate a new copy of the catalogue",
|
|
||||||
BashComplete: func(c *cli.Context) {},
|
|
||||||
Action: func(c *cli.Context) error {
|
|
||||||
catl, err := catalogue.ReadRecipeCatalogue()
|
|
||||||
if err != nil {
|
|
||||||
logrus.Fatal(err)
|
|
||||||
}
|
|
||||||
|
|
||||||
for recipeName, recipeMeta := range catl {
|
|
||||||
recipeDir := path.Join(config.ABRA_DIR, "apps", strings.ToLower(recipeName))
|
|
||||||
if err := git.Clone(recipeDir, recipeMeta.Repository); err != nil {
|
|
||||||
logrus.Fatal(err)
|
|
||||||
}
|
|
||||||
|
|
||||||
if err := git.EnsureUpToDate(recipeDir); err != nil {
|
|
||||||
logrus.Fatal(err)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// for reach app, build the recipemeta from parsing
|
|
||||||
// spit out a JSON file
|
|
||||||
|
|
||||||
return nil
|
|
||||||
},
|
|
||||||
}
|
|
194
cli/cli.go
194
cli/cli.go
|
@ -2,85 +2,203 @@
|
||||||
package cli
|
package cli
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"errors"
|
||||||
"fmt"
|
"fmt"
|
||||||
"os"
|
"os"
|
||||||
|
"os/exec"
|
||||||
|
"path"
|
||||||
|
|
||||||
"coopcloud.tech/abra/cli/app"
|
"coopcloud.tech/abra/cli/app"
|
||||||
"coopcloud.tech/abra/cli/catalogue"
|
"coopcloud.tech/abra/cli/catalogue"
|
||||||
|
"coopcloud.tech/abra/cli/internal"
|
||||||
"coopcloud.tech/abra/cli/recipe"
|
"coopcloud.tech/abra/cli/recipe"
|
||||||
"coopcloud.tech/abra/cli/server"
|
"coopcloud.tech/abra/cli/server"
|
||||||
|
"coopcloud.tech/abra/pkg/autocomplete"
|
||||||
|
cataloguePkg "coopcloud.tech/abra/pkg/catalogue"
|
||||||
|
"coopcloud.tech/abra/pkg/config"
|
||||||
|
"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: `
|
||||||
|
Set up auto-completion in your shell by downloading the relevant files and
|
||||||
|
laying out what additional information must be loaded. Supported shells are as
|
||||||
|
follows: bash, fish, fizsh & zsh.
|
||||||
|
|
||||||
// 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,
|
ArgsUsage: "<shell>",
|
||||||
Destination: &Verbose,
|
Flags: []cli.Flag{
|
||||||
Usage: "Show INFO messages",
|
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,
|
||||||
|
"fish": 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 auto-completion
|
||||||
|
sudo mkdir /etc/bash_completion.d/
|
||||||
|
sudo cp %s /etc/bash_completion.d/abra
|
||||||
|
echo "source /etc/bash_completion.d/abra" >> ~/.bashrc
|
||||||
|
# To test, run the following: "abra app <hit tab key>" - you should see command completion!
|
||||||
|
`, autocompletionFile))
|
||||||
|
case "zsh":
|
||||||
|
fmt.Println(fmt.Sprintf(`
|
||||||
|
# Run the following commands to install auto-completion
|
||||||
|
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
|
||||||
|
# To test, run the following: "abra app <hit tab key>" - you should see command completion!
|
||||||
|
`, autocompletionFile))
|
||||||
|
case "fish":
|
||||||
|
fmt.Println(fmt.Sprintf(`
|
||||||
|
# Run the following commands to install auto-completion
|
||||||
|
sudo mkdir -p /etc/fish/completions
|
||||||
|
sudo cp %s /etc/fish/completions/abra
|
||||||
|
echo "source /etc/fish/completions/abra" >> ~/.config/fish/config.fish
|
||||||
|
# To test, run the following: "abra app <hit tab key>" - you should see command completion!
|
||||||
|
`, 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: `
|
||||||
|
Upgrade Abra in-place with the latest stable or release candidate.
|
||||||
|
|
||||||
// DebugFlag turns on/off verbose logging down to the DEBUG level.
|
Pass "-r/--rc" to install the latest release candidate. Please bear in mind
|
||||||
var DebugFlag = &cli.BoolFlag{
|
that it may contain catastrophic bugs. Thank you very much for the testing
|
||||||
Name: "debug",
|
efforts!
|
||||||
Aliases: []string{"d"},
|
`,
|
||||||
Value: false,
|
Flags: []cli.Flag{internal.RCFlag},
|
||||||
Destination: &Debug,
|
Action: func(c *cli.Context) error {
|
||||||
Usage: "Show DEBUG messages",
|
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
|
||||||
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
// RunApp runs CLI abra app.
|
func newAbraApp(version, commit string) *cli.App {
|
||||||
func RunApp(version, commit string) {
|
|
||||||
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,
|
||||||
catalogue.CatalogueCommand,
|
catalogue.CatalogueCommand,
|
||||||
VersionCommand,
|
|
||||||
UpgradeCommand,
|
UpgradeCommand,
|
||||||
|
AutoCompleteCommand,
|
||||||
},
|
},
|
||||||
Flags: []cli.Flag{
|
BashComplete: autocomplete.SubcommandComplete,
|
||||||
VerboseFlag,
|
|
||||||
DebugFlag,
|
|
||||||
},
|
|
||||||
Authors: []*cli.Author{
|
|
||||||
&cli.Author{
|
|
||||||
Name: "Autonomic Co-op",
|
|
||||||
Email: "helo@autonomic.zone",
|
|
||||||
},
|
|
||||||
},
|
|
||||||
}
|
}
|
||||||
|
|
||||||
app.EnableBashCompletion = true
|
app.EnableBashCompletion = true
|
||||||
|
|
||||||
app.Before = func(c *cli.Context) error {
|
app.Before = func(c *cli.Context) error {
|
||||||
if Debug {
|
paths := []string{
|
||||||
logrus.SetLevel(logrus.DebugLevel)
|
config.ABRA_DIR,
|
||||||
|
config.SERVERS_DIR,
|
||||||
|
config.RECIPES_DIR,
|
||||||
|
config.VENDOR_DIR,
|
||||||
|
config.BACKUP_DIR,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
for _, path := range paths {
|
||||||
|
if err := os.Mkdir(path, 0764); err != nil {
|
||||||
|
if !os.IsExist(err) {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := cataloguePkg.EnsureCatalogue(); err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
logrus.Debugf("abra version %s, commit %s", version, commit)
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
logrus.Debugf("Flying abra version '%s', commit '%s', enjoy the ride", version, commit)
|
return app
|
||||||
|
}
|
||||||
|
|
||||||
|
// RunApp runs CLI abra app.
|
||||||
|
func RunApp(version, commit string) {
|
||||||
|
app := newAbraApp(version, commit)
|
||||||
|
|
||||||
if err := app.Run(os.Args); err != nil {
|
if err := app.Run(os.Args); err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
|
|
|
@ -1,39 +0,0 @@
|
||||||
package formatter
|
|
||||||
|
|
||||||
import (
|
|
||||||
"fmt"
|
|
||||||
"os"
|
|
||||||
"strings"
|
|
||||||
"time"
|
|
||||||
|
|
||||||
"github.com/docker/cli/cli/command/formatter"
|
|
||||||
"github.com/docker/go-units"
|
|
||||||
"github.com/olekukonko/tablewriter"
|
|
||||||
)
|
|
||||||
|
|
||||||
func ShortenID(str string) string {
|
|
||||||
return str[:12]
|
|
||||||
}
|
|
||||||
|
|
||||||
func Truncate(str string) string {
|
|
||||||
return fmt.Sprintf(`"%s"`, formatter.Ellipsis(str, 19))
|
|
||||||
}
|
|
||||||
|
|
||||||
// RemoveSha remove image sha from a string that are added in some docker outputs
|
|
||||||
func RemoveSha(str string) string {
|
|
||||||
return strings.Split(str, "@")[0]
|
|
||||||
}
|
|
||||||
|
|
||||||
// HumanDuration from docker/cli RunningFor() to be accessible outside of the class
|
|
||||||
func HumanDuration(timestamp int64) string {
|
|
||||||
date := time.Unix(timestamp, 0)
|
|
||||||
now := time.Now().UTC()
|
|
||||||
return units.HumanDuration(now.Sub(date)) + " ago"
|
|
||||||
}
|
|
||||||
|
|
||||||
// CreateTable prepares a table layout for output.
|
|
||||||
func CreateTable(columns []string) *tablewriter.Table {
|
|
||||||
table := tablewriter.NewWriter(os.Stdout)
|
|
||||||
table.SetHeader(columns)
|
|
||||||
return table
|
|
||||||
}
|
|
|
@ -0,0 +1,67 @@
|
||||||
|
package internal
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
|
||||||
|
"coopcloud.tech/abra/pkg/config"
|
||||||
|
containerPkg "coopcloud.tech/abra/pkg/container"
|
||||||
|
"coopcloud.tech/abra/pkg/service"
|
||||||
|
"coopcloud.tech/abra/pkg/upstream/container"
|
||||||
|
"github.com/docker/cli/cli/command"
|
||||||
|
"github.com/docker/docker/api/types"
|
||||||
|
"github.com/docker/docker/api/types/filters"
|
||||||
|
dockerClient "github.com/docker/docker/client"
|
||||||
|
"github.com/sirupsen/logrus"
|
||||||
|
)
|
||||||
|
|
||||||
|
// RetrieveBackupBotContainer gets the deployed backupbot container.
|
||||||
|
func RetrieveBackupBotContainer(cl *dockerClient.Client) (types.Container, error) {
|
||||||
|
ctx := context.Background()
|
||||||
|
chosenService, err := service.GetServiceByLabel(ctx, cl, config.BackupbotLabel, NoInput)
|
||||||
|
if err != nil {
|
||||||
|
return types.Container{}, err
|
||||||
|
}
|
||||||
|
|
||||||
|
logrus.Debugf("retrieved %s as backup enabled service", chosenService.Spec.Name)
|
||||||
|
|
||||||
|
filters := filters.NewArgs()
|
||||||
|
filters.Add("name", chosenService.Spec.Name)
|
||||||
|
targetContainer, err := containerPkg.GetContainer(
|
||||||
|
ctx,
|
||||||
|
cl,
|
||||||
|
filters,
|
||||||
|
NoInput,
|
||||||
|
)
|
||||||
|
if err != nil {
|
||||||
|
return types.Container{}, err
|
||||||
|
}
|
||||||
|
|
||||||
|
return targetContainer, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// RunBackupCmdRemote runs a backup related command on a remote backupbot container.
|
||||||
|
func RunBackupCmdRemote(cl *dockerClient.Client, backupCmd string, containerID string, execEnv []string) error {
|
||||||
|
execBackupListOpts := types.ExecConfig{
|
||||||
|
AttachStderr: true,
|
||||||
|
AttachStdin: true,
|
||||||
|
AttachStdout: true,
|
||||||
|
Cmd: []string{"/usr/bin/backup", "--", backupCmd},
|
||||||
|
Detach: false,
|
||||||
|
Env: execEnv,
|
||||||
|
Tty: true,
|
||||||
|
}
|
||||||
|
|
||||||
|
logrus.Debugf("running backup %s on %s with exec config %v", backupCmd, containerID, execBackupListOpts)
|
||||||
|
|
||||||
|
// FIXME: avoid instantiating a new CLI
|
||||||
|
dcli, err := command.NewDockerCli()
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
if _, err := container.RunExec(dcli, cl, containerID, &execBackupListOpts); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
|
@ -0,0 +1,261 @@
|
||||||
|
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: "Proceed with uncommitted recipes changes. Use with care!",
|
||||||
|
Destination: &Chaos,
|
||||||
|
}
|
||||||
|
|
||||||
|
// Disable tty to run commands from script
|
||||||
|
var Tty bool
|
||||||
|
|
||||||
|
// TtyFlag turns on/off tty mode.
|
||||||
|
var TtyFlag = &cli.BoolFlag{
|
||||||
|
Name: "tty, T",
|
||||||
|
Usage: "Disables TTY mode to run this command from a script.",
|
||||||
|
Destination: &Tty,
|
||||||
|
}
|
||||||
|
|
||||||
|
var NoInput bool
|
||||||
|
var NoInputFlag = &cli.BoolFlag{
|
||||||
|
Name: "no-input, n",
|
||||||
|
Usage: "Toggle non-interactive mode",
|
||||||
|
Destination: &NoInput,
|
||||||
|
}
|
||||||
|
|
||||||
|
// 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",
|
||||||
|
}
|
||||||
|
|
||||||
|
// Offline stores the variable from OfflineFlag.
|
||||||
|
var Offline bool
|
||||||
|
|
||||||
|
// DebugFlag turns on/off offline mode.
|
||||||
|
var OfflineFlag = &cli.BoolFlag{
|
||||||
|
Name: "offline, o",
|
||||||
|
Destination: &Offline,
|
||||||
|
Usage: "Prefer offline & filesystem access when possible",
|
||||||
|
}
|
||||||
|
|
||||||
|
// ReleaseNotes stores the variable from ReleaseNotesFlag.
|
||||||
|
var ReleaseNotes bool
|
||||||
|
|
||||||
|
// ReleaseNotesFlag turns on/off printing only release notes when upgrading.
|
||||||
|
var ReleaseNotesFlag = &cli.BoolFlag{
|
||||||
|
Name: "releasenotes, r",
|
||||||
|
Destination: &ReleaseNotes,
|
||||||
|
Usage: "Only show release notes",
|
||||||
|
}
|
||||||
|
|
||||||
|
// MachineReadable stores the variable from MachineReadableFlag
|
||||||
|
var MachineReadable bool
|
||||||
|
|
||||||
|
// MachineReadableFlag turns on/off machine readable output where supported
|
||||||
|
var MachineReadableFlag = &cli.BoolFlag{
|
||||||
|
Name: "machine, m",
|
||||||
|
Destination: &MachineReadable,
|
||||||
|
Usage: "Output in a machine-readable format (where supported)",
|
||||||
|
}
|
||||||
|
|
||||||
|
// 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: "Install 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 SinceLogs string
|
||||||
|
var SinceLogsFlag = &cli.StringFlag{
|
||||||
|
Name: "since, S",
|
||||||
|
Value: "",
|
||||||
|
Usage: "tail logs since YYYY-MM-DDTHH:MM:SSZ",
|
||||||
|
Destination: &SinceLogs,
|
||||||
|
}
|
||||||
|
|
||||||
|
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,
|
||||||
|
}
|
||||||
|
|
||||||
|
var LocalCmd bool
|
||||||
|
var LocalCmdFlag = &cli.BoolFlag{
|
||||||
|
Name: "local, l",
|
||||||
|
Usage: "Run command locally",
|
||||||
|
Destination: &LocalCmd,
|
||||||
|
}
|
||||||
|
|
||||||
|
var RemoteUser string
|
||||||
|
var RemoteUserFlag = &cli.StringFlag{
|
||||||
|
Name: "user, u",
|
||||||
|
Value: "",
|
||||||
|
Usage: "User to run command within a service context",
|
||||||
|
Destination: &RemoteUser,
|
||||||
|
}
|
||||||
|
|
||||||
|
// 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
|
||||||
|
}
|
|
@ -2,10 +2,109 @@ package internal
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"bufio"
|
"bufio"
|
||||||
|
"context"
|
||||||
"fmt"
|
"fmt"
|
||||||
|
"io/ioutil"
|
||||||
"os/exec"
|
"os/exec"
|
||||||
|
"strings"
|
||||||
|
|
||||||
|
"coopcloud.tech/abra/pkg/config"
|
||||||
|
containerPkg "coopcloud.tech/abra/pkg/container"
|
||||||
|
"coopcloud.tech/abra/pkg/formatter"
|
||||||
|
"coopcloud.tech/abra/pkg/upstream/container"
|
||||||
|
"github.com/docker/cli/cli/command"
|
||||||
|
"github.com/docker/docker/api/types"
|
||||||
|
"github.com/docker/docker/api/types/filters"
|
||||||
|
dockerClient "github.com/docker/docker/client"
|
||||||
|
"github.com/docker/docker/pkg/archive"
|
||||||
|
"github.com/sirupsen/logrus"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
// RunCmdRemote executes an abra.sh command in the target service
|
||||||
|
func RunCmdRemote(cl *dockerClient.Client, app config.App, abraSh, serviceName, cmdName, cmdArgs string) error {
|
||||||
|
filters := filters.NewArgs()
|
||||||
|
filters.Add("name", fmt.Sprintf("^%s_%s", app.StackName(), serviceName))
|
||||||
|
|
||||||
|
targetContainer, err := containerPkg.GetContainer(context.Background(), cl, filters, false)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
logrus.Debugf("retrieved %s as target container on %s", formatter.ShortenID(targetContainer.ID), app.Server)
|
||||||
|
|
||||||
|
toTarOpts := &archive.TarOptions{NoOverwriteDirNonDir: true, Compression: archive.Gzip}
|
||||||
|
content, err := archive.TarWithOptions(abraSh, toTarOpts)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
copyOpts := types.CopyToContainerOptions{AllowOverwriteDirWithFile: false, CopyUIDGID: false}
|
||||||
|
if err := cl.CopyToContainer(context.Background(), targetContainer.ID, "/tmp", content, copyOpts); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
// FIXME: avoid instantiating a new CLI
|
||||||
|
dcli, err := command.NewDockerCli()
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
shell := "/bin/bash"
|
||||||
|
findShell := []string{"test", "-e", shell}
|
||||||
|
execCreateOpts := types.ExecConfig{
|
||||||
|
AttachStderr: true,
|
||||||
|
AttachStdin: true,
|
||||||
|
AttachStdout: true,
|
||||||
|
Cmd: findShell,
|
||||||
|
Detach: false,
|
||||||
|
Tty: false,
|
||||||
|
}
|
||||||
|
|
||||||
|
if _, err := container.RunExec(dcli, cl, targetContainer.ID, &execCreateOpts); err != nil {
|
||||||
|
logrus.Infof("%s does not exist for %s, use /bin/sh as fallback", shell, app.Name)
|
||||||
|
shell = "/bin/sh"
|
||||||
|
}
|
||||||
|
|
||||||
|
var cmd []string
|
||||||
|
if cmdArgs != "" {
|
||||||
|
cmd = []string{shell, "-c", fmt.Sprintf("TARGET=%s; APP_NAME=%s; STACK_NAME=%s; . /tmp/abra.sh; %s %s", serviceName, app.Name, app.StackName(), cmdName, cmdArgs)}
|
||||||
|
} else {
|
||||||
|
cmd = []string{shell, "-c", fmt.Sprintf("TARGET=%s; APP_NAME=%s; STACK_NAME=%s; . /tmp/abra.sh; %s", serviceName, app.Name, app.StackName(), cmdName)}
|
||||||
|
}
|
||||||
|
|
||||||
|
logrus.Debugf("running command: %s", strings.Join(cmd, " "))
|
||||||
|
|
||||||
|
if RemoteUser != "" {
|
||||||
|
logrus.Debugf("running command with user %s", RemoteUser)
|
||||||
|
execCreateOpts.User = RemoteUser
|
||||||
|
}
|
||||||
|
|
||||||
|
execCreateOpts.Cmd = cmd
|
||||||
|
execCreateOpts.Tty = true
|
||||||
|
if Tty {
|
||||||
|
execCreateOpts.Tty = false
|
||||||
|
}
|
||||||
|
|
||||||
|
if _, err := container.RunExec(dcli, cl, targetContainer.ID, &execCreateOpts); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func EnsureCommand(abraSh, recipeName, execCmd string) error {
|
||||||
|
bytes, err := ioutil.ReadFile(abraSh)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
if !strings.Contains(string(bytes), execCmd) {
|
||||||
|
return fmt.Errorf("%s doesn't have a %s function", recipeName, execCmd)
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
// RunCmd runs a shell command and streams stdout/stderr in real-time.
|
// RunCmd runs a shell command and streams stdout/stderr in real-time.
|
||||||
func RunCmd(cmd *exec.Cmd) error {
|
func RunCmd(cmd *exec.Cmd) error {
|
||||||
r, err := cmd.StdoutPipe()
|
r, err := cmd.StdoutPipe()
|
||||||
|
|
|
@ -1,51 +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,
|
|
||||||
}
|
|
|
@ -0,0 +1,173 @@
|
||||||
|
package internal
|
||||||
|
|
||||||
|
import (
|
||||||
|
"fmt"
|
||||||
|
"io/ioutil"
|
||||||
|
"os"
|
||||||
|
"path"
|
||||||
|
"strings"
|
||||||
|
|
||||||
|
"coopcloud.tech/abra/pkg/config"
|
||||||
|
"coopcloud.tech/abra/pkg/formatter"
|
||||||
|
"github.com/AlecAivazis/survey/v2"
|
||||||
|
dockerClient "github.com/docker/docker/client"
|
||||||
|
"github.com/sirupsen/logrus"
|
||||||
|
)
|
||||||
|
|
||||||
|
// NewVersionOverview shows an upgrade or downgrade overview
|
||||||
|
func NewVersionOverview(app config.App, currentVersion, newVersion, releaseNotes string) error {
|
||||||
|
tableCol := []string{"server", "recipe", "config", "domain", "current version", "to be deployed"}
|
||||||
|
table := formatter.CreateTable(tableCol)
|
||||||
|
|
||||||
|
deployConfig := "compose.yml"
|
||||||
|
if composeFiles, ok := app.Env["COMPOSE_FILE"]; ok {
|
||||||
|
deployConfig = strings.Join(strings.Split(composeFiles, ":"), "\n")
|
||||||
|
}
|
||||||
|
|
||||||
|
server := app.Server
|
||||||
|
if app.Server == "default" {
|
||||||
|
server = "local"
|
||||||
|
}
|
||||||
|
|
||||||
|
table.Append([]string{server, app.Recipe, deployConfig, app.Domain, currentVersion, newVersion})
|
||||||
|
table.Render()
|
||||||
|
|
||||||
|
if releaseNotes != "" && newVersion != "" {
|
||||||
|
fmt.Println()
|
||||||
|
fmt.Print(releaseNotes)
|
||||||
|
} else {
|
||||||
|
logrus.Warnf("no release notes available for %s", newVersion)
|
||||||
|
}
|
||||||
|
|
||||||
|
if NoInput {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
response := false
|
||||||
|
prompt := &survey.Confirm{
|
||||||
|
Message: "continue with deployment?",
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := survey.AskOne(prompt, &response); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
if !response {
|
||||||
|
logrus.Fatal("exiting as requested")
|
||||||
|
}
|
||||||
|
|
||||||
|
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
|
||||||
|
}
|
||||||
|
withTitle := fmt.Sprintf("%s release notes:\n%s", version, string(releaseNotes))
|
||||||
|
return withTitle, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
return "", nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// PostCmds parses a string of commands and executes them inside of the respective services
|
||||||
|
// the commands string must have the following format:
|
||||||
|
// "<service> <command> <arguments>|<service> <command> <arguments>|... "
|
||||||
|
func PostCmds(cl *dockerClient.Client, app config.App, commands string) error {
|
||||||
|
abraSh := path.Join(config.RECIPES_DIR, app.Recipe, "abra.sh")
|
||||||
|
if _, err := os.Stat(abraSh); err != nil {
|
||||||
|
if os.IsNotExist(err) {
|
||||||
|
return fmt.Errorf(fmt.Sprintf("%s does not exist for %s?", abraSh, app.Name))
|
||||||
|
}
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, command := range strings.Split(commands, "|") {
|
||||||
|
commandParts := strings.Split(command, " ")
|
||||||
|
if len(commandParts) < 2 {
|
||||||
|
return fmt.Errorf(fmt.Sprintf("not enough arguments: %s", command))
|
||||||
|
}
|
||||||
|
targetServiceName := commandParts[0]
|
||||||
|
cmdName := commandParts[1]
|
||||||
|
parsedCmdArgs := ""
|
||||||
|
if len(commandParts) > 2 {
|
||||||
|
parsedCmdArgs = fmt.Sprintf("%s ", strings.Join(commandParts[2:], " "))
|
||||||
|
}
|
||||||
|
logrus.Infof("running post-command '%s %s' in container %s", cmdName, parsedCmdArgs, targetServiceName)
|
||||||
|
|
||||||
|
if err := EnsureCommand(abraSh, app.Recipe, cmdName); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
serviceNames, err := config.GetAppServiceNames(app.Name)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
matchingServiceName := false
|
||||||
|
for _, serviceName := range serviceNames {
|
||||||
|
if serviceName == targetServiceName {
|
||||||
|
matchingServiceName = true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if !matchingServiceName {
|
||||||
|
return fmt.Errorf(fmt.Sprintf("no service %s for %s?", targetServiceName, app.Name))
|
||||||
|
}
|
||||||
|
|
||||||
|
logrus.Debugf("running command %s %s within the context of %s_%s", cmdName, parsedCmdArgs, app.StackName(), targetServiceName)
|
||||||
|
|
||||||
|
Tty = true
|
||||||
|
if err := RunCmdRemote(cl, app, abraSh, targetServiceName, cmdName, parsedCmdArgs); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// DeployOverview shows a deployment overview
|
||||||
|
func DeployOverview(app config.App, version, message string) error {
|
||||||
|
tableCol := []string{"server", "recipe", "config", "domain", "version"}
|
||||||
|
table := formatter.CreateTable(tableCol)
|
||||||
|
|
||||||
|
deployConfig := "compose.yml"
|
||||||
|
if composeFiles, ok := app.Env["COMPOSE_FILE"]; ok {
|
||||||
|
deployConfig = strings.Join(strings.Split(composeFiles, ":"), "\n")
|
||||||
|
}
|
||||||
|
|
||||||
|
server := app.Server
|
||||||
|
if app.Server == "default" {
|
||||||
|
server = "local"
|
||||||
|
}
|
||||||
|
|
||||||
|
table.Append([]string{server, app.Recipe, deployConfig, app.Domain, version})
|
||||||
|
table.Render()
|
||||||
|
|
||||||
|
if NoInput {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
response := false
|
||||||
|
prompt := &survey.Confirm{
|
||||||
|
Message: message,
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := survey.AskOne(prompt, &response); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
if !response {
|
||||||
|
logrus.Fatal("exiting as requested")
|
||||||
|
}
|
||||||
|
|
||||||
|
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
|
||||||
|
|
|
@ -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
|
||||||
|
}
|
|
@ -0,0 +1,110 @@
|
||||||
|
package internal
|
||||||
|
|
||||||
|
import (
|
||||||
|
"fmt"
|
||||||
|
|
||||||
|
"coopcloud.tech/abra/pkg/formatter"
|
||||||
|
"coopcloud.tech/abra/pkg/recipe"
|
||||||
|
"github.com/AlecAivazis/survey/v2"
|
||||||
|
"github.com/docker/distribution/reference"
|
||||||
|
"github.com/sirupsen/logrus"
|
||||||
|
)
|
||||||
|
|
||||||
|
// PromptBumpType prompts for version bump type
|
||||||
|
func PromptBumpType(tagString, latestRelease string) error {
|
||||||
|
if (!Major && !Minor && !Patch) && tagString == "" {
|
||||||
|
fmt.Printf(`
|
||||||
|
You need to make a decision about what kind of an update this new recipe
|
||||||
|
version is. If someone else performs this upgrade, do they have to do some
|
||||||
|
migration work or take care of some breaking changes? This can be signaled in
|
||||||
|
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
|
||||||
|
prompt := &survey.Select{
|
||||||
|
Message: fmt.Sprintf("select recipe version increment type"),
|
||||||
|
Options: []string{"major", "minor", "patch"},
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := survey.AskOne(prompt, &chosenBumpType); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
SetBumpType(chosenBumpType)
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetBumpType figures out which bump type is specified
|
||||||
|
func GetBumpType() string {
|
||||||
|
var bumpType string
|
||||||
|
|
||||||
|
if Major {
|
||||||
|
bumpType = "major"
|
||||||
|
} else if Minor {
|
||||||
|
bumpType = "minor"
|
||||||
|
} else if Patch {
|
||||||
|
bumpType = "patch"
|
||||||
|
} else {
|
||||||
|
logrus.Fatal("no version bump type specififed?")
|
||||||
|
}
|
||||||
|
|
||||||
|
return bumpType
|
||||||
|
}
|
||||||
|
|
||||||
|
// SetBumpType figures out which bump type is specified
|
||||||
|
func SetBumpType(bumpType string) {
|
||||||
|
if bumpType == "major" {
|
||||||
|
Major = true
|
||||||
|
} else if bumpType == "minor" {
|
||||||
|
Minor = true
|
||||||
|
} else if bumpType == "patch" {
|
||||||
|
Patch = true
|
||||||
|
} else {
|
||||||
|
logrus.Fatal("no version bump type specififed?")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetMainAppImage retrieves the main 'app' image name
|
||||||
|
func GetMainAppImage(recipe recipe.Recipe) (string, error) {
|
||||||
|
var path string
|
||||||
|
|
||||||
|
for _, service := range recipe.Config.Services {
|
||||||
|
if service.Name == "app" {
|
||||||
|
img, err := reference.ParseNormalizedNamed(service.Image)
|
||||||
|
if err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
|
||||||
|
path = reference.Path(img)
|
||||||
|
path = formatter.StripTagMeta(path)
|
||||||
|
|
||||||
|
return path, nil
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if path == "" {
|
||||||
|
return path, fmt.Errorf("%s has no main 'app' service?", recipe.Name)
|
||||||
|
}
|
||||||
|
|
||||||
|
return path, nil
|
||||||
|
}
|
|
@ -2,30 +2,79 @@ package internal
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"errors"
|
"errors"
|
||||||
|
"strings"
|
||||||
|
|
||||||
"coopcloud.tech/abra/pkg/app"
|
"coopcloud.tech/abra/pkg/app"
|
||||||
"coopcloud.tech/abra/pkg/config"
|
"coopcloud.tech/abra/pkg/config"
|
||||||
"coopcloud.tech/abra/pkg/recipe"
|
"coopcloud.tech/abra/pkg/recipe"
|
||||||
|
"github.com/AlecAivazis/survey/v2"
|
||||||
"github.com/sirupsen/logrus"
|
"github.com/sirupsen/logrus"
|
||||||
"github.com/urfave/cli/v2"
|
"github.com/urfave/cli"
|
||||||
)
|
)
|
||||||
|
|
||||||
// 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) recipe.Recipe {
|
||||||
recipeName := c.Args().First()
|
recipeName := c.Args().First()
|
||||||
|
|
||||||
|
if recipeName == "" && !NoInput {
|
||||||
|
var recipes []string
|
||||||
|
|
||||||
|
catl, err := recipe.ReadRecipeCatalogue(Offline)
|
||||||
|
if err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
knownRecipes := make(map[string]bool)
|
||||||
|
for name := range catl {
|
||||||
|
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{
|
||||||
|
Message: "Select recipe",
|
||||||
|
Options: recipes,
|
||||||
|
}
|
||||||
|
if err := survey.AskOne(prompt, &recipeName); err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
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, Offline)
|
||||||
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 {
|
||||||
|
if strings.Contains(err.Error(), "template_driver is not allowed") {
|
||||||
|
logrus.Warnf("ensure %s recipe compose.* files include \"version: '3.8'\"", recipeName)
|
||||||
|
}
|
||||||
|
logrus.Fatalf("unable to validate recipe: %s", err)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
logrus.Debugf("validated '%s' as recipe argument", recipeName)
|
logrus.Debugf("validated %s as recipe argument", recipeName)
|
||||||
|
|
||||||
return recipe
|
return chosenRecipe
|
||||||
}
|
}
|
||||||
|
|
||||||
// ValidateApp ensures the app name arg is valid.
|
// ValidateApp ensures the app name arg is valid.
|
||||||
|
@ -41,7 +90,7 @@ func ValidateApp(c *cli.Context) config.App {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
logrus.Debugf("validated '%s' as app argument", appName)
|
logrus.Debugf("validated %s as app argument", appName)
|
||||||
|
|
||||||
return app
|
return app
|
||||||
}
|
}
|
||||||
|
@ -50,11 +99,74 @@ func ValidateApp(c *cli.Context) config.App {
|
||||||
func ValidateDomain(c *cli.Context) string {
|
func ValidateDomain(c *cli.Context) string {
|
||||||
domainName := c.Args().First()
|
domainName := c.Args().First()
|
||||||
|
|
||||||
|
if domainName == "" && !NoInput {
|
||||||
|
prompt := &survey.Input{
|
||||||
|
Message: "Specify a domain name",
|
||||||
|
Default: "example.com",
|
||||||
|
}
|
||||||
|
if err := survey.AskOne(prompt, &domainName); err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if domainName == "" {
|
if domainName == "" {
|
||||||
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
|
return domainName
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// ValidateSubCmdFlags ensures flag order conforms to correct order
|
||||||
|
func ValidateSubCmdFlags(c *cli.Context) bool {
|
||||||
|
for argIdx, arg := range c.Args() {
|
||||||
|
if !strings.HasPrefix(arg, "--") {
|
||||||
|
for _, flag := range c.Args()[argIdx:] {
|
||||||
|
if strings.HasPrefix(flag, "--") {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
|
||||||
|
// ValidateServer ensures the server name arg is valid.
|
||||||
|
func ValidateServer(c *cli.Context) string {
|
||||||
|
serverName := c.Args().First()
|
||||||
|
|
||||||
|
serverNames, err := config.ReadServerNames()
|
||||||
|
if err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if serverName == "" && !NoInput {
|
||||||
|
prompt := &survey.Select{
|
||||||
|
Message: "Specify a server name",
|
||||||
|
Options: serverNames,
|
||||||
|
}
|
||||||
|
if err := survey.AskOne(prompt, &serverName); err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
matched := false
|
||||||
|
for _, name := range serverNames {
|
||||||
|
if name == serverName {
|
||||||
|
matched = true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if serverName == "" {
|
||||||
|
ShowSubcommandHelpAndError(c, errors.New("no server provided"))
|
||||||
|
}
|
||||||
|
|
||||||
|
if !matched {
|
||||||
|
ShowSubcommandHelpAndError(c, errors.New("server doesn't exist?"))
|
||||||
|
}
|
||||||
|
|
||||||
|
logrus.Debugf("validated %s as server argument", serverName)
|
||||||
|
|
||||||
|
return serverName
|
||||||
|
}
|
||||||
|
|
|
@ -0,0 +1,40 @@
|
||||||
|
package recipe
|
||||||
|
|
||||||
|
import (
|
||||||
|
"path"
|
||||||
|
|
||||||
|
"coopcloud.tech/abra/cli/internal"
|
||||||
|
"coopcloud.tech/abra/pkg/autocomplete"
|
||||||
|
"coopcloud.tech/abra/pkg/config"
|
||||||
|
gitPkg "coopcloud.tech/abra/pkg/git"
|
||||||
|
"github.com/sirupsen/logrus"
|
||||||
|
"github.com/urfave/cli"
|
||||||
|
)
|
||||||
|
|
||||||
|
var recipeDiffCommand = cli.Command{
|
||||||
|
Name: "diff",
|
||||||
|
Usage: "Show unstaged changes in recipe config",
|
||||||
|
Description: "Due to limitations in our underlying Git dependency, this command requires /usr/bin/git.",
|
||||||
|
Aliases: []string{"d"},
|
||||||
|
ArgsUsage: "<recipe>",
|
||||||
|
Flags: []cli.Flag{
|
||||||
|
internal.DebugFlag,
|
||||||
|
internal.NoInputFlag,
|
||||||
|
},
|
||||||
|
Before: internal.SubCommandBefore,
|
||||||
|
BashComplete: autocomplete.RecipeNameComplete,
|
||||||
|
Action: func(c *cli.Context) error {
|
||||||
|
recipeName := c.Args().First()
|
||||||
|
|
||||||
|
if recipeName != "" {
|
||||||
|
internal.ValidateRecipe(c)
|
||||||
|
}
|
||||||
|
|
||||||
|
recipeDir := path.Join(config.RECIPES_DIR, recipeName)
|
||||||
|
if err := gitPkg.DiffUnstaged(recipeDir); err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil
|
||||||
|
},
|
||||||
|
}
|
|
@ -0,0 +1,50 @@
|
||||||
|
package recipe
|
||||||
|
|
||||||
|
import (
|
||||||
|
"coopcloud.tech/abra/cli/internal"
|
||||||
|
"coopcloud.tech/abra/pkg/autocomplete"
|
||||||
|
"coopcloud.tech/abra/pkg/formatter"
|
||||||
|
"coopcloud.tech/abra/pkg/recipe"
|
||||||
|
"github.com/sirupsen/logrus"
|
||||||
|
"github.com/urfave/cli"
|
||||||
|
)
|
||||||
|
|
||||||
|
var recipeFetchCommand = cli.Command{
|
||||||
|
Name: "fetch",
|
||||||
|
Usage: "Fetch recipe(s)",
|
||||||
|
Aliases: []string{"f"},
|
||||||
|
ArgsUsage: "[<recipe>]",
|
||||||
|
Description: "Retrieves all recipes if no <recipe> argument is passed",
|
||||||
|
Flags: []cli.Flag{
|
||||||
|
internal.DebugFlag,
|
||||||
|
internal.NoInputFlag,
|
||||||
|
internal.OfflineFlag,
|
||||||
|
},
|
||||||
|
Before: internal.SubCommandBefore,
|
||||||
|
BashComplete: autocomplete.RecipeNameComplete,
|
||||||
|
Action: func(c *cli.Context) error {
|
||||||
|
recipeName := c.Args().First()
|
||||||
|
if recipeName != "" {
|
||||||
|
internal.ValidateRecipe(c)
|
||||||
|
if err := recipe.Ensure(recipeName); err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
catalogue, err := recipe.ReadRecipeCatalogue(internal.Offline)
|
||||||
|
if err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
catlBar := formatter.CreateProgressbar(len(catalogue), "fetching latest recipes...")
|
||||||
|
for recipeName := range catalogue {
|
||||||
|
if err := recipe.Ensure(recipeName); err != nil {
|
||||||
|
logrus.Error(err)
|
||||||
|
}
|
||||||
|
catlBar.Add(1)
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil
|
||||||
|
},
|
||||||
|
}
|
|
@ -2,105 +2,121 @@ 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,
|
||||||
|
internal.OfflineFlag,
|
||||||
|
internal.NoInputFlag,
|
||||||
|
internal.ChaosFlag,
|
||||||
|
},
|
||||||
|
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)
|
||||||
|
|
||||||
expectedVersion := false
|
if err := recipePkg.EnsureExists(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
|
if !internal.Chaos {
|
||||||
traefikEnabled := false
|
if err := recipePkg.EnsureIsClean(recipe.Name); err != nil {
|
||||||
healthChecksForAllServices := true
|
logrus.Fatal(err)
|
||||||
allImagesTagged := true
|
|
||||||
noUnstableTags := true
|
|
||||||
semverLikeTags := true
|
|
||||||
for _, service := range recipe.Config.Services {
|
|
||||||
if service.Name == "app" {
|
|
||||||
serviceNamedApp = true
|
|
||||||
}
|
}
|
||||||
|
|
||||||
for label := range service.Deploy.Labels {
|
if !internal.Offline {
|
||||||
if label == "traefik.enable" {
|
if err := recipePkg.EnsureUpToDate(recipe.Name); err != nil {
|
||||||
if service.Deploy.Labels[label] == "true" {
|
logrus.Fatal(err)
|
||||||
traefikEnabled = true
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
img, err := reference.ParseNormalizedNamed(service.Image)
|
if err := recipePkg.EnsureLatest(recipe.Name); err != nil {
|
||||||
if err != nil {
|
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
if reference.IsNameOnly(img) {
|
|
||||||
allImagesTagged = false
|
|
||||||
}
|
|
||||||
|
|
||||||
tag := img.(reference.NamedTagged).Tag()
|
|
||||||
if tag == "latest" {
|
|
||||||
noUnstableTags = false
|
|
||||||
}
|
|
||||||
|
|
||||||
if !tagcmp.IsParsable(tag) {
|
|
||||||
semverLikeTags = false
|
|
||||||
}
|
|
||||||
|
|
||||||
if service.HealthCheck == nil {
|
|
||||||
healthChecksForAllServices = false
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
tableCol := []string{"rule", "satisfied"}
|
tableCol := []string{"ref", "rule", "severity", "satisfied", "skipped", "resolve"}
|
||||||
table := formatter.CreateTable(tableCol)
|
table := formatter.CreateTable(tableCol)
|
||||||
table.Append([]string{"compose files have the expected version", strconv.FormatBool(expectedVersion)})
|
|
||||||
table.Append([]string{"environment configuration is provided", strconv.FormatBool(envSampleProvided)})
|
hasError := false
|
||||||
table.Append([]string{"recipe contains a service named 'app'", strconv.FormatBool(serviceNamedApp)})
|
bar := formatter.CreateProgressbar(-1, "running recipe lint rules...")
|
||||||
table.Append([]string{"traefik routing enabled on at least one service", strconv.FormatBool(traefikEnabled)})
|
for level := range lint.LintRules {
|
||||||
table.Append([]string{"all services have a healthcheck enabled", strconv.FormatBool(healthChecksForAllServices)})
|
for _, rule := range lint.LintRules[level] {
|
||||||
table.Append([]string{"all images are using a tag", strconv.FormatBool(allImagesTagged)})
|
if internal.OnlyErrors && rule.Level != "error" {
|
||||||
table.Append([]string{"no usage of unstable 'latest' tags", strconv.FormatBool(noUnstableTags)})
|
logrus.Debugf("skipping %s, does not have level \"error\"", rule.Ref)
|
||||||
table.Append([]string{"all tags are using a semver-like format", strconv.FormatBool(semverLikeTags)})
|
continue
|
||||||
table.Render()
|
}
|
||||||
|
|
||||||
|
skipped := false
|
||||||
|
if rule.Skip(recipe) {
|
||||||
|
skipped = true
|
||||||
|
}
|
||||||
|
|
||||||
|
skippedOutput := "-"
|
||||||
|
if skipped {
|
||||||
|
skippedOutput = "✅"
|
||||||
|
}
|
||||||
|
|
||||||
|
satisfied := false
|
||||||
|
if !skipped {
|
||||||
|
ok, err := rule.Function(recipe)
|
||||||
|
if err != nil {
|
||||||
|
logrus.Warn(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if !ok && rule.Level == "error" {
|
||||||
|
hasError = true
|
||||||
|
}
|
||||||
|
|
||||||
|
if ok {
|
||||||
|
satisfied = true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
satisfiedOutput := "✅"
|
||||||
|
if !satisfied {
|
||||||
|
satisfiedOutput = "❌"
|
||||||
|
if skipped {
|
||||||
|
satisfiedOutput = "-"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
table.Append([]string{
|
||||||
|
rule.Ref,
|
||||||
|
rule.Description,
|
||||||
|
rule.Level,
|
||||||
|
satisfiedOutput,
|
||||||
|
skippedOutput,
|
||||||
|
rule.HowToResolve,
|
||||||
|
})
|
||||||
|
|
||||||
|
bar.Add(1)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if table.NumLines() > 0 {
|
||||||
|
fmt.Println()
|
||||||
|
table.Render()
|
||||||
|
}
|
||||||
|
|
||||||
|
if hasError {
|
||||||
|
logrus.Warn("watch out, some critical errors are present in your recipe config")
|
||||||
|
}
|
||||||
|
|
||||||
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,80 @@ 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,
|
||||||
|
internal.MachineReadableFlag,
|
||||||
|
patternFlag,
|
||||||
|
internal.OfflineFlag,
|
||||||
|
},
|
||||||
|
Before: internal.SubCommandBefore,
|
||||||
Action: func(c *cli.Context) error {
|
Action: func(c *cli.Context) error {
|
||||||
catl, err := catalogue.ReadRecipeCatalogue()
|
catl, err := recipe.ReadRecipeCatalogue(internal.Offline)
|
||||||
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()
|
if table.NumLines() > 0 {
|
||||||
|
if internal.MachineReadable {
|
||||||
|
table.SetCaption(false, "")
|
||||||
|
table.JSONRender()
|
||||||
|
} else {
|
||||||
|
table.SetCaption(true, fmt.Sprintf("total recipes: %v", len))
|
||||||
|
table.Render()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
},
|
},
|
||||||
|
|
|
@ -1,7 +1,10 @@
|
||||||
package recipe
|
package recipe
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"bytes"
|
||||||
|
"errors"
|
||||||
"fmt"
|
"fmt"
|
||||||
|
"io/ioutil"
|
||||||
"os"
|
"os"
|
||||||
"path"
|
"path"
|
||||||
"text/template"
|
"text/template"
|
||||||
|
@ -10,70 +13,129 @@ 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 {
|
||||||
Usage: "Create a new recipe",
|
Name string
|
||||||
Aliases: []string{"n"},
|
Description string
|
||||||
ArgsUsage: "<recipe>",
|
Category string
|
||||||
Action: func(c *cli.Context) error {
|
Status string
|
||||||
recipe := internal.ValidateRecipe(c)
|
Image string
|
||||||
|
Healthcheck string
|
||||||
|
Backups string
|
||||||
|
Email string
|
||||||
|
Tests string
|
||||||
|
SSO string
|
||||||
|
}
|
||||||
|
|
||||||
directory := path.Join(config.APPS_DIR, recipe.Name)
|
var recipeNewCommand = cli.Command{
|
||||||
|
Name: "new",
|
||||||
|
Aliases: []string{"n"},
|
||||||
|
Flags: []cli.Flag{
|
||||||
|
internal.DebugFlag,
|
||||||
|
internal.NoInputFlag,
|
||||||
|
internal.OfflineFlag,
|
||||||
|
},
|
||||||
|
Before: internal.SubCommandBefore,
|
||||||
|
Usage: "Create a new recipe",
|
||||||
|
ArgsUsage: "<recipe>",
|
||||||
|
Description: `
|
||||||
|
Create a new recipe.
|
||||||
|
|
||||||
|
Abra uses the built-in example repository which is available here:
|
||||||
|
|
||||||
|
https://git.coopcloud.tech/coop-cloud/example
|
||||||
|
|
||||||
|
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
|
||||||
|
recipe and domain in the sample environment config).
|
||||||
|
`,
|
||||||
|
Action: func(c *cli.Context) error {
|
||||||
|
recipeName := c.Args().First()
|
||||||
|
|
||||||
|
if recipeName == "" {
|
||||||
|
internal.ShowSubcommandHelpAndError(c, errors.New("no recipe name provided"))
|
||||||
|
}
|
||||||
|
|
||||||
|
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)
|
||||||
return nil
|
|
||||||
}
|
}
|
||||||
|
|
||||||
url := fmt.Sprintf("%s/example.git", config.REPOS_BASE_URL)
|
url := fmt.Sprintf("%s/example.git", config.REPOS_BASE_URL)
|
||||||
if err := git.Clone(directory, url); err != nil {
|
if err := git.Clone(directory, url); err != nil {
|
||||||
return err
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
gitRepo := path.Join(config.APPS_DIR, recipe.Name, ".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)
|
||||||
return nil
|
|
||||||
}
|
}
|
||||||
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, recipe.Name, "README.md"),
|
path.Join(config.RECIPES_DIR, recipeName, "README.md"),
|
||||||
path.Join(config.APPS_DIR, recipe.Name, ".env.sample"),
|
path.Join(config.RECIPES_DIR, recipeName, ".env.sample"),
|
||||||
path.Join(config.APPS_DIR, recipe.Name, ".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)
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
tpl, err := template.ParseFiles(path)
|
tpl, err := template.ParseFiles(path)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
return nil
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// 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
|
|
||||||
}{recipe.Name, "TODO"}); err != nil {
|
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
return nil
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
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 {
|
||||||
recipe.Name, path.Join(config.APPS_DIR, recipe.Name),
|
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/intro/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,26 +1,36 @@
|
||||||
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",
|
||||||
|
Aliases: []string{"r"},
|
||||||
Usage: "Manage recipes",
|
Usage: "Manage recipes",
|
||||||
ArgsUsage: "<recipe>",
|
ArgsUsage: "<recipe>",
|
||||||
Aliases: []string{"r"},
|
|
||||||
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, deploy 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,
|
recipeFetchCommand,
|
||||||
recipeVersionCommand,
|
|
||||||
recipeNewCommand,
|
|
||||||
recipeUpgradeCommand,
|
|
||||||
recipeSyncCommand,
|
|
||||||
recipeLintCommand,
|
recipeLintCommand,
|
||||||
|
recipeListCommand,
|
||||||
|
recipeNewCommand,
|
||||||
|
recipeReleaseCommand,
|
||||||
|
recipeSyncCommand,
|
||||||
|
recipeUpgradeCommand,
|
||||||
|
recipeVersionCommand,
|
||||||
|
recipeResetCommand,
|
||||||
|
recipeDiffCommand,
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
|
@ -0,0 +1,552 @@
|
||||||
|
package recipe
|
||||||
|
|
||||||
|
import (
|
||||||
|
"errors"
|
||||||
|
"fmt"
|
||||||
|
"os"
|
||||||
|
"path"
|
||||||
|
"strconv"
|
||||||
|
"strings"
|
||||||
|
|
||||||
|
"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/recipe"
|
||||||
|
recipePkg "coopcloud.tech/abra/pkg/recipe"
|
||||||
|
"coopcloud.tech/tagcmp"
|
||||||
|
"github.com/AlecAivazis/survey/v2"
|
||||||
|
"github.com/docker/distribution/reference"
|
||||||
|
"github.com/go-git/go-git/v5"
|
||||||
|
"github.com/sirupsen/logrus"
|
||||||
|
"github.com/urfave/cli"
|
||||||
|
)
|
||||||
|
|
||||||
|
var recipeReleaseCommand = cli.Command{
|
||||||
|
Name: "release",
|
||||||
|
Aliases: []string{"rl"},
|
||||||
|
Usage: "Release a new recipe version",
|
||||||
|
ArgsUsage: "<recipe> [<version>]",
|
||||||
|
Description: `
|
||||||
|
Create a new version of a recipe. These versions are then published on the
|
||||||
|
Co-op Cloud recipe catalogue. These versions take the following form:
|
||||||
|
|
||||||
|
a.b.c+x.y.z
|
||||||
|
|
||||||
|
Where the "a.b.c" part is a semantic version determined by the maintainer. The
|
||||||
|
"x.y.z" part is the image tag of the recipe "app" service (the main container
|
||||||
|
which contains the software to be used, by naming convention).
|
||||||
|
|
||||||
|
We maintain a semantic versioning scheme ("a.b.c") alongside the recipe
|
||||||
|
versioning scheme ("x.y.z") in order to maximise the chances that the nature of
|
||||||
|
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
|
||||||
|
major and therefore require intervention while doing the upgrade work.
|
||||||
|
|
||||||
|
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{
|
||||||
|
internal.DebugFlag,
|
||||||
|
internal.NoInputFlag,
|
||||||
|
internal.DryFlag,
|
||||||
|
internal.MajorFlag,
|
||||||
|
internal.MinorFlag,
|
||||||
|
internal.PatchFlag,
|
||||||
|
internal.PublishFlag,
|
||||||
|
internal.OfflineFlag,
|
||||||
|
},
|
||||||
|
Before: internal.SubCommandBefore,
|
||||||
|
BashComplete: autocomplete.RecipeNameComplete,
|
||||||
|
Action: func(c *cli.Context) error {
|
||||||
|
recipe := internal.ValidateRecipe(c)
|
||||||
|
|
||||||
|
imagesTmp, err := getImageVersions(recipe)
|
||||||
|
if err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
mainApp, err := internal.GetMainAppImage(recipe)
|
||||||
|
if err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
mainAppVersion := imagesTmp[mainApp]
|
||||||
|
if mainAppVersion == "" {
|
||||||
|
logrus.Fatalf("main app service version for %s is empty?", recipe.Name)
|
||||||
|
}
|
||||||
|
|
||||||
|
tagString := c.Args().Get(1)
|
||||||
|
if tagString != "" {
|
||||||
|
if _, err := tagcmp.Parse(tagString); err != nil {
|
||||||
|
logrus.Fatalf("cannot parse %s, invalid tag specified?", tagString)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (internal.Major || internal.Minor || internal.Patch) && tagString != "" {
|
||||||
|
logrus.Fatal("cannot specify tag and bump type at the same time")
|
||||||
|
}
|
||||||
|
|
||||||
|
if tagString != "" {
|
||||||
|
if err := createReleaseFromTag(recipe, tagString, mainAppVersion); err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
tags, err := recipe.Tags()
|
||||||
|
if err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if tagString == "" && (!internal.Major && !internal.Minor && !internal.Patch) {
|
||||||
|
var err error
|
||||||
|
tagString, err = getLabelVersion(recipe, false)
|
||||||
|
if err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
isClean, err := gitPkg.IsClean(recipe.Dir())
|
||||||
|
if err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if !isClean {
|
||||||
|
logrus.Infof("%s currently has these unstaged changes 👇", recipe.Name)
|
||||||
|
if err := gitPkg.DiffUnstaged(recipe.Dir()); err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
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 {
|
||||||
|
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
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
// getImageVersions retrieves image versions for a recipe
|
||||||
|
func getImageVersions(recipe recipe.Recipe) (map[string]string, error) {
|
||||||
|
services := make(map[string]string)
|
||||||
|
|
||||||
|
missingTag := false
|
||||||
|
for _, service := range recipe.Config.Services {
|
||||||
|
if service.Image == "" {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
|
||||||
|
img, err := reference.ParseNormalizedNamed(service.Image)
|
||||||
|
if err != nil {
|
||||||
|
return services, err
|
||||||
|
}
|
||||||
|
|
||||||
|
path := reference.Path(img)
|
||||||
|
|
||||||
|
path = formatter.StripTagMeta(path)
|
||||||
|
|
||||||
|
var tag string
|
||||||
|
switch img.(type) {
|
||||||
|
case reference.NamedTagged:
|
||||||
|
tag = img.(reference.NamedTagged).Tag()
|
||||||
|
case reference.Named:
|
||||||
|
if service.Name == "app" {
|
||||||
|
missingTag = true
|
||||||
|
}
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
|
||||||
|
services[path] = tag
|
||||||
|
}
|
||||||
|
|
||||||
|
if missingTag {
|
||||||
|
return services, fmt.Errorf("app service is missing image tag?")
|
||||||
|
}
|
||||||
|
|
||||||
|
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 := addReleaseNotes(recipe, tagString); err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
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
|
||||||
|
func btoi(b bool) int {
|
||||||
|
if b {
|
||||||
|
return 1
|
||||||
|
}
|
||||||
|
|
||||||
|
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
|
||||||
|
}
|
||||||
|
|
||||||
|
// addReleaseNotes checks if the release/next release note exists and moves the
|
||||||
|
// file to release/<tag>.
|
||||||
|
func addReleaseNotes(recipe recipe.Recipe, tag string) error {
|
||||||
|
repoPath := path.Join(config.RECIPES_DIR, recipe.Name)
|
||||||
|
tagReleaseNotePath := path.Join(repoPath, "release", tag)
|
||||||
|
if _, err := os.Stat(tagReleaseNotePath); err == nil {
|
||||||
|
// Release note for current tag already exist exists.
|
||||||
|
return nil
|
||||||
|
} else if !errors.Is(err, os.ErrNotExist) {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
nextReleaseNotePath := path.Join(repoPath, "release", "next")
|
||||||
|
if _, err := os.Stat(nextReleaseNotePath); err == nil {
|
||||||
|
// release/next note exists. Move it to release/<tag>
|
||||||
|
if internal.Dry {
|
||||||
|
logrus.Debugf("dry run: move release note from 'next' to %s", tag)
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
if !internal.NoInput {
|
||||||
|
prompt := &survey.Input{
|
||||||
|
Message: "Use release note in release/next?",
|
||||||
|
}
|
||||||
|
var addReleaseNote bool
|
||||||
|
if err := survey.AskOne(prompt, &addReleaseNote); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if !addReleaseNote {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
}
|
||||||
|
err := os.Rename(nextReleaseNotePath, tagReleaseNotePath)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
err = gitPkg.Add(repoPath, path.Join("release", "next"), internal.Dry)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
err = gitPkg.Add(repoPath, path.Join("release", tag), internal.Dry)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
} else if !errors.Is(err, os.ErrNotExist) {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
// No release note exists for the current release.
|
||||||
|
if internal.NoInput {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
prompt := &survey.Input{
|
||||||
|
Message: "Release Note (leave empty for no release note)",
|
||||||
|
}
|
||||||
|
var releaseNote string
|
||||||
|
if err := survey.AskOne(prompt, &releaseNote); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
if releaseNote == "" {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
err := os.WriteFile(tagReleaseNotePath, []byte(releaseNote), 0o644)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
err = gitPkg.Add(repoPath, path.Join("release", tag), internal.Dry)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
return 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 label (%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 := addReleaseNotes(recipe, tagString); err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := commitRelease(recipe, tagString); err != nil {
|
||||||
|
logrus.Fatalf("failed to commit changes: %s", err.Error())
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := tagRelease(tagString, repo); err != nil {
|
||||||
|
logrus.Fatalf("failed to tag release: %s", err.Error())
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := pushRelease(recipe, tagString); err != nil {
|
||||||
|
logrus.Fatalf("failed to publish new release: %s", err.Error())
|
||||||
|
}
|
||||||
|
|
||||||
|
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
|
||||||
|
}
|
|
@ -0,0 +1,56 @@
|
||||||
|
package recipe
|
||||||
|
|
||||||
|
import (
|
||||||
|
"path"
|
||||||
|
|
||||||
|
"coopcloud.tech/abra/cli/internal"
|
||||||
|
"coopcloud.tech/abra/pkg/autocomplete"
|
||||||
|
"coopcloud.tech/abra/pkg/config"
|
||||||
|
"github.com/go-git/go-git/v5"
|
||||||
|
"github.com/sirupsen/logrus"
|
||||||
|
"github.com/urfave/cli"
|
||||||
|
)
|
||||||
|
|
||||||
|
var recipeResetCommand = cli.Command{
|
||||||
|
Name: "reset",
|
||||||
|
Usage: "Remove all unstaged changes from recipe config",
|
||||||
|
Description: "WARNING, this will delete your changes. Be Careful.",
|
||||||
|
Aliases: []string{"rs"},
|
||||||
|
ArgsUsage: "<recipe>",
|
||||||
|
Flags: []cli.Flag{
|
||||||
|
internal.DebugFlag,
|
||||||
|
internal.NoInputFlag,
|
||||||
|
},
|
||||||
|
Before: internal.SubCommandBefore,
|
||||||
|
BashComplete: autocomplete.RecipeNameComplete,
|
||||||
|
Action: func(c *cli.Context) error {
|
||||||
|
recipeName := c.Args().First()
|
||||||
|
|
||||||
|
if recipeName != "" {
|
||||||
|
internal.ValidateRecipe(c)
|
||||||
|
}
|
||||||
|
|
||||||
|
repoPath := path.Join(config.RECIPES_DIR, recipeName)
|
||||||
|
repo, err := git.PlainOpen(repoPath)
|
||||||
|
if err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
ref, err := repo.Head()
|
||||||
|
if err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
worktree, err := repo.Worktree()
|
||||||
|
if err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
opts := &git.ResetOptions{Commit: ref.Hash(), Mode: git.HardReset}
|
||||||
|
if err := worktree.Reset(opts); err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil
|
||||||
|
},
|
||||||
|
}
|
|
@ -2,62 +2,212 @@ package recipe
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"fmt"
|
"fmt"
|
||||||
|
"path"
|
||||||
|
"strconv"
|
||||||
|
|
||||||
"coopcloud.tech/abra/cli/internal"
|
"coopcloud.tech/abra/cli/internal"
|
||||||
"coopcloud.tech/abra/pkg/client"
|
"coopcloud.tech/abra/pkg/autocomplete"
|
||||||
"github.com/docker/distribution/reference"
|
"coopcloud.tech/abra/pkg/config"
|
||||||
|
gitPkg "coopcloud.tech/abra/pkg/git"
|
||||||
|
"coopcloud.tech/tagcmp"
|
||||||
|
"github.com/AlecAivazis/survey/v2"
|
||||||
|
"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 recipeSyncCommand = &cli.Command{
|
var recipeSyncCommand = cli.Command{
|
||||||
Name: "sync",
|
Name: "sync",
|
||||||
Usage: "Generate new recipe labels",
|
Aliases: []string{"s"},
|
||||||
Aliases: []string{"s"},
|
Usage: "Sync recipe version label",
|
||||||
|
ArgsUsage: "<recipe> [<version>]",
|
||||||
|
Flags: []cli.Flag{
|
||||||
|
internal.DebugFlag,
|
||||||
|
internal.NoInputFlag,
|
||||||
|
internal.DryFlag,
|
||||||
|
internal.MajorFlag,
|
||||||
|
internal.MinorFlag,
|
||||||
|
internal.PatchFlag,
|
||||||
|
},
|
||||||
|
Before: internal.SubCommandBefore,
|
||||||
Description: `
|
Description: `
|
||||||
This command will generate labels for each service which correspond to the
|
Generate labels for the main recipe service (i.e. by convention, the service
|
||||||
following format:
|
named "app") which corresponds to the following format:
|
||||||
|
|
||||||
coop-cloud.${STACK_NAME}.${SERVICE_NAME}.version=${IMAGE_TAG}-${IMAGE_DIGEST}
|
coop-cloud.${STACK_NAME}.version=<version>
|
||||||
|
|
||||||
The <recipe> configuration will be updated on the local file system. These
|
Where <version> can be specifed on the command-line or Abra can attempt to
|
||||||
labels are consumed by abra in other command invocations and used to determine
|
auto-generate it for you. The <recipe> configuration will be updated on the
|
||||||
the versioning metadata of up-and-running containers are.
|
local file system.
|
||||||
`,
|
`,
|
||||||
ArgsUsage: "<recipe>",
|
BashComplete: autocomplete.RecipeNameComplete,
|
||||||
Action: func(c *cli.Context) error {
|
Action: func(c *cli.Context) error {
|
||||||
recipe := internal.ValidateRecipe(c)
|
recipe := internal.ValidateRecipe(c)
|
||||||
|
|
||||||
hasAppService := false
|
mainApp, err := internal.GetMainAppImage(recipe)
|
||||||
for _, service := range recipe.Config.Services {
|
if err != nil {
|
||||||
if service.Name == "app" {
|
logrus.Fatal(err)
|
||||||
hasAppService = true
|
}
|
||||||
|
|
||||||
|
imagesTmp, err := getImageVersions(recipe)
|
||||||
|
if err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
mainAppVersion := imagesTmp[mainApp]
|
||||||
|
|
||||||
|
tags, err := recipe.Tags()
|
||||||
|
if err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
nextTag := c.Args().Get(1)
|
||||||
|
if len(tags) == 0 && nextTag == "" {
|
||||||
|
logrus.Warnf("no git tags found for %s", recipe.Name)
|
||||||
|
if internal.NoInput {
|
||||||
|
logrus.Fatalf("unable to continue, input required for initial version")
|
||||||
|
}
|
||||||
|
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
|
||||||
|
edPrompt := &survey.Select{
|
||||||
|
Message: "which version do you want to begin with?",
|
||||||
|
Options: []string{"0.1.0", "1.0.0"},
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := survey.AskOne(edPrompt, &chosenVersion); err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
nextTag = fmt.Sprintf("%s+%s", chosenVersion, mainAppVersion)
|
||||||
|
}
|
||||||
|
|
||||||
|
if nextTag == "" && (!internal.Major && !internal.Minor && !internal.Patch) {
|
||||||
|
latestRelease := tags[len(tags)-1]
|
||||||
|
if err := internal.PromptBumpType("", latestRelease); err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if !hasAppService {
|
if nextTag == "" {
|
||||||
logrus.Fatal(fmt.Sprintf("no 'app' service defined in '%s'", recipe.Name))
|
recipeDir := path.Join(config.RECIPES_DIR, recipe.Name)
|
||||||
|
repo, err := git.PlainOpen(recipeDir)
|
||||||
|
if err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
var lastGitTag tagcmp.Tag
|
||||||
|
iter, err := repo.Tags()
|
||||||
|
if err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := iter.ForEach(func(ref *plumbing.Reference) error {
|
||||||
|
obj, err := repo.TagObject(ref.Hash())
|
||||||
|
if err != nil {
|
||||||
|
logrus.Fatal("Tag at commit ", ref.Hash(), " is unannotated or otherwise broken. Please fix it.")
|
||||||
|
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)
|
||||||
|
}
|
||||||
|
|
||||||
|
// 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 version flag: --major, --minor or --patch")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
newTag := lastGitTag
|
||||||
|
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
|
||||||
|
logrus.Debugf("choosing %s as new version for %s", newTag.String(), recipe.Name)
|
||||||
|
nextTag = newTag.String()
|
||||||
}
|
}
|
||||||
|
|
||||||
for _, service := range recipe.Config.Services {
|
if _, err := tagcmp.Parse(nextTag); err != nil {
|
||||||
img, err := reference.ParseNormalizedNamed(service.Image)
|
logrus.Fatalf("invalid version %s specified", nextTag)
|
||||||
if err != nil {
|
}
|
||||||
logrus.Fatal(err)
|
|
||||||
}
|
|
||||||
logrus.Debugf("detected image '%s' for service '%s'", img, service.Name)
|
|
||||||
|
|
||||||
digest, err := client.GetTagDigest(img)
|
mainService := "app"
|
||||||
if err != nil {
|
label := fmt.Sprintf("coop-cloud.${STACK_NAME}.version=%s", nextTag)
|
||||||
|
if !internal.Dry {
|
||||||
|
if err := recipe.UpdateLabel("compose.y*ml", mainService, label); err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
logrus.Debugf("retrieved digest '%s' for '%s'", digest, img)
|
} else {
|
||||||
|
logrus.Infof("dry run: not syncing label %s for recipe %s", nextTag, recipe.Name)
|
||||||
|
}
|
||||||
|
|
||||||
tag := img.(reference.NamedTagged).Tag()
|
isClean, err := gitPkg.IsClean(recipe.Dir())
|
||||||
label := fmt.Sprintf("coop-cloud.${STACK_NAME}.%s.version=%s-%s", service.Name, tag, digest)
|
if err != nil {
|
||||||
if err := recipe.UpdateLabel(service.Name, label); err != nil {
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
if !isClean {
|
||||||
|
logrus.Infof("%s currently has these unstaged changes 👇", recipe.Name)
|
||||||
|
if err := gitPkg.DiffUnstaged(recipe.Dir()); err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
logrus.Debugf("added label '%s' to service '%s'", label, service.Name)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
|
|
|
@ -1,81 +1,182 @@
|
||||||
package recipe
|
package recipe
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"bufio"
|
||||||
|
"encoding/json"
|
||||||
"fmt"
|
"fmt"
|
||||||
|
"os"
|
||||||
|
"path"
|
||||||
"sort"
|
"sort"
|
||||||
"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/formatter"
|
||||||
|
gitPkg "coopcloud.tech/abra/pkg/git"
|
||||||
|
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"
|
||||||
)
|
)
|
||||||
|
|
||||||
var recipeUpgradeCommand = &cli.Command{
|
type imgPin struct {
|
||||||
|
image string
|
||||||
|
version tagcmp.Tag
|
||||||
|
}
|
||||||
|
|
||||||
|
// anUpgrade represents a single service upgrade (as within a recipe), and the list of tags that it can be upgraded to,
|
||||||
|
// for serialization purposes.
|
||||||
|
type anUpgrade struct {
|
||||||
|
Service string `json:"service"`
|
||||||
|
Image string `json:"image"`
|
||||||
|
Tag string `json:"tag"`
|
||||||
|
UpgradeTags []string `json:"upgrades"`
|
||||||
|
}
|
||||||
|
|
||||||
|
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
|
Parse all image tags within the given <recipe> configuration and prompt with
|
||||||
<recipe> configuration and prompt with more recent tags to upgrade to. It will
|
more recent tags to upgrade to. It will update the relevant compose file tags
|
||||||
update the relevant compose file tags on the local file system.
|
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.
|
||||||
|
|
||||||
This is step 1 of upgrading a recipe. Step 2 is running "abra recipe sync
|
The command is interactive and will show a select input which allows you to
|
||||||
<recipe>".
|
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>",
|
ArgsUsage: "<recipe>",
|
||||||
|
Flags: []cli.Flag{
|
||||||
|
internal.DebugFlag,
|
||||||
|
internal.NoInputFlag,
|
||||||
|
internal.PatchFlag,
|
||||||
|
internal.MinorFlag,
|
||||||
|
internal.MajorFlag,
|
||||||
|
internal.MachineReadableFlag,
|
||||||
|
internal.AllTagsFlag,
|
||||||
|
},
|
||||||
|
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)
|
||||||
|
|
||||||
for _, service := range recipe.Config.Services {
|
if err := recipePkg.EnsureIsClean(recipe.Name); err != nil {
|
||||||
catlVersions, err := catalogue.VersionsOfService(recipe.Name, service.Name)
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := recipePkg.EnsureExists(recipe.Name); err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := recipePkg.EnsureUpToDate(recipe.Name); err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := recipePkg.EnsureLatest(recipe.Name); err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
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 internal.MachineReadable {
|
||||||
|
// -m implies -n in this case
|
||||||
|
internal.NoInput = true
|
||||||
|
}
|
||||||
|
|
||||||
|
upgradeList := make(map[string]anUpgrade)
|
||||||
|
|
||||||
|
// check for versions file and load pinned versions
|
||||||
|
versionsPresent := false
|
||||||
|
recipeDir := path.Join(config.RECIPES_DIR, recipe.Name)
|
||||||
|
versionsPath := path.Join(recipeDir, "versions")
|
||||||
|
var servicePins = make(map[string]imgPin)
|
||||||
|
if _, err := os.Stat(versionsPath); err == nil {
|
||||||
|
logrus.Debugf("found versions file for %s", recipe.Name)
|
||||||
|
file, err := os.Open(versionsPath)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
logrus.Debugf("read '%s' from the recipe catalogue for '%s'", catlVersions, service.Name)
|
scanner := bufio.NewScanner(file)
|
||||||
|
for scanner.Scan() {
|
||||||
|
line := scanner.Text()
|
||||||
|
splitLine := strings.Split(line, " ")
|
||||||
|
if splitLine[0] != "pin" || len(splitLine) != 3 {
|
||||||
|
logrus.Fatalf("malformed version pin specification: %s", line)
|
||||||
|
}
|
||||||
|
pinSlice := strings.Split(splitLine[2], ":")
|
||||||
|
pinTag, err := tagcmp.Parse(pinSlice[1])
|
||||||
|
if err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
pin := imgPin{
|
||||||
|
image: pinSlice[0],
|
||||||
|
version: pinTag,
|
||||||
|
}
|
||||||
|
servicePins[splitLine[1]] = pin
|
||||||
|
}
|
||||||
|
if err := scanner.Err(); err != nil {
|
||||||
|
logrus.Error(err)
|
||||||
|
}
|
||||||
|
versionsPresent = true
|
||||||
|
} else {
|
||||||
|
logrus.Debugf("did not find versions file for %s", recipe.Name)
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, service := range recipe.Config.Services {
|
||||||
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]
|
|
||||||
}
|
|
||||||
|
|
||||||
semverLikeTag := true
|
switch img.(type) {
|
||||||
if !tagcmp.IsParsable(img.(reference.NamedTagged).Tag()) {
|
case reference.NamedTagged:
|
||||||
logrus.Debugf("'%s' not considered semver-like", img.(reference.NamedTagged).Tag())
|
if !tagcmp.IsParsable(img.(reference.NamedTagged).Tag()) {
|
||||||
semverLikeTag = false
|
logrus.Debugf("%s not considered semver-like", img.(reference.NamedTagged).Tag())
|
||||||
|
}
|
||||||
|
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
|
||||||
}
|
}
|
||||||
|
@ -85,16 +186,21 @@ This is step 1 of upgrading a recipe. Step 2 is running "abra recipe sync
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
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, internal.Offline)
|
||||||
|
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 {
|
||||||
|
@ -107,32 +213,141 @@ This is step 1 of upgrading a recipe. Step 2 is running "abra recipe sync
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
logrus.Debugf("detected compatible upgradable tags '%s' for '%s'", compatibleStrings, service.Name)
|
logrus.Debugf("detected compatible upgradable tags %s for %s", compatibleStrings, service.Name)
|
||||||
|
|
||||||
msg := fmt.Sprintf("upgrade to which tag? (service: %s, tag: %s)", service.Name, tag)
|
|
||||||
if !tagcmp.IsParsable(img.(reference.NamedTagged).Tag()) {
|
|
||||||
tag := img.(reference.NamedTagged).Tag()
|
|
||||||
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)
|
|
||||||
compatibleStrings = []string{}
|
|
||||||
for _, regVersion := range regVersions {
|
|
||||||
compatibleStrings = append(compatibleStrings, regVersion.Name)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
var upgradeTag string
|
var upgradeTag string
|
||||||
prompt := &survey.Select{
|
_, ok := servicePins[service.Name]
|
||||||
Message: msg,
|
if versionsPresent && ok {
|
||||||
Options: compatibleStrings,
|
pinnedTag := servicePins[service.Name].version
|
||||||
|
if tag.IsLessThan(pinnedTag) {
|
||||||
|
pinnedTagString := pinnedTag.String()
|
||||||
|
contains := false
|
||||||
|
for _, v := range compatible {
|
||||||
|
if pinnedTag.IsUpgradeCompatible(v) {
|
||||||
|
contains = true
|
||||||
|
upgradeTag = v.String()
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if contains {
|
||||||
|
logrus.Infof("upgrading service %s from %s to %s (pinned tag: %s)", service.Name, tag.String(), upgradeTag, pinnedTagString)
|
||||||
|
} else {
|
||||||
|
logrus.Infof("service %s, image %s pinned to %s, no compatible upgrade found", service.Name, servicePins[service.Name].image, pinnedTagString)
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
} 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())
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
if bumpType != 0 {
|
||||||
|
for _, upTag := range compatible {
|
||||||
|
upElement, err := tag.UpgradeDelta(upTag)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
delta := upElement.UpgradeType()
|
||||||
|
if delta <= bumpType {
|
||||||
|
upgradeTag = upTag.String()
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
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)
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
msg := fmt.Sprintf("upgrade to which tag? (service: %s, image: %s, tag: %s)", service.Name, image, tag)
|
||||||
|
if !tagcmp.IsParsable(img.(reference.NamedTagged).Tag()) || internal.AllTags {
|
||||||
|
tag := img.(reference.NamedTagged).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)
|
||||||
|
compatibleStrings = []string{"skip"}
|
||||||
|
for _, regVersion := range regVersions {
|
||||||
|
compatibleStrings = append(compatibleStrings, regVersion)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// there is always at least the item "skip" in compatibleStrings (a list of
|
||||||
|
// possible upgradable tags) and at least one other tag.
|
||||||
|
upgradableTags := compatibleStrings[1:]
|
||||||
|
upgrade := anUpgrade{
|
||||||
|
Service: service.Name,
|
||||||
|
Image: image,
|
||||||
|
Tag: tag.String(),
|
||||||
|
UpgradeTags: make([]string, len(upgradableTags)),
|
||||||
|
}
|
||||||
|
|
||||||
|
for n, s := range upgradableTags {
|
||||||
|
var sb strings.Builder
|
||||||
|
if _, err := sb.WriteString(s); err != nil {
|
||||||
|
}
|
||||||
|
upgrade.UpgradeTags[n] = sb.String()
|
||||||
|
}
|
||||||
|
|
||||||
|
upgradeList[upgrade.Service] = upgrade
|
||||||
|
|
||||||
|
if internal.NoInput {
|
||||||
|
upgradeTag = "skip"
|
||||||
|
} else {
|
||||||
|
prompt := &survey.Select{
|
||||||
|
Message: msg,
|
||||||
|
Help: "enter / return to confirm, choose 'skip' to not upgrade this tag, vim mode is enabled",
|
||||||
|
VimMode: true,
|
||||||
|
Options: compatibleStrings,
|
||||||
|
}
|
||||||
|
if err := survey.AskOne(prompt, &upgradeTag); err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
if err := survey.AskOne(prompt, &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 {
|
||||||
|
if !internal.NoInput {
|
||||||
|
logrus.Warnf("not upgrading %s, skipping as requested", image)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if internal.NoInput {
|
||||||
|
if internal.MachineReadable {
|
||||||
|
jsonstring, err := json.Marshal(upgradeList)
|
||||||
|
if err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
fmt.Println(string(jsonstring))
|
||||||
|
|
||||||
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
if err := recipe.UpdateTag(image, upgradeTag); err != nil {
|
for _, upgrade := range upgradeList {
|
||||||
|
logrus.Infof("can upgrade service: %s, image: %s, tag: %s ::\n", upgrade.Service, upgrade.Image, upgrade.Tag)
|
||||||
|
for _, utag := range upgrade.UpgradeTags {
|
||||||
|
logrus.Infof(" %s\n", utag)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
isClean, err := gitPkg.IsClean(recipeDir)
|
||||||
|
if err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
if !isClean {
|
||||||
|
logrus.Infof("%s currently has these unstaged changes 👇", recipe.Name)
|
||||||
|
if err := gitPkg.DiffUnstaged(recipeDir); err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
logrus.Debugf("tag updated from '%s' to '%s' for '%s'", image, upgradeTag, recipe.Name)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
|
|
|
@ -1,44 +1,87 @@
|
||||||
package recipe
|
package recipe
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"coopcloud.tech/abra/cli/formatter"
|
"fmt"
|
||||||
|
"sort"
|
||||||
|
|
||||||
"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/olekukonko/tablewriter"
|
||||||
"github.com/sirupsen/logrus"
|
"github.com/sirupsen/logrus"
|
||||||
"github.com/urfave/cli/v2"
|
"github.com/urfave/cli"
|
||||||
)
|
)
|
||||||
|
|
||||||
var recipeVersionCommand = &cli.Command{
|
func sortServiceByName(versions [][]string) func(i, j int) bool {
|
||||||
Name: "versions",
|
return func(i, j int) bool {
|
||||||
Usage: "List recipe versions",
|
// NOTE(d1): corresponds to the `tableCol` definition below
|
||||||
Aliases: []string{"v"},
|
if versions[i][1] == "app" {
|
||||||
ArgsUsage: "<recipe>",
|
return true
|
||||||
|
}
|
||||||
|
return versions[i][1] < versions[j][1]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
var recipeVersionCommand = cli.Command{
|
||||||
|
Name: "versions",
|
||||||
|
Aliases: []string{"v"},
|
||||||
|
Usage: "List recipe versions",
|
||||||
|
ArgsUsage: "<recipe>",
|
||||||
|
Description: "Versions are read from the recipe catalogue.",
|
||||||
|
Flags: []cli.Flag{
|
||||||
|
internal.DebugFlag,
|
||||||
|
internal.OfflineFlag,
|
||||||
|
internal.NoInputFlag,
|
||||||
|
internal.MachineReadableFlag,
|
||||||
|
},
|
||||||
|
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)
|
||||||
|
|
||||||
catalogue, err := catalogue.ReadRecipeCatalogue()
|
catl, err := recipePkg.ReadRecipeCatalogue(internal.Offline)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
recipeMeta, ok := catalogue[recipe.Name]
|
recipeMeta, ok := catl[recipe.Name]
|
||||||
if !ok {
|
if !ok {
|
||||||
logrus.Fatalf("'%s' recipe doesn't exist?", recipe.Name)
|
logrus.Fatalf("%s is not published on the catalogue?", recipe.Name)
|
||||||
}
|
}
|
||||||
|
|
||||||
tableCol := []string{"Version", "Service", "Image", "Tag", "Digest"}
|
if len(recipeMeta.Versions) == 0 {
|
||||||
table := formatter.CreateTable(tableCol)
|
logrus.Fatalf("%s has no catalogue published versions?", recipe.Name)
|
||||||
|
}
|
||||||
|
|
||||||
for _, serviceVersion := range recipeMeta.Versions {
|
tableCols := []string{"version", "service", "image", "tag"}
|
||||||
for tag, meta := range serviceVersion {
|
aggregated_table := formatter.CreateTable(tableCols)
|
||||||
|
for i := len(recipeMeta.Versions) - 1; i >= 0; i-- {
|
||||||
|
table := formatter.CreateTable(tableCols)
|
||||||
|
for version, meta := range recipeMeta.Versions[i] {
|
||||||
|
var versions [][]string
|
||||||
for service, serviceMeta := range meta {
|
for service, serviceMeta := range meta {
|
||||||
table.Append([]string{tag, service, serviceMeta.Image, serviceMeta.Tag, serviceMeta.Digest})
|
versions = append(versions, []string{version, service, serviceMeta.Image, serviceMeta.Tag})
|
||||||
|
}
|
||||||
|
|
||||||
|
sort.Slice(versions, sortServiceByName(versions))
|
||||||
|
|
||||||
|
for _, version := range versions {
|
||||||
|
table.Append(version)
|
||||||
|
aggregated_table.Append(version)
|
||||||
|
}
|
||||||
|
|
||||||
|
if !internal.MachineReadable {
|
||||||
|
table.SetAutoMergeCellsByColumnIndex([]int{0})
|
||||||
|
table.SetAlignment(tablewriter.ALIGN_LEFT)
|
||||||
|
table.Render()
|
||||||
|
fmt.Println()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
if internal.MachineReadable {
|
||||||
table.SetAutoMergeCells(true)
|
aggregated_table.JSONRender()
|
||||||
table.Render()
|
}
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
},
|
},
|
||||||
|
|
|
@ -1,90 +1,180 @@
|
||||||
package server
|
package server
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"context"
|
"errors"
|
||||||
"os/user"
|
"os"
|
||||||
|
"path/filepath"
|
||||||
|
|
||||||
"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"
|
||||||
|
contextPkg "coopcloud.tech/abra/pkg/context"
|
||||||
|
"coopcloud.tech/abra/pkg/dns"
|
||||||
|
"coopcloud.tech/abra/pkg/server"
|
||||||
|
sshPkg "coopcloud.tech/abra/pkg/ssh"
|
||||||
"github.com/sirupsen/logrus"
|
"github.com/sirupsen/logrus"
|
||||||
"github.com/urfave/cli/v2"
|
"github.com/urfave/cli"
|
||||||
)
|
)
|
||||||
|
|
||||||
var serverAddCommand = &cli.Command{
|
var local bool
|
||||||
Name: "add",
|
var localFlag = &cli.BoolFlag{
|
||||||
Usage: "Add a new server",
|
Name: "local, l",
|
||||||
|
Usage: "Use local server",
|
||||||
|
Destination: &local,
|
||||||
|
}
|
||||||
|
|
||||||
|
func cleanUp(domainName string) {
|
||||||
|
if domainName != "default" {
|
||||||
|
logrus.Infof("cleaning up context for %s", domainName)
|
||||||
|
if err := client.DeleteContext(domainName); err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
logrus.Infof("attempting to clean up server directory for %s", domainName)
|
||||||
|
|
||||||
|
serverDir := filepath.Join(config.SERVERS_DIR, domainName)
|
||||||
|
files, err := config.GetAllFilesInDirectory(serverDir)
|
||||||
|
if err != nil {
|
||||||
|
logrus.Fatalf("unable to list files in %s: %s", serverDir, err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if len(files) > 0 {
|
||||||
|
logrus.Warnf("aborting clean up of %s because it is not empty", serverDir)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := os.RemoveAll(serverDir); err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// newContext creates a new internal Docker context for a server. This is how
|
||||||
|
// Docker manages SSH connection details. These are stored to disk in
|
||||||
|
// ~/.docker. Abra can manage this completely for the user, so it's an
|
||||||
|
// implementation detail.
|
||||||
|
func newContext(c *cli.Context, domainName, username, port string) error {
|
||||||
|
store := contextPkg.NewDefaultDockerContextStore()
|
||||||
|
contexts, err := store.Store.List()
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, context := range contexts {
|
||||||
|
if context.Name == domainName {
|
||||||
|
logrus.Debugf("context for %s already exists", domainName)
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
logrus.Debugf("creating context with domain %s, username %s and port %s", domainName, username, port)
|
||||||
|
|
||||||
|
if err := client.CreateContext(domainName, username, port); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// createServerDir creates the ~/.abra/servers/... directory for a new server.
|
||||||
|
func createServerDir(domainName string) error {
|
||||||
|
if err := server.CreateServerDir(domainName); err != nil {
|
||||||
|
if !os.IsExist(err) {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
logrus.Debugf("server dir for %s already created", domainName)
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
var serverAddCommand = cli.Command{
|
||||||
|
Name: "add",
|
||||||
|
Aliases: []string{"a"},
|
||||||
|
Usage: "Add a server to your configuration",
|
||||||
Description: `
|
Description: `
|
||||||
This command adds a new server that abra will communicate with, to deploy apps.
|
Add a new server to your configuration so that it can be managed by Abra.
|
||||||
|
|
||||||
The <domain> argument must be a publicy accessible domain name which points to
|
Abra uses the SSH command-line to discover connection details for your server.
|
||||||
your server. You should have SSH access to this server, Abra will assume port
|
It is advised to configure an entry per-host in your ~/.ssh/config for each
|
||||||
22 and will use your current system username to make an initial connection. You
|
server. For example:
|
||||||
can use the <user> and <port> arguments to adjust this.
|
|
||||||
|
|
||||||
For example:
|
Host example.com
|
||||||
|
Hostname example.com
|
||||||
|
User exampleUser
|
||||||
|
Port 12345
|
||||||
|
IdentityFile ~/.ssh/example@somewhere
|
||||||
|
|
||||||
abra server add varia.zone 12345 glodemodem
|
Abra can then load SSH connection details from this configuratiion with:
|
||||||
|
|
||||||
Abra will construct the following SSH connection string then:
|
abra server add example.com
|
||||||
|
|
||||||
ssh://globemodem@varia.zone:12345
|
|
||||||
|
|
||||||
All communication between Abra and the server will use this SSH connection.
|
|
||||||
|
|
||||||
|
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
|
||||||
|
Co-op Cloud config located on the server itself, and not on your local
|
||||||
|
developer machine.
|
||||||
`,
|
`,
|
||||||
Aliases: []string{"a"},
|
Flags: []cli.Flag{
|
||||||
ArgsUsage: "<domain> [<user>] [<port>]",
|
internal.DebugFlag,
|
||||||
|
internal.NoInputFlag,
|
||||||
|
localFlag,
|
||||||
|
},
|
||||||
|
Before: internal.SubCommandBefore,
|
||||||
|
ArgsUsage: "<domain>",
|
||||||
Action: func(c *cli.Context) error {
|
Action: func(c *cli.Context) error {
|
||||||
domainName := internal.ValidateDomain(c)
|
if len(c.Args()) > 0 && local || !internal.ValidateSubCmdFlags(c) {
|
||||||
|
err := errors.New("cannot use <domain> and --local together")
|
||||||
|
internal.ShowSubcommandHelpAndError(c, err)
|
||||||
|
}
|
||||||
|
|
||||||
var username string
|
var domainName string
|
||||||
var port string
|
if local {
|
||||||
|
domainName = "default"
|
||||||
|
} else {
|
||||||
|
domainName = internal.ValidateDomain(c)
|
||||||
|
}
|
||||||
|
|
||||||
username = c.Args().Get(1)
|
if local {
|
||||||
if username == "" {
|
if err := createServerDir(domainName); err != nil {
|
||||||
systemUser, err := user.Current()
|
|
||||||
if err != nil {
|
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
username = systemUser.Username
|
|
||||||
}
|
|
||||||
|
|
||||||
port = c.Args().Get(2)
|
logrus.Infof("attempting to create client for %s", domainName)
|
||||||
if port == "" {
|
if _, err := client.New(domainName); err != nil {
|
||||||
port = "22"
|
cleanUp(domainName)
|
||||||
}
|
logrus.Fatal(err)
|
||||||
|
|
||||||
store := client.NewDefaultDockerContextStore()
|
|
||||||
contexts, err := store.Store.List()
|
|
||||||
if err != nil {
|
|
||||||
logrus.Fatal(err)
|
|
||||||
}
|
|
||||||
|
|
||||||
for _, context := range contexts {
|
|
||||||
if context.Name == domainName {
|
|
||||||
logrus.Fatalf("server at '%s' already exists?", domainName)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
logrus.Info("local server added")
|
||||||
|
|
||||||
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
logrus.Debugf("creating context with domain '%s', username '%s' and port '%s'", domainName, username, port)
|
if _, err := dns.EnsureIPv4(domainName); err != nil {
|
||||||
|
|
||||||
if err := client.CreateContext(domainName, username, port); err != nil {
|
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
ctx := context.Background()
|
if err := createServerDir(domainName); err != nil {
|
||||||
cl, err := client.New(domainName)
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
hostConfig, err := sshPkg.GetHostConfig(domainName)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
if _, err := cl.Info(ctx); err != nil {
|
if err := newContext(c, domainName, hostConfig.User, hostConfig.Port); err != nil {
|
||||||
logrus.Fatalf("unable to make a connection to '%s'?", domainName)
|
logrus.Fatal(err)
|
||||||
logrus.Debug(err)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
logrus.Debugf("remote connection to '%s' is definitely up", domainName)
|
logrus.Infof("attempting to create client for %s", domainName)
|
||||||
logrus.Infof("server at '%s' has been added", domainName)
|
if _, err := client.New(domainName); err != nil {
|
||||||
|
cleanUp(domainName)
|
||||||
|
logrus.Debugf("failed to construct client for %s, saw %s", domainName, err.Error())
|
||||||
|
logrus.Fatal(sshPkg.Fatal(domainName, err))
|
||||||
|
}
|
||||||
|
|
||||||
|
logrus.Infof("%s added", domainName)
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
},
|
},
|
||||||
|
|
|
@ -1,78 +0,0 @@
|
||||||
package server
|
|
||||||
|
|
||||||
import (
|
|
||||||
"context"
|
|
||||||
"fmt"
|
|
||||||
"net"
|
|
||||||
"time"
|
|
||||||
|
|
||||||
"coopcloud.tech/abra/cli/internal"
|
|
||||||
"coopcloud.tech/abra/pkg/client"
|
|
||||||
"github.com/docker/docker/api/types"
|
|
||||||
"github.com/docker/docker/api/types/swarm"
|
|
||||||
"github.com/sirupsen/logrus"
|
|
||||||
"github.com/urfave/cli/v2"
|
|
||||||
)
|
|
||||||
|
|
||||||
var serverInitCommand = &cli.Command{
|
|
||||||
Name: "init",
|
|
||||||
Usage: "Initialise server for deploying apps",
|
|
||||||
Aliases: []string{"i"},
|
|
||||||
HideHelp: true,
|
|
||||||
ArgsUsage: "<domain>",
|
|
||||||
Description: `
|
|
||||||
Initialise swarm mode on the target <domain>.
|
|
||||||
|
|
||||||
This initialisation explicitly chooses the "single host swarm" mode which uses
|
|
||||||
the default IPv4 address as the advertising address. This can be re-configured
|
|
||||||
later for more advanced use cases.
|
|
||||||
`,
|
|
||||||
Action: func(c *cli.Context) error {
|
|
||||||
domainName := internal.ValidateDomain(c)
|
|
||||||
|
|
||||||
cl, err := client.New(domainName)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
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),
|
|
||||||
}
|
|
||||||
// comrade librehosters DNS resolver https://snopyta.org/service/dns/
|
|
||||||
return d.DialContext(ctx, "udp", "95.216.24.230:53")
|
|
||||||
},
|
|
||||||
}
|
|
||||||
logrus.Debugf("created DNS resolver via 95.216.24.230")
|
|
||||||
|
|
||||||
ctx := context.Background()
|
|
||||||
ips, err := resolver.LookupIPAddr(ctx, domainName)
|
|
||||||
if err != nil {
|
|
||||||
logrus.Fatal(err)
|
|
||||||
}
|
|
||||||
|
|
||||||
if len(ips) == 0 {
|
|
||||||
return fmt.Errorf("unable to retrieve ipv4 address for %s", domainName)
|
|
||||||
}
|
|
||||||
ipv4 := ips[0].IP.To4().String()
|
|
||||||
|
|
||||||
initReq := swarm.InitRequest{
|
|
||||||
ListenAddr: "0.0.0.0:2377",
|
|
||||||
AdvertiseAddr: ipv4,
|
|
||||||
}
|
|
||||||
if _, err := cl.SwarmInit(ctx, initReq); err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
logrus.Debugf("initialised swarm on '%s'", domainName)
|
|
||||||
|
|
||||||
netOpts := types.NetworkCreate{Driver: "overlay", Scope: "swarm"}
|
|
||||||
if _, err := cl.NetworkCreate(ctx, "proxy", netOpts); err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
logrus.Debug("swarm overlay network 'proxy' created")
|
|
||||||
|
|
||||||
return nil
|
|
||||||
},
|
|
||||||
}
|
|
|
@ -3,29 +3,43 @@ package server
|
||||||
import (
|
import (
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
"coopcloud.tech/abra/cli/formatter"
|
"coopcloud.tech/abra/cli/internal"
|
||||||
"coopcloud.tech/abra/pkg/client"
|
|
||||||
"coopcloud.tech/abra/pkg/config"
|
"coopcloud.tech/abra/pkg/config"
|
||||||
|
"coopcloud.tech/abra/pkg/context"
|
||||||
|
"coopcloud.tech/abra/pkg/formatter"
|
||||||
|
"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 problemsFilter bool
|
||||||
Name: "list",
|
|
||||||
Aliases: []string{"ls"},
|
var problemsFilterFlag = &cli.BoolFlag{
|
||||||
Usage: "List managed servers",
|
Name: "problems, p",
|
||||||
ArgsUsage: " ",
|
Usage: "Show only servers with potential connection problems",
|
||||||
HideHelp: true,
|
Destination: &problemsFilter,
|
||||||
|
}
|
||||||
|
|
||||||
|
var serverListCommand = cli.Command{
|
||||||
|
Name: "list",
|
||||||
|
Aliases: []string{"ls"},
|
||||||
|
Usage: "List managed servers",
|
||||||
|
Flags: []cli.Flag{
|
||||||
|
problemsFilterFlag,
|
||||||
|
internal.DebugFlag,
|
||||||
|
internal.MachineReadableFlag,
|
||||||
|
internal.OfflineFlag,
|
||||||
|
},
|
||||||
|
Before: internal.SubCommandBefore,
|
||||||
Action: func(c *cli.Context) error {
|
Action: func(c *cli.Context) error {
|
||||||
dockerContextStore := client.NewDefaultDockerContextStore()
|
dockerContextStore := context.NewDefaultDockerContextStore()
|
||||||
contexts, err := dockerContextStore.Store.List()
|
contexts, err := dockerContextStore.Store.List()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
tableColumns := []string{"Name", "Connection"}
|
tableColumns := []string{"name", "host", "user", "port"}
|
||||||
table := formatter.CreateTable(tableColumns)
|
table := formatter.CreateTable(tableColumns)
|
||||||
defer table.Render()
|
|
||||||
|
|
||||||
serverNames, err := config.ReadServerNames()
|
serverNames, err := config.ReadServerNames()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
@ -35,19 +49,60 @@ var serverListCommand = &cli.Command{
|
||||||
for _, serverName := range serverNames {
|
for _, serverName := range serverNames {
|
||||||
var row []string
|
var row []string
|
||||||
for _, ctx := range contexts {
|
for _, ctx := range contexts {
|
||||||
endpoint, err := client.GetContextEndpoint(ctx)
|
endpoint, err := context.GetContextEndpoint(ctx)
|
||||||
if err != nil && strings.Contains(err.Error(), "does not exist") {
|
if err != nil && strings.Contains(err.Error(), "does not exist") {
|
||||||
// No local context found, we can continue safely
|
// No local context found, we can continue safely
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
|
||||||
if ctx.Name == serverName {
|
if ctx.Name == serverName {
|
||||||
row = []string{serverName, endpoint}
|
sp, err := ssh.ParseURL(endpoint)
|
||||||
|
if err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if sp.Host == "" {
|
||||||
|
sp.Host = "unknown"
|
||||||
|
}
|
||||||
|
if sp.User == "" {
|
||||||
|
sp.User = "unknown"
|
||||||
|
}
|
||||||
|
if sp.Port == "" {
|
||||||
|
sp.Port = "unknown"
|
||||||
|
}
|
||||||
|
|
||||||
|
row = []string{serverName, sp.Host, sp.User, sp.Port}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if len(row) == 0 {
|
if len(row) == 0 {
|
||||||
row = []string{serverName, "UNKNOWN"}
|
if serverName == "default" {
|
||||||
|
row = []string{serverName, "local", "n/a", "n/a"}
|
||||||
|
} else {
|
||||||
|
row = []string{serverName, "unknown", "unknown", "unknown"}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if problemsFilter {
|
||||||
|
for _, val := range row {
|
||||||
|
if val == "unknown" {
|
||||||
|
table.Append(row)
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
table.Append(row)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if internal.MachineReadable {
|
||||||
|
table.JSONRender()
|
||||||
|
} else {
|
||||||
|
if problemsFilter && table.NumLines() == 0 {
|
||||||
|
logrus.Info("all servers wired up correctly 👏")
|
||||||
|
} else {
|
||||||
|
table.Render()
|
||||||
}
|
}
|
||||||
table.Append(row)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
|
|
|
@ -1,264 +0,0 @@
|
||||||
package server
|
|
||||||
|
|
||||||
import (
|
|
||||||
"bytes"
|
|
||||||
"context"
|
|
||||||
"encoding/json"
|
|
||||||
"errors"
|
|
||||||
"fmt"
|
|
||||||
"io/ioutil"
|
|
||||||
"net/http"
|
|
||||||
"time"
|
|
||||||
|
|
||||||
"coopcloud.tech/abra/cli/formatter"
|
|
||||||
"coopcloud.tech/abra/cli/internal"
|
|
||||||
"github.com/hetznercloud/hcloud-go/hcloud"
|
|
||||||
"github.com/sirupsen/logrus"
|
|
||||||
"github.com/urfave/cli/v2"
|
|
||||||
)
|
|
||||||
|
|
||||||
var hetznerCloudType string
|
|
||||||
var hetznerCloudImage string
|
|
||||||
var hetznerCloudSSHKeys cli.StringSlice
|
|
||||||
var hetznerCloudLocation string
|
|
||||||
var hetznerCloudAPIToken string
|
|
||||||
var serverNewHetznerCloudCommand = &cli.Command{
|
|
||||||
Name: "hetzner",
|
|
||||||
Usage: "Create a new Hetzner virtual server",
|
|
||||||
ArgsUsage: "<name>",
|
|
||||||
Description: `
|
|
||||||
Create a new Hetzner virtual server.
|
|
||||||
|
|
||||||
This command uses the uses the Hetzner Cloud API bindings to send a server
|
|
||||||
creation request. You must already have a Hetzner Cloud account and an account
|
|
||||||
API token before using this command.
|
|
||||||
|
|
||||||
Your token can be loaded from the environment using the HCLOUD_TOKEN
|
|
||||||
environment variable or otherwise passing the "--env/-e" flag.
|
|
||||||
`,
|
|
||||||
Flags: []cli.Flag{
|
|
||||||
&cli.StringFlag{
|
|
||||||
Name: "type",
|
|
||||||
Aliases: []string{"t"},
|
|
||||||
Usage: "Server type",
|
|
||||||
Destination: &hetznerCloudType,
|
|
||||||
Value: "cx11",
|
|
||||||
},
|
|
||||||
&cli.StringFlag{
|
|
||||||
Name: "image",
|
|
||||||
Aliases: []string{"i"},
|
|
||||||
Usage: "Image type",
|
|
||||||
Value: "debian-10",
|
|
||||||
Destination: &hetznerCloudImage,
|
|
||||||
},
|
|
||||||
&cli.StringSliceFlag{
|
|
||||||
Name: "ssh-keys",
|
|
||||||
Aliases: []string{"s"},
|
|
||||||
Usage: "SSH keys",
|
|
||||||
Destination: &hetznerCloudSSHKeys,
|
|
||||||
},
|
|
||||||
&cli.StringFlag{
|
|
||||||
Name: "location",
|
|
||||||
Aliases: []string{"l"},
|
|
||||||
Usage: "Server location",
|
|
||||||
Value: "hel1",
|
|
||||||
Destination: &hetznerCloudLocation,
|
|
||||||
},
|
|
||||||
&cli.StringFlag{
|
|
||||||
Name: "token",
|
|
||||||
Aliases: []string{"T"},
|
|
||||||
Usage: "Hetzner Cloud API token",
|
|
||||||
EnvVars: []string{"HCLOUD_TOKEN"},
|
|
||||||
Destination: &hetznerCloudAPIToken,
|
|
||||||
},
|
|
||||||
},
|
|
||||||
Action: func(c *cli.Context) error {
|
|
||||||
name := c.Args().First()
|
|
||||||
if name == "" {
|
|
||||||
internal.ShowSubcommandHelpAndError(c, errors.New("no name provided"))
|
|
||||||
}
|
|
||||||
|
|
||||||
if hetznerCloudAPIToken == "" {
|
|
||||||
logrus.Fatal("Hetzner Cloud API token is missing")
|
|
||||||
}
|
|
||||||
|
|
||||||
ctx := context.Background()
|
|
||||||
client := hcloud.NewClient(hcloud.WithToken(hetznerCloudAPIToken))
|
|
||||||
|
|
||||||
logrus.Debugf("successfully created hetzner cloud API client")
|
|
||||||
|
|
||||||
var sshKeys []*hcloud.SSHKey
|
|
||||||
for _, sshKey := range c.StringSlice("ssh-keys") {
|
|
||||||
sshKey, _, err := client.SSHKey.GetByName(ctx, sshKey)
|
|
||||||
if err != nil {
|
|
||||||
logrus.Fatal(err)
|
|
||||||
}
|
|
||||||
sshKeys = append(sshKeys, sshKey)
|
|
||||||
}
|
|
||||||
|
|
||||||
serverOpts := hcloud.ServerCreateOpts{
|
|
||||||
Name: name,
|
|
||||||
ServerType: &hcloud.ServerType{Name: hetznerCloudType},
|
|
||||||
Image: &hcloud.Image{Name: hetznerCloudImage},
|
|
||||||
SSHKeys: sshKeys,
|
|
||||||
Location: &hcloud.Location{Name: hetznerCloudLocation},
|
|
||||||
}
|
|
||||||
res, _, err := client.Server.Create(ctx, serverOpts)
|
|
||||||
if err != nil {
|
|
||||||
logrus.Fatal(err)
|
|
||||||
}
|
|
||||||
|
|
||||||
logrus.Debugf("new server '%s' created", name)
|
|
||||||
|
|
||||||
tableColumns := []string{"Name", "IPv4", "Root Password"}
|
|
||||||
table := formatter.CreateTable(tableColumns)
|
|
||||||
|
|
||||||
if len(sshKeys) > 0 {
|
|
||||||
table.Append([]string{name, res.Server.PublicNet.IPv4.IP.String(), "N/A (using SSH keys)"})
|
|
||||||
} else {
|
|
||||||
table.Append([]string{name, res.Server.PublicNet.IPv4.IP.String(), res.RootPassword})
|
|
||||||
}
|
|
||||||
|
|
||||||
table.Render()
|
|
||||||
|
|
||||||
return nil
|
|
||||||
},
|
|
||||||
}
|
|
||||||
|
|
||||||
var capsulInstance string
|
|
||||||
var capsulType string
|
|
||||||
var capsulImage string
|
|
||||||
var capsulSSHKey string
|
|
||||||
var capsulAPIToken string
|
|
||||||
var serverNewCapsulCommand = &cli.Command{
|
|
||||||
Name: "capsul",
|
|
||||||
Usage: "Create a new Capsul virtual server",
|
|
||||||
ArgsUsage: "<name>",
|
|
||||||
Description: `
|
|
||||||
Create a new Capsul virtual server.
|
|
||||||
|
|
||||||
This command uses the uses the Capsul API bindings of your chosen instance to
|
|
||||||
send a server creation request. You must already have an account on your chosen
|
|
||||||
Capsul instance before using this command.
|
|
||||||
|
|
||||||
Your token can be loaded from the environment using the CAPSUL_TOKEN
|
|
||||||
environment variable or otherwise passing the "--env/-e" flag.
|
|
||||||
`,
|
|
||||||
Flags: []cli.Flag{
|
|
||||||
&cli.StringFlag{
|
|
||||||
Name: "instance",
|
|
||||||
Aliases: []string{"I"},
|
|
||||||
Usage: "Capsul instance",
|
|
||||||
Destination: &capsulInstance,
|
|
||||||
Value: "yolo.servers.coop",
|
|
||||||
},
|
|
||||||
&cli.StringFlag{
|
|
||||||
Name: "type",
|
|
||||||
Aliases: []string{"t"},
|
|
||||||
Usage: "Server type",
|
|
||||||
Value: "f1-xs",
|
|
||||||
Destination: &capsulType,
|
|
||||||
},
|
|
||||||
&cli.StringFlag{
|
|
||||||
Name: "image",
|
|
||||||
Aliases: []string{"i"},
|
|
||||||
Usage: "Image type",
|
|
||||||
Value: "debian10",
|
|
||||||
Destination: &capsulImage,
|
|
||||||
},
|
|
||||||
&cli.StringFlag{
|
|
||||||
Name: "ssh-key",
|
|
||||||
Aliases: []string{"s"},
|
|
||||||
Usage: "SSH key",
|
|
||||||
Value: "",
|
|
||||||
Destination: &capsulSSHKey,
|
|
||||||
},
|
|
||||||
&cli.StringFlag{
|
|
||||||
Name: "token",
|
|
||||||
Aliases: []string{"T"},
|
|
||||||
Usage: "Capsul instance API token",
|
|
||||||
EnvVars: []string{"CAPSUL_TOKEN"},
|
|
||||||
Destination: &capsulAPIToken,
|
|
||||||
},
|
|
||||||
},
|
|
||||||
Action: func(c *cli.Context) error {
|
|
||||||
name := c.Args().First()
|
|
||||||
if name == "" {
|
|
||||||
internal.ShowSubcommandHelpAndError(c, errors.New("no name provided"))
|
|
||||||
}
|
|
||||||
|
|
||||||
if capsulAPIToken == "" {
|
|
||||||
logrus.Fatal("Capsul API token is missing")
|
|
||||||
}
|
|
||||||
|
|
||||||
// yep, the response time is quite slow, something to fix on the Capsul side
|
|
||||||
client := &http.Client{Timeout: 20 * time.Second}
|
|
||||||
|
|
||||||
capsulCreateURL := fmt.Sprintf("https://%s/api/capsul/create", capsulInstance)
|
|
||||||
logrus.Debugf("using '%s' as capsul create url", capsulCreateURL)
|
|
||||||
values := map[string]string{
|
|
||||||
"name": name,
|
|
||||||
"size": capsulType,
|
|
||||||
"os": capsulImage,
|
|
||||||
"ssh_key_0": capsulSSHKey,
|
|
||||||
}
|
|
||||||
|
|
||||||
payload, err := json.Marshal(values)
|
|
||||||
if err != nil {
|
|
||||||
logrus.Fatal(err)
|
|
||||||
}
|
|
||||||
|
|
||||||
req, err := http.NewRequest("POST", capsulCreateURL, bytes.NewBuffer(payload))
|
|
||||||
if err != nil {
|
|
||||||
logrus.Fatal(err)
|
|
||||||
}
|
|
||||||
|
|
||||||
req.Header = http.Header{
|
|
||||||
"Content-Type": []string{"application/json"},
|
|
||||||
"Authorization": []string{capsulAPIToken},
|
|
||||||
}
|
|
||||||
|
|
||||||
res, err := client.Do(req)
|
|
||||||
if err != nil {
|
|
||||||
logrus.Fatal(err)
|
|
||||||
}
|
|
||||||
defer res.Body.Close()
|
|
||||||
|
|
||||||
if res.StatusCode != http.StatusOK {
|
|
||||||
body, err := ioutil.ReadAll(res.Body)
|
|
||||||
if err != nil {
|
|
||||||
panic(err)
|
|
||||||
}
|
|
||||||
logrus.Fatal(string(body))
|
|
||||||
}
|
|
||||||
|
|
||||||
type capsulCreateResponse struct{ ID string }
|
|
||||||
var resp capsulCreateResponse
|
|
||||||
if err := json.NewDecoder(res.Body).Decode(&resp); err != nil {
|
|
||||||
logrus.Fatal(err)
|
|
||||||
}
|
|
||||||
logrus.Debugf("capsul created with ID: '%s'", resp.ID)
|
|
||||||
|
|
||||||
tableColumns := []string{"Name", "ID"}
|
|
||||||
table := formatter.CreateTable(tableColumns)
|
|
||||||
table.Append([]string{name, resp.ID})
|
|
||||||
table.Render()
|
|
||||||
|
|
||||||
return nil
|
|
||||||
},
|
|
||||||
}
|
|
||||||
|
|
||||||
var serverNewCommand = &cli.Command{
|
|
||||||
Name: "new",
|
|
||||||
Aliases: []string{"n"},
|
|
||||||
Usage: "Create a new server using a 3rd party provider",
|
|
||||||
Description: `
|
|
||||||
Use a provider plugin to create a new server which can then be used to house a
|
|
||||||
new Co-op Cloud installation.
|
|
||||||
`,
|
|
||||||
ArgsUsage: "<provider>",
|
|
||||||
Subcommands: []*cli.Command{
|
|
||||||
serverNewHetznerCloudCommand,
|
|
||||||
serverNewCapsulCommand,
|
|
||||||
},
|
|
||||||
}
|
|
|
@ -0,0 +1,103 @@
|
||||||
|
package server
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
|
||||||
|
"coopcloud.tech/abra/cli/internal"
|
||||||
|
"coopcloud.tech/abra/pkg/autocomplete"
|
||||||
|
"coopcloud.tech/abra/pkg/client"
|
||||||
|
"coopcloud.tech/abra/pkg/formatter"
|
||||||
|
"github.com/docker/docker/api/types/filters"
|
||||||
|
"github.com/sirupsen/logrus"
|
||||||
|
"github.com/urfave/cli"
|
||||||
|
)
|
||||||
|
|
||||||
|
var allFilter bool
|
||||||
|
|
||||||
|
var allFilterFlag = &cli.BoolFlag{
|
||||||
|
Name: "all, a",
|
||||||
|
Usage: "Remove all unused images not just dangling ones",
|
||||||
|
Destination: &allFilter,
|
||||||
|
}
|
||||||
|
|
||||||
|
var volumesFilter bool
|
||||||
|
|
||||||
|
var volumesFilterFlag = &cli.BoolFlag{
|
||||||
|
Name: "volumes, v",
|
||||||
|
Usage: "Prune volumes. This will remove app data, Be Careful!",
|
||||||
|
Destination: &volumesFilter,
|
||||||
|
}
|
||||||
|
|
||||||
|
var serverPruneCommand = cli.Command{
|
||||||
|
Name: "prune",
|
||||||
|
Aliases: []string{"p"},
|
||||||
|
Usage: "Prune a managed server; Runs a docker system prune",
|
||||||
|
Description: `
|
||||||
|
Prunes unused containers, networks, and dangling images.
|
||||||
|
|
||||||
|
If passing "-v/--volumes" then volumes not connected to a deployed app will
|
||||||
|
also be removed. This can result in unwanted data loss if not used carefully.
|
||||||
|
`,
|
||||||
|
ArgsUsage: "[<server>]",
|
||||||
|
Flags: []cli.Flag{
|
||||||
|
allFilterFlag,
|
||||||
|
volumesFilterFlag,
|
||||||
|
internal.DebugFlag,
|
||||||
|
internal.OfflineFlag,
|
||||||
|
internal.NoInputFlag,
|
||||||
|
},
|
||||||
|
Before: internal.SubCommandBefore,
|
||||||
|
BashComplete: autocomplete.ServerNameComplete,
|
||||||
|
Action: func(c *cli.Context) error {
|
||||||
|
serverName := internal.ValidateServer(c)
|
||||||
|
|
||||||
|
cl, err := client.New(serverName)
|
||||||
|
if err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
var args filters.Args
|
||||||
|
|
||||||
|
ctx := context.Background()
|
||||||
|
cr, err := cl.ContainersPrune(ctx, args)
|
||||||
|
if err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
cntSpaceReclaimed := formatter.ByteCountSI(cr.SpaceReclaimed)
|
||||||
|
logrus.Infof("containers pruned: %d; space reclaimed: %s", len(cr.ContainersDeleted), cntSpaceReclaimed)
|
||||||
|
|
||||||
|
nr, err := cl.NetworksPrune(ctx, args)
|
||||||
|
if err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
logrus.Infof("networks pruned: %d", len(nr.NetworksDeleted))
|
||||||
|
|
||||||
|
pruneFilters := filters.NewArgs()
|
||||||
|
if allFilter {
|
||||||
|
logrus.Debugf("removing all images, not only dangling ones")
|
||||||
|
pruneFilters.Add("dangling", "false")
|
||||||
|
}
|
||||||
|
|
||||||
|
ir, err := cl.ImagesPrune(ctx, pruneFilters)
|
||||||
|
if err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
imgSpaceReclaimed := formatter.ByteCountSI(ir.SpaceReclaimed)
|
||||||
|
logrus.Infof("images pruned: %d; space reclaimed: %s", len(ir.ImagesDeleted), imgSpaceReclaimed)
|
||||||
|
|
||||||
|
if volumesFilter {
|
||||||
|
vr, err := cl.VolumesPrune(ctx, args)
|
||||||
|
if err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
volSpaceReclaimed := formatter.ByteCountSI(vr.SpaceReclaimed)
|
||||||
|
logrus.Infof("volumes pruned: %d; space reclaimed: %s", len(vr.VolumesDeleted), volSpaceReclaimed)
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil
|
||||||
|
},
|
||||||
|
}
|
|
@ -1,29 +1,47 @@
|
||||||
package server
|
package server
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"os"
|
||||||
|
"path/filepath"
|
||||||
|
|
||||||
"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"
|
||||||
"github.com/sirupsen/logrus"
|
"github.com/sirupsen/logrus"
|
||||||
"github.com/urfave/cli/v2"
|
"github.com/urfave/cli"
|
||||||
)
|
)
|
||||||
|
|
||||||
var serverRemoveCommand = &cli.Command{
|
var serverRemoveCommand = cli.Command{
|
||||||
Name: "remove",
|
Name: "remove",
|
||||||
Aliases: []string{"rm"},
|
Aliases: []string{"rm"},
|
||||||
Usage: "Remove a server",
|
ArgsUsage: "<server>",
|
||||||
Description: `
|
Usage: "Remove a managed server",
|
||||||
This does not destroy the actual server. It simply removes it from Abra
|
Description: `Remove a managed server.
|
||||||
internal bookkeeping so that it is not managed any more.
|
|
||||||
`,
|
|
||||||
HideHelp: true,
|
|
||||||
Action: func(c *cli.Context) error {
|
|
||||||
domainName := internal.ValidateDomain(c)
|
|
||||||
|
|
||||||
if err := client.DeleteContext(domainName); err != nil {
|
Abra will remove the internal bookkeeping (~/.abra/servers/...) and underlying
|
||||||
|
client connection context. This server will then be lost in time, like tears in
|
||||||
|
rain.
|
||||||
|
`,
|
||||||
|
Flags: []cli.Flag{
|
||||||
|
internal.DebugFlag,
|
||||||
|
internal.NoInputFlag,
|
||||||
|
internal.OfflineFlag,
|
||||||
|
},
|
||||||
|
Before: internal.SubCommandBefore,
|
||||||
|
BashComplete: autocomplete.ServerNameComplete,
|
||||||
|
Action: func(c *cli.Context) error {
|
||||||
|
serverName := internal.ValidateServer(c)
|
||||||
|
|
||||||
|
if err := client.DeleteContext(serverName); err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
logrus.Infof("server at '%s' has been forgotten", domainName)
|
if err := os.RemoveAll(filepath.Join(config.SERVERS_DIR, serverName)); err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
logrus.Infof("server at %s has been lost in time, like tears in rain", serverName)
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
},
|
},
|
||||||
|
|
|
@ -1,26 +1,18 @@
|
||||||
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",
|
Usage: "Manage servers",
|
||||||
Description: `
|
Subcommands: []cli.Command{
|
||||||
Manage the lifecycle of a server.
|
|
||||||
|
|
||||||
These commands support creating new servers using 3rd party integrations,
|
|
||||||
initialising existing servers to support Co-op Cloud deployments and managing
|
|
||||||
the connections to those servers.
|
|
||||||
`,
|
|
||||||
Subcommands: []*cli.Command{
|
|
||||||
serverNewCommand,
|
|
||||||
serverInitCommand,
|
|
||||||
serverAddCommand,
|
serverAddCommand,
|
||||||
serverListCommand,
|
serverListCommand,
|
||||||
serverRemoveCommand,
|
serverRemoveCommand,
|
||||||
|
serverPruneCommand,
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
|
@ -0,0 +1,498 @@
|
||||||
|
package updater
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"fmt"
|
||||||
|
"os"
|
||||||
|
"strconv"
|
||||||
|
"strings"
|
||||||
|
|
||||||
|
"coopcloud.tech/abra/cli/internal"
|
||||||
|
"coopcloud.tech/abra/pkg/client"
|
||||||
|
"coopcloud.tech/abra/pkg/config"
|
||||||
|
"coopcloud.tech/abra/pkg/lint"
|
||||||
|
"coopcloud.tech/abra/pkg/recipe"
|
||||||
|
"coopcloud.tech/abra/pkg/upstream/convert"
|
||||||
|
"coopcloud.tech/abra/pkg/upstream/stack"
|
||||||
|
"coopcloud.tech/tagcmp"
|
||||||
|
composetypes "github.com/docker/cli/cli/compose/types"
|
||||||
|
"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"
|
||||||
|
)
|
||||||
|
|
||||||
|
const SERVER = "localhost"
|
||||||
|
|
||||||
|
var majorUpdate bool
|
||||||
|
var majorFlag = &cli.BoolFlag{
|
||||||
|
Name: "major, m",
|
||||||
|
Usage: "Also check for major updates",
|
||||||
|
Destination: &majorUpdate,
|
||||||
|
}
|
||||||
|
|
||||||
|
var updateAll bool
|
||||||
|
var allFlag = &cli.BoolFlag{
|
||||||
|
Name: "all, a",
|
||||||
|
Usage: "Update all deployed apps",
|
||||||
|
Destination: &updateAll,
|
||||||
|
}
|
||||||
|
|
||||||
|
// Notify checks for available upgrades
|
||||||
|
var Notify = cli.Command{
|
||||||
|
Name: "notify",
|
||||||
|
Aliases: []string{"n"},
|
||||||
|
Usage: "Check for available upgrades",
|
||||||
|
Flags: []cli.Flag{
|
||||||
|
internal.DebugFlag,
|
||||||
|
majorFlag,
|
||||||
|
internal.OfflineFlag,
|
||||||
|
},
|
||||||
|
Before: internal.SubCommandBefore,
|
||||||
|
Description: `
|
||||||
|
It reads the deployed app versions and looks for new versions in the recipe
|
||||||
|
catalogue. If a new patch/minor version is available, a notification is
|
||||||
|
printed. To include major versions use the --major flag.
|
||||||
|
`,
|
||||||
|
Action: func(c *cli.Context) error {
|
||||||
|
cl, err := client.New("default")
|
||||||
|
if err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
stacks, err := stack.GetStacks(cl)
|
||||||
|
if err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, stackInfo := range stacks {
|
||||||
|
stackName := stackInfo.Name
|
||||||
|
recipeName, err := getLabel(cl, stackName, "recipe")
|
||||||
|
if err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if recipeName != "" {
|
||||||
|
_, err = getLatestUpgrade(cl, stackName, recipeName)
|
||||||
|
if err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
// UpgradeApp upgrades apps.
|
||||||
|
var UpgradeApp = cli.Command{
|
||||||
|
Name: "upgrade",
|
||||||
|
Aliases: []string{"u"},
|
||||||
|
Usage: "Upgrade apps",
|
||||||
|
ArgsUsage: "<stack-name> <recipe>",
|
||||||
|
Flags: []cli.Flag{
|
||||||
|
internal.DebugFlag,
|
||||||
|
internal.ChaosFlag,
|
||||||
|
majorFlag,
|
||||||
|
allFlag,
|
||||||
|
internal.OfflineFlag,
|
||||||
|
},
|
||||||
|
Before: internal.SubCommandBefore,
|
||||||
|
Description: `
|
||||||
|
Upgrade an app by specifying its stack name and recipe. By passing "--all"
|
||||||
|
instead, every deployed app is upgraded. For each apps with enabled auto
|
||||||
|
updates the deployed version is compared with the current recipe catalogue
|
||||||
|
version. If a new patch/minor version is available, the app is upgraded. To
|
||||||
|
include major versions use the "--major" flag. Don't do that, it will probably
|
||||||
|
break things. Only apps that are not deployed with "--chaos" are upgraded, to
|
||||||
|
update chaos deployments use the "--chaos" flag. Use it with care.
|
||||||
|
`,
|
||||||
|
Action: func(c *cli.Context) error {
|
||||||
|
cl, err := client.New("default")
|
||||||
|
if err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if !updateAll {
|
||||||
|
stackName := c.Args().Get(0)
|
||||||
|
recipeName := c.Args().Get(1)
|
||||||
|
err = tryUpgrade(cl, stackName, recipeName)
|
||||||
|
if err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
stacks, err := stack.GetStacks(cl)
|
||||||
|
if err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, stackInfo := range stacks {
|
||||||
|
stackName := stackInfo.Name
|
||||||
|
recipeName, err := getLabel(cl, stackName, "recipe")
|
||||||
|
if err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
err = tryUpgrade(cl, stackName, recipeName)
|
||||||
|
if err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
// getLabel reads docker labels from running services in the format of "coop-cloud.${STACK_NAME}.${LABEL}".
|
||||||
|
func getLabel(cl *dockerclient.Client, stackName string, label string) (string, error) {
|
||||||
|
filter := filters.NewArgs()
|
||||||
|
filter.Add("label", fmt.Sprintf("%s=%s", convert.LabelNamespace, stackName))
|
||||||
|
|
||||||
|
services, err := cl.ServiceList(context.Background(), types.ServiceListOptions{Filters: filter})
|
||||||
|
if err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, service := range services {
|
||||||
|
labelKey := fmt.Sprintf("coop-cloud.%s.%s", stackName, label)
|
||||||
|
if labelValue, ok := service.Spec.Labels[labelKey]; ok {
|
||||||
|
return labelValue, nil
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
logrus.Debugf("no %s label found for %s", label, stackName)
|
||||||
|
|
||||||
|
return "", nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// getBoolLabel reads a boolean docker label from running services
|
||||||
|
func getBoolLabel(cl *dockerclient.Client, stackName string, label string) (bool, error) {
|
||||||
|
lableValue, err := getLabel(cl, stackName, label)
|
||||||
|
if err != nil {
|
||||||
|
return false, err
|
||||||
|
}
|
||||||
|
|
||||||
|
if lableValue != "" {
|
||||||
|
value, err := strconv.ParseBool(lableValue)
|
||||||
|
if err != nil {
|
||||||
|
return false, err
|
||||||
|
}
|
||||||
|
|
||||||
|
return value, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
logrus.Debugf("Boolean label %s could not be found for %s, set default to false.", label, stackName)
|
||||||
|
|
||||||
|
return false, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// getEnv reads env variables from docker services.
|
||||||
|
func getEnv(cl *dockerclient.Client, stackName string) (config.AppEnv, error) {
|
||||||
|
envMap := make(map[string]string)
|
||||||
|
filter := filters.NewArgs()
|
||||||
|
filter.Add("label", fmt.Sprintf("%s=%s", convert.LabelNamespace, stackName))
|
||||||
|
|
||||||
|
services, err := cl.ServiceList(context.Background(), types.ServiceListOptions{Filters: filter})
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, service := range services {
|
||||||
|
envList := service.Spec.TaskTemplate.ContainerSpec.Env
|
||||||
|
for _, envString := range envList {
|
||||||
|
splitString := strings.SplitN(envString, "=", 2)
|
||||||
|
if len(splitString) != 2 {
|
||||||
|
logrus.Debugf("can't separate key from value: %s (this variable is probably unset)", envString)
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
k := splitString[0]
|
||||||
|
v := splitString[1]
|
||||||
|
logrus.Debugf("For %s read env %s with value: %s from docker service", stackName, k, v)
|
||||||
|
envMap[k] = v
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return envMap, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// getLatestUpgrade returns the latest available version for an app respecting
|
||||||
|
// the "--major" flag if it is newer than the currently deployed version.
|
||||||
|
func getLatestUpgrade(cl *dockerclient.Client, stackName string, recipeName string) (string, error) {
|
||||||
|
deployedVersion, err := getDeployedVersion(cl, stackName, recipeName)
|
||||||
|
if err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
|
||||||
|
availableUpgrades, err := getAvailableUpgrades(cl, stackName, recipeName, deployedVersion)
|
||||||
|
if err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
|
||||||
|
if len(availableUpgrades) == 0 {
|
||||||
|
logrus.Debugf("no available upgrades for %s", stackName)
|
||||||
|
return "", nil
|
||||||
|
}
|
||||||
|
|
||||||
|
var chosenUpgrade string
|
||||||
|
if len(availableUpgrades) > 0 {
|
||||||
|
chosenUpgrade = availableUpgrades[len(availableUpgrades)-1]
|
||||||
|
logrus.Infof("%s (%s) can be upgraded from version %s to %s", stackName, recipeName, deployedVersion, chosenUpgrade)
|
||||||
|
}
|
||||||
|
|
||||||
|
return chosenUpgrade, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// getDeployedVersion returns the currently deployed version of an app.
|
||||||
|
func getDeployedVersion(cl *dockerclient.Client, stackName string, recipeName string) (string, error) {
|
||||||
|
logrus.Debugf("Retrieve deployed version whether %s is already deployed", stackName)
|
||||||
|
|
||||||
|
isDeployed, deployedVersion, err := stack.IsDeployed(context.Background(), cl, stackName)
|
||||||
|
if err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
|
||||||
|
if !isDeployed {
|
||||||
|
return "", fmt.Errorf("%s is not deployed?", stackName)
|
||||||
|
}
|
||||||
|
|
||||||
|
if deployedVersion == "unknown" {
|
||||||
|
return "", fmt.Errorf("failed to determine deployed version of %s", stackName)
|
||||||
|
}
|
||||||
|
|
||||||
|
return deployedVersion, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// getAvailableUpgrades returns all available versions of an app that are newer
|
||||||
|
// than the deployed version. It only includes major upgrades if the "--major"
|
||||||
|
// flag is set.
|
||||||
|
func getAvailableUpgrades(cl *dockerclient.Client, stackName string, recipeName string,
|
||||||
|
deployedVersion string) ([]string, error) {
|
||||||
|
catl, err := recipe.ReadRecipeCatalogue(internal.Offline)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
versions, err := recipe.GetRecipeCatalogueVersions(recipeName, catl)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
if len(versions) == 0 {
|
||||||
|
logrus.Warnf("no published releases for %s in the recipe catalogue?", recipeName)
|
||||||
|
return nil, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
var availableUpgrades []string
|
||||||
|
for _, version := range versions {
|
||||||
|
parsedDeployedVersion, err := tagcmp.Parse(deployedVersion)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
parsedVersion, err := tagcmp.Parse(version)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
versionDelta, err := parsedDeployedVersion.UpgradeDelta(parsedVersion)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
if 0 < versionDelta.UpgradeType() && (versionDelta.UpgradeType() < 4 || majorUpdate) {
|
||||||
|
availableUpgrades = append(availableUpgrades, version)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
logrus.Debugf("Available updates for %s: %s", stackName, availableUpgrades)
|
||||||
|
|
||||||
|
return availableUpgrades, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// processRecipeRepoVersion clones, pulls, checks out the version and lints the
|
||||||
|
// recipe repository.
|
||||||
|
func processRecipeRepoVersion(recipeName, version string) error {
|
||||||
|
if err := recipe.EnsureExists(recipeName); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := recipe.EnsureUpToDate(recipeName); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := recipe.EnsureVersion(recipeName, version); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
if r, err := recipe.Get(recipeName, internal.Offline); err != nil {
|
||||||
|
return err
|
||||||
|
} else if err := lint.LintForErrors(r); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// mergeAbraShEnv merges abra.sh env vars into the app env vars.
|
||||||
|
func mergeAbraShEnv(recipeName string, env config.AppEnv) error {
|
||||||
|
abraShPath := fmt.Sprintf("%s/%s/%s", config.RECIPES_DIR, recipeName, "abra.sh")
|
||||||
|
abraShEnv, err := config.ReadAbraShEnvVars(abraShPath)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
for k, v := range abraShEnv {
|
||||||
|
logrus.Debugf("read v:%s k: %s", v, k)
|
||||||
|
env[k] = v
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// createDeployConfig merges and enriches the compose config for the deployment.
|
||||||
|
func createDeployConfig(recipeName string, stackName string, env config.AppEnv) (*composetypes.Config, stack.Deploy, error) {
|
||||||
|
env["STACK_NAME"] = stackName
|
||||||
|
|
||||||
|
deployOpts := stack.Deploy{
|
||||||
|
Namespace: stackName,
|
||||||
|
Prune: false,
|
||||||
|
ResolveImage: stack.ResolveImageAlways,
|
||||||
|
}
|
||||||
|
|
||||||
|
composeFiles, err := config.GetComposeFiles(recipeName, env)
|
||||||
|
if err != nil {
|
||||||
|
return nil, deployOpts, err
|
||||||
|
}
|
||||||
|
|
||||||
|
deployOpts.Composefiles = composeFiles
|
||||||
|
compose, err := config.GetAppComposeConfig(stackName, deployOpts, env)
|
||||||
|
if err != nil {
|
||||||
|
return nil, deployOpts, err
|
||||||
|
}
|
||||||
|
|
||||||
|
config.ExposeAllEnv(stackName, compose, env)
|
||||||
|
|
||||||
|
// after the upgrade the deployment won't be in chaos state anymore
|
||||||
|
config.SetChaosLabel(compose, stackName, false)
|
||||||
|
config.SetRecipeLabel(compose, stackName, recipeName)
|
||||||
|
config.SetUpdateLabel(compose, stackName, env)
|
||||||
|
|
||||||
|
return compose, deployOpts, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// tryUpgrade performs the upgrade if all the requirements are fulfilled.
|
||||||
|
func tryUpgrade(cl *dockerclient.Client, stackName, recipeName string) error {
|
||||||
|
if recipeName == "" {
|
||||||
|
logrus.Debugf("don't update %s due to missing recipe name", stackName)
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
chaos, err := getBoolLabel(cl, stackName, "chaos")
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
if chaos && !internal.Chaos {
|
||||||
|
logrus.Debugf("don't update %s due to chaos deployment", stackName)
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
updatesEnabled, err := getBoolLabel(cl, stackName, "autoupdate")
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
if !updatesEnabled {
|
||||||
|
logrus.Debugf("don't update %s due to disabled auto updates or missing ENABLE_AUTO_UPDATE env", stackName)
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
upgradeVersion, err := getLatestUpgrade(cl, stackName, recipeName)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
if upgradeVersion == "" {
|
||||||
|
logrus.Debugf("don't update %s due to no new version", stackName)
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
err = upgrade(cl, stackName, recipeName, upgradeVersion)
|
||||||
|
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
// upgrade performs all necessary steps to upgrade an app.
|
||||||
|
func upgrade(cl *dockerclient.Client, stackName, recipeName,
|
||||||
|
upgradeVersion string) error {
|
||||||
|
env, err := getEnv(cl, stackName)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
app := config.App{
|
||||||
|
Name: stackName,
|
||||||
|
Recipe: recipeName,
|
||||||
|
Server: SERVER,
|
||||||
|
Env: env,
|
||||||
|
}
|
||||||
|
|
||||||
|
if err = processRecipeRepoVersion(recipeName, upgradeVersion); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
if err = mergeAbraShEnv(recipeName, app.Env); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
compose, deployOpts, err := createDeployConfig(recipeName, stackName, app.Env)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
logrus.Infof("upgrade %s (%s) to version %s", stackName, recipeName, upgradeVersion)
|
||||||
|
|
||||||
|
err = stack.RunDeploy(cl, deployOpts, compose, stackName, true)
|
||||||
|
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
func newAbraApp(version, commit string) *cli.App {
|
||||||
|
app := &cli.App{
|
||||||
|
Name: "kadabra",
|
||||||
|
Usage: `The Co-op Cloud auto-updater
|
||||||
|
____ ____ _ _
|
||||||
|
/ ___|___ ___ _ __ / ___| | ___ _ _ __| |
|
||||||
|
| | / _ \ _____ / _ \| '_ \ | | | |/ _ \| | | |/ _' |
|
||||||
|
| |__| (_) |_____| (_) | |_) | | |___| | (_) | |_| | (_| |
|
||||||
|
\____\___/ \___/| .__/ \____|_|\___/ \__,_|\__,_|
|
||||||
|
|_|
|
||||||
|
`,
|
||||||
|
Version: fmt.Sprintf("%s-%s", version, commit[:7]),
|
||||||
|
Commands: []cli.Command{
|
||||||
|
Notify,
|
||||||
|
UpgradeApp,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
app.Before = func(c *cli.Context) error {
|
||||||
|
logrus.Debugf("kadabra version %s, commit %s", version, commit)
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
return app
|
||||||
|
}
|
||||||
|
|
||||||
|
// RunApp runs CLI abra app.
|
||||||
|
func RunApp(version, commit string) {
|
||||||
|
app := newAbraApp(version, commit)
|
||||||
|
|
||||||
|
if err := app.Run(os.Args); err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
}
|
|
@ -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
|
|
||||||
},
|
|
||||||
}
|
|
|
@ -1,15 +0,0 @@
|
||||||
package cli
|
|
||||||
|
|
||||||
import (
|
|
||||||
"github.com/urfave/cli/v2"
|
|
||||||
)
|
|
||||||
|
|
||||||
// VersionCommand prints the version of abra.
|
|
||||||
var VersionCommand = &cli.Command{
|
|
||||||
Name: "version",
|
|
||||||
Usage: "Print version",
|
|
||||||
Action: func(c *cli.Context) error {
|
|
||||||
cli.VersionPrinter(c)
|
|
||||||
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"
|
||||||
}
|
}
|
||||||
|
|
|
@ -0,0 +1,23 @@
|
||||||
|
// Package main provides the command-line entrypoint.
|
||||||
|
package main
|
||||||
|
|
||||||
|
import (
|
||||||
|
"coopcloud.tech/abra/cli/updater"
|
||||||
|
)
|
||||||
|
|
||||||
|
// Version is the current version of Kadabra.
|
||||||
|
var Version string
|
||||||
|
|
||||||
|
// Commit is the current git commit of Kadabra.
|
||||||
|
var Commit string
|
||||||
|
|
||||||
|
func main() {
|
||||||
|
if Version == "" {
|
||||||
|
Version = "dev"
|
||||||
|
}
|
||||||
|
if Commit == "" {
|
||||||
|
Commit = " "
|
||||||
|
}
|
||||||
|
|
||||||
|
updater.RunApp(Version, Commit)
|
||||||
|
}
|
156
go.mod
156
go.mod
|
@ -1,94 +1,120 @@
|
||||||
module coopcloud.tech/abra
|
module coopcloud.tech/abra
|
||||||
|
|
||||||
go 1.17
|
go 1.21
|
||||||
|
|
||||||
require (
|
require (
|
||||||
coopcloud.tech/tagcmp v0.0.0-20210906102006-2a8edd82d75d
|
coopcloud.tech/tagcmp v0.0.0-20211103052201-885b22f77d52
|
||||||
github.com/AlecAivazis/survey/v2 v2.3.1
|
git.coopcloud.tech/coop-cloud/godotenv v1.5.2-0.20231130100509-01bff8284355
|
||||||
github.com/Autonomic-Cooperative/godotenv v1.3.1-0.20210731170023-c37c0920d1a4
|
github.com/AlecAivazis/survey/v2 v2.3.7
|
||||||
github.com/docker/cli v20.10.8+incompatible
|
github.com/Gurpartap/logrus-stack v0.0.0-20170710170904-89c00d8a28f4
|
||||||
github.com/docker/distribution v2.7.1+incompatible
|
github.com/docker/cli v24.0.7+incompatible
|
||||||
github.com/docker/docker v20.10.8+incompatible
|
github.com/docker/distribution v2.8.3+incompatible
|
||||||
github.com/docker/go-units v0.4.0
|
github.com/docker/docker v24.0.7+incompatible
|
||||||
github.com/go-git/go-git/v5 v5.4.2
|
github.com/docker/go-units v0.5.0
|
||||||
github.com/hetznercloud/hcloud-go v1.32.0
|
github.com/go-git/go-git/v5 v5.10.0
|
||||||
github.com/moby/sys/signal v0.5.0
|
github.com/google/go-cmp v0.5.9
|
||||||
github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6
|
github.com/moby/sys/signal v0.7.0
|
||||||
|
github.com/moby/term v0.5.0
|
||||||
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/schultz-is/passgen v1.0.1
|
github.com/schollz/progressbar/v3 v3.14.1
|
||||||
github.com/sirupsen/logrus v1.8.1
|
github.com/sirupsen/logrus v1.9.3
|
||||||
github.com/urfave/cli/v2 v2.3.0
|
gotest.tools/v3 v3.5.1
|
||||||
gotest.tools/v3 v3.0.3
|
|
||||||
)
|
)
|
||||||
|
|
||||||
require (
|
require (
|
||||||
|
dario.cat/mergo v1.0.0 // indirect
|
||||||
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
|
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
|
||||||
github.com/Microsoft/go-winio v0.4.17 // indirect
|
github.com/BurntSushi/toml v1.0.0 // indirect
|
||||||
github.com/Microsoft/hcsshim v0.8.21 // indirect
|
github.com/Microsoft/go-winio v0.6.1 // indirect
|
||||||
github.com/ProtonMail/go-crypto v0.0.0-20210428141323-04723f9f07d7 // indirect
|
github.com/Microsoft/hcsshim v0.9.2 // indirect
|
||||||
github.com/acomagu/bufpipe v1.0.3 // indirect
|
github.com/ProtonMail/go-crypto v0.0.0-20230828082145-3c4c8a2d2371 // indirect
|
||||||
|
github.com/acomagu/bufpipe v1.0.4 // indirect
|
||||||
github.com/beorn7/perks v1.0.1 // indirect
|
github.com/beorn7/perks v1.0.1 // indirect
|
||||||
github.com/cespare/xxhash/v2 v2.1.1 // indirect
|
github.com/cespare/xxhash/v2 v2.2.0 // indirect
|
||||||
github.com/containerd/cgroups v1.0.1 // indirect
|
github.com/cloudflare/circl v1.3.3 // indirect
|
||||||
github.com/containerd/containerd v1.5.5 // indirect
|
github.com/cpuguy83/go-md2man/v2 v2.0.1 // indirect
|
||||||
github.com/cpuguy83/go-md2man/v2 v2.0.0 // indirect
|
github.com/cyphar/filepath-securejoin v0.2.4 // indirect
|
||||||
github.com/docker/docker-credential-helpers v0.6.4 // indirect
|
github.com/davecgh/go-spew v1.1.1 // indirect
|
||||||
|
github.com/distribution/reference v0.5.0 // indirect
|
||||||
github.com/docker/go v1.5.1-1.0.20160303222718-d30aec9fd63c // indirect
|
github.com/docker/go v1.5.1-1.0.20160303222718-d30aec9fd63c // indirect
|
||||||
github.com/docker/go-connections v0.4.0 // indirect
|
github.com/docker/go-connections v0.4.0 // indirect
|
||||||
github.com/docker/go-metrics v0.0.1 // indirect
|
github.com/docker/go-metrics v0.0.1 // indirect
|
||||||
github.com/emirpasic/gods v1.12.0 // indirect
|
github.com/docker/libtrust v0.0.0-20160708172513-aabc10ec26b7 // indirect
|
||||||
github.com/fvbommel/sortorder v1.0.2 // indirect
|
github.com/emirpasic/gods v1.18.1 // indirect
|
||||||
github.com/go-git/gcfg v1.5.0 // indirect
|
github.com/ghodss/yaml v1.0.0 // indirect
|
||||||
github.com/go-git/go-billy/v5 v5.3.1 // indirect
|
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
|
||||||
|
github.com/go-git/go-billy/v5 v5.5.0 // indirect
|
||||||
github.com/gogo/protobuf v1.3.2 // indirect
|
github.com/gogo/protobuf v1.3.2 // indirect
|
||||||
github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect
|
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
|
||||||
github.com/golang/protobuf v1.5.0 // indirect
|
github.com/golang/protobuf v1.5.3 // indirect
|
||||||
github.com/google/go-cmp v0.5.5 // indirect
|
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
|
||||||
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
|
|
||||||
github.com/gorilla/mux v1.8.0 // indirect
|
|
||||||
github.com/imdario/mergo v0.3.12 // indirect
|
github.com/imdario/mergo v0.3.12 // indirect
|
||||||
github.com/inconshreveable/mousetrap v1.0.0 // indirect
|
github.com/inconshreveable/mousetrap v1.0.0 // indirect
|
||||||
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
|
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
|
||||||
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
|
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
|
||||||
github.com/kevinburke/ssh_config v0.0.0-20201106050909-4977a11b4351 // indirect
|
github.com/kevinburke/ssh_config v1.2.0 // indirect
|
||||||
github.com/mattn/go-colorable v0.1.2 // indirect
|
github.com/klauspost/compress v1.14.2 // indirect
|
||||||
github.com/mattn/go-isatty v0.0.8 // indirect
|
github.com/mattn/go-colorable v0.1.12 // indirect
|
||||||
github.com/mattn/go-runewidth v0.0.9 // indirect
|
github.com/mattn/go-isatty v0.0.20 // indirect
|
||||||
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
|
github.com/mattn/go-runewidth v0.0.14 // indirect
|
||||||
|
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
|
||||||
github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b // indirect
|
github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b // indirect
|
||||||
github.com/miekg/pkcs11 v1.0.3 // indirect
|
github.com/miekg/pkcs11 v1.0.3 // indirect
|
||||||
github.com/mitchellh/go-homedir v1.1.0 // indirect
|
github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db // indirect
|
||||||
github.com/mitchellh/mapstructure v1.1.2 // indirect
|
github.com/mitchellh/mapstructure v1.4.3 // indirect
|
||||||
github.com/moby/sys/mount v0.2.0 // indirect
|
|
||||||
github.com/moby/sys/mountinfo v0.4.1 // indirect
|
|
||||||
github.com/morikuni/aec v1.0.0 // indirect
|
github.com/morikuni/aec v1.0.0 // indirect
|
||||||
github.com/opencontainers/go-digest v1.0.0 // indirect
|
github.com/opencontainers/go-digest v1.0.0 // indirect
|
||||||
github.com/opencontainers/image-spec v1.0.1 // indirect
|
github.com/opencontainers/runc v1.1.0 // indirect
|
||||||
github.com/opencontainers/runc v1.0.2 // indirect
|
github.com/pjbgf/sha1cd v0.3.0 // indirect
|
||||||
github.com/prometheus/client_golang v1.11.0 // indirect
|
github.com/pmezard/go-difflib v1.0.0 // indirect
|
||||||
github.com/prometheus/client_model v0.2.0 // indirect
|
github.com/prometheus/client_model v0.3.0 // indirect
|
||||||
github.com/prometheus/common v0.26.0 // indirect
|
github.com/prometheus/common v0.42.0 // indirect
|
||||||
github.com/prometheus/procfs v0.6.0 // indirect
|
github.com/prometheus/procfs v0.10.1 // indirect
|
||||||
github.com/russross/blackfriday/v2 v2.0.1 // indirect
|
github.com/rivo/uniseg v0.4.4 // indirect
|
||||||
github.com/sergi/go-diff v1.1.0 // indirect
|
github.com/russross/blackfriday/v2 v2.1.0 // indirect
|
||||||
github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect
|
github.com/skeema/knownhosts v1.2.0 // indirect
|
||||||
github.com/spf13/cobra v1.0.0 // indirect
|
|
||||||
github.com/spf13/pflag v1.0.5 // indirect
|
github.com/spf13/pflag v1.0.5 // indirect
|
||||||
github.com/theupdateframework/notary v0.7.0 // indirect
|
github.com/xanzy/ssh-agent v0.3.3 // indirect
|
||||||
github.com/xanzy/ssh-agent v0.3.0 // indirect
|
|
||||||
github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f // indirect
|
|
||||||
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
|
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
|
||||||
github.com/xeipuuv/gojsonschema v1.2.0 // indirect
|
github.com/xeipuuv/gojsonschema v1.2.0 // indirect
|
||||||
go.opencensus.io v0.22.3 // indirect
|
golang.org/x/crypto v0.14.0 // indirect
|
||||||
golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b // indirect
|
golang.org/x/mod v0.12.0 // indirect
|
||||||
golang.org/x/net v0.0.0-20210326060303-6b1517762897 // indirect
|
golang.org/x/net v0.17.0 // indirect
|
||||||
golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c // indirect
|
golang.org/x/sync v0.3.0 // indirect
|
||||||
golang.org/x/term v0.0.0-20210503060354-a79de5458b56 // indirect
|
golang.org/x/term v0.14.0 // indirect
|
||||||
golang.org/x/text v0.3.4 // indirect
|
golang.org/x/text v0.13.0 // indirect
|
||||||
google.golang.org/genproto v0.0.0-20201110150050-8816d57aaa9a // indirect
|
golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e // indirect
|
||||||
google.golang.org/grpc v1.33.2 // indirect
|
golang.org/x/tools v0.13.0 // indirect
|
||||||
google.golang.org/protobuf v1.26.0 // indirect
|
google.golang.org/protobuf v1.30.0 // indirect
|
||||||
gopkg.in/warnings.v0 v0.1.2 // indirect
|
gopkg.in/warnings.v0 v0.1.2 // indirect
|
||||||
gopkg.in/yaml.v2 v2.4.0 // indirect
|
gopkg.in/yaml.v2 v2.4.0 // indirect
|
||||||
|
gopkg.in/yaml.v3 v3.0.1 // indirect
|
||||||
|
)
|
||||||
|
|
||||||
|
require (
|
||||||
|
github.com/AdaLogics/go-fuzz-headers v0.0.0-20230106234847-43070de90fa1 // 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/decentral1se/passgen v1.0.1
|
||||||
|
github.com/docker/docker-credential-helpers v0.6.4 // indirect
|
||||||
|
github.com/facebookgo/stack v0.0.0-20160209184415-751773369052 // indirect
|
||||||
|
github.com/fvbommel/sortorder v1.0.2 // indirect
|
||||||
|
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
|
||||||
|
github.com/gorilla/mux v1.8.0 // indirect
|
||||||
|
github.com/hashicorp/go-retryablehttp v0.7.5
|
||||||
|
github.com/klauspost/pgzip v1.2.6
|
||||||
|
github.com/moby/patternmatcher v0.5.0 // indirect
|
||||||
|
github.com/moby/sys/sequential v0.5.0 // indirect
|
||||||
|
github.com/opencontainers/image-spec v1.0.3-0.20211202193544-a5463b7f9c84 // indirect
|
||||||
|
github.com/prometheus/client_golang v1.16.0 // indirect
|
||||||
|
github.com/sergi/go-diff v1.2.0 // indirect
|
||||||
|
github.com/spf13/cobra v1.3.0 // indirect
|
||||||
|
github.com/stretchr/testify v1.8.4
|
||||||
|
github.com/theupdateframework/notary v0.7.0 // indirect
|
||||||
|
github.com/urfave/cli v1.22.9
|
||||||
|
github.com/xeipuuv/gojsonpointer v0.0.0-20190809123943-df4f5c81cb3b // indirect
|
||||||
|
golang.org/x/sys v0.14.0
|
||||||
)
|
)
|
||||||
|
|
|
@ -1,13 +1,9 @@
|
||||||
package app
|
package app
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"context"
|
|
||||||
"fmt"
|
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
"coopcloud.tech/abra/pkg/client/stack"
|
|
||||||
"coopcloud.tech/abra/pkg/config"
|
"coopcloud.tech/abra/pkg/config"
|
||||||
apiclient "github.com/docker/docker/client"
|
|
||||||
"github.com/sirupsen/logrus"
|
"github.com/sirupsen/logrus"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -23,7 +19,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
|
||||||
}
|
}
|
||||||
|
@ -37,49 +33,10 @@ type deployedServiceSpec struct {
|
||||||
// VersionSpec represents a deployed app and associated metadata.
|
// VersionSpec represents a deployed app and associated metadata.
|
||||||
type VersionSpec map[string]deployedServiceSpec
|
type VersionSpec map[string]deployedServiceSpec
|
||||||
|
|
||||||
// DeployedVersions lists metadata (e.g. versions) for deployed
|
// ParseServiceName parses a $STACK_NAME_$SERVICE_NAME service label.
|
||||||
func DeployedVersions(ctx context.Context, cl *apiclient.Client, app config.App) (VersionSpec, bool, error) {
|
|
||||||
services, err := stack.GetStackServices(ctx, cl, app.StackName())
|
|
||||||
if err != nil {
|
|
||||||
return VersionSpec{}, false, err
|
|
||||||
}
|
|
||||||
|
|
||||||
appSpec := make(VersionSpec)
|
|
||||||
for _, service := range services {
|
|
||||||
serviceName := ParseServiceName(service.Spec.Name)
|
|
||||||
label := fmt.Sprintf("coop-cloud.%s.%s.version", app.StackName(), serviceName)
|
|
||||||
if deployLabel, ok := service.Spec.Labels[label]; ok {
|
|
||||||
version, _ := ParseVersionLabel(deployLabel)
|
|
||||||
appSpec[serviceName] = deployedServiceSpec{Name: serviceName, Version: version}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
deployed := len(services) > 0
|
|
||||||
|
|
||||||
if deployed {
|
|
||||||
logrus.Debugf("detected '%s' as deployed versions of '%s'", appSpec, app.Name)
|
|
||||||
} else {
|
|
||||||
logrus.Debugf("detected '%s' as not deployed", app.Name)
|
|
||||||
}
|
|
||||||
|
|
||||||
return appSpec, len(services) > 0, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// ParseVersionLabel parses a $VERSION-$DIGEST app service label.
|
|
||||||
func ParseVersionLabel(label string) (string, string) {
|
|
||||||
// versions may look like v4.2-abcd or v4.2-alpine-abcd
|
|
||||||
idx := strings.LastIndex(label, "-")
|
|
||||||
version := label[:idx]
|
|
||||||
digest := label[idx+1:]
|
|
||||||
logrus.Debugf("parsed '%s' as version from '%s'", version, label)
|
|
||||||
logrus.Debugf("parsed '%s' as digest from '%s'", digest, label)
|
|
||||||
return version, digest
|
|
||||||
}
|
|
||||||
|
|
||||||
// ParseVersionName 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,102 @@
|
||||||
|
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)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func ServiceNameComplete(appName string) {
|
||||||
|
serviceNames, err := config.GetAppServiceNames(appName)
|
||||||
|
if err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
for _, s := range serviceNames {
|
||||||
|
fmt.Println(s)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// RecipeNameComplete completes recipe names.
|
||||||
|
func RecipeNameComplete(c *cli.Context) {
|
||||||
|
catl, err := recipe.ReadRecipeCatalogue(false)
|
||||||
|
if err != nil {
|
||||||
|
logrus.Warn(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if c.NArg() > 0 {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
for name := range catl {
|
||||||
|
fmt.Println(name)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// RecipeVersionComplete completes versions for the recipe.
|
||||||
|
func RecipeVersionComplete(recipeName string) {
|
||||||
|
catl, err := recipe.ReadRecipeCatalogue(false)
|
||||||
|
if err != nil {
|
||||||
|
logrus.Warn(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, v := range catl[recipeName].Versions {
|
||||||
|
for v2 := range v {
|
||||||
|
fmt.Println(v2)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// ServerNameComplete completes server names.
|
||||||
|
func ServerNameComplete(c *cli.Context) {
|
||||||
|
files, err := config.LoadAppFiles("")
|
||||||
|
if err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if c.NArg() > 0 {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, appFile := range files {
|
||||||
|
fmt.Println(appFile.Server)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// SubcommandComplete completes sub-commands.
|
||||||
|
func SubcommandComplete(c *cli.Context) {
|
||||||
|
if c.NArg() > 0 {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
subcmds := []string{
|
||||||
|
"app",
|
||||||
|
"autocomplete",
|
||||||
|
"catalogue",
|
||||||
|
"recipe",
|
||||||
|
"server",
|
||||||
|
"upgrade",
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, cmd := range subcmds {
|
||||||
|
fmt.Println(cmd)
|
||||||
|
}
|
||||||
|
}
|
|
@ -1,257 +1,88 @@
|
||||||
// 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
|
package catalogue
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"encoding/json"
|
|
||||||
"fmt"
|
"fmt"
|
||||||
"io/ioutil"
|
|
||||||
"net/http"
|
|
||||||
"os"
|
"os"
|
||||||
|
"path"
|
||||||
"strings"
|
"strings"
|
||||||
"time"
|
|
||||||
|
|
||||||
"coopcloud.tech/abra/pkg/config"
|
"coopcloud.tech/abra/pkg/config"
|
||||||
"coopcloud.tech/abra/pkg/recipe"
|
gitPkg "coopcloud.tech/abra/pkg/git"
|
||||||
"coopcloud.tech/abra/pkg/web"
|
"github.com/go-git/go-git/v5"
|
||||||
"github.com/sirupsen/logrus"
|
"github.com/sirupsen/logrus"
|
||||||
)
|
)
|
||||||
|
|
||||||
// RecipeCatalogueURL is the only current recipe catalogue available.
|
// EnsureCatalogue ensures that the catalogue is cloned locally & present.
|
||||||
const RecipeCatalogueURL = "https://apps.coopcloud.tech"
|
func EnsureCatalogue() error {
|
||||||
|
catalogueDir := path.Join(config.ABRA_DIR, "catalogue")
|
||||||
// image represents a recipe container image.
|
if _, err := os.Stat(catalogueDir); err != nil && os.IsNotExist(err) {
|
||||||
type image struct {
|
logrus.Warnf("local recipe catalogue is missing, retrieving now")
|
||||||
Image string `json:"image"`
|
url := fmt.Sprintf("%s/%s.git", config.REPOS_BASE_URL, config.CATALOGUE_JSON_REPO_NAME)
|
||||||
Rating string `json:"rating"`
|
if err := gitPkg.Clone(catalogueDir, url); err != nil {
|
||||||
Source string `json:"source"`
|
return err
|
||||||
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"`
|
|
||||||
}
|
|
||||||
|
|
||||||
// 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 []map[tag]map[service]serviceMeta `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
|
|
||||||
|
logrus.Debugf("cloned catalogue repository to %s", catalogueDir)
|
||||||
}
|
}
|
||||||
|
|
||||||
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
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// readRecipeCatalogueWeb reads the catalogue from the web.
|
// EnsureIsClean makes sure that the catalogue has no unstaged changes.
|
||||||
func readRecipeCatalogueWeb(target interface{}) error {
|
func EnsureIsClean() error {
|
||||||
if err := web.ReadJSON(RecipeCatalogueURL, &target); err != nil {
|
isClean, err := gitPkg.IsClean(config.CATALOGUE_DIR)
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
recipesJSON, err := json.MarshalIndent(target, "", " ")
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
if err := ioutil.WriteFile(config.APPS_JSON, recipesJSON, 0644); err != nil {
|
if !isClean {
|
||||||
return err
|
msg := "%s has locally unstaged changes? please commit/remove your changes before proceeding"
|
||||||
|
return fmt.Errorf(msg, config.CATALOGUE_DIR)
|
||||||
}
|
}
|
||||||
|
|
||||||
logrus.Debugf("read recipe catalogue from web at '%s'", RecipeCatalogueURL)
|
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// VersionsOfService lists the version of a service.
|
// EnsureUpToDate ensures that the local catalogue is up to date.
|
||||||
func VersionsOfService(recipe, serviceName string) ([]string, error) {
|
func EnsureUpToDate() error {
|
||||||
catalogue, err := ReadRecipeCatalogue()
|
repo, err := git.PlainOpen(config.CATALOGUE_DIR)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
rec, ok := catalogue[recipe]
|
remotes, err := repo.Remotes()
|
||||||
if !ok {
|
if err != nil {
|
||||||
return nil, fmt.Errorf("recipe '%s' does not exist?", recipe)
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
versions := []string{}
|
if len(remotes) == 0 {
|
||||||
alreadySeen := make(map[string]bool)
|
msg := "cannot ensure %s is up-to-date, no git remotes configured"
|
||||||
for _, serviceVersion := range rec.Versions {
|
logrus.Debugf(msg, config.CATALOGUE_DIR)
|
||||||
for tag := range serviceVersion {
|
return nil
|
||||||
if _, ok := alreadySeen[tag]; !ok {
|
}
|
||||||
alreadySeen[tag] = true
|
|
||||||
versions = append(versions, tag)
|
worktree, err := repo.Worktree()
|
||||||
}
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
branch, err := gitPkg.CheckoutDefaultBranch(repo, config.CATALOGUE_DIR)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
opts := &git.PullOptions{
|
||||||
|
Force: true,
|
||||||
|
ReferenceName: branch,
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := worktree.Pull(opts); err != nil {
|
||||||
|
if !strings.Contains(err.Error(), "already up-to-date") {
|
||||||
|
return err
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
logrus.Debugf("detected versions '%s' for '%s'", strings.Join(versions, ", "), recipe)
|
logrus.Debugf("fetched latest git changes for %s", config.CATALOGUE_DIR)
|
||||||
|
|
||||||
return versions, nil
|
return 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
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -2,39 +2,56 @@
|
||||||
package client
|
package client
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"context"
|
||||||
|
"errors"
|
||||||
|
"fmt"
|
||||||
"net/http"
|
"net/http"
|
||||||
"os"
|
"os"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
contextPkg "coopcloud.tech/abra/pkg/context"
|
||||||
|
sshPkg "coopcloud.tech/abra/pkg/ssh"
|
||||||
|
commandconnPkg "coopcloud.tech/abra/pkg/upstream/commandconn"
|
||||||
"github.com/docker/docker/client"
|
"github.com/docker/docker/client"
|
||||||
"github.com/sirupsen/logrus"
|
"github.com/sirupsen/logrus"
|
||||||
)
|
)
|
||||||
|
|
||||||
// New initiates a new Docker client.
|
// New initiates a new Docker client. New client connections are validated so
|
||||||
func New(contextName string) (*client.Client, error) {
|
// that we ensure connections via SSH to the daemon can succeed. It takes into
|
||||||
context, err := GetContext(contextName)
|
// account that you may only want the local client and not communicate via SSH.
|
||||||
if err != nil {
|
// For this use-case, please pass "default" as the contextName.
|
||||||
return nil, err
|
func New(serverName string) (*client.Client, error) {
|
||||||
}
|
|
||||||
|
|
||||||
ctxEndpoint, err := GetContextEndpoint(context)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
helper := newConnectionHelper(ctxEndpoint)
|
|
||||||
httpClient := &http.Client{
|
|
||||||
// No tls, no proxy
|
|
||||||
Transport: &http.Transport{
|
|
||||||
DialContext: helper.Dialer,
|
|
||||||
},
|
|
||||||
}
|
|
||||||
|
|
||||||
var clientOpts []client.Opt
|
var clientOpts []client.Opt
|
||||||
clientOpts = append(clientOpts,
|
|
||||||
client.WithHTTPClient(httpClient),
|
if serverName != "default" {
|
||||||
client.WithHost(helper.Host),
|
context, err := GetContext(serverName)
|
||||||
client.WithDialContext(helper.Dialer),
|
if err != nil {
|
||||||
)
|
return nil, fmt.Errorf("unknown server, run \"abra server add %s\"?", serverName)
|
||||||
|
}
|
||||||
|
|
||||||
|
ctxEndpoint, err := contextPkg.GetContextEndpoint(context)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
helper, err := commandconnPkg.NewConnectionHelper(ctxEndpoint)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
httpClient := &http.Client{
|
||||||
|
Transport: &http.Transport{
|
||||||
|
DialContext: helper.Dialer,
|
||||||
|
IdleConnTimeout: 30 * time.Second,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
clientOpts = append(clientOpts,
|
||||||
|
client.WithHTTPClient(httpClient),
|
||||||
|
client.WithHost(helper.Host),
|
||||||
|
client.WithDialContext(helper.Dialer),
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
version := os.Getenv("DOCKER_API_VERSION")
|
version := os.Getenv("DOCKER_API_VERSION")
|
||||||
if version != "" {
|
if version != "" {
|
||||||
|
@ -45,10 +62,23 @@ func New(contextName string) (*client.Client, error) {
|
||||||
|
|
||||||
cl, err := client.NewClientWithOpts(clientOpts...)
|
cl, err := client.NewClientWithOpts(clientOpts...)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logrus.Fatalf("unable to create Docker client: %s", err)
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
logrus.Debugf("created client for '%s'", contextName)
|
logrus.Debugf("created client for %s", serverName)
|
||||||
|
|
||||||
|
info, err := cl.Info(context.Background())
|
||||||
|
if err != nil {
|
||||||
|
return cl, sshPkg.Fatal(serverName, err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if info.Swarm.LocalNodeState == "inactive" {
|
||||||
|
if serverName != "default" {
|
||||||
|
return cl, fmt.Errorf("swarm mode not enabled on %s?", serverName)
|
||||||
|
} else {
|
||||||
|
return cl, errors.New("swarm mode not enabled on local server?")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
return cl, nil
|
return cl, nil
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,45 +0,0 @@
|
||||||
package client
|
|
||||||
|
|
||||||
import (
|
|
||||||
"github.com/docker/cli/cli/connhelper"
|
|
||||||
"github.com/docker/cli/cli/context/docker"
|
|
||||||
dCliContextStore "github.com/docker/cli/cli/context/store"
|
|
||||||
dClient "github.com/docker/docker/client"
|
|
||||||
"github.com/sirupsen/logrus"
|
|
||||||
)
|
|
||||||
|
|
||||||
func newConnectionHelper(daemonURL string) *connhelper.ConnectionHelper {
|
|
||||||
helper, err := connhelper.GetConnectionHelper(daemonURL)
|
|
||||||
|
|
||||||
if err != nil {
|
|
||||||
logrus.Fatal(err)
|
|
||||||
}
|
|
||||||
return helper
|
|
||||||
}
|
|
||||||
|
|
||||||
func getDockerEndpoint(host string) (docker.Endpoint, error) {
|
|
||||||
skipTLSVerify := false
|
|
||||||
ep := docker.Endpoint{
|
|
||||||
EndpointMeta: docker.EndpointMeta{
|
|
||||||
Host: host,
|
|
||||||
SkipTLSVerify: skipTLSVerify,
|
|
||||||
},
|
|
||||||
}
|
|
||||||
// try to resolve a docker client, validating the configuration
|
|
||||||
opts, err := ep.ClientOpts()
|
|
||||||
if err != nil {
|
|
||||||
return docker.Endpoint{}, err
|
|
||||||
}
|
|
||||||
if _, err := dClient.NewClientWithOpts(opts...); err != nil {
|
|
||||||
return docker.Endpoint{}, err
|
|
||||||
}
|
|
||||||
return ep, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func getDockerEndpointMetadataAndTLS(host string) (docker.EndpointMeta, *dCliContextStore.EndpointTLSData, error) {
|
|
||||||
ep, err := getDockerEndpoint(host)
|
|
||||||
if err != nil {
|
|
||||||
return docker.EndpointMeta{}, nil, err
|
|
||||||
}
|
|
||||||
return ep.EndpointMeta, ep.TLSData.ToStoreTLSData(), nil
|
|
||||||
}
|
|
|
@ -1,191 +0,0 @@
|
||||||
|
|
||||||
Apache License
|
|
||||||
Version 2.0, January 2004
|
|
||||||
https://www.apache.org/licenses/
|
|
||||||
|
|
||||||
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
|
|
||||||
|
|
||||||
1. Definitions.
|
|
||||||
|
|
||||||
"License" shall mean the terms and conditions for use, reproduction,
|
|
||||||
and distribution as defined by Sections 1 through 9 of this document.
|
|
||||||
|
|
||||||
"Licensor" shall mean the copyright owner or entity authorized by
|
|
||||||
the copyright owner that is granting the License.
|
|
||||||
|
|
||||||
"Legal Entity" shall mean the union of the acting entity and all
|
|
||||||
other entities that control, are controlled by, or are under common
|
|
||||||
control with that entity. For the purposes of this definition,
|
|
||||||
"control" means (i) the power, direct or indirect, to cause the
|
|
||||||
direction or management of such entity, whether by contract or
|
|
||||||
otherwise, or (ii) ownership of fifty percent (50%) or more of the
|
|
||||||
outstanding shares, or (iii) beneficial ownership of such entity.
|
|
||||||
|
|
||||||
"You" (or "Your") shall mean an individual or Legal Entity
|
|
||||||
exercising permissions granted by this License.
|
|
||||||
|
|
||||||
"Source" form shall mean the preferred form for making modifications,
|
|
||||||
including but not limited to software source code, documentation
|
|
||||||
source, and configuration files.
|
|
||||||
|
|
||||||
"Object" form shall mean any form resulting from mechanical
|
|
||||||
transformation or translation of a Source form, including but
|
|
||||||
not limited to compiled object code, generated documentation,
|
|
||||||
and conversions to other media types.
|
|
||||||
|
|
||||||
"Work" shall mean the work of authorship, whether in Source or
|
|
||||||
Object form, made available under the License, as indicated by a
|
|
||||||
copyright notice that is included in or attached to the work
|
|
||||||
(an example is provided in the Appendix below).
|
|
||||||
|
|
||||||
"Derivative Works" shall mean any work, whether in Source or Object
|
|
||||||
form, that is based on (or derived from) the Work and for which the
|
|
||||||
editorial revisions, annotations, elaborations, or other modifications
|
|
||||||
represent, as a whole, an original work of authorship. For the purposes
|
|
||||||
of this License, Derivative Works shall not include works that remain
|
|
||||||
separable from, or merely link (or bind by name) to the interfaces of,
|
|
||||||
the Work and Derivative Works thereof.
|
|
||||||
|
|
||||||
"Contribution" shall mean any work of authorship, including
|
|
||||||
the original version of the Work and any modifications or additions
|
|
||||||
to that Work or Derivative Works thereof, that is intentionally
|
|
||||||
submitted to Licensor for inclusion in the Work by the copyright owner
|
|
||||||
or by an individual or Legal Entity authorized to submit on behalf of
|
|
||||||
the copyright owner. For the purposes of this definition, "submitted"
|
|
||||||
means any form of electronic, verbal, or written communication sent
|
|
||||||
to the Licensor or its representatives, including but not limited to
|
|
||||||
communication on electronic mailing lists, source code control systems,
|
|
||||||
and issue tracking systems that are managed by, or on behalf of, the
|
|
||||||
Licensor for the purpose of discussing and improving the Work, but
|
|
||||||
excluding communication that is conspicuously marked or otherwise
|
|
||||||
designated in writing by the copyright owner as "Not a Contribution."
|
|
||||||
|
|
||||||
"Contributor" shall mean Licensor and any individual or Legal Entity
|
|
||||||
on behalf of whom a Contribution has been received by Licensor and
|
|
||||||
subsequently incorporated within the Work.
|
|
||||||
|
|
||||||
2. Grant of Copyright License. Subject to the terms and conditions of
|
|
||||||
this License, each Contributor hereby grants to You a perpetual,
|
|
||||||
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
|
||||||
copyright license to reproduce, prepare Derivative Works of,
|
|
||||||
publicly display, publicly perform, sublicense, and distribute the
|
|
||||||
Work and such Derivative Works in Source or Object form.
|
|
||||||
|
|
||||||
3. Grant of Patent License. Subject to the terms and conditions of
|
|
||||||
this License, each Contributor hereby grants to You a perpetual,
|
|
||||||
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
|
||||||
(except as stated in this section) patent license to make, have made,
|
|
||||||
use, offer to sell, sell, import, and otherwise transfer the Work,
|
|
||||||
where such license applies only to those patent claims licensable
|
|
||||||
by such Contributor that are necessarily infringed by their
|
|
||||||
Contribution(s) alone or by combination of their Contribution(s)
|
|
||||||
with the Work to which such Contribution(s) was submitted. If You
|
|
||||||
institute patent litigation against any entity (including a
|
|
||||||
cross-claim or counterclaim in a lawsuit) alleging that the Work
|
|
||||||
or a Contribution incorporated within the Work constitutes direct
|
|
||||||
or contributory patent infringement, then any patent licenses
|
|
||||||
granted to You under this License for that Work shall terminate
|
|
||||||
as of the date such litigation is filed.
|
|
||||||
|
|
||||||
4. Redistribution. You may reproduce and distribute copies of the
|
|
||||||
Work or Derivative Works thereof in any medium, with or without
|
|
||||||
modifications, and in Source or Object form, provided that You
|
|
||||||
meet the following conditions:
|
|
||||||
|
|
||||||
(a) You must give any other recipients of the Work or
|
|
||||||
Derivative Works a copy of this License; and
|
|
||||||
|
|
||||||
(b) You must cause any modified files to carry prominent notices
|
|
||||||
stating that You changed the files; and
|
|
||||||
|
|
||||||
(c) You must retain, in the Source form of any Derivative Works
|
|
||||||
that You distribute, all copyright, patent, trademark, and
|
|
||||||
attribution notices from the Source form of the Work,
|
|
||||||
excluding those notices that do not pertain to any part of
|
|
||||||
the Derivative Works; and
|
|
||||||
|
|
||||||
(d) If the Work includes a "NOTICE" text file as part of its
|
|
||||||
distribution, then any Derivative Works that You distribute must
|
|
||||||
include a readable copy of the attribution notices contained
|
|
||||||
within such NOTICE file, excluding those notices that do not
|
|
||||||
pertain to any part of the Derivative Works, in at least one
|
|
||||||
of the following places: within a NOTICE text file distributed
|
|
||||||
as part of the Derivative Works; within the Source form or
|
|
||||||
documentation, if provided along with the Derivative Works; or,
|
|
||||||
within a display generated by the Derivative Works, if and
|
|
||||||
wherever such third-party notices normally appear. The contents
|
|
||||||
of the NOTICE file are for informational purposes only and
|
|
||||||
do not modify the License. You may add Your own attribution
|
|
||||||
notices within Derivative Works that You distribute, alongside
|
|
||||||
or as an addendum to the NOTICE text from the Work, provided
|
|
||||||
that such additional attribution notices cannot be construed
|
|
||||||
as modifying the License.
|
|
||||||
|
|
||||||
You may add Your own copyright statement to Your modifications and
|
|
||||||
may provide additional or different license terms and conditions
|
|
||||||
for use, reproduction, or distribution of Your modifications, or
|
|
||||||
for any such Derivative Works as a whole, provided Your use,
|
|
||||||
reproduction, and distribution of the Work otherwise complies with
|
|
||||||
the conditions stated in this License.
|
|
||||||
|
|
||||||
5. Submission of Contributions. Unless You explicitly state otherwise,
|
|
||||||
any Contribution intentionally submitted for inclusion in the Work
|
|
||||||
by You to the Licensor shall be under the terms and conditions of
|
|
||||||
this License, without any additional terms or conditions.
|
|
||||||
Notwithstanding the above, nothing herein shall supersede or modify
|
|
||||||
the terms of any separate license agreement you may have executed
|
|
||||||
with Licensor regarding such Contributions.
|
|
||||||
|
|
||||||
6. Trademarks. This License does not grant permission to use the trade
|
|
||||||
names, trademarks, service marks, or product names of the Licensor,
|
|
||||||
except as required for reasonable and customary use in describing the
|
|
||||||
origin of the Work and reproducing the content of the NOTICE file.
|
|
||||||
|
|
||||||
7. Disclaimer of Warranty. Unless required by applicable law or
|
|
||||||
agreed to in writing, Licensor provides the Work (and each
|
|
||||||
Contributor provides its Contributions) on an "AS IS" BASIS,
|
|
||||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
|
|
||||||
implied, including, without limitation, any warranties or conditions
|
|
||||||
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
|
|
||||||
PARTICULAR PURPOSE. You are solely responsible for determining the
|
|
||||||
appropriateness of using or redistributing the Work and assume any
|
|
||||||
risks associated with Your exercise of permissions under this License.
|
|
||||||
|
|
||||||
8. Limitation of Liability. In no event and under no legal theory,
|
|
||||||
whether in tort (including negligence), contract, or otherwise,
|
|
||||||
unless required by applicable law (such as deliberate and grossly
|
|
||||||
negligent acts) or agreed to in writing, shall any Contributor be
|
|
||||||
liable to You for damages, including any direct, indirect, special,
|
|
||||||
incidental, or consequential damages of any character arising as a
|
|
||||||
result of this License or out of the use or inability to use the
|
|
||||||
Work (including but not limited to damages for loss of goodwill,
|
|
||||||
work stoppage, computer failure or malfunction, or any and all
|
|
||||||
other commercial damages or losses), even if such Contributor
|
|
||||||
has been advised of the possibility of such damages.
|
|
||||||
|
|
||||||
9. Accepting Warranty or Additional Liability. While redistributing
|
|
||||||
the Work or Derivative Works thereof, You may choose to offer,
|
|
||||||
and charge a fee for, acceptance of support, warranty, indemnity,
|
|
||||||
or other liability obligations and/or rights consistent with this
|
|
||||||
License. However, in accepting such obligations, You may act only
|
|
||||||
on Your own behalf and on Your sole responsibility, not on behalf
|
|
||||||
of any other Contributor, and only if You agree to indemnify,
|
|
||||||
defend, and hold each Contributor harmless for any liability
|
|
||||||
incurred by, or claims asserted against, such Contributor by reason
|
|
||||||
of your accepting any such warranty or additional liability.
|
|
||||||
|
|
||||||
END OF TERMS AND CONDITIONS
|
|
||||||
|
|
||||||
Copyright 2013-2017 Docker, Inc.
|
|
||||||
|
|
||||||
Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
you may not use this file except in compliance with the License.
|
|
||||||
You may obtain a copy of the License at
|
|
||||||
|
|
||||||
https://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
|
|
||||||
Unless required by applicable law or agreed to in writing, software
|
|
||||||
distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
See the License for the specific language governing permissions and
|
|
||||||
limitations under the License.
|
|
|
@ -1,7 +0,0 @@
|
||||||
# github.com/docker/cli/cli/command/container
|
|
||||||
|
|
||||||
Due to this literally just being copy-pasted from the lib, the Apache license
|
|
||||||
will be posted in this folder. Small edits to the source code have been to
|
|
||||||
function names and parts we don't need deleted.
|
|
||||||
|
|
||||||
Same vibe as [../convert](../convert).
|
|
|
@ -4,12 +4,11 @@ import (
|
||||||
"errors"
|
"errors"
|
||||||
"fmt"
|
"fmt"
|
||||||
|
|
||||||
command "github.com/docker/cli/cli/command"
|
"coopcloud.tech/abra/pkg/context"
|
||||||
|
commandconnPkg "coopcloud.tech/abra/pkg/upstream/commandconn"
|
||||||
dConfig "github.com/docker/cli/cli/config"
|
dConfig "github.com/docker/cli/cli/config"
|
||||||
context "github.com/docker/cli/cli/context"
|
|
||||||
"github.com/docker/cli/cli/context/docker"
|
"github.com/docker/cli/cli/context/docker"
|
||||||
contextStore "github.com/docker/cli/cli/context/store"
|
contextStore "github.com/docker/cli/cli/context/store"
|
||||||
"github.com/moby/term"
|
|
||||||
"github.com/sirupsen/logrus"
|
"github.com/sirupsen/logrus"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -27,13 +26,13 @@ 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
|
||||||
}
|
}
|
||||||
|
|
||||||
// createContext interacts with Docker Context to create a Docker context config
|
// createContext interacts with Docker Context to create a Docker context config
|
||||||
func createContext(name string, host string) error {
|
func createContext(name string, host string) error {
|
||||||
s := NewDefaultDockerContextStore()
|
s := context.NewDefaultDockerContextStore()
|
||||||
contextMetadata := contextStore.Metadata{
|
contextMetadata := contextStore.Metadata{
|
||||||
Endpoints: make(map[string]interface{}),
|
Endpoints: make(map[string]interface{}),
|
||||||
Name: name,
|
Name: name,
|
||||||
|
@ -43,7 +42,7 @@ func createContext(name string, host string) error {
|
||||||
Endpoints: make(map[string]contextStore.EndpointTLSData),
|
Endpoints: make(map[string]contextStore.EndpointTLSData),
|
||||||
}
|
}
|
||||||
|
|
||||||
dockerEP, dockerTLS, err := getDockerEndpointMetadataAndTLS(host)
|
dockerEP, dockerTLS, err := commandconnPkg.GetDockerEndpointMetadataAndTLS(host)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
@ -73,56 +72,20 @@ 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 {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
return NewDefaultDockerContextStore().Remove(name)
|
return context.NewDefaultDockerContextStore().Remove(name)
|
||||||
}
|
}
|
||||||
|
|
||||||
func GetContext(contextName string) (contextStore.Metadata, error) {
|
func GetContext(contextName string) (contextStore.Metadata, error) {
|
||||||
ctx, err := NewDefaultDockerContextStore().GetMetadata(contextName)
|
ctx, err := context.NewDefaultDockerContextStore().GetMetadata(contextName)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return contextStore.Metadata{}, err
|
return contextStore.Metadata{}, err
|
||||||
}
|
}
|
||||||
|
|
||||||
return ctx, nil
|
return ctx, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func GetContextEndpoint(ctx contextStore.Metadata) (string, error) {
|
|
||||||
// safe to use docker key hardcoded since abra doesn't use k8s... yet...
|
|
||||||
endpointmeta, ok := ctx.Endpoints["docker"].(context.EndpointMetaBase)
|
|
||||||
if !ok {
|
|
||||||
err := errors.New("context lacks Docker endpoint")
|
|
||||||
return "", err
|
|
||||||
}
|
|
||||||
return endpointmeta.Host, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func newContextStore(dir string, config contextStore.Config) contextStore.Store {
|
|
||||||
return contextStore.New(dir, config)
|
|
||||||
}
|
|
||||||
|
|
||||||
func NewDefaultDockerContextStore() *command.ContextStoreWithDefault {
|
|
||||||
// Grabbing the stderr from Docker commands
|
|
||||||
// Much easier to fit this into the code we are using to replicate docker cli commands
|
|
||||||
_, _, stderr := term.StdStreams()
|
|
||||||
// TODO: Look into custom docker configs in case users want that
|
|
||||||
dockerConfig := dConfig.LoadDefaultConfigFile(stderr)
|
|
||||||
contextDir := dConfig.ContextStoreDir()
|
|
||||||
storeConfig := command.DefaultContextStoreConfig()
|
|
||||||
store := newContextStore(contextDir, storeConfig)
|
|
||||||
|
|
||||||
dockerContextStore := &command.ContextStoreWithDefault{
|
|
||||||
Store: store,
|
|
||||||
Resolver: func() (*command.DefaultContext, error) {
|
|
||||||
// nil for the Opts because it works without it and its a cli thing
|
|
||||||
return command.ResolveDefaultContext(nil, dockerConfig, storeConfig, stderr)
|
|
||||||
},
|
|
||||||
}
|
|
||||||
return dockerContextStore
|
|
||||||
}
|
|
||||||
|
|
|
@ -1,52 +0,0 @@
|
||||||
package client_test
|
|
||||||
|
|
||||||
import (
|
|
||||||
"testing"
|
|
||||||
|
|
||||||
"coopcloud.tech/abra/pkg/client"
|
|
||||||
dContext "github.com/docker/cli/cli/context"
|
|
||||||
dCliContextStore "github.com/docker/cli/cli/context/store"
|
|
||||||
)
|
|
||||||
|
|
||||||
type TestContext struct {
|
|
||||||
context dCliContextStore.Metadata
|
|
||||||
expected_endpoint string
|
|
||||||
}
|
|
||||||
|
|
||||||
func dockerContext(host, key string) TestContext {
|
|
||||||
dockerContext := dCliContextStore.Metadata{
|
|
||||||
Name: "foo",
|
|
||||||
Metadata: nil,
|
|
||||||
Endpoints: map[string]interface{}{
|
|
||||||
key: dContext.EndpointMetaBase{
|
|
||||||
Host: host,
|
|
||||||
SkipTLSVerify: false,
|
|
||||||
},
|
|
||||||
},
|
|
||||||
}
|
|
||||||
return TestContext{
|
|
||||||
context: dockerContext,
|
|
||||||
expected_endpoint: host,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestGetContextEndpoint(t *testing.T) {
|
|
||||||
var testDockerContexts = []TestContext{
|
|
||||||
dockerContext("ssh://foobar", "docker"),
|
|
||||||
dockerContext("ssh://foobar", "k8"),
|
|
||||||
}
|
|
||||||
for _, context := range testDockerContexts {
|
|
||||||
endpoint, err := client.GetContextEndpoint(context.context)
|
|
||||||
if err != nil {
|
|
||||||
if err.Error() != "context lacks Docker endpoint" {
|
|
||||||
t.Error(err)
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
if endpoint != context.expected_endpoint {
|
|
||||||
t.Errorf("did not get correct context endpoint. Expected: %s, received: %s", context.expected_endpoint, endpoint)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
|
@ -1,191 +0,0 @@
|
||||||
|
|
||||||
Apache License
|
|
||||||
Version 2.0, January 2004
|
|
||||||
https://www.apache.org/licenses/
|
|
||||||
|
|
||||||
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
|
|
||||||
|
|
||||||
1. Definitions.
|
|
||||||
|
|
||||||
"License" shall mean the terms and conditions for use, reproduction,
|
|
||||||
and distribution as defined by Sections 1 through 9 of this document.
|
|
||||||
|
|
||||||
"Licensor" shall mean the copyright owner or entity authorized by
|
|
||||||
the copyright owner that is granting the License.
|
|
||||||
|
|
||||||
"Legal Entity" shall mean the union of the acting entity and all
|
|
||||||
other entities that control, are controlled by, or are under common
|
|
||||||
control with that entity. For the purposes of this definition,
|
|
||||||
"control" means (i) the power, direct or indirect, to cause the
|
|
||||||
direction or management of such entity, whether by contract or
|
|
||||||
otherwise, or (ii) ownership of fifty percent (50%) or more of the
|
|
||||||
outstanding shares, or (iii) beneficial ownership of such entity.
|
|
||||||
|
|
||||||
"You" (or "Your") shall mean an individual or Legal Entity
|
|
||||||
exercising permissions granted by this License.
|
|
||||||
|
|
||||||
"Source" form shall mean the preferred form for making modifications,
|
|
||||||
including but not limited to software source code, documentation
|
|
||||||
source, and configuration files.
|
|
||||||
|
|
||||||
"Object" form shall mean any form resulting from mechanical
|
|
||||||
transformation or translation of a Source form, including but
|
|
||||||
not limited to compiled object code, generated documentation,
|
|
||||||
and conversions to other media types.
|
|
||||||
|
|
||||||
"Work" shall mean the work of authorship, whether in Source or
|
|
||||||
Object form, made available under the License, as indicated by a
|
|
||||||
copyright notice that is included in or attached to the work
|
|
||||||
(an example is provided in the Appendix below).
|
|
||||||
|
|
||||||
"Derivative Works" shall mean any work, whether in Source or Object
|
|
||||||
form, that is based on (or derived from) the Work and for which the
|
|
||||||
editorial revisions, annotations, elaborations, or other modifications
|
|
||||||
represent, as a whole, an original work of authorship. For the purposes
|
|
||||||
of this License, Derivative Works shall not include works that remain
|
|
||||||
separable from, or merely link (or bind by name) to the interfaces of,
|
|
||||||
the Work and Derivative Works thereof.
|
|
||||||
|
|
||||||
"Contribution" shall mean any work of authorship, including
|
|
||||||
the original version of the Work and any modifications or additions
|
|
||||||
to that Work or Derivative Works thereof, that is intentionally
|
|
||||||
submitted to Licensor for inclusion in the Work by the copyright owner
|
|
||||||
or by an individual or Legal Entity authorized to submit on behalf of
|
|
||||||
the copyright owner. For the purposes of this definition, "submitted"
|
|
||||||
means any form of electronic, verbal, or written communication sent
|
|
||||||
to the Licensor or its representatives, including but not limited to
|
|
||||||
communication on electronic mailing lists, source code control systems,
|
|
||||||
and issue tracking systems that are managed by, or on behalf of, the
|
|
||||||
Licensor for the purpose of discussing and improving the Work, but
|
|
||||||
excluding communication that is conspicuously marked or otherwise
|
|
||||||
designated in writing by the copyright owner as "Not a Contribution."
|
|
||||||
|
|
||||||
"Contributor" shall mean Licensor and any individual or Legal Entity
|
|
||||||
on behalf of whom a Contribution has been received by Licensor and
|
|
||||||
subsequently incorporated within the Work.
|
|
||||||
|
|
||||||
2. Grant of Copyright License. Subject to the terms and conditions of
|
|
||||||
this License, each Contributor hereby grants to You a perpetual,
|
|
||||||
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
|
||||||
copyright license to reproduce, prepare Derivative Works of,
|
|
||||||
publicly display, publicly perform, sublicense, and distribute the
|
|
||||||
Work and such Derivative Works in Source or Object form.
|
|
||||||
|
|
||||||
3. Grant of Patent License. Subject to the terms and conditions of
|
|
||||||
this License, each Contributor hereby grants to You a perpetual,
|
|
||||||
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
|
||||||
(except as stated in this section) patent license to make, have made,
|
|
||||||
use, offer to sell, sell, import, and otherwise transfer the Work,
|
|
||||||
where such license applies only to those patent claims licensable
|
|
||||||
by such Contributor that are necessarily infringed by their
|
|
||||||
Contribution(s) alone or by combination of their Contribution(s)
|
|
||||||
with the Work to which such Contribution(s) was submitted. If You
|
|
||||||
institute patent litigation against any entity (including a
|
|
||||||
cross-claim or counterclaim in a lawsuit) alleging that the Work
|
|
||||||
or a Contribution incorporated within the Work constitutes direct
|
|
||||||
or contributory patent infringement, then any patent licenses
|
|
||||||
granted to You under this License for that Work shall terminate
|
|
||||||
as of the date such litigation is filed.
|
|
||||||
|
|
||||||
4. Redistribution. You may reproduce and distribute copies of the
|
|
||||||
Work or Derivative Works thereof in any medium, with or without
|
|
||||||
modifications, and in Source or Object form, provided that You
|
|
||||||
meet the following conditions:
|
|
||||||
|
|
||||||
(a) You must give any other recipients of the Work or
|
|
||||||
Derivative Works a copy of this License; and
|
|
||||||
|
|
||||||
(b) You must cause any modified files to carry prominent notices
|
|
||||||
stating that You changed the files; and
|
|
||||||
|
|
||||||
(c) You must retain, in the Source form of any Derivative Works
|
|
||||||
that You distribute, all copyright, patent, trademark, and
|
|
||||||
attribution notices from the Source form of the Work,
|
|
||||||
excluding those notices that do not pertain to any part of
|
|
||||||
the Derivative Works; and
|
|
||||||
|
|
||||||
(d) If the Work includes a "NOTICE" text file as part of its
|
|
||||||
distribution, then any Derivative Works that You distribute must
|
|
||||||
include a readable copy of the attribution notices contained
|
|
||||||
within such NOTICE file, excluding those notices that do not
|
|
||||||
pertain to any part of the Derivative Works, in at least one
|
|
||||||
of the following places: within a NOTICE text file distributed
|
|
||||||
as part of the Derivative Works; within the Source form or
|
|
||||||
documentation, if provided along with the Derivative Works; or,
|
|
||||||
within a display generated by the Derivative Works, if and
|
|
||||||
wherever such third-party notices normally appear. The contents
|
|
||||||
of the NOTICE file are for informational purposes only and
|
|
||||||
do not modify the License. You may add Your own attribution
|
|
||||||
notices within Derivative Works that You distribute, alongside
|
|
||||||
or as an addendum to the NOTICE text from the Work, provided
|
|
||||||
that such additional attribution notices cannot be construed
|
|
||||||
as modifying the License.
|
|
||||||
|
|
||||||
You may add Your own copyright statement to Your modifications and
|
|
||||||
may provide additional or different license terms and conditions
|
|
||||||
for use, reproduction, or distribution of Your modifications, or
|
|
||||||
for any such Derivative Works as a whole, provided Your use,
|
|
||||||
reproduction, and distribution of the Work otherwise complies with
|
|
||||||
the conditions stated in this License.
|
|
||||||
|
|
||||||
5. Submission of Contributions. Unless You explicitly state otherwise,
|
|
||||||
any Contribution intentionally submitted for inclusion in the Work
|
|
||||||
by You to the Licensor shall be under the terms and conditions of
|
|
||||||
this License, without any additional terms or conditions.
|
|
||||||
Notwithstanding the above, nothing herein shall supersede or modify
|
|
||||||
the terms of any separate license agreement you may have executed
|
|
||||||
with Licensor regarding such Contributions.
|
|
||||||
|
|
||||||
6. Trademarks. This License does not grant permission to use the trade
|
|
||||||
names, trademarks, service marks, or product names of the Licensor,
|
|
||||||
except as required for reasonable and customary use in describing the
|
|
||||||
origin of the Work and reproducing the content of the NOTICE file.
|
|
||||||
|
|
||||||
7. Disclaimer of Warranty. Unless required by applicable law or
|
|
||||||
agreed to in writing, Licensor provides the Work (and each
|
|
||||||
Contributor provides its Contributions) on an "AS IS" BASIS,
|
|
||||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
|
|
||||||
implied, including, without limitation, any warranties or conditions
|
|
||||||
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
|
|
||||||
PARTICULAR PURPOSE. You are solely responsible for determining the
|
|
||||||
appropriateness of using or redistributing the Work and assume any
|
|
||||||
risks associated with Your exercise of permissions under this License.
|
|
||||||
|
|
||||||
8. Limitation of Liability. In no event and under no legal theory,
|
|
||||||
whether in tort (including negligence), contract, or otherwise,
|
|
||||||
unless required by applicable law (such as deliberate and grossly
|
|
||||||
negligent acts) or agreed to in writing, shall any Contributor be
|
|
||||||
liable to You for damages, including any direct, indirect, special,
|
|
||||||
incidental, or consequential damages of any character arising as a
|
|
||||||
result of this License or out of the use or inability to use the
|
|
||||||
Work (including but not limited to damages for loss of goodwill,
|
|
||||||
work stoppage, computer failure or malfunction, or any and all
|
|
||||||
other commercial damages or losses), even if such Contributor
|
|
||||||
has been advised of the possibility of such damages.
|
|
||||||
|
|
||||||
9. Accepting Warranty or Additional Liability. While redistributing
|
|
||||||
the Work or Derivative Works thereof, You may choose to offer,
|
|
||||||
and charge a fee for, acceptance of support, warranty, indemnity,
|
|
||||||
or other liability obligations and/or rights consistent with this
|
|
||||||
License. However, in accepting such obligations, You may act only
|
|
||||||
on Your own behalf and on Your sole responsibility, not on behalf
|
|
||||||
of any other Contributor, and only if You agree to indemnify,
|
|
||||||
defend, and hold each Contributor harmless for any liability
|
|
||||||
incurred by, or claims asserted against, such Contributor by reason
|
|
||||||
of your accepting any such warranty or additional liability.
|
|
||||||
|
|
||||||
END OF TERMS AND CONDITIONS
|
|
||||||
|
|
||||||
Copyright 2013-2017 Docker, Inc.
|
|
||||||
|
|
||||||
Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
you may not use this file except in compliance with the License.
|
|
||||||
You may obtain a copy of the License at
|
|
||||||
|
|
||||||
https://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
|
|
||||||
Unless required by applicable law or agreed to in writing, software
|
|
||||||
distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
See the License for the specific language governing permissions and
|
|
||||||
limitations under the License.
|
|
|
@ -1,10 +0,0 @@
|
||||||
# github.com/docker/cli/cli/compose/convert
|
|
||||||
|
|
||||||
DISCLAIMER: This is like the entire `github.com/docker/cli/cli/compose/convert`
|
|
||||||
package. This should be an easy import but importing it creates DEPENDENCY
|
|
||||||
HELL. I tried for an hour to fix it but it would work. TRY TO FIX AT YOUR OWN
|
|
||||||
RISK!!!
|
|
||||||
|
|
||||||
Due to this literally just being copy-pasted from the lib, the Apache license
|
|
||||||
will be posted in this folder. Small edits to the source code have been to
|
|
||||||
function names and parts we don't need deleted.
|
|
|
@ -1,170 +1,28 @@
|
||||||
package client
|
package client
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"encoding/json"
|
"context"
|
||||||
"fmt"
|
"fmt"
|
||||||
"io/ioutil"
|
|
||||||
"net/http"
|
|
||||||
"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"
|
||||||
)
|
)
|
||||||
|
|
||||||
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.
|
|
||||||
func getRegv2Token(image reference.Named) (string, error) {
|
|
||||||
img := 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)
|
|
||||||
if err != nil {
|
|
||||||
return "", err
|
|
||||||
}
|
|
||||||
|
|
||||||
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 "", 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 err := json.Unmarshal(body, ®istryResT2); err != nil {
|
|
||||||
return "", err
|
|
||||||
}
|
|
||||||
digest = strings.Split(registryResT2.Config.Digest, ":")[1][:7]
|
|
||||||
}
|
|
||||||
|
|
||||||
if digest == "" {
|
|
||||||
return "", fmt.Errorf("Unable to retrieve amd64 digest for '%s'", image)
|
|
||||||
}
|
|
||||||
|
|
||||||
return digest, nil
|
|
||||||
}
|
|
||||||
|
|
|
@ -4,20 +4,14 @@ import (
|
||||||
"context"
|
"context"
|
||||||
|
|
||||||
"github.com/docker/docker/api/types/swarm"
|
"github.com/docker/docker/api/types/swarm"
|
||||||
|
"github.com/docker/docker/client"
|
||||||
)
|
)
|
||||||
|
|
||||||
func StoreSecret(secretName, secretValue, server string) error {
|
func StoreSecret(cl *client.Client, secretName, secretValue, server string) error {
|
||||||
cl, err := New(server)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
ctx := context.Background()
|
|
||||||
ann := swarm.Annotations{Name: secretName}
|
ann := swarm.Annotations{Name: secretName}
|
||||||
spec := swarm.SecretSpec{Annotations: ann, Data: []byte(secretValue)}
|
spec := swarm.SecretSpec{Annotations: ann, Data: []byte(secretValue)}
|
||||||
|
|
||||||
// We don't bother with the secret IDs for now
|
if _, err := cl.SecretCreate(context.Background(), spec); err != nil {
|
||||||
if _, err := cl.SecretCreate(ctx, spec); err != nil {
|
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -2,50 +2,61 @@ package client
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
|
"fmt"
|
||||||
|
"time"
|
||||||
|
|
||||||
"github.com/docker/docker/api/types"
|
|
||||||
"github.com/docker/docker/api/types/filters"
|
"github.com/docker/docker/api/types/filters"
|
||||||
|
"github.com/docker/docker/api/types/volume"
|
||||||
|
"github.com/docker/docker/client"
|
||||||
"github.com/sirupsen/logrus"
|
"github.com/sirupsen/logrus"
|
||||||
)
|
)
|
||||||
|
|
||||||
func GetVolumes(ctx context.Context, server string, appName string) ([]*types.Volume, error) {
|
func GetVolumes(cl *client.Client, ctx context.Context, server string, fs filters.Args) ([]*volume.Volume, error) {
|
||||||
|
volumeListOKBody, err := cl.VolumeList(ctx, volume.ListOptions{Filters: fs})
|
||||||
cl, err := New(server)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
fs := filters.NewArgs()
|
|
||||||
fs.Add("name", appName)
|
|
||||||
|
|
||||||
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
|
||||||
}
|
}
|
||||||
|
|
||||||
func GetVolumeNames(volumes []*types.Volume) []string {
|
func GetVolumeNames(volumes []*volume.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
|
||||||
}
|
}
|
||||||
|
|
||||||
func RemoveVolumes(ctx context.Context, server string, volumeNames []string, force bool) error {
|
func RemoveVolumes(cl *client.Client, ctx context.Context, volumeNames []string, force bool, retries int) error {
|
||||||
cl, err := New(server)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
for _, volName := range volumeNames {
|
for _, volName := range volumeNames {
|
||||||
err := cl.VolumeRemove(ctx, volName, force)
|
err := retryFunc(5, func() error {
|
||||||
|
return cl.VolumeRemove(context.Background(), volName, force)
|
||||||
|
})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return fmt.Errorf("volume %s: %s", volName, err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return nil
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// retryFunc retries the given function for the given retries. After the nth
|
||||||
|
// retry it waits (n + 1)^2 seconds before the next retry (starting with n=0).
|
||||||
|
// It returns an error if the function still failed after the last retry.
|
||||||
|
func retryFunc(retries int, fn func() error) error {
|
||||||
|
for i := 0; i < retries; i++ {
|
||||||
|
err := fn()
|
||||||
|
if err == nil {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
if i+1 < retries {
|
||||||
|
sleep := time.Duration(i+1) * time.Duration(i+1)
|
||||||
|
logrus.Infof("%s: waiting %d seconds before next retry", err, sleep)
|
||||||
|
time.Sleep(sleep * time.Second)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return fmt.Errorf("%d retries failed", retries)
|
||||||
}
|
}
|
||||||
|
|
|
@ -0,0 +1,26 @@
|
||||||
|
package client
|
||||||
|
|
||||||
|
import (
|
||||||
|
"fmt"
|
||||||
|
"testing"
|
||||||
|
)
|
||||||
|
|
||||||
|
func TestRetryFunc(t *testing.T) {
|
||||||
|
err := retryFunc(1, func() error { return nil })
|
||||||
|
if err != nil {
|
||||||
|
t.Errorf("should not return an error: %s", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
i := 0
|
||||||
|
fn := func() error {
|
||||||
|
i++
|
||||||
|
return fmt.Errorf("oh no, something went wrong!")
|
||||||
|
}
|
||||||
|
err = retryFunc(2, fn)
|
||||||
|
if err == nil {
|
||||||
|
t.Error("should return an error")
|
||||||
|
}
|
||||||
|
if i != 2 {
|
||||||
|
t.Errorf("The function should have been called 1 times, got %d", i)
|
||||||
|
}
|
||||||
|
}
|
|
@ -3,31 +3,40 @@ package compose
|
||||||
import (
|
import (
|
||||||
"fmt"
|
"fmt"
|
||||||
"io/ioutil"
|
"io/ioutil"
|
||||||
|
"path"
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
"coopcloud.tech/abra/pkg/client/stack"
|
"coopcloud.tech/abra/pkg/config"
|
||||||
loader "coopcloud.tech/abra/pkg/client/stack"
|
"coopcloud.tech/abra/pkg/formatter"
|
||||||
|
"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"
|
||||||
"github.com/docker/distribution/reference"
|
"github.com/docker/distribution/reference"
|
||||||
"github.com/sirupsen/logrus"
|
"github.com/sirupsen/logrus"
|
||||||
)
|
)
|
||||||
|
|
||||||
// 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 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}}
|
||||||
emptyEnv := make(map[string]string)
|
|
||||||
compose, err := loader.LoadComposefile(opts, emptyEnv)
|
envSamplePath := path.Join(config.RECIPES_DIR, recipeName, ".env.sample")
|
||||||
|
sampleEnv, err := config.ReadEnv(envSamplePath)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return false, err
|
||||||
|
}
|
||||||
|
|
||||||
|
compose, err := loader.LoadComposefile(opts, sampleEnv)
|
||||||
|
if err != nil {
|
||||||
|
return false, err
|
||||||
}
|
}
|
||||||
|
|
||||||
for _, service := range compose.Services {
|
for _, service := range compose.Services {
|
||||||
|
@ -37,55 +46,63 @@ func UpdateTag(pattern, image, tag 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.
|
||||||
func UpdateLabel(pattern, serviceName, label string) error {
|
func UpdateLabel(pattern, serviceName, label, recipeName string) error {
|
||||||
composeFiles, err := filepath.Glob(pattern)
|
composeFiles, err := filepath.Glob(pattern)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
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}}
|
||||||
emptyEnv := make(map[string]string)
|
|
||||||
compose, err := loader.LoadComposefile(opts, emptyEnv)
|
envSamplePath := path.Join(config.RECIPES_DIR, recipeName, ".env.sample")
|
||||||
|
sampleEnv, err := config.ReadEnv(envSamplePath)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
compose, err := loader.LoadComposefile(opts, sampleEnv)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
@ -103,23 +120,38 @@ func UpdateLabel(pattern, serviceName, label string) error {
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
|
||||||
|
discovered := false
|
||||||
for oldLabel, value := range service.Deploy.Labels {
|
for oldLabel, value := range service.Deploy.Labels {
|
||||||
if strings.HasPrefix(oldLabel, "coop-cloud") {
|
if strings.HasPrefix(oldLabel, "coop-cloud") && strings.Contains(oldLabel, "version") {
|
||||||
|
discovered = true
|
||||||
|
|
||||||
bytes, err := ioutil.ReadFile(composeFile)
|
bytes, err := ioutil.ReadFile(composeFile)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
old := fmt.Sprintf("coop-cloud.${STACK_NAME}.%s.version=%s", service.Name, 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)
|
||||||
|
|
||||||
logrus.Debugf("updating '%s' to '%s' in '%s'", old, label, compose.Filename)
|
if old == label {
|
||||||
|
logrus.Warnf("%s is already set, nothing to do?", label)
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
if err := ioutil.WriteFile(compose.Filename, []byte(replacedBytes), 0644); err != nil {
|
logrus.Debugf("updating %s to %s in %s", old, label, compose.Filename)
|
||||||
|
|
||||||
|
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 {
|
||||||
|
logrus.Warn("no existing label found, automagic insertion not supported yet")
|
||||||
|
logrus.Fatalf("add '- \"%s\"' manually to the 'app' service in %s", label, composeFile)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
|
|
|
@ -1,18 +1,22 @@
|
||||||
package config
|
package config
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"errors"
|
|
||||||
"fmt"
|
"fmt"
|
||||||
"io/ioutil"
|
"io/ioutil"
|
||||||
"os"
|
"os"
|
||||||
"path"
|
"path"
|
||||||
"path/filepath"
|
"strconv"
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
"coopcloud.tech/abra/pkg/client/convert"
|
"github.com/schollz/progressbar/v3"
|
||||||
loader "coopcloud.tech/abra/pkg/client/stack"
|
|
||||||
stack "coopcloud.tech/abra/pkg/client/stack"
|
"coopcloud.tech/abra/pkg/client"
|
||||||
|
"coopcloud.tech/abra/pkg/formatter"
|
||||||
|
"coopcloud.tech/abra/pkg/upstream/convert"
|
||||||
|
loader "coopcloud.tech/abra/pkg/upstream/stack"
|
||||||
|
stack "coopcloud.tech/abra/pkg/upstream/stack"
|
||||||
composetypes "github.com/docker/cli/cli/compose/types"
|
composetypes "github.com/docker/cli/cli/compose/types"
|
||||||
|
"github.com/docker/docker/api/types/filters"
|
||||||
"github.com/sirupsen/logrus"
|
"github.com/sirupsen/logrus"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -21,6 +25,9 @@ import (
|
||||||
// AppEnv is a map of the values in an apps env config
|
// AppEnv is a map of the values in an apps env config
|
||||||
type AppEnv = map[string]string
|
type AppEnv = map[string]string
|
||||||
|
|
||||||
|
// AppModifiers is a map of modifiers in an apps env config
|
||||||
|
type AppModifiers = map[string]map[string]string
|
||||||
|
|
||||||
// AppName is AppName
|
// AppName is AppName
|
||||||
type AppName = string
|
type AppName = string
|
||||||
|
|
||||||
|
@ -36,19 +43,97 @@ 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
|
// See documentation of config.StackName
|
||||||
func (a App) StackName() string {
|
func (a App) StackName() string {
|
||||||
return SanitiseAppName(a.Name)
|
if _, exists := a.Env["STACK_NAME"]; exists {
|
||||||
|
return a.Env["STACK_NAME"]
|
||||||
|
}
|
||||||
|
|
||||||
|
stackName := StackName(a.Name)
|
||||||
|
|
||||||
|
a.Env["STACK_NAME"] = stackName
|
||||||
|
|
||||||
|
return stackName
|
||||||
}
|
}
|
||||||
|
|
||||||
// SORTING TYPES
|
// StackName gets whatever the docker safe (uses the right delimiting
|
||||||
|
// character, e.g. "_") stack name is for the app. In general, you don't want
|
||||||
|
// to use this to show anything to end-users, you want use a.Name instead.
|
||||||
|
func StackName(appName string) string {
|
||||||
|
stackName := SanitiseAppName(appName)
|
||||||
|
|
||||||
|
if len(stackName) > MAX_SANITISED_APP_NAME_LENGTH {
|
||||||
|
logrus.Debugf("trimming %s to %s to avoid runtime limits", stackName, stackName[:MAX_SANITISED_APP_NAME_LENGTH])
|
||||||
|
stackName = stackName[:MAX_SANITISED_APP_NAME_LENGTH]
|
||||||
|
}
|
||||||
|
|
||||||
|
return stackName
|
||||||
|
}
|
||||||
|
|
||||||
|
// Filters retrieves app filters for querying the container runtime. By default
|
||||||
|
// it filters on all services in the app. It is also possible to pass an
|
||||||
|
// otional list of service names, which get filtered instead.
|
||||||
|
//
|
||||||
|
// Due to upstream issues, filtering works different depending on what you're
|
||||||
|
// querying. So, for example, secrets don't work with regex! The caller needs
|
||||||
|
// to implement their own validation that the right secrets are matched. In
|
||||||
|
// order to handle these cases, we provide the `appendServiceNames` /
|
||||||
|
// `exactMatch` modifiers.
|
||||||
|
func (a App) Filters(appendServiceNames, exactMatch bool, services ...string) (filters.Args, error) {
|
||||||
|
filters := filters.NewArgs()
|
||||||
|
if len(services) > 0 {
|
||||||
|
for _, serviceName := range services {
|
||||||
|
filters.Add("name", ServiceFilter(a.StackName(), serviceName, exactMatch))
|
||||||
|
}
|
||||||
|
return filters, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// When not appending the service name, just add one filter for the whole
|
||||||
|
// stack.
|
||||||
|
if !appendServiceNames {
|
||||||
|
f := fmt.Sprintf("%s", a.StackName())
|
||||||
|
if exactMatch {
|
||||||
|
f = fmt.Sprintf("^%s", f)
|
||||||
|
}
|
||||||
|
filters.Add("name", f)
|
||||||
|
return filters, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
composeFiles, err := GetComposeFiles(a.Recipe, a.Env)
|
||||||
|
if err != nil {
|
||||||
|
return filters, err
|
||||||
|
}
|
||||||
|
|
||||||
|
opts := stack.Deploy{Composefiles: composeFiles}
|
||||||
|
compose, err := GetAppComposeConfig(a.Recipe, opts, a.Env)
|
||||||
|
if err != nil {
|
||||||
|
return filters, err
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, service := range compose.Services {
|
||||||
|
f := ServiceFilter(a.StackName(), service.Name, exactMatch)
|
||||||
|
filters.Add("name", f)
|
||||||
|
}
|
||||||
|
|
||||||
|
return filters, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// ServiceFilter creates a filter string for filtering a service in the docker
|
||||||
|
// container runtime. When exact match is true, it uses regex to match the
|
||||||
|
// string exactly.
|
||||||
|
func ServiceFilter(stack, service string, exact bool) string {
|
||||||
|
if exact {
|
||||||
|
return fmt.Sprintf("^%s_%s", stack, service)
|
||||||
|
}
|
||||||
|
return fmt.Sprintf("%s_%s", stack, service)
|
||||||
|
}
|
||||||
|
|
||||||
// ByServer sort a slice of Apps
|
// ByServer sort a slice of Apps
|
||||||
type ByServer []App
|
type ByServer []App
|
||||||
|
@ -59,25 +144,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
|
||||||
|
@ -89,85 +174,90 @@ func (a ByName) Less(i, j int) bool {
|
||||||
return strings.ToLower(a[i].Name) < strings.ToLower(a[j].Name)
|
return strings.ToLower(a[i].Name) < strings.ToLower(a[j].Name)
|
||||||
}
|
}
|
||||||
|
|
||||||
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
|
||||||
}
|
}
|
||||||
|
|
||||||
// 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 TYPE 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,
|
||||||
}, nil
|
}, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// LoadAppFiles gets all app files for a given set of servers or all servers
|
// LoadAppFiles gets all app files for a given set of servers or all servers.
|
||||||
func LoadAppFiles(servers ...string) (AppFiles, error) {
|
func LoadAppFiles(servers ...string) (AppFiles, error) {
|
||||||
appFiles := make(AppFiles)
|
appFiles := make(AppFiles)
|
||||||
if len(servers) == 1 {
|
if len(servers) == 1 {
|
||||||
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 appFiles, err
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
logrus.Debugf("collecting metadata from '%v' servers: '%s'", len(servers), servers)
|
logrus.Debugf("collecting metadata from %v servers: %s", len(servers), strings.Join(servers, ", "))
|
||||||
|
|
||||||
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 appFiles, 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,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return appFiles, nil
|
return appFiles, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// GetApp loads an apps settings, reading it from file, in preparation to use it
|
// GetApp loads an apps settings, reading it from file, in preparation to use
|
||||||
//
|
// it. It should only be used when ready to use the env file to keep IO
|
||||||
// ONLY use when ready to use the env file to keep IO down
|
// operations down.
|
||||||
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)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return App{}, err
|
return App{}, err
|
||||||
}
|
}
|
||||||
|
@ -175,8 +265,9 @@ func GetApp(apps AppFiles, name AppName) (App, error) {
|
||||||
return app, nil
|
return app, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// GetApps returns a slice of Apps with their env files read from a given slice of AppFiles
|
// GetApps returns a slice of Apps with their env files read from a given
|
||||||
func GetApps(appFiles AppFiles) ([]App, error) {
|
// slice of AppFiles.
|
||||||
|
func GetApps(appFiles AppFiles, recipeFilter string) ([]App, error) {
|
||||||
var apps []App
|
var apps []App
|
||||||
|
|
||||||
for name := range appFiles {
|
for name := range appFiles {
|
||||||
|
@ -184,7 +275,14 @@ func GetApps(appFiles AppFiles) ([]App, error) {
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
apps = append(apps, app)
|
|
||||||
|
if recipeFilter != "" {
|
||||||
|
if app.Recipe == recipeFilter {
|
||||||
|
apps = append(apps, app)
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
apps = append(apps, app)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return apps, nil
|
return apps, nil
|
||||||
|
@ -204,13 +302,13 @@ func GetAppServiceNames(appName string) ([]string, error) {
|
||||||
return serviceNames, err
|
return serviceNames, err
|
||||||
}
|
}
|
||||||
|
|
||||||
composeFiles, err := GetAppComposeFiles(app.Type, app.Env)
|
composeFiles, err := GetComposeFiles(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
|
||||||
}
|
}
|
||||||
|
@ -231,7 +329,7 @@ func GetAppNames() ([]string, error) {
|
||||||
return appNames, err
|
return appNames, err
|
||||||
}
|
}
|
||||||
|
|
||||||
apps, err := GetApps(appFiles)
|
apps, err := GetApps(appFiles, "")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return appNames, err
|
return appNames, err
|
||||||
}
|
}
|
||||||
|
@ -243,86 +341,178 @@ func GetAppNames() ([]string, error) {
|
||||||
return appNames, nil
|
return appNames, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// CopyAppEnvSample 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
|
||||||
func CopyAppEnvSample(appType, appName, server string) error {
|
// env files.
|
||||||
envSamplePath := path.Join(ABRA_DIR, "apps", appType, ".env.sample")
|
func TemplateAppEnvSample(recipeName, appName, server, domain string) error {
|
||||||
|
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.IsNotExist(err) {
|
||||||
return fmt.Errorf("%s already exists?", appEnvPath)
|
return fmt.Errorf("%s already exists?", appEnvPath)
|
||||||
}
|
}
|
||||||
|
|
||||||
err = ioutil.WriteFile(appEnvPath, envSample, 0755)
|
err = ioutil.WriteFile(appEnvPath, envSample, 0o664)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
logrus.Debugf("copied '%s' to '%s'", envSamplePath, appEnvPath)
|
read, err := ioutil.ReadFile(appEnvPath)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
newContents := strings.Replace(string(read), recipeName+".example.com", domain, -1)
|
||||||
|
|
||||||
|
err = ioutil.WriteFile(appEnvPath, []byte(newContents), 0)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
logrus.Debugf("copied & templated %s to %s", envSamplePath, appEnvPath)
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// SanitiseAppName makes a app name usable with Docker by replacing illegal characters
|
// SanitiseAppName makes a app name usable with Docker by replacing illegal
|
||||||
|
// characters.
|
||||||
func SanitiseAppName(name string) string {
|
func SanitiseAppName(name string) string {
|
||||||
return strings.ReplaceAll(name, ".", "_")
|
return strings.ReplaceAll(name, ".", "_")
|
||||||
}
|
}
|
||||||
|
|
||||||
// GetAppStatuses queries servers to check the deployment status of given apps
|
// GetAppStatuses queries servers to check the deployment status of given apps.
|
||||||
func GetAppStatuses(appFiles AppFiles) (map[string]string, error) {
|
func GetAppStatuses(apps []App, MachineReadable bool) (map[string]map[string]string, error) {
|
||||||
statuses := map[string]string{}
|
statuses := make(map[string]map[string]string)
|
||||||
|
|
||||||
servers, err := GetServers()
|
servers := make(map[string]struct{})
|
||||||
if err != nil {
|
for _, app := range apps {
|
||||||
return statuses, err
|
if _, ok := servers[app.Server]; !ok {
|
||||||
|
servers[app.Server] = struct{}{}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
var bar *progressbar.ProgressBar
|
||||||
|
if !MachineReadable {
|
||||||
|
bar = formatter.CreateProgressbar(len(servers), "querying remote servers...")
|
||||||
}
|
}
|
||||||
|
|
||||||
ch := make(chan stack.StackStatus, len(servers))
|
ch := make(chan stack.StackStatus, len(servers))
|
||||||
for _, server := range servers {
|
for server := range servers {
|
||||||
go func(s string) { ch <- stack.GetAllDeployedServices(s) }(server)
|
cl, err := client.New(server)
|
||||||
|
if err != nil {
|
||||||
|
return statuses, err
|
||||||
|
}
|
||||||
|
|
||||||
|
go func(s string) {
|
||||||
|
ch <- stack.GetAllDeployedServices(cl, s)
|
||||||
|
if !MachineReadable {
|
||||||
|
bar.Add(1)
|
||||||
|
}
|
||||||
|
}(server)
|
||||||
}
|
}
|
||||||
|
|
||||||
for range servers {
|
for range servers {
|
||||||
status := <-ch
|
status := <-ch
|
||||||
|
if status.Err != nil {
|
||||||
|
return statuses, status.Err
|
||||||
|
}
|
||||||
|
|
||||||
for _, service := range status.Services {
|
for _, service := range status.Services {
|
||||||
|
result := make(map[string]string)
|
||||||
name := service.Spec.Labels[convert.LabelNamespace]
|
name := service.Spec.Labels[convert.LabelNamespace]
|
||||||
|
|
||||||
if _, ok := statuses[name]; !ok {
|
if _, ok := statuses[name]; !ok {
|
||||||
statuses[name] = "deployed"
|
result["status"] = "deployed"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
labelKey := fmt.Sprintf("coop-cloud.%s.chaos", name)
|
||||||
|
chaos, ok := service.Spec.Labels[labelKey]
|
||||||
|
if ok {
|
||||||
|
result["chaos"] = chaos
|
||||||
|
}
|
||||||
|
|
||||||
|
labelKey = fmt.Sprintf("coop-cloud.%s.chaos-version", name)
|
||||||
|
if chaosVersion, ok := service.Spec.Labels[labelKey]; ok {
|
||||||
|
result["chaosVersion"] = chaosVersion
|
||||||
|
}
|
||||||
|
|
||||||
|
labelKey = fmt.Sprintf("coop-cloud.%s.autoupdate", name)
|
||||||
|
if autoUpdate, ok := service.Spec.Labels[labelKey]; ok {
|
||||||
|
result["autoUpdate"] = autoUpdate
|
||||||
|
} else {
|
||||||
|
result["autoUpdate"] = "false"
|
||||||
|
}
|
||||||
|
|
||||||
|
labelKey = fmt.Sprintf("coop-cloud.%s.version", name)
|
||||||
|
if version, ok := service.Spec.Labels[labelKey]; ok {
|
||||||
|
result["version"] = version
|
||||||
|
} else {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
|
||||||
|
statuses[name] = result
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
logrus.Debugf("retrieved app statuses: '%s'", statuses)
|
logrus.Debugf("retrieved app statuses: %s", statuses)
|
||||||
|
|
||||||
return statuses, nil
|
return statuses, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// GetAppComposeFiles gets the list of compose files for an app which should be
|
// ensurePathExists ensures that a path exists.
|
||||||
// merged into a composetypes.Config while respecting the COMPOSE_FILE env var.
|
func ensurePathExists(path string) error {
|
||||||
func GetAppComposeFiles(recipe string, appEnv AppEnv) ([]string, error) {
|
if _, err := os.Stat(path); err != nil && os.IsNotExist(err) {
|
||||||
if _, ok := appEnv["COMPOSE_FILE"]; !ok {
|
return err
|
||||||
logrus.Debug("no COMPOSE_FILE detected, loading all compose files")
|
}
|
||||||
pattern := fmt.Sprintf("%s/%s/compose**yml", APPS_DIR, recipe)
|
return nil
|
||||||
composeFiles, err := filepath.Glob(pattern)
|
}
|
||||||
if err != nil {
|
|
||||||
|
// GetComposeFiles gets the list of compose files for an app (or recipe if you
|
||||||
|
// don't already have an app) which should be merged into a composetypes.Config
|
||||||
|
// while respecting the COMPOSE_FILE env var.
|
||||||
|
func GetComposeFiles(recipe string, appEnv AppEnv) ([]string, error) {
|
||||||
|
var composeFiles []string
|
||||||
|
|
||||||
|
composeFileEnvVar, ok := appEnv["COMPOSE_FILE"]
|
||||||
|
if !ok {
|
||||||
|
path := fmt.Sprintf("%s/%s/compose.yml", RECIPES_DIR, recipe)
|
||||||
|
if err := ensurePathExists(path); err != nil {
|
||||||
return composeFiles, err
|
return composeFiles, err
|
||||||
}
|
}
|
||||||
|
logrus.Debugf("no COMPOSE_FILE detected, loading default: %s", path)
|
||||||
|
composeFiles = append(composeFiles, path)
|
||||||
return composeFiles, nil
|
return composeFiles, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
var composeFiles []string
|
if !strings.Contains(composeFileEnvVar, ":") {
|
||||||
composeFileEnvVar := appEnv["COMPOSE_FILE"]
|
path := fmt.Sprintf("%s/%s/%s", RECIPES_DIR, recipe, composeFileEnvVar)
|
||||||
envVars := strings.Split(composeFileEnvVar, ":")
|
if err := ensurePathExists(path); err != nil {
|
||||||
logrus.Debugf("COMPOSE_FILE detected ('%s'), loading '%s'", composeFileEnvVar, envVars)
|
return composeFiles, err
|
||||||
for _, file := range strings.Split(composeFileEnvVar, ":") {
|
}
|
||||||
path := fmt.Sprintf("%s/%s/%s", APPS_DIR, recipe, file)
|
logrus.Debugf("COMPOSE_FILE detected, loading %s", path)
|
||||||
|
composeFiles = append(composeFiles, path)
|
||||||
|
return composeFiles, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
numComposeFiles := strings.Count(composeFileEnvVar, ":") + 1
|
||||||
|
envVars := strings.SplitN(composeFileEnvVar, ":", numComposeFiles)
|
||||||
|
if len(envVars) != numComposeFiles {
|
||||||
|
return composeFiles, fmt.Errorf("COMPOSE_FILE (=\"%s\") parsing failed?", composeFileEnvVar)
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, file := range envVars {
|
||||||
|
path := fmt.Sprintf("%s/%s/%s", RECIPES_DIR, recipe, file)
|
||||||
|
if err := ensurePathExists(path); err != nil {
|
||||||
|
return composeFiles, err
|
||||||
|
}
|
||||||
composeFiles = append(composeFiles, path)
|
composeFiles = append(composeFiles, path)
|
||||||
}
|
}
|
||||||
|
|
||||||
logrus.Debugf("retrieved '%s' configs for '%s'", strings.Join(composeFiles, ", "), recipe)
|
logrus.Debugf("COMPOSE_FILE detected (%s), loading %s", composeFileEnvVar, strings.Join(envVars, ", "))
|
||||||
|
logrus.Debugf("retrieved %s configs for %s", strings.Join(composeFiles, ", "), recipe)
|
||||||
|
|
||||||
return composeFiles, nil
|
return composeFiles, nil
|
||||||
}
|
}
|
||||||
|
@ -336,7 +526,102 @@ 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
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// ExposeAllEnv exposes all env variables to the app container
|
||||||
|
func ExposeAllEnv(stackName string, compose *composetypes.Config, appEnv AppEnv) {
|
||||||
|
for _, service := range compose.Services {
|
||||||
|
if service.Name == "app" {
|
||||||
|
logrus.Debugf("Add the following environment to the app service config of %s:", stackName)
|
||||||
|
for k, v := range appEnv {
|
||||||
|
_, exists := service.Environment[k]
|
||||||
|
if !exists {
|
||||||
|
value := v
|
||||||
|
service.Environment[k] = &value
|
||||||
|
logrus.Debugf("Add Key: %s Value: %s to %s", k, value, stackName)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// SetRecipeLabel adds the label 'coop-cloud.${STACK_NAME}.recipe=${RECIPE}' to the app container
|
||||||
|
// to signal which recipe is connected to the deployed app
|
||||||
|
func SetRecipeLabel(compose *composetypes.Config, stackName string, recipe string) {
|
||||||
|
for _, service := range compose.Services {
|
||||||
|
if service.Name == "app" {
|
||||||
|
logrus.Debugf("set recipe label 'coop-cloud.%s.recipe' to %s for %s", stackName, recipe, stackName)
|
||||||
|
labelKey := fmt.Sprintf("coop-cloud.%s.recipe", stackName)
|
||||||
|
service.Deploy.Labels[labelKey] = recipe
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// SetChaosLabel adds the label 'coop-cloud.${STACK_NAME}.chaos=true/false' to the app container
|
||||||
|
// to signal if the app is deployed in chaos mode
|
||||||
|
func SetChaosLabel(compose *composetypes.Config, stackName string, chaos bool) {
|
||||||
|
for _, service := range compose.Services {
|
||||||
|
if service.Name == "app" {
|
||||||
|
logrus.Debugf("set label 'coop-cloud.%s.chaos' to %v for %s", stackName, chaos, stackName)
|
||||||
|
labelKey := fmt.Sprintf("coop-cloud.%s.chaos", stackName)
|
||||||
|
service.Deploy.Labels[labelKey] = strconv.FormatBool(chaos)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// SetChaosVersionLabel adds the label 'coop-cloud.${STACK_NAME}.chaos-version=$(GIT_COMMIT)' to the app container
|
||||||
|
func SetChaosVersionLabel(compose *composetypes.Config, stackName string, chaosVersion string) {
|
||||||
|
for _, service := range compose.Services {
|
||||||
|
if service.Name == "app" {
|
||||||
|
logrus.Debugf("set label 'coop-cloud.%s.chaos-version' to %v for %s", stackName, chaosVersion, stackName)
|
||||||
|
labelKey := fmt.Sprintf("coop-cloud.%s.chaos-version", stackName)
|
||||||
|
service.Deploy.Labels[labelKey] = chaosVersion
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// SetUpdateLabel adds env ENABLE_AUTO_UPDATE as label to enable/disable the
|
||||||
|
// auto update process for this app. The default if this variable is not set is to disable
|
||||||
|
// the auto update process.
|
||||||
|
func SetUpdateLabel(compose *composetypes.Config, stackName string, appEnv AppEnv) {
|
||||||
|
for _, service := range compose.Services {
|
||||||
|
if service.Name == "app" {
|
||||||
|
enable_auto_update, exists := appEnv["ENABLE_AUTO_UPDATE"]
|
||||||
|
if !exists {
|
||||||
|
enable_auto_update = "false"
|
||||||
|
}
|
||||||
|
logrus.Debugf("set label 'coop-cloud.%s.autoupdate' to %s for %s", stackName, enable_auto_update, stackName)
|
||||||
|
labelKey := fmt.Sprintf("coop-cloud.%s.autoupdate", stackName)
|
||||||
|
service.Deploy.Labels[labelKey] = enable_auto_update
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetLabel reads docker labels in the format of "coop-cloud.${STACK_NAME}.${LABEL}" from the local compose files
|
||||||
|
func GetLabel(compose *composetypes.Config, stackName string, label string) string {
|
||||||
|
for _, service := range compose.Services {
|
||||||
|
if service.Name == "app" {
|
||||||
|
labelKey := fmt.Sprintf("coop-cloud.%s.%s", stackName, label)
|
||||||
|
logrus.Debugf("get label '%s'", labelKey)
|
||||||
|
if labelValue, ok := service.Deploy.Labels[labelKey]; ok {
|
||||||
|
return labelValue
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
logrus.Debugf("no %s label found for %s", label, stackName)
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetTimeoutFromLabel reads the timeout value from docker label "coop-cloud.${STACK_NAME}.TIMEOUT" and returns 50 as default value
|
||||||
|
func GetTimeoutFromLabel(compose *composetypes.Config, stackName string) (int, error) {
|
||||||
|
timeout := 50 // Default Timeout
|
||||||
|
var err error = nil
|
||||||
|
if timeoutLabel := GetLabel(compose, stackName, "timeout"); timeoutLabel != "" {
|
||||||
|
logrus.Debugf("timeout label: %s", timeoutLabel)
|
||||||
|
timeout, err = strconv.Atoi(timeoutLabel)
|
||||||
|
}
|
||||||
|
return timeout, err
|
||||||
|
}
|
||||||
|
|
|
@ -1,37 +1,197 @@
|
||||||
package config
|
package config_test
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"encoding/json"
|
||||||
|
"fmt"
|
||||||
"reflect"
|
"reflect"
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
|
"coopcloud.tech/abra/pkg/config"
|
||||||
|
"coopcloud.tech/abra/pkg/recipe"
|
||||||
|
"github.com/docker/docker/api/types/filters"
|
||||||
|
"github.com/google/go-cmp/cmp"
|
||||||
|
"github.com/stretchr/testify/assert"
|
||||||
)
|
)
|
||||||
|
|
||||||
func TestNewApp(t *testing.T) {
|
func TestNewApp(t *testing.T) {
|
||||||
app, err := newApp(expectedAppEnv, appName, expectedAppFile)
|
app, err := config.NewApp(ExpectedAppEnv, AppName, ExpectedAppFile)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatal(err)
|
t.Fatal(err)
|
||||||
}
|
}
|
||||||
if !reflect.DeepEqual(app, expectedApp) {
|
if !reflect.DeepEqual(app, ExpectedApp) {
|
||||||
t.Fatalf("did not get expected app type. Expected: %s; Got: %s", app, expectedApp)
|
t.Fatalf("did not get expected app type. Expected: %s; Got: %s", app, ExpectedApp)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestReadAppEnvFile(t *testing.T) {
|
func TestReadAppEnvFile(t *testing.T) {
|
||||||
app, err := readAppEnvFile(expectedAppFile, appName)
|
app, err := config.ReadAppEnvFile(ExpectedAppFile, AppName)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatal(err)
|
t.Fatal(err)
|
||||||
}
|
}
|
||||||
if !reflect.DeepEqual(app, expectedApp) {
|
if !reflect.DeepEqual(app, ExpectedApp) {
|
||||||
t.Fatalf("did not get expected app type. Expected: %s; Got: %s", app, expectedApp)
|
t.Fatalf("did not get expected app type. Expected: %s; Got: %s", app, ExpectedApp)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestGetApp(t *testing.T) {
|
func TestGetApp(t *testing.T) {
|
||||||
// TODO: Test failures as well as successes
|
app, err := config.GetApp(ExpectedAppFiles, AppName)
|
||||||
app, err := GetApp(expectedAppFiles, appName)
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatal(err)
|
t.Fatal(err)
|
||||||
}
|
}
|
||||||
if !reflect.DeepEqual(app, expectedApp) {
|
if !reflect.DeepEqual(app, ExpectedApp) {
|
||||||
t.Fatalf("did not get expected app type. Expected: %s; Got: %s", app, expectedApp)
|
t.Fatalf("did not get expected app type. Expected: %s; Got: %s", app, ExpectedApp)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestGetComposeFiles(t *testing.T) {
|
||||||
|
offline := true
|
||||||
|
r, err := recipe.Get("abra-test-recipe", offline)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
tests := []struct {
|
||||||
|
appEnv map[string]string
|
||||||
|
composeFiles []string
|
||||||
|
}{
|
||||||
|
{
|
||||||
|
map[string]string{},
|
||||||
|
[]string{
|
||||||
|
fmt.Sprintf("%s/%s/compose.yml", config.RECIPES_DIR, r.Name),
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
map[string]string{"COMPOSE_FILE": "compose.yml"},
|
||||||
|
[]string{
|
||||||
|
fmt.Sprintf("%s/%s/compose.yml", config.RECIPES_DIR, r.Name),
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
map[string]string{"COMPOSE_FILE": "compose.extra_secret.yml"},
|
||||||
|
[]string{
|
||||||
|
fmt.Sprintf("%s/%s/compose.extra_secret.yml", config.RECIPES_DIR, r.Name),
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
map[string]string{"COMPOSE_FILE": "compose.yml:compose.extra_secret.yml"},
|
||||||
|
[]string{
|
||||||
|
fmt.Sprintf("%s/%s/compose.yml", config.RECIPES_DIR, r.Name),
|
||||||
|
fmt.Sprintf("%s/%s/compose.extra_secret.yml", config.RECIPES_DIR, r.Name),
|
||||||
|
},
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, test := range tests {
|
||||||
|
composeFiles, err := config.GetComposeFiles(r.Name, test.appEnv)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
assert.Equal(t, composeFiles, test.composeFiles)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestGetComposeFilesError(t *testing.T) {
|
||||||
|
offline := true
|
||||||
|
r, err := recipe.Get("abra-test-recipe", offline)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
tests := []struct{ appEnv map[string]string }{
|
||||||
|
{map[string]string{"COMPOSE_FILE": "compose.yml::compose.foo.yml"}},
|
||||||
|
{map[string]string{"COMPOSE_FILE": "doesnt.exist.yml"}},
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, test := range tests {
|
||||||
|
_, err := config.GetComposeFiles(r.Name, test.appEnv)
|
||||||
|
if err == nil {
|
||||||
|
t.Fatalf("should have failed: %v", test.appEnv)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestFilters(t *testing.T) {
|
||||||
|
oldDir := config.RECIPES_DIR
|
||||||
|
config.RECIPES_DIR = "./testdir"
|
||||||
|
defer func() {
|
||||||
|
config.RECIPES_DIR = oldDir
|
||||||
|
}()
|
||||||
|
|
||||||
|
app, err := config.NewApp(config.AppEnv{
|
||||||
|
"DOMAIN": "test.example.com",
|
||||||
|
"RECIPE": "test-recipe",
|
||||||
|
}, "test_example_com", config.AppFile{
|
||||||
|
Path: "./testdir/filtertest.end",
|
||||||
|
Server: "local",
|
||||||
|
})
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
f, err := app.Filters(false, false)
|
||||||
|
if err != nil {
|
||||||
|
t.Error(err)
|
||||||
|
}
|
||||||
|
compareFilter(t, f, map[string]map[string]bool{
|
||||||
|
"name": {
|
||||||
|
"test_example_com": true,
|
||||||
|
},
|
||||||
|
})
|
||||||
|
|
||||||
|
f2, err := app.Filters(false, true)
|
||||||
|
if err != nil {
|
||||||
|
t.Error(err)
|
||||||
|
}
|
||||||
|
compareFilter(t, f2, map[string]map[string]bool{
|
||||||
|
"name": {
|
||||||
|
"^test_example_com": true,
|
||||||
|
},
|
||||||
|
})
|
||||||
|
|
||||||
|
f3, err := app.Filters(true, false)
|
||||||
|
if err != nil {
|
||||||
|
t.Error(err)
|
||||||
|
}
|
||||||
|
compareFilter(t, f3, map[string]map[string]bool{
|
||||||
|
"name": {
|
||||||
|
"test_example_com_bar": true,
|
||||||
|
"test_example_com_foo": true,
|
||||||
|
},
|
||||||
|
})
|
||||||
|
|
||||||
|
f4, err := app.Filters(true, true)
|
||||||
|
if err != nil {
|
||||||
|
t.Error(err)
|
||||||
|
}
|
||||||
|
compareFilter(t, f4, map[string]map[string]bool{
|
||||||
|
"name": {
|
||||||
|
"^test_example_com_bar": true,
|
||||||
|
"^test_example_com_foo": true,
|
||||||
|
},
|
||||||
|
})
|
||||||
|
|
||||||
|
f5, err := app.Filters(false, false, "foo")
|
||||||
|
if err != nil {
|
||||||
|
t.Error(err)
|
||||||
|
}
|
||||||
|
compareFilter(t, f5, map[string]map[string]bool{
|
||||||
|
"name": {
|
||||||
|
"test_example_com_foo": true,
|
||||||
|
},
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
func compareFilter(t *testing.T, f1 filters.Args, f2 map[string]map[string]bool) {
|
||||||
|
t.Helper()
|
||||||
|
j1, err := f1.MarshalJSON()
|
||||||
|
if err != nil {
|
||||||
|
t.Error(err)
|
||||||
|
}
|
||||||
|
j2, err := json.Marshal(f2)
|
||||||
|
if err != nil {
|
||||||
|
t.Error(err)
|
||||||
|
}
|
||||||
|
if diff := cmp.Diff(string(j2), string(j1)); diff != "" {
|
||||||
|
t.Errorf("filters mismatch (-want +got):\n%s", diff)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -8,61 +8,101 @@ import (
|
||||||
"os"
|
"os"
|
||||||
"path"
|
"path"
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
|
"regexp"
|
||||||
|
"sort"
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
"github.com/Autonomic-Cooperative/godotenv"
|
"git.coopcloud.tech/coop-cloud/godotenv"
|
||||||
"github.com/sirupsen/logrus"
|
"github.com/sirupsen/logrus"
|
||||||
)
|
)
|
||||||
|
|
||||||
var ABRA_DIR = os.ExpandEnv("$HOME/.abra")
|
// getBaseDir retrieves the Abra base directory.
|
||||||
var ABRA_SERVER_FOLDER = path.Join(ABRA_DIR, "servers")
|
func getBaseDir() string {
|
||||||
var APPS_JSON = path.Join(ABRA_DIR, "apps.json")
|
home := os.ExpandEnv("$HOME/.abra")
|
||||||
var APPS_DIR = path.Join(ABRA_DIR, "apps")
|
if customAbraDir, exists := os.LookupEnv("ABRA_DIR"); exists && customAbraDir != "" {
|
||||||
|
home = customAbraDir
|
||||||
|
}
|
||||||
|
return home
|
||||||
|
}
|
||||||
|
|
||||||
|
var ABRA_DIR = getBaseDir()
|
||||||
|
var SERVERS_DIR = path.Join(ABRA_DIR, "servers")
|
||||||
|
var RECIPES_DIR = path.Join(ABRA_DIR, "recipes")
|
||||||
|
var VENDOR_DIR = path.Join(ABRA_DIR, "vendor")
|
||||||
|
var BACKUP_DIR = path.Join(ABRA_DIR, "backups")
|
||||||
|
var CATALOGUE_DIR = path.Join(ABRA_DIR, "catalogue")
|
||||||
|
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"
|
||||||
|
|
||||||
|
const MAX_SANITISED_APP_NAME_LENGTH = 45
|
||||||
|
const MAX_DOCKER_SECRET_LENGTH = 64
|
||||||
|
|
||||||
|
var BackupbotLabel = "coop-cloud.backupbot.enabled"
|
||||||
|
|
||||||
|
// envVarModifiers is a list of env var modifier strings. These are added to
|
||||||
|
// env vars as comments and modify their processing by Abra, e.g. determining
|
||||||
|
// how long secrets should be.
|
||||||
|
var envVarModifiers = []string{"length"}
|
||||||
|
|
||||||
// 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
|
||||||
}
|
}
|
||||||
|
|
||||||
// ReadEnv loads an app envivornment into a map.
|
// ReadEnv loads an app envivornment into a map.
|
||||||
func ReadEnv(filePath string) (AppEnv, error) {
|
func ReadEnv(filePath string) (AppEnv, error) {
|
||||||
var envFile AppEnv
|
var envVars AppEnv
|
||||||
|
|
||||||
envFile, err := godotenv.Read(filePath)
|
envVars, _, err := godotenv.Read(filePath)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
logrus.Debugf("read '%s' from '%s'", envFile, filePath)
|
logrus.Debugf("read %s from %s", envVars, filePath)
|
||||||
|
|
||||||
return envFile, nil
|
return envVars, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// ReadEnv loads an app envivornment and their modifiers in two different maps.
|
||||||
|
func ReadEnvWithModifiers(filePath string) (AppEnv, AppModifiers, error) {
|
||||||
|
var envVars AppEnv
|
||||||
|
|
||||||
|
envVars, mods, err := godotenv.Read(filePath)
|
||||||
|
if err != nil {
|
||||||
|
return nil, mods, err
|
||||||
|
}
|
||||||
|
|
||||||
|
logrus.Debugf("read %s from %s", envVars, filePath)
|
||||||
|
|
||||||
|
return envVars, mods, 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
|
||||||
}
|
}
|
||||||
|
|
||||||
// getAllFilesInDirectory returns filenames of all files in directory
|
// GetAllFilesInDirectory returns filenames of all files in directory
|
||||||
func getAllFilesInDirectory(directory string) ([]fs.FileInfo, error) {
|
func GetAllFilesInDirectory(directory string) ([]fs.FileInfo, error) {
|
||||||
var realFiles []fs.FileInfo
|
var realFiles []fs.FileInfo
|
||||||
|
|
||||||
files, err := ioutil.ReadDir(directory)
|
files, err := ioutil.ReadDir(directory)
|
||||||
|
@ -73,9 +113,14 @@ func getAllFilesInDirectory(directory string) ([]fs.FileInfo, error) {
|
||||||
for _, file := range files {
|
for _, file := range files {
|
||||||
// Follow any symlinks
|
// Follow any symlinks
|
||||||
filePath := path.Join(directory, file.Name())
|
filePath := path.Join(directory, file.Name())
|
||||||
|
|
||||||
|
if filepath.Ext(strings.TrimSpace(filePath)) != ".env" {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
|
||||||
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 {
|
||||||
|
@ -90,8 +135,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)
|
||||||
|
@ -99,7 +144,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 {
|
||||||
|
@ -108,7 +153,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())
|
||||||
|
@ -119,17 +164,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)
|
||||||
|
@ -137,26 +171,111 @@ func ReadAbraShEnvVars(abraSh string) (map[string]string, error) {
|
||||||
file, err := os.Open(abraSh)
|
file, err := os.Open(abraSh)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
if os.IsNotExist(err) {
|
if os.IsNotExist(err) {
|
||||||
return envVars, fmt.Errorf("'%s' does not exist?", abraSh)
|
return envVars, nil
|
||||||
}
|
}
|
||||||
return envVars, err
|
return envVars, err
|
||||||
}
|
}
|
||||||
|
defer file.Close()
|
||||||
|
|
||||||
|
exportRegex, err := regexp.Compile(`^export\s+(\w+=\w+)`)
|
||||||
|
if err != nil {
|
||||||
|
return envVars, err
|
||||||
|
}
|
||||||
|
|
||||||
scanner := bufio.NewScanner(file)
|
scanner := bufio.NewScanner(file)
|
||||||
for scanner.Scan() {
|
for scanner.Scan() {
|
||||||
line := scanner.Text()
|
txt := scanner.Text()
|
||||||
if strings.Contains(line, "export") {
|
if exportRegex.MatchString(txt) {
|
||||||
splitVals := strings.Split(line, "export ")
|
splitVals := strings.Split(txt, "export ")
|
||||||
envVarDef := splitVals[len(splitVals)-1]
|
envVarDef := splitVals[len(splitVals)-1]
|
||||||
keyVal := strings.Split(envVarDef, "=")
|
keyVal := strings.Split(envVarDef, "=")
|
||||||
if len(keyVal) != 2 {
|
if len(keyVal) != 2 {
|
||||||
return envVars, fmt.Errorf("couldn't parse %s", line)
|
return envVars, fmt.Errorf("couldn't parse %s", txt)
|
||||||
}
|
}
|
||||||
envVars[keyVal[0]] = keyVal[1]
|
envVars[keyVal[0]] = keyVal[1]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
logrus.Debugf("read '%s' from '%s'", envVars, abraSh)
|
if len(envVars) > 0 {
|
||||||
|
logrus.Debugf("read %s from %s", envVars, abraSh)
|
||||||
|
} else {
|
||||||
|
logrus.Debugf("read 0 env var exports from %s", abraSh)
|
||||||
|
}
|
||||||
|
|
||||||
return envVars, nil
|
return envVars, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
type EnvVar struct {
|
||||||
|
Name string
|
||||||
|
Present bool
|
||||||
|
}
|
||||||
|
|
||||||
|
func CheckEnv(app App) ([]EnvVar, error) {
|
||||||
|
var envVars []EnvVar
|
||||||
|
|
||||||
|
envSamplePath := path.Join(RECIPES_DIR, app.Recipe, ".env.sample")
|
||||||
|
if _, err := os.Stat(envSamplePath); err != nil {
|
||||||
|
if os.IsNotExist(err) {
|
||||||
|
return envVars, fmt.Errorf("%s does not exist?", envSamplePath)
|
||||||
|
}
|
||||||
|
return envVars, err
|
||||||
|
}
|
||||||
|
|
||||||
|
envSample, err := ReadEnv(envSamplePath)
|
||||||
|
if err != nil {
|
||||||
|
return envVars, err
|
||||||
|
}
|
||||||
|
|
||||||
|
var keys []string
|
||||||
|
for key := range envSample {
|
||||||
|
keys = append(keys, key)
|
||||||
|
}
|
||||||
|
|
||||||
|
sort.Strings(keys)
|
||||||
|
|
||||||
|
for _, key := range keys {
|
||||||
|
if _, ok := app.Env[key]; ok {
|
||||||
|
envVars = append(envVars, EnvVar{Name: key, Present: true})
|
||||||
|
} else {
|
||||||
|
envVars = append(envVars, EnvVar{Name: key, Present: false})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return envVars, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// ReadAbraShCmdNames reads the names of commands.
|
||||||
|
func ReadAbraShCmdNames(abraSh string) ([]string, error) {
|
||||||
|
var cmdNames []string
|
||||||
|
|
||||||
|
file, err := os.Open(abraSh)
|
||||||
|
if err != nil {
|
||||||
|
if os.IsNotExist(err) {
|
||||||
|
return cmdNames, nil
|
||||||
|
}
|
||||||
|
return cmdNames, err
|
||||||
|
}
|
||||||
|
defer file.Close()
|
||||||
|
|
||||||
|
cmdNameRegex, err := regexp.Compile(`(\w+)(\(\).*\{)`)
|
||||||
|
if err != nil {
|
||||||
|
return cmdNames, err
|
||||||
|
}
|
||||||
|
|
||||||
|
scanner := bufio.NewScanner(file)
|
||||||
|
for scanner.Scan() {
|
||||||
|
line := scanner.Text()
|
||||||
|
matches := cmdNameRegex.FindStringSubmatch(line)
|
||||||
|
if len(matches) > 0 {
|
||||||
|
cmdNames = append(cmdNames, matches[1])
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if len(cmdNames) > 0 {
|
||||||
|
logrus.Debugf("read %s from %s", strings.Join(cmdNames, " "), abraSh)
|
||||||
|
} else {
|
||||||
|
logrus.Debugf("read 0 command names from %s", abraSh)
|
||||||
|
}
|
||||||
|
|
||||||
|
return cmdNames, nil
|
||||||
|
}
|
||||||
|
|
|
@ -1,60 +1,69 @@
|
||||||
package config
|
package config_test
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"fmt"
|
||||||
"os"
|
"os"
|
||||||
"path"
|
"path"
|
||||||
"reflect"
|
"reflect"
|
||||||
|
"slices"
|
||||||
"strings"
|
"strings"
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
|
"coopcloud.tech/abra/pkg/config"
|
||||||
|
"coopcloud.tech/abra/pkg/recipe"
|
||||||
)
|
)
|
||||||
|
|
||||||
var testFolder = os.ExpandEnv("$PWD/../../tests/resources/test_folder")
|
var (
|
||||||
var validAbraConf = os.ExpandEnv("$PWD/../../tests/resources/valid_abra_config")
|
TestFolder = os.ExpandEnv("$PWD/../../tests/resources/test_folder")
|
||||||
|
ValidAbraConf = os.ExpandEnv("$PWD/../../tests/resources/valid_abra_config")
|
||||||
|
)
|
||||||
|
|
||||||
// make sure these are in alphabetical order
|
// make sure these are in alphabetical order
|
||||||
var tFolders = []string{"folder1", "folder2"}
|
var (
|
||||||
var tFiles = []string{"bar", "foo"}
|
TFolders = []string{"folder1", "folder2"}
|
||||||
|
TFiles = []string{"bar.env", "foo.env"}
|
||||||
|
)
|
||||||
|
|
||||||
var appName = "ecloud"
|
var (
|
||||||
var serverName = "evil.corp"
|
AppName = "ecloud"
|
||||||
|
ServerName = "evil.corp"
|
||||||
|
)
|
||||||
|
|
||||||
var expectedAppEnv = AppEnv{
|
var ExpectedAppEnv = config.AppEnv{
|
||||||
"DOMAIN": "ecloud.evil.corp",
|
"DOMAIN": "ecloud.evil.corp",
|
||||||
"TYPE": "ecloud",
|
"RECIPE": "ecloud",
|
||||||
}
|
}
|
||||||
|
|
||||||
var expectedApp = App{
|
var ExpectedApp = config.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,
|
||||||
Server: expectedAppFile.Server,
|
Server: ExpectedAppFile.Server,
|
||||||
}
|
}
|
||||||
|
|
||||||
var expectedAppFile = AppFile{
|
var ExpectedAppFile = config.AppFile{
|
||||||
Path: path.Join(validAbraConf, "servers", serverName, appName+".env"),
|
Path: path.Join(ValidAbraConf, "servers", ServerName, AppName+".env"),
|
||||||
Server: serverName,
|
Server: ServerName,
|
||||||
}
|
}
|
||||||
|
|
||||||
var expectedAppFiles = map[string]AppFile{
|
var ExpectedAppFiles = map[string]config.AppFile{
|
||||||
appName: expectedAppFile,
|
AppName: ExpectedAppFile,
|
||||||
}
|
}
|
||||||
|
|
||||||
// var expectedServerNames = []string{"evil.corp"}
|
|
||||||
|
|
||||||
func TestGetAllFoldersInDirectory(t *testing.T) {
|
func TestGetAllFoldersInDirectory(t *testing.T) {
|
||||||
folders, err := getAllFoldersInDirectory(testFolder)
|
folders, err := config.GetAllFoldersInDirectory(TestFolder)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatal(err)
|
t.Fatal(err)
|
||||||
}
|
}
|
||||||
if !reflect.DeepEqual(folders, tFolders) {
|
if !reflect.DeepEqual(folders, TFolders) {
|
||||||
t.Fatalf("did not get expected folders. Expected: (%s), Got: (%s)", strings.Join(tFolders, ","), strings.Join(folders, ","))
|
t.Fatalf("did not get expected folders. Expected: (%s), Got: (%s)", strings.Join(TFolders, ","), strings.Join(folders, ","))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestGetAllFilesInDirectory(t *testing.T) {
|
func TestGetAllFilesInDirectory(t *testing.T) {
|
||||||
files, err := getAllFilesInDirectory(testFolder)
|
files, err := config.GetAllFilesInDirectory(TestFolder)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatal(err)
|
t.Fatal(err)
|
||||||
}
|
}
|
||||||
|
@ -62,23 +71,205 @@ func TestGetAllFilesInDirectory(t *testing.T) {
|
||||||
for _, file := range files {
|
for _, file := range files {
|
||||||
fileNames = append(fileNames, file.Name())
|
fileNames = append(fileNames, file.Name())
|
||||||
}
|
}
|
||||||
if !reflect.DeepEqual(fileNames, tFiles) {
|
if !reflect.DeepEqual(fileNames, TFiles) {
|
||||||
t.Fatalf("did not get expected files. Expected: (%s), Got: (%s)", strings.Join(tFiles, ","), strings.Join(fileNames, ","))
|
t.Fatalf("did not get expected files. Expected: (%s), Got: (%s)", strings.Join(TFiles, ","), strings.Join(fileNames, ","))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestReadEnv(t *testing.T) {
|
func TestReadEnv(t *testing.T) {
|
||||||
env, err := ReadEnv(expectedAppFile.Path)
|
env, err := config.ReadEnv(ExpectedAppFile.Path)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatal(err)
|
t.Fatal(err)
|
||||||
}
|
}
|
||||||
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"],
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestReadAbraShEnvVars(t *testing.T) {
|
||||||
|
offline := true
|
||||||
|
r, err := recipe.Get("abra-test-recipe", offline)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
abraShPath := fmt.Sprintf("%s/%s/%s", config.RECIPES_DIR, r.Name, "abra.sh")
|
||||||
|
abraShEnv, err := config.ReadAbraShEnvVars(abraShPath)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if len(abraShEnv) == 0 {
|
||||||
|
t.Error("at least one env var should be exported")
|
||||||
|
}
|
||||||
|
|
||||||
|
if _, ok := abraShEnv["INNER_FOO"]; ok {
|
||||||
|
t.Error("INNER_FOO should not be exported")
|
||||||
|
}
|
||||||
|
|
||||||
|
if _, ok := abraShEnv["INNER_BAZ"]; ok {
|
||||||
|
t.Error("INNER_BAZ should not be exported")
|
||||||
|
}
|
||||||
|
|
||||||
|
if _, ok := abraShEnv["OUTER_FOO"]; !ok {
|
||||||
|
t.Error("OUTER_FOO should be exported")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestReadAbraShCmdNames(t *testing.T) {
|
||||||
|
offline := true
|
||||||
|
r, err := recipe.Get("abra-test-recipe", offline)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
abraShPath := fmt.Sprintf("%s/%s/%s", config.RECIPES_DIR, r.Name, "abra.sh")
|
||||||
|
cmdNames, err := config.ReadAbraShCmdNames(abraShPath)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if len(cmdNames) == 0 {
|
||||||
|
t.Error("at least one command name should be found")
|
||||||
|
}
|
||||||
|
|
||||||
|
expectedCmdNames := []string{"test_cmd", "test_cmd_args"}
|
||||||
|
for _, cmdName := range expectedCmdNames {
|
||||||
|
if !slices.Contains(cmdNames, cmdName) {
|
||||||
|
t.Fatalf("%s should have been found in %s", cmdName, abraShPath)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestCheckEnv(t *testing.T) {
|
||||||
|
offline := true
|
||||||
|
r, err := recipe.Get("abra-test-recipe", offline)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
envSamplePath := path.Join(config.RECIPES_DIR, r.Name, ".env.sample")
|
||||||
|
envSample, err := config.ReadEnv(envSamplePath)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
app := config.App{
|
||||||
|
Name: "test-app",
|
||||||
|
Recipe: r.Name,
|
||||||
|
Domain: "example.com",
|
||||||
|
Env: envSample,
|
||||||
|
Path: "example.com.env",
|
||||||
|
Server: "example.com",
|
||||||
|
}
|
||||||
|
|
||||||
|
envVars, err := config.CheckEnv(app)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, envVar := range envVars {
|
||||||
|
if !envVar.Present {
|
||||||
|
t.Fatalf("%s should be present", envVar.Name)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestCheckEnvError(t *testing.T) {
|
||||||
|
offline := true
|
||||||
|
r, err := recipe.Get("abra-test-recipe", offline)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
envSamplePath := path.Join(config.RECIPES_DIR, r.Name, ".env.sample")
|
||||||
|
envSample, err := config.ReadEnv(envSamplePath)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
delete(envSample, "DOMAIN")
|
||||||
|
|
||||||
|
app := config.App{
|
||||||
|
Name: "test-app",
|
||||||
|
Recipe: r.Name,
|
||||||
|
Domain: "example.com",
|
||||||
|
Env: envSample,
|
||||||
|
Path: "example.com.env",
|
||||||
|
Server: "example.com",
|
||||||
|
}
|
||||||
|
|
||||||
|
envVars, err := config.CheckEnv(app)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, envVar := range envVars {
|
||||||
|
if envVar.Name == "DOMAIN" && envVar.Present {
|
||||||
|
t.Fatalf("%s should not be present", envVar.Name)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestEnvVarCommentsRemoved(t *testing.T) {
|
||||||
|
offline := true
|
||||||
|
r, err := recipe.Get("abra-test-recipe", offline)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
envSamplePath := path.Join(config.RECIPES_DIR, r.Name, ".env.sample")
|
||||||
|
envSample, err := config.ReadEnv(envSamplePath)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
envVar, exists := envSample["WITH_COMMENT"]
|
||||||
|
if !exists {
|
||||||
|
t.Fatal("WITH_COMMENT env var should be present in .env.sample")
|
||||||
|
}
|
||||||
|
|
||||||
|
if strings.Contains(envVar, "should be removed") {
|
||||||
|
t.Fatalf("comment from '%s' should be removed", envVar)
|
||||||
|
}
|
||||||
|
|
||||||
|
envVar, exists = envSample["SECRET_TEST_PASS_TWO_VERSION"]
|
||||||
|
if !exists {
|
||||||
|
t.Fatal("WITH_COMMENT env var should be present in .env.sample")
|
||||||
|
}
|
||||||
|
|
||||||
|
if strings.Contains(envVar, "length") {
|
||||||
|
t.Fatal("comment from env var SECRET_TEST_PASS_TWO_VERSION should have been removed")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestEnvVarModifiersIncluded(t *testing.T) {
|
||||||
|
offline := true
|
||||||
|
r, err := recipe.Get("abra-test-recipe", offline)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
envSamplePath := path.Join(config.RECIPES_DIR, r.Name, ".env.sample")
|
||||||
|
envSample, modifiers, err := config.ReadEnvWithModifiers(envSamplePath)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if !strings.Contains(envSample["SECRET_TEST_PASS_TWO_VERSION"], "v1") {
|
||||||
|
t.Errorf("value should be 'v1', got: '%s'", envSample["SECRET_TEST_PASS_TWO_VERSION"])
|
||||||
|
}
|
||||||
|
if modifiers == nil || modifiers["SECRET_TEST_PASS_TWO_VERSION"] == nil {
|
||||||
|
t.Errorf("no modifiers included")
|
||||||
|
} else {
|
||||||
|
if modifiers["SECRET_TEST_PASS_TWO_VERSION"]["length"] != "10" {
|
||||||
|
t.Errorf("length modifier should be '10', got: '%s'", modifiers["SECRET_TEST_PASS_TWO_VERSION"]["length"])
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
|
@ -0,0 +1,2 @@
|
||||||
|
RECIPE=test-recipe
|
||||||
|
DOMAIN=test.example.com
|
|
@ -0,0 +1,6 @@
|
||||||
|
version: "3.8"
|
||||||
|
services:
|
||||||
|
foo:
|
||||||
|
image: debian
|
||||||
|
bar:
|
||||||
|
image: debian
|
|
@ -0,0 +1,82 @@
|
||||||
|
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
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetContainerFromStackAndService retrieves the container for the given stack and service.
|
||||||
|
func GetContainerFromStackAndService(cl *client.Client, stack, service string) (types.Container, error) {
|
||||||
|
filters := filters.NewArgs()
|
||||||
|
filters.Add("name", fmt.Sprintf("^%s_%s", stack, service))
|
||||||
|
|
||||||
|
container, err := GetContainer(context.Background(), cl, filters, true)
|
||||||
|
if err != nil {
|
||||||
|
return types.Container{}, err
|
||||||
|
}
|
||||||
|
return container, nil
|
||||||
|
}
|
|
@ -0,0 +1,41 @@
|
||||||
|
package context
|
||||||
|
|
||||||
|
import (
|
||||||
|
"errors"
|
||||||
|
|
||||||
|
"github.com/docker/cli/cli/command"
|
||||||
|
dConfig "github.com/docker/cli/cli/config"
|
||||||
|
"github.com/docker/cli/cli/context"
|
||||||
|
contextStore "github.com/docker/cli/cli/context/store"
|
||||||
|
cliflags "github.com/docker/cli/cli/flags"
|
||||||
|
)
|
||||||
|
|
||||||
|
func NewDefaultDockerContextStore() *command.ContextStoreWithDefault {
|
||||||
|
contextDir := dConfig.ContextStoreDir()
|
||||||
|
storeConfig := command.DefaultContextStoreConfig()
|
||||||
|
store := newContextStore(contextDir, storeConfig)
|
||||||
|
|
||||||
|
opts := &cliflags.ClientOptions{Context: "default"}
|
||||||
|
|
||||||
|
dockerContextStore := &command.ContextStoreWithDefault{
|
||||||
|
Store: store,
|
||||||
|
Resolver: func() (*command.DefaultContext, error) {
|
||||||
|
return command.ResolveDefaultContext(opts, storeConfig)
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
return dockerContextStore
|
||||||
|
}
|
||||||
|
|
||||||
|
func GetContextEndpoint(ctx contextStore.Metadata) (string, error) {
|
||||||
|
endpointmeta, ok := ctx.Endpoints["docker"].(context.EndpointMetaBase)
|
||||||
|
if !ok {
|
||||||
|
err := errors.New("context lacks Docker endpoint")
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
return endpointmeta.Host, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func newContextStore(dir string, config contextStore.Config) contextStore.Store {
|
||||||
|
return contextStore.New(dir, config)
|
||||||
|
}
|
|
@ -0,0 +1,55 @@
|
||||||
|
package dns
|
||||||
|
|
||||||
|
import (
|
||||||
|
"fmt"
|
||||||
|
"net"
|
||||||
|
)
|
||||||
|
|
||||||
|
// EnsureIPv4 ensures that an ipv4 address is set for a domain name
|
||||||
|
func EnsureIPv4(domainName string) (string, error) {
|
||||||
|
ipv4, err := net.ResolveIPAddr("ip4", domainName)
|
||||||
|
if err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
|
||||||
|
// NOTE(d1): e.g. when there is only an ipv6 record available
|
||||||
|
if ipv4 == nil {
|
||||||
|
return "", fmt.Errorf("unable to resolve ipv4 address for %s", domainName)
|
||||||
|
}
|
||||||
|
|
||||||
|
return ipv4.String(), nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// EnsureDomainsResolveSameIPv4 ensures that domains resolve to the same ipv4 address
|
||||||
|
func EnsureDomainsResolveSameIPv4(domainName, server string) (string, error) {
|
||||||
|
if server == "default" || server == "local" {
|
||||||
|
return "", nil
|
||||||
|
}
|
||||||
|
|
||||||
|
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
|
||||||
|
}
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue