From ed0adfb71c45d6baf7170dcffd2bfa7bdac45493 Mon Sep 17 00:00:00 2001 From: Martin Helmich Date: Fri, 16 Feb 2024 15:35:20 +0100 Subject: [PATCH 01/19] Initial (real) commit :) --- README.md | 105 ++++++++------------------- commands/web/mw | 9 +++ docker-compose.addon-template.yaml | 16 ----- images/gh-tmate.jpg | Bin 55195 -> 0 bytes images/template-button.png | Bin 20431 -> 0 bytes install.yaml | 110 +++++++++++++++-------------- providers/mittwald.yaml | 40 +++++++++++ web-build/Dockerfile.mittwald | 2 + 8 files changed, 136 insertions(+), 146 deletions(-) create mode 100644 commands/web/mw delete mode 100644 docker-compose.addon-template.yaml delete mode 100644 images/gh-tmate.jpg delete mode 100644 images/template-button.png create mode 100644 providers/mittwald.yaml create mode 100644 web-build/Dockerfile.mittwald diff --git a/README.md b/README.md index 2880389..4199340 100644 --- a/README.md +++ b/README.md @@ -1,93 +1,46 @@ -[![tests](https://github.com/ddev/ddev-addon-template/actions/workflows/tests.yml/badge.svg)](https://github.com/ddev/ddev-addon-template/actions/workflows/tests.yml) ![project is maintained](https://img.shields.io/maintenance/yes/2024.svg) +

mittwald DDEV addon

-# ddev-addon-template +

+ ā„¹ļø Synopsis | + āš’ļø Installation instructions | + šŸ™† Usage +

-* [What is ddev-addon-template?](#what-is-ddev-addon-template) -* [Components of the repository](#components-of-the-repository) -* [Getting started](#getting-started) -* [How to debug in Github Actions](#how-to-debug-tests-github-actions) +--- -## What is ddev-addon-template? +## Synopsis -This repository is a template for providing [DDEV](https://ddev.readthedocs.io) add-ons and services. +This repository contains a [DDEV addon][addon] for the mittwald hosting platform. It adds the following features to your DDEV project: -In DDEV addons can be installed from the command line using the `ddev get` command, for example, `ddev get ddev/ddev-redis` or `ddev get ddev/ddev-solr`. +- Synchronizing your DDEV configuration with the current state of your mittwald cloud project +- Pulling and pushing your project's code and database contents from and to the mittwald cloud platform. +- Using the [mittwald CLI][cli] in your DDEV web environment -This repository is a quick way to get started. You can create a new repo from this one by clicking the template button in the top right corner of the page. +## Installation -![template button](images/template-button.png) +This addon has the following requirements: -## Components of the repository +- DDEV (obviously) +- An API token for the [mittwald mStudio v2 API][api-intro]; you will be prompted for this token during the installation process (if not already configured) +- An existing application on the mittwald cloud; you will need the application id (formatted like `a-XXXXXX`). -* The fundamental contents of the add-on service or other component. For example, in this template there is a [docker-compose.addon-template.yaml](docker-compose.addon-template.yaml) file. -* An [install.yaml](install.yaml) file that describes how to install the service or other component. -* A test suite in [test.bats](tests/test.bats) that makes sure the service continues to work as expected. -* [Github actions setup](.github/workflows/tests.yml) so that the tests run automatically when you push to the repository. - -## Getting started - -1. Choose a good descriptive name for your add-on. It should probably start with "ddev-" and include the basic service or functionality. If it's particular to a specific CMS, perhaps `ddev--servicename`. -2. Create the new template repository by using the template button. -3. Globally replace "addon-template" with the name of your add-on. -4. Add the files that need to be added to a DDEV project to the repository. For example, you might replace `docker-compose.addon-template.yaml` with the `docker-compose.*.yaml` for your recipe. -5. Update the `install.yaml` to give the necessary instructions for installing the add-on: - - * The fundamental line is the `project_files` directive, a list of files to be copied from this repo into the project `.ddev` directory. - * You can optionally add files to the `global_files` directive as well, which will cause files to be placed in the global `.ddev` directory, `~/.ddev`. - * Finally, `pre_install_commands` and `post_install_commands` are supported. These can use the host-side environment variables documented [in DDEV docs](https://ddev.readthedocs.io/en/latest/users/extend/custom-commands/#environment-variables-provided). - -6. Update `tests/test.bats` to provide a reasonable test for your repository. Tests are triggered either by manually executing `bats ./tests/test.bats`, automatically on every push to the repository, or periodically each night. Please make sure to attend to test failures when they happen. Others will be depending on you. Bats is a simple testing framework that just uses Bash. To run a Bats test locally, you have to [install bats-core](https://bats-core.readthedocs.io/en/stable/installation.html) first. Then you download your add-on, and finally run `bats ./tests/test.bats` within the root of the uncompressed directory. To learn more about Bats see the [documentation](https://bats-core.readthedocs.io/en/stable/). -7. When everything is working, including the tests, you can push the repository to GitHub. -8. Create a [release](https://docs.github.com/en/repositories/releasing-projects-on-github/managing-releases-in-a-repository) on GitHub. -9. Test manually with `ddev get `. -10. You can test PRs with `ddev get https://github.com///tarball/` -11. Update the `README.md` to describe the add-on, how to use it, and how to contribute. If there are any manual actions that have to be taken, please explain them. If it requires special configuration of the using project, please explain how to do those. Examples in [ddev/ddev-solr](https://github.com/ddev/ddev-solr), [ddev/ddev-memcached](https://github.com/ddev/ddev-memcached), and (advanced) [ddev-platformsh](https://github.com/ddev/ddev-platformsh). -12. Update the `README.md` header in Title Case format, for example, use `# DDEV Redis`, not `# ddev-redis`. -13. Add a good short description to your repo, and add the [topic](https://docs.github.com/en/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/classifying-your-repository-with-topics) "ddev-get". It will immediately be added to the list provided by `ddev get --list --all`. -14. When it has matured you will hopefully want to have it become an "official" maintained add-on. Open an issue in the [DDEV queue](https://github.com/ddev/ddev/issues) for that. - -Add-ons were covered in [DDEV Add-ons: Creating, maintaining, testing](https://www.dropbox.com/scl/fi/bnvlv7zswxwm8ix1s5u4t/2023-11-07_DDEV_Add-ons.mp4?rlkey=5cma8s11pscxq0skawsoqrscp&dl=0) (part of the [DDEV Contributor Live Training](https://ddev.com/blog/contributor-training)). - -Note that more advanced techniques are discussed in [DDEV docs](https://ddev.readthedocs.io/en/latest/users/extend/additional-services/#additional-service-configurations-and-add-ons-for-ddev). - -## How to debug tests (Github Actions) - -1. You need an SSH-key registered with GitHub. You either pick the key you have already used with `github.com` or you create a dedicated new one with `ssh-keygen -t ed25519 -a 64 -f tmate_ed25519 -C "$(date +'%d-%m-%Y')"` and add it at `https://github.com/settings/keys`. - -2. Add the following snippet to `~/.ssh/config`: +You can install this addon by running `ddev get`: ``` -Host *.tmate.io - User git - AddKeysToAgent yes - UseKeychain yes - PreferredAuthentications publickey - IdentitiesOnly yes - IdentityFile ~/.ssh/tmate_ed25519 +$ ddev get mittwald/ddev ``` -3. Go to `https://github.com///actions/workflows/tests.yml`. - -4. Click the `Run workflow` button and you will have the option to select the branch to run the workflow from and activate `tmate` by checking the `Debug with tmate` checkbox for this run. - -![tmate](images/gh-tmate.jpg) - -5. After the `workflow_dispatch` event was triggered, click the `All workflows` link in the sidebar and then click the `tests` action in progress workflow. -7. Pick one of the jobs in progress in the sidebar. - -8. Wait until the current task list reaches the `tmate debugging session` section and the output shows something like: - -``` -106 SSH: ssh PRbaS7SLVxbXImhjUqydQBgDL@nyc1.tmate.io -107 or: ssh -i PRbaS7SLVxbXImhjUqydQBgDL@nyc1.tmate.io -108 SSH: ssh PRbaS7SLVxbXImhjUqydQBgDL@nyc1.tmate.io -109 or: ssh -i PRbaS7SLVxbXImhjUqydQBgDL@nyc1.tmate.io -``` +The installation process will prompt you for a [mittwald API token][api-intro] and your application ID. The former will be added to your global DDEV configuration, the latter to your local project configuration. -9. Copy and execute the first option `ssh PRbaS7SLVxbXImhjUqydQBgDL@nyc1.tmate.io` in the terminal and continue by pressing either q or Ctrl + c. +## Usage -10. Start the Bats test with `bats ./tests/test.bats`. +Installing the mittwald DDEV addon allows you to use the following commands: -For a more detailed documentation about `tmate` see [Debug your GitHub Actions by using tmate](https://mxschmitt.github.io/action-tmate/). +- `ddev pull mittwald` will download the filesystem and database contents of the linked application to your local DDEV project. +- `ddev push mittwald` will upload the filesystem and database contents back to the mittwald cloud platform. **CAUTION**: Keep in mind that this is a dangerous operation and not meant to be used as a robust, production-ready deployment solution. Have a look at our [documented deployment guides][deployment] to learn more about production-grade deployments. +- `ddev mw ...` allows you to run the [mittwald CLI][cli] in your web container. -**Contributed and maintained by [@CONTRIBUTOR](https://github.com/CONTRIBUTOR)** +[addon]: https://ddev.readthedocs.io/en/stable/users/extend/additional-services/ +[cli]: https://github.com/mittwald/cli +[api-intro]: https://developer.mittwald.de/docs/v2/api/intro/ +[deployment]: https://developer.mittwald.de/docs/v2/category/deployment-guides/ \ No newline at end of file diff --git a/commands/web/mw b/commands/web/mw new file mode 100644 index 0000000..f2fb9bb --- /dev/null +++ b/commands/web/mw @@ -0,0 +1,9 @@ +#!/bin/bash + +#ddev-generated +## Description: Run the mw CLI inside the web container +## Usage: mw [flags] [args] +## Example: "mw app get" +## ExecRaw: true + +mw $@ \ No newline at end of file diff --git a/docker-compose.addon-template.yaml b/docker-compose.addon-template.yaml deleted file mode 100644 index 09a8a5f..0000000 --- a/docker-compose.addon-template.yaml +++ /dev/null @@ -1,16 +0,0 @@ -#ddev-generated -# Simple template to demonstrate addon-template -services: - addon-template: - container_name: ddev-${DDEV_SITENAME}-addon-template - image: busybox:stable - command: tail -f /dev/null - networks: [default, ddev_default] - restart: "no" - # These labels ensure this service is discoverable by ddev. - labels: - com.ddev.site-name: ${DDEV_SITENAME} - com.ddev.approot: $DDEV_APPROOT - - volumes: - - ".:/mnt/ddev_config" diff --git a/images/gh-tmate.jpg b/images/gh-tmate.jpg deleted file mode 100644 index 71b11e8b72d412a865725f886c4e48bf1097e7e9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 55195 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 Ag8%>k diff --git a/images/template-button.png b/images/template-button.png deleted file mode 100644 index 7bc5113bed4e842c85bc517ed228825f54afeebc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 20431 zcmb5WbyOTr&@Q|YASBqLAy{yCcUvH^xH|-QcTEDp-5o-3cbDMq?!g^`JA6a(d*AP# zbN{*=WVWZLyQaFks``1V36zx;RH}%8Kkzo6 z)a*eZq|WD`7qQexI3UnRkT^t8(Iw?z$yHN9WtsnvwW`pYI_uMg$S61 zdN5sPc(qiDclNuo@viEr{l9y4#TKx$4J}UcF&*~gHK^ax(oIQ}Prbm%=EIDq;?Db0 z@g3#m&4aD*r(XP*@Ed1dCt@6&SIhPzT6V2hDfaZi^eCu+L?BQC^*ep6zgM6Tc)}OY zS6|eGKm9Gyo&KLntiG@RmKY)aKUAq?a{Aj|23B5Saj~@p`rGf_be~Gwj4JUC4scUb zss^n)KNy|B%$7X2ogoi}4*cv1x13cDLz2eT2rCbsFn^Qu+VP@#NN6nM>#O48;;9W5 zH$-BRzoIzy_YdG59^$2@e4@d`X=G@A6C9vg)G$Ba;0KHB?99p;s@<`}@p_bdlI;)9 zjnvDpvXk>>2NmZm)KDmrzhzIgW5xD|Mj8;vD7U0$+Rt)xXT#SHD{a zd37b;0LdSIU{p{-!#u2)qZDmV_xy4gcW-@qY<6}zbaDbxTzsFi&fja5Dwk?KT^!udw61m#b#ydj z3p9szzh!aj%-(i~zm}2;-fG3<`HTw=#lH|Ta8WgIncb12XLyoMW}34vYam27TjbGR zYicnt4{YEOi+-0nqk=nS{Q_3y)Me03YIBS%-1blHWAmu1=W6?a*5HKk(%PAI7i+@LlPgVs8*5#+8r5Ru65}%j^*Cx=#fILO z6>M7%;(Yskw;ub$n|dLqCL8*59+t1CTYc{OD~`Kzad6zdyHYV@B2FvAoJ^ZSd{(93mL<@!a z!hM~bU4tqqbh%iX|J&0&NuAsR+1|Y7ha0I&rvj_5jl)Y(2~jE6g0J!J?yJ&NW~?UG zquIYV=8qU83^*6>)^NCUTM@VBa}T@%fw(B@>{ZzCKN3BywkQY-(`om+I-gB@-XUu> zr6?$A{p?Dq(03Jlap+yH7PLYqPDwD+%)GdjDL{fxAG(+snES}E}#3rYf^6BWA>Ihz2vFl5h7x)fHT)% z<3!`Em=et9nt&MZ0#&3zL5rlFF0B_q5V z3$Cu&JAHg!m4pO0<_yvPc8@M>8reS4Yp6z(NeFrpQWI<5JYr6DX{hHDaOEW-VU zMDqsAqwJscSim)@y+TN1V;n+8k+K#ea7x1DUG8Y z#L~?_m4|O#Ms6~*o4MY9%v_7A=+Gg!!aaB#-oucTXiIIBY%SUxz`Q}e+O)G=QEMim zTkUwRfq$^NnSXlOO!PC1)MV58VY>ryMguOy;Zw@Yu@2!h23En=c2(bIzIVex$KK&p z7k$e{0!OJ1?#P;dDV6@_tG0px48bRjbYV8{v>AHaw1)xO_QNNQa;DbMUb7Ptq*^H# z8nGHQ|D9x>&xJmR62RJ$TbG%09V+oo;F6q+x10%&Z#{RM2vuh+r`4=08c&wd;rnPZ z%89I`Rq{rnfcxf?#b!IwMOhVkkhIsG&8clmMBWPI2>l%qYEB>e-4=!*A-LX7r7#38 zAn$0TaX(D43cNry+A-cHbiWb#J5>ugyvDf}6O$L|ac4KOVwz0vqPDiojmpJX<)Y81 zUd<%he=nVG@zkcHI!^Be=d4DZjjEK#7&5=2jAYU7;@y*N$3|*(?p|+XM<(0J1Gl4n zOP*(e5n^vRXyvm^reC2JyIQW_TZWYc5~s!o9l)} z)*sh*KHR;r3N-|g;! zjl1M~F%0X}TmCtf`um`QF#bKNxj1v6r?!~*n}hc1(S|=#a1 zc6$AB*fD7ZnKIIbqW706jLGs*XbMq)*1<3(l41BG4)W^YPY(Jc(@nM-s0zS6W%+sM zSi3WwzQ!iwC1dp1sFZ|?D3vI$+ayew_sv9%q@2LF+kNa{$XiQHI1ng@nu+IN$S@dR zMd^69{%&+^JqUX^rBPPv3^L-9vGdDATNVVwBYQrVBssPpx#MbANtTu|u+dTCi%sdq zFMSVGm!o1Pi(f>!VxocNZ2N_jnqwt})J1btX_l)9MUyJnFJzT2qNQK4u~`OygS$+z z6V(SRe&U~7kWx_6%1A7e-&rw5c`GHdG1t3R+(!3cPCV{7xiqmxpLSC_4%AL&IU0cR zcvam+O)iGHk2IPRsjs~TdQ@bdj6GXe-aVNPo)|@1w>GgpB>1zoFfOxQ`iP~cdY#UI zw%d4)3dLTpY)r>VJK+y*l$P+Se&X{kQ(?S)I7vLXW3d=!$?kZA&mVXrJ}JRsG5+hF z{h>u*UW=Eo{DoKQnPTgsqdlG)-K}?tIAEY7%XUtDJG2fssInV@Fq20EYNECtu@A@9 zk(&aI$B)LkD9Hipbhus|IwgkUg*<_MG9zz#?LJl% zkw1N`RG6yby=!p4gj%pwZ{gD-H%_WM7oOm>OuUWttia`eXe8Duv3V>=ytSQp?rO)6OS}P(c@O5Yr&65MMcP2$(DEmb`?>X+*n`?fO;J;(W$&Dx)UsQZT&> z1kL0!Oaw#0`XB#pOvK;}PRfd{+6IVqNRKwsiV!Xc&COzG^d2nYH=+y64Sl*eQ*x$m#C!VWMO{Dd zIf{>r0xrkX@9w|vu4Th*rrqK@zQ#HZv#VITEsaQgn81C+{?WCsaO=p^v=qf{?MoW_ z&YO_PPLr=Ysy`WtKhERkx19o?8f`+>TGILOO*++VQ(yE!jHm0J`~)qL-ET6+nOn%l z?=pM38Ic|ycKXw^h2HUzRh<#>>C{6@c5@Iou;Nh$V!&um;}4xwr{L&V6!BVgsfglLU$8o1;4cBFIP)3^G0E)5)vos2z1iowJSfUL<^izV7rALA7^@UskeG8(`T3>m5WoZTp=joI`As< zmvQ|m{~hKuldD8}6>9aN3|&kkq6`Gm8jIpOUI&kx4hfpUVZiKfQ4e?Bdc zEn?Pe_qeCf!#L4R)q3IbQxgJNH0HFUMbM1nm5Zfwwc@oP&75A4S(xv1csTQ z#+k#UOLjJb5zA!$Hr80*k>g~FYMsUezKz{X+#AW!NzRv6l$bn`SHn^6F?KFA4m@&{Bx1Js z5@67SK%s{@Kizce{Z_^KR>CTfCO1rVq<<+bPt@w^#Ic-2ey3=CD3PkM&A(jd<74=w z@&LJ=vOK0^>|%ENK>7MS8_OwPwdc_zGyYMm;UMpI(|&y5ymf=hmS!PB`Yx5}+uxMQ zle9J|?nd*@6JjHZ3$nkr_5{@p_9Y!(P*Fn{wUz=*b25gDoz!VceneX5p8k*ofpjGw zJN&f<;?K#9)?SPsPFD+F7pp8eWcXf<|8#{0%g4X|V>Ke7$XVpNyvRv{$!rP3i;avD z8K2vec~k0H{xnM7=dMDdHMlu{i+uI44X2TXeSM$P42KjK6W3aA5qU50^7zLi(-Q`7 zop6i7rn%@y#IF(Ooy0S>$koqdh124I*GB_(>eY2s2bZbtW;wBj1JjF=ZDT1td*P9n zXk4XlslU{xojIufp09f_TK7pzA#7#$Q0fSJ<1Ft677fMn?!|JGM7~hEwd5`d-C{D2 z?lA(n7ier-SotIdE8M}nkh#<`Yj!CV^6^-k)UAW!As8$|`qX}=0u>`}93@okV{XC&J!fBNZg%s{$gq@5cH;wnTkvw_5feCc zv+uQX2|h;tSRqxQ$$dWrL+WkGs_mFzVU1WWS|1`kS>~^da!T>Tbx#$mL~yNAR46t| zkyM)^<`;HPtJ}*f6+^&SHZ`&ZN1IdpewPF@M0+&y5rC2yM7+FO_;rS9=_tAFk6upj z2|%#uH&Mn;4TD*vihsHH{`rQOZcHon=Et)q*yKXOPH>)#->uqMg6l$G%ccrvLD=bY z`O?;Obr}5MU!(HmKDHlOp;h_zXp#5aQC(boE_ncxvI&29Uu|W9F&W7hUwcm~rkXzg zqn>eYgxE;L@6;)3I_=w1JvSgiGSK|GV~itzzQ#E;R?m%Hu46nXX@QwSalY3kdlgyTv_yTX znH`p1P~o7I97}O)$ZrbuAVX|miLa-po4>O)?U^$3hGJzFh_2Fyn`Sy-+zhE0;!suf zts8BM50R#x$}Z4fX#@n|7Q+^*62mwh7s<}^L$Qs15DlmWYbu2ckIr<&?L&UfKe@Zf zTz?6mDSE|&QE66SkbO?ubOy@pVXa<1^4W-fr9wu%U)7-z7u6(r>iS)CIM#0FXuQvG z8?BCs(>A+;DMUMR)^_)pjhD~0;h^@^UiLPT$H+=TP8&4yr>@gR3zK}`_8FDy`U&8L zlI`{#{$M%z)8&Fa@`{J=Rbg+l^x=EG56gebwZR9jzS#dJje1iWnkZtt!3-x8I*Wpa zT}7>D?A6o|3Ho4QiKrSc2!X7MyHc&c5FLSgCEteDjp%UH%6>5#mfFb6%PR`kA^@4O zx>uK%-{Q%50zeFBHx5c-lE>NG@Akwl;t5$SD~ndw#*qp_cd{>5qm#TfO^MBpyH_o^T?HP3n)@ zL{mzhZWkx69&Ym+1{SST4m;21qg4t9N^5UIR9MTdmv_^tEnmic&ufuHJTig6@Qj%`G9gP*2I$1Ut^3SC2^uVJRgi(0c`QH?1h&U7)) zLi#~HM&^9*6StK0E9+tm6mb1{rO}Zq`@`c#rBLFrzb#q$jj7OBu2|Zj+Jtuksa)Zo z-(PRj7aRuHE!m9)*2!5j!}+{<)R{jLy6z}XGDp)~QLsBKnfP{Ho}1i~W@S!YSzb3{Z%ox!kRN4e zxAnLzls2tJ*%ZxNTd$`2Sl0i59g0Y?m3{v?wit0id_h|Y1R9;tOo8hxQuo?g{2qv= z9fE+YkDB=F_gXfthQ@-(*>+wU7Y89d`ws>6-njdwOME6d=t8ABsCQH1kyj`1Pdw^4O9ZZuna{ADGz-RUJs-LpXBXw*FOl)+5 zCBMk{or)~s4PQfW3_(6-KdQH6oQ@v;bliY^kbdr;W6IC#N!VgK1z9lWgnWyGvL{<3 zV%vOHzQcGmW4d|f2(|xU?yGFBh(Lp>)pwgce3C7jmh|EC*{vndlMU2#VT7EjSw@3H zT~13ldFBmHy2jA=hK(OT=$^P+4yp%=`Hgwb`Si!qr6$R|+OcYp$~5N7S%%vM_77ue zu?PYJi!yblU4&B~76mY;0!j^H?lg7hP^JQl$lc|CRAtiO>E}*+KWRai9_F#wry6bY z)JD6HM-tftY;r{7c{(2k$NlH)y0(*JOyvMIgj^rQ^d}Y2# z%~`U=_d54rf9<5*Sf*vV&$jwoPp1RNGg7xuPj9+`sJzIP=}DuTVP87>u%X*lX5{o{ z-BpvW!RP?}v(g#7SVYY!#Xbnc;^~D$jvrkr#T91{5kXJ;=EFJN{l{&u@Pc&ASpE+j zzr-8yA)dH8qxW?=)6;&uy>q(dKCKICD%jzl`M>hbdF9{ z7H_0@^MTER@Jq!%4t-v=D=*pm>s4!ylIQVYsu=bXhfa~j57?(!ubw!Y)@Cmc=W_R3 zilsbFE^7ICnZ=F@mh~oaYl~(q(#_G1hFuztl5>wAMjcWuE4@+V)LhO+%4cWsO?>_6ouSd+d_L>5} z8gioPvQ;PdWn2b%vWegPHsmNL-}O%Alq}Sg&sH1)39Jmw2}`U^%s0xO>T484#v)V} zD|BiR9dsk}iX{Y&9;MZu)^}vMwm-W!rg*QoPS_MaTG)CDYs7xRg`I1v{F9hMA=a@t zbm_3no_g3#mV-ct1gN@IkP{~blcDsbiAmvFFee?`F^$8n8QKf*+ycJV`Zb*UNwi-L znO;3&`Q2W#@fJ75P(giEV4b(x9>Z9mq4?S@Y7fWy#R^=xch*62u2223T^64Oz#@=#&YP3)bi_>p~#YquaH}V zm+XeUyxMbQ9Yh$2@vP~OTwZ+JEwKE}ewzIH<>%6%w+J2m<53--7i=xZ)ZTzHws|RN zaM#xL59H6?%nHWP&1O-Sc-&eWjh{4(&h8hye@($A(2={-(FME!Dwoe$d=>b$n&-`l znn#TCX4WG1c%1S32hmRgkc~zXKEuHBch7{EuG>Lf&BcY|8~BFImX=}Z&0jjvd8;L1 zq|dz77rw#eWx-jZg2G}}CqcJDfMxm|+`FuO!y&>H`azWXFJqQxU}!kis?$m?lg{=o z84nkCOf!S`tAMPI4!H&R;&^7HUt&|KmU5E84+}uvL0`D^%2g@QPj5WD6ryDVpkkJQ zq$S0)@dJjHb2OMxDe0dx3_{ODB*?yvik=*&Cc#{+hN`iqkO(zUT|=V_czh90WZzts z2Dplgi!+;t<6_kNk7;AT!X>a)HiQ93W|Pj%1=c$aadNH+j=XQw)HQeyeQs2jPW4{2 zFLzqGpiqBm3cS#rNBT1Q3pvvByCj5mcT2wV;7Bn{G5^HW&wj<{UsT{xSDJ@ORw66${{gudXkaUl^ai8hP=J0YI*>IUy+{l z5?Ma+8CDBbojA>WsZ26mm+7FLIO!Bp<6#LEuD>PZF^7IM9r+0WG_={0tPa#-cfqSp zG`!)!eYUO14M=FiC zOAB&d9~FLy4d)h>S{(5E?zAC31_*>(CDn)cA?};|i`h=do7)G*iQIH5#)a}u z2|)xuALZs$Vr+5lU|5n7em)I59g2lO1~NUIV8@Z+-aaLWK_EQwd)b!~XDDFan39-+ z>_SyrKry55)Zqm%c!j>-JrMwQzv z55lJG8vqK<(GBE-vsRQZ-MiS~x4eeNp`(u1@C2~CTibz5P zZcGXKX|jLbE822d?O!5@r}gXao(tM#YAiqQ@b32$v1OAq_Qz-zeC`OF2g~v0zT9ow zttf{qOp=}wv)`uJkv5!A9I&LmUFTXcnZ-7df$%T>rhj*aEd-g2aOl6C(pq9UlU8R- z&!lej@LP1*NKtp89&C2QO19#$llHvrI2SB+NXz{byZeD0Om<8mgR`kk3y&NSpslv2 z&>WNShQu}Lfl7tcb;G#OY*)yT8VOL#tvs%_h5u@oK$grWSvj>WK7H2kfL_b3kdxiS zC`dt5lj9O2*~l#5`Zl zw(w zx*__a#_+)(Med_Bb~OUBLG*_GVY7tWcl51%*Qo9)iKC}pt$nm5Kvn(ml2Ax&|7q`# za@Tll39#%yJ5sBJS)C%(FHo=@XawDj@dI(Vj0-vNYW?-1(8LrBMLi0(OsOTGUa*Xt z+Xg0-%}?ci7tX(&&ig7HknpuDa$uHn?qMs@42VamO}KZZo<}@zyMUgqlQh z`J@gCE%nGe8wU)G0ILJ;OC<;IwTR?GG1sj=9-_>kVgOV1psq<^~iPQ&b% z<|T=M&ZLuR)y6HdmOdK;_04%+=9$Yr9#C>v4L!At-lKb z2Vdwd)y|j%N}U}kz1v8`03;2}+^vvCVmlC0SG@3ZBJdLvhw4q0S;a}th}6pCV}YdI zcBpgw2J(mGs7byi)z9kLq+^-)8b+O#T3Axg6J#J~EQu__xRp8RI7PiKoq}S}6#Ha~ z)XD-_{YM@_YTVB&bHfZvd^34TGa*gL?o}`%ul*9`u);dYffA0^QBk~P1x>%Pv2Lqn zZhucnDXGd4lZujSm1e^@1_1ekc+0O-y(PO`l(132;9&aE%@P}OjNJ7aWzl}e*DnuQ zEoR41CvNHmfU2OScDHqRWdid4oT_{MMw16v{a83jvG{IO%{#ivPEWtS);EI&bH|G& z2hUkAUv30?2xSGsBQltXz3v#rb-cADD|TCP-aj`LgGgV~Q`rCIQ)$F6RvtRW#XqFa zUgOJA*7c`)Iw0F*gNQ2SAD~E!Wr>!R0inahRCX%F5Hz zv&L@J778Fx<#!bdj(MYXe0ri;3h41t>Pk=IR0tw92GjfCf|7 zX7%Wn6=3mfz`7u%DOTfQV~oXm6?u74NLm^`0LV$bL$tNU*FDJGl^k89K@XZVK&cH( zemzudS&WO5j8Cnk{2Rwix|dK(fjBdh*EH6Ge^`;OcT z$;`PR=rseAM>hZkzi<3FN=s9sS)OhyoqmD^a+nj~XKxX=Am!KYp&bAz%KvIs-t&w!=pMR=%)^ zUtey=vHQv{bMWtP?C5&pn92UY@bj-QevM*=PhWAk=q|0bUTL=DeOk*-5l8E$)v4*7 z{mz;cHGaA_&gA>r6H{9Y!ORi*sf_(X*H*3m0C{BZBDp*4?T&u#JfPM1fAHuUE8=rf z4F1*u&u;*EL&D>2G4Z0WV zIym*@e75RQCg5$A!MP=s3F`ITji{eL02I^iWoE z3{6r4$SC-Lfg?Yry^L&;Nz(&U|MXg!+m6fhSWjXrwA!j28#MKwfck7LI5lcKW1QEG z{`g`AngCfXXgzRXISIS9>7nDem>8|*lR~!2{-Aezv)(RHd6ol|x$>rBH9G<~UdM%) zyp2(f=r{s8xlioZY*V6uvgnbofUJR;1O=~3SeRa`qM~AT3lrg;a+uxrFUDC&B5+%0 z-}D^0@Fgqk-qXk@u zim?@PH>SGYYa`$x;G!}Z2L-PCa4mgT2UokSU4Jb8`RzbeTefr8bQegy8C)rVOHZCP zoKLh@gRs!DKs?#VUPaHvR0qUp!^Gig^0~@m4vo4B@z!%7U%MZ;Lr5Cm6$hyEu(J3D zB>aGxQr8|rxhdr(oAXBXbQZas*NH4Dz7+{EV;`c2i#pz8{apJV$QASE*HIEi;@X`p za;@JrKkoiiswP~svF(X{xKvDfI0v&UbP{q7RWKR9v`8y-SG;DfzRQ*xGMoUmB? z`sE7hva0H`6idY`^<8m}s*e44CkRs5uj@r>K3wp=df)luXAg2;&)&F>YZn>TtDXKw z{mGy`Jiz?VF2COdp&9l@2s|VT-Q|6xw(95$NWJlocS^w&sv$9{yF4<5aXvbIDdx1- z7UfB~y|#%vhfX&Whs9Cx`=~jMHg#BiVLpb`oo?BAb?wf3)Klnz5m{u{p|Pa!0aqw< z=5A&9zPt{~ylXjWkrX9NS!K3qvqa9qx-6%YQ+mN&UlPu8;P8D7oAS7O$eFz-*Dz&m zpi{jeC9+~9$6qECIW^V`e~LPHrw#9|H+O&V%?P&{wDir_b6`dOo;y=B9x)X6u5M(< z|6JVf&Q@YGBnat1`bwjfN40CFi}GD8+l&*-diNtm zvJTl&2ERFJ_U7OO4_BN606OZJh3UR-q-=xvnU5UgL z6|Et}%1?Aac$>)&Ts!<-@{4&{gA_37#QV4ybgZZ;j#QWe^T(IXwdS>-m)W$T>@BP* zJ}o;%{u~Rbe=WMGwX&n{MS-ORWLb{dcx>rTghXSi-%NaKvTY$L+pTfO1%Zl}n9&m_ zYoS(OaNe3vi!v?pJpl1p&Rwon@8c~UR`C)Wrt)KhKM1uc5HmUD_WMoPvEDdtYfYk4 z_xx(|N63|SY?pOYAGPb*cZiBK*mr>K4SJVE-?&&*yfkhZ7+_HHn0p zwu@aop~3{0-;yiA{0(sR>aa%~K*DGPS8zKV%;SVm?1}@Wv>JzV{PFPR);u#f${u3d z-yUYPn12=hmg^Kc;XKY2eat2A@OvrTGn&LxODHxsFU!KvF`$7$ZO|Jn$s@9u6MqE}NdYT(nEvz^!S*tHQg&i1R zbsWUQ&q~kEPtQ(CMC@08z&w6JF-_e$z!lGEF2Ml)E(uT1;VHQFO}m5)&T(FZJ3)Dq z19?ZsMx&&15g^29lb(_+BmfsO{OZ=6vGTWX)%#nQlKbkMf{AZV-1w3A;-Z-o*dGlf zT-tgl@xUr}-9<{!#-D*gmwP&H^rhy9uNtfzSdA4)EBE{q3<)~dobjO_yMa*0uTAJ% z?;nQHhi_TN*h(@V$1-+=j09cen>H?UoG0P-cL#5X#2c!x*$rGn_|GV*4Y9gBNW_uT zK78&iAqH|oxi5qf(-@9`d>C|sD>+U1JxQhIl-Q4e_^MW21pp6fLT{)DT=-yTmi+VDt zOxkF1cOh<%(bmbfpceP`*OEmmd4jc?l0 zf*h!QoNlXZr++VGq;l+#r>Ln;=6*4Pu#@!R!}#|{AucNiM`J~$%DpTc=iKGD#ji8s z2-83IrO*I5poBzS+jXW3TRY61t-l2cBcqu0SAAYS5%SIFqR9!$zor+zO@C5%giZ%O z*{oDZ$?r z>eW7N%kX5AwE;$hNx!t}{}mk8s<>|r1uGaVJD zA(pEzI}=(mv06mj#XR15A{Yr~=4vii9blFp3pakdJmLE#oXegC6>h?lzoANt%KBqqTz2xz0wFz>Td>+2g6fvxJlT*D&8;d$iknJ zV{bMI<=!1~#iyd6YM!rStKSK-YaMj=w9HUuYv5~||MG#}aV9hS0!sc`x~&*WIQ;`T z^J)Y8QKHcl6)e~0BNV#(9hpo0{ewOizD7*EdEGlm5*w*+z_7^&=NIp zKRyr_+um^mB`6K(E7KbDVa3PbJ>J%(AIqk$jBoO~`tdKh%1Ta#^0V8$3sL8!e(=CF z^nPRX#?@lv?oe)W^K=C zkNsx1r;%moP*hc7w?oKF5AXQneiQ4=h*32>pXMNisD)#T@4mxSpWIZG9L8AbhF|6Q z`K9!7Oqnv27ac%30S6(4h$wgeSvgEiiiilXj#To!?s=`#)P)9in?=RN=R0)m6}s4$ zN``~MeKl5I@mL(EMfVs1Nu>@yGA|u6s|q$z4Yw^u0qw$)M$hFySb#k4z?I4T8NpoV zSPuZ;#y_SU2znPJe!P<~mR2AOJ+0P?ar+3JavIxvZ;`tfl2uX1Wx=O~eHxNAODr<4 zBO)$UpeqsEp$e{6{g+xoM)e%*kb!iyBk3@Ms}C_096l<$Z7_u@(z~15s>?R6?|yVK zgLKc;osnY@uWE}ewPo*x%x?nItV{VNu(>vH7+45afzWCbrk~E09CAq>H=mmQ@hBqn3}cTW6e}h=b7D zm?m7DJo8V9Gevy0$z#elZs*on@4SWvBXyGi3uK}k`c5DX7BIVxCe|0&cH~T-#;x$m znfZP5J`sLz0>;chLdD6FW68KhxuznBSuwQ3h#fvD*7Iz9D?KJ$bhB)3z9h*hB^3@u zZr(W&#@YLrWmslNr9oE7olCAkCx0Hkv8h=|$hdd`B|^Fq)gH}ZE+fk-8P%2UUN8Mr zyejX-5(L-?AQ41eGFMHVXidTpK&eAr#lE(O%9B=;=qvyq51AYlId<%_+3u1t6CMh-HNOvS!k2(AD zcwD6Y4N7^8o{$pc-S^8iatnzV|-qgTnOmmkq+*B^$TEzlT{g?fHm^ zPH_)PI5sjG0n(fUD~X_#t>Cqk1)0C9W(!I3xW{8pO+49$LLOZ+6x8z6GpDB3j-S1+O1= zxv5en6S>HeIN38l3-VhY6jNE#9jm9~WBC@OTZ2v@B;n%D*!%0^8SoO&(X~BH>Z&II zsGx)20+&d7aPCnaHXmE=(f)x{Y5>9l)EmVrvs&4DZFXg&idksc4%Ksaw=0Y9L_k8) zbHA(E{cK4r=48*h z?eiZFCI-L_V*bOh_%d0EgpN%`3TNJzk&HHGtfTxDZ*0CFd#%ImTy|!+^YQUp6Hcd| zqu7sM=K!z;d}WlDRavBRDunMs3THmzGZ_De1%=h9RXU_~kI7ZJh_lDQxFP<7?>xo! z2YzI&bHhQP@sZ7*?6Gie{{efRZ~P~?91Els0+dVkaw-I@zy1ZWGGxYf<+6$=a)LcQ z8%r5Rsh=}<0H9f6zTGGyJ3B5>W9IkVPXXnw&F~Pd=W}-;29gn5dOP}uOvdEVh3&Ra z_^W242WmHnCk#&5&-Z_2JaVL0y@8+IpT0%BIQY8uB~U-GOHV)kc{D%>1!WO_2xAdF z!(kH8e4SQ&N|XeakiP`pj=hHm1%s?`8vC*U4+!DE7aFsW8o|4rNO#M^9ewwoaKS{x zQ=T{>1k#_KpHJ#0?U8R#uP;8 z4t+RWF@)U$Arry?lI{FdS2r2`=yt0}7uoS+T;9%!O+N7#`hUX^UQv^i$jnVnr|#q=l6gSS}B>lr|W?%pJ@nbui3`zyAM-j9a z6h8kcKDwoHa4B_bkkL%;7v#TbHIY^NQMEd#s5n#|ok8v&2{<|_oPW0j6sN1MAR15b@n*MO^n?qy| z`w~*vy?$BQXwNjZP<~ev$3%8?5|rMtbxvP?fFDZyniR#(=y7c z_uw)E6HQ!i5mERSt;??N}NrESIPw)G#*q~yIM^66>i zFllMM6xm5sG+a_+-}q>gK^uehmny zA)dteA2Zp?RVT@a!nz*(#z*XsK6pF=WOhMK$#7d6{5Bdb&?X#QE}(pUtk)U-ztIKN zaj)}8DJNrpWRTtQuqI!hFIl_`Q!1=0-iA&ssdrgo;ucOgS0eHm`@Ys9HNmvAun5r# zTJ{CbFUo1^^4SFG=JEfLgI4_as*09t?Md<#M>lKd=;l;Kl&sg9VAS`ZBZi&VQ!rbw zcRZ$Y@c(~zN*ZM%i_W+2D9zA<8`ob*{NIx$0^}C0(TXAIwW+iM{#j%B^ofmkm4G13 zi_ztjx^(%r_?N2TK4VW<`uhjHvf}``3hzqoyPupz+`w#f@Zs`(J(^q;rlzBz!cOX7 zxA)ZtsHuw@j>ljA#P8n?6PjOKsDV}~crhuGK7z;Ut`jMAdy%z6Z`YXLiAOcAhc@1i z$newG+v7ZCUlgMC`bupP_G=y0D@JFUox}TpPR!^wswoIWRnoi>B>6#%mAjE~?-ZpXC znF{Nn&z*B1(dFW;dtMTZ=8c}<(GGE;7UG;S(29UWiF14EVOD&1WiBo-_#$|UV!SDlz`_W5x_q&;`K_gV1 zWafqCWv|OcnC)R5)yr<8u6+Chjo)`{hc{kJfa$Z8`EZi*)b`*Gu}C#A#mKKJ&&>PCRpav6I1s! z8W=HnKqsZiHsc2tn~g|!5eAtJ+|jMduAvDjLlUrnn&gOyjfZ<1Z7UlZM59!-gdvfu z%oN1T0E~8|?)02Oc9i5?8}u;X?&x^YBa@X&z|S??kt&XRu$ty|zcZkqlgi9ZbV+|q zDa~qd6WKTr_*Q{mnf-WQd@TJ*60!l<4T~&puu@jn(a+wo)`Q2AgzkIJ&7llx9hzCs zSoE_Zc>1|PN$#x?N^4kgBh^UEWSgvz8y?^@^F};TvVu3*eydWoD0;<9h+TC>;0tlW!%c*^?pOi3pi>kjd!g!3l)=0xA3;&QbZlyO8u zRKVZfm->iHg zkSRZ9_#!-1~3h#?Hpvbws6Fv!i zKxWw6+Y8v~vemyx-JkLnnMhY~>OmQcrN^{*Y!|lU)UYK9b;>y~!i>|{qPp?e42DVf z;-_0xawZ$uG9Rp}Pj7xG9Z8^L$1p927vovxied-~=$G-($zd{9>1%OQ&{zEP`|4%p zw^(9e2b8Aayrnvca)WSGsUPmr>xe5~GYveL9uMipPdw}{+8tqu4#>N|>twm&&+UW- zkHzjU@$>wo9|&5oVT!23Qv-pJO`rcSfL`t*eIWpUEP1=`Jrz0E(s%s&i_i|eBVE2J zy4Dp=Ww|Kvw{E$)OtzljA{}<8wOekQY0#v2HJj}AXM3PN)l0Mcb&Ji3JQCOx4TEBi zS-6JeeM5>alH?!V#H-UJ@y+ypt$qGwoX4N#K@%hJ@0fM#t!aLkEJb)|=S)Ii@tYJ5hgf>JCZi~6N)^-juS02@^nV8dDRD4L=G;Snj zxnKuR^aA>A}c&s$}{H%+mO9 zHamtkKsA7#gP6oSQCQTJ5>R4*PlPa7NuP=z=lEyQ!tLLRqXG2rk%{Lax`gacJgH{d>|;V z3t(cjnqn%gp9m2vN6U;0=6kAUF>@-#9784Jsdm$TTCv9B6=WUcHtDM<*1Tc0SI}%= zQ$ZSB%i1ltW$N=RTpH(2SZrgm5s7i{YD+FSdXRZ?uwCTI(HINX@AZ^=TtiDoiq4UF zQXC)qRAV3c)U9@i7qQ_6C(fLHt+?;BVx{Qp@q{b|kpk=&85Wi?QB?OU1ise5fctxo z>g1k7t-guzGrML=;0zz($0ch|b*mQk=R;5d14dRG2E6a1(&G1}AZi+~*zn%)Hcd88 z;1Z3HZ*G#I7y^5w&V2Jz=F|i)&Cvw#qu01MFVAAGG`ypO!>F^@5mPae6+ZqsR1GGS zl!#qsZaU!fcxB;U>rSL6;bhNvcXeJ$zvJP-FZXeKlv+Vsd5ZPZymG{!aOCKx)I1M5 zJ~?w@G?ko($1f%Ur?`jcGYw4@s=M>`t+%UeZq{cDVtLII;GNt*f?uDi!WEZu=>Vu) zWxg_-!cn|aNFtuUr1@vdAOX?Bw^Ccw(w&a_ANkPbY~(OeSFm9ZmD-LUw|V#`^U7&l zR+cBW_0UAv;~1Mv*_UR&T3CtVO5qCk-uL8^M{dD zL0rjA|5plPKQT#03UhOTjcMbvn%){Z%KHDWj`NIaDqF)agCNpH7*M*1APx|U3`!S* z5Gm48I-v%E00sh~DMdO+Q&Bod6(U`w-HeTq-jYE=4G@9?h89Rjat|}J?!WtQpS8|9 z>#TM5{?6Xd`@UcMSOiJJ{JTeJ7^R^h%7iI2 z%prUrp72^C_4L;~MG`eDw3paK=n@OhXFYs0PF^~ z-03Pll-z>m5(Z}y0bZPLd<5SRk+zOpEX!e-sg4Nssp zuJsDTj?IcAU>9nqKAz%%IiHADu}>=kq-^bpFaG(82uj~dt>*QlJ?)Tdj4Oj6L*7C& zT+FJpGY{84C|r**hJcMb^9$E!-~9X{h3O!!Bgo|4CC`s1?t2-g2=EpQ{Rq+M(+zwZ zr$Ls^D$%pbD@EDw?9zva5ng2wvjeGKOK+M+~FS2rv_vF~cJyRREz}8He@Y zzM`d~uU1cAR*eb3`TFiXFD3EVIyub4uHVGjiQfp-4bzz1j$aUX@y?bcv31}~Sd~|c zlS76#v3Z%?!PBFbIp7Yt_=y636$$$*rpmr+M(yCJ)GzGvM>|d=oxS zq;V}cNg9Ip2=0zG0>*un@6d(IPJ>OZ#!lbtp@5<1NG5GQ^MV_*di%oJ7B9ICj;G@;v!cMDp2^ZjRru?Yt+#!HMdc!%~~Rqi?sgJdT+6r*)|Ra z&zt4cj2{n_yMh5!ciE_!H+u1kYmz7xH0S7RkcDXS>BFr}R3ar5J61pOZGA{>78IBi z4Jq_rOwZ&LtyN_9Rs~foQczqGJMzH70`=EE$3cwWx46(obECn^0@k)oz`_*|=208e-odeFF;J6o%1q@e@1g1Bl`i)S%2&_t63g#%SL#2D zv5d0+Gv>?4-6v1qT%>Bt?4%dp$h|r}5@Kim)fqC*$^AS6o>QdlXIu1*6HzI5^~vW` z9F%Q)8~p|JKK`4^dYaK~9LjE}vuHcW7dsM!nN{z7K8-*s z%^V-F`pOaJwE&?NwOgw5K_7+;K$sS!$JI0_4^EAF%J@yAiS6QbMM*FZH)^rGHK*`U1%@d;94P8apIf*!XcueQ_>T*LGU3reUO`4swZs zud@zu-^fD(g3I*&&G{`Oj&qPoR%QjCor{eDSXR(uAlCvJMv*b< z`Dh2PT41hXX+tImakZL;h5(s{fOu9I64q~ITkxJ({mAzQeE$Be8#lL^qZJAj`FF&% zZQR|NLA2S7j#a_%Wo)>Q2&M{ZGtVPRTN8j#&XcOt=VSz{NAcbaAGIHhkb_3myuh6( zJWyY5idtr-=MIHXa+4hArdOvp1b;{mLzaj=(q+?qSmOg!LG;Cf`^|Ej3Xips5 zx}?yOYj^L*(w6eGw_6IUSxTMyRP$$-P; zDHX2?{M=kv7+Nm&eM+hh&rE2Yplc>-ulAkG&J)Upysdzep5Mr^Subkz zI$Xy9{Pkc6uuzbzQC)VuN+_5`CvuMS$uY<_tn4DPngoaxMy8F^1=@BRO0Iv(Obs>t zRw!P2Z8e4kZbVDk(WKeCI-L(B-P(zSA7V1Z{5A*Ndunv+mluodOSbnGXxpDea4R6U z2ju=X9R5;eBl$9@^G=usV{!gF7|gD18Mo0JnI+q+7fXWpx?o5eemd$kn*$X2%Jf90 z1?cypuDVulsQ^CI+i=>}St%)9xlFf?Y?13~fP)L@*E7t=Z;Nx7CF%fago@2eg)1jj zI(&$_vy<)vSG1uzsHxjII`&7-?6mH1$!yd|8XPDEM!tP=8dWAkmDJ$S3#iZEYHS3~ zUg-J5{WjOxR|<_dxTxS^f&v2Gz2UAEdYkEy4mI%K*31zXc{ z2PFNw_zCRpD(S-V)8ES&i5kR70mFpmu=XxA8m%6ofXb&*wM?R;y`Hh2kSvT<{9@Hp z?}}y~c8wWg{kM-5MxXP`JBWjmMr=*MSS+UbgoMTG*9zy>0e!>%Vkb##1l)H9S2F0u zKu@KIk_onKuu$L`)&Ih*slesco+G2p-j5csDp${HcJOsjoJL*(sLq+O36EDlG#^e+ zPEOA12)77oG8prQ!C*eqU%JsG3+b~uQ8t(SgCiu?|5ysi1i+&tbglM`5`T<3`hVc@ zv&B$nXI%5bn3zxh^fjG}+`@x-)4R#nu7{e5k&TVsl{z!uU?)HQkBO!TK&)2 zT$Va0qJQI+W*b!~|2SI2;aF$113OP6BBT4WRM(1g2!~kCJYb%DjRB_H!)p*=2s^o+ zkOjbfH3SH`nC7#wuso3ijI+`f=Ky8pg)A_u{{M{!tl;~vcvT|Vf`O;7K#VQH&4wNc F{{>FW!+!t( diff --git a/install.yaml b/install.yaml index 5313833..8b93ea5 100644 --- a/install.yaml +++ b/install.yaml @@ -1,72 +1,53 @@ # Details about the install.yaml file are at https://ddev.readthedocs.io/en/latest/users/extend/additional-services/#sections-and-features-of-ddev-get-add-on-installyaml -name: addon-template +name: mittwald # pre_install_actions - list of actions to run before installing the addon. -# Examples would be removing an extraneous docker volume, -# or doing a sanity check for requirements. -# DDEV environment variables can be interpolated into these actions pre_install_actions: - # Actions with #ddev-nodisplay will not show the execution of the action, but may show their output -# - | - # #ddev-nodisplay - #ddev-description:Check architecture type for incompatible arm64 type - # if [ "$(arch)" = "arm64" -o "$(arch)" = "aarch64" ]; then - # echo "This package does not work on arm64 machines"; - # exit 1; - #fi +- | + #ddev-nodisplay + if ( {{ contains "MITTWALD_API_TOKEN" (list .DdevGlobalConfig.web_environment | toString) }} || {{ contains "MITTWALD_API_TOKEN" (list .DdevProjectConfig.web_environment | toString) }} ); then + echo "Using existing MITTWALD_API_TOKEN." + else + printf "\nPlease enter mittwald API token: " + fi + +- | + #ddev-description:set mittwald API token + #ddev-nodisplay + if !( {{ contains "MITTWALD_API_TOKEN" (list .DdevGlobalConfig.web_environment | toString) }} || {{ contains "MITTWALD_API_TOKEN" (list .DdevProjectConfig.web_environment | toString) }} ); then + read -s token + ddev config global --web-environment-add MITTWALD_API_TOKEN=${token} + echo "MITTWALD_API_TOKEN set globally" + fi -# - "docker volume rm ddev-${DDEV_PROJECT}_solr 2>/dev/null || true" -#- | -# # Using #ddev-nodisplay tells ddev to be quiet about this action and not show it or its output. -# #ddev-nodisplay -# #ddev-description:Remove solr volume -# if ! ( ddev debug capabilities 2>/dev/null | grep multiple-dockerfiles >/dev/null 2>&1 ) ; then -# echo "This add-on requires DDEV v1.19.4 or higher, please upgrade." && exit 2 -# fi -#- 'echo "what is your platform.sh token" && read x' +- | + #ddev-nodisplay + if !( {{ contains "MITTWALD_APP_INSTALLATION_ID" (list .DdevProjectConfig.web_environment | toString) }} ); then + printf "Please enter mittwald app installation ID (formatted a-XXXXXX): " + fi -# This item shows templating using DDEV environment variables. -# - -# #ddev-description:Touch a file to create it -# touch somefile.${DDEV_PROJECT_TYPE}.${DDEV_DOCROOT}.txt -# +- | + #ddev-description:set mittwald app installation ID + #ddev-nodisplay + if !( {{ contains "MITTWALD_APP_INSTALLATION_ID" (list .DdevProjectConfig.web_environment | toString) }} ); then + read app_id + ddev config --web-environment-add MITTWALD_APP_INSTALLATION_ID=${app_id} + fi -# This item shows complex go templating possibilities based on yaml_read_files -#- | -#- #ddev-description:Create a config.platformsh.yaml -# cat <.ddev/config.platformsh.yaml -# php_version: {{ trimPrefix "php:" .platformapp.type }} -# database: -# type: {{ regexReplaceAll ":.*$" .services.db.type "" }} -# version: {{ regexReplaceAll "^.*:" .services.db.type "" }} -# -# docroot: {{ dig "web" "locations" "/" "root" "notfound" .platformapp }} -# {{ if eq .platformapp.build.flavor "composer" }} -# hooks: -# post-start: -# - composer: install -# {{ if .platformapp.hooks.deploy }} -# - exec: "{{ trimAll "\n" .platformapp.hooks.deploy | splitList "\n" | join ` && ` }}" -# {{ end }} -# {{ end }} -# -# EOF # list of files and directories listed that are copied into project .ddev directory # Each file should contain #ddev-generated so it can be replaced by a later `ddev get` # if it hasn't been modified by the user. # DDEV environment variables can be interpolated into these filenames project_files: -- docker-compose.addon-template.yaml -# - extra_files/ -# - somefile.sh +- web-build/Dockerfile.mittwald +- providers/mittwald.yaml # List of files and directories that are copied into the global .ddev directory # DDEV environment variables can be interpolated into these filenames global_files: -# - commands -# - homeadditions +- commands # List of add-on names that this add-on depends on dependencies: @@ -74,9 +55,30 @@ dependencies: # DDEV environment variables can be interpolated into these actions post_install_actions: -# - chmod +x ~/.ddev/commands/web/somecommand -# - touch somefile.${GOOS}.${DDEV_WEBSERVER} -# - perl -pi -e 's/oldstring/newstring/g' docker-compose.addon-template.yaml + +- | + #ddev-description:write mittwald specific configuration file + + # Load all configured MITTWALD_ environment variables into the current shell; + # we'll need them for the mittwald/cli calls. + {{ range $var := .DdevGlobalConfig.web_environment }} + {{ if hasPrefix "MITTWALD_" $var }} + export {{ $var }} + {{ end }} + {{ end }} + + if [ -e config.mittwald.yaml ] ; then + echo "mittwald specific config file already exists" + else + docker run --rm -e MITTWALD_API_TOKEN mittwald/cli mw ddev init-config "${MITTWALD_APP_INSTALLATION_ID}" > config.mittwald.yaml + echo "mittwald specific config file written to config.mittwald.yaml" + fi + +- | + echo -e "\nšŸš€ All done! You can now do the following:\n" + echo " - Use 'ddev mw ...' to run the mittwald CLI from within the web container" + echo " - Use 'ddev pull mittwald' to download the configured app" + echo " - Use 'ddev push mittwald' to upload the app to the mittwald platform (DANGEROUS)" # Shell actions that can be done during removal of the add-on removal_actions: diff --git a/providers/mittwald.yaml b/providers/mittwald.yaml new file mode 100644 index 0000000..1a562f1 --- /dev/null +++ b/providers/mittwald.yaml @@ -0,0 +1,40 @@ +#ddev-generated + +auth_command: + command: | + set -e -o pipefail + + if [ -z "${MITTWALD_API_TOKEN}" ] ; then + echo "MITTWALD_API_TOKEN must be set" + exit 1 + fi + + mw context set --installation-id "${MITTWALD_APP_INSTALLATION_ID}" + mw context set --project-id "$(mw app get -ojson | jq -r '.projectId')" + + mw app ssh --test + +db_pull_command: + command: | + set -e -o pipefail + DATABASE_ID=$(mw app get -ojson | jq -r '(.linkedDatabases[] | select(.purpose = "primary")).databaseId') + mw database mysql dump "${DATABASE_ID}" --gzip -o /var/www/html/.ddev/.downloads/db.sql.gz + +files_import_command: + command: | + set -e -o pipefail + mw app download --target "${DDEV_FILES_DIR}" + +# push is a dangerous command. If not absolutely needed it's better to delete these lines. +db_push_command: + command: | + set -eu -o pipefail + pushd /var/www/html/.ddev/.downloads >/dev/null; + DATABASE_ID=$(mw app get -ojson | jq -r '(.linkedDatabases[] | select(.purpose = "primary")).databaseId') + gzip -dc db.sql.gz | mittwald database mysql import "${DATABASE_ID}" -i - + +# push is a dangerous command. If not absolutely needed it's better to delete these lines. +files_push_command: + command: | + set -eu -o pipefail + mw app upload --source "${DDEV_FILES_DIR}" \ No newline at end of file diff --git a/web-build/Dockerfile.mittwald b/web-build/Dockerfile.mittwald new file mode 100644 index 0000000..165c7a9 --- /dev/null +++ b/web-build/Dockerfile.mittwald @@ -0,0 +1,2 @@ +#ddev-generated +RUN npm install -g @mittwald/cli \ No newline at end of file From 80e5bbbaf959d480090b45f49f247d807257107e Mon Sep 17 00:00:00 2001 From: Martin Helmich Date: Mon, 19 Feb 2024 08:32:58 +0100 Subject: [PATCH 02/19] Set a dummy API token --- .github/workflows/tests.yml | 2 ++ install.yaml | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 3191904..b206286 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -30,6 +30,8 @@ jobs: steps: - uses: ddev/github-action-add-on-test@v1 + env: + MITTWALD_API_TOKEN: foo with: ddev_version: ${{ matrix.ddev_version }} token: ${{ secrets.GITHUB_TOKEN }} diff --git a/install.yaml b/install.yaml index 8b93ea5..d28324e 100644 --- a/install.yaml +++ b/install.yaml @@ -16,6 +16,11 @@ pre_install_actions: #ddev-description:set mittwald API token #ddev-nodisplay if !( {{ contains "MITTWALD_API_TOKEN" (list .DdevGlobalConfig.web_environment | toString) }} || {{ contains "MITTWALD_API_TOKEN" (list .DdevProjectConfig.web_environment | toString) }} ); then + if [[ -n "${DDEV_NONINTERACTIVE}" ]] ; then + echo "MITTWALD_API_TOKEN not set; please provide one in the web_environment configuration" >&2 + exit 1 + fi + read -s token ddev config global --web-environment-add MITTWALD_API_TOKEN=${token} echo "MITTWALD_API_TOKEN set globally" From a2a22bf3d6254f4a74c70d0f29999d7544737a68 Mon Sep 17 00:00:00 2001 From: Martin Helmich Date: Mon, 19 Feb 2024 08:33:37 +0100 Subject: [PATCH 03/19] Don't prompt anything at all, when DDEV_NONINTERACTIVE is set --- install.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/install.yaml b/install.yaml index d28324e..adba629 100644 --- a/install.yaml +++ b/install.yaml @@ -36,6 +36,10 @@ pre_install_actions: #ddev-description:set mittwald app installation ID #ddev-nodisplay if !( {{ contains "MITTWALD_APP_INSTALLATION_ID" (list .DdevProjectConfig.web_environment | toString) }} ); then + if [[ -n "${DDEV_NONINTERACTIVE}" ]] ; then + echo "MITTWALD_APP_INSTALLATION_ID not set; please provide one in the web_environment configuration" >&2 + exit 1 + fi read app_id ddev config --web-environment-add MITTWALD_APP_INSTALLATION_ID=${app_id} fi From 3236089d6434717e5e4ab34cf4775033192a0be2 Mon Sep 17 00:00:00 2001 From: Martin Helmich Date: Mon, 19 Feb 2024 08:40:46 +0100 Subject: [PATCH 04/19] Use config from global environment in non-interactive mode --- .github/workflows/tests.yml | 1 + install.yaml | 30 ++++++++++++++++++++---------- 2 files changed, 21 insertions(+), 10 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index b206286..1d682db 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -32,6 +32,7 @@ jobs: - uses: ddev/github-action-add-on-test@v1 env: MITTWALD_API_TOKEN: foo + MITTWALD_APP_INSTALLATION_ID: a-XXXXXX with: ddev_version: ${{ matrix.ddev_version }} token: ${{ secrets.GITHUB_TOKEN }} diff --git a/install.yaml b/install.yaml index adba629..2cb28ec 100644 --- a/install.yaml +++ b/install.yaml @@ -17,13 +17,18 @@ pre_install_actions: #ddev-nodisplay if !( {{ contains "MITTWALD_API_TOKEN" (list .DdevGlobalConfig.web_environment | toString) }} || {{ contains "MITTWALD_API_TOKEN" (list .DdevProjectConfig.web_environment | toString) }} ); then if [[ -n "${DDEV_NONINTERACTIVE}" ]] ; then - echo "MITTWALD_API_TOKEN not set; please provide one in the web_environment configuration" >&2 - exit 1 + if [[ -n "${MITTWALD_API_TOKEN}" ]] ; then + ddev config global --web-environment-add MITTWALD_API_TOKEN=${MITTWALD_API_TOKEN} + echo "MITTWALD_API_TOKEN set globally" + else + echo "MITTWALD_API_TOKEN not set; please provide one in the web_environment configuration" >&2 + exit 1 + fi + else + read -s token + ddev config global --web-environment-add MITTWALD_API_TOKEN=${token} + echo "MITTWALD_API_TOKEN set globally" fi - - read -s token - ddev config global --web-environment-add MITTWALD_API_TOKEN=${token} - echo "MITTWALD_API_TOKEN set globally" fi - | @@ -37,11 +42,16 @@ pre_install_actions: #ddev-nodisplay if !( {{ contains "MITTWALD_APP_INSTALLATION_ID" (list .DdevProjectConfig.web_environment | toString) }} ); then if [[ -n "${DDEV_NONINTERACTIVE}" ]] ; then - echo "MITTWALD_APP_INSTALLATION_ID not set; please provide one in the web_environment configuration" >&2 - exit 1 + if [[ -n "${MITTWALD_APP_INSTALLATION_ID}" ]] ; then + ddev config --web-environment-add MITTWALD_APP_INSTALLATION_ID=${MITTWALD_APP_INSTALLATION_ID} + else + echo "MITTWALD_APP_INSTALLATION_ID not set; please provide one in the web_environment configuration" >&2 + exit 1 + fi + else + read app_id + ddev config --web-environment-add MITTWALD_APP_INSTALLATION_ID=${app_id} fi - read app_id - ddev config --web-environment-add MITTWALD_APP_INSTALLATION_ID=${app_id} fi From 9b796325751d20455cd26e525425f49150228295 Mon Sep 17 00:00:00 2001 From: Martin Helmich Date: Mon, 19 Feb 2024 10:23:10 +0100 Subject: [PATCH 05/19] Simplify initialization shell scripts --- install.yaml | 39 +++++++++++++++++++-------------------- 1 file changed, 19 insertions(+), 20 deletions(-) diff --git a/install.yaml b/install.yaml index 2cb28ec..8af3d4c 100644 --- a/install.yaml +++ b/install.yaml @@ -16,19 +16,18 @@ pre_install_actions: #ddev-description:set mittwald API token #ddev-nodisplay if !( {{ contains "MITTWALD_API_TOKEN" (list .DdevGlobalConfig.web_environment | toString) }} || {{ contains "MITTWALD_API_TOKEN" (list .DdevProjectConfig.web_environment | toString) }} ); then - if [[ -n "${DDEV_NONINTERACTIVE}" ]] ; then - if [[ -n "${MITTWALD_API_TOKEN}" ]] ; then - ddev config global --web-environment-add MITTWALD_API_TOKEN=${MITTWALD_API_TOKEN} - echo "MITTWALD_API_TOKEN set globally" - else - echo "MITTWALD_API_TOKEN not set; please provide one in the web_environment configuration" >&2 - exit 1 - fi - else + token="${MITTWALD_API_TOKEN}" + if [[ -z "${token}" && -z "${DDEV_NONINTERACTIVE}" ]] ; then read -s token - ddev config global --web-environment-add MITTWALD_API_TOKEN=${token} - echo "MITTWALD_API_TOKEN set globally" fi + + if [[ -z "${token}" ]] ; then + echo "MITTWALD_API_TOKEN not set; please provide one in the web_environment configuration" >&2 + exit 1 + fi + + ddev config global --web-environment-add MITTWALD_API_TOKEN=${token} + echo "MITTWALD_API_TOKEN set globally" fi - | @@ -41,17 +40,17 @@ pre_install_actions: #ddev-description:set mittwald app installation ID #ddev-nodisplay if !( {{ contains "MITTWALD_APP_INSTALLATION_ID" (list .DdevProjectConfig.web_environment | toString) }} ); then - if [[ -n "${DDEV_NONINTERACTIVE}" ]] ; then - if [[ -n "${MITTWALD_APP_INSTALLATION_ID}" ]] ; then - ddev config --web-environment-add MITTWALD_APP_INSTALLATION_ID=${MITTWALD_APP_INSTALLATION_ID} - else - echo "MITTWALD_APP_INSTALLATION_ID not set; please provide one in the web_environment configuration" >&2 - exit 1 - fi - else + app_id="${MITTWALD_APP_INSTALLATION_ID}" + if [[ -z "${app_id}" && -e "${DDEV_NONINTERACTIVE}" ]] ; then read app_id - ddev config --web-environment-add MITTWALD_APP_INSTALLATION_ID=${app_id} fi + + if [[ -z "${app_id}" ]] ; then + echo "MITTWALD_APP_INSTALLATION_ID not set; please provide one in the web_environment configuration" >&2 + exit 1 + fi + + ddev config --web-environment-add MITTWALD_APP_INSTALLATION_ID=${app_id} fi From d5aaa55cb262d5c76aeecf42a404047549c83849 Mon Sep 17 00:00:00 2001 From: Martin Helmich Date: Mon, 19 Feb 2024 11:03:16 +0100 Subject: [PATCH 06/19] "{init => render}-config" --- install.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install.yaml b/install.yaml index 8af3d4c..f1931b0 100644 --- a/install.yaml +++ b/install.yaml @@ -88,7 +88,7 @@ post_install_actions: if [ -e config.mittwald.yaml ] ; then echo "mittwald specific config file already exists" else - docker run --rm -e MITTWALD_API_TOKEN mittwald/cli mw ddev init-config "${MITTWALD_APP_INSTALLATION_ID}" > config.mittwald.yaml + docker run --rm -e MITTWALD_API_TOKEN mittwald/cli mw ddev render-config "${MITTWALD_APP_INSTALLATION_ID}" > config.mittwald.yaml echo "mittwald specific config file written to config.mittwald.yaml" fi From 07c3cca6ced1a5575e5302216159d5125e35f6a2 Mon Sep 17 00:00:00 2001 From: Martin Helmich Date: Mon, 19 Feb 2024 11:04:10 +0100 Subject: [PATCH 07/19] Skip actual mw config generation during CI run --- .github/workflows/tests.yml | 1 + install.yaml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 1d682db..e8527a3 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -33,6 +33,7 @@ jobs: env: MITTWALD_API_TOKEN: foo MITTWALD_APP_INSTALLATION_ID: a-XXXXXX + MITTWALD_SKIP_CONFIG: yes with: ddev_version: ${{ matrix.ddev_version }} token: ${{ secrets.GITHUB_TOKEN }} diff --git a/install.yaml b/install.yaml index f1931b0..2c51342 100644 --- a/install.yaml +++ b/install.yaml @@ -85,7 +85,7 @@ post_install_actions: {{ end }} {{ end }} - if [ -e config.mittwald.yaml ] ; then + if [[ -e config.mittwald.yaml || -n "${MITTWALD_SKIP_CONFIG}" ]] ; then echo "mittwald specific config file already exists" else docker run --rm -e MITTWALD_API_TOKEN mittwald/cli mw ddev render-config "${MITTWALD_APP_INSTALLATION_ID}" > config.mittwald.yaml From d9b984f18183ed4f49faed972afe5355a90dc3f9 Mon Sep 17 00:00:00 2001 From: Martin Helmich Date: Mon, 19 Feb 2024 19:22:43 +0100 Subject: [PATCH 08/19] Install correct addon in tests, but skip during pull requests --- tests/test.bats | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/tests/test.bats b/tests/test.bats index b41afac..073cb86 100644 --- a/tests/test.bats +++ b/tests/test.bats @@ -35,9 +35,14 @@ teardown() { @test "install from release" { set -eu -o pipefail + + if [[ "${GITHUB_EVENT_NAME}" == "pull_request" ]] ; then + skip "skipping 'install from release' in pull request pipelines" + fi + cd ${TESTDIR} || ( printf "unable to cd to ${TESTDIR}\n" && exit 1 ) echo "# ddev get ddev/ddev-addon-template with project ${PROJNAME} in ${TESTDIR} ($(pwd))" >&3 - ddev get ddev/ddev-addon-template + ddev get mittwald/ddev ddev restart >/dev/null health_checks } From efac7f03c1f5d69abe222d4ddb368942111e7be4 Mon Sep 17 00:00:00 2001 From: Martin Helmich Date: Tue, 20 Feb 2024 08:59:32 +0100 Subject: [PATCH 09/19] Add disclaimer about unmerged prerequisites in README --- README.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 4199340..9770e4f 100644 --- a/README.md +++ b/README.md @@ -8,6 +8,9 @@ --- +> [!WARNING] +> Functionality of this addon depends on some unmerged features in the [mittwald CLI](https://github.com/mittwald/cli) (most importantly, https://github.com/mittwald/cli/pull/220). This warning will be removed once all required prerequisites have been merged. See https://github.com/mittwald/feature-requests/issues/118 to track the feature's overall progress. + ## Synopsis This repository contains a [DDEV addon][addon] for the mittwald hosting platform. It adds the following features to your DDEV project: @@ -43,4 +46,4 @@ Installing the mittwald DDEV addon allows you to use the following commands: [addon]: https://ddev.readthedocs.io/en/stable/users/extend/additional-services/ [cli]: https://github.com/mittwald/cli [api-intro]: https://developer.mittwald.de/docs/v2/api/intro/ -[deployment]: https://developer.mittwald.de/docs/v2/category/deployment-guides/ \ No newline at end of file +[deployment]: https://developer.mittwald.de/docs/v2/category/deployment-guides/ From 3bb0e2f6f71b6b0b98d196eaf96a0e8150158203 Mon Sep 17 00:00:00 2001 From: Martin Helmich Date: Tue, 20 Feb 2024 11:13:41 +0100 Subject: [PATCH 10/19] Run "ddev pull" with test project in pipeline --- .github/workflows/tests.yml | 7 ++++--- install.yaml | 2 +- tests/test.bats | 20 ++++++++++++++++++-- 3 files changed, 23 insertions(+), 6 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index e8527a3..859154f 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -31,9 +31,10 @@ jobs: steps: - uses: ddev/github-action-add-on-test@v1 env: - MITTWALD_API_TOKEN: foo - MITTWALD_APP_INSTALLATION_ID: a-XXXXXX - MITTWALD_SKIP_CONFIG: yes + MITTWALD_API_TOKEN: ${{ secrets.MITTWALD_API_TOKEN }} + MITTWALD_APP_INSTALLATION_ID: ${{ vars.MITTWALD_APP_INSTALLATION_ID }} + MITTWALD_SSH_PRIVATE_KEY: ${{ secrets.MITTWALD_SSH_PRIVATE_KEY }} + MITTWALD_SSH_USER: ${{ secrets.MITTWALD_SSH_USER }} with: ddev_version: ${{ matrix.ddev_version }} token: ${{ secrets.GITHUB_TOKEN }} diff --git a/install.yaml b/install.yaml index 2c51342..33c1a8d 100644 --- a/install.yaml +++ b/install.yaml @@ -85,7 +85,7 @@ post_install_actions: {{ end }} {{ end }} - if [[ -e config.mittwald.yaml || -n "${MITTWALD_SKIP_CONFIG}" ]] ; then + if [[ -e config.mittwald.yaml || -n "${MITTWALD_SKIP_CONFIG:-}" ]] ; then echo "mittwald specific config file already exists" else docker run --rm -e MITTWALD_API_TOKEN mittwald/cli mw ddev render-config "${MITTWALD_APP_INSTALLATION_ID}" > config.mittwald.yaml diff --git a/tests/test.bats b/tests/test.bats index 073cb86..f521e92 100644 --- a/tests/test.bats +++ b/tests/test.bats @@ -7,14 +7,22 @@ setup() { export DDEV_NON_INTERACTIVE=true ddev delete -Oy ${PROJNAME} >/dev/null 2>&1 || true cd "${TESTDIR}" - ddev config --project-name=${PROJNAME} + ddev config \ + --project-name=${PROJNAME} \ + --web-environment-add=MITTWALD_API_TOKEN=${MITTWALD_API_TOKEN} \ + --web-environment-add=MITTWALD_APP_INSTALLATION_ID=${MITTWALD_APP_INSTALLATION_ID} ddev start -y >/dev/null } +setup_ssh() { + mkdir -p ~/.ssh + echo "${MITTWALD_SSH_PRIVATE_KEY}" > ~/.ssh/id_rsa +} + health_checks() { # Do something useful here that verifies the add-on # ddev exec "curl -s elasticsearch:9200" | grep "${PROJNAME}-elasticsearch" - ddev exec "curl -s https://localhost:443/" + ddev exec "curl -s https://localhost:443/" | grep "Hello world" } teardown() { @@ -30,6 +38,14 @@ teardown() { echo "# ddev get ${DIR} with project ${PROJNAME} in ${TESTDIR} ($(pwd))" >&3 ddev get ${DIR} ddev restart +} + +@test "can pull code from remote" { + cd ${TESTDIR} + ddev get ${DIR} + ddev restart + ddev pull mittwald + health_checks } From bb289dab25fe1a41f0490f7cb80da524a4b47264 Mon Sep 17 00:00:00 2001 From: Martin Helmich Date: Tue, 20 Feb 2024 11:31:24 +0100 Subject: [PATCH 11/19] Skip configuration step when not necessary --- tests/test.bats | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/tests/test.bats b/tests/test.bats index f521e92..1039bfe 100644 --- a/tests/test.bats +++ b/tests/test.bats @@ -35,6 +35,9 @@ teardown() { @test "install from directory" { set -eu -o pipefail cd ${TESTDIR} + + export MITTWALD_SKIP_CONFIG=yes + echo "# ddev get ${DIR} with project ${PROJNAME} in ${TESTDIR} ($(pwd))" >&3 ddev get ${DIR} ddev restart @@ -42,8 +45,13 @@ teardown() { @test "can pull code from remote" { cd ${TESTDIR} + + export MITTWALD_SKIP_CONFIG=yes + ddev get ${DIR} ddev restart + + echo "# ddev pull with project ${PROJNAME} in ${TESTDIR} ($(pwd))" >&3 ddev pull mittwald health_checks @@ -56,8 +64,10 @@ teardown() { skip "skipping 'install from release' in pull request pipelines" fi + export MITTWALD_SKIP_CONFIG=yes + cd ${TESTDIR} || ( printf "unable to cd to ${TESTDIR}\n" && exit 1 ) - echo "# ddev get ddev/ddev-addon-template with project ${PROJNAME} in ${TESTDIR} ($(pwd))" >&3 + echo "# ddev get mittwald/ddev with project ${PROJNAME} in ${TESTDIR} ($(pwd))" >&3 ddev get mittwald/ddev ddev restart >/dev/null health_checks From fcf0091f8c1cc56b9da17dcb914b83c4c587a012 Mon Sep 17 00:00:00 2001 From: Martin Helmich Date: Tue, 20 Feb 2024 11:53:52 +0100 Subject: [PATCH 12/19] Consider that linked app might not have a database --- providers/mittwald.yaml | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/providers/mittwald.yaml b/providers/mittwald.yaml index 1a562f1..9412d19 100644 --- a/providers/mittwald.yaml +++ b/providers/mittwald.yaml @@ -17,8 +17,16 @@ auth_command: db_pull_command: command: | set -e -o pipefail - DATABASE_ID=$(mw app get -ojson | jq -r '(.linkedDatabases[] | select(.purpose = "primary")).databaseId') - mw database mysql dump "${DATABASE_ID}" --gzip -o /var/www/html/.ddev/.downloads/db.sql.gz + + database_output="/var/www/html/.ddev/.downloads/db.sql.gz" + database_id=$(mw app get -ojson | jq -r 'if has("linkedDatabases") then ((.linkedDatabases[] | select(.purpose == "primary")).databaseId) else empty end') + + if [[ -n "${database_id:-}" ]] ; then + mw database mysql dump "${database_id}" --gzip -o "${database_output}" + else + echo "app has no linked database; skipping database import" + echo "" | gzip > "${database_output}" + fi files_import_command: command: | From 6dc00376740b4e03711ef3e8b065bd4147f81fd5 Mon Sep 17 00:00:00 2001 From: Martin Helmich Date: Tue, 20 Feb 2024 12:53:42 +0100 Subject: [PATCH 13/19] Make tests pass --- providers/mittwald.yaml | 6 ++++++ tests/test.bats | 23 +++++++++++++++++++---- 2 files changed, 25 insertions(+), 4 deletions(-) diff --git a/providers/mittwald.yaml b/providers/mittwald.yaml index 9412d19..bda38c2 100644 --- a/providers/mittwald.yaml +++ b/providers/mittwald.yaml @@ -3,12 +3,15 @@ auth_command: command: | set -e -o pipefail + set -x if [ -z "${MITTWALD_API_TOKEN}" ] ; then echo "MITTWALD_API_TOKEN must be set" exit 1 fi + mw app get -ojson "${MITTWALD_APP_INSTALLATION_ID}" + mw context set --installation-id "${MITTWALD_APP_INSTALLATION_ID}" mw context set --project-id "$(mw app get -ojson | jq -r '.projectId')" @@ -17,6 +20,7 @@ auth_command: db_pull_command: command: | set -e -o pipefail + set -x database_output="/var/www/html/.ddev/.downloads/db.sql.gz" database_id=$(mw app get -ojson | jq -r 'if has("linkedDatabases") then ((.linkedDatabases[] | select(.purpose == "primary")).databaseId) else empty end') @@ -31,6 +35,8 @@ db_pull_command: files_import_command: command: | set -e -o pipefail + set -x + mw app download --target "${DDEV_FILES_DIR}" # push is a dangerous command. If not absolutely needed it's better to delete these lines. diff --git a/tests/test.bats b/tests/test.bats index 1039bfe..82da9db 100644 --- a/tests/test.bats +++ b/tests/test.bats @@ -1,5 +1,8 @@ setup() { set -eu -o pipefail + + setup_ssh + export DIR="$( cd "$( dirname "$BATS_TEST_FILENAME" )" >/dev/null 2>&1 && pwd )/.." export TESTDIR=~/tmp/test-addon-template mkdir -p $TESTDIR @@ -10,7 +13,8 @@ setup() { ddev config \ --project-name=${PROJNAME} \ --web-environment-add=MITTWALD_API_TOKEN=${MITTWALD_API_TOKEN} \ - --web-environment-add=MITTWALD_APP_INSTALLATION_ID=${MITTWALD_APP_INSTALLATION_ID} + --web-environment-add=MITTWALD_APP_INSTALLATION_ID=${MITTWALD_APP_INSTALLATION_ID} \ + --web-environment-add=MITTWALD_SSH_USER=${MITTWALD_SSH_USER} ddev start -y >/dev/null } @@ -32,6 +36,12 @@ teardown() { [ "${TESTDIR}" != "" ] && rm -rf ${TESTDIR} } +setup_ssh_in_ddev() { + ddev exec 'mkdir -p $HOME/.ssh' + echo "${MITTWALD_SSH_PRIVATE_KEY}" | ddev exec --raw -- bash -c 'cat > $HOME/.ssh/id_rsa' + ddev exec 'chmod 600 $HOME/.ssh/id_rsa' +} + @test "install from directory" { set -eu -o pipefail cd ${TESTDIR} @@ -44,16 +54,21 @@ teardown() { } @test "can pull code from remote" { + set -eu -o pipefail + cd ${TESTDIR} export MITTWALD_SKIP_CONFIG=yes - + ddev get ${DIR} ddev restart + echo "${MITTWALD_SSH_PRIVATE_KEY}" | docker exec -i ddev-ssh-agent ssh-add - + #setup_ssh_in_ddev + echo "# ddev pull with project ${PROJNAME} in ${TESTDIR} ($(pwd))" >&3 - ddev pull mittwald - + ddev pull mittwald >&3 + health_checks } From 480ebb2078b626c7fb6042dfeebee35d4f5de6e0 Mon Sep 17 00:00:00 2001 From: Martin Helmich Date: Wed, 21 Feb 2024 11:23:56 +0100 Subject: [PATCH 14/19] Assert presence of downloaded files --- tests/test.bats | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/test.bats b/tests/test.bats index 82da9db..0480dc3 100644 --- a/tests/test.bats +++ b/tests/test.bats @@ -68,8 +68,10 @@ setup_ssh_in_ddev() { echo "# ddev pull with project ${PROJNAME} in ${TESTDIR} ($(pwd))" >&3 ddev pull mittwald >&3 + + ls -al . >&3 - health_checks + test -e assertion_file } @test "install from release" { From 74c6aca5be4e147679e4b455ff00874d1884efcb Mon Sep 17 00:00:00 2001 From: Martin Helmich Date: Wed, 21 Feb 2024 11:32:23 +0100 Subject: [PATCH 15/19] DDEV_FILES_DIR seems to be empty --- providers/mittwald.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/providers/mittwald.yaml b/providers/mittwald.yaml index bda38c2..907bc08 100644 --- a/providers/mittwald.yaml +++ b/providers/mittwald.yaml @@ -37,7 +37,7 @@ files_import_command: set -e -o pipefail set -x - mw app download --target "${DDEV_FILES_DIR}" + mw app download --target /var/www/html # push is a dangerous command. If not absolutely needed it's better to delete these lines. db_push_command: @@ -51,4 +51,4 @@ db_push_command: files_push_command: command: | set -eu -o pipefail - mw app upload --source "${DDEV_FILES_DIR}" \ No newline at end of file + mw app upload --source /var/www/html/ \ No newline at end of file From 3d91120dba81e4887e25377c510b84d7fcfd7244 Mon Sep 17 00:00:00 2001 From: Martin Helmich Date: Wed, 21 Feb 2024 15:32:20 +0100 Subject: [PATCH 16/19] More assertions --- tests/test.bats | 33 ++++++++++++++++++--------------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/tests/test.bats b/tests/test.bats index 0480dc3..0fc2f68 100644 --- a/tests/test.bats +++ b/tests/test.bats @@ -1,8 +1,6 @@ setup() { set -eu -o pipefail - setup_ssh - export DIR="$( cd "$( dirname "$BATS_TEST_FILENAME" )" >/dev/null 2>&1 && pwd )/.." export TESTDIR=~/tmp/test-addon-template mkdir -p $TESTDIR @@ -18,11 +16,6 @@ setup() { ddev start -y >/dev/null } -setup_ssh() { - mkdir -p ~/.ssh - echo "${MITTWALD_SSH_PRIVATE_KEY}" > ~/.ssh/id_rsa -} - health_checks() { # Do something useful here that verifies the add-on # ddev exec "curl -s elasticsearch:9200" | grep "${PROJNAME}-elasticsearch" @@ -37,9 +30,7 @@ teardown() { } setup_ssh_in_ddev() { - ddev exec 'mkdir -p $HOME/.ssh' - echo "${MITTWALD_SSH_PRIVATE_KEY}" | ddev exec --raw -- bash -c 'cat > $HOME/.ssh/id_rsa' - ddev exec 'chmod 600 $HOME/.ssh/id_rsa' + echo "${MITTWALD_SSH_PRIVATE_KEY}" | docker exec -i ddev-ssh-agent ssh-add - } @test "install from directory" { @@ -63,15 +54,27 @@ setup_ssh_in_ddev() { ddev get ${DIR} ddev restart - echo "${MITTWALD_SSH_PRIVATE_KEY}" | docker exec -i ddev-ssh-agent ssh-add - - #setup_ssh_in_ddev + setup_ssh_in_ddev echo "# ddev pull with project ${PROJNAME} in ${TESTDIR} ($(pwd))" >&3 ddev pull mittwald >&3 - ls -al . >&3 - - test -e assertion_file + sha256sum -c <<- EOF + 8c97bcaed289bbf584bf661550579f3225045e7d07dbb7f16ddc3d0522751095 assertion_file +EOF +} + +@test "can run mw shell in web container" { + set -eu -o pipefail + + cd ${TESTDIR} + + export MITTWALD_SKIP_CONFIG=yes + + ddev get ${DIR} + ddev restart + + ddev mw app get } @test "install from release" { From fa4b2827d98c0187a93b61b1b535340e5e03b1d1 Mon Sep 17 00:00:00 2001 From: Martin Helmich Date: Wed, 21 Feb 2024 15:32:58 +0100 Subject: [PATCH 17/19] Unify shell options --- providers/mittwald.yaml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/providers/mittwald.yaml b/providers/mittwald.yaml index 907bc08..30fd6b7 100644 --- a/providers/mittwald.yaml +++ b/providers/mittwald.yaml @@ -2,8 +2,7 @@ auth_command: command: | - set -e -o pipefail - set -x + set -eu -o pipefail if [ -z "${MITTWALD_API_TOKEN}" ] ; then echo "MITTWALD_API_TOKEN must be set" @@ -19,8 +18,7 @@ auth_command: db_pull_command: command: | - set -e -o pipefail - set -x + set -eu -o pipefail database_output="/var/www/html/.ddev/.downloads/db.sql.gz" database_id=$(mw app get -ojson | jq -r 'if has("linkedDatabases") then ((.linkedDatabases[] | select(.purpose == "primary")).databaseId) else empty end') @@ -34,8 +32,7 @@ db_pull_command: files_import_command: command: | - set -e -o pipefail - set -x + set -eu -o pipefail mw app download --target /var/www/html From 7650025530557bbeec97be14ca613e82c6914e11 Mon Sep 17 00:00:00 2001 From: Martin Helmich Date: Wed, 21 Feb 2024 15:41:50 +0100 Subject: [PATCH 18/19] Improve UX of console messages in provider --- providers/mittwald.yaml | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/providers/mittwald.yaml b/providers/mittwald.yaml index 30fd6b7..c5734a7 100644 --- a/providers/mittwald.yaml +++ b/providers/mittwald.yaml @@ -9,12 +9,18 @@ auth_command: exit 1 fi - mw app get -ojson "${MITTWALD_APP_INSTALLATION_ID}" - mw context set --installation-id "${MITTWALD_APP_INSTALLATION_ID}" mw context set --project-id "$(mw app get -ojson | jq -r '.projectId')" - mw app ssh --test + if ! mw app ssh --test ; then + cat <<- EOF >&2 + Could not establish an SSH connection to your space. Please make sure your SSH keys + are set up correctly; you can use the "mw app ssh --test" command to verify your + connection, and the "ddev auth ssh" command to make sure all your SSH keys are + available in your web container. + EOF + exit 1 + fi db_pull_command: command: | @@ -41,8 +47,14 @@ db_push_command: command: | set -eu -o pipefail pushd /var/www/html/.ddev/.downloads >/dev/null; - DATABASE_ID=$(mw app get -ojson | jq -r '(.linkedDatabases[] | select(.purpose = "primary")).databaseId') - gzip -dc db.sql.gz | mittwald database mysql import "${DATABASE_ID}" -i - + + database_id=$(mw app get -ojson | jq -r 'if has("linkedDatabases") then ((.linkedDatabases[] | select(.purpose == "primary")).databaseId) else empty end') + + if [[ -n "${database_id:-}" ]] ; then + gzip -dc db.sql.gz | mittwald database mysql import "${DATABASE_ID}" -i - + else + echo "app has no linked database; skipping database export" + fi # push is a dangerous command. If not absolutely needed it's better to delete these lines. files_push_command: From 7e9d3bc092c9a086a176aa1c298ed5213d369625 Mon Sep 17 00:00:00 2001 From: Martin Helmich Date: Thu, 22 Feb 2024 09:20:01 +0100 Subject: [PATCH 19/19] Refactor tests --- tests/test.bats | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/tests/test.bats b/tests/test.bats index 0fc2f68..3be85c6 100644 --- a/tests/test.bats +++ b/tests/test.bats @@ -33,15 +33,19 @@ setup_ssh_in_ddev() { echo "${MITTWALD_SSH_PRIVATE_KEY}" | docker exec -i ddev-ssh-agent ssh-add - } +setup_addon_from_dir() { + export MITTWALD_SKIP_CONFIG=yes + + ddev get ${DIR} + ddev restart >/dev/null +} + @test "install from directory" { set -eu -o pipefail cd ${TESTDIR} - export MITTWALD_SKIP_CONFIG=yes - echo "# ddev get ${DIR} with project ${PROJNAME} in ${TESTDIR} ($(pwd))" >&3 - ddev get ${DIR} - ddev restart + setup_addon_from_dir } @test "can pull code from remote" { @@ -49,11 +53,7 @@ setup_ssh_in_ddev() { cd ${TESTDIR} - export MITTWALD_SKIP_CONFIG=yes - - ddev get ${DIR} - ddev restart - + setup_addon_from_dir setup_ssh_in_ddev echo "# ddev pull with project ${PROJNAME} in ${TESTDIR} ($(pwd))" >&3 @@ -69,10 +69,7 @@ EOF cd ${TESTDIR} - export MITTWALD_SKIP_CONFIG=yes - - ddev get ${DIR} - ddev restart + setup_addon_from_dir ddev mw app get }