From a68e5ae4f26a20f8d55339c1a1a57565040f2710 Mon Sep 17 00:00:00 2001
From: Frederic Heem <frederic.heem@gmail.com>
Date: Sat, 4 Nov 2023 15:18:28 -0300
Subject: [PATCH 01/16] remove infra from client, no more git credential and
 git repository table

---
 client/src/app_infra/Layout.js                |  48 ---
 client/src/app_infra/LayoutUnauthenticated.js |  31 --
 client/src/app_infra/UserApp.js               |  17 --
 client/src/app_infra/footer.js                | 118 --------
 client/src/app_infra/index.js                 |   2 -
 client/src/app_infra/infra/SelectRegion.js    |  27 --
 client/src/app_infra/infra/assets/aws.svg     |   5 -
 client/src/app_infra/infra/assets/azure.svg   |   3 -
 client/src/app_infra/infra/assets/gc.svg      |   3 -
 client/src/app_infra/infra/assets/gcp.svg     |   7 -
 client/src/app_infra/infra/assets/k8s.svg     |   5 -
 client/src/app_infra/infra/assets/ovh.svg     |   1 -
 .../src/app_infra/infra/assets/uploadIcon.svg |  47 ---
 client/src/app_infra/infra/awsConfig.js       | 192 ------------
 client/src/app_infra/infra/azureConfig.js     | 192 ------------
 client/src/app_infra/infra/badgeRegion.js     |  24 --
 client/src/app_infra/infra/gcpConfig.js       | 273 ------------------
 .../app_infra/infra/gitCredentialConfig.js    | 249 ----------------
 .../app_infra/infra/gitRepositoryConfig.js    | 233 ---------------
 .../src/app_infra/infra/importProjectForm.js  | 216 --------------
 client/src/app_infra/infra/index.js           |   2 -
 client/src/app_infra/infra/infraDelete.js     |  76 -----
 client/src/app_infra/infra/infraDeleteLink.js |  33 ---
 client/src/app_infra/infra/infraDetail.js     | 185 ------------
 client/src/app_infra/infra/infraList.js       | 185 ------------
 client/src/app_infra/infra/infraModule.js     | 110 -------
 client/src/app_infra/infra/infraRoutes.js     | 139 ---------
 client/src/app_infra/infra/infraSettings.js   | 178 ------------
 client/src/app_infra/infra/ovhConfig.js       | 226 ---------------
 client/src/app_infra/infra/ovhSelectRegion.js |  40 ---
 client/src/app_infra/infra/projectList.js     |  76 -----
 .../app_infra/infra/providerConfigCommon.js   | 108 -------
 client/src/app_infra/infra/providerLogo.js    |  37 ---
 .../src/app_infra/infra/providerSelection.js  |  90 ------
 client/src/app_infra/infra/providerStore.js   | 169 -----------
 client/src/app_infra/infra/resourceTable.js   |  40 ---
 client/src/app_infra/infra/rulesForm.js       |  23 --
 client/src/app_infra/infra/wizardCreate.js    | 252 ----------------
 client/src/app_infra/menuItems.ts             |  21 --
 .../profile/components/profileForm.js         | 115 --------
 client/src/app_infra/profile/profileModule.js | 134 ---------
 .../src/app_infra/profile/userDeleteView.js   |  68 -----
 .../app_infra/profile/views/profileView.js    |  16 -
 client/src/app_infra/routes.js                |  44 ---
 client/src/app_infra/test/app.spec.js         |  13 -
 client/src/app_infra/test/router.spec.js      |  24 --
 client/src/app_public/landing/content.js      |  51 +---
 client/webpack.config.js                      |   8 -
 client/webpack.dev.js                         |   1 -
 client/webpack.prod.js                        |   1 -
 .../cloudDiagram/api/gitCredentialApi.js      | 135 ---------
 .../cloudDiagram/api/gitRepositoryApi.js      | 128 --------
 .../src/plugins/cloudDiagram/api/infraApi.js  | 260 ++++++++---------
 .../cloudDiagram/api/infraPushCodeApi.js      | 162 +++++------
 .../plugins/cloudDiagram/api/projectApi.js    |  20 +-
 server/src/plugins/cloudDiagram/index.js      |   6 -
 .../cloudDiagram/migrations/010.do.app.do.sql |  37 +--
 .../migrations/011.do.app-seed.sql            |  36 ---
 .../cloudDiagram/sql/GitCredentialSql.js      |  18 --
 .../cloudDiagram/sql/GitRepositorySql.js      |  15 -
 .../cloudDiagram/test/testGitCredential.js    | 111 -------
 .../cloudDiagram/test/testGitRepository.js    | 117 --------
 62 files changed, 246 insertions(+), 4957 deletions(-)
 delete mode 100644 client/src/app_infra/Layout.js
 delete mode 100644 client/src/app_infra/LayoutUnauthenticated.js
 delete mode 100644 client/src/app_infra/UserApp.js
 delete mode 100644 client/src/app_infra/footer.js
 delete mode 100644 client/src/app_infra/index.js
 delete mode 100644 client/src/app_infra/infra/SelectRegion.js
 delete mode 100644 client/src/app_infra/infra/assets/aws.svg
 delete mode 100644 client/src/app_infra/infra/assets/azure.svg
 delete mode 100644 client/src/app_infra/infra/assets/gc.svg
 delete mode 100644 client/src/app_infra/infra/assets/gcp.svg
 delete mode 100644 client/src/app_infra/infra/assets/k8s.svg
 delete mode 100644 client/src/app_infra/infra/assets/ovh.svg
 delete mode 100644 client/src/app_infra/infra/assets/uploadIcon.svg
 delete mode 100644 client/src/app_infra/infra/awsConfig.js
 delete mode 100644 client/src/app_infra/infra/azureConfig.js
 delete mode 100644 client/src/app_infra/infra/badgeRegion.js
 delete mode 100644 client/src/app_infra/infra/gcpConfig.js
 delete mode 100644 client/src/app_infra/infra/gitCredentialConfig.js
 delete mode 100644 client/src/app_infra/infra/gitRepositoryConfig.js
 delete mode 100644 client/src/app_infra/infra/importProjectForm.js
 delete mode 100644 client/src/app_infra/infra/index.js
 delete mode 100644 client/src/app_infra/infra/infraDelete.js
 delete mode 100644 client/src/app_infra/infra/infraDeleteLink.js
 delete mode 100644 client/src/app_infra/infra/infraDetail.js
 delete mode 100644 client/src/app_infra/infra/infraList.js
 delete mode 100644 client/src/app_infra/infra/infraModule.js
 delete mode 100644 client/src/app_infra/infra/infraRoutes.js
 delete mode 100644 client/src/app_infra/infra/infraSettings.js
 delete mode 100644 client/src/app_infra/infra/ovhConfig.js
 delete mode 100644 client/src/app_infra/infra/ovhSelectRegion.js
 delete mode 100644 client/src/app_infra/infra/projectList.js
 delete mode 100644 client/src/app_infra/infra/providerConfigCommon.js
 delete mode 100644 client/src/app_infra/infra/providerLogo.js
 delete mode 100644 client/src/app_infra/infra/providerSelection.js
 delete mode 100644 client/src/app_infra/infra/providerStore.js
 delete mode 100644 client/src/app_infra/infra/resourceTable.js
 delete mode 100644 client/src/app_infra/infra/rulesForm.js
 delete mode 100644 client/src/app_infra/infra/wizardCreate.js
 delete mode 100644 client/src/app_infra/menuItems.ts
 delete mode 100644 client/src/app_infra/profile/components/profileForm.js
 delete mode 100644 client/src/app_infra/profile/profileModule.js
 delete mode 100644 client/src/app_infra/profile/userDeleteView.js
 delete mode 100644 client/src/app_infra/profile/views/profileView.js
 delete mode 100644 client/src/app_infra/routes.js
 delete mode 100644 client/src/app_infra/test/app.spec.js
 delete mode 100644 client/src/app_infra/test/router.spec.js
 delete mode 100644 server/src/plugins/cloudDiagram/api/gitCredentialApi.js
 delete mode 100644 server/src/plugins/cloudDiagram/api/gitRepositoryApi.js
 delete mode 100644 server/src/plugins/cloudDiagram/sql/GitCredentialSql.js
 delete mode 100644 server/src/plugins/cloudDiagram/sql/GitRepositorySql.js
 delete mode 100644 server/src/plugins/cloudDiagram/test/testGitCredential.js
 delete mode 100644 server/src/plugins/cloudDiagram/test/testGitRepository.js

diff --git a/client/src/app_infra/Layout.js b/client/src/app_infra/Layout.js
deleted file mode 100644
index f319aed9..00000000
--- a/client/src/app_infra/Layout.js
+++ /dev/null
@@ -1,48 +0,0 @@
-import React, { createElement as h } from "react";
-import { observer } from "mobx-react";
-import footer from "./footer";
-import MainView from "components/MainView";
-import navBar from "components/navbar";
-import userInfo from "components/UserInfo";
-
-import APP_MENU from "./menuItems";
-
-export default (context) => {
-  const {
-    alertStack: { View: AlertStack },
-  } = context;
-
-  const NavBar = navBar(context);
-  const Footer = footer(context);
-  const UserInfo = userInfo(context);
-
-  const Layout = ({ children }) => (
-    <div
-      style={{
-        display: "flex",
-        minHeight: "100vh",
-        minWidth: "100vw",
-        flexDirection: "column",
-      }}
-    >
-      <NavBar appMenu={APP_MENU()} right={UserInfo} />
-      <div
-        style={{
-          display: "flex",
-          flexDirection: "row",
-          alignItems: "flex-start",
-          flexGrow: "1",
-        }}
-      >
-        <MainView>{children}</MainView>
-      </div>
-      <Footer />
-      <AlertStack />
-    </div>
-  );
-
-  return ({ children }) =>
-    h(observer(Layout), {
-      children,
-    });
-};
diff --git a/client/src/app_infra/LayoutUnauthenticated.js b/client/src/app_infra/LayoutUnauthenticated.js
deleted file mode 100644
index f2b84d4e..00000000
--- a/client/src/app_infra/LayoutUnauthenticated.js
+++ /dev/null
@@ -1,31 +0,0 @@
-import React, { createElement as h } from "react";
-import { observer } from "mobx-react";
-import navBar from "components/navbar";
-import footer from "./footer";
-import RootView from "components/RootView";
-import MainView from "components/MainView";
-import authBar from "components/authBar";
-
-export default (context) => {
-  const {
-    alertStack: { View: AlertStack },
-  } = context;
-
-  const NavBar = navBar(context);
-  const Footer = footer(context);
-  const AuthBar = authBar(context);
-
-  const Layout = ({ children }) => (
-    <RootView>
-      <NavBar right={AuthBar} />
-      <MainView>{children}</MainView>
-      <Footer />
-      <AlertStack />
-    </RootView>
-  );
-
-  return ({ children }) =>
-    h(observer(Layout), {
-      children,
-    });
-};
diff --git a/client/src/app_infra/UserApp.js b/client/src/app_infra/UserApp.js
deleted file mode 100644
index a2f5ff87..00000000
--- a/client/src/app_infra/UserApp.js
+++ /dev/null
@@ -1,17 +0,0 @@
-import Context from "../context";
-import App from "../app";
-import layout from "./Layout";
-import createRoutes from "./routes";
-
-export default async () => {
-  const context = await Context({
-    config: {
-      loginPath: "/auth/login",
-      routeAfterLogin: "/infra",
-      defaultPath: "/infra",
-      title: "GruCloud",
-    },
-  });
-
-  return App({ context, routes: createRoutes({ context }), layout });
-};
diff --git a/client/src/app_infra/footer.js b/client/src/app_infra/footer.js
deleted file mode 100644
index ae1a323d..00000000
--- a/client/src/app_infra/footer.js
+++ /dev/null
@@ -1,118 +0,0 @@
-/* @jsxImportSource @emotion/react */
-import { useEffect } from "react";
-import { jsx, css } from "@emotion/react";
-import { observer } from "mobx-react";
-import AsyncOp from "mdlean/lib/utils/asyncOp";
-
-import { RiTwitterFill, RiBugFill, RiMailSendLine } from "react-icons/ri";
-
-export default (context) => {
-  const {
-    tr,
-    theme: { palette, shadows },
-    rest,
-  } = context;
-  const versionStore = AsyncOp(context)(() => rest.get(`version`));
-  const style = { color: palette.grey[500], fontSize: "0.8em" };
-
-  const Footer = observer(() => {
-    useEffect(() => {
-      versionStore.fetch();
-    }, []);
-
-    return (
-      <footer
-        css={css`
-          text-align: center;
-          box-shadow: ${shadows[2]};
-          color: ${palette.text.secondary};
-          display: flex;
-          justify-content: space-between;
-          align-items: center;
-          > * {
-            margin: 0.5rem;
-          }
-          .footer-version {
-            visibility: hidden;
-            opacity: 0;
-            transition: visibility 0s ease-in 300ms, opacity 300ms;
-          }
-          :hover .footer-version {
-            visibility: visible;
-            opacity: 1;
-            transition: visibility 0s ease-out 0s, opacity 300ms;
-          }
-        `}
-      >
-        <ul
-          css={css`
-            display: flex;
-
-            li {
-              margin: 0.5rem;
-              a {
-                display: flex;
-                text-decoration: none;
-                align-items: center;
-                font-size: 1.5rem;
-              }
-            }
-          `}
-        >
-          <li>
-            <a href="https://twitter.com/grucloud_iac">
-              <RiTwitterFill style={style} />
-            </a>
-          </li>
-          <li>
-            <a
-              css={css``}
-              title="Contact us via email"
-              href="mailto:hello@grucloud.com"
-            >
-              <RiMailSendLine style={style} />
-            </a>
-          </li>
-          <li>
-            <a
-              css={css``}
-              title="Report an issue"
-              href="https://github.com/grucloud/grucloud/issues"
-            >
-              <RiBugFill style={style} />
-            </a>
-          </li>
-        </ul>
-        <div
-          css={css`
-            font-size: 0.8rem;
-            font-weight: 300;
-            > * {
-              margin: 0.3rem;
-            }
-            a {
-              color: ${palette.grey[500]};
-            }
-          `}
-        >
-          <span
-            className="footer-version"
-            css={css`
-              font-size: 0.8rem;
-            `}
-          >
-            {`F${__VERSION__}`}
-            {" - "}
-            {versionStore.data
-              ? `B${versionStore.data.version}`
-              : "Fetching..."}
-          </span>
-          <span>{`Copyright © ${new Date().getFullYear()} `}</span>
-
-          <a href="https://grucloud.com">GruCloud.com</a>
-        </div>
-      </footer>
-    );
-  });
-  return Footer;
-};
diff --git a/client/src/app_infra/index.js b/client/src/app_infra/index.js
deleted file mode 100644
index 79ba327e..00000000
--- a/client/src/app_infra/index.js
+++ /dev/null
@@ -1,2 +0,0 @@
-import App from "./UserApp";
-App().catch(error => console.error(error));
diff --git a/client/src/app_infra/infra/SelectRegion.js b/client/src/app_infra/infra/SelectRegion.js
deleted file mode 100644
index 9cae6ecc..00000000
--- a/client/src/app_infra/infra/SelectRegion.js
+++ /dev/null
@@ -1,27 +0,0 @@
-/** @jsxImportSource @emotion/react */
-import { jsx, css } from "@emotion/react";
-import select from "mdlean/lib/select";
-
-export default (context, { items } = {}) => {
-  const Item = ({ item }) => (
-    <div
-      css={css`
-        display: flex;
-        align-items: center;
-        padding: 0.9rem;
-      `}
-    >
-      {item}
-    </div>
-  );
-
-  const SelectRegion = select(context, {
-    items,
-    renderItems: Item,
-    cssOveride: css`
-      width: 200px;
-    `,
-  });
-
-  return SelectRegion;
-};
diff --git a/client/src/app_infra/infra/assets/aws.svg b/client/src/app_infra/infra/assets/aws.svg
deleted file mode 100644
index 37e1a909..00000000
--- a/client/src/app_infra/infra/assets/aws.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg width="118" height="70" viewBox="0 0 118 70" fill="none" xmlns="http://www.w3.org/2000/svg">
-    <path d="M33.2536 25.4227C33.2536 26.8632 33.4105 28.0312 33.6853 28.8877C33.9992 29.7442 34.3917 30.6785 34.9411 31.6908C35.1373 32.0022 35.2158 32.3137 35.2158 32.5862C35.2158 32.9755 34.9804 33.3649 34.4702 33.7542L31.9977 35.3893C31.6445 35.6229 31.2913 35.7397 30.9773 35.7397C30.5849 35.7397 30.1924 35.5451 29.8 35.1947C29.2505 34.6107 28.7796 33.9878 28.3871 33.3649C27.9947 32.703 27.6022 31.9633 27.1705 31.0679C24.1093 34.6496 20.2633 36.4405 15.6323 36.4405C12.3357 36.4405 9.70623 35.5061 7.7832 33.6374C5.86017 31.7686 4.87903 29.277 4.87903 26.1624C4.87903 22.8532 6.0564 20.1669 8.45037 18.1424C10.8444 16.1179 14.0232 15.1057 18.0655 15.1057C19.3999 15.1057 20.7735 15.2225 22.2256 15.4171C23.6776 15.6118 25.169 15.9233 26.7388 16.2736V13.4316C26.7388 10.4727 26.1109 8.40934 24.8943 7.20245C23.6384 5.99555 21.5191 5.41157 18.4972 5.41157C17.1236 5.41157 15.7108 5.5673 14.2587 5.91769C12.8066 6.26808 11.3938 6.69633 10.0202 7.24138C9.39227 7.51391 8.92132 7.66963 8.6466 7.7475C8.37188 7.82536 8.17565 7.86429 8.01867 7.86429C7.46923 7.86429 7.19452 7.47497 7.19452 6.6574V4.74972C7.19452 4.12681 7.27301 3.65962 7.46923 3.3871C7.66546 3.11457 8.01867 2.84205 8.56811 2.56952C9.9417 1.86874 11.59 1.28476 13.513 0.817575C15.4361 0.311457 17.4768 0.0778643 19.6354 0.0778643C24.3056 0.0778643 27.7199 1.12903 29.9177 3.23137C32.0762 5.3337 33.1751 8.52614 33.1751 12.8087V25.4227H33.2536ZM17.3199 31.3404C18.615 31.3404 19.9493 31.1068 21.3622 30.6396C22.775 30.1724 24.0309 29.3159 25.0905 28.1479C25.7184 27.4082 26.1894 26.5907 26.4248 25.6563C26.6603 24.7219 26.8173 23.5929 26.8173 22.2692V20.634C25.6792 20.3615 24.4626 20.1279 23.2067 19.9722C21.9508 19.8165 20.7342 19.7386 19.5176 19.7386C16.8882 19.7386 14.9651 20.2447 13.67 21.2959C12.3749 22.3471 11.747 23.8265 11.747 25.7731C11.747 27.6029 12.2179 28.9655 13.1991 29.8999C14.141 30.8732 15.5146 31.3404 17.3199 31.3404V31.3404ZM48.834 35.5451C48.1276 35.5451 47.6567 35.4283 47.3427 35.1557C47.0288 34.9221 46.754 34.3771 46.5186 33.6374L37.2959 3.54283C37.0604 2.76418 36.9426 2.25806 36.9426 1.98554C36.9426 1.36263 37.2566 1.01224 37.8845 1.01224H41.7306C42.4763 1.01224 42.9865 1.12903 43.2612 1.40156C43.5751 1.63515 43.8106 2.1802 44.0461 2.91991L50.6393 28.693L56.7616 2.91991C56.9579 2.14127 57.1933 1.63515 57.5073 1.40156C57.8213 1.16796 58.3707 1.01224 59.0771 1.01224H62.2168C62.9624 1.01224 63.4726 1.12903 63.7866 1.40156C64.1006 1.63515 64.3753 2.1802 64.5323 2.91991L70.7331 29.0045L77.5225 2.91991C77.758 2.14127 78.0327 1.63515 78.3075 1.40156C78.6214 1.16796 79.1316 1.01224 79.838 1.01224H83.4879C84.1158 1.01224 84.469 1.32369 84.469 1.98554C84.469 2.1802 84.4298 2.37486 84.3905 2.60845C84.3513 2.84205 84.2728 3.1535 84.1158 3.58176L74.6576 33.6763C74.4221 34.455 74.1474 34.9611 73.8335 35.1947C73.5195 35.4283 73.0093 35.584 72.3421 35.584H68.967C68.2213 35.584 67.7112 35.4672 67.3972 35.1947C67.0832 34.9221 66.8085 34.416 66.6515 33.6374L60.5685 8.52614L54.5247 33.5984C54.3284 34.3771 54.0929 34.8832 53.779 35.1557C53.465 35.4283 52.9156 35.5451 52.2092 35.5451H48.834V35.5451ZM99.2646 36.5962C97.2238 36.5962 95.183 36.3626 93.2208 35.8954C91.2585 35.4283 89.7279 34.9221 88.7075 34.3382C88.0796 33.9878 87.6479 33.5984 87.4909 33.2481C87.3339 32.8977 87.2554 32.5083 87.2554 32.158V30.1724C87.2554 29.3548 87.5694 28.9655 88.1581 28.9655C88.3936 28.9655 88.629 29.0045 88.8645 29.0823C89.1 29.1602 89.4532 29.3159 89.8456 29.4716C91.18 30.0556 92.6321 30.5228 94.1627 30.8343C95.7325 31.1457 97.2631 31.3014 98.8329 31.3014C101.305 31.3014 103.228 30.8732 104.563 30.0167C105.897 29.1602 106.603 27.9144 106.603 26.3181C106.603 25.228 106.25 24.3326 105.544 23.5929C104.837 22.8532 103.503 22.1913 101.58 21.5684L95.8895 19.8165C93.0245 18.921 90.9053 17.5973 89.6102 15.8454C88.3151 14.1324 87.6479 12.2247 87.6479 10.2002C87.6479 8.56507 88.0011 7.12458 88.7075 5.87875C89.4139 4.63293 90.3558 3.54283 91.5332 2.68632C92.7106 1.79088 94.0449 1.12903 95.6147 0.661847C97.1846 0.194661 98.8329 0 100.56 0C101.423 0 102.326 0.0389321 103.189 0.155729C104.092 0.272525 104.916 0.428254 105.74 0.583982C106.525 0.778643 107.271 0.973304 107.977 1.2069C108.684 1.44049 109.233 1.67408 109.625 1.90768C110.175 2.21913 110.567 2.53059 110.803 2.88098C111.038 3.19244 111.156 3.62069 111.156 4.16574V5.99555C111.156 6.81313 110.842 7.24138 110.253 7.24138C109.939 7.24138 109.429 7.08565 108.762 6.77419C106.525 5.76196 104.013 5.25584 101.227 5.25584C98.9899 5.25584 97.2238 5.60623 96.0072 6.34594C94.7906 7.08565 94.1627 8.21468 94.1627 9.8109C94.1627 10.901 94.5551 11.8354 95.34 12.5751C96.1249 13.3148 97.577 14.0545 99.657 14.7164L105.23 16.4683C108.056 17.3637 110.096 18.6096 111.313 20.2058C112.53 21.802 113.118 23.6318 113.118 25.6563C113.118 27.3304 112.765 28.8487 112.098 30.1724C111.391 31.4961 110.45 32.6641 109.233 33.5984C108.016 34.5718 106.564 35.2725 104.877 35.7786C103.111 36.3237 101.266 36.5962 99.2646 36.5962V36.5962Z" fill="#252F3E"/>
-    <path fill-rule="evenodd" clip-rule="evenodd" d="M106.682 55.5172C93.7702 64.9778 75.0108 70 58.8809 70C36.2755 70 15.907 61.7075 0.522757 47.9255C-0.693855 46.8354 0.405021 45.356 1.85711 46.2125C18.4972 55.7898 39.0226 61.5907 60.2545 61.5907C74.5791 61.5907 90.3166 58.6318 104.798 52.5584C106.957 51.5851 108.801 53.96 106.682 55.5172V55.5172Z" fill="#FF9900"/>
-    <path fill-rule="evenodd" clip-rule="evenodd" d="M112.059 49.4438C110.41 47.3415 101.148 48.4316 96.9491 48.9377C95.6932 49.0934 95.497 48.0033 96.6351 47.1858C104.013 42.0467 116.14 43.5261 117.553 45.2392C118.966 46.9911 117.161 59.0211 110.253 64.7831C109.194 65.6785 108.173 65.2114 108.644 64.0434C110.214 60.1891 113.707 51.5072 112.059 49.4438V49.4438Z" fill="#FF9900"/>
-</svg>
diff --git a/client/src/app_infra/infra/assets/azure.svg b/client/src/app_infra/infra/assets/azure.svg
deleted file mode 100644
index 2193a2c6..00000000
--- a/client/src/app_infra/infra/assets/azure.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="261" height="75" viewBox="0 0 261 75" fill="none" xmlns="http://www.w3.org/2000/svg">
-    <path d="M44.9084 70.9905L67.8041 66.9564L68.0162 66.9072L56.2428 52.9354C52.2968 48.2749 48.3723 43.5962 44.4694 38.8996C44.4694 38.8308 56.6275 5.43621 56.6966 5.31814C56.7163 5.27878 64.9927 19.5261 76.7512 39.854L96.9243 74.7343L97.0772 75L59.6559 74.9951L22.2347 74.9902L44.9084 70.9954V70.9905ZM188.418 67.6156C182.721 67.2516 179.412 64.0144 178.534 57.9583C178.297 56.3496 178.297 56.3053 178.272 45.8511L178.253 35.7265H183.293L183.313 45.5166C183.333 54.3424 183.343 55.3755 183.427 55.9954C183.772 58.5143 184.453 60.2115 185.617 61.4267C186.549 62.4008 187.639 62.9715 189.148 63.2716C189.858 63.4142 191.885 63.4192 192.532 63.2716C194.061 62.937 195.289 62.2729 196.369 61.1955C197.602 59.9656 198.514 58.2191 198.953 56.2512L199.101 55.5871L199.121 45.7133L199.136 35.8396H204.285V66.8826H199.19V64.4178C199.19 62.7452 199.17 61.958 199.131 61.9728C199.015 62.107 198.917 62.2559 198.84 62.4155C197.912 64.0621 196.549 65.4234 194.899 66.3513C192.976 67.409 191.052 67.7829 188.418 67.6156V67.6156ZM246.239 67.591C244.164 67.4191 242.157 66.7655 240.38 65.6822C236.73 63.4339 234.574 59.7245 233.943 54.6179C233.723 52.7461 233.701 50.8563 233.879 48.98C234.288 45.6248 235.605 42.3336 237.489 39.977C237.973 39.3768 239.068 38.2847 239.669 37.8075C241.302 36.5087 243.211 35.5936 245.238 35.1558C246.417 34.9 248.493 34.777 249.751 34.895C252.898 35.1853 255.788 36.6661 257.751 38.9931C259.744 41.3545 260.839 44.6655 260.977 48.734C261.002 49.3736 261.006 50.4903 260.992 51.2234L260.962 52.5467L249.929 52.5615L238.895 52.5763V53.0682C238.895 54.5589 239.26 56.266 239.891 57.7124C240.434 58.962 241.371 60.3247 242.136 60.9839C243.705 62.3382 245.662 63.1645 247.729 63.3454C248.508 63.4192 250.491 63.3454 251.379 63.2076C253.875 62.8359 256.242 61.8614 258.274 60.369C258.501 60.1968 258.718 60.0394 258.762 60.0148C258.817 59.9803 258.831 60.428 258.831 62.3073V64.6441L258.304 64.9639C256.053 66.3395 253.531 67.2122 250.91 67.5221C250.116 67.6205 247.191 67.6599 246.239 67.591V67.591ZM255.842 47.8829C255.842 45.3788 254.782 42.5992 253.287 41.1676C252.22 40.1459 250.856 39.4864 249.391 39.2834C248.384 39.1785 247.367 39.2066 246.367 39.367C244.745 39.6917 243.408 40.4001 242.239 41.5562C241.002 42.7786 240.067 44.2707 239.507 45.9151C239.274 46.6151 239.098 47.3323 238.979 48.06L238.944 48.3208H255.842V47.8829ZM106.167 66.8088L114.493 44.9951L122.799 23.2453H128.136L128.353 23.8111C129.033 25.5428 144.975 66.8334 144.975 66.858C144.975 66.8678 143.697 66.8777 142.138 66.8777H139.302L137.004 60.7773L134.706 54.6769H116.2L116.116 54.8786L113.936 60.979L111.835 66.8826H108.989C106.74 66.8826 106.153 66.8678 106.167 66.8088V66.8088ZM133.014 50.018C133.014 50.0082 131.47 45.8265 129.576 40.7199C126.04 31.1758 125.842 30.6051 125.566 29.0702C125.433 28.3519 125.369 28.3322 125.29 28.9866C125.236 29.4588 124.994 30.5067 124.806 31.0872C124.713 31.3775 123.125 35.7363 121.27 40.7789C120.135 43.8451 119.011 46.915 117.896 49.9885C117.896 50.0131 121.3 50.0377 125.458 50.0377C129.615 50.0377 133.014 50.0279 133.014 50.018V50.018ZM146.691 66.0856V65.2886L155.914 52.6451L165.133 40.0066L156.782 39.982L148.437 39.9524L148.422 37.837L148.407 35.7265H172.556V37.1532L163.333 49.8655C160.25 54.1052 157.175 58.3509 154.109 62.6025C154.109 62.6173 158.213 62.6271 163.224 62.6271H172.334V66.8777H146.686L146.691 66.0856ZM214.347 66.8432C214.322 66.8235 214.308 59.8131 214.308 51.2676V35.7265H219.348V38.9292C219.348 40.6953 219.368 42.1368 219.398 42.1368C219.514 41.9354 219.605 41.7206 219.669 41.4972C220.251 39.8534 221.215 38.3701 222.48 37.1679C223.569 36.1136 224.961 35.4241 226.461 35.1951C226.895 35.1263 227.26 35.1115 228.123 35.1361C229.208 35.1656 229.775 35.2443 230.441 35.4559L230.643 35.5248V40.7396L230.051 40.4444C229.02 39.9229 227.866 39.6916 226.712 39.7753C225.671 39.8073 224.655 40.0959 223.753 40.6152C222.851 41.1346 222.092 41.8686 221.543 42.7517C220.448 44.4982 219.669 46.7366 219.437 48.798C219.393 49.1669 219.368 52.1778 219.358 58.1109L219.348 66.8777H216.863C215.501 66.8777 214.367 66.8629 214.347 66.8432V66.8432ZM0 66.735C0 66.7153 5.54882 57.1072 12.3307 45.3837L24.6614 24.0718L39.0291 12.0433C46.9307 5.43129 53.4166 0.00983929 53.4462 0C53.3934 0.202353 53.3155 0.39736 53.2144 0.580518L37.6086 33.9603L22.284 66.7399L11.142 66.7547C5.01613 66.7645 0 66.7547 0 66.735Z" fill="#0089D6"/>
-</svg>
diff --git a/client/src/app_infra/infra/assets/gc.svg b/client/src/app_infra/infra/assets/gc.svg
deleted file mode 100644
index ef26f65a..00000000
--- a/client/src/app_infra/infra/assets/gc.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"  preserveAspectRatio="xMidYMid meet" viewBox="0 0 640 640" width="200" height="200"><defs><path d="M153.99 207.43C71.06 219.19 7.48 291.86 10.08 378.56C10.08 378.56 10.08 378.56 10.08 378.56C12.72 466.3 84.32 538.15 172.06 541.02C172.06 541.02 172.06 541.02 172.06 541.02C266.99 544.14 345.22 467.84 345.32 373.59C345.32 373.59 345.32 373.59 345.32 373.59C345.33 359.54 334.03 348.09 319.98 348.09C319.98 348.09 319.98 348.09 319.98 348.09C250.06 348.09 211.21 348.09 203.44 348.09C188.63 348.09 176.79 360.8 178.23 375.91C178.23 375.91 178.23 375.91 178.23 375.91C179.48 389.08 191.3 398.76 204.53 398.76C204.53 398.76 204.53 398.76 204.53 398.76C256.95 398.76 286.07 398.76 291.89 398.76C280.22 451.46 232.92 490.92 176.66 490.45C176.66 490.45 176.66 490.45 176.66 490.45C113.09 489.91 60.66 436.98 60.66 373.41C60.66 373.41 60.66 373.41 60.66 373.41C60.67 308.9 113.15 256.43 177.65 256.43C177.65 256.43 177.65 256.43 177.65 256.43C191.66 256.43 202.93 244.61 202.99 230.61C202.99 230.61 202.99 230.61 202.99 230.61C203.25 166.32 255.63 114.1 319.98 114.1C319.98 114.1 319.98 114.1 319.98 114.1C384.56 114.1 437.09 166.67 437.01 231.25C437.01 231.25 437.01 231.25 437.01 231.25C436.99 245.26 448.35 256.43 462.36 256.43C462.36 256.43 462.36 256.43 462.36 256.43C528.62 256.44 582.19 311.82 579.22 378.72C579.22 378.72 579.22 378.72 579.22 378.72C576.49 440.26 521.04 490.45 459.44 490.45C459.44 490.45 459.44 490.45 459.44 490.45C417.5 490.45 394.19 490.45 389.53 490.45C374.72 490.45 362.88 503.16 364.32 518.27C364.32 518.27 364.32 518.27 364.32 518.27C365.57 531.44 377.39 541.11 390.62 541.11C390.62 541.11 390.62 541.11 390.62 541.11C431.51 541.11 454.22 541.11 458.76 541.11C549.62 541.11 626.67 470.3 629.89 379.49C629.89 379.49 629.89 379.49 629.89 379.49C632.98 292.38 569.23 219.23 486.01 207.43C486.01 207.43 486.01 207.43 486.01 207.43C474.48 126.14 404.42 63.44 319.98 63.44C319.98 63.44 319.98 63.44 319.98 63.44C235.56 63.44 165.52 126.14 153.99 207.43" id="a1Gbkcddy9"></path><linearGradient id="gradientd7CepKW321" gradientUnits="userSpaceOnUse" x1="320" y1="58.34" x2="320" y2="551.31"><stop style="stop-color: #00d1ff;stop-opacity: 1" offset="0%"></stop><stop style="stop-color: #1540f5;stop-opacity: 1" offset="100%"></stop></linearGradient></defs><g><g><g><use xlink:href="#a1Gbkcddy9" opacity="1" fill="url(#gradientd7CepKW321)"></use><g><use xlink:href="#a1Gbkcddy9" opacity="1" fill-opacity="0" stroke="#000000" stroke-width="1" stroke-opacity="0"></use></g></g></g></g></svg>
\ No newline at end of file
diff --git a/client/src/app_infra/infra/assets/gcp.svg b/client/src/app_infra/infra/assets/gcp.svg
deleted file mode 100644
index 92e4ddca..00000000
--- a/client/src/app_infra/infra/assets/gcp.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg width="80%" height="75" viewBox="0 0 473 75" fill="none" xmlns="http://www.w3.org/2000/svg">
-    <path d="M55.6361 19.6663H58.3103L65.9318 11.9524L66.3062 8.67733C61.9401 4.77692 56.6637 2.06744 50.9754 0.80484C45.287 -0.457761 39.3746 -0.231798 33.7965 1.46138C28.2185 3.15456 23.159 6.25906 19.0959 10.4816C15.0329 14.7042 12.1005 19.9054 10.5757 25.5939C11.4248 25.2417 12.3653 25.1846 13.2499 25.4315L28.4929 22.8873C28.4929 22.8873 29.2684 21.5881 29.6695 21.6693C32.9356 18.0387 37.4493 15.8091 42.2865 15.4367C47.1237 15.0644 51.9186 16.5775 55.6896 19.6663H55.6361V19.6663Z" fill="#EA4335"/>
-    <path d="M76.7891 25.594C75.0373 19.0645 71.4404 13.1946 66.4399 8.70444L55.7431 19.5311C57.9724 21.3747 59.759 23.7067 60.968 26.3511C62.1771 28.9955 62.7771 31.8833 62.7228 34.7966V36.7183C65.2477 36.7183 67.6692 37.7335 69.4545 39.5405C71.2399 41.3476 72.2429 43.7985 72.2429 46.354C72.2429 48.9096 71.2399 51.3604 69.4545 53.1675C67.6692 54.9745 65.2477 55.9897 62.7228 55.9897H43.6824L41.7837 57.9385V69.4959L43.6824 71.4176H62.7228C68.0397 71.4595 73.2288 69.7682 77.5224 66.5938C81.816 63.4193 84.9861 58.9305 86.5636 53.7912C88.1412 48.6519 88.0426 43.1351 86.2822 38.057C84.5219 32.9788 81.1934 28.609 76.7891 25.594V25.594Z" fill="#4285F4"/>
-    <path d="M24.6153 71.3093H43.6557V55.8814H24.6153C23.2587 55.8811 21.9181 55.5857 20.6842 55.0153L18.01 55.8543L10.335 63.5683L9.66644 66.2749C13.9704 69.5644 19.2221 71.333 24.6153 71.3093V71.3093Z" fill="#34A853"/>
-    <path d="M24.6153 21.2632C19.4562 21.2944 14.4356 22.9557 10.2547 26.015C6.07383 29.0743 2.94138 33.379 1.29491 38.3276C-0.351561 43.2763 -0.429833 48.6218 1.07103 53.6177C2.57189 58.6136 5.57693 63.0103 9.66643 66.1937L20.7109 55.0152C19.3074 54.3734 18.0787 53.3965 17.1302 52.1684C16.1816 50.9403 15.5417 49.4976 15.2651 47.9641C14.9886 46.4307 15.0838 44.8522 15.5425 43.3641C16.0012 41.8761 16.8098 40.5229 17.8988 39.4206C18.9879 38.3184 20.3248 37.5 21.7951 37.0357C23.2653 36.5714 24.8248 36.4751 26.3399 36.755C27.855 37.0349 29.2804 37.6826 30.4938 38.6426C31.7072 39.6026 32.6723 40.8463 33.3064 42.2668L44.3509 31.0883C42.0328 28.0211 39.045 25.5381 35.6213 23.8336C32.1976 22.1292 28.4307 21.2494 24.6153 21.2632V21.2632Z" fill="#FBBC05"/>
-    <path d="M138.376 60.5369C135.098 60.5792 131.845 59.9513 128.812 58.6909C125.78 57.4306 123.029 55.5636 120.726 53.2019C118.351 50.9404 116.466 48.2039 115.191 45.1659C113.915 42.128 113.278 38.855 113.319 35.5545C113.28 32.2542 113.918 28.9817 115.193 25.944C116.468 22.9063 118.352 20.1696 120.726 17.9071C123.018 15.5209 125.763 13.6289 128.796 12.345C131.83 11.0612 135.088 10.412 138.376 10.4367C141.509 10.3945 144.619 10.9829 147.525 12.1678C150.431 13.3526 153.075 15.1103 155.304 17.3387L150.544 22.2377C147.284 19.0492 142.909 17.2974 138.376 17.3658C136.025 17.3365 133.693 17.8027 131.529 18.7346C129.366 19.6666 127.417 21.0439 125.807 22.7791C124.135 24.4588 122.815 26.4637 121.928 28.6732C121.041 30.8828 120.605 33.2511 120.646 35.6357C120.627 37.993 121.073 40.3306 121.959 42.5106C122.846 44.6907 124.154 46.6693 125.807 48.3299C129.119 51.6702 133.588 53.5703 138.263 53.626C142.938 53.6816 147.45 51.8882 150.838 48.6276C152.936 46.3026 154.223 43.3458 154.502 40.2099H138.456V33.2809H161.16C161.384 34.6764 161.473 36.0904 161.428 37.5033C161.569 40.4276 161.123 43.3505 160.116 46.0953C159.11 48.8401 157.564 51.3497 155.571 53.4725C153.356 55.8066 150.68 57.6421 147.718 58.8593C144.755 60.0765 141.572 60.6481 138.376 60.5369V60.5369ZM191.165 55.9356C188.118 58.8918 184.061 60.5422 179.84 60.5422C175.619 60.5422 171.561 58.8918 168.515 55.9356C166.998 54.4473 165.804 52.6562 165.007 50.6759C164.211 48.6957 163.83 46.5695 163.888 44.4323C163.831 42.2953 164.213 40.1696 165.009 38.1896C165.806 36.2096 166.999 34.4183 168.515 32.929C171.565 29.9791 175.621 28.3328 179.84 28.3328C184.059 28.3328 188.115 29.9791 191.165 32.929C192.68 34.4183 193.874 36.2096 194.67 38.1896C195.466 40.1696 195.848 42.2953 195.791 44.4323C195.846 46.5715 195.461 48.6989 194.66 50.6792C193.859 52.6596 192.66 54.4496 191.138 55.9356H191.165V55.9356ZM173.515 51.4155C174.326 52.2915 175.305 52.9898 176.393 53.4672C177.481 53.9446 178.654 54.1909 179.84 54.1909C181.026 54.1909 182.199 53.9446 183.287 53.4672C184.374 52.9898 185.354 52.2915 186.164 51.4155C187.048 50.4911 187.74 49.397 188.199 48.1976C188.658 46.9983 188.876 45.718 188.839 44.4323C188.878 43.1423 188.662 41.8573 188.202 40.6533C187.743 39.4493 187.05 38.3506 186.164 37.4221C185.343 36.555 184.357 35.8651 183.266 35.3938C182.174 34.9225 181 34.6795 179.813 34.6795C178.626 34.6795 177.452 34.9225 176.36 35.3938C175.269 35.8651 174.283 36.555 173.462 37.4221C172.576 38.3506 171.883 39.4493 171.424 40.6533C170.965 41.8573 170.748 43.1423 170.788 44.4323C170.754 45.7199 170.975 47.0013 171.439 48.2008C171.903 49.4002 172.6 50.4933 173.489 51.4155H173.515V51.4155ZM225.983 55.9356C222.936 58.8918 218.879 60.5422 214.658 60.5422C210.437 60.5422 206.38 58.8918 203.333 55.9356C201.816 54.4473 200.622 52.6562 199.825 50.6759C199.029 48.6957 198.648 46.5695 198.706 44.4323C198.65 42.2953 199.031 40.1696 199.828 38.1896C200.624 36.2096 201.817 34.4183 203.333 32.929C206.38 29.9729 210.437 28.3224 214.658 28.3224C218.879 28.3224 222.936 29.9729 225.983 32.929C227.499 34.4183 228.692 36.2096 229.488 38.1896C230.285 40.1696 230.666 42.2953 230.61 44.4323C230.668 46.5695 230.287 48.6957 229.491 50.6759C228.694 52.6562 227.5 54.4473 225.983 55.9356V55.9356ZM208.333 51.4155C209.144 52.2915 210.123 52.9898 211.211 53.4672C212.299 53.9446 213.472 54.1909 214.658 54.1909C215.844 54.1909 217.017 53.9446 218.105 53.4672C219.193 52.9898 220.172 52.2915 220.983 51.4155C221.866 50.4911 222.558 49.397 223.017 48.1976C223.477 46.9983 223.694 45.718 223.657 44.4323C223.696 43.1423 223.48 41.8573 223.021 40.6533C222.561 39.4493 221.868 38.3506 220.983 37.4221C220.161 36.555 219.175 35.8651 218.084 35.3938C216.992 34.9225 215.818 34.6795 214.631 34.6795C213.445 34.6795 212.27 34.9225 211.179 35.3938C210.087 35.8651 209.101 36.555 208.28 37.4221C207.394 38.3506 206.701 39.4493 206.242 40.6533C205.783 41.8573 205.566 43.1423 205.606 44.4323C205.572 45.7199 205.794 47.0013 206.258 48.2008C206.721 49.4002 207.418 50.4933 208.307 51.4155H208.333V51.4155ZM248.875 74.9904C245.669 75.0936 242.526 74.0809 239.969 72.1214C237.699 70.3942 235.912 68.0998 234.781 65.463L240.879 62.8917C241.542 64.4675 242.58 65.8529 243.9 66.9246C245.314 68.0776 247.087 68.6822 248.901 68.6298C250.052 68.7006 251.204 68.5197 252.279 68.0994C253.354 67.679 254.327 67.0291 255.132 66.1938C256.743 64.2268 257.539 61.7045 257.352 59.1565V56.8288H257.111C256.092 58.0538 254.805 59.0218 253.352 59.6561C251.899 60.2903 250.32 60.5733 248.741 60.4828C246.733 60.4889 244.746 60.0736 242.905 59.2629C241.063 58.4523 239.408 57.264 238.044 55.7732C236.563 54.2942 235.395 52.5266 234.609 50.5772C233.823 48.6279 233.436 46.5374 233.471 44.4323C233.434 42.3149 233.82 40.2117 234.606 38.249C235.392 36.2862 236.561 34.5044 238.044 33.0102C239.405 31.5132 241.059 30.319 242.9 29.5035C244.742 28.6881 246.731 28.2692 248.741 28.2736C250.442 28.2706 252.122 28.6496 253.661 29.3833C254.993 29.9717 256.18 30.8496 257.138 31.9546H257.379V29.3833H264.011V58.2092C264.185 60.4895 263.898 62.7819 263.167 64.946C262.436 67.1101 261.276 69.1004 259.759 70.7951C258.313 72.1947 256.605 73.287 254.736 74.0076C252.867 74.7281 250.874 75.0623 248.875 74.9904V74.9904ZM249.356 54.2033C250.498 54.2287 251.631 53.9994 252.676 53.5316C253.72 53.0639 254.65 52.3691 255.4 51.4967C257.05 49.5829 257.919 47.1061 257.833 44.5676C257.932 41.9863 257.063 39.4627 255.4 37.5033C254.651 36.6294 253.722 35.9336 252.677 35.4657C251.632 34.9978 250.498 34.7693 249.356 34.7966C248.183 34.7722 247.018 35.001 245.939 35.4677C244.86 35.9344 243.892 36.6283 243.098 37.5033C241.329 39.3923 240.368 41.9115 240.424 44.5135C240.397 45.7898 240.619 47.059 241.078 48.2481C241.537 49.4372 242.223 50.5228 243.098 51.4425C243.888 52.326 244.854 53.0291 245.933 53.5051C247.012 53.9811 248.179 54.2191 249.356 54.2033V54.2033ZM275.804 12.2502V59.5625H268.824V12.2502H275.804V12.2502ZM294.951 60.5369C292.861 60.5913 290.782 60.2083 288.845 59.4119C286.907 58.6154 285.153 57.4228 283.693 55.9085C282.21 54.4054 281.045 52.613 280.269 50.6402C279.492 48.6674 279.119 46.5553 279.173 44.4323C279.094 42.3041 279.439 40.1815 280.188 38.1912C280.937 36.2009 282.074 34.3837 283.532 32.8478C284.906 31.3821 286.567 30.2229 288.409 29.4445C290.251 28.6662 292.233 28.2858 294.229 28.3277C296.064 28.3081 297.884 28.6673 299.578 29.3833C301.102 30.0058 302.492 30.9261 303.669 32.09C304.679 33.0767 305.576 34.1753 306.343 35.365C306.964 36.3692 307.493 37.4302 307.921 38.5318L308.643 40.3723L287.249 49.2772C287.896 50.7819 288.979 52.0528 290.354 52.9225C291.728 53.7922 293.331 54.2199 294.951 54.1492C296.527 54.1535 298.077 53.7444 299.451 52.9617C300.824 52.179 301.973 51.0495 302.787 49.6832L308.135 53.3372C306.77 55.3136 305.023 56.9894 303.001 58.2633C300.595 59.8017 297.796 60.5922 294.951 60.5369V60.5369ZM286.019 43.9451L300.246 37.9634C299.808 36.9087 299.024 36.0389 298.026 35.5003C296.91 34.862 295.645 34.5351 294.363 34.553C292.186 34.6101 290.12 35.5341 288.613 37.1243C287.711 37.9978 287.011 39.0621 286.563 40.2412C286.114 41.4203 285.929 42.685 286.019 43.9451V43.9451ZM345.2 60.5369C342.231 60.5888 339.283 60.033 336.532 58.903C333.781 57.7729 331.284 56.0919 329.191 53.9609C327.098 51.8299 325.453 49.2927 324.352 46.5018C323.252 43.7109 322.721 40.7238 322.79 37.7198C322.721 34.7158 323.252 31.7287 324.352 28.9378C325.453 26.1469 327.098 23.6097 329.191 21.4787C331.284 19.3477 333.781 17.6667 336.532 16.5366C339.283 15.4066 342.231 14.8508 345.2 14.9027C348.204 14.8076 351.191 15.4009 353.937 16.6383C356.683 17.8756 359.117 19.725 361.058 22.0483L357.207 25.8376C355.782 24.0238 353.954 22.576 351.873 21.6119C349.791 20.6477 347.514 20.1945 345.226 20.2889C343.024 20.2387 340.835 20.6396 338.79 21.4676C336.745 22.2955 334.886 23.5334 333.326 25.1068C331.704 26.7579 330.436 28.7307 329.603 30.9013C328.77 33.0718 328.39 35.3933 328.486 37.7198C328.39 40.0463 328.77 42.3678 329.603 44.5384C330.436 46.7089 331.704 48.6817 333.326 50.3328C334.886 51.9062 336.745 53.1441 338.79 53.972C340.835 54.8 343.024 55.2009 345.226 55.1507C347.782 55.1797 350.311 54.6253 352.626 53.5288C354.941 52.4323 356.982 50.8218 358.597 48.8171L362.448 52.7147C360.432 55.155 357.901 57.1065 355.041 58.4257C351.958 59.8663 348.595 60.5878 345.2 60.5369V60.5369ZM372.797 59.5625H367.262V15.85H372.797V59.5625ZM381.836 33.2538C384.737 30.3382 388.659 28.7019 392.747 28.7019C396.835 28.7019 400.757 30.3382 403.658 33.2538C405.076 34.7696 406.184 36.5543 406.919 38.5053C407.653 40.4563 407.999 42.535 407.936 44.6218C407.999 46.7086 407.653 48.7873 406.919 50.7382C406.184 52.6892 405.076 54.4739 403.658 55.9897C400.757 58.9054 396.835 60.5417 392.747 60.5417C388.659 60.5417 384.737 58.9054 381.836 55.9897C380.418 54.4739 379.31 52.6892 378.575 50.7382C377.841 48.7873 377.495 46.7086 377.557 44.6218C377.495 42.535 377.841 40.4563 378.575 38.5053C379.31 36.5543 380.418 34.7696 381.836 33.2538V33.2538ZM385.954 52.4711C386.827 53.404 387.878 54.1471 389.043 54.655C390.209 55.1628 391.465 55.4248 392.734 55.4248C394.003 55.4248 395.258 55.1628 396.424 54.655C397.59 54.1471 398.641 53.404 399.513 52.4711C400.48 51.4203 401.232 50.1851 401.723 48.8375C402.214 47.4899 402.435 46.0568 402.374 44.6218C402.435 43.1867 402.214 41.7537 401.723 40.4061C401.232 39.0585 400.48 37.8233 399.513 36.7725C398.641 35.8395 397.59 35.0964 396.424 34.5886C395.258 34.0807 394.003 33.8188 392.734 33.8188C391.465 33.8188 390.209 34.0807 389.043 34.5886C387.878 35.0964 386.827 35.8395 385.954 36.7725C384.987 37.8233 384.236 39.0585 383.744 40.4061C383.253 41.7537 383.032 43.1867 383.093 44.6218C383.039 46.0542 383.266 47.4833 383.762 48.8261C384.258 50.1688 385.012 51.3986 385.981 52.444L385.954 52.4711V52.4711ZM438.61 59.5625H433.261V55.4213H433.101C432.149 56.9942 430.802 58.2831 429.196 59.1565C427.531 60.1336 425.639 60.6472 423.714 60.6452C422.151 60.7534 420.584 60.5029 419.13 59.9124C417.676 59.3218 416.373 58.4065 415.317 57.2348C413.292 54.6414 412.274 51.3872 412.456 48.0863V29.681H417.992V47.0578C417.992 52.6335 420.425 55.4213 425.292 55.4213C426.374 55.4555 427.447 55.2276 428.424 54.7568C429.401 54.2861 430.253 53.5859 430.908 52.7147C432.343 50.8742 433.108 48.5899 433.074 46.2458V29.681H438.61V59.5625V59.5625ZM457.409 60.5369C455.532 60.5432 453.675 60.1376 451.967 59.3479C450.258 58.5583 448.74 57.4033 447.515 55.9627C444.742 52.8633 443.258 48.8012 443.37 44.6218C443.258 40.4424 444.742 36.3802 447.515 33.2809C448.74 31.8402 450.258 30.6853 451.967 29.8956C453.675 29.106 455.532 28.7003 457.409 28.7066C459.513 28.673 461.592 29.1757 463.453 30.1682C465.089 31.0014 466.474 32.2632 467.464 33.8222H467.705L467.464 29.681V15.85H473V59.5625H467.652V55.4213H467.411C466.421 56.9804 465.035 58.2422 463.4 59.0753C461.554 60.0591 459.495 60.5615 457.409 60.5369V60.5369ZM458.319 55.4213C459.57 55.4398 460.811 55.1887 461.959 54.6847C463.107 54.1807 464.136 53.4354 464.977 52.4981C466.858 50.331 467.819 47.5011 467.652 44.6218C467.819 41.7425 466.858 38.9125 464.977 36.7454C464.13 35.8031 463.098 35.0502 461.947 34.5351C460.795 34.0199 459.551 33.7538 458.292 33.7538C457.033 33.7538 455.788 34.0199 454.637 34.5351C453.486 35.0502 452.453 35.8031 451.606 36.7454C450.672 37.8113 449.955 39.0533 449.496 40.4003C449.037 41.7472 448.846 43.1726 448.932 44.5947C448.846 46.0168 449.037 47.4422 449.496 48.7891C449.955 50.1361 450.672 51.3781 451.606 52.444C452.449 53.398 453.485 54.1576 454.643 54.6712C455.801 55.1849 457.054 55.4407 458.319 55.4213Z" fill="#5F6368"/>
-</svg>
diff --git a/client/src/app_infra/infra/assets/k8s.svg b/client/src/app_infra/infra/assets/k8s.svg
deleted file mode 100644
index 1a3e9034..00000000
--- a/client/src/app_infra/infra/assets/k8s.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg width="300" height="68" viewBox="0 0 397 68" fill="none" xmlns="http://www.w3.org/2000/svg">
-    <path d="M63.2814 15.1236C62.8849 13.8365 61.9333 12.7907 60.7438 12.1471L36.5565 0.402223C35.922 0.0804445 35.2083 0 34.5739 0C33.9395 0 33.2258 0 32.5913 0.160889L8.40404 11.9862C7.2145 12.5493 6.34217 13.5951 6.02496 14.9627L0.0772692 41.4289C-0.160639 42.7965 0.156572 44.164 0.949598 45.2903L17.6824 66.2863C18.6341 67.2516 19.9822 67.8952 21.3304 67.9756H47.976C49.4035 68.1365 50.7516 67.493 51.624 66.2863L68.3568 45.2903C69.1498 44.164 69.467 42.7965 69.3084 41.4289L63.2814 15.1236V15.1236Z" fill="#326DE6"/>
-    <path d="M59.5542 40.3832C59.4749 40.3832 59.3956 40.3832 59.3956 40.3027C59.3956 40.2223 59.237 40.2223 59.0784 40.2223C58.7612 40.1418 58.444 40.1418 58.1268 40.1418C57.9682 40.1418 57.8095 40.1418 57.6509 40.0614H57.5716C56.6993 39.9809 55.7477 39.8201 54.8754 39.5787C54.6374 39.4983 54.3995 39.2569 54.3202 39.0156C54.3995 39.0156 54.3202 39.0156 54.3202 39.0156L53.6858 38.8547C54.003 36.5218 53.8444 34.1085 53.3686 31.7756C52.8135 29.4427 51.8619 27.1903 50.593 25.1791L51.0688 24.6965V24.616C51.0688 24.3747 51.1481 24.0529 51.3067 23.892C52.0205 23.2485 52.7342 22.7658 53.5272 22.2831L54.003 22.0418C54.3202 21.8809 54.5581 21.72 54.8754 21.5591C54.9547 21.4787 55.034 21.4787 55.1133 21.3983C55.1926 21.3178 55.1133 21.3178 55.1133 21.2374C55.827 20.6743 55.9856 19.7089 55.4305 18.9849C55.1926 18.6631 54.7168 18.4218 54.3202 18.4218C53.9237 18.4218 53.5272 18.5827 53.21 18.824L53.1307 18.9045C53.0514 18.9849 52.9721 19.0654 52.8928 19.0654C52.6549 19.3067 52.417 19.548 52.2584 19.7894C52.1791 19.9503 52.0205 20.0307 51.9412 20.1111C51.386 20.7547 50.6723 21.3983 49.9586 21.8809C49.8 21.9614 49.6414 22.0418 49.4828 22.0418C49.4035 22.0418 49.2449 22.0418 49.1656 21.9614H49.0863L48.4518 22.3636C47.8174 21.72 47.1037 21.0765 46.4693 20.4329C43.5351 18.1 39.8872 16.652 36.1599 16.2498L36.0806 15.6063V15.6867C35.8427 15.5258 35.7634 15.2845 35.6841 15.0431C35.6841 14.1582 35.6841 13.2734 35.8427 12.308V12.2276C35.8427 12.0667 35.922 11.9058 35.922 11.7449C36.0013 11.4231 36.0013 11.1014 36.0806 10.7796V10.2969C36.1599 9.49247 35.5255 8.68802 34.7325 8.60758C34.2567 8.52713 33.7809 8.76847 33.3844 9.17069C33.0671 9.49247 32.9085 9.89469 32.9085 10.2969V10.6991C32.9085 11.0209 32.9878 11.3427 33.0671 11.6645C33.1464 11.8254 33.1464 11.9862 33.1464 12.1471V12.2276C33.3051 13.1125 33.3051 13.9974 33.3051 14.9627C33.2258 15.204 33.1464 15.4454 32.9085 15.6063V15.7671L32.8292 16.4107C31.9569 16.4911 31.0846 16.652 30.1329 16.8129C26.4057 17.6174 22.9957 19.6285 20.3787 22.444L19.9029 22.1223H19.8236C19.7443 22.1223 19.665 22.2027 19.5064 22.2027C19.3478 22.2027 19.1892 22.1223 19.0306 22.0418C18.3169 21.4787 17.6031 20.8351 17.048 20.1916C16.9687 20.0307 16.8101 19.9503 16.7308 19.8698C16.4929 19.6285 16.3343 19.3871 16.0964 19.1458C16.0171 19.0654 15.9378 19.0654 15.8585 18.9849L15.7792 18.9045C15.462 18.6631 15.0655 18.5023 14.6689 18.5023C14.1931 18.5023 13.7966 18.6631 13.5587 19.0654C13.0829 19.7894 13.2415 20.7547 13.8759 21.3178C13.9552 21.3178 13.9552 21.3983 13.9552 21.3983C13.9552 21.3983 14.1138 21.5591 14.1931 21.5591C14.431 21.72 14.7482 21.8809 15.0655 22.0418L15.5413 22.2831C16.3343 22.7658 17.1273 23.2485 17.7617 23.892C17.9203 24.0529 18.079 24.3747 17.9997 24.616V24.5356L18.4755 25.0183C18.3962 25.1791 18.3169 25.2596 18.2376 25.4205C15.7792 29.3623 14.7482 34.028 15.462 38.6134L14.8275 38.7743C14.8275 38.8547 14.7482 38.8547 14.7482 38.8547C14.6689 39.0961 14.431 39.2569 14.1931 39.4178C13.3208 39.6592 12.4485 39.8201 11.4968 39.9005C11.3382 39.9005 11.1796 39.9005 11.021 39.9809C10.7038 39.9809 10.3866 40.0614 10.0694 40.0614C9.99009 40.0614 9.91079 40.1418 9.75218 40.1418C9.67288 40.1418 9.67288 40.1418 9.59358 40.2223C8.72125 40.3832 8.16613 41.1876 8.32473 42.0725C8.48334 42.7965 9.19706 43.2792 9.91079 43.1987C10.0694 43.1987 10.1487 43.1987 10.3073 43.1183C10.3866 43.1183 10.3866 43.1183 10.3866 43.0378C10.3866 42.9574 10.6245 43.0378 10.7038 43.0378C11.021 42.9574 11.3382 42.7965 11.5761 42.7161C11.7347 42.6356 11.8934 42.5552 12.052 42.5552H12.1313C13.0036 42.2334 13.7966 41.9921 14.7482 41.8312H14.8275C15.0655 41.8312 15.3034 41.9116 15.462 42.0725C15.5413 42.0725 15.5413 42.1529 15.5413 42.1529L16.255 42.0725C17.4445 45.7729 19.665 49.0712 22.7578 51.4845C23.4715 52.0476 24.106 52.5303 24.899 52.9325L24.5025 53.4956C24.5025 53.5761 24.5818 53.5761 24.5818 53.5761C24.7404 53.8174 24.7404 54.1392 24.6611 54.3805C24.3439 55.185 23.868 55.9894 23.3922 56.7134V56.7938C23.3129 56.9547 23.2336 57.0352 23.075 57.1961C22.9164 57.357 22.7578 57.6787 22.5199 58.0005C22.4406 58.081 22.4406 58.1614 22.3613 58.2419C22.3613 58.2419 22.3613 58.3223 22.282 58.3223C21.8855 59.1267 22.2027 60.0921 22.9164 60.4943C23.075 60.5747 23.3129 60.6552 23.4715 60.6552C24.106 60.6552 24.6611 60.253 24.9783 59.6898C24.9783 59.6898 24.9783 59.6094 25.0576 59.6094C25.0576 59.529 25.1369 59.4485 25.2162 59.3681C25.2955 59.0463 25.4541 58.805 25.5334 58.4832L25.692 58.0005C25.9299 57.1156 26.3264 56.3112 26.7229 55.5067C26.8815 55.2654 27.1195 55.1045 27.3574 55.0241C27.4367 55.0241 27.4367 55.0241 27.4367 54.9436L27.7539 54.3001C29.9743 55.185 32.2741 55.5872 34.6532 55.5872C36.0806 55.5872 37.5081 55.4263 38.9355 55.0241C39.8079 54.8632 40.6802 54.5414 41.4732 54.3001L41.7904 54.8632C41.8697 54.8632 41.8697 54.8632 41.8697 54.9436C42.1076 55.0241 42.3455 55.185 42.5042 55.4263C42.9007 56.2307 43.2972 57.0352 43.5351 57.9201V58.0005L43.6937 58.4832C43.773 58.805 43.8523 59.1267 44.0109 59.3681C44.0902 59.4485 44.0902 59.529 44.1695 59.6094C44.1695 59.6094 44.1695 59.6898 44.2488 59.6898C44.566 60.253 45.1211 60.6552 45.7556 60.6552C45.9935 60.6552 46.1521 60.5747 46.39 60.4943C46.7072 60.3334 47.0244 60.0116 47.1037 59.6094C47.183 59.2072 47.183 58.805 47.0244 58.4027C47.0244 58.3223 46.9451 58.3223 46.9451 58.3223C46.9451 58.2418 46.8658 58.1614 46.7865 58.081C46.6279 57.7592 46.4693 57.5178 46.2314 57.2765C46.1521 57.1156 46.0728 57.0352 45.9142 56.8743V56.7134C45.359 55.9894 44.9625 55.185 44.6453 54.3805C44.566 54.1392 44.566 53.8174 44.7246 53.5761C44.7246 53.4956 44.8039 53.4956 44.8039 53.4956L44.566 52.8521C48.6104 50.3583 51.7033 46.4969 53.1307 41.9116L53.7651 41.9921C53.8444 41.9921 53.8444 41.9116 53.8444 41.9116C54.003 41.7507 54.2409 41.6703 54.4788 41.6703H54.5581C55.4305 41.8312 56.3028 42.0725 57.0958 42.3943H57.1751C57.3337 42.4747 57.4923 42.5552 57.6509 42.5552C57.9682 42.7161 58.2061 42.8769 58.5233 42.9574C58.6026 42.9574 58.6819 43.0378 58.8405 43.0378C58.9198 43.0378 58.9198 43.0378 58.9991 43.1183C59.1577 43.1987 59.237 43.1987 59.3956 43.1987C60.1093 43.1987 60.7438 42.7161 60.9817 42.0725C60.9024 41.1876 60.2679 40.5441 59.5542 40.3832V40.3832ZM36.6358 37.8894L34.4946 38.9352L32.3534 37.8894L31.7983 35.5565L33.3051 33.6258H35.6841L37.1909 35.5565L36.6358 37.8894V37.8894ZM49.5621 32.6605C49.9586 34.3498 50.0379 36.0392 49.8793 37.7285L42.3455 35.5565C41.6318 35.3956 41.2353 34.6716 41.3939 33.9476C41.4732 33.7063 41.5525 33.5454 41.7111 33.3845L47.6588 27.9143C48.5311 29.3623 49.1656 30.9712 49.5621 32.6605V32.6605ZM45.2797 24.9378L38.7769 29.6036C38.2218 29.9254 37.4288 29.8449 37.0323 29.2818C36.8737 29.1209 36.7944 28.96 36.7944 28.7187L36.3185 20.5938C39.8079 20.996 42.9007 22.5245 45.2797 24.9378V24.9378ZM30.926 20.8351L32.512 20.5134L32.1155 28.5578C32.1155 29.2818 31.4811 29.8449 30.7674 29.8449C30.5295 29.8449 30.3709 29.7645 30.1329 29.684L23.5508 24.9378C25.6127 22.9267 28.1504 21.4787 30.926 20.8351ZM21.2511 27.9143L27.1194 33.2236C27.6746 33.7063 27.7539 34.5107 27.2781 35.0738C27.1194 35.3152 26.9608 35.3956 26.6436 35.476L18.9513 37.7285C18.7134 34.3498 19.5064 30.8907 21.2511 27.9143V27.9143ZM19.9029 41.5094L27.7539 40.1418C28.3883 40.1418 29.0227 40.5441 29.102 41.1876C29.1813 41.4289 29.1813 41.7507 29.0227 41.9921L26.0092 49.393C23.2336 47.5427 21.0131 44.7272 19.9029 41.5094V41.5094ZM37.9046 51.4845C36.7944 51.7258 35.6841 51.8867 34.4946 51.8867C32.8292 51.8867 31.0846 51.565 29.4985 51.0823L33.3844 43.9227C33.7809 43.4401 34.4153 43.2792 34.9704 43.6009C35.2083 43.7618 35.3669 43.9227 35.6048 44.1641L39.4113 51.1627C38.9355 51.2432 38.4597 51.3236 37.9046 51.4845V51.4845ZM47.5795 44.4858C46.39 46.4165 44.7246 48.1058 42.8214 49.3125L39.7286 41.7507C39.57 41.1072 39.8872 40.4636 40.4423 40.2223C40.6802 40.1418 40.9181 40.0614 41.156 40.0614L49.0863 41.4289C48.6898 42.5552 48.2139 43.6009 47.5795 44.4858Z" fill="white"/>
-    <path d="M384.219 50.2778C385.329 50.3582 386.519 50.1974 387.55 49.7951C388.184 49.4734 388.581 48.7494 388.501 48.0254C388.422 47.2209 387.946 46.4969 387.233 46.2556C386.043 45.5316 384.695 44.888 383.347 44.4858C381.999 44.0031 380.809 43.44 379.699 42.8769C378.668 42.3942 377.796 41.7507 376.923 40.9462C376.13 40.1418 375.575 39.2569 375.179 38.2111C374.703 37.0045 374.544 35.7173 374.544 34.4302C374.465 31.7756 375.654 29.2013 377.716 27.5924C379.857 25.9031 382.712 25.0987 386.36 25.0987C388.105 25.0987 389.929 25.2596 391.673 25.6618C393.022 25.9031 394.37 26.2249 395.718 26.7076L394.211 33.5453C393.101 33.1431 392.07 32.9018 390.96 32.58C389.691 32.2582 388.343 32.1778 387.074 32.1778C384.378 32.1778 383.029 32.9018 383.029 34.4302C383.029 34.752 383.109 35.0738 383.188 35.3956C383.347 35.7173 383.585 35.9587 383.902 36.2C384.219 36.4413 384.695 36.6827 385.25 37.0045C385.805 37.3262 386.598 37.648 387.55 37.9698C389.136 38.5329 390.722 39.2569 392.149 40.0613C393.26 40.6245 394.211 41.3485 395.004 42.3138C395.718 43.0378 396.194 43.9227 396.511 44.9685C396.828 46.0947 396.987 47.2209 396.987 48.3471C397.145 51.0822 395.876 53.7369 393.577 55.2654C391.356 56.7938 388.184 57.5983 384.06 57.5983C381.761 57.6787 379.54 57.4374 377.32 56.8743C376.051 56.5525 374.861 56.1503 373.672 55.748L375.099 48.6689C376.527 49.232 378.033 49.7147 379.54 50.0365C381.126 50.1169 382.633 50.2778 384.219 50.2778V50.2778ZM340.523 41.4289C340.444 39.0156 340.92 36.6022 341.713 34.3498C342.427 32.4191 343.537 30.7298 344.964 29.2013C346.312 27.8338 347.819 26.788 349.564 26.1444C351.308 25.4204 353.132 25.0987 354.956 25.0987C359.239 25.0987 362.649 26.4662 365.107 29.1209C367.565 31.7756 368.834 35.7173 368.834 40.8658C368.834 41.3485 368.834 41.9116 368.755 42.5551C368.755 43.1987 368.676 43.6814 368.676 44.164H349.326C349.484 45.8534 350.357 47.4622 351.784 48.4276C353.529 49.5538 355.591 50.1169 357.653 50.0365C359.159 50.0365 360.745 49.8756 362.252 49.6342C363.521 49.3929 364.79 48.9907 365.979 48.4276L367.169 55.5067C366.614 55.8285 365.979 55.9894 365.345 56.2307C364.473 56.472 363.6 56.7134 362.728 56.7938C361.776 56.9547 360.825 57.1156 359.715 57.2765C358.684 57.3569 357.573 57.4374 356.463 57.4374C354.005 57.5178 351.626 57.1156 349.326 56.2307C347.423 55.5067 345.757 54.3805 344.33 52.9325C342.982 51.4845 342.03 49.7147 341.396 47.8645C340.841 45.6925 340.523 43.5205 340.523 41.4289V41.4289ZM360.587 38.1307C360.587 37.4067 360.428 36.6827 360.19 35.9587C360.032 35.2347 359.635 34.6716 359.239 34.1085C358.763 33.5453 358.208 33.0627 357.573 32.7409C356.78 32.3387 355.987 32.1778 355.115 32.1778C354.243 32.1778 353.45 32.3387 352.657 32.7409C352.022 33.0627 351.388 33.4649 350.912 34.028C350.436 34.5911 350.04 35.2347 349.802 35.9587C349.564 36.6827 349.405 37.4067 349.326 38.1307H360.587V38.1307ZM317.288 18.1804L325.852 16.8129V25.8227H336.162V33.0627H325.852V43.8422C325.773 45.3707 326.09 46.8991 326.804 48.1862C327.438 49.232 328.707 49.7951 330.69 49.7951C331.641 49.7951 332.593 49.7147 333.465 49.5538C334.417 49.3929 335.289 49.1516 336.162 48.8298L337.351 55.5871C336.241 56.0698 335.051 56.3916 333.862 56.7134C332.355 57.0351 330.769 57.196 329.183 57.196C327.2 57.2765 325.218 56.9547 323.394 56.2307C321.966 55.6676 320.698 54.7023 319.746 53.576C318.794 52.3694 318.16 50.9214 317.763 49.3929C317.367 47.6231 317.208 45.7729 317.288 44.0031V18.1804V18.1804ZM282.632 41.4289C282.553 39.0156 283.029 36.6022 283.822 34.3498C284.536 32.4191 285.646 30.7298 287.073 29.2013C288.421 27.8338 289.928 26.788 291.673 26.1444C293.418 25.4204 295.242 25.0987 297.065 25.0987C301.348 25.0987 304.758 26.4662 307.216 29.1209C309.675 31.7756 310.943 35.7173 310.943 40.8658C310.943 41.3485 310.943 41.9116 310.864 42.5551C310.785 43.1987 310.785 43.6814 310.785 44.164H291.356C291.514 45.8534 292.387 47.4622 293.814 48.4276C295.559 49.5538 297.621 50.1169 299.682 50.0365C301.189 50.0365 302.775 49.8756 304.282 49.6342C305.551 49.3929 306.82 48.9907 308.089 48.4276L309.278 55.5067C308.723 55.8285 308.089 55.9894 307.454 56.2307C306.582 56.472 305.709 56.7134 304.837 56.7938C303.885 56.9547 302.934 57.1156 301.824 57.2765C300.793 57.3569 299.682 57.4374 298.572 57.4374C296.114 57.5178 293.735 57.1156 291.435 56.2307C289.532 55.5067 287.866 54.3805 286.439 52.9325C285.091 51.4845 284.139 49.7147 283.505 47.8645C282.87 45.6925 282.553 43.5205 282.632 41.4289V41.4289ZM302.696 38.1307C302.696 37.4067 302.537 36.6827 302.299 35.9587C302.141 35.2347 301.744 34.6716 301.348 34.1085C300.872 33.5453 300.317 33.0627 299.682 32.7409C298.889 32.3387 298.096 32.1778 297.224 32.1778C296.352 32.1778 295.559 32.3387 294.766 32.7409C294.131 33.0627 293.576 33.4649 293.1 34.028C292.625 34.5911 292.228 35.2347 291.99 35.9587C291.752 36.6827 291.594 37.4067 291.514 38.1307H302.696V38.1307ZM250.118 26.8684C251.942 26.3858 253.846 25.9836 255.749 25.6618C258.128 25.2596 260.586 25.0987 262.965 25.0987C265.107 25.0182 267.248 25.4204 269.31 26.1444C270.896 26.7076 272.323 27.6729 273.354 28.96C274.385 30.2471 275.099 31.7756 275.495 33.3845C275.971 35.2347 276.13 37.1653 276.13 39.096V56.3916H267.644V40.2222C267.644 37.4067 267.248 35.476 266.534 34.2693C265.82 33.1431 264.472 32.4996 262.49 32.4996C261.855 32.4996 261.221 32.4996 260.507 32.58C259.793 32.58 259.238 32.6605 258.683 32.7409V56.3916H250.118V26.8684V26.8684ZM244.091 33.5453C243.298 33.3845 242.426 33.1431 241.395 32.9822C240.285 32.7409 239.175 32.6605 238.064 32.6605C237.43 32.6605 236.796 32.7409 236.082 32.8213C235.527 32.9018 234.972 32.9822 234.416 33.1431V56.5525H225.852V27.4316C227.596 26.788 229.42 26.3053 231.244 25.9031C233.544 25.34 235.923 25.0987 238.223 25.1791C238.778 25.1791 239.333 25.2596 239.888 25.2596C240.523 25.2596 241.157 25.34 241.871 25.5009C242.505 25.5813 243.14 25.6618 243.853 25.8227C244.409 25.9031 244.964 26.064 245.519 26.3053L244.091 33.5453V33.5453ZM190.879 41.4289C190.8 39.0156 191.276 36.6022 192.069 34.3498C192.783 32.4191 193.893 30.7298 195.32 29.2013C196.668 27.8338 198.175 26.788 199.92 26.1444C201.664 25.4204 203.488 25.0987 205.312 25.0987C209.595 25.0987 213.005 26.4662 215.463 29.1209C217.921 31.7756 219.19 35.7173 219.19 40.7854C219.19 41.268 219.19 41.8311 219.111 42.4747C219.032 43.1182 219.032 43.6009 219.032 44.0836H199.603C199.761 45.7729 200.634 47.3818 202.061 48.3471C203.806 49.4734 205.867 50.0365 207.929 49.956C209.436 49.956 211.022 49.7951 212.529 49.5538C213.798 49.3125 215.067 48.9102 216.256 48.4276L217.446 55.5067C216.891 55.8285 216.256 55.9894 215.622 56.2307C214.749 56.472 213.877 56.7134 213.005 56.7938C212.053 56.9547 211.101 57.1156 209.991 57.2765C208.96 57.3569 207.85 57.4374 206.74 57.4374C204.281 57.5178 201.902 57.1156 199.603 56.2307C197.699 55.5067 196.034 54.3805 194.607 52.9325C193.258 51.4845 192.307 49.7147 191.672 47.8645C191.197 45.6925 190.879 43.6009 190.879 41.4289V41.4289ZM211.022 38.1307C211.022 37.4067 210.864 36.6827 210.626 35.9587C210.467 35.2347 210.071 34.6716 209.674 34.1085C209.198 33.5453 208.643 33.0627 208.009 32.7409C207.216 32.3387 206.423 32.1778 205.55 32.1778C204.678 32.1778 203.885 32.3387 203.092 32.7409C202.457 33.0627 201.823 33.4649 201.347 34.028C200.871 34.5911 200.475 35.2347 200.237 35.9587C199.999 36.6827 199.841 37.4067 199.761 38.1307H211.022V38.1307ZM177.001 40.9462C177.001 35.3151 174.939 32.58 170.895 32.58C170.023 32.58 169.15 32.6605 168.278 32.9018C167.564 33.0627 166.851 33.3845 166.216 33.7867V49.5538C166.613 49.6342 167.168 49.7147 167.802 49.7951C168.437 49.8756 169.15 49.8756 169.943 49.8756C172.005 50.0365 173.988 49.1516 175.257 47.4622C176.446 45.5316 177.081 43.2791 177.001 40.9462V40.9462ZM185.725 41.268C185.725 43.5205 185.407 45.7729 184.614 47.9449C183.98 49.8756 182.949 51.5649 181.601 53.0129C180.173 54.4609 178.508 55.5871 176.684 56.3111C174.543 57.1156 172.323 57.4374 170.023 57.4374C168.992 57.4374 167.882 57.3569 166.771 57.2765C165.661 57.196 164.551 57.0351 163.441 56.9547C162.41 56.7938 161.379 56.6329 160.348 56.3916C159.317 56.2307 158.445 55.9894 157.731 55.6676V12.6298L166.296 11.2622V26.5467C167.247 26.1444 168.278 25.8227 169.309 25.5813C170.419 25.34 171.529 25.2596 172.64 25.2596C174.622 25.2596 176.526 25.5813 178.35 26.4662C179.936 27.1902 181.363 28.3164 182.473 29.684C183.663 31.2125 184.535 32.9018 185.011 34.752C185.487 36.7631 185.725 39.0156 185.725 41.268V41.268ZM149.563 55.4263C147.739 55.9089 145.835 56.3111 143.932 56.5525C141.553 56.9547 139.095 57.1156 136.716 57.1156C134.495 57.196 132.354 56.7938 130.292 56.0698C128.706 55.4263 127.358 54.4609 126.248 53.1738C125.217 51.8063 124.503 50.2778 124.107 48.5885C123.631 46.7382 123.472 44.7271 123.472 42.7965V25.8227H132.037V41.8311C132.037 44.6467 132.433 46.6578 133.147 47.8645C133.861 49.0711 135.209 49.7147 137.191 49.7147C137.826 49.7147 138.46 49.7147 139.174 49.6342C139.888 49.5538 140.443 49.5538 140.998 49.3929V25.8227H149.563V55.4263V55.4263ZM99.602 36.924C100.474 35.9587 101.267 34.9933 102.219 34.028C103.091 32.9822 103.964 32.0169 104.836 31.0516C105.708 30.0058 106.501 29.1209 107.215 28.236C107.929 27.3511 108.643 26.5467 109.198 25.9031H119.348C117.287 28.236 115.304 30.5689 113.401 32.7409C111.418 34.9129 109.356 37.1653 107.056 39.4178C108.325 40.6245 109.515 41.8311 110.625 43.1987C111.815 44.6467 113.004 46.0947 114.194 47.7036C115.304 49.232 116.414 50.8409 117.366 52.3694C118.317 53.8978 119.11 55.3458 119.745 56.6329H109.911C109.277 55.5871 108.563 54.5414 107.77 53.3347C106.977 52.128 106.105 50.9214 105.312 49.6342C104.439 48.4276 103.488 47.2209 102.457 46.0947C101.585 45.0489 100.633 44.0836 99.602 43.2791V56.7134H91.0374V12.6298L99.602 11.2622V36.924" fill="black"/>
-</svg>
diff --git a/client/src/app_infra/infra/assets/ovh.svg b/client/src/app_infra/infra/assets/ovh.svg
deleted file mode 100644
index 67370c91..00000000
--- a/client/src/app_infra/infra/assets/ovh.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg id="Layer_1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 298.03 47.18"><defs><style type="text/css">.cls-1,.cls-2{fill:#000e9c;}.cls-1{fill-rule:evenodd;}</style></defs><title>OVHcloud_master_logo_fullcolor_RGB</title><path class="cls-1" d="M110.11,40.31a40.1,40.1,0,0,1-3.74,44.49H84.93l6.6-11.67H82.8L93.09,55h8.78l8.24-14.67ZM67.77,84.8H45.91a39.59,39.59,0,0,1-3.79-44.59L56.3,64.84,71.93,37.62h23L67.78,84.78h0v0Z" transform="translate(-36.97 -37.62)"/><path class="cls-2" d="M128.18,62.9c0-12.59,6.27-18.64,16.57-18.64s16.56,6.05,16.56,18.64S155,81.47,144.75,81.47,128.18,75.37,128.18,62.9Zm3.72,0c0,10.35,4.72,15.28,12.85,15.28s12.84-4.93,12.84-15.28-4.72-15.35-12.84-15.35S131.9,52.49,131.9,62.9Z" transform="translate(-36.97 -37.62)"/><path class="cls-2" d="M188.38,45.75a1.82,1.82,0,0,1,1.7-1.17,1.79,1.79,0,0,1,1.8,1.81,2.42,2.42,0,0,1-.16.79L179.3,79.93a1.78,1.78,0,0,1-3.39,0L163.49,47.18a2.42,2.42,0,0,1-.16-.79,1.79,1.79,0,0,1,1.8-1.81,1.82,1.82,0,0,1,1.7,1.17L177.6,74.31Z" transform="translate(-36.97 -37.62)"/><path class="cls-2" d="M199.42,64.06V79.35a1.81,1.81,0,1,1-3.61,0v-33a1.81,1.81,0,1,1,3.61,0V60.77H217.9V46.39a1.81,1.81,0,1,1,3.61,0v33a1.81,1.81,0,1,1-3.61,0V64.06Z" transform="translate(-36.97 -37.62)"/><path class="cls-2" d="M238.55,55.89a10,10,0,0,1,8.17,3.66,1.56,1.56,0,0,1,.37,1,1.51,1.51,0,0,1-1.54,1.54,1.56,1.56,0,0,1-1.27-.64A6.8,6.8,0,0,0,238.55,59c-4.89,0-7.49,3.13-7.49,9.66s2.6,9.71,7.49,9.71a9.68,9.68,0,0,0,6.15-2.28,1.56,1.56,0,0,1,1-.37,1.54,1.54,0,0,1,1.54,1.54,1.63,1.63,0,0,1-.69,1.32,12.06,12.06,0,0,1-8,2.87c-6.85,0-10.94-4.09-10.94-12.79S231.7,55.89,238.55,55.89Z" transform="translate(-36.97 -37.62)"/><path class="cls-2" d="M255.48,44.63V75c0,2.12.69,3,2.12,3a1.6,1.6,0,1,1,0,3.19c-3.55,0-5.52-2.13-5.52-6.21V44.63a1.74,1.74,0,0,1,1.7-1.69A1.7,1.7,0,0,1,255.48,44.63Z" transform="translate(-36.97 -37.62)"/><path class="cls-2" d="M284.41,68.63c0,8.7-4.25,12.79-11.15,12.79s-11.14-4.09-11.14-12.79,4.3-12.74,11.14-12.74S284.41,59.92,284.41,68.63Zm-3.45,0c0-6.69-2.81-9.66-7.7-9.66s-7.69,3-7.69,9.66,2.81,9.71,7.69,9.71S281,75.42,281,68.63Z" transform="translate(-36.97 -37.62)"/><path class="cls-2" d="M292.59,57.91V71.76c0,3.45,1.11,6.42,6.47,6.42s6.48-3,6.48-6.42V57.91a1.72,1.72,0,0,1,1.75-1.7,1.67,1.67,0,0,1,1.65,1.7V71.76c0,5-1.65,9.66-9.88,9.66s-9.87-4.62-9.87-9.66V57.91a1.67,1.67,0,0,1,1.7-1.7A1.71,1.71,0,0,1,292.59,57.91Z" transform="translate(-36.97 -37.62)"/><path class="cls-2" d="M331.6,59.34V44.63a1.7,1.7,0,0,1,3.4,0V71c0,7-4.35,10.46-10.4,10.46-6.85,0-10.89-4.09-10.89-12.79s3.83-12.74,10.67-12.74A9,9,0,0,1,331.6,59.34Zm0,4.3s-2-4.67-7-4.67-7.49,3.13-7.49,9.66,2.6,9.71,7.49,9.71c4.08,0,7-2.33,7-7.38Z" transform="translate(-36.97 -37.62)"/></svg>
\ No newline at end of file
diff --git a/client/src/app_infra/infra/assets/uploadIcon.svg b/client/src/app_infra/infra/assets/uploadIcon.svg
deleted file mode 100644
index b37b77e8..00000000
--- a/client/src/app_infra/infra/assets/uploadIcon.svg
+++ /dev/null
@@ -1,47 +0,0 @@
-<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 294.156 294.156" style="enable-background:new 0 0 294.156 294.156;" xml:space="preserve">
-<g>
-	<path d="M227.002,108.256c-2.755-41.751-37.6-74.878-80.036-74.878c-42.447,0-77.298,33.141-80.038,74.907
-		C28.978,113.059,0,145.39,0,184.184c0,42.234,34.36,76.595,76.595,76.595h116.483c3.313,0,6-2.687,6-6s-2.687-6-6-6H76.595
-		C40.977,248.778,12,219.801,12,184.184c0-34.275,26.833-62.568,61.087-64.411c3.184-0.171,5.678-2.803,5.678-5.991
-		c0-0.119-0.003-0.236-0.01-0.355c0.09-37.536,30.654-68.049,68.211-68.049c37.563,0,68.132,30.518,68.211,68.063
-		c-0.005,0.116-0.009,0.238-0.009,0.329c0,3.196,2.505,5.831,5.696,5.992c34.37,1.741,61.292,30.038,61.292,64.421
-		c0,19.526-8.698,37.801-23.864,50.138c-2.571,2.091-2.959,5.87-0.868,8.44c2.091,2.571,5.87,2.959,8.44,0.868
-		c17.98-14.626,28.292-36.293,28.292-59.447C294.156,145.269,265.08,112.926,227.002,108.256z"/>
-	<path d="M140.966,141.078v76.511c0,3.313,2.687,6,6,6s6-2.687,6-6v-76.511c0-3.313-2.687-6-6-6S140.966,137.765,140.966,141.078z"
-		/>
-	<path d="M181.283,152.204c1.536,0,3.071-0.586,4.243-1.757c2.343-2.343,2.343-6.142,0-8.485l-34.317-34.317
-		c-2.343-2.343-6.143-2.343-8.485,0l-34.317,34.317c-2.343,2.343-2.343,6.142,0,8.485c2.343,2.343,6.143,2.343,8.485,0
-		l30.074-30.074l30.074,30.074C178.212,151.618,179.748,152.204,181.283,152.204z"/>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-</svg>
diff --git a/client/src/app_infra/infra/awsConfig.js b/client/src/app_infra/infra/awsConfig.js
deleted file mode 100644
index 4c06184c..00000000
--- a/client/src/app_infra/infra/awsConfig.js
+++ /dev/null
@@ -1,192 +0,0 @@
-/** @jsxImportSource @emotion/react */
-import { css } from "@emotion/react";
-import { observable, action } from "mobx";
-import { observer } from "mobx-react";
-import { get, or, pipe } from "rubico";
-import { isEmpty } from "rubico/x";
-
-import input from "mdlean/lib/input";
-import formGroup from "mdlean/lib/formGroup";
-
-import { providerCreateStore } from "./providerStore";
-import {
-  providerFormCreate,
-  providerFormUpdate,
-  providerConfigCreateFooter,
-  providerConfigUpdateFooter,
-} from "./providerConfigCommon";
-
-const AWS_REGION = [
-  "eu-north-1",
-  "ap-south-1",
-  "eu-west-3",
-  "eu-west-2",
-  "eu-west-1",
-  "ap-northeast-3",
-  "ap-northeast-2",
-  "ap-northeast-1",
-  "sa-east-1",
-  "ca-central-1",
-  "ap-southeast-1",
-  "ap-southeast-2",
-  "eu-central-1",
-  "us-east-1",
-  "us-east-2",
-  "us-west-1",
-  "us-west-2",
-];
-
-import selectRegion from "./SelectRegion";
-
-const rules = {
-  AWSAccessKeyId: {
-    presence: true,
-    length: {
-      minimum: 20,
-      message: "must be at least 20 characters",
-    },
-  },
-  AWSSecretKey: {
-    presence: true,
-    length: {
-      minimum: 40,
-      message: "must be at least 40 characters",
-    },
-  },
-};
-
-const defaultData = {
-  id: "",
-  AWSAccessKeyId: "",
-  AWSSecretKey: "",
-  AWS_REGION: "us-east-1",
-};
-
-export const createStoreAws = (
-  context,
-  {
-    infraSettingsStore,
-    importProjectStore,
-    gitCredentialStore,
-    gitRepositoryStore,
-  }
-) => {
-  const core = providerCreateStore({
-    context,
-    defaultData,
-    rules,
-    infraSettingsStore,
-    importProjectStore,
-    gitCredentialStore,
-    gitRepositoryStore,
-  });
-  const store = observable({
-    get isDisabled() {
-      return or([
-        pipe([get("AWSAccessKeyId"), isEmpty]),
-        pipe([get("AWSSecretKey"), isEmpty]),
-      ])(core.data);
-    },
-    buildPayload: ({ data }) => ({
-      providerType: "aws",
-      providerName: "aws",
-      providerAuth: {
-        AWSAccessKeyId: data.AWSAccessKeyId.trim(),
-        AWSSecretKey: data.AWSSecretKey,
-        AWS_REGION: data.AWS_REGION,
-      },
-    }),
-    core,
-  });
-  return store;
-};
-
-export const awsConfigForm = (context) => {
-  const { tr } = context;
-  const FormGroup = formGroup(context);
-  const AwsSelectRegion = selectRegion(context, { items: AWS_REGION });
-  const Input = input(context, {
-    cssOverride: css`
-      > input {
-        width: 300px;
-      }
-    `,
-  });
-
-  return observer(({ store }) => (
-    <>
-      <FormGroup>
-        <Input
-          name="AWSAccessKeyId"
-          value={store.data.AWSAccessKeyId}
-          onChange={(event) => store.onChange("AWSAccessKeyId", event)}
-          autoComplete="off"
-          label={tr.t("AWS Access Key Id")}
-          error={get("AWSAccessKeyId[0]")(store.errors)}
-        />
-      </FormGroup>
-      <FormGroup>
-        <Input
-          name="AWSSecretKey"
-          value={store.data.AWSSecretKey}
-          onChange={(event) => store.onChange("AWSSecretKey", event)}
-          label={tr.t("AWS Secret Key")}
-          type="password"
-          error={get("AWSSecretKey[0]")(store.errors)}
-        />
-      </FormGroup>
-      <FormGroup className="aws-region">
-        <AwsSelectRegion
-          placeholder="Select a region"
-          value={store.data.AWS_REGION}
-          onSelected={(region) => {
-            store.data.AWS_REGION = region;
-          }}
-        />
-      </FormGroup>
-    </>
-  ));
-};
-
-export const awsFormCreate = (context) => {
-  const { tr } = context;
-  const FormCreate = providerFormCreate(context);
-  const Footer = providerConfigCreateFooter(context);
-  const AwsConfigForm = awsConfigForm(context);
-
-  return observer(({ store }) => (
-    <FormCreate>
-      <header>
-        <h2>{tr.t("Create new AWS Infrastructure")}</h2>
-      </header>
-      <main>
-        <div>
-          {tr.t(
-            "Please provide the following information to create and scan a new infrastructure"
-          )}
-        </div>
-        <AwsConfigForm store={store.core} />
-      </main>
-      <Footer store={store} />
-    </FormCreate>
-  ));
-};
-
-export const awsFormEdit = (context) => {
-  const { tr } = context;
-  const FormUpdate = providerFormUpdate(context);
-  const AwsConfigForm = awsConfigForm(context);
-  const Footer = providerConfigUpdateFooter(context);
-
-  return observer(({ store, infraSettingsStore }) => (
-    <FormUpdate>
-      <header>
-        <h2>{tr.t("Update AWS Infrastructure")}</h2>
-      </header>
-      <main>
-        <AwsConfigForm store={store.core} />
-      </main>
-      <Footer store={store} infraSettingsStore={infraSettingsStore} />
-    </FormUpdate>
-  ));
-};
diff --git a/client/src/app_infra/infra/azureConfig.js b/client/src/app_infra/infra/azureConfig.js
deleted file mode 100644
index 66090845..00000000
--- a/client/src/app_infra/infra/azureConfig.js
+++ /dev/null
@@ -1,192 +0,0 @@
-/** @jsxImportSource @emotion/react */
-import { css } from "@emotion/react";
-import { observable, action } from "mobx";
-import { observer } from "mobx-react";
-import { pipe, get, or, tap } from "rubico";
-import { isEmpty } from "rubico/x";
-
-import input from "mdlean/lib/input";
-import formGroup from "mdlean/lib/formGroup";
-
-import { providerCreateStore } from "./providerStore";
-import {
-  providerFormCreate,
-  providerFormUpdate,
-  providerConfigCreateFooter,
-  providerConfigUpdateFooter,
-} from "./providerConfigCommon";
-
-export const createStoreAzure = (
-  context,
-  { infraSettingsStore, gitCredentialStore, gitRepositoryStore }
-) => {
-  const core = providerCreateStore({
-    context,
-    defaultData: {},
-    rules: {},
-    infraSettingsStore,
-    gitCredentialStore,
-    gitRepositoryStore,
-  });
-
-  const store = observable({
-    buildPayload: ({ data }) => ({
-      providerType: "azure",
-      providerName: "azure",
-      providerAuth: data,
-    }),
-    get isDisabled() {
-      return or([
-        pipe([get("AZURE_SUBSCRIPTION_ID"), isEmpty]),
-        pipe([get("AZURE_TENANT_ID"), isEmpty]),
-        pipe([get("APP_ID"), isEmpty]),
-        pipe([get("PASSWORD"), isEmpty]),
-      ])(core.data);
-    },
-    core,
-  });
-  return store;
-};
-
-export const azureFormContent = (context) => {
-  const {
-    tr,
-    theme: { palette },
-  } = context;
-  const FormGroup = formGroup(context);
-  const Input = input(context, {
-    cssOverride: css`
-      input {
-        width: 25rem;
-      }
-    `,
-  });
-  return observer(({ store }) => (
-    <main>
-      <p>
-        Please follow the instructions to setup a service principal used by
-        Grucloud to scan an Azure infrastructure.
-      </p>
-      <ol
-        css={css`
-          list-style: none;
-          counter-reset: counter;
-          padding-left: 40px;
-          > li {
-            counter-increment: counter;
-            margin: 0 0 0.5rem 0;
-            position: relative;
-            ::before {
-              background-color: ${palette.primary.main};
-              color: ${palette.primary.contrastText};
-              content: counter(counter) ".";
-              font-weight: bold;
-              position: absolute;
-              --size: 32px;
-              left: calc(-1 * var(--size) - 10px);
-              line-height: var(--size);
-              width: var(--size);
-              height: var(--size);
-              top: -0.3rem;
-              border-radius: 50%;
-              text-align: center;
-            }
-          }
-        `}
-      >
-        <li>
-          <h3>Subscription ID</h3>
-          <p>
-            Retrieve the <em>Subscription ID</em> with the following command:{" "}
-          </p>
-          <pre>az account show --query id -otsv</pre>
-          <Input
-            data-input-azure-subscription-id
-            value={store.data.AZURE_SUBSCRIPTION_ID}
-            onChange={(event) => store.onChange("AZURE_SUBSCRIPTION_ID", event)}
-            label={tr.t("Subscription Id")}
-            error={
-              store.errors.AZURE_SUBSCRIPTION_ID &&
-              store.errors.AZURE_SUBSCRIPTION_ID[0]
-            }
-          />
-        </li>
-        <li>
-          <h3>Tenant ID</h3>
-          <p>
-            Retrieve the <em>AZURE_TENANT_ID</em> with the following command:{" "}
-          </p>
-          <pre>az account show</pre>
-          <Input
-            data-input-azure-tenant-id
-            value={store.data.AZURE_TENANT_ID}
-            onChange={(e) => store.onChange("AZURE_TENANT_ID", e)}
-            label={tr.t("Tenant Id")}
-            error={
-              store.errors.AZURE_TENANT_ID && store.errors.AZURE_TENANT_ID[0]
-            }
-          />
-        </li>
-        <li>
-          <h3>App ID and PASSWORD</h3>
-          <p>
-            Retrieve the <em>APP_ID</em> and <em>PASSWORD</em> by creating a
-            service principal called grucloud:
-          </p>
-          <pre>az ad sp create-for-rbac -n "grucloud"</pre>
-          <FormGroup>
-            <Input
-              data-input-azure-app-id
-              value={store.data.APP_ID}
-              onChange={(e) => store.onChange("APP_ID", e)}
-              label={tr.t("App Id")}
-              error={store.errors.APP_ID && store.errors.APP_ID[0]}
-            />
-          </FormGroup>
-          <FormGroup>
-            <Input
-              data-input-azure-password
-              type="PASSWORD"
-              value={store.data.PASSWORD}
-              onChange={(e) => store.onChange("PASSWORD", e)}
-              label={tr.t("Password")}
-              error={store.errors.PASSWORD && store.errors.PASSWORD[0]}
-            />
-          </FormGroup>
-        </li>
-      </ol>
-    </main>
-  ));
-};
-
-export const azureFormCreate = (context) => {
-  const { tr } = context;
-  const FormCreate = providerFormCreate(context);
-  const Content = azureFormContent(context);
-  const Footer = providerConfigCreateFooter(context);
-
-  return observer(({ store }) => (
-    <FormCreate>
-      <Content store={store.core} />
-      <Footer store={store} />
-    </FormCreate>
-  ));
-};
-
-export const azureFormEdit = (context) => {
-  const { tr } = context;
-  const FormUpdate = providerFormUpdate(context);
-
-  const Content = azureFormContent(context);
-  const Footer = providerConfigUpdateFooter(context);
-
-  return observer(({ store, infraSettingsStore }) => (
-    <FormUpdate>
-      <header>
-        <h2>{tr.t("Update Azure Infrastructure")}</h2>
-      </header>
-      <Content store={store.core} />
-      <Footer store={store} infraSettingsStore={infraSettingsStore} />
-    </FormUpdate>
-  ));
-};
diff --git a/client/src/app_infra/infra/badgeRegion.js b/client/src/app_infra/infra/badgeRegion.js
deleted file mode 100644
index 8262da30..00000000
--- a/client/src/app_infra/infra/badgeRegion.js
+++ /dev/null
@@ -1,24 +0,0 @@
-/* @jsxImportSource @emotion/react */
-import { css } from "@emotion/react";
-
-const badgeRegion =
-  ({ theme: { palette } }) =>
-  ({ region }) =>
-    (
-      <div
-        css={css`
-          display: inline-block;
-          border: 2px solid ${palette.grey[400]};
-          border-radius: 5px;
-          color: ${palette.grey[500]};
-          padding: 0.5rem;
-          //margin: 0.5rem;
-          max-height: 1.2rem;
-          white-space: nowrap;
-        `}
-      >
-        {region}
-      </div>
-    );
-
-export default badgeRegion;
diff --git a/client/src/app_infra/infra/gcpConfig.js b/client/src/app_infra/infra/gcpConfig.js
deleted file mode 100644
index b152f5b8..00000000
--- a/client/src/app_infra/infra/gcpConfig.js
+++ /dev/null
@@ -1,273 +0,0 @@
-/** @jsxImportSource @emotion/react */
-import { css } from "@emotion/react";
-import { observable, action } from "mobx";
-import { observer } from "mobx-react";
-
-import input from "mdlean/lib/input";
-
-import fileInput from "mdlean/lib/fileInput";
-import formGroup from "mdlean/lib/formGroup";
-
-import IconUpload from "./assets/uploadIcon.svg";
-
-import { providerCreateStore } from "./providerStore";
-import {
-  providerFormCreate,
-  providerFormUpdate,
-  providerConfigCreateFooter,
-  providerConfigUpdateFooter,
-} from "./providerConfigCommon";
-
-export const createStoreGoogle = (
-  context,
-  { infraSettingsStore, gitCredentialStore, gitRepositoryStore }
-) => {
-  const core = providerCreateStore({
-    context,
-    defaultData: {},
-    rules: {},
-    infraSettingsStore,
-    gitCredentialStore,
-    gitRepositoryStore,
-  });
-
-  const store = observable({
-    fileName: "",
-    content: {},
-    buildPayload: () => ({
-      providerType: "google",
-      providerName: "google",
-      providerAuth: { credentials: store.content },
-    }),
-    get isDisabled() {
-      return !store.content.project_id;
-    },
-    onChangeFile: (event) => {
-      const file = event.target.files[0];
-      if (file) {
-        store.fileName = file.name;
-        const reader = new FileReader();
-        reader.readAsText(file);
-        reader.onload = () => {
-          try {
-            store.content = JSON.parse(reader.result);
-          } catch (error) {
-            //TODO display error
-            store.error = "Error parsing file";
-          }
-        };
-
-        reader.onerror = () => {
-          //TODO display error
-          console.log(reader.error);
-        };
-      } else {
-        //TODO
-        store.input = "";
-      }
-    },
-    core,
-  });
-
-  return store;
-};
-
-const credentialFile =
-  ({ theme: { palette } }) =>
-  ({ fileName, content }) =>
-    (
-      <table
-        css={css`
-          border-collapse: collapse;
-          td,
-          th {
-            border: 1px solid ${palette.grey[500]};
-            padding: 0.5rem;
-            text-align: left;
-          }
-        `}
-      >
-        <tbody>
-          <tr>
-            <th>Credential File</th>
-            <td>{fileName}</td>
-          </tr>
-          <tr>
-            <th>Project Name</th>
-            <td>{content.project_id}</td>
-          </tr>
-          <tr>
-            <th>Service Account</th>
-            <td>{content.client_email}</td>
-          </tr>
-        </tbody>
-      </table>
-    );
-
-const fileInputLabel =
-  ({ tr, theme: { palette } }) =>
-  ({}) =>
-    (
-      <div
-        css={[
-          css`
-            display: flex;
-            align-items: center;
-            flex-direction: column;
-            color: ${palette.text.primary};
-            > * {
-              margin: 1rem;
-            }
-            svg {
-              height: 2rem;
-              path {
-                fill: ${palette.text.primary};
-              }
-            }
-          `,
-        ]}
-      >
-        <img src={IconUpload} alt="upload" />
-        <span>{tr.t("Choose a credential file to upload")}</span>
-      </div>
-    );
-
-export const gcpFormCreate = (context) => {
-  const { tr } = context;
-  const FormCreate = providerFormCreate(context);
-
-  const FileInput = fileInput(context);
-  const CredentialFile = credentialFile(context);
-  const FileInputLabel = fileInputLabel(context);
-  const Footer = providerConfigCreateFooter(context);
-
-  return observer(({ store }) => (
-    <FormCreate>
-      <main>
-        <p>
-          GruCloud requires a read-only service account to scan a project's
-          architecture. Please select the service account credential JSON file
-          for the project that will be scanned. Follow the following steps to
-          create and upload this file.
-        </p>
-        <ol
-          css={css`
-            > li {
-              padding: 0.3rem 0;
-            }
-          `}
-        >
-          <li>
-            <span>Visit the </span>
-            <a
-              href="https://console.cloud.google.com/iam-admin/serviceaccounts"
-              target="_blank"
-            >
-              service account page
-            </a>{" "}
-            on the google cloud console
-          </li>
-          <li>Select your project</li>
-          <li>
-            Click on <em>CREATE SERVICE ACCOUNT</em>
-          </li>
-          <li>
-            Set the <em>Service account name</em> to 'grucloud' for instance
-          </li>
-          <li>
-            Click on <em>CREATE</em>
-          </li>
-          <li>Select the basic role 'Viewer'</li>
-          <li>
-            Click on <em>CONTINUE</em>
-          </li>
-          <li>
-            Click on <em>DONE</em>
-          </li>
-          <li>
-            Go to the <em>Actions</em> column, click on the three dot icon of
-            the newly created service account
-          </li>
-          <li>
-            Click on <em>Manage keys</em>
-          </li>
-          <li>
-            Click on <em>ADD KEYS</em>, then <em>Create new key</em>
-          </li>
-          <li>
-            Click on <em>CREATE</em> to download the credential file in JSON
-            format.
-          </li>
-        </ol>
-        <FileInput
-          data-input-google-upload
-          cssOverride={css`
-            .filename-display {
-              display: none;
-            }
-          `}
-          component={<FileInputLabel />}
-          name="file"
-          accept="application/JSON"
-          onChange={(evt) => store.onChangeFile(evt)}
-        />
-
-        {!store.isDisabled && (
-          <CredentialFile fileName={store.fileName} content={store.content} />
-        )}
-      </main>
-      <Footer store={store} />
-    </FormCreate>
-  ));
-};
-
-export const gcpFormEdit = (context) => {
-  const { tr } = context;
-  const FormUpdate = providerFormUpdate(context);
-  const FormGroup = formGroup(context);
-  const FileInput = fileInput(context);
-  const Input = input(context, {
-    cssOverride: css`
-      input {
-        width: 25rem;
-      }
-    `,
-  });
-  const CredentialFile = credentialFile(context);
-  const FileInputLabel = fileInputLabel(context);
-  const Footer = providerConfigUpdateFooter(context);
-
-  return observer(({ store, infraSettingsStore }) => (
-    <FormUpdate>
-      <header>
-        <h2>{tr.t("Update GCP Infrastructure")}</h2>
-      </header>
-      <main>
-        <FormGroup>
-          <Input
-            value={store.core.data.name}
-            disabled={true}
-            label={tr.t("Infrastrucure Name")}
-          />
-        </FormGroup>
-        <FileInput
-          data-input-google-upload
-          cssOverride={css`
-            .filename-display {
-              display: none;
-            }
-          `}
-          component={<FileInputLabel />}
-          name="file"
-          accept="application/JSON"
-          onChange={(evt) => store.onChangeFile(evt)}
-        />
-
-        {!store.isDisabled && (
-          <CredentialFile fileName={store.fileName} content={store.content} />
-        )}
-      </main>
-      <Footer store={store} infraSettingsStore={infraSettingsStore} />
-    </FormUpdate>
-  ));
-};
diff --git a/client/src/app_infra/infra/gitCredentialConfig.js b/client/src/app_infra/infra/gitCredentialConfig.js
deleted file mode 100644
index 96dc2557..00000000
--- a/client/src/app_infra/infra/gitCredentialConfig.js
+++ /dev/null
@@ -1,249 +0,0 @@
-/** @jsxImportSource @emotion/react */
-import { css } from "@emotion/react";
-import { observable, action } from "mobx";
-import { observer } from "mobx-react";
-import { get, or, pipe, tap, switchCase, tryCatch } from "rubico";
-import { isEmpty, size, first, defaultsDeep } from "rubico/x";
-import validate from "validate.js";
-
-import AsyncOp from "mdlean/lib/utils/asyncOp";
-import button from "mdlean/lib/button";
-import input from "mdlean/lib/input";
-import formGroup from "mdlean/lib/formGroup";
-import spinner from "mdlean/lib/spinner";
-import { buttonWizardBack, buttonHistoryBack } from "./wizardCreate";
-import form from "components/form";
-
-const rules = {
-  username: {
-    presence: true,
-    length: {
-      minimum: 2,
-      message: "must be at least 2 characters",
-    },
-  },
-  password: {
-    presence: true,
-    length: {
-      minimum: 6,
-      message: "must be at least 6 characters",
-    },
-  },
-};
-
-export const gitCredentialCreateStore = ({ context, infraSettingsStore }) => {
-  const { tr, history, alertStack, rest, emitter } = context;
-  const asyncOpCreate = AsyncOp(context);
-
-  const defaultData = {
-    username: "",
-    password: "",
-  };
-
-  const store = observable({
-    id: undefined,
-    data: defaultData,
-    errors: {},
-    setErrors: action((errors) => {
-      store.errors = errors;
-    }),
-    setData: action((data = {}) => {
-      store.data = defaultsDeep(defaultData)(data);
-    }),
-    onChange: action((field, event) => {
-      store.errors = {};
-      store.data[field] = event.target.value;
-    }),
-    opSave: asyncOpCreate((payload) => rest.post(`git_credential`, payload)),
-    opUpdate: asyncOpCreate((payload) =>
-      rest.patch(`git_credential/${store.data.id}`, payload)
-    ),
-    opGetAll: asyncOpCreate(() => rest.get(`git_credential`)),
-    getAll: action(
-      pipe([
-        () => store.opGetAll.fetch(),
-        tap((result) => {
-          console.log("getAll result", result);
-        }),
-        first,
-        //TODO check if empty
-        tap((result) => {
-          store.setData(result);
-        }),
-      ])
-    ),
-    get defaultCredential() {
-      return first(store.opGetAll.data);
-    },
-    get isSaving() {
-      return store.opSave.loading;
-    },
-    get isDisabled() {
-      return or([
-        pipe([get("username"), isEmpty]),
-        pipe([get("password"), isEmpty]),
-      ])(store.data);
-    },
-    validate: action(async ({ data }) => {
-      store.setErrors({});
-      const vErrors = validate(data, rules);
-      if (vErrors) {
-        store.setErrors(vErrors);
-        return false;
-      } else {
-        return true;
-      }
-    }),
-    save: action(
-      pipe([
-        tap(() => {
-          console.log("save", store.data);
-        }),
-        switchCase([
-          () => store.validate(store),
-          tryCatch(
-            pipe([
-              switchCase([
-                () => isEmpty(store.data.id),
-                () => store.create(store.data),
-                () => store.update(store.data),
-              ]),
-              tap(() => {
-                emitter.emit("step.next");
-              }),
-            ]),
-            (error) => {
-              console.error("save error", error);
-            }
-          ),
-          () => undefined,
-        ]),
-      ])
-    ),
-    create: action(
-      pipe([
-        tap((data) => {
-          console.log("create ", data);
-        }),
-        (data) => store.opSave.fetch(data),
-        tap(({ id }) => {
-          console.log("created ", id);
-        }),
-        tap(({ id }) => {
-          store.id = id;
-        }),
-      ])
-    ),
-    update: action(
-      pipe([
-        tap((data) => {
-          console.log("update ", data);
-          store.id = store.data.id;
-        }),
-        (data) => store.opUpdate.fetch(data),
-        tap((result) => {
-          console.log("updated ", result);
-        }),
-      ])
-    ),
-    skip: () => {
-      emitter.emit("step.select", "Configuration");
-    },
-  });
-
-  return store;
-};
-
-export const gitCredentialFormContent = (context) => {
-  const {
-    tr,
-    theme: { palette },
-  } = context;
-  const FormGroup = formGroup(context);
-  const Input = input(context, {
-    cssOverride: css`
-      > input {
-        width: 400px;
-      }
-    `,
-  });
-
-  return observer(({ store }) => (
-    <>
-      <FormGroup>
-        <Input
-          name="gitUsername"
-          value={store.data.username}
-          onChange={(event) => store.onChange("username", event)}
-          label={tr.t("Git username")}
-          error={get("username[0]")(store.errors)}
-        />
-      </FormGroup>
-      <FormGroup>
-        <Input
-          name="gitPassword"
-          value={store.data.password}
-          onChange={(event) => store.onChange("password", event)}
-          label={tr.t("Git password or Personnal access code")}
-          error={get("password[0]")(store.errors)}
-          type="password"
-        />
-      </FormGroup>
-    </>
-  ));
-};
-
-export const gitCredentialConfig = (context) => {
-  const {
-    tr,
-    theme: { palette },
-    emitter,
-  } = context;
-  const Form = form(context);
-  const Spinner = spinner(context);
-  const Button = button(context);
-  const ButtonHistoryBack = buttonHistoryBack(context);
-  const GitCredentialFormContent = gitCredentialFormContent(context);
-
-  return observer(({ store }) => (
-    <Form
-      data-form-git-credential-config
-      css={css`
-        display: flex;
-        flex-direction: column;
-        align-items: flex-start;
-        margin: 0.5rem;
-      `}
-    >
-      <header>
-        <h2>{tr.t("Git Credential")}</h2>
-      </header>
-      <main>
-        <p>
-          The project template, resources inventory and generated code will be
-          stored on your source code git repository.
-        </p>
-        <GitCredentialFormContent store={store} />
-      </main>
-      <footer>
-        <ButtonHistoryBack />
-        <Button
-          data-button-skip
-          disabled={store.isSaving}
-          onClick={() => store.skip()}
-          label={tr.t("Skip")}
-        />
-        <Button
-          data-button-submit
-          primary
-          raised
-          disabled={store.isSaving || store.isDisabled}
-          onClick={() => store.save()}
-          label={tr.t("Next")}
-        />
-
-        <Spinner visibility={store.isSaving} color={palette.primary.main} />
-      </footer>
-    </Form>
-  ));
-};
diff --git a/client/src/app_infra/infra/gitRepositoryConfig.js b/client/src/app_infra/infra/gitRepositoryConfig.js
deleted file mode 100644
index 10c3868f..00000000
--- a/client/src/app_infra/infra/gitRepositoryConfig.js
+++ /dev/null
@@ -1,233 +0,0 @@
-/** @jsxImportSource @emotion/react */
-import { css } from "@emotion/react";
-import { observable, action } from "mobx";
-import { observer } from "mobx-react";
-import { get, or, pipe, tap, switchCase, tryCatch, eq } from "rubico";
-import { isEmpty } from "rubico/x";
-import validate from "validate.js";
-
-import AsyncOp from "mdlean/lib/utils/asyncOp";
-import button from "mdlean/lib/button";
-import input from "mdlean/lib/input";
-import formGroup from "mdlean/lib/formGroup";
-import spinner from "mdlean/lib/spinner";
-import { buttonWizardBack } from "./wizardCreate";
-import form from "components/form";
-import alertAxios from "mdlean/lib/alertAjax";
-
-// TODO delete
-const rules = {
-  url: {
-    presence: true,
-    length: {
-      minimum: 2,
-      message: "must be at least 2 characters",
-    },
-  },
-  branch: {
-    presence: true,
-    length: {
-      minimum: 1,
-      message: "must be at least 6 characters",
-    },
-  },
-};
-
-export const repositoryCreateStore = ({
-  context,
-  infraSettingsStore,
-  gitCredentialStore,
-}) => {
-  const { tr, history, alertStack, rest, emitter } = context;
-  const asyncOpCreate = AsyncOp(context);
-  const AlertAxios = alertAxios(context);
-
-  const defaultData = {
-    url: "",
-    branch: "master",
-  };
-
-  const store = observable({
-    id: undefined,
-    data: defaultData,
-    errors: {},
-    setError: action((error) => {
-      store.errors = error;
-    }),
-    setData: action((data) => {
-      store.data = data;
-    }),
-    onChange: action((field, event) => {
-      store.errors = {};
-      store.data[field] = event.target.value;
-    }),
-    opSaveGitConfig: asyncOpCreate((gitConfig) =>
-      rest.post(`git_repository`, gitConfig)
-    ),
-    opPatchInfra: asyncOpCreate(
-      pipe([
-        ({ id }) => ({
-          id: infraSettingsStore.id,
-          git_credential_id: gitCredentialStore.id,
-          git_repository_id: id,
-        }),
-        tap((payload) => {
-          console.log("patch infra ", infraSettingsStore.id, payload);
-        }),
-        (payload) => rest.patch(`infra/${infraSettingsStore.id}`, payload),
-      ])
-    ),
-    opPushCode: asyncOpCreate(() =>
-      rest.post(`infra/${infraSettingsStore.id}/push_code`)
-    ),
-    get isSaving() {
-      return or([
-        get("opSaveGitConfig.loading"),
-        get("opPatchInfra.loading"),
-        get("opPushCode.loading"),
-      ])(store);
-    },
-    get isDisabled() {
-      return or([pipe([get("url"), isEmpty])])(store.data);
-    },
-    validate: action(async ({ data }) => {
-      store.errors = {};
-      const vErrors = validate(data, rules);
-      if (vErrors) {
-        store.errors = vErrors;
-        return false;
-      } else {
-        return true;
-      }
-    }),
-    save: action(async () =>
-      pipe([
-        tap(() => {
-          console.log("save", store.data);
-        }),
-        switchCase([
-          () => store.validate({ data: store.data }),
-          tryCatch(
-            pipe([
-              () => store.opSaveGitConfig.fetch(store.data),
-              tap(({ id }) => {
-                store.id = id;
-              }),
-              tap(({ id }) => store.opPatchInfra.fetch({ id })),
-              tap(() => store.opPushCode.fetch()),
-              tap(() => {
-                emitter.emit("step.next");
-              }),
-            ]),
-            (error) =>
-              pipe([
-                tap(() => {
-                  //console.error("save", error);
-                }),
-                () => error,
-                switchCase([
-                  eq(get("response.data.code"), "UrlParseError"),
-                  () => {
-                    store.setError({ url: [error.response.data.message] });
-                  },
-                  eq(get("response.data.data.statusCode"), 404),
-                  () => {
-                    store.setError({
-                      url: [error.response.data.data.statusMessage],
-                    });
-                  },
-                  eq(get("response.data.data.statusCode"), 401),
-                  () => {
-                    gitCredentialStore.setErrors({
-                      username: [error.response.data.data.response],
-                      password: [error.response.data.data.response],
-                    });
-                    emitter.emit("step.previous");
-                  },
-                  tap(() => {
-                    console.error("save error.response", error.response);
-                    alertStack.add(<AlertAxios error={error} />);
-                  }),
-                ]),
-              ])()
-          ),
-          () => undefined,
-        ]),
-      ])()
-    ),
-  });
-
-  return store;
-};
-
-export const repositoryConfig = (context) => {
-  const {
-    tr,
-    theme: { palette },
-  } = context;
-  const Form = form(context);
-  const Spinner = spinner(context);
-  const Button = button(context);
-  const FormGroup = formGroup(context);
-  const Input = input(context, {
-    cssOverride: css`
-      > input {
-        width: 500px;
-      }
-    `,
-  });
-  const ButtonWizardBack = buttonWizardBack(context);
-
-  return observer(({ store }) => (
-    <Form
-      data-form-repository-config
-      css={css`
-        display: flex;
-        flex-direction: column;
-        align-items: flex-start;
-        margin: 0.5rem;
-      `}
-    >
-      <header>
-        <h2>{tr.t("Git Repository Settings")}</h2>
-      </header>
-      <main>
-        <p>
-          The resources inventory and generated code are stored on your source
-          code git repository.
-        </p>
-        <FormGroup>
-          <Input
-            autoFocus
-            name="repositoryUrl"
-            value={store.data.url}
-            onChange={(event) => store.onChange("url", event)}
-            label={tr.t("Git Repository URL")}
-            error={get("url[0]")(store.errors)}
-          />
-        </FormGroup>
-        <FormGroup>
-          <Input
-            name="repositoryBranch"
-            value={store.data.branch}
-            onChange={(event) => store.onChange("branch", event)}
-            label={tr.t("Git Branch")}
-            error={get("branch[0]")(store.errors)}
-          />
-        </FormGroup>
-      </main>
-      <footer>
-        <ButtonWizardBack />
-        <Button
-          data-button-submit
-          primary
-          raised
-          disabled={store.isSaving || store.isDisabled}
-          onClick={() => store.save({ data: store.data })}
-          label={tr.t("Next")}
-        />
-        <Spinner visibility={store.isSaving} color={palette.primary.main} />
-      </footer>
-    </Form>
-  ));
-};
diff --git a/client/src/app_infra/infra/importProjectForm.js b/client/src/app_infra/infra/importProjectForm.js
deleted file mode 100644
index 69d363f6..00000000
--- a/client/src/app_infra/infra/importProjectForm.js
+++ /dev/null
@@ -1,216 +0,0 @@
-/** @jsxImportSource @emotion/react */
-import { css } from "@emotion/react";
-import { observable, action } from "mobx";
-import { observer } from "mobx-react";
-import { get, or, pipe } from "rubico";
-import { isEmpty } from "rubico/x";
-import validate from "validate.js";
-import modal from "mdlean/lib/modal";
-import AsyncOp from "mdlean/lib/utils/asyncOp";
-import button from "mdlean/lib/button";
-import input from "mdlean/lib/input";
-import formGroup from "mdlean/lib/formGroup";
-import spinner from "mdlean/lib/spinner";
-import { list, listItem } from "mdlean/lib/list";
-import { buttonHistoryBack } from "./wizardCreate";
-import form from "components/form";
-import { PROJECTS } from "./projectList";
-
-const projectId = (project) => `${project.url}${project.directory}`;
-
-const projectItem = (context) => {
-  const ListItem = listItem(context);
-  const ProjectItem = ({ item, store, ...leftOver }) => (
-    <ListItem onClick={() => store.onSelectProject(item)} {...leftOver} raised>
-      <h3>{item.title}</h3>
-      <p>{item.description}</p>
-    </ListItem>
-  );
-  return ProjectItem;
-};
-
-const importTypeItem = (context) => {
-  const ListItem = listItem(context);
-  const ImportTypeItem = ({ item, onClick, ...leftOver }) => (
-    <ListItem {...leftOver} onClick={() => onClick(item)} raised>
-      <h3>{item.title}</h3>
-      <p>{item.description}</p>
-    </ListItem>
-  );
-  return ImportTypeItem;
-};
-
-export const importProjectCreateStore = (context) => {
-  const { emitter } = context;
-
-  const store = observable({
-    project: {},
-    modalOpenNewProjectFromTemplate: false,
-    showNewProjectFromTemplate: action((show) => {
-      store.modalOpenNewProjectFromTemplate = show;
-    }),
-    onSelectProject: (project) => {
-      store.modalOpenNewProjectFromTemplate = false;
-      store.project = project;
-      emitter.emit("step.next");
-    },
-    modalImportFromCloud: false,
-    showImportFromCloud: action((show) => {
-      store.modalImportFromCloud = show;
-    }),
-    selectImportFormCloud: action((project) => {
-      store.modalOpenNewProjectFromTemplate = false;
-      emitter.emit("step.next", { pippo: "pippo" });
-    }),
-  });
-
-  return store;
-};
-
-const modalNewFromTemplate = (context) => {
-  const Modal = modal(context);
-  const Button = button(context);
-  const List = list(context);
-  const ProjectItem = projectItem(context);
-
-  return observer(({ store, projects = [] }) => (
-    <Modal
-      open={store.modalOpenNewProjectFromTemplate}
-      onClose={() => {
-        store.showNewProjectFromTemplate(false);
-      }}
-    >
-      <header>New infrastructure from a template</header>
-      <main
-        css={css`
-          margin: 1rem;
-        `}
-      >
-        <p>Select an infrastructure template from the list below.</p>
-        <ul
-          css={css`
-            > li {
-              margin: 1rem 0;
-            }
-          `}
-        >
-          <List
-            items={projects}
-            toId={({ item }) => projectId(item)}
-            itemRenderer={ProjectItem}
-            store={store}
-          />
-        </ul>
-      </main>
-      <footer>
-        <Button onClick={() => store.showNewProjectFromTemplate(false)}>
-          Cancel
-        </Button>
-      </footer>
-    </Modal>
-  ));
-};
-
-const modalImportFromCloud = (context) => {
-  const Modal = modal(context);
-  const Button = button(context);
-
-  return observer(({ store }) => (
-    <Modal
-      css={css`
-        border: 1px red solid;
-      `}
-      open={store.modalImportFromCloud}
-      onClose={() => {
-        store.showNewProjectFromTemplate(false);
-      }}
-    >
-      <header>Import from Cloud</header>
-      <main
-        css={css`
-          border: 1px red solid;
-        `}
-      >
-        TODO
-      </main>
-      <footer>
-        <Button onClick={() => store.showImportFromCloud(false)}>Cancel</Button>
-      </footer>
-    </Modal>
-  ));
-};
-
-export const importProjectForm = (context) => {
-  const { tr, theme, emitter } = context;
-  const ImportTypeItem = importTypeItem(context);
-  const Form = form(context);
-  const ButtonHistoryBack = buttonHistoryBack(context);
-  const ModalNewFromTemplate = modalNewFromTemplate(context);
-  const ModalImportFromCloud = modalImportFromCloud(context);
-
-  return observer(({ store, storeProvider }) => (
-    <Form
-      data-form-import-project
-      css={css`
-        display: flex;
-        flex-direction: column;
-        align-items: flex-start;
-        margin: 0.5rem;
-      `}
-    >
-      <ModalNewFromTemplate
-        store={store}
-        projects={PROJECTS[storeProvider.data.providerName]}
-      />
-      <ModalImportFromCloud store={store} />
-
-      <header>
-        <h2>{tr.t("Import Project")}</h2>
-      </header>
-      <main>
-        <div
-          css={css`
-            display: flex;
-            flex-direction: column;
-            > button {
-              margin: 1rem 0;
-            }
-          `}
-        >
-          <ImportTypeItem
-            data-selection-project-import-existing
-            item={{
-              title: tr.t("Import an existing infrastructure"),
-              description:
-                "Choose this option to visualize an existing infrastructure.",
-            }}
-            onClick={() => emitter.emit("step.next")}
-          />
-          <ImportTypeItem
-            data-selection-project-new-from-template
-            item={{
-              title: tr.t("Create new infrastructure from a template"),
-              description:
-                "This option lets you create an infrastructure from a selection of ready made template.",
-            }}
-            onClick={() => store.showNewProjectFromTemplate(true)}
-          />
-          {storeProvider.supportImport && (
-            <ImportTypeItem
-              data-selection-project-import-from-cloud
-              item={{
-                title: tr.t("Import from an OpenStack Cloud Provider"),
-                description:
-                  "Do you have an existing infrastructure on a cloud provider supporting the OpenStack API such as Red Hat, OVH, IBM etc...? Would you like to migrate this infractstructure ?  The new infrastructure code will be generated from your current inventory.",
-              }}
-              onClick={() => store.showImportFromCloud(true)}
-            />
-          )}
-        </div>
-      </main>
-      <footer>
-        <ButtonHistoryBack />
-      </footer>
-    </Form>
-  ));
-};
diff --git a/client/src/app_infra/infra/index.js b/client/src/app_infra/infra/index.js
deleted file mode 100644
index e4c3431d..00000000
--- a/client/src/app_infra/infra/index.js
+++ /dev/null
@@ -1,2 +0,0 @@
-import wizard from "./wizard";
-export default wizard;
diff --git a/client/src/app_infra/infra/infraDelete.js b/client/src/app_infra/infra/infraDelete.js
deleted file mode 100644
index 445a96b5..00000000
--- a/client/src/app_infra/infra/infraDelete.js
+++ /dev/null
@@ -1,76 +0,0 @@
-/* @jsxImportSource @emotion/react */
-import { css } from "@emotion/react";
-import { observer } from "mobx-react";
-
-import button from "mdlean/lib/button";
-import formGroup from "mdlean/lib/formGroup";
-import input from "mdlean/lib/input";
-
-import createForm from "components/form";
-
-export const createInfraDelete = (context) => {
-  const { tr, history } = context;
-  const Form = createForm(context);
-  const FormGroup = formGroup(context);
-  const Input = input(context, {
-    cssOverride: css`
-      > input {
-        width: 300px;
-      }
-    `,
-  });
-  const Button = button(context, {
-    cssOverride: css``,
-  });
-
-  const InfraDeleteForm = ({ store }) => (
-    <Form data-infra-delete>
-      <header>
-        <h2>Delete Infrastructure</h2>
-      </header>
-      {/* <pre
-        css={css`
-          width: 300px;
-        `}
-      >
-        {JSON.stringify(store, null, 4)}
-      </pre> */}
-      <main>
-        <div>
-          To prevent accidental deletion, please type the name of the
-          infrastructure to destroy:
-          <pre
-            css={css`
-              color: red;
-            `}
-          >
-            {store.data.name}
-          </pre>
-        </div>
-        <FormGroup data-delete-name>
-          <Input
-            data-delete-name
-            value={store.name}
-            onChange={(e) => {
-              store.setName(e.target.value);
-            }}
-            label={tr.t(`Type ${store.data.name}`)}
-            error={store.errors.name && store.errors.name[0]}
-          />
-        </FormGroup>
-      </main>
-      <footer>
-        <Button
-          data-infra-button-delete
-          primary
-          raised
-          disabled={!store.nameMatch}
-          onClick={() => store.destroy({})}
-          label={tr.t("Delete Infrastructure")}
-        />
-        <Button onClick={() => history.back()} label={tr.t("Cancel")} />
-      </footer>
-    </Form>
-  );
-  return observer(InfraDeleteForm);
-};
diff --git a/client/src/app_infra/infra/infraDeleteLink.js b/client/src/app_infra/infra/infraDeleteLink.js
deleted file mode 100644
index d5ae8d44..00000000
--- a/client/src/app_infra/infra/infraDeleteLink.js
+++ /dev/null
@@ -1,33 +0,0 @@
-/* @jsxImportSource @emotion/react */
-import { css } from "@emotion/react";
-import { toJS } from "mobx";
-import { observer } from "mobx-react";
-
-export const infraDeleteLink = ({ history }) =>
-  observer(({ store, infraSettingsStore }) => (
-    <p>
-      {/* <pre
-        css={css`
-          width: 300px;
-        `}
-      >
-        {JSON.stringify(infraSettingsStore.data, null, 4)}
-      </pre> */}
-      <a
-        data-infra-edit-delete-link
-        css={css`
-          color: red;
-          cursor: pointer;
-          text-decoration: underline;
-        `}
-        onClick={() => {
-          history.push(`/infra/detail/${store.id}/delete`, {
-            id: store.id,
-            ...toJS(infraSettingsStore.data),
-          });
-        }}
-      >
-        Danger zone...
-      </a>
-    </p>
-  ));
diff --git a/client/src/app_infra/infra/infraDetail.js b/client/src/app_infra/infra/infraDetail.js
deleted file mode 100644
index cb038a2f..00000000
--- a/client/src/app_infra/infra/infraDetail.js
+++ /dev/null
@@ -1,185 +0,0 @@
-/* @jsxImportSource @emotion/react */
-import { css } from "@emotion/react";
-import { observer } from "mobx-react";
-import { get, eq, pipe, flatMap, fork, switchCase, pick, tap } from "rubico";
-import { size, isEmpty } from "rubico/x";
-import { MdEdit } from "react-icons/md";
-import formatDistance from "date-fns/formatDistance";
-
-import button from "mdlean/lib/button";
-
-import createForm from "components/form";
-import spinner from "mdlean/lib/spinner";
-import screenLoader from "components/screenLoader";
-
-import badgeRegion from "./badgeRegion";
-import providerLogo from "./providerLogo";
-import createResourcePerTypeTable from "./resourceTable";
-
-const createInfraDetail = (context) => {
-  const {
-    tr,
-    history,
-    theme: { palette },
-  } = context;
-  const Form = createForm(context);
-  const BadgeRegion = badgeRegion(context);
-  const ProviderLogo = providerLogo(context);
-  const Spinner = spinner(context);
-  const Button = button(context, {
-    cssOverride: css``,
-  });
-  const ResourcePerTypeTable = createResourcePerTypeTable(context);
-  const ScreenLoader = screenLoader(context);
-  const InfraDetailContainer = observer(({ store }) => (
-    <div>
-      {store.opGetById.data ? (
-        <InfraDetail store={store} detail={store.opGetById.data} />
-      ) : null}
-      <ScreenLoader loading={store.opGetById.loading} />
-    </div>
-  ));
-  const ScanLastUpdated = ({ updatedAt }) => (
-    <div
-      title={updatedAt}
-      css={css`
-        color: ${palette.grey[500]};
-        > div {
-          margin: 0.4rem 0;
-        }
-      `}
-    >
-      <div
-        css={css`
-          font-weight: 700;
-          font-size: 0.7rem;
-          text-transform: uppercase;
-        `}
-      >
-        Last Scan
-      </div>
-      <div
-        css={css`
-          font-weight: 500;
-          font-size: 0.9rem;
-        `}
-      >{`${
-        updatedAt && formatDistance(new Date(updatedAt), new Date())
-      } ago`}</div>
-    </div>
-  );
-
-  const InfraDetail = observer(({ store, detail }) => (
-    <Form
-      data-infra-detail
-      cssOverride={css`
-        width: 100%;
-        display: flex;
-        flex-direction: row;
-      `}
-    >
-      <section
-        css={css`
-          margin-right: 1rem;
-        `}
-      >
-        <header
-          css={css`
-            display: flex;
-            flex-direction: row;
-          `}
-        >
-          <h2>{detail.name}</h2>
-          <Button
-            data-infra-edit-button
-            icon={<MdEdit size="1.5rem" />}
-            onClick={() => {
-              const state = {
-                id: detail.id,
-                name: detail.name,
-                providerType: detail.providerType,
-                providerName: detail.providerName,
-                providerAuth: {
-                  ...detail.providerAuth,
-                  credentials: { ...detail.providerAuth?.credentials },
-                },
-              };
-              history.push(
-                `${detail.id}/${
-                  detail.providerName || detail.providerType
-                }/edit`,
-                state
-              );
-            }}
-          />
-        </header>
-        <div
-          css={css`
-            display: flex;
-            justify-content: space-between;
-          `}
-        >
-          <ProviderLogo name={detail.providerName || detail.providerType} />
-          {detail.providerAuth?.AWS_REGION && (
-            <BadgeRegion region={detail.providerAuth.AWS_REGION} />
-          )}
-        </div>
-        <div
-          css={css`
-            margin: 1rem 0rem 1rem 0rem;
-            display: flex;
-            flex-direction: row;
-            align-items: center;
-          `}
-        >
-          <Button
-            primary
-            raised
-            onClick={() => store.scan(detail)}
-            disabled={store.opScan.loading}
-            label={store.opScan.loading ? tr.t("Scanning") : tr.t("New Scan")}
-          />
-          <Spinner
-            visibility={store.opScan.loading}
-            color={palette.primary.main}
-          />
-        </div>
-        <ScanLastUpdated updatedAt={get("Jobs[0].updatedAt")(detail)} />
-        <div
-          css={css`
-            margin: 1rem 0rem 1rem 0rem;
-          `}
-        >
-          {detail.gitRepository && (
-            <Button
-              target="_blank"
-              href={detail.gitRepository.url}
-              label="Open GitHub"
-            />
-          )}
-        </div>
-        {store.lives && <ResourcePerTypeTable lives={store.lives} />}
-      </section>
-      <section
-        css={css`
-          display: flex;
-        `}
-      >
-        <span
-          css={css`
-            svg {
-              //height: 800px;
-            }
-          `}
-          dangerouslySetInnerHTML={{
-            __html: store.svg,
-          }}
-        />
-      </section>
-    </Form>
-  ));
-
-  return InfraDetailContainer;
-};
-
-export default createInfraDetail;
diff --git a/client/src/app_infra/infra/infraList.js b/client/src/app_infra/infra/infraList.js
deleted file mode 100644
index 1f0c411c..00000000
--- a/client/src/app_infra/infra/infraList.js
+++ /dev/null
@@ -1,185 +0,0 @@
-/* @jsxImportSource @emotion/react */
-import { css } from "@emotion/react";
-import { observer } from "mobx-react";
-import { get, eq, pipe, flatMap, fork, switchCase, pick, tap } from "rubico";
-import { size, isEmpty } from "rubico/x";
-
-import button from "mdlean/lib/button";
-
-import createForm from "components/form";
-import page from "components/Page";
-import screenLoader from "components/screenLoader";
-import badgeRegion from "./badgeRegion";
-import providerLogo from "./providerLogo";
-
-const getLivesFromJob = get("result.list.result.results[0].results");
-
-const resourceStats = pipe([
-  getLivesFromJob,
-  fork({ types: size, resources: pipe([flatMap(get("resources")), size]) }),
-  tap((xx) => {}),
-]);
-
-const createInfraItem = (context) => {
-  const { tr, history, rest, theme } = context;
-
-  const { palette } = theme;
-  const BadgeRegion = badgeRegion(context);
-  const ProviderLogo = providerLogo(context);
-  const ResourceStat = ({ stats }) => (
-    <div
-      css={css`
-        display: flex;
-        flex-direction: column;
-        font-size: 1.3rem;
-        font-weight: 600;
-        > span {
-          margin: 0.3rem;
-        }
-      `}
-    >
-      <Label title="Resources" />
-      <div>{stats.resources}</div>
-    </div>
-  );
-
-  const Label = ({ title }) => (
-    <div
-      css={css`
-        font-size: 1rem;
-        font-weight: 600;
-        color: ${palette.grey[600]};
-        margin-bottom: 0.6rem;
-      `}
-    >
-      {title}
-    </div>
-  );
-  const ProjectName = ({ name }) => (
-    <div
-      css={css`
-        display: flex;
-        flex-direction: column;
-        white-space: nowrap;
-        min-width: 15rem;
-      `}
-    >
-      <Label title="Project Name" />
-      <div
-        css={css`
-          font-size: 1.5rem;
-          font-weight: 600;
-        `}
-      >
-        {name}
-      </div>
-    </div>
-  );
-  const InfraItem = ({ item, store, onClick }) => {
-    return (
-      <li
-        data-infra-list-item
-        data-infra-list-item-name={item.name}
-        css={css`
-          box-shadow: ${theme.shadows[1]};
-          cursor: pointer;
-          display: flex;
-          align-items: center;
-          > * {
-            margin: 1rem;
-          }
-        `}
-        onClick={(event) => {
-          onClick(item);
-        }}
-      >
-        <ProjectName name={item.name} />
-        {item.Jobs[0] && <ResourceStat stats={resourceStats(item.Jobs[0])} />}
-        <ProviderLogo name={item.providerName || item.providerType} />
-        {item.providerAuth?.AWS_REGION && (
-          <BadgeRegion region={item.providerAuth.AWS_REGION} />
-        )}
-      </li>
-    );
-  };
-  return observer(InfraItem);
-};
-
-export const createInfraList = (context) => {
-  const { tr, history } = context;
-  const Form = createForm(context);
-  const Page = page(context);
-  const Button = button(context, {
-    cssOverride: css`
-      width: 256px;
-    `,
-  });
-  const ScreenLoader = screenLoader(context);
-
-  const InfraItem = createInfraItem(context);
-
-  const InfraListView = observer(({ store, items }) => (
-    <Form
-      data-infra-list
-      cssOverride={css`
-        //border: 1px solid red;
-        width: 95%;
-      `}
-    >
-      <header
-        css={css`
-          display: flex;
-          justify-content: space-between;
-          align-items: center;
-          > h2 {
-            margin-right: 2rem;
-          }
-        `}
-      >
-        <h2>Your Infrastructures</h2>
-        <Button
-          primary
-          raised
-          onClick={() => history.push(`/infra/create`)}
-          label={tr.t("+ New Infrastructure")}
-        />
-      </header>
-      <ul
-        css={css`
-          display: inline-grid;
-          justify-content: space-around;
-          align-items: center;
-          > * {
-            margin: 1rem;
-          }
-        `}
-      >
-        {Array.isArray(items) &&
-          items.map((item) => (
-            <InfraItem
-              store={store}
-              item={item}
-              key={item.id}
-              onScan={(item) => store.scan(item)}
-              onClick={(item) => {
-                history.push(`/infra/detail/${item.id}`);
-              }}
-            ></InfraItem>
-          ))}
-      </ul>
-    </Form>
-  ));
-
-  const InfraListContainer = observer(({ store }) => (
-    <div>
-      {store.opGet.data && (
-        <InfraListView store={store} items={store.opGet.data} />
-      )}
-      <ScreenLoader
-        loading={store.opGet.loading}
-        message={tr.t("Loading Infrastructures")}
-      />
-    </div>
-  ));
-  return InfraListContainer;
-};
diff --git a/client/src/app_infra/infra/infraModule.js b/client/src/app_infra/infra/infraModule.js
deleted file mode 100644
index 71665ace..00000000
--- a/client/src/app_infra/infra/infraModule.js
+++ /dev/null
@@ -1,110 +0,0 @@
-/* @jsxImportSource @emotion/react */
-import { observable, action, toJS } from "mobx";
-import { get } from "rubico";
-import { isEmpty } from "rubico/x";
-
-import alert from "mdlean/lib/alert";
-import AsyncOp from "mdlean/lib/utils/asyncOp";
-import { wizardStoreCreate } from "./wizardCreate";
-
-import { createRoutes } from "./infraRoutes";
-
-const getLivesFromJob = get("result.list.result.results[0].results");
-
-export default function (context) {
-  const { rest, tr, history, alertStack, emitter } = context;
-  const asyncOpCreate = AsyncOp(context);
-  const Alert = alert(context);
-  const wizardStore = wizardStoreCreate(context);
-  function Stores() {
-    const infraStore = observable({
-      errors: {},
-      opGet: asyncOpCreate(() => rest.get("infra")),
-      get: action(async function () {
-        const response = await this.opGet.fetch();
-        if (isEmpty(response)) {
-          context.history.push("/infra/create");
-        }
-        console.log(response);
-      }),
-    });
-
-    const infraDetailStore = observable({
-      id: "",
-      lives: [],
-      svg: "",
-      opGetById: asyncOpCreate((id) => rest.get(`infra/${id}`)),
-      getById: action(async (id) => {
-        const infra = await infraDetailStore.opGetById.fetch(id);
-        infraDetailStore.lives = getLivesFromJob(infra.Jobs[0]);
-        infraDetailStore.svg = get("Jobs[0].result.svg")(infra);
-      }),
-      opScan: asyncOpCreate((infraItem) =>
-        rest.post(`cloudDiagram`, { infra_id: infraItem.id })
-      ),
-      scan: action(async (infraItem) => {
-        console.log("infraDetailStore scan", infraItem);
-        await infraDetailStore.opScan.fetch(infraItem);
-        await infraDetailStore.getById(infraItem.id);
-      }),
-    });
-
-    const storeDelete = observable({
-      name: "",
-      setName: (name) => {
-        storeDelete.name = name;
-      },
-      data: {},
-      setData: (data) => {
-        storeDelete.name = "";
-        storeDelete.data = data;
-      },
-      errors: {},
-      opDestroy: asyncOpCreate(() => rest.del(`infra/${storeDelete.data.id}`)),
-      get nameMatch() {
-        return (
-          !isEmpty(storeDelete.name) &&
-          storeDelete.name === storeDelete.data.name
-        );
-      },
-      destroy: action(async () => {
-        try {
-          await storeDelete.opDestroy.fetch();
-
-          alertStack.add(
-            <Alert
-              severity="success"
-              message={tr.t("Infrastructure Deleted")}
-            />
-          );
-          history.push("/infra");
-          emitter.emit("infra.deleted", storeDelete.data);
-        } catch (error) {
-          console.error(error);
-          alertStack.add(
-            <Alert
-              severity="error"
-              message={tr.t(
-                "An error occured while destroying the infrastructure"
-              )}
-            />
-          );
-        }
-      }),
-    });
-
-    return {
-      infra: infraStore,
-      infraDetail: infraDetailStore,
-      delete: storeDelete,
-      wizard: wizardStore,
-    };
-  }
-
-  const stores = Stores(context);
-
-  return {
-    stores: () => stores,
-    routes: () => createRoutes({ context, stores }),
-  };
-}
diff --git a/client/src/app_infra/infra/infraRoutes.js b/client/src/app_infra/infra/infraRoutes.js
deleted file mode 100644
index 6c4b0386..00000000
--- a/client/src/app_infra/infra/infraRoutes.js
+++ /dev/null
@@ -1,139 +0,0 @@
-/* @jsxImportSource @emotion/react */
-import { createElement as h } from "react";
-
-import { wizardCreate } from "./wizardCreate";
-import createInfraDetail from "./infraDetail";
-import { awsFormEdit } from "./awsConfig";
-import { gcpFormEdit } from "./gcpConfig";
-import { azureFormEdit } from "./azureConfig";
-import { ovhFormEdit } from "./ovhConfig";
-
-import { createInfraDelete } from "./infraDelete";
-import { createInfraList } from "./infraList";
-
-export const createRoutes = ({ context, stores }) => {
-  return [
-    {
-      path: "",
-      protected: true,
-      action: (routerContext) => {
-        stores.infra.get();
-        return {
-          routerContext,
-          title: "My Infra",
-          component: h(createInfraList(context), {
-            title: "Create",
-            store: stores.infra,
-          }),
-        };
-      },
-    },
-    {
-      path: "/create",
-      protected: true,
-      action: (routerContext) => {
-        return {
-          routerContext,
-          title: "Create Infrastructure",
-          component: h(wizardCreate({ context, stores }), {
-            title: "Create",
-            buttonTitle: "Create Infrastructure",
-          }),
-        };
-      },
-    },
-    {
-      path: "/detail/:id/aws/edit",
-      protected: true,
-      action: async (routerContext) => {
-        stores.wizard.infraSettingsStore.setData(window.history.state.usr);
-        stores.wizard.aws.core.setData(window.history.state.usr);
-        return {
-          routerContext,
-          title: "Edit Aws Infrastructure",
-          component: h(awsFormEdit(context), {
-            store: stores.wizard.aws,
-            infraSettingsStore: stores.wizard.infraSettingsStore,
-          }),
-        };
-      },
-    },
-    {
-      path: "/detail/:id/google/edit",
-      protected: true,
-      action: async (routerContext) => {
-        stores.wizard.infraSettingsStore.setData(window.history.state.usr);
-        stores.wizard.google.core.setData(window.history.state.usr);
-        return {
-          routerContext,
-          title: "Edit GCP Infrastructure",
-          component: h(gcpFormEdit(context), {
-            store: stores.wizard.google,
-            infraSettingsStore: stores.wizard.infraSettingsStore,
-          }),
-        };
-      },
-    },
-    {
-      path: "/detail/:id/azure/edit",
-      protected: true,
-      action: async (routerContext) => {
-        stores.wizard.infraSettingsStore.setData(window.history.state.usr);
-        stores.wizard.azure.core.setData(window.history.state.usr);
-        return {
-          routerContext,
-          title: "Edit Azure Infrastructure",
-          component: h(azureFormEdit(context), {
-            store: stores.wizard.azure,
-            infraSettingsStore: stores.wizard.infraSettingsStore,
-          }),
-        };
-      },
-    },
-    {
-      path: "/detail/:id/ovh/edit",
-      protected: true,
-      action: async (routerContext) => {
-        stores.wizard.infraSettingsStore.setData(window.history.state.usr);
-        stores.wizard.ovh.core.setData(window.history.state.usr);
-        return {
-          routerContext,
-          title: "Edit OVH Infrastructure",
-          component: h(ovhFormEdit(context), {
-            store: stores.wizard.ovh,
-            infraSettingsStore: stores.wizard.infraSettingsStore,
-          }),
-        };
-      },
-    },
-    {
-      path: "/detail/:id/delete",
-      protected: true,
-      action: (routerContext) => {
-        stores.delete.setData(window.history.state.usr);
-        return {
-          routerContext,
-          title: "Delete Infrastructure",
-          component: h(createInfraDelete(context), {
-            store: stores.delete,
-          }),
-        };
-      },
-    },
-    {
-      path: "/detail/:id",
-      protected: true,
-      action: async (routerContext) => {
-        await stores.infraDetail.getById(routerContext.params.id);
-        return {
-          routerContext,
-          title: "Infrastructure Detail",
-          component: h(createInfraDetail(context), {
-            store: stores.infraDetail,
-            detail: window.history.state.usr,
-          }),
-        };
-      },
-    },
-  ];
-};
diff --git a/client/src/app_infra/infra/infraSettings.js b/client/src/app_infra/infra/infraSettings.js
deleted file mode 100644
index 41886ccd..00000000
--- a/client/src/app_infra/infra/infraSettings.js
+++ /dev/null
@@ -1,178 +0,0 @@
-/** @jsxImportSource @emotion/react */
-import { css } from "@emotion/react";
-import { observable, action } from "mobx";
-import { observer } from "mobx-react";
-import { get, or, pipe, tap, switchCase, tryCatch } from "rubico";
-import { isEmpty } from "rubico/x";
-import validate from "validate.js";
-
-import AsyncOp from "mdlean/lib/utils/asyncOp";
-import button from "mdlean/lib/button";
-import input from "mdlean/lib/input";
-import formGroup from "mdlean/lib/formGroup";
-import spinner from "mdlean/lib/spinner";
-import createAlert from "mdlean/lib/alert";
-
-import { buttonWizardBack } from "./wizardCreate";
-import form from "components/form";
-
-const rules = {
-  name: {
-    presence: true,
-    length: {
-      minimum: 2,
-      message: "must be at least 2 characters",
-    },
-  },
-  stage: {
-    presence: true,
-    length: {
-      minimum: 2,
-      message: "must be at least 2 characters",
-    },
-  },
-};
-
-const defaultData = {
-  id: undefined,
-  name: "",
-  stage: "dev",
-};
-
-export const infraSettingsCreateStore = ({
-  context,
-  providerSelectionStore,
-  importProjectStore,
-}) => {
-  const { tr, history, alertStack, rest, emitter } = context;
-  const asyncOpCreate = AsyncOp(context);
-  const Alert = createAlert(context);
-
-  const store = observable({
-    id: undefined,
-    data: defaultData,
-    errors: {},
-    setData: action((data) => {
-      store.data = data;
-    }),
-    onChange: action((field, event) => {
-      store.data[field] = event.target.value;
-    }),
-    opSave: asyncOpCreate((params) => rest.post(`infra`, params)),
-    get isSaving() {
-      return store.opSave.loading;
-    },
-    get isDisabled() {
-      return or([pipe([get("name"), isEmpty])])(store.data);
-    },
-    validate: action(async ({ data }) => {
-      store.errors = {};
-      const vErrors = validate(data, rules);
-      if (vErrors) {
-        store.errors = vErrors;
-        return false;
-      } else {
-        return true;
-      }
-    }),
-    save: action(async ({ data }) =>
-      pipe([
-        tap(() => {
-          console.log("save", data);
-        }),
-        switchCase([
-          () => store.validate({ data }),
-          tryCatch(
-            pipe([
-              () => ({
-                ...store.data,
-                ...providerSelectionStore.data,
-                project: { ...importProjectStore.project },
-              }),
-              tap((payload) => {
-                console.log("infra setting save payload", payload);
-              }),
-              (payload) => store.opSave.fetch(payload),
-              tap((result) => {
-                store.id = result.id;
-              }),
-              tap(() => {
-                emitter.emit("step.next");
-              }),
-            ]),
-            (error) =>
-              pipe([
-                tap(() => {
-                  console.error("save error", error);
-                }),
-              ])()
-          ),
-          () => undefined,
-        ]),
-      ])()
-    ),
-  });
-
-  return store;
-};
-
-export const infraSettings = (context) => {
-  const {
-    tr,
-    theme: { palette },
-  } = context;
-  const Form = form(context);
-  const Spinner = spinner(context);
-  const Button = button(context);
-  const FormGroup = formGroup(context);
-  const Input = input(context, {
-    cssOverride: css`
-      > input {
-        width: 500px;
-      }
-    `,
-  });
-  const ButtonWizardBack = buttonWizardBack(context);
-
-  return observer(({ store }) => (
-    <Form data-form-infra-settings>
-      <header>
-        <h2>{tr.t("Infrastructure Settings")}</h2>
-      </header>
-      <main>
-        <p>Provide information about the infrastructure</p>
-        <FormGroup>
-          <Input
-            autoFocus
-            name="infraName"
-            value={store.data.name}
-            onChange={(event) => store.onChange("name", event)}
-            label={tr.t("Infrastrucure Name")}
-            error={get("name[0]")(store.errors)}
-          />
-        </FormGroup>
-        <FormGroup>
-          <Input
-            name="stage"
-            value={store.data.stage}
-            onChange={(event) => store.onChange("stage", event)}
-            label={tr.t("Stage")}
-            error={get("stage[0]")(store.errors)}
-          />
-        </FormGroup>
-      </main>
-      <footer>
-        <ButtonWizardBack />
-        <Button
-          data-button-submit
-          primary
-          raised
-          disabled={store.isSaving || store.isDisabled}
-          onClick={() => store.save({ data: store.data })}
-          label={tr.t("Next")}
-        />
-        <Spinner visibility={store.isSaving} color={palette.primary.main} />
-      </footer>
-    </Form>
-  ));
-};
diff --git a/client/src/app_infra/infra/ovhConfig.js b/client/src/app_infra/infra/ovhConfig.js
deleted file mode 100644
index b3e5a765..00000000
--- a/client/src/app_infra/infra/ovhConfig.js
+++ /dev/null
@@ -1,226 +0,0 @@
-/** @jsxImportSource @emotion/react */
-import { css } from "@emotion/react";
-import { observable, action } from "mobx";
-import { observer } from "mobx-react";
-import { get, or, pipe } from "rubico";
-import { isEmpty } from "rubico/x";
-
-import input from "mdlean/lib/input";
-import formGroup from "mdlean/lib/formGroup";
-import { providerCreateStore } from "./providerStore";
-
-import {
-  providerFormCreate,
-  providerFormUpdate,
-  providerConfigCreateFooter,
-  providerConfigUpdateFooter,
-} from "./providerConfigCommon";
-
-const OVH_REGION = [
-  "UK1",
-  "BHS5",
-  "DE1",
-  "GRA5",
-  "GRA7",
-  "GRA9",
-  "GRA11",
-  "SBG5",
-  "WAW1",
-  "SGP1",
-  "SYD1",
-];
-
-import selectRegion from "./SelectRegion";
-
-const rules = {
-  OS_PROJECT_NAME: {
-    presence: true,
-    length: {
-      minimum: 2,
-      message: "must be at least 2 characters",
-    },
-  },
-  OS_PROJECT_ID: {
-    presence: true,
-    length: {
-      minimum: 2,
-      message: "must be at least 2 characters",
-    },
-  },
-  OS_USERNAME: {
-    presence: true,
-    length: {
-      minimum: 2,
-      message: "must be at least 2 characters",
-    },
-  },
-  OS_PASSWORD: {
-    presence: true,
-    length: {
-      minimum: 2,
-      message: "must be at least 2 characters",
-    },
-  },
-};
-
-const defaultData = {
-  id: "",
-  name: "",
-  OS_AUTH_URL: "https://auth.cloud.ovh.net/v3",
-  OS_PROJECT_NAME: "",
-  OS_PROJECT_ID: "",
-  OS_USERNAME: "",
-  OS_PASSWORD: "",
-  OS_REGION_NAME: "UK1",
-};
-
-export const createStoreOvh = (
-  context,
-  {
-    infraSettingsStore,
-    importProjectStore,
-    gitCredentialStore,
-    gitRepositoryStore,
-  }
-) => {
-  const core = providerCreateStore({
-    context,
-    defaultData,
-    rules,
-    infraSettingsStore,
-    gitCredentialStore,
-    gitRepositoryStore,
-  });
-
-  const store = observable({
-    buildPayload: ({ data }) => ({
-      providerType: "openstack",
-      providerName: "ovh",
-      providerAuth: {
-        OS_AUTH_URL: data.OS_AUTH_URL,
-        OS_PROJECT_NAME: data.OS_PROJECT_NAME.trim(),
-        OS_PROJECT_ID: data.OS_PROJECT_ID.trim(),
-        OS_USERNAME: data.OS_USERNAME.trim(),
-        OS_PASSWORD: data.OS_PASSWORD,
-        OS_REGION_NAME: data.OS_REGION_NAME,
-      },
-    }),
-    get isDisabled() {
-      return or([
-        pipe([get("OS_PROJECT_NAME"), isEmpty]),
-        pipe([get("OS_PROJECT_ID"), isEmpty]),
-        pipe([get("OS_USERNAME"), isEmpty]),
-        pipe([get("OS_REGION_NAME"), isEmpty]),
-      ])(core.data);
-    },
-    core,
-  });
-  return store;
-};
-
-export const ovhConfigForm = (context) => {
-  const { tr } = context;
-  const FormGroup = formGroup(context);
-  const OvhSelectRegion = selectRegion(context, { items: OVH_REGION });
-  const Input = input(context, {
-    cssOverride: css`
-      > input {
-        width: 320px;
-      }
-    `,
-  });
-
-  return observer(({ store }) => (
-    <>
-      <FormGroup>
-        <Input
-          name="OS_PROJECT_NAME"
-          value={store.data.OS_PROJECT_NAME}
-          onChange={(event) => store.onChange("OS_PROJECT_NAME", event)}
-          label={tr.t("OS_PROJECT_NAME")}
-          error={get("OS_PROJECT_NAME[0]")(store.errors)}
-        />
-      </FormGroup>
-      <FormGroup>
-        <Input
-          name="OS_PROJECT_ID"
-          value={store.data.OS_PROJECT_ID}
-          onChange={(event) => store.onChange("OS_PROJECT_ID", event)}
-          label={tr.t("OS_PROJECT_ID")}
-          error={get("OS_PROJECT_ID[0]")(store.errors)}
-        />
-      </FormGroup>
-      <FormGroup>
-        <Input
-          name="OS_USERNAME"
-          value={store.data.OS_USERNAME}
-          onChange={(event) => store.onChange("OS_USERNAME", event)}
-          label={tr.t("OS_USERNAME")}
-          error={get("OS_USERNAME[0]")(store.errors)}
-        />
-      </FormGroup>
-      <FormGroup>
-        <Input
-          name="OS_PASSWORD"
-          value={store.data.OS_PASSWORD}
-          onChange={(event) => store.onChange("OS_PASSWORD", event)}
-          label={tr.t("OS_PASSWORD")}
-          type="password"
-          error={get("OS_PASSWORD[0]")(store.errors)}
-        />
-      </FormGroup>
-      <FormGroup>
-        <OvhSelectRegion
-          placeholder="Select a region"
-          value={store.data.OS_REGION_NAME}
-          onSelected={(region) => {
-            store.data.OS_REGION_NAME = region;
-          }}
-        />
-      </FormGroup>
-    </>
-  ));
-};
-
-export const ovhFormCreate = (context) => {
-  const { tr } = context;
-  const FormCreate = providerFormCreate(context);
-  const OvhConfigForm = ovhConfigForm(context);
-  const Footer = providerConfigCreateFooter(context);
-
-  return observer(({ store }) => (
-    <FormCreate>
-      <header>
-        <h2>{tr.t("Create new OVH Infrastructure")}</h2>
-      </header>
-      <main>
-        <div>
-          {tr.t(
-            "Please provide the following information to create and scan a new infrastructure"
-          )}
-        </div>
-        <OvhConfigForm store={store.core} />
-      </main>
-      <Footer store={store} />
-    </FormCreate>
-  ));
-};
-
-export const ovhFormEdit = (context) => {
-  const { tr } = context;
-  const FormUpdate = providerFormUpdate(context);
-  const OvhConfigForm = ovhConfigForm(context);
-  const Footer = providerConfigUpdateFooter(context);
-
-  return observer(({ store, infraSettingsStore }) => (
-    <FormUpdate>
-      <header>
-        <h2>{tr.t("Update OVH Infrastructure")}</h2>
-      </header>
-      <main>
-        <OvhConfigForm store={store.core} />
-      </main>
-      <Footer store={store} infraSettingsStore={infraSettingsStore} />
-    </FormUpdate>
-  ));
-};
diff --git a/client/src/app_infra/infra/ovhSelectRegion.js b/client/src/app_infra/infra/ovhSelectRegion.js
deleted file mode 100644
index 1ff7641a..00000000
--- a/client/src/app_infra/infra/ovhSelectRegion.js
+++ /dev/null
@@ -1,40 +0,0 @@
-/** @jsxImportSource @emotion/react */
-import { jsx, css } from "@emotion/react";
-import select from "mdlean/lib/select";
-
-const OVH_REGION = [
-  "UK1",
-  "BHS5",
-  "DE1",
-  "GRA5",
-  "GRA7",
-  "GRA9",
-  "GRA11",
-  "SBG5",
-  "WAW1",
-  "SGP1",
-  "SYD1",
-];
-
-export default (context) => {
-  const Item = ({ item }) => (
-    <div
-      css={css`
-        display: flex;
-        align-items: center;
-        padding: 0.9rem;
-      `}
-    >
-      {item}
-    </div>
-  );
-  const SelectRegion = select(context, {
-    items: OVH_REGION,
-    renderItems: Item,
-    cssOveride: css`
-      width: 200px;
-    `,
-  });
-
-  return SelectRegion;
-};
diff --git a/client/src/app_infra/infra/projectList.js b/client/src/app_infra/infra/projectList.js
deleted file mode 100644
index b86a169f..00000000
--- a/client/src/app_infra/infra/projectList.js
+++ /dev/null
@@ -1,76 +0,0 @@
-const url = "https://github.com/grucloud/grucloud/";
-const branch = "main";
-
-export const PROJECTS = {
-  aws: [
-    {
-      title: "EC2 an instance with public address",
-      description:
-        "Deploy a EC2 virtual machine attached to an elastic public address",
-      url,
-      branch,
-      directory: "examples/aws/ec2",
-    },
-    {
-      title: "EKS",
-      description: "Deploy a kubernetes cluster with EKS",
-      url,
-      branch,
-      directory: "examples/aws/EKS/eks-simple",
-    },
-    {
-      title: "Route53 TXT Record",
-      description: "Create an Hosted Zone and a TXT record",
-      url,
-      branch,
-      directory: "examples/aws/route53/dns-validation-record-txt",
-    },
-  ],
-  azure: [
-    {
-      title: "Virtual machine",
-      description:
-        "Deploy a virtual machine with a public address, protected by a firewall",
-      url,
-      branch,
-      directory: "examples/azure/Compute/vm",
-    },
-  ],
-  google: [
-    {
-      title: "Virtual machine",
-      description: "Deploy a virtual machine on the default network",
-      resources: ["compute.instance"],
-      url,
-      branch,
-      directory: "examples/google/vm",
-    },
-    {
-      title: "Virtual machine inside a network",
-      description:
-        "Create a network, a sub-network, a virtual machine and firewall rules for HTTP/HTTPS",
-      url,
-      branch,
-      directory: "examples/google/vm-network",
-      resources: [
-        "compute.network",
-        "compute.subnetwork",
-        "compute.subnetwork",
-      ],
-    },
-    {
-      title: "Secure static website",
-      description: "Deploy a static website served with HTTPS",
-      url,
-      branch,
-      directory: "examples/google/storage/website-https",
-    },
-    {
-      title: "DNS records",
-      description: "Manages DNS records such as A, CNAME, TXT and MX records",
-      url,
-      branch,
-      directory: "examples/google/dns/github-page",
-    },
-  ],
-};
diff --git a/client/src/app_infra/infra/providerConfigCommon.js b/client/src/app_infra/infra/providerConfigCommon.js
deleted file mode 100644
index a04dd423..00000000
--- a/client/src/app_infra/infra/providerConfigCommon.js
+++ /dev/null
@@ -1,108 +0,0 @@
-/** @jsxImportSource @emotion/react */
-import { css } from "@emotion/react";
-import { observer } from "mobx-react";
-import { get, or, pipe } from "rubico";
-import { isEmpty } from "rubico/x";
-import createForm from "components/form";
-
-import button from "mdlean/lib/button";
-import spinner from "mdlean/lib/spinner";
-import { infraDeleteLink } from "./infraDeleteLink";
-import { buttonWizardBack, buttonHistoryBack } from "./wizardCreate";
-
-export const providerFormCreate = (context) => {
-  const Form = createForm(context);
-  return ({ children }) => (
-    <Form spellCheck="false" autoCapitalize="none" data-infra-create>
-      {children}
-    </Form>
-  );
-};
-
-export const providerFormUpdate = (context) => {
-  const Form = createForm(context);
-  return ({ children }) => (
-    <Form spellCheck="false" autoCapitalize="none" data-infra-update>
-      {children}
-    </Form>
-  );
-};
-
-export const providerConfigCreateFooter = (context) => {
-  const {
-    tr,
-    history,
-    theme: { palette },
-  } = context;
-
-  const Spinner = spinner(context);
-  const Button = button(context, {
-    cssOverride: css``,
-  });
-  const ButtonWizardBack = buttonWizardBack(context);
-
-  return observer(({ store }) => (
-    <footer>
-      <ButtonWizardBack />
-      <Button
-        data-button-submit
-        primary
-        raised
-        disabled={store.core.isCreating || store.isDisabled}
-        onClick={() =>
-          store.core.create({
-            data: store.buildPayload({ data: store.core.data }),
-          })
-        }
-        label={tr.t("Create Infrastructure")}
-      />
-      <Spinner
-        visibility={store.core.isCreating}
-        color={palette.primary.main}
-      />
-    </footer>
-  ));
-};
-
-export const providerConfigUpdateFooter = (context) => {
-  const {
-    tr,
-    history,
-    theme: { palette },
-  } = context;
-
-  const Spinner = spinner(context);
-  const Button = button(context, {
-    cssOverride: css``,
-  });
-  const ButtonHistoryBack = buttonHistoryBack(context);
-  const InfraDeleteLink = infraDeleteLink(context);
-
-  return observer(({ store, infraSettingsStore }) => (
-    <>
-      <footer>
-        <ButtonHistoryBack />
-        <Button
-          data-infra-update-submit
-          primary
-          raised
-          disabled={store.core.isUpdating}
-          onClick={() =>
-            store.core.update({
-              data: store.buildPayload({ data: store.core.data }),
-            })
-          }
-          label={tr.t("Update Infrastructure")}
-        />
-        <Spinner
-          visibility={store.core.isUpdating}
-          color={palette.primary.main}
-        />
-      </footer>
-      <InfraDeleteLink
-        store={store.core}
-        infraSettingsStore={infraSettingsStore}
-      />
-    </>
-  ));
-};
diff --git a/client/src/app_infra/infra/providerLogo.js b/client/src/app_infra/infra/providerLogo.js
deleted file mode 100644
index 3ba0b489..00000000
--- a/client/src/app_infra/infra/providerLogo.js
+++ /dev/null
@@ -1,37 +0,0 @@
-/* @jsxImportSource @emotion/react */
-import { css } from "@emotion/react";
-import { get, eq, pipe, flatMap, fork, switchCase, pick, tap } from "rubico";
-
-import AwsLogo from "./assets/aws.svg";
-import GcpLogo from "./assets/gcp.svg";
-import AzureLogo from "./assets/azure.svg";
-import OvhLogo from "./assets/ovh.svg";
-
-const providerName2Logo = (name) =>
-  switchCase([
-    eq(name, "aws"),
-    () => AwsLogo,
-    eq(name, "google"),
-    () => GcpLogo,
-    eq(name, "azure"),
-    () => AzureLogo,
-    eq(name, "ovh"),
-    () => OvhLogo,
-    (type) => <div>{type}</div>,
-  ])();
-
-const providerLogo =
-  ({ theme: { palette } }) =>
-  ({ name }) =>
-    (
-      <img
-        css={css`
-          filter: grayscale(100%);
-        `}
-        height="40px"
-        src={providerName2Logo(name)}
-        alt={name}
-      ></img>
-    );
-
-export default providerLogo;
diff --git a/client/src/app_infra/infra/providerSelection.js b/client/src/app_infra/infra/providerSelection.js
deleted file mode 100644
index 00c41750..00000000
--- a/client/src/app_infra/infra/providerSelection.js
+++ /dev/null
@@ -1,90 +0,0 @@
-/** @jsxImportSource @emotion/react */
-import { css } from "@emotion/react";
-import { observable, action } from "mobx";
-import { observer } from "mobx-react";
-
-import button from "mdlean/lib/button";
-
-import AwsLogo from "./assets/aws.svg";
-import GcpLogo from "./assets/gcp.svg";
-import AzureLogo from "./assets/azure.svg";
-import OvhLogo from "./assets/ovh.svg";
-
-export const providerSelectionCreateStore = ({ context }) => {
-  const { emitter } = context;
-  const store = observable({
-    data: {},
-    selectProvider: (provider) => {
-      store.data = provider;
-      if (!provider.providerType) {
-        store.data.providerType = provider.providerName;
-      }
-      emitter.emit("step.next");
-    },
-    setProvider: (provider) => {
-      store.data = provider;
-    },
-    get supportImport() {
-      return store.providerType === "google";
-    },
-  });
-  return store;
-};
-
-export const providerSelection = (context) => {
-  const Button = button(context);
-  return observer(({ store }) => (
-    <form
-      data-form-provider-select
-      css={css`
-        display: flex;
-        flex-direction: column;
-        align-items: flex-start;
-        margin: 0.5rem;
-        > button {
-          margin: 1rem;
-          padding: 1rem;
-          width: 32rem;
-          img {
-            margin: 0.5rem;
-            padding: 0.5rem;
-          }
-        }
-      `}
-    >
-      <Button
-        data-button-select-aws
-        raised
-        onClick={() => store.selectProvider({ providerName: "aws" })}
-      >
-        <img src={AwsLogo} alt="AWS" />
-      </Button>
-      <Button
-        data-button-select-google
-        raised
-        onClick={() => store.selectProvider({ providerName: "google" })}
-      >
-        <img src={GcpLogo} alt="GCP" />
-      </Button>
-      <Button
-        data-button-select-azure
-        raised
-        onClick={() => store.selectProvider({ providerName: "azure" })}
-      >
-        <img src={AzureLogo} alt="Azure" />
-      </Button>
-      <Button
-        data-button-select-ovh
-        raised
-        onClick={() =>
-          store.selectProvider({
-            providerName: "ovh",
-            providerType: "openstack",
-          })
-        }
-      >
-        <img src={OvhLogo} alt="OVH" />
-      </Button>
-    </form>
-  ));
-};
diff --git a/client/src/app_infra/infra/providerStore.js b/client/src/app_infra/infra/providerStore.js
deleted file mode 100644
index 5fe08918..00000000
--- a/client/src/app_infra/infra/providerStore.js
+++ /dev/null
@@ -1,169 +0,0 @@
-/** @jsxImportSource @emotion/react */
-import { observable, action } from "mobx";
-import validate from "validate.js";
-import { pipe, switchCase, tryCatch, tap } from "rubico";
-const { defaultsDeep } = require("rubico/x");
-
-import AsyncOp from "mdlean/lib/utils/asyncOp";
-import createAlert from "mdlean/lib/alert";
-
-export const providerCreateStore = ({
-  context,
-  defaultData,
-  rules,
-  infraSettingsStore,
-  gitCredentialStore,
-  gitRepositoryStore,
-}) => {
-  const { tr, rest, emitter, alertStack, history } = context;
-  const Alert = createAlert(context);
-  const asyncOpCreate = AsyncOp(context);
-
-  const store = observable({
-    id: "",
-    data: defaultData,
-    errors: {},
-    onChange: action((field, event) => {
-      store.data[field] = event.target.value;
-    }),
-    reset: action(() => {
-      store.data = defaultData;
-    }),
-    setData: action((data) => {
-      store.id = data.id;
-      store.data = defaultsDeep(defaultData)(data.providerAuth);
-    }),
-    get supportImport() {
-      return store.providerName === "google";
-    },
-    opScan: asyncOpCreate((infraItem) =>
-      rest.post(`cloudDiagram`, { infra_id: infraItem.id })
-    ),
-    op: asyncOpCreate((payload) => rest.post("infra", payload)),
-    get isCreating() {
-      return store.opScan.loading || store.opUpdate.loading;
-    },
-    validate: action(async ({ data }) => {
-      store.errors = {};
-      const vErrors = validate(
-        { name: data.name, ...data.providerAuth },
-        rules
-      );
-      if (vErrors) {
-        store.errors = vErrors;
-        return false;
-      } else {
-        return true;
-      }
-    }),
-    create: action(async ({ data }) =>
-      pipe([
-        tap(() => {
-          console.log("create", data);
-        }),
-        switchCase([
-          () => store.validate({ data }),
-          tryCatch(
-            pipe([
-              () => ({
-                ...data,
-                id: infraSettingsStore.id,
-                git_credential_id: gitCredentialStore.id,
-                git_repository_id: gitRepositoryStore.id,
-              }),
-              tap((payload) => {
-                console.log("create payload", payload);
-              }),
-              (payload) => store.opUpdate.fetch(payload),
-              tap(() => {
-                alertStack.add(
-                  <Alert
-                    severity="success"
-                    message={tr.t("Infrastructure Created")}
-                  />
-                );
-              }),
-              tap((result) => {
-                history.push(`/infra/detail/${result.id}`, result);
-              }),
-              tap((result) => {
-                emitter.emit("infra.created", result);
-              }),
-            ]),
-            (error) =>
-              pipe([
-                tap(() => {
-                  console.error("create", error);
-                }),
-                tap(() => {
-                  alertStack.add(
-                    <Alert
-                      severity="error"
-                      data-alert-error-create
-                      message={tr.t(
-                        "Error creating infrastructure, check the credentials"
-                      )}
-                    />
-                  );
-                }),
-              ])()
-          ),
-          () => undefined,
-        ]),
-      ])()
-    ),
-    //TODO use id in the payload
-    opUpdate: asyncOpCreate((payload) =>
-      rest.patch(`infra/${store.id || infraSettingsStore.id}`, payload)
-    ),
-    get isUpdating() {
-      return store.opScan.loading || store.opUpdate.loading;
-    },
-    update: action(async ({ data }) =>
-      pipe([
-        tap(() => {
-          console.log("update", data);
-        }),
-        switchCase([
-          () => store.validate({ data }),
-          tryCatch(
-            pipe([
-              () => store.opUpdate.fetch(data),
-              tap(() => {
-                alertStack.add(
-                  <Alert
-                    severity="success"
-                    message={tr.t("Infrastructure Udated")}
-                  />
-                );
-              }),
-              tap((result) => {
-                history.push(`/infra/detail/${result.id}`, result);
-              }),
-              tap((result) => {
-                emitter.emit("infra.updated", result);
-              }),
-            ]),
-            (error) =>
-              pipe([
-                tap(() => {
-                  console.error("update", error);
-                }),
-                tap(() => {
-                  alertStack.add(
-                    <Alert
-                      severity="error"
-                      data-alert-error-update
-                      message={tr.t("Error updating the infrastructure")}
-                    />
-                  );
-                }),
-              ])()
-          ),
-          () => undefined,
-        ]),
-      ])()
-    ),
-  });
-  return store;
-};
diff --git a/client/src/app_infra/infra/resourceTable.js b/client/src/app_infra/infra/resourceTable.js
deleted file mode 100644
index 69e25c2f..00000000
--- a/client/src/app_infra/infra/resourceTable.js
+++ /dev/null
@@ -1,40 +0,0 @@
-/* @jsxImportSource @emotion/react */
-import { css } from "@emotion/react";
-
-const createResourcePerTypeTable =
-  ({ theme }) =>
-  ({ lives }) =>
-    (
-      <table
-        css={css`
-          box-shadow: ${theme.shadows[1]};
-          min-width: 200px;
-          border-collapse: collapse;
-          border-top: 0.5em solid transparent;
-          border-spacing: 0;
-          padding: 16px;
-          & td,
-          & th {
-            padding: 0.6rem 1rem 0.6rem 1rem;
-          }
-        `}
-      >
-        <thead>
-          <tr>
-            <th>Resource Type</th>
-            <th>Total</th>
-          </tr>
-        </thead>
-        <tbody>
-          {lives &&
-            lives.map((live) => (
-              <tr key={live.type}>
-                <td>{live.type}</td>
-                <td>{live?.resources.length}</td>
-              </tr>
-            ))}
-        </tbody>
-      </table>
-    );
-
-export default createResourcePerTypeTable;
diff --git a/client/src/app_infra/infra/rulesForm.js b/client/src/app_infra/infra/rulesForm.js
deleted file mode 100644
index b317ccce..00000000
--- a/client/src/app_infra/infra/rulesForm.js
+++ /dev/null
@@ -1,23 +0,0 @@
-export default {
-  infraName: {
-    presence: true,
-    length: {
-      minimum: 3,
-      message: "must be at least 3 characters",
-    },
-  },
-  accessKeyId: {
-    presence: true,
-    length: {
-      minimum: 20,
-      message: "must be at least 20 characters",
-    },
-  },
-  secretKey: {
-    presence: true,
-    length: {
-      minimum: 40,
-      message: "must be at least 40 characters",
-    },
-  },
-};
diff --git a/client/src/app_infra/infra/wizardCreate.js b/client/src/app_infra/infra/wizardCreate.js
deleted file mode 100644
index 6fe43353..00000000
--- a/client/src/app_infra/infra/wizardCreate.js
+++ /dev/null
@@ -1,252 +0,0 @@
-/** @jsxImportSource @emotion/react */
-import { css } from "@emotion/react";
-import { observer } from "mobx-react";
-
-import button from "mdlean/lib/button";
-import wizard from "mdlean/lib/wizard";
-import screenLoader from "components/screenLoader";
-
-import {
-  providerSelection,
-  providerSelectionCreateStore,
-} from "./providerSelection";
-import { awsFormCreate, createStoreAws } from "./awsConfig";
-import { gcpFormCreate, createStoreGoogle } from "./gcpConfig";
-import { azureFormCreate, createStoreAzure } from "./azureConfig";
-import { ovhFormCreate, createStoreOvh } from "./ovhConfig";
-
-import { repositoryConfig, repositoryCreateStore } from "./gitRepositoryConfig";
-import {
-  gitCredentialConfig,
-  gitCredentialCreateStore,
-} from "./gitCredentialConfig";
-import { infraSettings, infraSettingsCreateStore } from "./infraSettings";
-
-import {
-  importProjectForm,
-  importProjectCreateStore,
-} from "./importProjectForm";
-
-export const buttonWizardBack = (context) => {
-  const Button = button(context);
-  return () => (
-    <Button onClick={() => context.emitter.emit("step.previous")}>
-      {"\u25c0"} Back
-    </Button>
-  );
-};
-
-export const buttonHistoryBack = (context) => {
-  const Button = button(context);
-  return () => (
-    <Button onClick={() => context.history.back()}>{"\u25c0"} Back</Button>
-  );
-};
-
-export const wizardStoreCreate = (context) => {
-  const providerSelectionStore = providerSelectionCreateStore({ context });
-
-  const importProjectStore = importProjectCreateStore(context);
-
-  const infraSettingsStore = infraSettingsCreateStore({
-    context,
-    providerSelectionStore,
-    importProjectStore,
-  });
-
-  const gitCredentialStore = gitCredentialCreateStore({
-    context,
-    infraSettingsStore,
-  });
-
-  const gitRepositoryStore = repositoryCreateStore({
-    context,
-    infraSettingsStore,
-    gitCredentialStore,
-  });
-
-  const aws = createStoreAws(context, {
-    importProjectStore,
-    gitCredentialStore,
-    gitRepositoryStore,
-    infraSettingsStore,
-  });
-
-  const google = createStoreGoogle(context, {
-    importProjectStore,
-    gitCredentialStore,
-    gitRepositoryStore,
-    infraSettingsStore,
-  });
-
-  const azure = createStoreAzure(context, {
-    importProjectStore,
-    gitCredentialStore,
-    gitRepositoryStore,
-    infraSettingsStore,
-  });
-
-  const ovh = createStoreOvh(context, {
-    importProjectStore,
-    gitCredentialStore,
-    gitRepositoryStore,
-    infraSettingsStore,
-  });
-
-  return {
-    providerSelectionStore,
-    importProjectStore,
-    infraSettingsStore,
-    gitCredentialStore,
-    gitRepositoryStore,
-    aws,
-    azure,
-    google,
-    ovh,
-  };
-};
-
-export const wizardCreate = ({ context, stores }) => {
-  const { tr, emitter } = context;
-
-  const ScreenLoader = screenLoader(context);
-
-  const ProviderSelection = providerSelection(context);
-  const InfraSettings = infraSettings(context);
-  const RepositoryConfig = repositoryConfig(context);
-  const GitCredentialConfig = gitCredentialConfig(context);
-  const ImportProjectForm = importProjectForm(context);
-
-  const AwsFormCreate = awsFormCreate(context);
-  const GcpFormCreate = gcpFormCreate(context);
-  const AzureFormCreate = azureFormCreate(context);
-  const OvhFormCreate = ovhFormCreate(context);
-
-  const {
-    providerSelectionStore,
-    importProjectStore,
-    infraSettingsStore,
-    gitCredentialStore,
-    gitRepositoryStore,
-    aws,
-    google,
-    azure,
-    ovh,
-  } = stores.wizard;
-
-  const configViewFromProvider = (providerName) => {
-    switch (providerName) {
-      case "aws":
-        return <AwsFormCreate store={aws} />;
-      case "google":
-        return <GcpFormCreate store={google} />;
-      case "azure":
-        return <AzureFormCreate store={azure} />;
-      case "ovh":
-        return <OvhFormCreate store={ovh} />;
-      default:
-        throw Error(`invalid provider type`);
-    }
-  };
-  const wizardDefs = [
-    {
-      name: "ProviderSelection",
-      header: () => <header>{tr.t("Select Provider")}</header>,
-      content: () => <ProviderSelection store={providerSelectionStore} />,
-      enter: async () => {
-        providerSelectionStore.setProvider("");
-      },
-    },
-    {
-      name: "Import",
-      header: observer(() => <header>Import</header>),
-      content: ({}) => (
-        <ImportProjectForm
-          store={importProjectStore}
-          storeProvider={providerSelectionStore}
-        />
-      ),
-      enter: async () => {
-        importProjectStore.project = {};
-      },
-    },
-    {
-      name: "Settings",
-      header: observer(() => <header>Settings</header>),
-      content: ({}) => (
-        <InfraSettings
-          store={infraSettingsStore}
-          storeProvider={providerSelectionStore}
-        />
-      ),
-      enter: async () => {
-        infraSettingsStore.data.name = importProjectStore.project.title;
-      },
-    },
-    {
-      name: "GitCredential",
-      header: observer(() => <header>Git Credential</header>),
-      content: observer(({}) =>
-        gitCredentialStore.opGetAll.loading ? (
-          <ScreenLoader
-            loading={true}
-            message={tr.t("Loading Git Credentials")}
-          />
-        ) : (
-          <GitCredentialConfig store={gitCredentialStore} />
-        )
-      ),
-      enter: async () => {
-        gitCredentialStore.getAll();
-      },
-    },
-    {
-      name: "GitRepository",
-      header: observer(() => <header>Git Repository</header>),
-      content: ({}) => <RepositoryConfig store={gitRepositoryStore} />,
-    },
-    {
-      name: "Configuration",
-      header: observer(() => <header>Configuration</header>),
-      content: ({}) =>
-        configViewFromProvider(providerSelectionStore.data.providerName),
-    },
-  ];
-
-  const Wizard = wizard(context, { wizardDefs });
-
-  //TODO only for testing
-  const testWorkflow = async () => {
-    providerSelectionStore.selectProvider({ providerName: "aws" });
-    importProjectStore.showNewProjectFromTemplate(true);
-    importProjectStore.onSelectProject({
-      title: "EKS",
-      description: "Deploy a kubernetes cluster with EKS",
-      url: "https://github.com/grucloud/grucloud/",
-      branch: "main",
-      directory: "packages/modules/aws/eks/example",
-    });
-
-    infraSettingsStore.save({ data: { name: "EKS infra", stage: "dev" } });
-    await gitCredentialStore.getAll();
-    gitCredentialStore.setData({
-      username: "TODO",
-      password: "xxxxxx",
-    });
-    gitCredentialStore.save();
-    gitRepositoryStore.setData({
-      url: "https://github.com/FredericHeem/grucloud-aws-demo.git",
-      branch: "master",
-    });
-    //  gitRepositoryStore.save();
-  };
-  //testWorkflow();
-
-  return observer(function WizardView() {
-    return (
-      <div css={css``}>
-        <Wizard.View />
-      </div>
-    );
-  });
-};
diff --git a/client/src/app_infra/menuItems.ts b/client/src/app_infra/menuItems.ts
deleted file mode 100644
index dfd5f80c..00000000
--- a/client/src/app_infra/menuItems.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import { createElement as h } from "react";
-import { BiLogOutCircle } from "react-icons/bi";
-import { CgProfile,CgCloud } from "react-icons/cg";
-
-export default () => [
-  {
-    route: "/infra",
-    text: "INFRA",
-    icon: h(CgCloud),
-  },
-  {
-    route: "/profile",
-    text: "PROFILE",
-    icon: h(CgProfile),
-  },
-  {
-    route: "/auth/logout",
-    text: "LOGOUT",
-    icon: h(BiLogOutCircle),
-  },
-];
diff --git a/client/src/app_infra/profile/components/profileForm.js b/client/src/app_infra/profile/components/profileForm.js
deleted file mode 100644
index e1d4d855..00000000
--- a/client/src/app_infra/profile/components/profileForm.js
+++ /dev/null
@@ -1,115 +0,0 @@
-/* @jsxImportSource @emotion/react */
-import { jsx, css } from "@emotion/react";
-import { createElement as h } from "react";
-import { toJS } from "mobx";
-import { observer } from "mobx-react";
-
-import input from "mdlean/lib/input";
-import button from "mdlean/lib/button";
-import formGroup from "mdlean/lib/formGroup";
-
-import spinner from "mdlean/lib/spinner";
-import paper from "components/Paper";
-
-export default (context) => {
-  const { tr, history } = context;
-  const FormGroup = formGroup(context);
-  const Paper = paper(context);
-  const Button = button(context, {
-    cssOverride: css`
-      width: 256px;
-    `,
-  });
-  const Input = input(context, {
-    cssOverride: css`
-      > input {
-        width: 256px;
-      }
-    `,
-  });
-
-  const UserDeleteLink = observer(({ store }) => (
-    <p>
-      <a
-        data-profile-user-delete-link
-        css={css`
-          color: red;
-          cursor: pointer;
-          text-decoration: underline;
-        `}
-        onClick={() => {
-          history.push(`profile/delete`, toJS(store.data));
-        }}
-      >
-        Danger zone...
-      </a>
-    </p>
-  ));
-
-  return observer(function ProfileForm({ store }) {
-    const { errors } = store;
-    if (store.opGet.loading) {
-      return h(spinner(context));
-    }
-    return (
-      <Paper>
-        <form onSubmit={(e) => e.preventDefault()}>
-          <h3>{tr.t("My Profile")}</h3>
-          {store.picture && (
-            <img width="50" src={store.picture.url} alt="profile" />
-          )}
-          <FormGroup>
-            <Input
-              id="username"
-              label={tr.t("Username")}
-              value={store.username}
-              disabled
-            />
-          </FormGroup>
-          <FormGroup>
-            <Input
-              id="email"
-              value={store.email}
-              disabled
-              label={tr.t("Email")}
-            />
-          </FormGroup>
-          <br />
-
-          <FormGroup>
-            <h4>{tr.t("About Me")}</h4>
-            <Input
-              className="biography-input"
-              value={store.profile.biography || ""}
-              error={errors.biography && errors.biography[0]}
-              label={tr.t("Enter Biography")}
-              rows={1}
-              onChange={(e) => {
-                store.profile.biography = e.target.value;
-              }}
-            />
-          </FormGroup>
-          {/*<FormGroup>
-            <h4>{tr.t("Picture")}</h4>
-            <input
-              type="file"
-              accept="image/*"
-              onChange={event => store.uploadPicture(event)}
-            />
-            <img alt="profile" src=""/>
-          </FormGroup>*/}
-          <FormGroup>
-            <Button
-              className="btn-update-profile"
-              raised
-              onClick={() => store.update()}
-              label={tr.t("Update Profile")}
-            />
-          </FormGroup>
-
-          <UserDeleteLink store={store} />
-        </form>
-      </Paper>
-    );
-  });
-};
diff --git a/client/src/app_infra/profile/profileModule.js b/client/src/app_infra/profile/profileModule.js
deleted file mode 100644
index d3451102..00000000
--- a/client/src/app_infra/profile/profileModule.js
+++ /dev/null
@@ -1,134 +0,0 @@
-import { observable, action } from "mobx";
-import React, { createElement as h } from "react";
-import validate from "validate.js";
-import rules from "utils/rules";
-import AsyncOp from "mdlean/lib/utils/asyncOp";
-import alert from "mdlean/lib/alert";
-import profileView from "./views/profileView";
-import userDeleteView from "./userDeleteView";
-
-export default function (context) {
-  const { rest, tr, config } = context;
-  const asyncOpCreate = AsyncOp(context);
-  const Alert = alert(context);
-  function Routes(stores) {
-    return [
-      {
-        path: "",
-        protected: true,
-        action: (routerContext) => {
-          stores.profile.get();
-          return {
-            routerContext,
-            title: "My Profile",
-            component: h(profileView(context), { store: stores.profile }),
-          };
-        },
-      },
-      {
-        path: "/delete",
-        protected: true,
-        action: (routerContext) => {
-          return {
-            routerContext,
-            title: "Delete Profile",
-            component: h(userDeleteView(context), { store: stores.userDelete }),
-          };
-        },
-      },
-    ];
-  }
-
-  function merge(profile, response) {
-    profile.username = response.username;
-    profile.email = response.email;
-    profile.profile = response.profile || { biography: "" };
-    profile.picture = response.picture;
-  }
-
-  function Stores() {
-    const profileStore = observable({
-      language: "US",
-      errors: {},
-      username: "",
-      email: "",
-      picture: null,
-      profile: {
-        biography: "",
-      },
-      opGet: asyncOpCreate(() => rest.get("me")),
-      get: action(async function () {
-        const response = await this.opGet.fetch();
-        merge(profileStore, response);
-      }),
-      opUpdate: asyncOpCreate((payload) => rest.patch("me", payload)),
-      update: action(async function () {
-        this.errors = {};
-        const payload = {
-          biography: this.profile.biography || "",
-        };
-        const constraints = {
-          biography: rules.biography,
-        };
-        const vErrors = validate(payload, constraints);
-        if (vErrors) {
-          this.errors = vErrors;
-          return;
-        }
-        const response = await this.opUpdate.fetch(payload);
-        merge(profileStore, response);
-        context.alertStack.add(
-          <Alert severity="success" message={tr.t("Profile updated")} />
-        );
-      }) /*,
-      uploadPicture: action(async event => {
-        const data = new FormData();
-        const file = event.target.files[0];
-        data.append("file", file);
-        data.append("name", file.name);
-        data.append("file-type", file.type);
-        data.append("category", "profile-picture");
-        try {
-          await rest.upload("document/profile_picture", data);
-          context.alertStack.add(
-            <Alert severity="info" message={tr.t("Picture uploaded")} />
-          );
-        } catch (error) {
-          console.error("uploadPicture ", error);
-          context.alertStack.add(
-            <Alert severity="error" message={tr.t("Cannot upload file")} />
-          );
-        }
-      })*/,
-    });
-    const userDeleteStore = observable({
-      input: "",
-      setInput: (input) => {
-        userDeleteStore.input = input;
-      },
-      opDestroy: asyncOpCreate(() => rest.del("me")),
-      destroy: action(async () => {
-        const response = await userDeleteStore.opDestroy.fetch();
-        context.alertStack.add(
-          <Alert severity="error" message={tr.t("Account Deleted")} />
-        );
-        context.history.push(config.loginPath);
-      }),
-
-      get nameMatch() {
-        return userDeleteStore.input === "delete";
-      },
-    });
-    return {
-      profile: profileStore,
-      userDelete: userDeleteStore,
-    };
-  }
-
-  const stores = Stores(context);
-
-  return {
-    stores: () => stores,
-    routes: () => Routes(stores),
-  };
-}
diff --git a/client/src/app_infra/profile/userDeleteView.js b/client/src/app_infra/profile/userDeleteView.js
deleted file mode 100644
index 7b67b8b6..00000000
--- a/client/src/app_infra/profile/userDeleteView.js
+++ /dev/null
@@ -1,68 +0,0 @@
-/* @jsxImportSource @emotion/react */
-import { jsx, css } from "@emotion/react";
-import { observer } from "mobx-react";
-
-import input from "mdlean/lib/input";
-import button from "mdlean/lib/button";
-import form from "mdlean/lib/form";
-import formGroup from "mdlean/lib/formGroup";
-
-import paper from "components/Paper";
-
-export default (context) => {
-  const { tr, history } = context;
-  const FormGroup = formGroup(context);
-  const Paper = paper(context);
-  const Form = form(context);
-  const Button = button(context, {
-    cssOverride: css`
-      width: 256px;
-    `,
-  });
-
-  const Input = input(context, {
-    cssOverride: css`
-      > input {
-        width: 256px;
-      }
-    `,
-  });
-
-  return observer(function UserDeleteForm({ store }) {
-    return (
-      <Form>
-        <header>
-          <h3>{tr.t("Delete My Account")}</h3>
-        </header>
-        <main>
-          <div>
-            To prevent accidental deletion, please type 'delete' in the input
-            field:
-          </div>
-          <FormGroup data-delete-name>
-            <Input
-              autoFocus
-              data-delete-name
-              value={store.input}
-              onChange={(e) => {
-                store.setInput(e.target.value);
-              }}
-              label={tr.t(`Type delete`)}
-            />
-          </FormGroup>
-        </main>
-        <footer>
-          <Button
-            data-user-button-delete
-            primary
-            raised
-            disabled={!store.nameMatch}
-            onClick={() => store.destroy()}
-            label={tr.t("Delete Account")}
-          />
-          <Button onClick={() => history.back()} label={tr.t("Cancel")} />
-        </footer>
-      </Form>
-    );
-  });
-};
diff --git a/client/src/app_infra/profile/views/profileView.js b/client/src/app_infra/profile/views/profileView.js
deleted file mode 100644
index 50b6d3e0..00000000
--- a/client/src/app_infra/profile/views/profileView.js
+++ /dev/null
@@ -1,16 +0,0 @@
-import React from "react";
-import page from "components/Page";
-import profileForm from "../components/profileForm";
-
-export default context => {
-  const Page = page(context);
-  const ProfileForm = profileForm(context);
-  function ProfileView(props) {
-    return (
-      <Page className="profile-page">
-        <ProfileForm {...props} />
-      </Page>
-    );
-  }
-  return ProfileView;
-};
diff --git a/client/src/app_infra/routes.js b/client/src/app_infra/routes.js
deleted file mode 100644
index 30812001..00000000
--- a/client/src/app_infra/routes.js
+++ /dev/null
@@ -1,44 +0,0 @@
-import { createPart } from "../router";
-import Layout from "./LayoutUnauthenticated";
-
-export default ({ context }) => [
-  {
-    path: "",
-    children: [
-      {
-        path: "/infra",
-        children: [],
-        action: async (routerContext) =>
-          createPart({
-            name: "infra",
-            context,
-            partCreate: await import("./infra/infraModule"),
-            routerContext,
-          }),
-      },
-      {
-        path: "/profile",
-        children: [],
-        action: async (routerContext) =>
-          createPart({
-            name: "profile",
-            context,
-            partCreate: await import("./profile/profileModule"),
-            routerContext,
-          }),
-      },
-      {
-        path: "/auth",
-        children: [],
-        action: async (routerContext) =>
-          createPart({
-            name: "auth",
-            context,
-            partCreate: await import("parts/auth/authModule"),
-            routerContext,
-            partParam: { Layout },
-          }),
-      },
-    ],
-  },
-];
diff --git a/client/src/app_infra/test/app.spec.js b/client/src/app_infra/test/app.spec.js
deleted file mode 100644
index 86175fc9..00000000
--- a/client/src/app_infra/test/app.spec.js
+++ /dev/null
@@ -1,13 +0,0 @@
-import { assert } from "chai";
-import App from "../UserApp";
-
-describe("App",  function() {
-  let app;
-  before(async () => {
-    app = await App();
-  })
- 
-  it("1 parts", async () => {
-    assert(true)
-  });
-});
diff --git a/client/src/app_infra/test/router.spec.js b/client/src/app_infra/test/router.spec.js
deleted file mode 100644
index 7bebe66b..00000000
--- a/client/src/app_infra/test/router.spec.js
+++ /dev/null
@@ -1,24 +0,0 @@
-import chai from "chai";
-import chaiAsPromised from "chai-as-promised";
-import UserApp from "../UserApp";
-
-chai.use(chaiAsPromised);
-const { expect, assert } = chai;
-
-describe("Router", function() {
-  let app;
-  let router;
-  before(async () => {
-    app = await UserApp();
-    router = app.router
-  })
-  it("/login", async () => {
-    const route = await router.instance.resolve("/auth/login");
-    assert(route);
-    assert(route.component)
-    assert.equal(route.title, "Login");
-  });
-  it("/app/profile not authenticated", async () => {
-    expect(router.instance.resolve("/profile")).to.be.rejectedWith(Error);
-  });
-});
diff --git a/client/src/app_public/landing/content.js b/client/src/app_public/landing/content.js
index db6c77a4..20e387f9 100644
--- a/client/src/app_public/landing/content.js
+++ b/client/src/app_public/landing/content.js
@@ -3,15 +3,13 @@ export default () => ({
     {
       img: require("./img/stack.svg").default,
       title: "Full Stack",
-      text:
-        "A complete frontend, backend and deployment solution to bootstrap your application",
+      text: "A complete frontend, backend and deployment solution to bootstrap your application",
       height: "100",
     },
     {
       img: require("./img/users.svg").default,
       title: "Authentication",
-      text:
-        "Account registration with username and password, or with identity provider such as Google, Facebook, Twitter, GitHub etc ..",
+      text: "Account registration with username and password, or with identity provider such as Google, Facebook, Twitter, GitHub etc ..",
       height: "100",
     },
     {
@@ -23,8 +21,7 @@ export default () => ({
     {
       img: require("./img/database.svg").default,
       title: "Relational SQL Database",
-      text:
-        "The data are modeled with sequelize, an ORM which support PostgreSQL, MySQL, MariaDB, SQLite and MSSQL",
+      text: "The data are modeled with sequelize, an ORM which support PostgreSQL, MySQL, MariaDB, SQLite and MSSQL",
       height: "100",
     },
   ],
@@ -66,21 +63,12 @@ export default () => ({
       link: "https://nodejs.org",
       text: "A scalable javascript application server.",
     },
-    {
-      img: require("./img/sequelize.svg").default,
-      height: "120",
-      title: "Sequelize",
-      link: "http://docs.sequelizejs.com/en/latest/",
-      text:
-        "Sequelize is a promise-based ORM for Node.js and io.js. It supports the dialects PostgreSQL, MySQL, MariaDB, SQLite and MSSQL",
-    },
     {
       img: require("./img/passportjs.png").default,
       title: "Passportjs",
       width: "64",
       link: "http://passportjs.org/",
-      text:
-        "Simple, unobtrusive authentication for Node.js, supports more than 300 authentication stragegies such as username and password, Facebook, google etc ...",
+      text: "Simple, unobtrusive authentication for Node.js, supports more than 300 authentication stragegies such as username and password, Facebook, google etc ...",
     },
   ],
   tools: [
@@ -89,8 +77,7 @@ export default () => ({
       title: "ESLint",
       height: "120",
       link: "http://eslint.org/",
-      text:
-        "The pluggable linting utility for JavaScript and JSX, find errors and coding style violation.",
+      text: "The pluggable linting utility for JavaScript and JSX, find errors and coding style violation.",
     },
     {
       img: require("./img/mocha.svg").default,
@@ -103,38 +90,21 @@ export default () => ({
       img: require("./img/nightwatch.png").default,
       title: "Nightwatch",
       link: "http://nightwatchjs.org/",
-      text:
-        "Write End-to-End tests in Node.js quickly and effortlessly that run against a Selenium server.",
+      text: "Write End-to-End tests in Node.js quickly and effortlessly that run against a Selenium server.",
     },
     {
       img: require("./img/webpack.svg").default,
       title: "Webpack",
       height: "160",
       link: "http://webpack.github.io/docs/",
-      text:
-        "A bundler for javascript and friends. Packs many modules into a few bundled assets.",
-    },
-    {
-      img: require("./img/nodemon.svg").default,
-      title: "Nodemon",
-      height: "160",
-      link: "http://nodemon.io/",
-      text:
-        "Monitors for any changes in your node.js application and automatically restart the server",
-    },
-    {
-      img: require("./img/travis.png").default,
-      title: "Travis CI",
-      height: "160",
-      link: "https://travis-ci.org/",
-      text: "A continuous integration platform.",
+      text: "A bundler for javascript and friends. Packs many modules into a few bundled assets.",
     },
+
     {
       img: require("./img/raml.png").default,
       title: "RAML",
       link: "http://raml.org",
-      text:
-        "RESTful API Modeling Language, model your API, generate html documentation, mock server for frontend, ensure the backend implements the API",
+      text: "RESTful API Modeling Language, model your API, generate html documentation, mock server for frontend, ensure the backend implements the API",
     },
 
     {
@@ -155,8 +125,7 @@ export default () => ({
       img: require("./img/docker.png").default,
       title: "Docker",
       link: "https://www.docker.com/",
-      text:
-        "An open platform for distributed applications for developers and sysadmins",
+      text: "An open platform for distributed applications for developers and sysadmins",
     },
   ],
 });
diff --git a/client/webpack.config.js b/client/webpack.config.js
index 33f963c4..bac590ea 100644
--- a/client/webpack.config.js
+++ b/client/webpack.config.js
@@ -22,7 +22,6 @@ module.exports = function (options) {
             { from: /^\/user/, to: "/user/index.html" },
             { from: /^\/admin/, to: "/admin/index.html" },
             { from: /^\/public/, to: "/public/index.html" },
-            { from: /^\/infra/, to: "/infra/index.html" },
           ],
         },
         proxy: {
@@ -63,13 +62,6 @@ module.exports = function (options) {
           chunks: ["admin"],
           filename: "admin/index.html",
         }),
-        new HtmlWebpackPlugin({
-          template: "src/index.ejs",
-          title: pkg.title,
-          chunks: ["infra"],
-          filename: "infra/index.html",
-        }),
-
         new webpack.DefinePlugin({
           __VERSION__: JSON.stringify(pkg.version),
         }),
diff --git a/client/webpack.dev.js b/client/webpack.dev.js
index d199872c..7dcfb3a4 100644
--- a/client/webpack.dev.js
+++ b/client/webpack.dev.js
@@ -11,7 +11,6 @@ const webpackDevConfig = {
       public: ["./src/app_public/index.js"],
       user: ["./src/app_user/index.js"],
       admin: ["./src/app_admin/index.js"],
-      infra: ["./src/app_infra/index.js"],
     },
   },
 
diff --git a/client/webpack.prod.js b/client/webpack.prod.js
index 9df8283c..7fe314d0 100644
--- a/client/webpack.prod.js
+++ b/client/webpack.prod.js
@@ -14,7 +14,6 @@ const webpackProdConfig = {
       public: ["./src/app_public/index.js"],
       user: ["./src/app_user/index.js"],
       admin: ["./src/app_admin/index.js"],
-      infra: ["./src/app_infra/index.js"],
     },
     output: {
       path: path.join(__dirname, "dist"),
diff --git a/server/src/plugins/cloudDiagram/api/gitCredentialApi.js b/server/src/plugins/cloudDiagram/api/gitCredentialApi.js
deleted file mode 100644
index b155f75e..00000000
--- a/server/src/plugins/cloudDiagram/api/gitCredentialApi.js
+++ /dev/null
@@ -1,135 +0,0 @@
-const assert = require("assert");
-const { switchCase, fork, pipe, tap, get, assign } = require("rubico");
-const { isEmpty } = require("rubico/x");
-const { contextSet404, contextSetOk } = require("utils/koaCommon");
-
-const { middlewareUserBelongsToOrg } = require("../middleware");
-
-const gitCredentialAttribute = [
-  "provider",
-  "auth_type",
-  "org_id",
-  "git_credential_id",
-  "username",
-  "password",
-];
-
-const buildWhereFromContext = pipe([
-  tap((context) => {
-    assert(context);
-  }),
-  fork({
-    org_id: pipe([get("params.org_id")]),
-    git_credential_id: pipe([get("params.git_credential_id")]),
-  }),
-  tap(({ org_id, git_credential_id }) => {
-    assert(org_id);
-    // assert(git_credential_id);
-  }),
-]);
-
-exports.GitCredentialApi = ({ app, models }) => {
-  assert(models);
-  return {
-    pathname: "/org/:org_id/git_credential",
-    middlewares: [
-      app.server.auth.isAuthenticated, //
-      middlewareUserBelongsToOrg(models),
-    ],
-    ops: [
-      {
-        pathname: "/",
-        method: "post",
-        handler: (context) =>
-          pipe([
-            tap(() => {
-              assert(context.request.body);
-              assert(context.state.user.user_id);
-            }),
-            () => context.request.body,
-            assign({ org_id: () => context.params.org_id }),
-            models.gitCredential.insert,
-            tap((param) => {
-              assert(true);
-            }),
-            contextSetOk({ context }),
-          ])(),
-      },
-      {
-        pathname: "/",
-        method: "get",
-        handler: (context) =>
-          pipe([
-            () => ({
-              attributes: gitCredentialAttribute,
-              where: {
-                org_id: context.params.org_id,
-              },
-            }),
-            models.gitCredential.findAll,
-            tap((param) => {
-              assert(true);
-            }),
-            contextSetOk({ context }),
-          ])(),
-      },
-      {
-        pathname: "/:git_credential_id",
-        method: "get",
-        handler: (context) =>
-          pipe([
-            tap(() => {
-              assert(context.params.org_id);
-              assert(context.params.git_credential_id);
-              assert(context.state.user.user_id);
-            }),
-            () => ({
-              attributes: gitCredentialAttribute,
-              where: buildWhereFromContext(context),
-            }),
-            models.gitCredential.findOne,
-            tap((param) => {
-              assert(true);
-            }),
-            switchCase([
-              isEmpty,
-              tap(contextSet404({ context })),
-              tap(contextSetOk({ context })),
-            ]),
-          ])(),
-      },
-      {
-        pathname: "/:git_credential_id",
-        method: "delete",
-        handler: (context) =>
-          pipe([
-            () => ({
-              where: buildWhereFromContext(context),
-            }),
-            models.gitCredential.destroy,
-            () => {
-              context.status = 204;
-            },
-          ])(),
-      },
-      {
-        pathname: "/:git_credential_id",
-        method: "patch",
-        handler: (context) =>
-          pipe([
-            () => ({
-              data: context.request.body,
-              where: buildWhereFromContext(context),
-            }),
-            models.gitCredential.update,
-            () => ({
-              attributes: gitCredentialAttribute,
-              where: buildWhereFromContext(context),
-            }),
-            models.gitCredential.findOne,
-            contextSetOk({ context }),
-          ])(),
-      },
-    ],
-  };
-};
diff --git a/server/src/plugins/cloudDiagram/api/gitRepositoryApi.js b/server/src/plugins/cloudDiagram/api/gitRepositoryApi.js
deleted file mode 100644
index 7570e724..00000000
--- a/server/src/plugins/cloudDiagram/api/gitRepositoryApi.js
+++ /dev/null
@@ -1,128 +0,0 @@
-const assert = require("assert");
-const { switchCase, fork, pipe, tap, get, assign } = require("rubico");
-const { isEmpty } = require("rubico/x");
-const { contextSet404, contextSetOk } = require("utils/koaCommon");
-
-const { middlewareUserBelongsToOrg } = require("../middleware");
-
-const gitRepositoryAttributes = [
-  "org_id",
-  "project_id",
-  "git_credential_id",
-  "repository_url",
-  "branch",
-  "working_directory",
-];
-
-const buildWhereFromContext = pipe([
-  tap((context) => {
-    assert(context);
-  }),
-  fork({
-    org_id: pipe([get("params.org_id")]),
-    project_id: pipe([get("params.project_id")]),
-    workspace_id: pipe([get("params.workspace_id")]),
-  }),
-  tap(({ org_id, project_id, workspace_id }) => {
-    assert(org_id);
-    assert(project_id);
-    assert(workspace_id);
-  }),
-]);
-
-exports.GitRepositoryApi = ({ app, models }) => {
-  assert(models.gitRepository);
-  return {
-    pathname:
-      "/org/:org_id/project/:project_id/workspace/:workspace_id/git_repository",
-    middlewares: [
-      app.server.auth.isAuthenticated, //
-      middlewareUserBelongsToOrg(models),
-    ],
-    ops: [
-      {
-        pathname: "/",
-        method: "post",
-        handler: (context) =>
-          pipe([
-            tap(() => {
-              assert(context.request.body);
-              assert(context.state.user.user_id);
-              assert(context.params.org_id);
-              assert(context.params.project_id);
-              assert(context.params.workspace_id);
-            }),
-            () => context.request.body,
-            assign({
-              org_id: () => context.params.org_id,
-              project_id: () => context.params.project_id,
-              workspace_id: () => context.params.workspace_id,
-            }),
-            models.gitRepository.insert,
-            tap((param) => {
-              assert(true);
-            }),
-            contextSetOk({ context }),
-          ])(),
-      },
-      {
-        pathname: "/",
-        method: "get",
-        handler: (context) =>
-          pipe([
-            tap(() => {
-              assert(context.params.org_id);
-              assert(context.params.project_id);
-              assert(context.params.workspace_id);
-              assert(context.state.user.user_id);
-            }),
-            () => ({
-              attributes: gitRepositoryAttributes,
-              where: buildWhereFromContext(context),
-            }),
-            models.gitRepository.findOne,
-            tap((param) => {
-              assert(true);
-            }),
-            switchCase([
-              isEmpty,
-              tap(contextSetOk({ context })),
-              tap(contextSetOk({ context })),
-            ]),
-          ])(),
-      },
-      {
-        pathname: "/",
-        method: "delete",
-        handler: (context) =>
-          pipe([
-            () => ({
-              where: buildWhereFromContext(context),
-            }),
-            models.gitRepository.destroy,
-            () => {
-              context.status = 204;
-            },
-          ])(),
-      },
-      {
-        pathname: "/",
-        method: "patch",
-        handler: (context) =>
-          pipe([
-            () => ({
-              data: context.request.body,
-              where: buildWhereFromContext(context),
-            }),
-            models.gitRepository.update,
-            () => ({
-              attributes: gitRepositoryAttributes,
-              where: buildWhereFromContext(context),
-            }),
-            models.gitRepository.findOne,
-            contextSetOk({ context }),
-          ])(),
-      },
-    ],
-  };
-};
diff --git a/server/src/plugins/cloudDiagram/api/infraApi.js b/server/src/plugins/cloudDiagram/api/infraApi.js
index a9da5d0e..a3931288 100644
--- a/server/src/plugins/cloudDiagram/api/infraApi.js
+++ b/server/src/plugins/cloudDiagram/api/infraApi.js
@@ -1,134 +1,134 @@
-const assert = require("assert");
-const path = require("path");
-const { pipe, tap, switchCase, map } = require("rubico");
-const { isEmpty, callProp, defaultsDeep } = require("rubico/x");
-const fs = require("fs");
-const pfs = fs.promises;
-const os = require("os");
-const { gitPush } = require("../gitUtils");
-const { createRestApiByUser } = require("../apiFactory");
+// const assert = require("assert");
+// const path = require("path");
+// const { pipe, tap, switchCase, map } = require("rubico");
+// const { isEmpty, callProp, defaultsDeep } = require("rubico/x");
+// const fs = require("fs");
+// const pfs = fs.promises;
+// const os = require("os");
+// const { gitPush } = require("../gitUtils");
+// const { createRestApiByUser } = require("../apiFactory");
 
-const infraFindOne = ({ models }) =>
-  pipe([
-    ({ id }) =>
-      models.Infra.findOne({
-        include: [
-          {
-            model: models.Job,
-            limit: 1,
-            order: [["created_at", "DESC"]],
-          },
-          {
-            model: models.GitCredential,
-            as: "gitCredential",
-          },
-          {
-            model: models.GitRepository,
-            as: "gitRepository",
-          },
-          {
-            model: models.User,
-            as: "user",
-          },
-        ],
-        where: {
-          id,
-        },
-      }),
-    switchCase([isEmpty, () => undefined, callProp("toJSON")]),
-  ]);
+// const infraFindOne = ({ models }) =>
+//   pipe([
+//     ({ id }) =>
+//       models.Infra.findOne({
+//         include: [
+//           {
+//             model: models.Job,
+//             limit: 1,
+//             order: [["created_at", "DESC"]],
+//           },
+//           {
+//             model: models.GitCredential,
+//             as: "gitCredential",
+//           },
+//           {
+//             model: models.GitRepository,
+//             as: "gitRepository",
+//           },
+//           {
+//             model: models.User,
+//             as: "user",
+//           },
+//         ],
+//         where: {
+//           id,
+//         },
+//       }),
+//     switchCase([isEmpty, () => undefined, callProp("toJSON")]),
+//   ]);
 
-exports.infraFindOne = infraFindOne;
+// exports.infraFindOne = infraFindOne;
 
-const InfraApi = ({ models, model, log }) => ({
-  findOne: infraFindOne({ models }),
-  findAll: ({ user_id }) =>
-    pipe([
-      () =>
-        model.findAll({
-          include: [
-            {
-              model: models.Job,
-              limit: 1,
-              order: [["created_at", "DESC"]],
-            },
-            {
-              model: models.GitCredential,
-              as: "gitCredential",
-            },
-            {
-              model: models.GitRepository,
-              as: "gitRepository",
-            },
-            {
-              model: models.User,
-              as: "user",
-            },
-          ],
-          where: {
-            user_id,
-          },
-        }),
-      map(callProp("toJSON")),
-      tap((xxx) => {
-        assert(true);
-      }),
-    ])(),
-  create: ({ data }) =>
-    pipe([
-      () => model.create(data),
-      tap((xxx) => {
-        assert(true);
-      }),
-      callProp("toJSON"),
-      tap((param) => {
-        log.debug(`created infra result: ${JSON.stringify(param, null, 4)}`);
-      }),
-      ({ id }) => infraFindOne({ models })({ id }),
-      tap((param) => {
-        log.debug(`created infraFindOne: ${JSON.stringify(param, null, 4)}`);
-      }),
-      tap(async (infra) =>
-        gitPush({
-          infra,
-          dirTemplate: await path.join(
-            os.tmpdir(),
-            "grucloud-example-template"
-          ),
-          dir: await pfs.mkdtemp(path.join(os.tmpdir(), "grucloud-template")),
-          message: "new infra project",
-        })
-      ),
-    ])(),
-  patch: ({ id, data }) =>
-    pipe([
-      () => infraFindOne({ models })({ id }),
-      (current) => defaultsDeep(current)(data),
-      tap((merged) =>
-        model.update(merged, {
-          where: {
-            id,
-          },
-        })
-      ),
-      () => infraFindOne({ models })({ id }),
-      tap((param) => {
-        log.debug(`created infraFindOne: ${JSON.stringify(param, null, 4)}`);
-      }),
-    ])(),
-  destroy: ({ id }) =>
-    pipe([
-      () =>
-        model.destroy({
-          where: {
-            id,
-          },
-        }),
-    ])(),
-});
+// const InfraApi = ({ models, model, log }) => ({
+//   findOne: infraFindOne({ models }),
+//   findAll: ({ user_id }) =>
+//     pipe([
+//       () =>
+//         model.findAll({
+//           include: [
+//             {
+//               model: models.Job,
+//               limit: 1,
+//               order: [["created_at", "DESC"]],
+//             },
+//             {
+//               model: models.GitCredential,
+//               as: "gitCredential",
+//             },
+//             {
+//               model: models.GitRepository,
+//               as: "gitRepository",
+//             },
+//             {
+//               model: models.User,
+//               as: "user",
+//             },
+//           ],
+//           where: {
+//             user_id,
+//           },
+//         }),
+//       map(callProp("toJSON")),
+//       tap((xxx) => {
+//         assert(true);
+//       }),
+//     ])(),
+//   create: ({ data }) =>
+//     pipe([
+//       () => model.create(data),
+//       tap((xxx) => {
+//         assert(true);
+//       }),
+//       callProp("toJSON"),
+//       tap((param) => {
+//         log.debug(`created infra result: ${JSON.stringify(param, null, 4)}`);
+//       }),
+//       ({ id }) => infraFindOne({ models })({ id }),
+//       tap((param) => {
+//         log.debug(`created infraFindOne: ${JSON.stringify(param, null, 4)}`);
+//       }),
+//       tap(async (infra) =>
+//         gitPush({
+//           infra,
+//           dirTemplate: await path.join(
+//             os.tmpdir(),
+//             "grucloud-example-template"
+//           ),
+//           dir: await pfs.mkdtemp(path.join(os.tmpdir(), "grucloud-template")),
+//           message: "new infra project",
+//         })
+//       ),
+//     ])(),
+//   patch: ({ id, data }) =>
+//     pipe([
+//       () => infraFindOne({ models })({ id }),
+//       (current) => defaultsDeep(current)(data),
+//       tap((merged) =>
+//         model.update(merged, {
+//           where: {
+//             id,
+//           },
+//         })
+//       ),
+//       () => infraFindOne({ models })({ id }),
+//       tap((param) => {
+//         log.debug(`created infraFindOne: ${JSON.stringify(param, null, 4)}`);
+//       }),
+//     ])(),
+//   destroy: ({ id }) =>
+//     pipe([
+//       () =>
+//         model.destroy({
+//           where: {
+//             id,
+//           },
+//         }),
+//     ])(),
+// });
 
-exports.InfraRestApi = ({ app, models }) => {
-  const log = require("logfilename")(__filename);
-  const api = InfraApi({ model: models.Infra, models, log });
-  return createRestApiByUser({ pathname: "infra", api, app });
-};
+// exports.InfraRestApi = ({ app, models }) => {
+//   const log = require("logfilename")(__filename);
+//   const api = InfraApi({ model: models.Infra, models, log });
+//   return createRestApiByUser({ pathname: "infra", api, app });
+// };
diff --git a/server/src/plugins/cloudDiagram/api/infraPushCodeApi.js b/server/src/plugins/cloudDiagram/api/infraPushCodeApi.js
index cca6916e..7e3053eb 100644
--- a/server/src/plugins/cloudDiagram/api/infraPushCodeApi.js
+++ b/server/src/plugins/cloudDiagram/api/infraPushCodeApi.js
@@ -1,85 +1,85 @@
-const assert = require("assert");
-const path = require("path");
-const { pipe, tap, tryCatch, switchCase, eq, get, or } = require("rubico");
-const uuid = require("uuid");
-const fs = require("fs");
-const pfs = fs.promises;
-const os = require("os");
+// const assert = require("assert");
+// const path = require("path");
+// const { pipe, tap, tryCatch, switchCase, eq, get, or } = require("rubico");
+// const uuid = require("uuid");
+// const fs = require("fs");
+// const pfs = fs.promises;
+// const os = require("os");
 
-const { contextSet400, contextSetOk } = require("utils/koaCommon");
-const { gitPush } = require("../gitUtils");
-const { infraFindOne } = require("./infraApi");
+// const { contextSet400, contextSetOk } = require("utils/koaCommon");
+// const { gitPush } = require("../gitUtils");
+// const { infraFindOne } = require("./infraApi");
 
-const InfraPushCodeApi = ({ models, log }) => ({
-  create: ({ id }) =>
-    pipe([
-      () => infraFindOne({ models })({ id }),
-      tap((infra) => {
-        log.debug(`InfraPushCodeApi: ${JSON.stringify({ infra }, null, 4)}`);
-      }),
-      tap(async (infra) =>
-        gitPush({
-          infra,
-          dirTemplate: await path.join(
-            os.tmpdir(),
-            "grucloud-example-template"
-          ),
-          dir: await pfs.mkdtemp(path.join(os.tmpdir(), "grucloud-user-dir")),
-          message: "new infra project",
-        })
-      ),
-    ])(),
-});
+// const InfraPushCodeApi = ({ models, log }) => ({
+//   create: ({ id }) =>
+//     pipe([
+//       () => infraFindOne({ models })({ id }),
+//       tap((infra) => {
+//         log.debug(`InfraPushCodeApi: ${JSON.stringify({ infra }, null, 4)}`);
+//       }),
+//       tap(async (infra) =>
+//         gitPush({
+//           infra,
+//           dirTemplate: await path.join(
+//             os.tmpdir(),
+//             "grucloud-example-template"
+//           ),
+//           dir: await pfs.mkdtemp(path.join(os.tmpdir(), "grucloud-user-dir")),
+//           message: "new infra project",
+//         })
+//       ),
+//     ])(),
+// });
 
-exports.InfraPushCodeRestApi = ({ app, models }) => {
-  const log = require("logfilename")(__filename);
-  const api = InfraPushCodeApi({ model: models.Infra, models, log });
-  const apiSpec = {
-    pathname: "/infra",
-    middlewares: [
-      app.server.auth.isAuthenticated /*,app.server.auth.isAuthorized*/,
-    ],
-    ops: [
-      {
-        pathname: "/:id/push_code",
-        method: "post",
-        handler: (context) =>
-          tryCatch(
-            pipe([
-              tap(() => {
-                assert(context.params.id);
-                assert(context.state.user.user_id);
-              }),
-              switchCase([
-                () => uuid.validate(context.params.id),
-                // valid id
-                pipe([
-                  () =>
-                    api.create({
-                      id: context.params.id,
-                      data: context.request.body,
-                    }),
-                  tap(contextSetOk({ context })),
-                ]),
-                // invalid uuid
-                contextSet400({ context, message: "invalid uuid" }),
-              ]),
-            ]),
-            (error) =>
-              pipe([
-                tap(() => {
-                  console.error(error);
-                }),
-                () => {
-                  context.status = 422;
-                  context.body = { ...error, message: error.toString() };
-                },
-              ])()
-          )(),
-      },
-    ],
-  };
+// exports.InfraPushCodeRestApi = ({ app, models }) => {
+//   const log = require("logfilename")(__filename);
+//   const api = InfraPushCodeApi({ model: models.Infra, models, log });
+//   const apiSpec = {
+//     pathname: "/infra",
+//     middlewares: [
+//       app.server.auth.isAuthenticated /*,app.server.auth.isAuthorized*/,
+//     ],
+//     ops: [
+//       {
+//         pathname: "/:id/push_code",
+//         method: "post",
+//         handler: (context) =>
+//           tryCatch(
+//             pipe([
+//               tap(() => {
+//                 assert(context.params.id);
+//                 assert(context.state.user.user_id);
+//               }),
+//               switchCase([
+//                 () => uuid.validate(context.params.id),
+//                 // valid id
+//                 pipe([
+//                   () =>
+//                     api.create({
+//                       id: context.params.id,
+//                       data: context.request.body,
+//                     }),
+//                   tap(contextSetOk({ context })),
+//                 ]),
+//                 // invalid uuid
+//                 contextSet400({ context, message: "invalid uuid" }),
+//               ]),
+//             ]),
+//             (error) =>
+//               pipe([
+//                 tap(() => {
+//                   console.error(error);
+//                 }),
+//                 () => {
+//                   context.status = 422;
+//                   context.body = { ...error, message: error.toString() };
+//                 },
+//               ])()
+//           )(),
+//       },
+//     ],
+//   };
 
-  app.server.createRouter(apiSpec);
-  return { api: apiSpec };
-};
+//   app.server.createRouter(apiSpec);
+//   return { api: apiSpec };
+// };
diff --git a/server/src/plugins/cloudDiagram/api/projectApi.js b/server/src/plugins/cloudDiagram/api/projectApi.js
index 1c6e9f28..00aad193 100644
--- a/server/src/plugins/cloudDiagram/api/projectApi.js
+++ b/server/src/plugins/cloudDiagram/api/projectApi.js
@@ -5,6 +5,21 @@ const { contextSet404, contextSetOk } = require("utils/koaCommon");
 
 const { middlewareUserBelongsToOrg } = require("../middleware");
 
+const projectAttributes = [
+  "org_id",
+  "project_id",
+  "project_name",
+  "project_description",
+  "options",
+  "git_provider_type",
+  "git_auth_type",
+  "username",
+  "password",
+  "repository_url",
+  "branch",
+  "working_directory",
+];
+
 const buildWhereFromContext = pipe([
   tap((context) => {
     assert(context);
@@ -52,7 +67,6 @@ exports.ProjectApi = ({ app, models }) => {
         handler: (context) =>
           pipe([
             () => ({
-              //attributes: ["org_id", "project_id", "project_name"],
               where: {
                 org_id: context.params.org_id,
                 user_id: context.state.user.user_id,
@@ -76,7 +90,7 @@ exports.ProjectApi = ({ app, models }) => {
               assert(context.state.user.user_id);
             }),
             () => ({
-              attributes: ["org_id", "project_id", "project_name"],
+              attributes: projectAttributes,
               where: buildWhereFromContext(context),
             }),
             models.project.findOne,
@@ -115,7 +129,7 @@ exports.ProjectApi = ({ app, models }) => {
             }),
             models.project.update,
             () => ({
-              attributes: ["project_name", "org_id", "project_id"],
+              attributes: projectAttributes,
               where: buildWhereFromContext(context),
             }),
             models.project.findOne,
diff --git a/server/src/plugins/cloudDiagram/index.js b/server/src/plugins/cloudDiagram/index.js
index ea0049d0..a5576804 100644
--- a/server/src/plugins/cloudDiagram/index.js
+++ b/server/src/plugins/cloudDiagram/index.js
@@ -6,10 +6,8 @@ const { DockerClient } = require("@grucloud/docker-axios");
 const { GetAllApi } = require("./api/getAllApi");
 
 const { OrgApi } = require("./api/orgApi");
-const { GitCredentialApi } = require("./api/gitCredentialApi");
 const { ProjectApi } = require("./api/projectApi");
 const { WorkspaceApi } = require("./api/workspaceApi");
-const { GitRepositoryApi } = require("./api/gitRepositoryApi");
 const { CloudAuthenticationApi } = require("./api/cloudAuthenticationApi");
 const { RunApi } = require("./api/runApi");
 const { DockerGcRun } = require("./utils/rungc");
@@ -83,9 +81,7 @@ module.exports = (app) => {
     org: sqlAdaptor(require("./sql/OrganisationSql")({ sql })),
     project: sqlAdaptor(require("./sql/ProjectSql")({ sql })),
     workspace: sqlAdaptor(require("./sql/WorkspaceSql")({ sql })),
-    gitRepository: sqlAdaptor(require("./sql/GitRepositorySql")({ sql })),
     userOrg: sqlAdaptor(require("./sql/UserOrgSql")({ sql })),
-    gitCredential: sqlAdaptor(require("./sql/GitCredentialSql")({ sql })),
     run: sqlAdaptor(require("./sql/RunSql")({ sql })),
     cloudAuthentication: sqlAdaptor(
       require("./sql/CloudAuthenticationSql")({ sql })
@@ -205,10 +201,8 @@ module.exports = (app) => {
   [
     GetAllApi,
     OrgApi,
-    GitCredentialApi,
     ProjectApi,
     WorkspaceApi,
-    GitRepositoryApi,
     RunApi,
     CloudAuthenticationApi,
   ].forEach((api) => app.server.createRouter(api({ app, models })));
diff --git a/server/src/plugins/cloudDiagram/migrations/010.do.app.do.sql b/server/src/plugins/cloudDiagram/migrations/010.do.app.do.sql
index 00c3df2a..350b7ee9 100644
--- a/server/src/plugins/cloudDiagram/migrations/010.do.app.do.sql
+++ b/server/src/plugins/cloudDiagram/migrations/010.do.app.do.sql
@@ -16,28 +16,22 @@ CREATE TABLE IF NOT EXISTS user_orgs (
   UNIQUE (user_id, org_id),
   PRIMARY KEY (user_id, org_id)
 );
--- git_credential
-CREATE TABLE IF NOT EXISTS git_credential (
-  git_credential_id TEXT,
-  provider TEXT NOT NULL DEFAULT 'GitHub',
-  auth_type TEXT NOT NULL,
-  username TEXT NOT NULL,
-  password TEXT NOT NULL,
-  options JSONB,
-  created_at TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT NOW(),
-  updated_at TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT NOW(),
-  org_id TEXT NOT NULL REFERENCES org (org_id) ON DELETE CASCADE ON UPDATE CASCADE,
-  PRIMARY KEY (git_credential_id)
-);
 -- project
 CREATE TABLE IF NOT EXISTS project (
+  org_id TEXT NOT NULL REFERENCES org (org_id) ON DELETE CASCADE ON UPDATE CASCADE,
   project_id TEXT NOT NULL,
   project_name TEXT,
   project_description TEXT,
   options JSONB,
+  git_provider_type TEXT,
+  git_auth_type TEXT,
+  username TEXT,
+  password TEXT,
+  repository_url TEXT,
+  branch TEXT NOT NULL DEFAULT 'main',
+  working_directory TEXT DEFAULT '',
   created_at TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT NOW(),
   updated_at TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT NOW(),
-  org_id TEXT NOT NULL REFERENCES org (org_id) ON DELETE CASCADE ON UPDATE CASCADE,
   PRIMARY KEY (org_id, project_id)
 );
 -- workspace
@@ -54,21 +48,6 @@ CREATE TABLE IF NOT EXISTS workspace (
   FOREIGN KEY(org_id, project_id) REFERENCES project ON DELETE CASCADE ON UPDATE CASCADE,
   PRIMARY KEY (org_id, project_id, workspace_id)
 );
--- git_repository 
-CREATE TABLE IF NOT EXISTS git_repository (
-  org_id TEXT NOT NULL,
-  project_id TEXT NOT NULL,
-  workspace_id TEXT NOT NULL,
-  repository_url TEXT NOT NULL,
-  branch TEXT NOT NULL DEFAULT 'main',
-  working_directory TEXT DEFAULT '',
-  options JSONB,
-  created_at TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT NOW(),
-  updated_at TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT NOW(),
-  FOREIGN KEY(org_id, project_id, workspace_id) REFERENCES workspace ON DELETE CASCADE,
-  git_credential_id TEXT NOT NULL REFERENCES git_credential (git_credential_id) ON DELETE CASCADE ON UPDATE CASCADE,
-  PRIMARY KEY (org_id, project_id, workspace_id)
-);
 -- run
 CREATE TABLE IF NOT EXISTS run (
   org_id TEXT NOT NULL,
diff --git a/server/src/plugins/cloudDiagram/migrations/011.do.app-seed.sql b/server/src/plugins/cloudDiagram/migrations/011.do.app-seed.sql
index d363b836..611d9852 100644
--- a/server/src/plugins/cloudDiagram/migrations/011.do.app-seed.sql
+++ b/server/src/plugins/cloudDiagram/migrations/011.do.app-seed.sql
@@ -4,23 +4,6 @@ INSERT INTO org (org_id, org_name)
 VALUES ('org-alice', 'org alice');
 INSERT INTO user_orgs (org_id, user_id)
 VALUES ('org-alice', 'alice-1234567890');
--- git_credential
-INSERT INTO git_credential (
-        git_credential_id,
-        org_id,
-        username,
-        password,
-        provider,
-        auth_type
-    )
-VALUES (
-        'cred-org-alice',
-        'org-alice',
-        'alice',
-        'password',
-        'GitHub',
-        'PersonalAccessCode'
-    );
 -- project aws
 INSERT INTO project (org_id, project_id, project_name)
 VALUES (
@@ -72,25 +55,6 @@ VALUES (
         'started',
         'list'
     );
--- git_repository
-INSERT INTO git_repository (
-        org_id,
-        project_id,
-        workspace_id,
-        git_credential_id,
-        repository_url,
-        branch,
-        working_directory
-    )
-VALUES (
-        'org-alice',
-        'project-aws',
-        'dev',
-        'cred-org-alice',
-        'https://github.com/FredericHeem/grucloud-aws-demo',
-        'main',
-        ''
-    );
 -- bob
 INSERT INTO org (org_id, org_name)
 VALUES ('org-bob', 'org bob');
diff --git a/server/src/plugins/cloudDiagram/sql/GitCredentialSql.js b/server/src/plugins/cloudDiagram/sql/GitCredentialSql.js
deleted file mode 100644
index e6373497..00000000
--- a/server/src/plugins/cloudDiagram/sql/GitCredentialSql.js
+++ /dev/null
@@ -1,18 +0,0 @@
-const { tap, pipe, fork } = require("rubico");
-const assert = require("assert");
-const { defaultsDeep, identity } = require("rubico/x");
-const nanoid = require("nanoid");
-const { insert } = require("utils/SqlOps");
-
-module.exports = ({ sql }) => {
-  const tableName = "git_credential";
-  return {
-    tableName,
-    insert: (data) =>
-      pipe([
-        () => data,
-        defaultsDeep({ git_credential_id: `cred-${nanoid.nanoid(8)}` }),
-        fork({ out: identity, query: insert({ tableName, sql }) }),
-      ])(),
-  };
-};
diff --git a/server/src/plugins/cloudDiagram/sql/GitRepositorySql.js b/server/src/plugins/cloudDiagram/sql/GitRepositorySql.js
deleted file mode 100644
index 60e5cd2a..00000000
--- a/server/src/plugins/cloudDiagram/sql/GitRepositorySql.js
+++ /dev/null
@@ -1,15 +0,0 @@
-const { tap, pipe, fork } = require("rubico");
-const { identity } = require("rubico/x");
-const { insert } = require("utils/SqlOps");
-
-module.exports = ({ sql }) => {
-  const tableName = "git_repository";
-  return {
-    tableName,
-    insert: (data) =>
-      pipe([
-        () => data,
-        fork({ out: identity, query: insert({ tableName, sql }) }),
-      ])(),
-  };
-};
diff --git a/server/src/plugins/cloudDiagram/test/testGitCredential.js b/server/src/plugins/cloudDiagram/test/testGitCredential.js
deleted file mode 100644
index eaddcc6b..00000000
--- a/server/src/plugins/cloudDiagram/test/testGitCredential.js
+++ /dev/null
@@ -1,111 +0,0 @@
-const assert = require("assert");
-const { switchCase, tryCatch, pipe, tap, get } = require("rubico");
-const testMngr = require("test/testManager");
-
-const org_id = "org-alice";
-
-const payloadCreate = {
-  provider: "GitHub",
-  auth_type: "PersonalAccessCode",
-  username: "username",
-  password: "password",
-};
-
-describe("Git Credential No Auth", function () {
-  let client;
-  before(async function () {
-    if (!testMngr.app.config.infra) {
-      this.skip();
-    }
-    client = testMngr.client("bob");
-  });
-
-  it("should get a 401 when getting all git credentials", async () => {
-    try {
-      await client.get(`v1/org/${org_id}/git_credential`);
-      assert(false);
-    } catch (error) {
-      assert.equal(error.response.data, "Unauthorized");
-      assert.equal(error.response.status, 401);
-    }
-  });
-  it("should get 403 when getting a org", async () => {
-    try {
-      await client.get(`v1/org/${org_id}/git_credential/123456`);
-      assert(false);
-    } catch (error) {
-      assert.equal(error.response.data, "Unauthorized");
-      assert.equal(error.response.status, 401);
-    }
-  });
-});
-
-describe("Git Credential", function () {
-  let client;
-  before(async function () {
-    if (!testMngr.app.config.infra) {
-      this.skip();
-    }
-    client = testMngr.client("alice");
-    await client.login();
-  });
-  it("CRUD", async () => {
-    try {
-      // Create
-      const gitCredential = await client.post(
-        `v1/org/${org_id}/git_credential`,
-        payloadCreate
-      );
-      assert(gitCredential);
-      const { git_credential_id } = gitCredential;
-      assert(git_credential_id);
-
-      assert.equal(gitCredential.username, payloadCreate.username);
-      // Get By Id
-      {
-        let getOneResult = await client.get(
-          `v1/org/${org_id}/git_credential/${git_credential_id}`
-        );
-        assert(getOneResult);
-        assert(getOneResult.git_credential_id);
-        assert(getOneResult.org_id);
-        assert(getOneResult.username);
-      }
-      // Update
-      {
-        const inputUpdated = {
-          username: "newgitusername",
-        };
-        const updatedGitCredential = await client.patch(
-          `v1/org/${org_id}/git_credential/${git_credential_id}`,
-          inputUpdated
-        );
-        assert.equal(updatedGitCredential.username, inputUpdated.username);
-      }
-      // Get all git credentials by org id
-      {
-        let gitCredentials = await client.get(
-          `v1/org/${org_id}/git_credential`
-        );
-        assert(gitCredentials);
-        assert(Array.isArray(gitCredentials));
-      }
-      // Delete
-      await client.delete(
-        `v1/org/${org_id}/git_credential/${git_credential_id}`
-      );
-    } catch (error) {
-      throw error;
-    }
-  });
-  it("should get 404 when the credentials is not found", async () => {
-    try {
-      await client.get(`v1/org/${org_id}/git_credential/123456`);
-      assert(false);
-    } catch (error) {
-      assert(error.response.data.error);
-      assert.equal(error.response.data.error.name, "NotFound");
-      assert.equal(error.response.status, 404);
-    }
-  });
-});
diff --git a/server/src/plugins/cloudDiagram/test/testGitRepository.js b/server/src/plugins/cloudDiagram/test/testGitRepository.js
deleted file mode 100644
index eeb1e80a..00000000
--- a/server/src/plugins/cloudDiagram/test/testGitRepository.js
+++ /dev/null
@@ -1,117 +0,0 @@
-const assert = require("assert");
-const testMngr = require("test/testManager");
-
-const org_id = "org-alice";
-const project_id = "project-aws";
-const workspace_id = "dev";
-
-const payloadCreate = {
-  git_credential_id: "cred-org-alice",
-  repository_url: "https://github.com/FredericHeem/grucloud-aws-demo",
-  branch: "master",
-};
-
-describe("Git Repository No Auth", function () {
-  let client;
-  before(async function () {
-    if (!testMngr.app.config.infra) {
-      this.skip();
-    }
-    client = testMngr.client("bob");
-  });
-
-  it("should get a 401 when getting all git_repositories", async () => {
-    try {
-      await client.get(
-        `v1/org/${org_id}/project/${project_id}/workspace/${workspace_id}/git_repository`
-      );
-      assert(false);
-    } catch (error) {
-      assert.equal(error.response.data, "Unauthorized");
-      assert.equal(error.response.status, 401);
-    }
-  });
-  it("should get 403 when getting a git_repository", async () => {
-    try {
-      await client.get(
-        `v1/org/${org_id}/project/${project_id}/workspace/${workspace_id}/git_repository`
-      );
-      assert(false);
-    } catch (error) {
-      assert.equal(error.response.data, "Unauthorized");
-      assert.equal(error.response.status, 401);
-    }
-  });
-});
-
-describe("Git Repository", function () {
-  let client;
-  before(async function () {
-    if (!testMngr.app.config.infra) {
-      this.skip();
-    }
-    client = testMngr.client("alice");
-    await client.login();
-  });
-  it("CRUD", async () => {
-    try {
-      // Create
-      try {
-        const git_repository = await client.post(
-          `v1/org/${org_id}/project/${project_id}/workspace/${workspace_id}/git_repository`,
-          payloadCreate
-        );
-        assert(git_repository);
-
-        assert.equal(
-          git_repository.repository_url,
-          payloadCreate.repository_url
-        );
-      } catch (error) {
-        // May already be created
-      }
-
-      // Get By Id
-      {
-        let getOneResult = await client.get(
-          `v1/org/${org_id}/project/${project_id}/workspace/${workspace_id}/git_repository`
-        );
-        assert(getOneResult);
-        assert(getOneResult.branch);
-        assert(getOneResult.git_credential_id);
-      }
-      // Update
-      {
-        const inputUpdated = {
-          repository_url: "https://github.com/FredericHeem/grucloud-aws-demo1",
-        };
-        const updatedGitCredential = await client.patch(
-          `v1/org/${org_id}/project/${project_id}/workspace/${workspace_id}/git_repository`,
-          inputUpdated
-        );
-        assert.equal(
-          updatedGitCredential.repository_url,
-          inputUpdated.repository_url
-        );
-      }
-      // Delete
-      await client.delete(
-        `v1/org/${org_id}/project/${project_id}/workspace/${workspace_id}/git_repository`
-      );
-    } catch (error) {
-      throw error;
-    }
-  });
-  it("should get 404 when the git_repository is not found", async () => {
-    try {
-      await client.get(
-        `v1/org/${org_id}/project/${project_id}/workspace/idonotexist/git_repository`
-      );
-      assert(false);
-    } catch (error) {
-      assert(error.response.data.error);
-      assert.equal(error.response.data.error.name, "NotFound");
-      assert.equal(error.response.status, 404);
-    }
-  });
-});

From 838055b483f0d6e0e48aab24fbe460cef9f946d1 Mon Sep 17 00:00:00 2001
From: Frederic Heem <frederic.heem@gmail.com>
Date: Mon, 6 Nov 2023 17:52:28 -0300
Subject: [PATCH 02/16] reset github-access-token and gitlab-access-token on
 logout

---
 .../src/plugins/users/authentication/AuthenticationRouter.js   | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/server/src/plugins/users/authentication/AuthenticationRouter.js b/server/src/plugins/users/authentication/AuthenticationRouter.js
index 48c7d887..d8ef0204 100644
--- a/server/src/plugins/users/authentication/AuthenticationRouter.js
+++ b/server/src/plugins/users/authentication/AuthenticationRouter.js
@@ -154,6 +154,9 @@ function AuthenticationHttpController({ app, models }) {
     logout(ctx) {
       log.debug("logout");
       ctx.logout();
+      ctx.cookies.set("github-access-token", "");
+      ctx.cookies.set("gitlab-access-token", "");
+
       ctx.body = {
         success: true,
       };

From 418116bd88b907ffb9a80a85e2f198bac84c6337 Mon Sep 17 00:00:00 2001
From: Frederic Heem <frederic.heem@gmail.com>
Date: Wed, 8 Nov 2023 18:49:24 -0300
Subject: [PATCH 03/16] --include-groups

---
 server/src/plugins/cloudDiagram/utils/rungc.js | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/server/src/plugins/cloudDiagram/utils/rungc.js b/server/src/plugins/cloudDiagram/utils/rungc.js
index 266446a6..c7ab2d7e 100644
--- a/server/src/plugins/cloudDiagram/utils/rungc.js
+++ b/server/src/plugins/cloudDiagram/utils/rungc.js
@@ -1,5 +1,5 @@
 const assert = require("assert");
-const { pipe, tap, assign, get, eq, map, pick } = require("rubico");
+const { pipe, tap, assign, get, eq, map, pick, flatMap } = require("rubico");
 const { values, unless } = require("rubico/x");
 const path = require("path");
 
@@ -140,9 +140,16 @@ exports.DockerGcCreate = ({ app }) => {
         outputDot: `resources.dot`,
         outputSvg: `resources.svg`,
       }),
+      assign({
+        servicesCmd: pipe([
+          () => env_vars,
+          get("SERVICES", []),
+          flatMap((service) => ["--include-groups", service]),
+        ]),
+      }),
       assign({
         name: () => `${containerName}-${run_id}`,
-        Cmd: ({ outputGcList, outputDot }) => [
+        Cmd: ({ outputGcList, servicesCmd }) => [
           "list",
           "--provider",
           provider,
@@ -170,10 +177,7 @@ exports.DockerGcCreate = ({ app }) => {
           //`${outputDot}`,
           "--title",
           "",
-          "--include-groups",
-          "EC2",
-          "--include-groups",
-          "ECS",
+          ...servicesCmd,
         ],
         outputGcListLocalPath: ({ outputGcList }) =>
           path.resolve(outputDir, outputGcList),

From 213cb2cdf36aa870feaeb20bb892e8bb2b1d3179 Mon Sep 17 00:00:00 2001
From: Frederic Heem <frederic.heem@gmail.com>
Date: Sun, 12 Nov 2023 16:38:33 -0300
Subject: [PATCH 04/16] run ecs task with the set of service

---
 server/src/plugins/cloudDiagram/api/runApi.js | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/server/src/plugins/cloudDiagram/api/runApi.js b/server/src/plugins/cloudDiagram/api/runApi.js
index 8e2589e2..24958bf0 100644
--- a/server/src/plugins/cloudDiagram/api/runApi.js
+++ b/server/src/plugins/cloudDiagram/api/runApi.js
@@ -10,6 +10,8 @@ const {
   assign,
   pick,
   map,
+  flatMap,
+  omit,
 } = require("rubico");
 const { isEmpty, values, defaultsDeep } = require("rubico/x");
 const { contextSet404, contextSetOk } = require("utils/koaCommon");
@@ -179,6 +181,12 @@ exports.RunApi = ({ app, models }) => {
                     ]),
                     // default is ecs
                     pipe([
+                      assign({
+                        servicesCmd: pipe([
+                          get("env_vars.SERVICES", []),
+                          flatMap((service) => ["--include-groups", service]),
+                        ]),
+                      }),
                       ({
                         org_id,
                         project_id,
@@ -186,6 +194,7 @@ exports.RunApi = ({ app, models }) => {
                         run_id,
                         env_vars,
                         provider_type,
+                        servicesCmd,
                       }) => ({
                         config,
                         container: {
@@ -211,9 +220,11 @@ exports.RunApi = ({ app, models }) => {
                             `${org_id}/${project_id}/${workspace_id}/${run_id}`,
                             "--title",
                             "",
+                            ...servicesCmd,
                           ],
                           environment: pipe([
                             () => env_vars,
+                            omit(["SERVICES"]),
                             transformEnv({
                               GRUCLOUD_OAUTH_SUBJECT: buildSubject({
                                 org_id,

From ef1d670f1d79383ba0869d6c8f1e5154f754cea0 Mon Sep 17 00:00:00 2001
From: Frederic Heem <frederic.heem@gmail.com>
Date: Fri, 17 Nov 2023 14:59:17 -0300
Subject: [PATCH 05/16] use gc ci runner

---
 server/config/default.json                    |   4 +
 server/src/plugins/cloudDiagram/api/runApi.js | 203 +++++++++++++++---
 .../migrations/011.do.app-seed.sql            |  18 +-
 .../migrations/012.do.app-seed-js.js          |   3 +-
 .../plugins/cloudDiagram/test/test005Run.js   |   1 +
 .../src/plugins/cloudDiagram/utils/rungc.js   |  39 +---
 server/src/server/koa/koaServer.js            |   1 +
 7 files changed, 190 insertions(+), 79 deletions(-)

diff --git a/server/config/default.json b/server/config/default.json
index dd053026..d6a250ba 100644
--- a/server/config/default.json
+++ b/server/config/default.json
@@ -1,5 +1,9 @@
 {
   "websiteUrl": "http://localhost:8080",
+  "infra": {
+    "wsUrl": "ws://host.docker.internal:9000",
+    "containerImage": "grucloud/grucloud-cli"
+  },
   "log": {
     "console": {
       "level": "debug",
diff --git a/server/src/plugins/cloudDiagram/api/runApi.js b/server/src/plugins/cloudDiagram/api/runApi.js
index 24958bf0..7e736690 100644
--- a/server/src/plugins/cloudDiagram/api/runApi.js
+++ b/server/src/plugins/cloudDiagram/api/runApi.js
@@ -13,7 +13,14 @@ const {
   flatMap,
   omit,
 } = require("rubico");
-const { isEmpty, values, defaultsDeep } = require("rubico/x");
+const {
+  isEmpty,
+  values,
+  defaultsDeep,
+  append,
+  when,
+  callProp,
+} = require("rubico/x");
 const { contextSet404, contextSetOk } = require("utils/koaCommon");
 
 const { middlewareUserBelongsToOrg } = require("../middleware");
@@ -95,6 +102,96 @@ const buildS3SignedUrl = ({ config, context, filename }) =>
         ])()
     ),
   ]);
+
+const buildCmd = ({
+  servicesCmd,
+  bucketUpload,
+  wsUrl,
+  provider_type,
+  org_id,
+  project_id,
+  workspace_id,
+  run_id,
+}) =>
+  pipe([
+    tap((param) => {
+      assert(bucketUpload);
+      assert(wsUrl);
+      assert(provider_type);
+      assert(run_id);
+    }),
+    () => [
+      "list",
+      "--json",
+      "grucloud-result.json",
+      "--graph",
+      // "--infra",
+      // `/app/iac.js`,
+      // "--provider",
+      // provider_type,
+      "--s3-bucket",
+      bucketUpload,
+      "--s3-key",
+      `${org_id}/${project_id}/${workspace_id}/${run_id}`,
+      "--s3-local-dir",
+      //"/app/artifacts",
+      "artifacts",
+      "--ws-url",
+      wsUrl,
+      "--ws-room",
+      `${org_id}/${project_id}/${workspace_id}/${run_id}`,
+      "--title",
+      '""',
+      ...servicesCmd,
+    ],
+    callProp("join", " "),
+  ])();
+
+const buildGcFlow = ({
+  repository_url,
+  provider_type,
+  bucketUpload,
+  wsUrl,
+  servicesCmd,
+  org_id,
+  project_id,
+  workspace_id,
+  run_id,
+}) =>
+  pipe([
+    () => [],
+    when(
+      () => repository_url,
+      pipe([
+        append({
+          name: "Clone Repo",
+          run: "git clone $GIT_REPO -b $GIT_BRANCH --depth 1 my-repo",
+        }),
+        append({
+          name: "npm install",
+          run: "npm install",
+          workingDirectory: "my-repo",
+        }),
+      ])
+    ),
+    append({
+      name: "gc list",
+      run: `node_modules/.bin/gc ${buildCmd({
+        servicesCmd,
+        bucketUpload,
+        wsUrl,
+        provider_type,
+        org_id,
+        project_id,
+        workspace_id,
+        run_id,
+      })}`,
+      workingDirectory: "my-repo",
+    }),
+    (steps) => ({ steps }),
+    JSON.stringify,
+  ])();
+
 exports.RunApi = ({ app, models }) => {
   const { config } = app;
   const { aws, infra } = config;
@@ -129,9 +226,6 @@ exports.RunApi = ({ app, models }) => {
               workspace_id: () => context.params.workspace_id,
               status: () => "creating",
             }),
-            tap((param) => {
-              assert(true);
-            }),
             models.run.insert,
             tap((param) => {
               assert(true);
@@ -139,15 +233,73 @@ exports.RunApi = ({ app, models }) => {
             assign({
               container_id: (data) =>
                 pipe([
-                  () => ({
-                    attributes: ["env_vars", "provider_type"],
-                    where: pick(["org_id", "project_id", "workspace_id"])(data),
+                  fork({
+                    cloudAuthentication: pipe([
+                      () => ({
+                        attributes: ["env_vars", "provider_type"],
+                        where: pick(["org_id", "project_id", "workspace_id"])(
+                          data
+                        ),
+                      }),
+                      models.cloudAuthentication.findOne,
+                    ]),
+                    project: pipe([
+                      () => ({
+                        attributes: [
+                          "repository_url",
+                          "branch",
+                          "working_directory",
+                          "username",
+                          "password",
+                        ],
+                        where: pick(["org_id", "project_id"])(data),
+                      }),
+                      models.project.findOne,
+                    ]),
+                    servicesCmd: pipe([
+                      get("cloudAuthentication.env_vars.SERVICES", []),
+                      flatMap((service) => ["--include-groups", service]),
+                    ]),
                   }),
-                  models.cloudAuthentication.findOne,
                   tap((param) => {
                     assert(true);
                   }),
                   defaultsDeep(data),
+                  assign({
+                    env_vars: ({
+                      cloudAuthentication,
+                      project,
+                      servicesCmd,
+                      org_id,
+                      project_id,
+                      workspace_id,
+                      run_id,
+                    }) =>
+                      pipe([
+                        () => cloudAuthentication.env_vars,
+                        defaultsDeep({
+                          DB_URL: config.db.urlDocker ?? config.db.url,
+                          S3_BUCKET: aws.bucketUpload,
+                          S3_BUCKET_KEY: `${org_id}/${project_id}/${workspace_id}/${run_id}/steps.txt`,
+                          GIT_REPO: project.repository_url,
+                          GIT_BRANCH: project.branch,
+                          GC_FLOW: buildGcFlow({
+                            servicesCmd,
+                            repository_url: project.repository_url,
+                            provider_type: cloudAuthentication.provider_type,
+                            bucketUpload: aws.bucketUpload,
+                            wsUrl: infra.wsUrl,
+                            org_id,
+                            project_id,
+                            workspace_id,
+                            run_id,
+                          }),
+                        }),
+                      ])(),
+                  }),
+                  tap((param) => {
+                    assert(true);
+                  }),
                   switchCase([
                     eq(get("engine"), "docker"),
                     pipe([
@@ -157,7 +309,8 @@ exports.RunApi = ({ app, models }) => {
                         workspace_id,
                         run_id,
                         env_vars,
-                        provider_type,
+                        cloudAuthentication,
+                        project,
                       }) => ({
                         containerImage: "grucloud/grucloud-cli",
                         org_id,
@@ -165,13 +318,14 @@ exports.RunApi = ({ app, models }) => {
                         workspace_id,
                         run_id,
                         env_vars,
-                        provider: provider_type,
+                        provider: cloudAuthentication.provider_type,
                         dockerClient: app.dockerClient,
                         GRUCLOUD_OAUTH_SUBJECT: buildSubject({
                           org_id,
                           project_id,
                           workspace_id,
                         }),
+                        project,
                       }),
                       dockerGcCreate,
                       get("Id"),
@@ -192,36 +346,15 @@ exports.RunApi = ({ app, models }) => {
                         project_id,
                         workspace_id,
                         run_id,
-                        env_vars,
-                        provider_type,
                         servicesCmd,
+                        cloudAuthentication,
+                        env_vars,
+                        project,
                       }) => ({
                         config,
                         container: {
                           name: "grucloud-cli",
-                          command: [
-                            "list",
-                            "--json",
-                            "grucloud-result.json",
-                            "--graph",
-                            "--infra",
-                            `/app/iac.js`,
-                            "--provider",
-                            provider_type,
-                            "--s3-bucket",
-                            aws.bucketUpload,
-                            "--s3-key",
-                            `${org_id}/${project_id}/${workspace_id}/${run_id}`,
-                            "--s3-local-dir",
-                            "/app/artifacts",
-                            "--ws-url",
-                            infra.wsUrl,
-                            "--ws-room",
-                            `${org_id}/${project_id}/${workspace_id}/${run_id}`,
-                            "--title",
-                            "",
-                            ...servicesCmd,
-                          ],
+                          command: [],
                           environment: pipe([
                             () => env_vars,
                             omit(["SERVICES"]),
diff --git a/server/src/plugins/cloudDiagram/migrations/011.do.app-seed.sql b/server/src/plugins/cloudDiagram/migrations/011.do.app-seed.sql
index 611d9852..2593ff9a 100644
--- a/server/src/plugins/cloudDiagram/migrations/011.do.app-seed.sql
+++ b/server/src/plugins/cloudDiagram/migrations/011.do.app-seed.sql
@@ -5,25 +5,31 @@ VALUES ('org-alice', 'org alice');
 INSERT INTO user_orgs (org_id, user_id)
 VALUES ('org-alice', 'alice-1234567890');
 -- project aws
-INSERT INTO project (org_id, project_id, project_name)
+INSERT INTO project (org_id, project_id, project_name, repository_url, branch)
 VALUES (
         'org-alice',
         'project-aws',
-        'alice project'
+        'alice project',
+        'https://github.com/FredericHeem/grucloud-aws-demo',
+        'main'
     );
 -- project azure
-INSERT INTO project (org_id, project_id, project_name)
+INSERT INTO project (org_id, project_id, project_name, repository_url, branch)
 VALUES (
         'org-alice',
         'project-azure',
-        'project azure'
+        'project azure',
+        'https://github.com/FredericHeem/grucloud-azure-demo',
+        'master'
     );
 -- project google
-INSERT INTO project (org_id, project_id, project_name)
+INSERT INTO project (org_id, project_id, project_name,repository_url, branch)
 VALUES (
         'org-alice',
         'project-google',
-        'project google'
+        'project google',
+        'https://github.com/FredericHeem/grucloud-gcp-demo',
+        'master'
     );
 -- workspace aws
 INSERT INTO workspace (org_id, project_id, workspace_id)
diff --git a/server/src/plugins/cloudDiagram/migrations/012.do.app-seed-js.js b/server/src/plugins/cloudDiagram/migrations/012.do.app-seed-js.js
index bad3f903..92693a04 100644
--- a/server/src/plugins/cloudDiagram/migrations/012.do.app-seed-js.js
+++ b/server/src/plugins/cloudDiagram/migrations/012.do.app-seed-js.js
@@ -23,7 +23,8 @@ VALUES (
           "AZURE_SUBSCRIPTION_ID": "${process.env.AZURE_SUBSCRIPTION_ID}",
           "AZURE_CLIENT_ID": "${process.env.AZURE_CLIENT_ID}",
           "AZURE_CLIENT_SECRET": "${process.env.AZURE_CLIENT_SECRET}",
-          "AZURE_OBJECT_ID": "${process.env.AZURE_OBJECT_ID}"
+          "AZURE_OBJECT_ID": "${process.env.AZURE_OBJECT_ID}",
+          "AZURE_LOCATION": "${process.env.AZURE_LOCATION}"
 
         }'
     );
diff --git a/server/src/plugins/cloudDiagram/test/test005Run.js b/server/src/plugins/cloudDiagram/test/test005Run.js
index 1620e295..e7dcd7ee 100644
--- a/server/src/plugins/cloudDiagram/test/test005Run.js
+++ b/server/src/plugins/cloudDiagram/test/test005Run.js
@@ -6,6 +6,7 @@ const project_id = "project-aws";
 
 const project_aws_id = "project-aws";
 const project_azure_id = "project-azure";
+const project_google_id = "project-google";
 
 const workspace_id = "dev";
 
diff --git a/server/src/plugins/cloudDiagram/utils/rungc.js b/server/src/plugins/cloudDiagram/utils/rungc.js
index c7ab2d7e..c478448a 100644
--- a/server/src/plugins/cloudDiagram/utils/rungc.js
+++ b/server/src/plugins/cloudDiagram/utils/rungc.js
@@ -140,45 +140,10 @@ exports.DockerGcCreate = ({ app }) => {
         outputDot: `resources.dot`,
         outputSvg: `resources.svg`,
       }),
-      assign({
-        servicesCmd: pipe([
-          () => env_vars,
-          get("SERVICES", []),
-          flatMap((service) => ["--include-groups", service]),
-        ]),
-      }),
+
       assign({
         name: () => `${containerName}-${run_id}`,
-        Cmd: ({ outputGcList, servicesCmd }) => [
-          "list",
-          "--provider",
-          provider,
-          "--s3-bucket",
-          //TODO configure
-          "grucloud-console-dev",
-          "--s3-key",
-          `${org_id}/${project_id}/${workspace_id}/${run_id}`,
-          "--s3-local-dir",
-          `/app/${outputDir}`,
-          "--ws-url",
-          "ws://host.docker.internal:9000",
-          "--ws-room",
-          `${org_id}/${project_id}/${workspace_id}/${run_id}`,
-          "--infra",
-          `/app/iac_${provider}.js`,
-          //"--config",
-          //`/app/input/config_${provider}.js`,
-          "--graph",
-          "--types-exclude",
-          "ServiceAccount",
-          "--json",
-          `${outputGcList}`,
-          //"--dot-file",
-          //`${outputDot}`,
-          "--title",
-          "",
-          ...servicesCmd,
-        ],
+        Cmd: () => [],
         outputGcListLocalPath: ({ outputGcList }) =>
           path.resolve(outputDir, outputGcList),
         HostConfig: () => ({
diff --git a/server/src/server/koa/koaServer.js b/server/src/server/koa/koaServer.js
index f39443bb..de33aa89 100644
--- a/server/src/server/koa/koaServer.js
+++ b/server/src/server/koa/koaServer.js
@@ -12,6 +12,7 @@ const contextHandleError = (error, context) =>
     tap(() => {
       assert(context);
       log.error(error);
+      error.response && log.error(error.response);
     }),
     () => {
       context.status = 500;

From 4193afd01188cbba605a1d363b85aac6e632534d Mon Sep 17 00:00:00 2001
From: Frederic Heem <frederic.heem@gmail.com>
Date: Sat, 25 Nov 2023 11:50:22 -0300
Subject: [PATCH 06/16] make it work

---
 deploy/playbook/group_vars/all/vars.yml       |  6 ++---
 deploy/playbook/tasks/api.yml                 | 10 ++++++---
 server/.dockerignore                          |  7 ++++--
 server/package.json                           |  8 +++----
 server/src/plugins/cloudDiagram/api/runApi.js | 22 +++++++------------
 .../plugins/cloudDiagram/utils/ecsTaskRun.js  |  5 ++++-
 .../plugins/cloudDiagram/utils/envUtils.js    |  2 +-
 .../src/plugins/cloudDiagram/utils/rungc.js   |  2 +-
 8 files changed, 33 insertions(+), 29 deletions(-)

diff --git a/deploy/playbook/group_vars/all/vars.yml b/deploy/playbook/group_vars/all/vars.yml
index 12a11efa..92d1c367 100644
--- a/deploy/playbook/group_vars/all/vars.yml
+++ b/deploy/playbook/group_vars/all/vars.yml
@@ -10,13 +10,13 @@ pip_install_packages:
 
 docker_base_url: "http:/v1.41"
 
-grucloud_image: "grucloud/grucloud-cli:v12.10.2"
+grucloud_image: "grucloud/grucloud-cli:v13.0.0"
 # Docker image tag names
 api_image: "fredericheem/grucloud-api"
-api_tag: "10.50"
+api_tag: "13.0.0"
 
 web_image: "fredericheem/grucloud-ui"
-web_tag: "12.21"
+web_tag: "13.0.0"
 
 firewall_state: started
 firewall_enabled_at_boot: true
diff --git a/deploy/playbook/tasks/api.yml b/deploy/playbook/tasks/api.yml
index 4b492976..0c5adb6e 100644
--- a/deploy/playbook/tasks/api.yml
+++ b/deploy/playbook/tasks/api.yml
@@ -24,9 +24,13 @@
       - "9000:9000"
     env:
       NODE_ENV: "production"
-      S3_AWS_REGION: "{{S3_AWS_REGION}}"
-      S3_AWSAccessKeyId: "{{S3_AWSAccessKeyId}}"
-      S3_AWSSecretKey: "{{S3_AWSSecretKey}}"
+      S3_AWS_REGION: "{{AWS_REGION}}"
+      S3_AWSAccessKeyId: "{{AWSAccessKeyId}}"
+      S3_AWSSecretKey: "{{AWSSecretKey}}"
+      AWS_REGION: "{{AWS_REGION}}"
+      AWSAccessKeyId: "{{AWSAccessKeyId}}"
+      AWSSecretKey: "{{AWSSecretKey}}"
+      GRUCLOUD_OAUTH_SERVER: "{{GRUCLOUD_OAUTH_SERVER}}"
       GRUCLOUD_OAUTH_CLIENT_SECRET: "{{GRUCLOUD_OAUTH_CLIENT_SECRET}}"
 
     networks:
diff --git a/server/.dockerignore b/server/.dockerignore
index 11fd42cf..73d2b83c 100644
--- a/server/.dockerignore
+++ b/server/.dockerignore
@@ -1,5 +1,5 @@
 .git
-.env
+*env
 .vscode
 coverage
 dist
@@ -7,4 +7,7 @@ builds
 local_backup
 node_modules
 docs
-
+output
+config/development.json
+test
+*.log
diff --git a/server/package.json b/server/package.json
index 22c3e868..061cc2ac 100644
--- a/server/package.json
+++ b/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "starhackit-api",
   "description": "The starhackit backend",
-  "version": "10.41.0",
+  "version": "13.0.0",
   "private": false,
   "main": "src/index.js",
   "repository": {
@@ -11,7 +11,7 @@
   "license": "NLPL",
   "scripts": {
     "start": "NODE_PATH=src node --env-file env --watch src/index.js",
-    "start:prod": "NODE_PATH=src NODE_ENV=production node --env-file env src/index.js",
+    "start:prod": "NODE_PATH=src NODE_ENV=production node src/index.js",
     "test": "npm run mocha",
     "mocha": "NODE_PATH=src node --env-file env  node_modules/mocha/bin/_mocha --file test/setup.js 'src/**/test*.js' --exit",
     "mocha:watch": "npm run mocha -- --watch",
@@ -24,8 +24,8 @@
     "db:drop": "dropdb dev -p 6432 -h localhost -U postgres",
     "db:recreate": "PGPASSWORD=password npm run db:drop && npm run db:create",
     "docker:build": "docker build . -t grucloud-api",
-    "docker:tag": "docker tag grucloud-api fredericheem/grucloud-api:10.50",
-    "docker:push": "docker push fredericheem/grucloud-api:10.50",
+    "docker:tag": "docker tag grucloud-api fredericheem/grucloud-api:13.0.0",
+    "docker:push": "docker push fredericheem/grucloud-api:13.0.0",
     "docker:btp": "npm run docker:build && npm run docker:tag && npm run docker:push",
     "docker:up": "docker-compose up -d",
     "docker:down": "docker-compose down",
diff --git a/server/src/plugins/cloudDiagram/api/runApi.js b/server/src/plugins/cloudDiagram/api/runApi.js
index 7e736690..559cdeb5 100644
--- a/server/src/plugins/cloudDiagram/api/runApi.js
+++ b/server/src/plugins/cloudDiagram/api/runApi.js
@@ -123,7 +123,7 @@ const buildCmd = ({
     () => [
       "list",
       "--json",
-      "grucloud-result.json",
+      "artifacts/grucloud-result.json",
       "--graph",
       // "--infra",
       // `/app/iac.js`,
@@ -134,8 +134,7 @@ const buildCmd = ({
       "--s3-key",
       `${org_id}/${project_id}/${workspace_id}/${run_id}`,
       "--s3-local-dir",
-      //"/app/artifacts",
-      "artifacts",
+      "/app/my-repo/artifacts",
       "--ws-url",
       wsUrl,
       "--ws-room",
@@ -163,6 +162,10 @@ const buildGcFlow = ({
     when(
       () => repository_url,
       pipe([
+        append({
+          name: "Env",
+          run: "env",
+        }),
         append({
           name: "Clone Repo",
           run: "git clone $GIT_REPO -b $GIT_BRANCH --depth 1 my-repo",
@@ -341,16 +344,7 @@ exports.RunApi = ({ app, models }) => {
                           flatMap((service) => ["--include-groups", service]),
                         ]),
                       }),
-                      ({
-                        org_id,
-                        project_id,
-                        workspace_id,
-                        run_id,
-                        servicesCmd,
-                        cloudAuthentication,
-                        env_vars,
-                        project,
-                      }) => ({
+                      ({ org_id, project_id, workspace_id, env_vars }) => ({
                         config,
                         container: {
                           name: "grucloud-cli",
@@ -451,7 +445,7 @@ exports.RunApi = ({ app, models }) => {
                     svgUrl: buildS3SignedUrl({
                       config,
                       context,
-                      filename: "artifacts/diagram-live.svg",
+                      filename: "diagram-live.svg",
                     }),
                   }),
                   contextSetOk({ context }),
diff --git a/server/src/plugins/cloudDiagram/utils/ecsTaskRun.js b/server/src/plugins/cloudDiagram/utils/ecsTaskRun.js
index 5ad5493c..5592d2b2 100644
--- a/server/src/plugins/cloudDiagram/utils/ecsTaskRun.js
+++ b/server/src/plugins/cloudDiagram/utils/ecsTaskRun.js
@@ -13,7 +13,10 @@ exports.ecsTaskRun = ({ config: { ecs }, container }) =>
     pipe([
       tap(() => {
         log.debug(
-          `ecsTaskRun cluster: ${ecs.cluster}, taskDefinition: ${ecs.taskDefinition}, subnets: ${ecs.subnets}, securityGroups: ${ecs.securityGroups}`
+          `ecsTaskRun cluster: ${ecs.cluster}, taskDefinition: ${ecs.taskDefinition}, subnets: ${ecs.subnets}, securityGroups: ${ecs.securityGroups}, AWS_REGION: ${AWS_REGION}`
+        );
+        log.debug(
+          `ecsTaskRun AWS_REGION: ${AWS_REGION}, AWSAccessKeyId: ${AWSAccessKeyId}`
         );
         assert(ecs);
         assert(ecs.cluster);
diff --git a/server/src/plugins/cloudDiagram/utils/envUtils.js b/server/src/plugins/cloudDiagram/utils/envUtils.js
index 50d34632..9308097b 100644
--- a/server/src/plugins/cloudDiagram/utils/envUtils.js
+++ b/server/src/plugins/cloudDiagram/utils/envUtils.js
@@ -14,7 +14,7 @@ const defaultEnv = [
 exports.transformEnv = ({ GRUCLOUD_OAUTH_SUBJECT }) =>
   pipe([
     defaultsDeep(pick(defaultEnv)(process.env)),
-    defaultsDeep({ GRUCLOUD_OAUTH_SUBJECT }),
+    defaultsDeep({ GRUCLOUD_OAUTH_SUBJECT, CONTINUOUS_INTEGRATION: "1" }),
     when(
       get("GOOGLE_CREDENTIALS"),
       assign({
diff --git a/server/src/plugins/cloudDiagram/utils/rungc.js b/server/src/plugins/cloudDiagram/utils/rungc.js
index c478448a..1de0f39f 100644
--- a/server/src/plugins/cloudDiagram/utils/rungc.js
+++ b/server/src/plugins/cloudDiagram/utils/rungc.js
@@ -172,7 +172,7 @@ exports.DockerGcCreate = ({ app }) => {
               Cmd,
               Env,
               HostConfig,
-              WorkingDir: `/app/${outputDir}`,
+              WorkingDir: `/app/`,
             },
           }),
           tap((xxx) => {

From ec4cc6add69faa44a480a006b5ad35cb1c3498f5 Mon Sep 17 00:00:00 2001
From: Frederic Heem <frederic.heem@gmail.com>
Date: Sat, 25 Nov 2023 17:35:57 -0300
Subject: [PATCH 07/16] remove room on closed

---
 server/src/plugins/cloudDiagram/index.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/server/src/plugins/cloudDiagram/index.js b/server/src/plugins/cloudDiagram/index.js
index a5576804..22aa0e0b 100644
--- a/server/src/plugins/cloudDiagram/index.js
+++ b/server/src/plugins/cloudDiagram/index.js
@@ -95,8 +95,8 @@ module.exports = (app) => {
     const ws = ctx.websocket;
     dockerGcRun = DockerGcRun({ app, models, ws });
     ws.on("close", () => {
-      console.log("ws close");
-      const room = producerMap.get();
+      const room = producerMap.get(ws);
+      console.log("ws close room", room);
       if (room) {
         roomMap.delete(room);
       }

From 17c581b422482abf809a4ed010a099dfedcd2097 Mon Sep 17 00:00:00 2001
From: Frederic Heem <frederic.heem@gmail.com>
Date: Sat, 25 Nov 2023 17:36:09 -0300
Subject: [PATCH 08/16] WS_URL and WS_ROOM

---
 server/src/plugins/cloudDiagram/api/runApi.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/server/src/plugins/cloudDiagram/api/runApi.js b/server/src/plugins/cloudDiagram/api/runApi.js
index 559cdeb5..241b6fdd 100644
--- a/server/src/plugins/cloudDiagram/api/runApi.js
+++ b/server/src/plugins/cloudDiagram/api/runApi.js
@@ -297,6 +297,8 @@ exports.RunApi = ({ app, models }) => {
                             workspace_id,
                             run_id,
                           }),
+                          WS_URL: infra.wsUrl,
+                          WS_ROOM: `${org_id}/${project_id}/${workspace_id}/${run_id}`,
                         }),
                       ])(),
                   }),

From 01628bee755d0906998132dc315d6fafae915cfc Mon Sep 17 00:00:00 2001
From: Frederic Heem <frederic.heem@gmail.com>
Date: Tue, 28 Nov 2023 13:39:11 -0300
Subject: [PATCH 09/16] close socket

---
 server/src/plugins/cloudDiagram/api/runApi.js | 19 ++++++++++---------
 server/src/plugins/cloudDiagram/index.js      |  8 ++++++--
 .../src/plugins/cloudDiagram/utils/rungc.js   |  8 ++++----
 3 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/server/src/plugins/cloudDiagram/api/runApi.js b/server/src/plugins/cloudDiagram/api/runApi.js
index 241b6fdd..2782b4a5 100644
--- a/server/src/plugins/cloudDiagram/api/runApi.js
+++ b/server/src/plugins/cloudDiagram/api/runApi.js
@@ -135,10 +135,10 @@ const buildCmd = ({
       `${org_id}/${project_id}/${workspace_id}/${run_id}`,
       "--s3-local-dir",
       "/app/my-repo/artifacts",
-      "--ws-url",
-      wsUrl,
-      "--ws-room",
-      `${org_id}/${project_id}/${workspace_id}/${run_id}`,
+      // "--ws-url",
+      // wsUrl,
+      // "--ws-room",
+      // `${org_id}/${project_id}/${workspace_id}/${run_id}`,
       "--title",
       '""',
       ...servicesCmd,
@@ -162,21 +162,22 @@ const buildGcFlow = ({
     when(
       () => repository_url,
       pipe([
-        append({
-          name: "Env",
-          run: "env",
-        }),
         append({
           name: "Clone Repo",
           run: "git clone $GIT_REPO -b $GIT_BRANCH --depth 1 my-repo",
         }),
         append({
           name: "npm install",
-          run: "npm install",
+          run: "npm install --loglevel=error",
           workingDirectory: "my-repo",
         }),
       ])
     ),
+    // append({
+    //   name: "ls",
+    //   run: "ls -l",
+    //   workingDirectory: "my-repo",
+    // }),
     append({
       name: "gc list",
       run: `node_modules/.bin/gc ${buildCmd({
diff --git a/server/src/plugins/cloudDiagram/index.js b/server/src/plugins/cloudDiagram/index.js
index 22aa0e0b..f186d8a7 100644
--- a/server/src/plugins/cloudDiagram/index.js
+++ b/server/src/plugins/cloudDiagram/index.js
@@ -94,9 +94,11 @@ module.exports = (app) => {
   app.server.koa.ws.use((ctx) => {
     const ws = ctx.websocket;
     dockerGcRun = DockerGcRun({ app, models, ws });
-    ws.on("close", () => {
+    ws.on("close", (event) => {
       const room = producerMap.get(ws);
       console.log("ws close room", room);
+      //console.log(ws);
+
       if (room) {
         roomMap.delete(room);
       }
@@ -124,7 +126,7 @@ module.exports = (app) => {
             }
             producerMap.set(ws, options.room);
             break;
-          case "list": {
+          case "end": {
             const { error } = data;
             const room = producerMap.get(ws);
             if (room) {
@@ -164,6 +166,8 @@ module.exports = (app) => {
                     console.log("sending back");
                     client.send(message.toString());
                   });
+              } else {
+                console.error("no client for room", room);
               }
             } else {
               console.error("no room for log command");
diff --git a/server/src/plugins/cloudDiagram/utils/rungc.js b/server/src/plugins/cloudDiagram/utils/rungc.js
index 1de0f39f..0edea71b 100644
--- a/server/src/plugins/cloudDiagram/utils/rungc.js
+++ b/server/src/plugins/cloudDiagram/utils/rungc.js
@@ -36,21 +36,21 @@ exports.DockerGcRun = ({ app, models, ws }) => {
       () => ({ name: container_id }),
       dockerClient.container.start,
       tap((params) => {
-        ws.send("update status");
+        // ws.send("update status");
         log.debug("DockerGcRun", container_id, "started, wait for completion");
       }),
       // Update status
       () => ({ data: { status: "running" }, where: { container_id } }),
       models.run.update,
       tap((params) => {
-        ws.send("wait for completion");
+        //ws.send("wait for completion");
       }),
       // Wait
       () => ({ name: container_id }),
       dockerClient.container.wait,
       tap((params) => {
         log.debug("DockerGcRun ", container_id, "ended");
-        ws.send("getting container state");
+        //ws.send("getting container state");
       }),
       // Get container state
       () => ({ id: container_id }),
@@ -58,7 +58,7 @@ exports.DockerGcRun = ({ app, models, ws }) => {
       get("State"),
       tap((State) => {
         log.debug(`container state ${JSON.stringify(State)}`);
-        ws.send("saving container state");
+        //ws.send("saving container state");
       }),
       // Save container_state and status to DB
       (container_state) => ({

From d008b0ac21346b904cb09d4e0a01b163f0d2a127 Mon Sep 17 00:00:00 2001
From: Frederic Heem <frederic.heem@gmail.com>
Date: Sun, 3 Dec 2023 20:29:19 -0300
Subject: [PATCH 10/16] run on lambda

---
 deploy/grucloud-aws/.gitignore                |   8 -
 deploy/grucloud-aws/.npmrc                    |   1 -
 deploy/grucloud-aws/.vscode/launch.json       |  71 ---
 deploy/grucloud-aws/README.md                 |  51 --
 deploy/grucloud-aws/config.js                 |   8 -
 deploy/grucloud-aws/default.templateenv       |   5 -
 deploy/grucloud-aws/diagram-live.svg          | 472 ------------------
 deploy/grucloud-aws/diagram-target.svg        | 317 ------------
 deploy/grucloud-aws/hooks.js                  |  97 ----
 deploy/grucloud-aws/iac.js                    | 301 -----------
 deploy/grucloud-aws/package.json              |  17 -
 deploy/grucloud-aws/resources-mindmap.puml    |  45 --
 deploy/grucloud-aws/resources-mindmap.svg     |  55 --
 deploy/playbook/group_vars/all/vars.yml       |   4 +-
 server/package.json                           |   1 +
 server/src/plugins/cloudDiagram/api/runApi.js | 111 ++--
 .../plugins/cloudDiagram/test/test005Run.js   |  43 +-
 .../plugins/cloudDiagram/test/testEcsTask.js  |  48 +-
 .../plugins/cloudDiagram/utils/ECSClient.js   |  24 +
 .../cloudDiagram/utils/LambdaClient.js        |  24 +
 .../plugins/cloudDiagram/utils/S3Client.js    |  24 +
 .../plugins/cloudDiagram/utils/ecsTaskRun.js  |  16 +-
 .../plugins/cloudDiagram/utils/lambdaRun.js   |  57 +++
 .../src/plugins/cloudDiagram/utils/rungc.js   |   9 +-
 24 files changed, 261 insertions(+), 1548 deletions(-)
 delete mode 100644 deploy/grucloud-aws/.gitignore
 delete mode 100644 deploy/grucloud-aws/.npmrc
 delete mode 100644 deploy/grucloud-aws/.vscode/launch.json
 delete mode 100644 deploy/grucloud-aws/README.md
 delete mode 100644 deploy/grucloud-aws/config.js
 delete mode 100644 deploy/grucloud-aws/default.templateenv
 delete mode 100644 deploy/grucloud-aws/diagram-live.svg
 delete mode 100644 deploy/grucloud-aws/diagram-target.svg
 delete mode 100644 deploy/grucloud-aws/hooks.js
 delete mode 100644 deploy/grucloud-aws/iac.js
 delete mode 100644 deploy/grucloud-aws/package.json
 delete mode 100644 deploy/grucloud-aws/resources-mindmap.puml
 delete mode 100644 deploy/grucloud-aws/resources-mindmap.svg
 create mode 100644 server/src/plugins/cloudDiagram/utils/ECSClient.js
 create mode 100644 server/src/plugins/cloudDiagram/utils/LambdaClient.js
 create mode 100644 server/src/plugins/cloudDiagram/utils/S3Client.js
 create mode 100644 server/src/plugins/cloudDiagram/utils/lambdaRun.js

diff --git a/deploy/grucloud-aws/.gitignore b/deploy/grucloud-aws/.gitignore
deleted file mode 100644
index d138929c..00000000
--- a/deploy/grucloud-aws/.gitignore
+++ /dev/null
@@ -1,8 +0,0 @@
-*.csv
-*.pem
-node_modules/
-*.env
-.nyc_output
-coverage
-*.log
-*.dot
diff --git a/deploy/grucloud-aws/.npmrc b/deploy/grucloud-aws/.npmrc
deleted file mode 100644
index 43c97e71..00000000
--- a/deploy/grucloud-aws/.npmrc
+++ /dev/null
@@ -1 +0,0 @@
-package-lock=false
diff --git a/deploy/grucloud-aws/.vscode/launch.json b/deploy/grucloud-aws/.vscode/launch.json
deleted file mode 100644
index 145bd259..00000000
--- a/deploy/grucloud-aws/.vscode/launch.json
+++ /dev/null
@@ -1,71 +0,0 @@
-{
-  "version": "0.2.0",
-  "configurations": [
-    {
-      "name": "Graph",
-      "type": "node",
-      "request": "launch",
-      "runtimeExecutable": "gc",
-      "runtimeArgs": ["graph"],
-      "internalConsoleOptions": "openOnSessionStart",
-      "console": "integratedTerminal",
-      "cwd": "${workspaceRoot}",
-      "port": 9229
-    },
-    {
-      "name": "List -g -o",
-      "type": "node",
-      "request": "launch",
-      "runtimeExecutable": "gc",
-      "runtimeArgs": ["list", "-g", "-o"],
-      "internalConsoleOptions": "openOnSessionStart",
-      "console": "integratedTerminal",
-      "cwd": "${workspaceRoot}",
-      "port": 9229
-    },
-    {
-      "name": "Plan",
-      "type": "node",
-      "request": "launch",
-      "runtimeExecutable": "gc",
-      "runtimeArgs": ["plan"],
-      "internalConsoleOptions": "openOnSessionStart",
-      "console": "integratedTerminal",
-      "cwd": "${workspaceRoot}",
-      "port": 9229
-    },
-    {
-      "name": "Apply",
-      "type": "node",
-      "request": "launch",
-      "runtimeExecutable": "gc",
-      "runtimeArgs": ["apply", "-f"],
-      "internalConsoleOptions": "openOnSessionStart",
-      "console": "integratedTerminal",
-      "cwd": "${workspaceRoot}",
-      "port": 9229
-    },
-    {
-      "name": "Destroy",
-      "type": "node",
-      "request": "launch",
-      "runtimeExecutable": "gc",
-      "runtimeArgs": ["destroy", "-f"],
-      "internalConsoleOptions": "openOnSessionStart",
-      "console": "integratedTerminal",
-      "cwd": "${workspaceRoot}",
-      "port": 9229
-    }
-    {
-      "name": "Info",
-      "type": "node",
-      "request": "launch",
-      "runtimeExecutable": "gc",
-      "runtimeArgs": ["info"],
-      "internalConsoleOptions": "openOnSessionStart",
-      "console": "integratedTerminal",
-      "cwd": "${workspaceRoot}",
-      "port": 9229
-    }
-  ]
-}
diff --git a/deploy/grucloud-aws/README.md b/deploy/grucloud-aws/README.md
deleted file mode 100644
index 2d138394..00000000
--- a/deploy/grucloud-aws/README.md
+++ /dev/null
@@ -1,51 +0,0 @@
-# Deploy infrastructure on AWS with GruCloud
-
-This directory contains the code to deploy and destroy the instructure on AWS with [grucloud](https://grucloud.com).
-
-The following resources are defined in [iac](./iac.js):
-
-![resource-mindmap](./resources-mindmap.svg)
-
-> Mindmap generated by `gc tree`
-
-Visit [AwsRequirements](https://www.grucloud.com/docs/aws/AwsRequirements) and ensure the _aws cli_ is configured properly.
-
-Edit [config.js](config.js) and change the domain name and the key pair name.
-
-Install the _gc CLI_ globally:
-
-```sh
-npm i -g @grucloud/core
-```
-
-Install the dependencies
-
-```sh
-npm i
-```
-
-Generate a graph of the infrastructure:
-
-```sh
-gc graph
-```
-
-![Graph](artifacts/diagram-target.svg)
-
-Deploy the infrastructure with:
-
-```sh
-gc apply
-```
-
-List the running resources:
-
-```sh
-gc list
-```
-
-Destroy the running resources:
-
-```sh
-gc destroy
-```
diff --git a/deploy/grucloud-aws/config.js b/deploy/grucloud-aws/config.js
deleted file mode 100644
index 2d83a3a7..00000000
--- a/deploy/grucloud-aws/config.js
+++ /dev/null
@@ -1,8 +0,0 @@
-const pkg = require("./package.json");
-
-module.exports = () => ({
-  domainName: "grucloud.com",
-  keyPairName: "grucloud-app",
-  projectName: pkg.name,
-  availabilityZoneSuffix: "b",
-});
diff --git a/deploy/grucloud-aws/default.templateenv b/deploy/grucloud-aws/default.templateenv
deleted file mode 100644
index 0bd0c95a..00000000
--- a/deploy/grucloud-aws/default.templateenv
+++ /dev/null
@@ -1,5 +0,0 @@
-AWSAccessKeyId=
-AWSSecretKey=
-AWS_REGION=us-east-1
-
-
diff --git a/deploy/grucloud-aws/diagram-live.svg b/deploy/grucloud-aws/diagram-live.svg
deleted file mode 100644
index eccfee87..00000000
--- a/deploy/grucloud-aws/diagram-live.svg
+++ /dev/null
@@ -1,472 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
- "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<!-- Generated by graphviz version 2.44.1 (20200629.0846)
- -->
-<!-- Title: graphname Pages: 1 -->
-<svg width="902pt" height="1645pt"
- viewBox="0.00 0.00 902.00 1644.70" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 1640.7)">
-<title>graphname</title>
-<polygon fill="#fafafa" stroke="transparent" points="-4,4 -4,-1640.7 898,-1640.7 898,4 -4,4"/>
-<text text-anchor="start" x="336" y="-1612.1" font-family="Helvetica,sans-Serif" font-weight="bold" font-size="22.00" fill="#383838">Project grucloud&#45;aws</text>
-<text text-anchor="start" x="336" y="-1586.9" font-family="Helvetica,sans-Serif" font-weight="bold" font-size="16.00" fill="#707070">Live Diagram</text>
-<g id="clust1" class="cluster">
-<title>cluster_aws</title>
-<polygon fill="#f5f5f5" stroke="#f5f5f5" points="8,-8 8,-1555 886,-1555 886,-8 8,-8"/>
-<text text-anchor="start" x="385" y="-23" font-family="Helvetica,sans-Serif" font-weight="bold" font-size="20.00" fill="#707070">Provider aws</text>
-</g>
-<g id="clust2" class="cluster">
-<title>cluster_aws_</title>
-<polygon fill="#eeeeee" stroke="#eeeeee" points="16,-54 16,-1547 878,-1547 878,-54 16,-54"/>
-<text text-anchor="start" x="446.86" y="-58.3" font-family="Helvetica,sans-Serif" font-size="1.00" fill="#383838"> </text>
-</g>
-<!-- Volume::::vol&#45;034a467db1e71e984 -->
-<g id="node1" class="node">
-<title>Volume::::vol&#45;034a467db1e71e984</title>
-<polygon fill="#e5e5e5" stroke="#dddddd" points="536.5,-473 332.5,-473 332.5,-415 536.5,-415 536.5,-473"/>
-<text text-anchor="start" x="344.5" y="-453.2" font-family="Helvetica,sans-Serif" font-weight="bold" font-size="16.00" fill="#707070">Volume</text>
-<text text-anchor="start" x="344.5" y="-428.2" font-family="Helvetica,sans-Serif" font-size="16.00" fill="#383838">vol&#45;034a467db1e71e984</text>
-</g>
-<!-- KeyPair::::grucloud&#45;app -->
-<g id="node2" class="node">
-<title>KeyPair::::grucloud&#45;app</title>
-<polygon fill="#e5e5e5" stroke="#dddddd" points="494,-549 375,-549 375,-491 494,-491 494,-549"/>
-<text text-anchor="start" x="387.5" y="-529.2" font-family="Helvetica,sans-Serif" font-weight="bold" font-size="16.00" fill="#707070">KeyPair</text>
-<text text-anchor="start" x="387.5" y="-504.2" font-family="Helvetica,sans-Serif" font-size="16.00" fill="#383838">grucloud&#45;app</text>
-</g>
-<!-- Route53Domain::::grucloud.com -->
-<g id="node3" class="node">
-<title>Route53Domain::::grucloud.com</title>
-<polygon fill="#e5e5e5" stroke="#dddddd" points="227.5,-1539 81.5,-1539 81.5,-1481 227.5,-1481 227.5,-1539"/>
-<text text-anchor="start" x="93.5" y="-1519.2" font-family="Helvetica,sans-Serif" font-weight="bold" font-size="16.00" fill="#707070">Route53Domain</text>
-<text text-anchor="start" x="93.5" y="-1494.2" font-family="Helvetica,sans-Serif" font-size="16.00" fill="#383838">grucloud.com</text>
-</g>
-<!-- IamRole::::arn:aws:iam::161408406883:role/OrganizationAccountAccessRole -->
-<g id="node4" class="node">
-<title>IamRole::::arn:aws:iam::161408406883:role/OrganizationAccountAccessRole</title>
-<polygon fill="#e5e5e5" stroke="#dddddd" points="285,-1463 24,-1463 24,-1405 285,-1405 285,-1463"/>
-<text text-anchor="start" x="36.5" y="-1443.2" font-family="Helvetica,sans-Serif" font-weight="bold" font-size="16.00" fill="#707070">IamRole</text>
-<text text-anchor="start" x="36.5" y="-1418.2" font-family="Helvetica,sans-Serif" font-size="16.00" fill="#383838">OrganizationAccountAccessRole</text>
-</g>
-<!-- HostedZone::::/hostedzone/Z0829805257L0AS74FNR9 -->
-<g id="node5" class="node">
-<title>HostedZone::::/hostedzone/Z0829805257L0AS74FNR9</title>
-<polygon fill="#e5e5e5" stroke="#dddddd" points="498,-1367 371,-1367 371,-1309 498,-1309 498,-1367"/>
-<text text-anchor="start" x="383.5" y="-1347.2" font-family="Helvetica,sans-Serif" font-weight="bold" font-size="16.00" fill="#707070">HostedZone</text>
-<text text-anchor="start" x="383.5" y="-1322.2" font-family="Helvetica,sans-Serif" font-size="16.00" fill="#383838">grucloud.com.</text>
-</g>
-<!-- Vpc::::vpc&#45;0a3a7a91cb6b0dccb -->
-<g id="node6" class="node">
-<title>Vpc::::vpc&#45;0a3a7a91cb6b0dccb</title>
-<polygon fill="#e5e5e5" stroke="#dddddd" points="870,-343 816,-343 816,-285 870,-285 870,-343"/>
-<text text-anchor="start" x="828" y="-323.2" font-family="Helvetica,sans-Serif" font-weight="bold" font-size="16.00" fill="#707070">Vpc</text>
-<text text-anchor="start" x="828" y="-298.2" font-family="Helvetica,sans-Serif" font-size="16.00" fill="#383838">vpc</text>
-</g>
-<!-- Vpc::::vpc&#45;280b8555 -->
-<g id="node7" class="node">
-<title>Vpc::::vpc&#45;280b8555</title>
-<polygon fill="#e5e5e5" stroke="#dddddd" points="718.5,-1197 645.5,-1197 645.5,-1139 718.5,-1139 718.5,-1197"/>
-<text text-anchor="start" x="658" y="-1177.2" font-family="Helvetica,sans-Serif" font-weight="bold" font-size="16.00" fill="#707070">Vpc</text>
-<text text-anchor="start" x="658" y="-1152.2" font-family="Helvetica,sans-Serif" font-size="16.00" fill="#383838">default</text>
-</g>
-<!-- Image::::ami&#45;0a7ce59297fb8a731 -->
-<g id="node8" class="node">
-<title>Image::::ami&#45;0a7ce59297fb8a731</title>
-<polygon fill="#e5e5e5" stroke="#dddddd" points="494,-321 375,-321 375,-263 494,-263 494,-321"/>
-<text text-anchor="start" x="387.5" y="-301.2" font-family="Helvetica,sans-Serif" font-weight="bold" font-size="16.00" fill="#707070">Image</text>
-<text text-anchor="start" x="387.5" y="-276.2" font-family="Helvetica,sans-Serif" font-size="16.00" fill="#383838">ubuntu 20.04</text>
-</g>
-<!-- Subnet::::subnet&#45;2c0e760d -->
-<g id="node9" class="node">
-<title>Subnet::::subnet&#45;2c0e760d</title>
-<polygon fill="#e5e5e5" stroke="#dddddd" points="474,-1197 395,-1197 395,-1139 474,-1139 474,-1197"/>
-<text text-anchor="start" x="407.5" y="-1177.2" font-family="Helvetica,sans-Serif" font-weight="bold" font-size="16.00" fill="#707070">Subnet</text>
-<text text-anchor="start" x="407.5" y="-1152.2" font-family="Helvetica,sans-Serif" font-size="16.00" fill="#383838">default</text>
-</g>
-<!-- Subnet::::subnet&#45;2c0e760d&#45;&gt;Vpc::::vpc&#45;280b8555 -->
-<g id="edge4" class="edge">
-<title>Subnet::::subnet&#45;2c0e760d&#45;&gt;Vpc::::vpc&#45;280b8555</title>
-<path fill="none" stroke="#707070" d="M474.13,-1168C517.82,-1168 588.89,-1168 635.3,-1168"/>
-<polygon fill="#707070" stroke="#707070" points="635.39,-1171.5 645.39,-1168 635.39,-1164.5 635.39,-1171.5"/>
-</g>
-<!-- Subnet::::subnet&#45;ed027cb2 -->
-<g id="node10" class="node">
-<title>Subnet::::subnet&#45;ed027cb2</title>
-<polygon fill="#e5e5e5" stroke="#dddddd" points="474,-1121 395,-1121 395,-1063 474,-1063 474,-1121"/>
-<text text-anchor="start" x="407.5" y="-1101.2" font-family="Helvetica,sans-Serif" font-weight="bold" font-size="16.00" fill="#707070">Subnet</text>
-<text text-anchor="start" x="407.5" y="-1076.2" font-family="Helvetica,sans-Serif" font-size="16.00" fill="#383838">default</text>
-</g>
-<!-- Subnet::::subnet&#45;ed027cb2&#45;&gt;Vpc::::vpc&#45;280b8555 -->
-<g id="edge5" class="edge">
-<title>Subnet::::subnet&#45;ed027cb2&#45;&gt;Vpc::::vpc&#45;280b8555</title>
-<path fill="none" stroke="#707070" d="M474.13,-1103.96C517.91,-1117.51 589.19,-1139.58 635.59,-1153.94"/>
-<polygon fill="#707070" stroke="#707070" points="634.8,-1157.36 645.39,-1156.97 636.87,-1150.67 634.8,-1157.36"/>
-</g>
-<!-- Subnet::::subnet&#45;a14e43ec -->
-<g id="node11" class="node">
-<title>Subnet::::subnet&#45;a14e43ec</title>
-<polygon fill="#e5e5e5" stroke="#dddddd" points="474,-1045 395,-1045 395,-987 474,-987 474,-1045"/>
-<text text-anchor="start" x="407.5" y="-1025.2" font-family="Helvetica,sans-Serif" font-weight="bold" font-size="16.00" fill="#707070">Subnet</text>
-<text text-anchor="start" x="407.5" y="-1000.2" font-family="Helvetica,sans-Serif" font-size="16.00" fill="#383838">default</text>
-</g>
-<!-- Subnet::::subnet&#45;a14e43ec&#45;&gt;Vpc::::vpc&#45;280b8555 -->
-<g id="edge6" class="edge">
-<title>Subnet::::subnet&#45;a14e43ec&#45;&gt;Vpc::::vpc&#45;280b8555</title>
-<path fill="none" stroke="#707070" d="M474.02,-1025.07C496.5,-1031.3 524.88,-1040.85 548,-1054 584.81,-1074.94 620.93,-1106.83 646.21,-1131.56"/>
-<polygon fill="#707070" stroke="#707070" points="643.81,-1134.11 653.38,-1138.66 648.74,-1129.13 643.81,-1134.11"/>
-</g>
-<!-- Subnet::::subnet&#45;becd4c8f -->
-<g id="node12" class="node">
-<title>Subnet::::subnet&#45;becd4c8f</title>
-<polygon fill="#e5e5e5" stroke="#dddddd" points="474,-969 395,-969 395,-911 474,-911 474,-969"/>
-<text text-anchor="start" x="407.5" y="-949.2" font-family="Helvetica,sans-Serif" font-weight="bold" font-size="16.00" fill="#707070">Subnet</text>
-<text text-anchor="start" x="407.5" y="-924.2" font-family="Helvetica,sans-Serif" font-size="16.00" fill="#383838">default</text>
-</g>
-<!-- Subnet::::subnet&#45;becd4c8f&#45;&gt;Vpc::::vpc&#45;280b8555 -->
-<g id="edge7" class="edge">
-<title>Subnet::::subnet&#45;becd4c8f&#45;&gt;Vpc::::vpc&#45;280b8555</title>
-<path fill="none" stroke="#707070" d="M474.05,-946.69C497.21,-952.17 526.3,-961.75 548,-978 601.89,-1018.37 642.13,-1087.07 663.55,-1129.87"/>
-<polygon fill="#707070" stroke="#707070" points="660.41,-1131.42 667.96,-1138.85 666.7,-1128.33 660.41,-1131.42"/>
-</g>
-<!-- Subnet::::subnet&#45;f46b5cfa -->
-<g id="node13" class="node">
-<title>Subnet::::subnet&#45;f46b5cfa</title>
-<polygon fill="#e5e5e5" stroke="#dddddd" points="474,-893 395,-893 395,-835 474,-835 474,-893"/>
-<text text-anchor="start" x="407.5" y="-873.2" font-family="Helvetica,sans-Serif" font-weight="bold" font-size="16.00" fill="#707070">Subnet</text>
-<text text-anchor="start" x="407.5" y="-848.2" font-family="Helvetica,sans-Serif" font-size="16.00" fill="#383838">default</text>
-</g>
-<!-- Subnet::::subnet&#45;f46b5cfa&#45;&gt;Vpc::::vpc&#45;280b8555 -->
-<g id="edge8" class="edge">
-<title>Subnet::::subnet&#45;f46b5cfa&#45;&gt;Vpc::::vpc&#45;280b8555</title>
-<path fill="none" stroke="#707070" d="M474.14,-869.42C497.77,-874.44 527.32,-883.99 548,-902 618.53,-963.41 655.83,-1071.08 671.62,-1128.81"/>
-<polygon fill="#707070" stroke="#707070" points="668.29,-1129.88 674.24,-1138.64 675.05,-1128.08 668.29,-1129.88"/>
-</g>
-<!-- Subnet::::subnet&#45;22c5b744 -->
-<g id="node14" class="node">
-<title>Subnet::::subnet&#45;22c5b744</title>
-<polygon fill="#e5e5e5" stroke="#dddddd" points="474,-1519 395,-1519 395,-1461 474,-1461 474,-1519"/>
-<text text-anchor="start" x="407.5" y="-1499.2" font-family="Helvetica,sans-Serif" font-weight="bold" font-size="16.00" fill="#707070">Subnet</text>
-<text text-anchor="start" x="407.5" y="-1474.2" font-family="Helvetica,sans-Serif" font-size="16.00" fill="#383838">default</text>
-</g>
-<!-- Subnet::::subnet&#45;22c5b744&#45;&gt;Vpc::::vpc&#45;280b8555 -->
-<g id="edge9" class="edge">
-<title>Subnet::::subnet&#45;22c5b744&#45;&gt;Vpc::::vpc&#45;280b8555</title>
-<path fill="none" stroke="#707070" d="M474.03,-1484.82C497.77,-1479.88 527.48,-1470.34 548,-1452 622.64,-1385.3 658.67,-1267.91 673.05,-1207.05"/>
-<polygon fill="#707070" stroke="#707070" points="676.51,-1207.61 675.33,-1197.08 669.69,-1206.05 676.51,-1207.61"/>
-</g>
-<!-- Subnet::::subnet&#45;0357436d6b0748d2e -->
-<g id="node15" class="node">
-<title>Subnet::::subnet&#45;0357436d6b0748d2e</title>
-<polygon fill="#e5e5e5" stroke="#dddddd" points="721.5,-319 642.5,-319 642.5,-261 721.5,-261 721.5,-319"/>
-<text text-anchor="start" x="655" y="-299.2" font-family="Helvetica,sans-Serif" font-weight="bold" font-size="16.00" fill="#707070">Subnet</text>
-<text text-anchor="start" x="655" y="-274.2" font-family="Helvetica,sans-Serif" font-size="16.00" fill="#383838">subnet</text>
-</g>
-<!-- Subnet::::subnet&#45;0357436d6b0748d2e&#45;&gt;Vpc::::vpc&#45;0a3a7a91cb6b0dccb -->
-<g id="edge10" class="edge">
-<title>Subnet::::subnet&#45;0357436d6b0748d2e&#45;&gt;Vpc::::vpc&#45;0a3a7a91cb6b0dccb</title>
-<path fill="none" stroke="#707070" d="M721.9,-295.87C747.48,-299.73 780.73,-304.75 805.75,-308.53"/>
-<polygon fill="#707070" stroke="#707070" points="805.52,-312.03 815.93,-310.06 806.56,-305.11 805.52,-312.03"/>
-</g>
-<!-- InternetGateway::::igw&#45;0afcf265918398336 -->
-<g id="node16" class="node">
-<title>InternetGateway::::igw&#45;0afcf265918398336</title>
-<polygon fill="#e5e5e5" stroke="#dddddd" points="757,-243 607,-243 607,-185 757,-185 757,-243"/>
-<text text-anchor="start" x="619" y="-223.2" font-family="Helvetica,sans-Serif" font-weight="bold" font-size="16.00" fill="#707070">InternetGateway</text>
-<text text-anchor="start" x="619" y="-198.2" font-family="Helvetica,sans-Serif" font-size="16.00" fill="#383838">ig</text>
-</g>
-<!-- InternetGateway::::igw&#45;0afcf265918398336&#45;&gt;Vpc::::vpc&#45;0a3a7a91cb6b0dccb -->
-<g id="edge16" class="edge">
-<title>InternetGateway::::igw&#45;0afcf265918398336&#45;&gt;Vpc::::vpc&#45;0a3a7a91cb6b0dccb</title>
-<path fill="none" stroke="#707070" d="M757.17,-239.32C765.12,-243.12 772.89,-247.35 780,-252 790.86,-259.1 801.35,-268.35 810.53,-277.52"/>
-<polygon fill="#707070" stroke="#707070" points="808.12,-280.06 817.59,-284.82 813.15,-275.2 808.12,-280.06"/>
-</g>
-<!-- InternetGateway::::igw&#45;a50bf6df -->
-<g id="node17" class="node">
-<title>InternetGateway::::igw&#45;a50bf6df</title>
-<polygon fill="#e5e5e5" stroke="#dddddd" points="509.5,-1443 359.5,-1443 359.5,-1385 509.5,-1385 509.5,-1443"/>
-<text text-anchor="start" x="371.5" y="-1423.2" font-family="Helvetica,sans-Serif" font-weight="bold" font-size="16.00" fill="#707070">InternetGateway</text>
-<text text-anchor="start" x="371.5" y="-1398.2" font-family="Helvetica,sans-Serif" font-size="16.00" fill="#383838">igw&#45;a50bf6df</text>
-</g>
-<!-- InternetGateway::::igw&#45;a50bf6df&#45;&gt;Vpc::::vpc&#45;280b8555 -->
-<g id="edge17" class="edge">
-<title>InternetGateway::::igw&#45;a50bf6df&#45;&gt;Vpc::::vpc&#45;280b8555</title>
-<path fill="none" stroke="#707070" d="M509.66,-1396.94C523.27,-1391.66 536.71,-1384.83 548,-1376 605.68,-1330.88 645.61,-1253.34 665.79,-1206.75"/>
-<polygon fill="#707070" stroke="#707070" points="669.11,-1207.88 669.79,-1197.3 662.67,-1205.15 669.11,-1207.88"/>
-</g>
-<!-- Route53Record::::A::grucloud.com. -->
-<g id="node18" class="node">
-<title>Route53Record::::A::grucloud.com.</title>
-<polygon fill="#e5e5e5" stroke="#dddddd" points="235.5,-1235 73.5,-1235 73.5,-1177 235.5,-1177 235.5,-1235"/>
-<text text-anchor="start" x="85.5" y="-1215.2" font-family="Helvetica,sans-Serif" font-weight="bold" font-size="16.00" fill="#707070">Route53Record</text>
-<text text-anchor="start" x="85.5" y="-1190.2" font-family="Helvetica,sans-Serif" font-size="16.00" fill="#383838">grucloud.com.&#45;ipv4</text>
-</g>
-<!-- Route53Record::::A::grucloud.com.&#45;&gt;HostedZone::::/hostedzone/Z0829805257L0AS74FNR9 -->
-<g id="edge18" class="edge">
-<title>Route53Record::::A::grucloud.com.&#45;&gt;HostedZone::::/hostedzone/Z0829805257L0AS74FNR9</title>
-<path fill="none" stroke="#707070" d="M235.71,-1219.9C253.08,-1225.45 270.56,-1233.19 285,-1244 308.69,-1261.73 297.67,-1281.8 321,-1300 332.75,-1309.17 346.84,-1316.19 361.01,-1321.55"/>
-<polygon fill="#707070" stroke="#707070" points="360.21,-1324.98 370.8,-1324.99 362.53,-1318.37 360.21,-1324.98"/>
-</g>
-<!-- ElasticIpAddress::::eipalloc&#45;07efbd8b54f12f828 -->
-<g id="node19" class="node">
-<title>ElasticIpAddress::::eipalloc&#45;07efbd8b54f12f828</title>
-<polygon fill="#e5e5e5" stroke="#dddddd" points="231.5,-1311 77.5,-1311 77.5,-1253 231.5,-1253 231.5,-1311"/>
-<text text-anchor="start" x="89.5" y="-1291.2" font-family="Helvetica,sans-Serif" font-weight="bold" font-size="16.00" fill="#707070">ElasticIpAddress</text>
-<text text-anchor="start" x="89.5" y="-1266.2" font-family="Helvetica,sans-Serif" font-size="16.00" fill="#383838">ip</text>
-</g>
-<!-- RouteTable::::rtb&#45;c05f4bbe -->
-<g id="node20" class="node">
-<title>RouteTable::::rtb&#45;c05f4bbe</title>
-<polygon fill="#e5e5e5" stroke="#dddddd" points="212,-1387 97,-1387 97,-1329 212,-1329 212,-1387"/>
-<text text-anchor="start" x="109.5" y="-1367.2" font-family="Helvetica,sans-Serif" font-weight="bold" font-size="16.00" fill="#707070">RouteTable</text>
-<text text-anchor="start" x="109.5" y="-1342.2" font-family="Helvetica,sans-Serif" font-size="16.00" fill="#383838">rtb&#45;c05f4bbe</text>
-</g>
-<!-- RouteTable::::rtb&#45;c05f4bbe&#45;&gt;Vpc::::vpc&#45;280b8555 -->
-<g id="edge19" class="edge">
-<title>RouteTable::::rtb&#45;c05f4bbe&#45;&gt;Vpc::::vpc&#45;280b8555</title>
-<path fill="none" stroke="#707070" d="M212.25,-1362.26C237.59,-1366.98 265.97,-1376.6 285,-1396 327.58,-1439.41 272.67,-1491.09 321,-1528 401.18,-1589.24 465.22,-1585.67 548,-1528 654.39,-1453.89 675.89,-1284.43 680.08,-1207.41"/>
-<polygon fill="#707070" stroke="#707070" points="683.59,-1207.32 680.56,-1197.17 676.59,-1206.99 683.59,-1207.32"/>
-</g>
-<!-- RouteTable::::rtb&#45;c05f4bbe&#45;&gt;InternetGateway::::igw&#45;a50bf6df -->
-<g id="edge20" class="edge">
-<title>RouteTable::::rtb&#45;c05f4bbe&#45;&gt;InternetGateway::::igw&#45;a50bf6df</title>
-<path fill="none" stroke="#707070" d="M212.09,-1369.4C251.57,-1377.35 304.94,-1388.1 349.38,-1397.06"/>
-<polygon fill="#707070" stroke="#707070" points="348.81,-1400.51 359.3,-1399.05 350.19,-1393.65 348.81,-1400.51"/>
-</g>
-<!-- RouteTable::::rtb&#45;06b8e49ef9c983e40 -->
-<g id="node21" class="node">
-<title>RouteTable::::rtb&#45;06b8e49ef9c983e40</title>
-<polygon fill="#e5e5e5" stroke="#dddddd" points="780,-596 584,-596 584,-538 780,-538 780,-596"/>
-<text text-anchor="start" x="596" y="-576.2" font-family="Helvetica,sans-Serif" font-weight="bold" font-size="16.00" fill="#707070">RouteTable</text>
-<text text-anchor="start" x="596" y="-551.2" font-family="Helvetica,sans-Serif" font-size="16.00" fill="#383838">rtb&#45;06b8e49ef9c983e40</text>
-</g>
-<!-- RouteTable::::rtb&#45;06b8e49ef9c983e40&#45;&gt;Vpc::::vpc&#45;0a3a7a91cb6b0dccb -->
-<g id="edge21" class="edge">
-<title>RouteTable::::rtb&#45;06b8e49ef9c983e40&#45;&gt;Vpc::::vpc&#45;0a3a7a91cb6b0dccb</title>
-<path fill="none" stroke="#707070" d="M770.4,-537.84C773.85,-535.15 777.08,-532.21 780,-529 824.64,-480.02 837.32,-400.84 840.81,-353.46"/>
-<polygon fill="#707070" stroke="#707070" points="844.31,-353.49 841.45,-343.29 837.33,-353.05 844.31,-353.49"/>
-</g>
-<!-- RouteTable::::rtb&#45;097a54b361c1d896f -->
-<g id="node22" class="node">
-<title>RouteTable::::rtb&#45;097a54b361c1d896f</title>
-<polygon fill="#e5e5e5" stroke="#dddddd" points="489.5,-129 379.5,-129 379.5,-71 489.5,-71 489.5,-129"/>
-<text text-anchor="start" x="391.5" y="-109.2" font-family="Helvetica,sans-Serif" font-weight="bold" font-size="16.00" fill="#707070">RouteTable</text>
-<text text-anchor="start" x="391.5" y="-84.2" font-family="Helvetica,sans-Serif" font-size="16.00" fill="#383838">route&#45;table</text>
-</g>
-<!-- RouteTable::::rtb&#45;097a54b361c1d896f&#45;&gt;Vpc::::vpc&#45;0a3a7a91cb6b0dccb -->
-<g id="edge22" class="edge">
-<title>RouteTable::::rtb&#45;097a54b361c1d896f&#45;&gt;Vpc::::vpc&#45;0a3a7a91cb6b0dccb</title>
-<path fill="none" stroke="#707070" d="M489.8,-124.35C517.46,-135.75 551.95,-148.46 584,-156 626.62,-166.03 744.5,-150.38 780,-176 812.09,-199.16 827.89,-242.87 835.45,-274.91"/>
-<polygon fill="#707070" stroke="#707070" points="832.07,-275.85 837.63,-284.87 838.91,-274.35 832.07,-275.85"/>
-</g>
-<!-- RouteTable::::rtb&#45;097a54b361c1d896f&#45;&gt;InternetGateway::::igw&#45;0afcf265918398336 -->
-<g id="edge23" class="edge">
-<title>RouteTable::::rtb&#45;097a54b361c1d896f&#45;&gt;InternetGateway::::igw&#45;0afcf265918398336</title>
-<path fill="none" stroke="#707070" d="M489.62,-117.01C508.63,-123.93 529.78,-132.74 548,-143 565.66,-152.95 566.61,-160.59 584,-171 589.39,-174.23 595.07,-177.36 600.87,-180.36"/>
-<polygon fill="#707070" stroke="#707070" points="599.53,-183.61 610.04,-184.97 602.68,-177.35 599.53,-183.61"/>
-</g>
-<!-- SecurityGroupRuleIngress::::sg&#45;rule&#45;ingress&#45;ssh -->
-<g id="node23" class="node">
-<title>SecurityGroupRuleIngress::::sg&#45;rule&#45;ingress&#45;ssh</title>
-<polygon fill="#e5e5e5" stroke="#dddddd" points="548,-777 321,-777 321,-719 548,-719 548,-777"/>
-<text text-anchor="start" x="333.5" y="-757.2" font-family="Helvetica,sans-Serif" font-weight="bold" font-size="16.00" fill="#707070">SecurityGroupRuleIngress</text>
-<text text-anchor="start" x="333.5" y="-732.2" font-family="Helvetica,sans-Serif" font-size="16.00" fill="#383838">sg&#45;rule&#45;ingress&#45;ssh</text>
-</g>
-<!-- SecurityGroup::::sg&#45;0aed7dee5b6d71e6e -->
-<g id="node32" class="node">
-<title>SecurityGroup::::sg&#45;0aed7dee5b6d71e6e</title>
-<polygon fill="#e5e5e5" stroke="#dddddd" points="750,-520 614,-520 614,-462 750,-462 750,-520"/>
-<text text-anchor="start" x="626" y="-500.2" font-family="Helvetica,sans-Serif" font-weight="bold" font-size="16.00" fill="#707070">SecurityGroup</text>
-<text text-anchor="start" x="626" y="-475.2" font-family="Helvetica,sans-Serif" font-size="16.00" fill="#383838">securityGroup</text>
-</g>
-<!-- SecurityGroupRuleIngress::::sg&#45;rule&#45;ingress&#45;ssh&#45;&gt;SecurityGroup::::sg&#45;0aed7dee5b6d71e6e -->
-<g id="edge24" class="edge">
-<title>SecurityGroupRuleIngress::::sg&#45;rule&#45;ingress&#45;ssh&#45;&gt;SecurityGroup::::sg&#45;0aed7dee5b6d71e6e</title>
-<path fill="none" stroke="#707070" d="M538.63,-718.95C542,-716.23 545.14,-713.25 548,-710 602.13,-648.37 531.36,-591.9 584,-529 589.74,-522.15 596.87,-516.52 604.65,-511.91"/>
-<polygon fill="#707070" stroke="#707070" points="606.48,-514.9 613.67,-507.12 603.19,-508.72 606.48,-514.9"/>
-</g>
-<!-- SecurityGroupRuleIngress::::sg&#45;rule&#45;ingress&#45;http -->
-<g id="node24" class="node">
-<title>SecurityGroupRuleIngress::::sg&#45;rule&#45;ingress&#45;http</title>
-<polygon fill="#e5e5e5" stroke="#dddddd" points="548,-701 321,-701 321,-643 548,-643 548,-701"/>
-<text text-anchor="start" x="333.5" y="-681.2" font-family="Helvetica,sans-Serif" font-weight="bold" font-size="16.00" fill="#707070">SecurityGroupRuleIngress</text>
-<text text-anchor="start" x="333.5" y="-656.2" font-family="Helvetica,sans-Serif" font-size="16.00" fill="#383838">sg&#45;rule&#45;ingress&#45;http</text>
-</g>
-<!-- SecurityGroupRuleIngress::::sg&#45;rule&#45;ingress&#45;http&#45;&gt;SecurityGroup::::sg&#45;0aed7dee5b6d71e6e -->
-<g id="edge25" class="edge">
-<title>SecurityGroupRuleIngress::::sg&#45;rule&#45;ingress&#45;http&#45;&gt;SecurityGroup::::sg&#45;0aed7dee5b6d71e6e</title>
-<path fill="none" stroke="#707070" d="M537.34,-643C541.13,-640.26 544.71,-637.27 548,-634 582.96,-599.2 549.88,-564.63 584,-529 589.93,-522.8 597,-517.6 604.57,-513.23"/>
-<polygon fill="#707070" stroke="#707070" points="606.42,-516.21 613.66,-508.48 603.18,-510.01 606.42,-516.21"/>
-</g>
-<!-- SecurityGroupRuleIngress::::sg&#45;rule&#45;ingress&#45;https -->
-<g id="node25" class="node">
-<title>SecurityGroupRuleIngress::::sg&#45;rule&#45;ingress&#45;https</title>
-<polygon fill="#e5e5e5" stroke="#dddddd" points="548,-625 321,-625 321,-567 548,-567 548,-625"/>
-<text text-anchor="start" x="333.5" y="-605.2" font-family="Helvetica,sans-Serif" font-weight="bold" font-size="16.00" fill="#707070">SecurityGroupRuleIngress</text>
-<text text-anchor="start" x="333.5" y="-580.2" font-family="Helvetica,sans-Serif" font-size="16.00" fill="#383838">sg&#45;rule&#45;ingress&#45;https</text>
-</g>
-<!-- SecurityGroupRuleIngress::::sg&#45;rule&#45;ingress&#45;https&#45;&gt;SecurityGroup::::sg&#45;0aed7dee5b6d71e6e -->
-<g id="edge26" class="edge">
-<title>SecurityGroupRuleIngress::::sg&#45;rule&#45;ingress&#45;https&#45;&gt;SecurityGroup::::sg&#45;0aed7dee5b6d71e6e</title>
-<path fill="none" stroke="#707070" d="M529.88,-566.92C536.12,-564.15 542.22,-561.17 548,-558 566.01,-548.12 566.23,-539.31 584,-529 590.6,-525.17 597.66,-521.57 604.85,-518.23"/>
-<polygon fill="#707070" stroke="#707070" points="606.29,-521.42 613.99,-514.14 603.44,-515.03 606.29,-521.42"/>
-</g>
-<!-- SecurityGroupRuleIngress::::sg&#45;rule&#45;ingress&#45;icmp -->
-<g id="node26" class="node">
-<title>SecurityGroupRuleIngress::::sg&#45;rule&#45;ingress&#45;icmp</title>
-<polygon fill="#e5e5e5" stroke="#dddddd" points="548,-397 321,-397 321,-339 548,-339 548,-397"/>
-<text text-anchor="start" x="333.5" y="-377.2" font-family="Helvetica,sans-Serif" font-weight="bold" font-size="16.00" fill="#707070">SecurityGroupRuleIngress</text>
-<text text-anchor="start" x="333.5" y="-352.2" font-family="Helvetica,sans-Serif" font-size="16.00" fill="#383838">sg&#45;rule&#45;ingress&#45;icmp</text>
-</g>
-<!-- SecurityGroupRuleIngress::::sg&#45;rule&#45;ingress&#45;icmp&#45;&gt;SecurityGroup::::sg&#45;0aed7dee5b6d71e6e -->
-<g id="edge27" class="edge">
-<title>SecurityGroupRuleIngress::::sg&#45;rule&#45;ingress&#45;icmp&#45;&gt;SecurityGroup::::sg&#45;0aed7dee5b6d71e6e</title>
-<path fill="none" stroke="#707070" d="M527.72,-397.09C534.66,-399.9 541.49,-402.88 548,-406 577.4,-420.1 608.19,-439.45 632.74,-456.13"/>
-<polygon fill="#707070" stroke="#707070" points="630.93,-459.13 641.15,-461.9 634.89,-453.36 630.93,-459.13"/>
-</g>
-<!-- Route::::route&#45;ig -->
-<g id="node27" class="node">
-<title>Route::::route&#45;ig</title>
-<polygon fill="#e5e5e5" stroke="#dddddd" points="194,-205 115,-205 115,-147 194,-147 194,-205"/>
-<text text-anchor="start" x="127.5" y="-185.2" font-family="Helvetica,sans-Serif" font-weight="bold" font-size="16.00" fill="#707070">Route</text>
-<text text-anchor="start" x="127.5" y="-160.2" font-family="Helvetica,sans-Serif" font-size="16.00" fill="#383838">route&#45;ig</text>
-</g>
-<!-- Route::::route&#45;ig&#45;&gt;InternetGateway::::igw&#45;0afcf265918398336 -->
-<g id="edge29" class="edge">
-<title>Route::::route&#45;ig&#45;&gt;InternetGateway::::igw&#45;0afcf265918398336</title>
-<path fill="none" stroke="#707070" d="M194.08,-169.28C264.9,-158.15 420.12,-139.32 548,-163 568.58,-166.81 590.1,-173.68 609.67,-181.16"/>
-<polygon fill="#707070" stroke="#707070" points="608.53,-184.47 619.12,-184.88 611.09,-177.96 608.53,-184.47"/>
-</g>
-<!-- Route::::route&#45;ig&#45;&gt;RouteTable::::rtb&#45;097a54b361c1d896f -->
-<g id="edge28" class="edge">
-<title>Route::::route&#45;ig&#45;&gt;RouteTable::::rtb&#45;097a54b361c1d896f</title>
-<path fill="none" stroke="#707070" d="M194.15,-165.43C239.52,-153.03 315.42,-132.28 369.59,-117.47"/>
-<polygon fill="#707070" stroke="#707070" points="370.71,-120.79 379.44,-114.78 368.87,-114.04 370.71,-120.79"/>
-</g>
-<!-- EC2::::i&#45;0c0c8b11cddee7365 -->
-<g id="node28" class="node">
-<title>EC2::::i&#45;0c0c8b11cddee7365</title>
-<polygon fill="#e5e5e5" stroke="#dddddd" points="189.5,-473 119.5,-473 119.5,-415 189.5,-415 189.5,-473"/>
-<text text-anchor="start" x="131.5" y="-453.2" font-family="Helvetica,sans-Serif" font-weight="bold" font-size="16.00" fill="#707070">EC2</text>
-<text text-anchor="start" x="131.5" y="-428.2" font-family="Helvetica,sans-Serif" font-size="16.00" fill="#383838">server</text>
-</g>
-<!-- EC2::::i&#45;0c0c8b11cddee7365&#45;&gt;Volume::::vol&#45;034a467db1e71e984 -->
-<g id="edge34" class="edge">
-<title>EC2::::i&#45;0c0c8b11cddee7365&#45;&gt;Volume::::vol&#45;034a467db1e71e984</title>
-<path fill="none" stroke="#707070" d="M189.59,-444C222.68,-444 274.75,-444 322.29,-444"/>
-<polygon fill="#707070" stroke="#707070" points="322.36,-447.5 332.36,-444 322.36,-440.5 322.36,-447.5"/>
-</g>
-<!-- EC2::::i&#45;0c0c8b11cddee7365&#45;&gt;KeyPair::::grucloud&#45;app -->
-<g id="edge31" class="edge">
-<title>EC2::::i&#45;0c0c8b11cddee7365&#45;&gt;KeyPair::::grucloud&#45;app</title>
-<path fill="none" stroke="#707070" d="M189.59,-453.32C233.08,-465.21 309.34,-486.06 365.04,-501.28"/>
-<polygon fill="#707070" stroke="#707070" points="364.27,-504.7 374.84,-503.96 366.12,-497.95 364.27,-504.7"/>
-</g>
-<!-- EC2::::i&#45;0c0c8b11cddee7365&#45;&gt;Vpc::::vpc&#45;0a3a7a91cb6b0dccb -->
-<g id="edge32" class="edge">
-<title>EC2::::i&#45;0c0c8b11cddee7365&#45;&gt;Vpc::::vpc&#45;0a3a7a91cb6b0dccb</title>
-<path fill="none" stroke="#707070" d="M158.68,-473.26C168.18,-544.54 203.46,-726.85 321,-802 363.5,-829.17 500.65,-819.39 548,-802 674.98,-755.36 710.64,-721.14 780,-605 828,-524.63 839.11,-412.22 841.51,-353.41"/>
-<polygon fill="#707070" stroke="#707070" points="845.02,-353.19 841.86,-343.07 838.02,-352.95 845.02,-353.19"/>
-</g>
-<!-- EC2::::i&#45;0c0c8b11cddee7365&#45;&gt;Image::::ami&#45;0a7ce59297fb8a731 -->
-<g id="edge30" class="edge">
-<title>EC2::::i&#45;0c0c8b11cddee7365&#45;&gt;Image::::ami&#45;0a7ce59297fb8a731</title>
-<path fill="none" stroke="#707070" d="M189.57,-416.32C221.85,-391.14 272.49,-354.3 321,-330 334.83,-323.07 350.23,-316.94 365.08,-311.73"/>
-<polygon fill="#707070" stroke="#707070" points="366.39,-314.98 374.73,-308.44 364.14,-308.35 366.39,-314.98"/>
-</g>
-<!-- EC2::::i&#45;0c0c8b11cddee7365&#45;&gt;Subnet::::subnet&#45;0357436d6b0748d2e -->
-<g id="edge33" class="edge">
-<title>EC2::::i&#45;0c0c8b11cddee7365&#45;&gt;Subnet::::subnet&#45;0357436d6b0748d2e</title>
-<path fill="none" stroke="#707070" d="M171.55,-414.78C208.27,-348.46 297.05,-191.31 321,-178 343.05,-165.75 526.62,-164.62 548,-178 579.01,-197.4 557.13,-227.18 584,-252 597.55,-264.51 615.7,-273.09 632.63,-278.88"/>
-<polygon fill="#707070" stroke="#707070" points="631.83,-282.29 642.42,-281.97 633.94,-275.62 631.83,-282.29"/>
-</g>
-<!-- NetworkInterface::::eni&#45;009d9c6e09a0a6acc -->
-<g id="node30" class="node">
-<title>NetworkInterface::::eni&#45;009d9c6e09a0a6acc</title>
-<polygon fill="#e5e5e5" stroke="#dddddd" points="535.5,-245 333.5,-245 333.5,-187 535.5,-187 535.5,-245"/>
-<text text-anchor="start" x="345.5" y="-225.2" font-family="Helvetica,sans-Serif" font-weight="bold" font-size="16.00" fill="#707070">NetworkInterface</text>
-<text text-anchor="start" x="345.5" y="-200.2" font-family="Helvetica,sans-Serif" font-size="16.00" fill="#383838">eni&#45;009d9c6e09a0a6acc</text>
-</g>
-<!-- EC2::::i&#45;0c0c8b11cddee7365&#45;&gt;NetworkInterface::::eni&#45;009d9c6e09a0a6acc -->
-<g id="edge35" class="edge">
-<title>EC2::::i&#45;0c0c8b11cddee7365&#45;&gt;NetworkInterface::::eni&#45;009d9c6e09a0a6acc</title>
-<path fill="none" stroke="#707070" d="M173.52,-414.94C200.64,-373.52 255.75,-297.69 321,-254 322.95,-252.7 324.95,-251.43 326.98,-250.21"/>
-<polygon fill="#707070" stroke="#707070" points="329.13,-253.02 336.16,-245.09 325.72,-246.91 329.13,-253.02"/>
-</g>
-<!-- EC2::::i&#45;0c0c8b11cddee7365&#45;&gt;SecurityGroup::::sg&#45;0aed7dee5b6d71e6e -->
-<g id="edge36" class="edge">
-<title>EC2::::i&#45;0c0c8b11cddee7365&#45;&gt;SecurityGroup::::sg&#45;0aed7dee5b6d71e6e</title>
-<path fill="none" stroke="#707070" d="M159.3,-473.01C170.05,-541.92 207.69,-714.96 321,-786 363.74,-812.8 509.94,-819.1 548,-786 635.03,-710.31 512.53,-619.53 584,-529 589.68,-521.81 596.91,-515.97 604.86,-511.24"/>
-<polygon fill="#707070" stroke="#707070" points="606.53,-514.31 613.72,-506.53 603.25,-508.13 606.53,-514.31"/>
-</g>
-<!-- Volume::::vol&#45;0716097719ad12517 -->
-<g id="node29" class="node">
-<title>Volume::::vol&#45;0716097719ad12517</title>
-<polygon fill="#e5e5e5" stroke="#dddddd" points="195,-129 114,-129 114,-71 195,-71 195,-129"/>
-<text text-anchor="start" x="126.5" y="-109.2" font-family="Helvetica,sans-Serif" font-weight="bold" font-size="16.00" fill="#707070">Volume</text>
-<text text-anchor="start" x="126.5" y="-84.2" font-family="Helvetica,sans-Serif" font-size="16.00" fill="#383838">volume</text>
-</g>
-<!-- NetworkInterface::::eni&#45;009d9c6e09a0a6acc&#45;&gt;Vpc::::vpc&#45;0a3a7a91cb6b0dccb -->
-<g id="edge2" class="edge">
-<title>NetworkInterface::::eni&#45;009d9c6e09a0a6acc&#45;&gt;Vpc::::vpc&#45;0a3a7a91cb6b0dccb</title>
-<path fill="none" stroke="#707070" d="M535.54,-244.66C539.95,-247.49 544.13,-250.59 548,-254 575.45,-278.17 552.99,-308.6 584,-328 652.77,-371.02 753.13,-346.27 806.13,-328.04"/>
-<polygon fill="#707070" stroke="#707070" points="807.52,-331.26 815.77,-324.61 805.17,-324.66 807.52,-331.26"/>
-</g>
-<!-- NetworkInterface::::eni&#45;009d9c6e09a0a6acc&#45;&gt;Subnet::::subnet&#45;0357436d6b0748d2e -->
-<g id="edge3" class="edge">
-<title>NetworkInterface::::eni&#45;009d9c6e09a0a6acc&#45;&gt;Subnet::::subnet&#45;0357436d6b0748d2e</title>
-<path fill="none" stroke="#707070" d="M531.82,-245.03C566.31,-255.43 603.72,-266.71 632.45,-275.37"/>
-<polygon fill="#707070" stroke="#707070" points="631.65,-278.78 642.23,-278.31 633.67,-272.08 631.65,-278.78"/>
-</g>
-<!-- NetworkInterface::::eni&#45;009d9c6e09a0a6acc&#45;&gt;SecurityGroup::::sg&#45;0aed7dee5b6d71e6e -->
-<g id="edge1" class="edge">
-<title>NetworkInterface::::eni&#45;009d9c6e09a0a6acc&#45;&gt;SecurityGroup::::sg&#45;0aed7dee5b6d71e6e</title>
-<path fill="none" stroke="#707070" d="M535.57,-244.17C540,-247.13 544.18,-250.39 548,-254 579.04,-283.27 564.21,-305.2 584,-343 604.62,-382.39 632.92,-424.54 653.64,-453.74"/>
-<polygon fill="#707070" stroke="#707070" points="650.87,-455.89 659.53,-462 656.57,-451.82 650.87,-455.89"/>
-</g>
-<!-- SecurityGroup::::sg&#45;006766c368b7e81d1 -->
-<g id="node31" class="node">
-<title>SecurityGroup::::sg&#45;006766c368b7e81d1</title>
-<polygon fill="#e5e5e5" stroke="#dddddd" points="750,-129 614,-129 614,-71 750,-71 750,-129"/>
-<text text-anchor="start" x="626" y="-109.2" font-family="Helvetica,sans-Serif" font-weight="bold" font-size="16.00" fill="#707070">SecurityGroup</text>
-<text text-anchor="start" x="626" y="-84.2" font-family="Helvetica,sans-Serif" font-size="16.00" fill="#383838">default</text>
-</g>
-<!-- SecurityGroup::::sg&#45;006766c368b7e81d1&#45;&gt;Vpc::::vpc&#45;0a3a7a91cb6b0dccb -->
-<g id="edge11" class="edge">
-<title>SecurityGroup::::sg&#45;006766c368b7e81d1&#45;&gt;Vpc::::vpc&#45;0a3a7a91cb6b0dccb</title>
-<path fill="none" stroke="#707070" d="M742.26,-129.06C755.98,-137.87 769.59,-148.57 780,-161 807.93,-194.35 824.54,-241.95 833.43,-275.17"/>
-<polygon fill="#707070" stroke="#707070" points="830.07,-276.16 835.95,-284.98 836.85,-274.43 830.07,-276.16"/>
-</g>
-<!-- SecurityGroup::::sg&#45;006766c368b7e81d1&#45;&gt;SecurityGroup::::sg&#45;006766c368b7e81d1 -->
-<g id="edge12" class="edge">
-<title>SecurityGroup::::sg&#45;006766c368b7e81d1&#45;&gt;SecurityGroup::::sg&#45;006766c368b7e81d1</title>
-<path fill="none" stroke="#707070" d="M652,-129.38C652,-139.17 662,-147 682,-147 694.81,-147 703.52,-143.79 708.13,-138.9"/>
-<polygon fill="#707070" stroke="#707070" points="711.47,-139.96 712,-129.38 704.99,-137.32 711.47,-139.96"/>
-</g>
-<!-- SecurityGroup::::sg&#45;0aed7dee5b6d71e6e&#45;&gt;Vpc::::vpc&#45;0a3a7a91cb6b0dccb -->
-<g id="edge13" class="edge">
-<title>SecurityGroup::::sg&#45;0aed7dee5b6d71e6e&#45;&gt;Vpc::::vpc&#45;0a3a7a91cb6b0dccb</title>
-<path fill="none" stroke="#707070" d="M709.26,-461.77C736.61,-431.32 779.53,-383.54 809.12,-350.6"/>
-<polygon fill="#707070" stroke="#707070" points="811.89,-352.76 815.97,-342.98 806.68,-348.08 811.89,-352.76"/>
-</g>
-<!-- SecurityGroup::::sg&#45;9643e293 -->
-<g id="node33" class="node">
-<title>SecurityGroup::::sg&#45;9643e293</title>
-<polygon fill="#e5e5e5" stroke="#dddddd" points="502.5,-1273 366.5,-1273 366.5,-1215 502.5,-1215 502.5,-1273"/>
-<text text-anchor="start" x="378.5" y="-1253.2" font-family="Helvetica,sans-Serif" font-weight="bold" font-size="16.00" fill="#707070">SecurityGroup</text>
-<text text-anchor="start" x="378.5" y="-1228.2" font-family="Helvetica,sans-Serif" font-size="16.00" fill="#383838">default</text>
-</g>
-<!-- SecurityGroup::::sg&#45;9643e293&#45;&gt;Vpc::::vpc&#45;280b8555 -->
-<g id="edge14" class="edge">
-<title>SecurityGroup::::sg&#45;9643e293&#45;&gt;Vpc::::vpc&#45;280b8555</title>
-<path fill="none" stroke="#707070" d="M502.58,-1223.23C544.94,-1210.12 598.51,-1193.54 635.85,-1181.98"/>
-<polygon fill="#707070" stroke="#707070" points="636.93,-1185.31 645.45,-1179.01 634.86,-1178.62 636.93,-1185.31"/>
-</g>
-<!-- SecurityGroup::::sg&#45;9643e293&#45;&gt;SecurityGroup::::sg&#45;9643e293 -->
-<g id="edge15" class="edge">
-<title>SecurityGroup::::sg&#45;9643e293&#45;&gt;SecurityGroup::::sg&#45;9643e293</title>
-<path fill="none" stroke="#707070" d="M388.38,-1273.38C388.38,-1283.17 403.75,-1291 434.5,-1291 455.16,-1291 468.88,-1287.46 475.66,-1282.17"/>
-<polygon fill="#707070" stroke="#707070" points="478.76,-1283.8 480.62,-1273.38 472.66,-1280.36 478.76,-1283.8"/>
-</g>
-</g>
-</svg>
diff --git a/deploy/grucloud-aws/diagram-target.svg b/deploy/grucloud-aws/diagram-target.svg
deleted file mode 100644
index acfcd9a4..00000000
--- a/deploy/grucloud-aws/diagram-target.svg
+++ /dev/null
@@ -1,317 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
- "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<!-- Generated by graphviz version 2.44.1 (20200629.0846)
- -->
-<!-- Title: graphname Pages: 1 -->
-<svg width="810pt" height="921pt"
- viewBox="0.00 0.00 810.00 921.00" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 917)">
-<title>graphname</title>
-<polygon fill="#fafafa" stroke="transparent" points="-4,4 -4,-917 806,-917 806,4 -4,4"/>
-<text text-anchor="start" x="290" y="-888.4" font-family="Helvetica,sans-Serif" font-weight="bold" font-size="22.00" fill="#383838">Project grucloud&#45;aws</text>
-<text text-anchor="start" x="397.5" y="-872.8" font-family="Helvetica,sans-Serif" font-size="14.00"> &#160;</text>
-<text text-anchor="start" x="290" y="-851.2" font-family="Helvetica,sans-Serif" font-weight="bold" font-size="16.00" fill="#707070">Target Diagram</text>
-<g id="clust1" class="cluster">
-<title>cluster_aws</title>
-<polygon fill="#f5f5f5" stroke="#f5f5f5" points="8,-8 8,-829 794,-829 794,-8 8,-8"/>
-<text text-anchor="start" x="339" y="-23" font-family="Helvetica,sans-Serif" font-weight="bold" font-size="20.00" fill="#707070">Provider aws</text>
-</g>
-<g id="clust2" class="cluster">
-<title>cluster_aws_</title>
-<polygon fill="#eeeeee" stroke="#eeeeee" points="16,-54 16,-821 786,-821 786,-54 16,-54"/>
-<text text-anchor="start" x="400.86" y="-58.3" font-family="Helvetica,sans-Serif" font-size="1.00" fill="#383838"> </text>
-</g>
-<!-- KeyPair::grucloud&#45;app -->
-<g id="node1" class="node">
-<title>KeyPair::grucloud&#45;app</title>
-<polygon fill="#e5e5e5" stroke="#dddddd" points="484.5,-585 365.5,-585 365.5,-527 484.5,-527 484.5,-585"/>
-<text text-anchor="start" x="378" y="-565.2" font-family="Helvetica,sans-Serif" font-weight="bold" font-size="16.00" fill="#707070">KeyPair</text>
-<text text-anchor="start" x="378" y="-540.2" font-family="Helvetica,sans-Serif" font-size="16.00" fill="#383838">grucloud&#45;app</text>
-</g>
-<!-- Vpc::vpc -->
-<g id="node2" class="node">
-<title>Vpc::vpc</title>
-<polygon fill="#e5e5e5" stroke="#dddddd" points="778,-733 724,-733 724,-675 778,-675 778,-733"/>
-<text text-anchor="start" x="736" y="-713.2" font-family="Helvetica,sans-Serif" font-weight="bold" font-size="16.00" fill="#707070">Vpc</text>
-<text text-anchor="start" x="736" y="-688.2" font-family="Helvetica,sans-Serif" font-size="16.00" fill="#383838">vpc</text>
-</g>
-<!-- InternetGateway::ig -->
-<g id="node3" class="node">
-<title>InternetGateway::ig</title>
-<polygon fill="#e5e5e5" stroke="#dddddd" points="688,-809 538,-809 538,-751 688,-751 688,-809"/>
-<text text-anchor="start" x="550" y="-789.2" font-family="Helvetica,sans-Serif" font-weight="bold" font-size="16.00" fill="#707070">InternetGateway</text>
-<text text-anchor="start" x="550" y="-764.2" font-family="Helvetica,sans-Serif" font-size="16.00" fill="#383838">ig</text>
-</g>
-<!-- InternetGateway::ig&#45;&gt;Vpc::vpc -->
-<g id="edge1" class="edge">
-<title>InternetGateway::ig&#45;&gt;Vpc::vpc</title>
-<path fill="none" stroke="#707070" d="M666.19,-750.83C682.57,-741.68 700.24,-731.81 715.12,-723.49"/>
-<polygon fill="#707070" stroke="#707070" points="716.96,-726.47 723.98,-718.54 713.54,-720.36 716.96,-726.47"/>
-</g>
-<!-- Subnet::subnet -->
-<g id="node4" class="node">
-<title>Subnet::subnet</title>
-<polygon fill="#e5e5e5" stroke="#dddddd" points="652.5,-709 573.5,-709 573.5,-651 652.5,-651 652.5,-709"/>
-<text text-anchor="start" x="586" y="-689.2" font-family="Helvetica,sans-Serif" font-weight="bold" font-size="16.00" fill="#707070">Subnet</text>
-<text text-anchor="start" x="586" y="-664.2" font-family="Helvetica,sans-Serif" font-size="16.00" fill="#383838">subnet</text>
-</g>
-<!-- Subnet::subnet&#45;&gt;Vpc::vpc -->
-<g id="edge2" class="edge">
-<title>Subnet::subnet&#45;&gt;Vpc::vpc</title>
-<path fill="none" stroke="#707070" d="M652.61,-686.81C671.82,-690.2 694.92,-694.28 713.79,-697.61"/>
-<polygon fill="#707070" stroke="#707070" points="713.34,-701.08 723.79,-699.38 714.55,-694.19 713.34,-701.08"/>
-</g>
-<!-- RouteTable::route&#45;table -->
-<g id="node5" class="node">
-<title>RouteTable::route&#45;table</title>
-<polygon fill="#e5e5e5" stroke="#dddddd" points="480,-757 370,-757 370,-699 480,-699 480,-757"/>
-<text text-anchor="start" x="382" y="-737.2" font-family="Helvetica,sans-Serif" font-weight="bold" font-size="16.00" fill="#707070">RouteTable</text>
-<text text-anchor="start" x="382" y="-712.2" font-family="Helvetica,sans-Serif" font-size="16.00" fill="#383838">route&#45;table</text>
-</g>
-<!-- RouteTable::route&#45;table&#45;&gt;Vpc::vpc -->
-<g id="edge3" class="edge">
-<title>RouteTable::route&#45;table&#45;&gt;Vpc::vpc</title>
-<path fill="none" stroke="#707070" d="M480.18,-728.83C533.34,-728.96 616.57,-727.35 688,-718 696.48,-716.89 705.51,-715.17 713.97,-713.31"/>
-<polygon fill="#707070" stroke="#707070" points="714.99,-716.67 723.95,-711 713.41,-709.85 714.99,-716.67"/>
-</g>
-<!-- RouteTable::route&#45;table&#45;&gt;Subnet::subnet -->
-<g id="edge4" class="edge">
-<title>RouteTable::route&#45;table&#45;&gt;Subnet::subnet</title>
-<path fill="none" stroke="#707070" d="M480.05,-714.05C506.47,-707.23 538,-699.1 563.62,-692.48"/>
-<polygon fill="#707070" stroke="#707070" points="564.68,-695.83 573.48,-689.94 562.93,-689.05 564.68,-695.83"/>
-</g>
-<!-- Route::route&#45;ig -->
-<g id="node6" class="node">
-<title>Route::route&#45;ig</title>
-<polygon fill="#e5e5e5" stroke="#dddddd" points="207.5,-813 128.5,-813 128.5,-755 207.5,-755 207.5,-813"/>
-<text text-anchor="start" x="141" y="-793.2" font-family="Helvetica,sans-Serif" font-weight="bold" font-size="16.00" fill="#707070">Route</text>
-<text text-anchor="start" x="141" y="-768.2" font-family="Helvetica,sans-Serif" font-size="16.00" fill="#383838">route&#45;ig</text>
-</g>
-<!-- Route::route&#45;ig&#45;&gt;InternetGateway::ig -->
-<g id="edge6" class="edge">
-<title>Route::route&#45;ig&#45;&gt;InternetGateway::ig</title>
-<path fill="none" stroke="#707070" d="M207.54,-783.65C278.52,-783.01 431.45,-781.63 527.59,-780.76"/>
-<polygon fill="#707070" stroke="#707070" points="527.9,-784.26 537.87,-780.67 527.84,-777.26 527.9,-784.26"/>
-</g>
-<!-- Route::route&#45;ig&#45;&gt;RouteTable::route&#45;table -->
-<g id="edge5" class="edge">
-<title>Route::route&#45;ig&#45;&gt;RouteTable::route&#45;table</title>
-<path fill="none" stroke="#707070" d="M207.73,-775.49C248.05,-766.64 311.89,-752.62 359.78,-742.1"/>
-<polygon fill="#707070" stroke="#707070" points="360.72,-745.48 369.74,-739.92 359.22,-738.64 360.72,-745.48"/>
-</g>
-<!-- SecurityGroup::securityGroup -->
-<g id="node7" class="node">
-<title>SecurityGroup::securityGroup</title>
-<polygon fill="#e5e5e5" stroke="#dddddd" points="493,-661 357,-661 357,-603 493,-603 493,-661"/>
-<text text-anchor="start" x="369" y="-641.2" font-family="Helvetica,sans-Serif" font-weight="bold" font-size="16.00" fill="#707070">SecurityGroup</text>
-<text text-anchor="start" x="369" y="-616.2" font-family="Helvetica,sans-Serif" font-size="16.00" fill="#383838">securityGroup</text>
-</g>
-<!-- SecurityGroup::securityGroup&#45;&gt;Vpc::vpc -->
-<g id="edge7" class="edge">
-<title>SecurityGroup::securityGroup&#45;&gt;Vpc::vpc</title>
-<path fill="none" stroke="#707070" d="M493.03,-621.5C547.81,-615.91 626.05,-614.95 688,-642 700.9,-647.63 712.56,-657.28 722.21,-667.31"/>
-<polygon fill="#707070" stroke="#707070" points="719.86,-669.94 729.17,-674.99 725.05,-665.24 719.86,-669.94"/>
-</g>
-<!-- SecurityGroup::securityGroup&#45;&gt;Subnet::subnet -->
-<g id="edge8" class="edge">
-<title>SecurityGroup::securityGroup&#45;&gt;Subnet::subnet</title>
-<path fill="none" stroke="#707070" d="M493.15,-649.33C516.42,-655.33 542.03,-661.94 563.5,-667.48"/>
-<polygon fill="#707070" stroke="#707070" points="562.8,-670.92 573.36,-670.03 564.55,-664.14 562.8,-670.92"/>
-</g>
-<!-- SecurityGroupRuleIngress::sg&#45;rule&#45;ingress&#45;ssh -->
-<g id="node8" class="node">
-<title>SecurityGroupRuleIngress::sg&#45;rule&#45;ingress&#45;ssh</title>
-<polygon fill="#e5e5e5" stroke="#dddddd" points="281.5,-737 54.5,-737 54.5,-679 281.5,-679 281.5,-737"/>
-<text text-anchor="start" x="67" y="-717.2" font-family="Helvetica,sans-Serif" font-weight="bold" font-size="16.00" fill="#707070">SecurityGroupRuleIngress</text>
-<text text-anchor="start" x="67" y="-692.2" font-family="Helvetica,sans-Serif" font-size="16.00" fill="#383838">sg&#45;rule&#45;ingress&#45;ssh</text>
-</g>
-<!-- SecurityGroupRuleIngress::sg&#45;rule&#45;ingress&#45;ssh&#45;&gt;SecurityGroup::securityGroup -->
-<g id="edge9" class="edge">
-<title>SecurityGroupRuleIngress::sg&#45;rule&#45;ingress&#45;ssh&#45;&gt;SecurityGroup::securityGroup</title>
-<path fill="none" stroke="#707070" d="M281.22,-678.95C291.65,-676.02 302.04,-673.01 312,-670 323.36,-666.57 335.31,-662.75 346.99,-658.89"/>
-<polygon fill="#707070" stroke="#707070" points="348.34,-662.13 356.72,-655.65 346.13,-655.49 348.34,-662.13"/>
-</g>
-<!-- SecurityGroupRuleIngress::sg&#45;rule&#45;ingress&#45;http -->
-<g id="node9" class="node">
-<title>SecurityGroupRuleIngress::sg&#45;rule&#45;ingress&#45;http</title>
-<polygon fill="#e5e5e5" stroke="#dddddd" points="281.5,-661 54.5,-661 54.5,-603 281.5,-603 281.5,-661"/>
-<text text-anchor="start" x="67" y="-641.2" font-family="Helvetica,sans-Serif" font-weight="bold" font-size="16.00" fill="#707070">SecurityGroupRuleIngress</text>
-<text text-anchor="start" x="67" y="-616.2" font-family="Helvetica,sans-Serif" font-size="16.00" fill="#383838">sg&#45;rule&#45;ingress&#45;http</text>
-</g>
-<!-- SecurityGroupRuleIngress::sg&#45;rule&#45;ingress&#45;http&#45;&gt;SecurityGroup::securityGroup -->
-<g id="edge10" class="edge">
-<title>SecurityGroupRuleIngress::sg&#45;rule&#45;ingress&#45;http&#45;&gt;SecurityGroup::securityGroup</title>
-<path fill="none" stroke="#707070" d="M281.59,-632C303.5,-632 326.01,-632 346.48,-632"/>
-<polygon fill="#707070" stroke="#707070" points="346.67,-635.5 356.67,-632 346.67,-628.5 346.67,-635.5"/>
-</g>
-<!-- SecurityGroupRuleIngress::sg&#45;rule&#45;ingress&#45;https -->
-<g id="node10" class="node">
-<title>SecurityGroupRuleIngress::sg&#45;rule&#45;ingress&#45;https</title>
-<polygon fill="#e5e5e5" stroke="#dddddd" points="281.5,-585 54.5,-585 54.5,-527 281.5,-527 281.5,-585"/>
-<text text-anchor="start" x="67" y="-565.2" font-family="Helvetica,sans-Serif" font-weight="bold" font-size="16.00" fill="#707070">SecurityGroupRuleIngress</text>
-<text text-anchor="start" x="67" y="-540.2" font-family="Helvetica,sans-Serif" font-size="16.00" fill="#383838">sg&#45;rule&#45;ingress&#45;https</text>
-</g>
-<!-- SecurityGroupRuleIngress::sg&#45;rule&#45;ingress&#45;https&#45;&gt;SecurityGroup::securityGroup -->
-<g id="edge11" class="edge">
-<title>SecurityGroupRuleIngress::sg&#45;rule&#45;ingress&#45;https&#45;&gt;SecurityGroup::securityGroup</title>
-<path fill="none" stroke="#707070" d="M281.22,-585.05C291.65,-587.98 302.04,-590.99 312,-594 323.36,-597.43 335.31,-601.25 346.99,-605.11"/>
-<polygon fill="#707070" stroke="#707070" points="346.13,-608.51 356.72,-608.35 348.34,-601.87 346.13,-608.51"/>
-</g>
-<!-- SecurityGroupRuleIngress::sg&#45;rule&#45;ingress&#45;icmp -->
-<g id="node11" class="node">
-<title>SecurityGroupRuleIngress::sg&#45;rule&#45;ingress&#45;icmp</title>
-<polygon fill="#e5e5e5" stroke="#dddddd" points="281.5,-509 54.5,-509 54.5,-451 281.5,-451 281.5,-509"/>
-<text text-anchor="start" x="67" y="-489.2" font-family="Helvetica,sans-Serif" font-weight="bold" font-size="16.00" fill="#707070">SecurityGroupRuleIngress</text>
-<text text-anchor="start" x="67" y="-464.2" font-family="Helvetica,sans-Serif" font-size="16.00" fill="#383838">sg&#45;rule&#45;ingress&#45;icmp</text>
-</g>
-<!-- SecurityGroupRuleIngress::sg&#45;rule&#45;ingress&#45;icmp&#45;&gt;SecurityGroup::securityGroup -->
-<g id="edge12" class="edge">
-<title>SecurityGroupRuleIngress::sg&#45;rule&#45;ingress&#45;icmp&#45;&gt;SecurityGroup::securityGroup</title>
-<path fill="none" stroke="#707070" d="M281.83,-499.66C292.71,-504.5 303.02,-510.52 312,-518 340.73,-541.91 321.85,-567.29 348,-594 348.77,-594.79 349.57,-595.57 350.38,-596.33"/>
-<polygon fill="#707070" stroke="#707070" points="348.22,-599.08 358.12,-602.84 352.72,-593.73 348.22,-599.08"/>
-</g>
-<!-- ElasticIpAddress::ip -->
-<g id="node12" class="node">
-<title>ElasticIpAddress::ip</title>
-<polygon fill="#e5e5e5" stroke="#dddddd" points="502,-337 348,-337 348,-279 502,-279 502,-337"/>
-<text text-anchor="start" x="360" y="-317.2" font-family="Helvetica,sans-Serif" font-weight="bold" font-size="16.00" fill="#707070">ElasticIpAddress</text>
-<text text-anchor="start" x="360" y="-292.2" font-family="Helvetica,sans-Serif" font-size="16.00" fill="#383838">ip</text>
-</g>
-<!-- Image::ubuntu 20.04 -->
-<g id="node13" class="node">
-<title>Image::ubuntu 20.04</title>
-<polygon fill="#e5e5e5" stroke="#dddddd" points="484.5,-413 365.5,-413 365.5,-355 484.5,-355 484.5,-413"/>
-<text text-anchor="start" x="378" y="-393.2" font-family="Helvetica,sans-Serif" font-weight="bold" font-size="16.00" fill="#707070">Image</text>
-<text text-anchor="start" x="378" y="-368.2" font-family="Helvetica,sans-Serif" font-size="16.00" fill="#383838">ubuntu 20.04</text>
-</g>
-<!-- Volume::volume -->
-<g id="node14" class="node">
-<title>Volume::volume</title>
-<polygon fill="#e5e5e5" stroke="#dddddd" points="465.5,-489 384.5,-489 384.5,-431 465.5,-431 465.5,-489"/>
-<text text-anchor="start" x="397" y="-469.2" font-family="Helvetica,sans-Serif" font-weight="bold" font-size="16.00" fill="#707070">Volume</text>
-<text text-anchor="start" x="397" y="-444.2" font-family="Helvetica,sans-Serif" font-size="16.00" fill="#383838">volume</text>
-</g>
-<!-- Instance::server -->
-<g id="node15" class="node">
-<title>Instance::server</title>
-<polygon fill="#e5e5e5" stroke="#dddddd" points="213,-433 123,-433 123,-375 213,-375 213,-433"/>
-<text text-anchor="start" x="135" y="-413.2" font-family="Helvetica,sans-Serif" font-weight="bold" font-size="16.00" fill="#707070">Instance</text>
-<text text-anchor="start" x="135" y="-388.2" font-family="Helvetica,sans-Serif" font-size="16.00" fill="#383838">server</text>
-</g>
-<!-- Instance::server&#45;&gt;KeyPair::grucloud&#45;app -->
-<g id="edge13" class="edge">
-<title>Instance::server&#45;&gt;KeyPair::grucloud&#45;app</title>
-<path fill="none" stroke="#707070" d="M213.26,-406.4C243.9,-410.13 284.05,-419.37 312,-442 339.5,-464.26 323.56,-487.42 348,-513 350.89,-516.02 354.03,-518.89 357.35,-521.61"/>
-<polygon fill="#707070" stroke="#707070" points="355.27,-524.42 365.35,-527.66 359.49,-518.83 355.27,-524.42"/>
-</g>
-<!-- Instance::server&#45;&gt;Subnet::subnet -->
-<g id="edge14" class="edge">
-<title>Instance::server&#45;&gt;Subnet::subnet</title>
-<path fill="none" stroke="#707070" d="M213.22,-407.38C243.46,-411.58 283.14,-420.98 312,-442 335.92,-459.42 323,-482.18 348,-498 406.32,-534.91 443.22,-481.82 502,-518 548.71,-546.75 580.23,-603.6 597.16,-641.72"/>
-<polygon fill="#707070" stroke="#707070" points="593.98,-643.18 601.15,-650.97 600.41,-640.41 593.98,-643.18"/>
-</g>
-<!-- Instance::server&#45;&gt;SecurityGroup::securityGroup -->
-<g id="edge15" class="edge">
-<title>Instance::server&#45;&gt;SecurityGroup::securityGroup</title>
-<path fill="none" stroke="#707070" d="M213.01,-404.29C244.76,-406.9 286.38,-415.67 312,-442 360.42,-491.75 304.9,-539.58 348,-594 348.58,-594.73 349.18,-595.45 349.8,-596.16"/>
-<polygon fill="#707070" stroke="#707070" points="347.4,-598.72 356.97,-603.26 352.32,-593.74 347.4,-598.72"/>
-</g>
-<!-- Instance::server&#45;&gt;ElasticIpAddress::ip -->
-<g id="edge16" class="edge">
-<title>Instance::server&#45;&gt;ElasticIpAddress::ip</title>
-<path fill="none" stroke="#707070" d="M213.09,-395.25C241.83,-388.83 279.84,-378.97 312,-366 328.97,-359.15 331.81,-354.54 348,-346 350.57,-344.65 353.19,-343.27 355.85,-341.9"/>
-<polygon fill="#707070" stroke="#707070" points="357.67,-344.9 364.95,-337.21 354.46,-338.67 357.67,-344.9"/>
-</g>
-<!-- Instance::server&#45;&gt;Image::ubuntu 20.04 -->
-<g id="edge17" class="edge">
-<title>Instance::server&#45;&gt;Image::ubuntu 20.04</title>
-<path fill="none" stroke="#707070" d="M213.13,-400.54C252.22,-397.47 309.94,-392.95 355.11,-389.4"/>
-<polygon fill="#707070" stroke="#707070" points="355.44,-392.89 365.13,-388.62 354.89,-385.91 355.44,-392.89"/>
-</g>
-<!-- Instance::server&#45;&gt;Volume::volume -->
-<g id="edge18" class="edge">
-<title>Instance::server&#45;&gt;Volume::volume</title>
-<path fill="none" stroke="#707070" d="M213.13,-413.69C258.01,-423.55 327.45,-438.8 374.26,-449.08"/>
-<polygon fill="#707070" stroke="#707070" points="373.67,-452.53 384.18,-451.26 375.17,-445.69 373.67,-452.53"/>
-</g>
-<!-- Domain::grucloud.com -->
-<g id="node16" class="node">
-<title>Domain::grucloud.com</title>
-<polygon fill="#e5e5e5" stroke="#dddddd" points="674,-233 552,-233 552,-175 674,-175 674,-233"/>
-<text text-anchor="start" x="564" y="-213.2" font-family="Helvetica,sans-Serif" font-weight="bold" font-size="16.00" fill="#707070">Domain</text>
-<text text-anchor="start" x="564" y="-188.2" font-family="Helvetica,sans-Serif" font-size="16.00" fill="#383838">grucloud.com</text>
-</g>
-<!-- HostedZone::grucloud.com. -->
-<g id="node17" class="node">
-<title>HostedZone::grucloud.com.</title>
-<polygon fill="#e5e5e5" stroke="#dddddd" points="488.5,-233 361.5,-233 361.5,-175 488.5,-175 488.5,-233"/>
-<text text-anchor="start" x="374" y="-213.2" font-family="Helvetica,sans-Serif" font-weight="bold" font-size="16.00" fill="#707070">HostedZone</text>
-<text text-anchor="start" x="374" y="-188.2" font-family="Helvetica,sans-Serif" font-size="16.00" fill="#383838">grucloud.com.</text>
-</g>
-<!-- HostedZone::grucloud.com.&#45;&gt;Domain::grucloud.com -->
-<g id="edge19" class="edge">
-<title>HostedZone::grucloud.com.&#45;&gt;Domain::grucloud.com</title>
-<path fill="none" stroke="#707070" d="M488.71,-204C505.73,-204 524.26,-204 541.67,-204"/>
-<polygon fill="#707070" stroke="#707070" points="541.76,-207.5 551.76,-204 541.76,-200.5 541.76,-207.5"/>
-</g>
-<!-- Record::app.grucloud.com. -->
-<g id="node18" class="node">
-<title>Record::app.grucloud.com.</title>
-<polygon fill="#e5e5e5" stroke="#dddddd" points="247,-357 89,-357 89,-299 247,-299 247,-357"/>
-<text text-anchor="start" x="101" y="-337.2" font-family="Helvetica,sans-Serif" font-weight="bold" font-size="16.00" fill="#707070">Record</text>
-<text text-anchor="start" x="101" y="-312.2" font-family="Helvetica,sans-Serif" font-size="16.00" fill="#383838">app.grucloud.com.</text>
-</g>
-<!-- Record::app.grucloud.com.&#45;&gt;ElasticIpAddress::ip -->
-<g id="edge21" class="edge">
-<title>Record::app.grucloud.com.&#45;&gt;ElasticIpAddress::ip</title>
-<path fill="none" stroke="#707070" d="M247.24,-321.86C275.79,-319.62 308.23,-317.08 337.46,-314.79"/>
-<polygon fill="#707070" stroke="#707070" points="337.96,-318.26 347.66,-313.99 337.41,-311.28 337.96,-318.26"/>
-</g>
-<!-- Record::app.grucloud.com.&#45;&gt;HostedZone::grucloud.com. -->
-<g id="edge20" class="edge">
-<title>Record::app.grucloud.com.&#45;&gt;HostedZone::grucloud.com.</title>
-<path fill="none" stroke="#707070" d="M247.09,-313.18C268.75,-307.5 291.83,-299.92 312,-290 338.41,-277 364.68,-257.28 385.14,-240"/>
-<polygon fill="#707070" stroke="#707070" points="387.66,-242.45 392.96,-233.27 383.1,-237.14 387.66,-242.45"/>
-</g>
-<!-- Record::grucloud.com. -->
-<g id="node19" class="node">
-<title>Record::grucloud.com.</title>
-<polygon fill="#e5e5e5" stroke="#dddddd" points="231.5,-281 104.5,-281 104.5,-223 231.5,-223 231.5,-281"/>
-<text text-anchor="start" x="117" y="-261.2" font-family="Helvetica,sans-Serif" font-weight="bold" font-size="16.00" fill="#707070">Record</text>
-<text text-anchor="start" x="117" y="-236.2" font-family="Helvetica,sans-Serif" font-size="16.00" fill="#383838">grucloud.com.</text>
-</g>
-<!-- Record::grucloud.com.&#45;&gt;HostedZone::grucloud.com. -->
-<g id="edge22" class="edge">
-<title>Record::grucloud.com.&#45;&gt;HostedZone::grucloud.com.</title>
-<path fill="none" stroke="#707070" d="M231.71,-240.2C267.85,-233.39 313.46,-224.81 351.18,-217.71"/>
-<polygon fill="#707070" stroke="#707070" points="351.91,-221.13 361.09,-215.84 350.62,-214.25 351.91,-221.13"/>
-</g>
-<!-- Record::grucloud.com.&#45;gitpage&#45;record&#45;www -->
-<g id="node20" class="node">
-<title>Record::grucloud.com.&#45;gitpage&#45;record&#45;www</title>
-<polygon fill="#e5e5e5" stroke="#dddddd" points="312,-205 24,-205 24,-147 312,-147 312,-205"/>
-<text text-anchor="start" x="36" y="-185.2" font-family="Helvetica,sans-Serif" font-weight="bold" font-size="16.00" fill="#707070">Record</text>
-<text text-anchor="start" x="36" y="-160.2" font-family="Helvetica,sans-Serif" font-size="16.00" fill="#383838">grucloud.com.&#45;gitpage&#45;record&#45;www...</text>
-</g>
-<!-- Record::grucloud.com.&#45;gitpage&#45;record&#45;www&#45;&gt;HostedZone::grucloud.com. -->
-<g id="edge23" class="edge">
-<title>Record::grucloud.com.&#45;gitpage&#45;record&#45;www&#45;&gt;HostedZone::grucloud.com.</title>
-<path fill="none" stroke="#707070" d="M312.15,-191.72C325.63,-193.2 338.88,-194.65 351.27,-196.01"/>
-<polygon fill="#707070" stroke="#707070" points="351.14,-199.52 361.47,-197.13 351.91,-192.56 351.14,-199.52"/>
-</g>
-<!-- Record::grucloud.com.&#45;mx -->
-<g id="node21" class="node">
-<title>Record::grucloud.com.&#45;mx</title>
-<polygon fill="#e5e5e5" stroke="#dddddd" points="245,-129 91,-129 91,-71 245,-71 245,-129"/>
-<text text-anchor="start" x="103" y="-109.2" font-family="Helvetica,sans-Serif" font-weight="bold" font-size="16.00" fill="#707070">Record</text>
-<text text-anchor="start" x="103" y="-84.2" font-family="Helvetica,sans-Serif" font-size="16.00" fill="#383838">grucloud.com.&#45;mx</text>
-</g>
-<!-- Record::grucloud.com.&#45;mx&#45;&gt;HostedZone::grucloud.com. -->
-<g id="edge24" class="edge">
-<title>Record::grucloud.com.&#45;mx&#45;&gt;HostedZone::grucloud.com.</title>
-<path fill="none" stroke="#707070" d="M245.24,-116.15C267.2,-121.9 290.91,-129.18 312,-138 332.58,-146.61 353.97,-158.41 372.47,-169.65"/>
-<polygon fill="#707070" stroke="#707070" points="370.68,-172.66 381.02,-174.94 374.36,-166.7 370.68,-172.66"/>
-</g>
-</g>
-</svg>
diff --git a/deploy/grucloud-aws/hooks.js b/deploy/grucloud-aws/hooks.js
deleted file mode 100644
index 1b080f41..00000000
--- a/deploy/grucloud-aws/hooks.js
+++ /dev/null
@@ -1,97 +0,0 @@
-const assert = require("assert");
-const ping = require("ping");
-const path = require("path");
-const Client = require("ssh2").Client;
-const { retryCall } = require("@grucloud/core").Retry;
-
-const testPing = ({ host }) =>
-  ping.promise.probe(host, {
-    timeout: 10,
-  });
-
-//const privateKey = require("fs").readFileSync(
-//  path.resolve(__dirname, "../../../secrets/kp.pem")
-//);
-
-const testSsh = async ({ host, username = "ubuntu" }) =>
-  await new Promise((resolve, reject) => {
-    const conn = new Client();
-    conn
-      .on("ready", function () {
-        //console.log(`ssh to ${host} ok`);
-        conn.end();
-        resolve();
-      })
-      .on("error", function (error) {
-        // console.log(`cannot ssh to ${host}`, error);
-        reject(error);
-      })
-      .connect({
-        host,
-        port: 22,
-        username,
-        agent: process.env.SSH_AUTH_SOCK,
-        //privateKey,
-      });
-  });
-
-module.exports = ({ resources: { eip, server }, provider }) => {
-  assert(provider);
-  return {
-    onDeployed: {
-      init: async () => {
-        const eipLive = await eip.getLive();
-        const serverLive = await server.getLive();
-        assert(serverLive, "server should be alive");
-        //Static checks
-        assert.equal(serverLive.PublicIpAddress, eipLive.PublicIp);
-
-        const host = eipLive.PublicIp;
-        return {
-          host,
-        };
-      },
-      actions: [
-        //Cannot ping from CircleCI
-        /*{
-          name: "Ping",
-          command: async ({ host }) => {
-            const alive = await retryCall({
-              name: `ping ${host}`,
-              fn: async () => {
-                const { alive } = await testPing({ host });
-                if (!alive) {
-                  throw Error(`cannot ping ${host} yet`);
-                }
-                return alive;
-              },
-              shouldRetryOnException: () => true,
-              retryCount: 40,
-              retryDelay: 5e3,
-            });
-            assert(alive, `cannot ping ${host}`);
-          },
-        },*/
-        {
-          name: "SSH",
-          command: async ({ host }) => {
-            await retryCall({
-              name: `ssh ${host}`,
-              fn: async () => {
-                await testSsh({ host });
-                return true;
-              },
-              shouldRetryOnException: () => true,
-              config: { retryCount: 40, retryDelay: 5e3 },
-            });
-          },
-        },
-      ],
-    },
-    onDestroyed: {
-      init: () => {
-        //console.log("ec2 onDestroyed");
-      },
-    },
-  };
-};
diff --git a/deploy/grucloud-aws/iac.js b/deploy/grucloud-aws/iac.js
deleted file mode 100644
index 5935b0fe..00000000
--- a/deploy/grucloud-aws/iac.js
+++ /dev/null
@@ -1,301 +0,0 @@
-const { AwsProvider } = require("@grucloud/provider-aws");
-const assert = require("assert");
-
-const createResources = async ({ provider, resources: { keyPair } }) => {
-  const { config } = provider;
-  const { domainName, stage } = config;
-
-  const AvailabilityZone = `${config.region}${config.availabilityZoneSuffix}`;
-
-  const Device = "/dev/sdf";
-  const deviceMounted = "/dev/xvdf";
-  const mountPoint = "/data";
-  const vpc = provider.EC2.makeVpc({
-    name: "vpc",
-    properties: () => ({
-      CidrBlock: "10.1.0.0/16",
-    }),
-  });
-  const ig = provider.EC2.makeInternetGateway({
-    name: "ig",
-    dependencies: { vpc },
-  });
-
-  const subnet = provider.EC2.makeSubnet({
-    name: "subnet",
-    dependencies: { vpc },
-    properties: () => ({
-      CidrBlock: "10.1.0.1/24",
-      AvailabilityZone,
-    }),
-  });
-
-  const routeTable = provider.EC2.makeRouteTable({
-    name: "route-table",
-    dependencies: { vpc, subnets: [subnet] },
-  });
-
-  const route = provider.EC2.makeRoute({
-    name: "route-ig",
-    dependencies: { routeTable, ig },
-  });
-
-  const securityGroup = provider.EC2.makeSecurityGroup({
-    name: "securityGroup",
-    dependencies: { vpc, subnet },
-    properties: () => ({
-      //https://docs.aws.amazon.com/AWSJavaScriptSDK/latest/AWS/EC2.html#createSecurityGroup-property
-      Description: "Security Group Description",
-    }),
-  });
-  const sgRuleIngressSsh = provider.EC2.makeSecurityGroupRuleIngress({
-    name: "sg-rule-ingress-ssh",
-    dependencies: {
-      securityGroup,
-    },
-    properties: () => ({
-      IpPermission: {
-        FromPort: 22,
-        IpProtocol: "tcp",
-        IpRanges: [
-          {
-            CidrIp: "0.0.0.0/0",
-          },
-        ],
-        Ipv6Ranges: [
-          {
-            CidrIpv6: "::/0",
-          },
-        ],
-        ToPort: 22,
-      },
-    }),
-  });
-  const sgRuleIngressHttp = provider.EC2.makeSecurityGroupRuleIngress({
-    name: "sg-rule-ingress-http",
-    dependencies: {
-      securityGroup,
-    },
-    properties: () => ({
-      IpPermission: {
-        FromPort: 80,
-        IpProtocol: "tcp",
-        IpRanges: [
-          {
-            CidrIp: "0.0.0.0/0",
-          },
-        ],
-        Ipv6Ranges: [
-          {
-            CidrIpv6: "::/0",
-          },
-        ],
-        ToPort: 80,
-      },
-    }),
-  });
-  const sgRuleIngressHttps = provider.EC2.makeSecurityGroupRuleIngress({
-    name: "sg-rule-ingress-https",
-    dependencies: {
-      securityGroup,
-    },
-    properties: () => ({
-      IpPermission: {
-        FromPort: 443,
-        IpProtocol: "tcp",
-        IpRanges: [
-          {
-            CidrIp: "0.0.0.0/0",
-          },
-        ],
-        Ipv6Ranges: [
-          {
-            CidrIpv6: "::/0",
-          },
-        ],
-        ToPort: 443,
-      },
-    }),
-  });
-  const sgRuleIngressIcmp = provider.EC2.makeSecurityGroupRuleIngress({
-    name: "sg-rule-ingress-icmp",
-    dependencies: {
-      securityGroup,
-    },
-    properties: () => ({
-      IpPermission: {
-        FromPort: -1,
-        IpProtocol: "icmp",
-        IpRanges: [
-          {
-            CidrIp: "0.0.0.0/0",
-          },
-        ],
-        Ipv6Ranges: [
-          {
-            CidrIpv6: "::/0",
-          },
-        ],
-        ToPort: -1,
-      },
-    }),
-  });
-
-  const eip = provider.EC2.makeElasticIpAddress({
-    name: "ip",
-  });
-
-  const image = provider.EC2.useImage({
-    name: "ubuntu 20.04",
-    properties: () => ({
-      Filters: [
-        {
-          Name: "architecture",
-          Values: ["x86_64"],
-        },
-        {
-          Name: "description",
-          Values: ["Canonical, Ubuntu, 20.04 LTS, amd64 focal*"],
-        },
-      ],
-    }),
-  });
-
-  const volume = provider.EC2.makeVolume({
-    name: "volume",
-    properties: () => ({
-      Size: 10,
-      VolumeType: "standard",
-      Device,
-      AvailabilityZone,
-    }),
-  });
-
-  // Allocate a server
-  const server = provider.EC2.makeInstance({
-    name: "server",
-    dependencies: {
-      keyPair,
-      subnet,
-      securityGroups: [securityGroup],
-      eip,
-      image,
-      volumes: [volume],
-    },
-    properties: () => ({
-      UserData: volume.spec.setupEbsVolume({ deviceMounted, mountPoint }),
-      InstanceType: "t2.micro",
-      Placement: { AvailabilityZone },
-    }),
-  });
-
-  const domain = provider.Route53Domains.useDomain({
-    name: domainName,
-  });
-
-  const hostedZoneName = `${domainName}.`;
-  const hostedZone = provider.Route53.makeHostedZone({
-    name: hostedZoneName,
-    dependencies: { domain },
-    properties: ({}) => ({}),
-  });
-
-  const recordA = provider.Route53.makeRecord({
-    name: `app.${hostedZoneName}`,
-    dependencies: { hostedZone, eip },
-    properties: ({ dependencies: { eip } }) => {
-      return {
-        Name: `app.${hostedZoneName}`,
-        Type: "A",
-        ResourceRecords: [
-          {
-            Value: eip.live?.PublicIp,
-          },
-        ],
-        TTL: 60,
-      };
-    },
-  });
-
-  const recordAGitPage = provider.Route53.makeRecord({
-    name: `${hostedZoneName}`,
-    dependencies: { hostedZone },
-    properties: ({ dependencies }) => {
-      return {
-        Name: `${hostedZoneName}`,
-        Type: "A",
-        ResourceRecords: [
-          {
-            Value: "185.199.108.153",
-          },
-          {
-            Value: "185.199.109.153",
-          },
-        ],
-        TTL: 86400,
-      };
-    },
-  });
-  const recordWww = provider.Route53.makeRecord({
-    name: `${hostedZoneName}-gitpage-record-www`,
-    dependencies: { hostedZone },
-    properties: () => {
-      return {
-        Name: `www.${hostedZoneName}`,
-        Type: "CNAME",
-        ResourceRecords: [
-          {
-            Value: "grucloud.github.io.",
-          },
-        ],
-        TTL: 86400,
-      };
-    },
-  });
-
-  const recordMx = provider.Route53.makeRecord({
-    name: `${hostedZoneName}-mx`,
-    dependencies: { hostedZone },
-    properties: () => {
-      return {
-        Name: `${hostedZoneName}`,
-        Type: "MX",
-        ResourceRecords: [
-          {
-            Value: "1 ASPMX.L.GOOGLE.COM.",
-          },
-          {
-            Value: "5 ALT1.ASPMX.L.GOOGLE.COM.",
-          },
-        ],
-        TTL: 86400,
-      };
-    },
-  });
-  return {
-    vpc,
-    ig,
-    subnet,
-    routeTable,
-    securityGroup,
-    eip,
-    server,
-    //hostedZone, recordA
-  };
-};
-
-exports.createResources = createResources;
-
-//TODO
-exports.createStack = async ({ config, stage }) => {
-  // Create a AWS provider
-  const provider = AwsProvider({ config, stage });
-  const { keyPairName } = provider.config;
-  assert(keyPairName);
-
-  const keyPair = provider.EC2.useKeyPair({
-    name: keyPairName,
-  });
-  const resources = await createResources({ provider, resources: { keyPair } });
-  return { provider, resources };
-};
diff --git a/deploy/grucloud-aws/package.json b/deploy/grucloud-aws/package.json
deleted file mode 100644
index cf69c5a4..00000000
--- a/deploy/grucloud-aws/package.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "name": "grucloud-app",
-  "version": "1.0.0",
-  "description": "",
-  "main": "index.js",
-  "scripts": {
-    "e2e": "gc d -a -f && gc d -a && gc l && gc a -f && gc a && gc d -f && gc d && gc l -o"
-  },
-  "author": "",
-  "license": "ISC",
-  "dependencies": {
-    "@grucloud/core": "1.38.0",
-    "@grucloud/provider-aws": "1.38.0",
-    "ping": "^0.4.1",
-    "ssh2": "^1.3.0"
-  }
-}
diff --git a/deploy/grucloud-aws/resources-mindmap.puml b/deploy/grucloud-aws/resources-mindmap.puml
deleted file mode 100644
index b7ec56f4..00000000
--- a/deploy/grucloud-aws/resources-mindmap.puml
+++ /dev/null
@@ -1,45 +0,0 @@
-@startmindmap
-title Resources for project grucloud-aws
-skinparam monochrome true
-+ Infra
-++ aws
-+++ ec2
-++++ KeyPair (1)
-+++++ grucloud-app
-++++ Vpc (1)
-+++++ vpc
-++++ InternetGateway (1)
-+++++ ig
-++++ Subnet (1)
-+++++ subnet
-++++ RouteTable (1)
-+++++ route-table
-++++ Route (1)
-+++++ route-ig
-++++ SecurityGroup (1)
-+++++ securityGroup
-++++ SecurityGroupRuleIngress (4)
-+++++ sg-rule-ingress-ssh
-+++++ sg-rule-ingress-http
-+++++ sg-rule-ingress-https
-+++++ sg-rule-ingress-icmp
-++++ ElasticIpAddress (1)
-+++++ ip
-++++ Image (1)
-+++++ ubuntu 20.04
-++++ Volume (1)
-+++++ volume
-++++ Instance (1)
-+++++ server
-+++ route53Domain
-++++ Domain (1)
-+++++ grucloud.com
-+++ route53
-++++ HostedZone (1)
-+++++ grucloud.com.
-++++ Record (4)
-+++++ app.grucloud.com.
-+++++ grucloud.com.
-+++++ grucloud.com.-gitpage-record-www
-+++++ grucloud.com.-mx
-@endmindmap
\ No newline at end of file
diff --git a/deploy/grucloud-aws/resources-mindmap.svg b/deploy/grucloud-aws/resources-mindmap.svg
deleted file mode 100644
index de96534e..00000000
--- a/deploy/grucloud-aws/resources-mindmap.svg
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="1245px" preserveAspectRatio="none" style="width:766px;height:1245px;background:#FFFFFF;" version="1.1" viewBox="0 0 766 1245" width="766px" zoomAndPan="magnify"><defs><filter height="300%" id="f1kcm1dcn7dno5" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviation="2.0"/><feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/><feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/><feBlend in="SourceGraphic" in2="blurOut3" mode="normal"/></filter></defs><g><rect fill="none" height="26.4883" style="stroke:none;stroke-width:1.0;" width="269" x="218.5" y="15"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="259" x="223.5" y="33.5352">Resources for project grucloud-aws</text><rect fill="#F8F8F8" filter="url(#f1kcm1dcn7dno5)" height="36.4883" rx="12.5" ry="12.5" style="stroke:#383838;stroke-width:1.5;" width="52" x="10" y="622.3711"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="32" x="20" y="645.9063">Infra</text><rect fill="#F8F8F8" filter="url(#f1kcm1dcn7dno5)" height="36.4883" rx="12.5" ry="12.5" style="stroke:#383838;stroke-width:1.5;" width="46" x="112" y="622.3711"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="26" x="122" y="645.9063">aws</text><rect fill="#F8F8F8" filter="url(#f1kcm1dcn7dno5)" height="36.4883" rx="12.5" ry="12.5" style="stroke:#383838;stroke-width:1.5;" width="44" x="208" y="452.9063"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="24" x="218" y="476.4414">ec2</text><rect fill="#F8F8F8" filter="url(#f1kcm1dcn7dno5)" height="36.4883" rx="12.5" ry="12.5" style="stroke:#383838;stroke-width:1.5;" width="93" x="302" y="57.4883"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="73" x="312" y="81.0234">KeyPair (1)</text><rect fill="#F8F8F8" filter="url(#f1kcm1dcn7dno5)" height="36.4883" rx="12.5" ry="12.5" style="stroke:#383838;stroke-width:1.5;" width="116" x="445" y="57.4883"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="96" x="455" y="81.0234">grucloud-app</text><path d="M395,75.7324 L405,75.7324 C420,75.7324 420,75.7324 435,75.7324 L445,75.7324 " fill="none" style="stroke:#383838;stroke-width:1.0;"/><path d="M252,471.1504 L262,471.1504 C277,471.1504 277,75.7324 292,75.7324 L302,75.7324 " fill="none" style="stroke:#383838;stroke-width:1.0;"/><rect fill="#F8F8F8" filter="url(#f1kcm1dcn7dno5)" height="36.4883" rx="12.5" ry="12.5" style="stroke:#383838;stroke-width:1.5;" width="68" x="302" y="113.9766"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="48" x="312" y="137.5117">Vpc (1)</text><rect fill="#F8F8F8" filter="url(#f1kcm1dcn7dno5)" height="36.4883" rx="12.5" ry="12.5" style="stroke:#383838;stroke-width:1.5;" width="43" x="420" y="113.9766"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="23" x="430" y="137.5117">vpc</text><path d="M370,132.2207 L380,132.2207 C395,132.2207 395,132.2207 410,132.2207 L420,132.2207 " fill="none" style="stroke:#383838;stroke-width:1.0;"/><path d="M252,471.1504 L262,471.1504 C277,471.1504 277,132.2207 292,132.2207 L302,132.2207 " fill="none" style="stroke:#383838;stroke-width:1.0;"/><rect fill="#F8F8F8" filter="url(#f1kcm1dcn7dno5)" height="36.4883" rx="12.5" ry="12.5" style="stroke:#383838;stroke-width:1.5;" width="154" x="302" y="170.4648"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="134" x="312" y="194">InternetGateway (1)</text><rect fill="#F8F8F8" filter="url(#f1kcm1dcn7dno5)" height="36.4883" rx="12.5" ry="12.5" style="stroke:#383838;stroke-width:1.5;" width="33" x="506" y="170.4648"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="13" x="516" y="194">ig</text><path d="M456,188.709 L466,188.709 C481,188.709 481,188.709 496,188.709 L506,188.709 " fill="none" style="stroke:#383838;stroke-width:1.0;"/><path d="M252,471.1504 L262,471.1504 C277,471.1504 277,188.709 292,188.709 L302,188.709 " fill="none" style="stroke:#383838;stroke-width:1.0;"/><rect fill="#F8F8F8" filter="url(#f1kcm1dcn7dno5)" height="36.4883" rx="12.5" ry="12.5" style="stroke:#383838;stroke-width:1.5;" width="91" x="302" y="226.9531"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="71" x="312" y="250.4883">Subnet (1)</text><rect fill="#F8F8F8" filter="url(#f1kcm1dcn7dno5)" height="36.4883" rx="12.5" ry="12.5" style="stroke:#383838;stroke-width:1.5;" width="67" x="443" y="226.9531"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="47" x="453" y="250.4883">subnet</text><path d="M393,245.1973 L403,245.1973 C418,245.1973 418,245.1973 433,245.1973 L443,245.1973 " fill="none" style="stroke:#383838;stroke-width:1.0;"/><path d="M252,471.1504 L262,471.1504 C277,471.1504 277,245.1973 292,245.1973 L302,245.1973 " fill="none" style="stroke:#383838;stroke-width:1.0;"/><rect fill="#F8F8F8" filter="url(#f1kcm1dcn7dno5)" height="36.4883" rx="12.5" ry="12.5" style="stroke:#383838;stroke-width:1.5;" width="121" x="302" y="283.4414"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="101" x="312" y="306.9766">RouteTable (1)</text><rect fill="#F8F8F8" filter="url(#f1kcm1dcn7dno5)" height="36.4883" rx="12.5" ry="12.5" style="stroke:#383838;stroke-width:1.5;" width="99" x="473" y="283.4414"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="79" x="483" y="306.9766">route-table</text><path d="M423,301.6855 L433,301.6855 C448,301.6855 448,301.6855 463,301.6855 L473,301.6855 " fill="none" style="stroke:#383838;stroke-width:1.0;"/><path d="M252,471.1504 L262,471.1504 C277,471.1504 277,301.6855 292,301.6855 L302,301.6855 " fill="none" style="stroke:#383838;stroke-width:1.0;"/><rect fill="#F8F8F8" filter="url(#f1kcm1dcn7dno5)" height="36.4883" rx="12.5" ry="12.5" style="stroke:#383838;stroke-width:1.5;" width="83" x="302" y="339.9297"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="63" x="312" y="363.4648">Route (1)</text><rect fill="#F8F8F8" filter="url(#f1kcm1dcn7dno5)" height="36.4883" rx="12.5" ry="12.5" style="stroke:#383838;stroke-width:1.5;" width="78" x="435" y="339.9297"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="58" x="445" y="363.4648">route-ig</text><path d="M385,358.1738 L395,358.1738 C410,358.1738 410,358.1738 425,358.1738 L435,358.1738 " fill="none" style="stroke:#383838;stroke-width:1.0;"/><path d="M252,471.1504 L262,471.1504 C277,471.1504 277,358.1738 292,358.1738 L302,358.1738 " fill="none" style="stroke:#383838;stroke-width:1.0;"/><rect fill="#F8F8F8" filter="url(#f1kcm1dcn7dno5)" height="36.4883" rx="12.5" ry="12.5" style="stroke:#383838;stroke-width:1.5;" width="140" x="302" y="396.418"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="120" x="312" y="419.9531">SecurityGroup (1)</text><rect fill="#F8F8F8" filter="url(#f1kcm1dcn7dno5)" height="36.4883" rx="12.5" ry="12.5" style="stroke:#383838;stroke-width:1.5;" width="116" x="492" y="396.418"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="96" x="502" y="419.9531">securityGroup</text><path d="M442,414.6621 L452,414.6621 C467,414.6621 467,414.6621 482,414.6621 L492,414.6621 " fill="none" style="stroke:#383838;stroke-width:1.0;"/><path d="M252,471.1504 L262,471.1504 C277,471.1504 277,414.6621 292,414.6621 L302,414.6621 " fill="none" style="stroke:#383838;stroke-width:1.0;"/><rect fill="#F8F8F8" filter="url(#f1kcm1dcn7dno5)" height="36.4883" rx="12.5" ry="12.5" style="stroke:#383838;stroke-width:1.5;" width="220" x="302" y="537.6387"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="200" x="312" y="561.1738">SecurityGroupRuleIngress (4)</text><rect fill="#F8F8F8" filter="url(#f1kcm1dcn7dno5)" height="36.4883" rx="12.5" ry="12.5" style="stroke:#383838;stroke-width:1.5;" width="160" x="572" y="452.9063"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="140" x="582" y="476.4414">sg-rule-ingress-ssh</text><path d="M522,555.8828 L532,555.8828 C547,555.8828 547,471.1504 562,471.1504 L572,471.1504 " fill="none" style="stroke:#383838;stroke-width:1.0;"/><rect fill="#F8F8F8" filter="url(#f1kcm1dcn7dno5)" height="36.4883" rx="12.5" ry="12.5" style="stroke:#383838;stroke-width:1.5;" width="165" x="572" y="509.3945"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="145" x="582" y="532.9297">sg-rule-ingress-http</text><path d="M522,555.8828 L532,555.8828 C547,555.8828 547,527.6387 562,527.6387 L572,527.6387 " fill="none" style="stroke:#383838;stroke-width:1.0;"/><rect fill="#F8F8F8" filter="url(#f1kcm1dcn7dno5)" height="36.4883" rx="12.5" ry="12.5" style="stroke:#383838;stroke-width:1.5;" width="172" x="572" y="565.8828"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="152" x="582" y="589.418">sg-rule-ingress-https</text><path d="M522,555.8828 L532,555.8828 C547,555.8828 547,584.127 562,584.127 L572,584.127 " fill="none" style="stroke:#383838;stroke-width:1.0;"/><rect fill="#F8F8F8" filter="url(#f1kcm1dcn7dno5)" height="36.4883" rx="12.5" ry="12.5" style="stroke:#383838;stroke-width:1.5;" width="170" x="572" y="622.3711"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="150" x="582" y="645.9063">sg-rule-ingress-icmp</text><path d="M522,555.8828 L532,555.8828 C547,555.8828 547,640.6152 562,640.6152 L572,640.6152 " fill="none" style="stroke:#383838;stroke-width:1.0;"/><path d="M252,471.1504 L262,471.1504 C277,471.1504 277,555.8828 292,555.8828 L302,555.8828 " fill="none" style="stroke:#383838;stroke-width:1.0;"/><rect fill="#F8F8F8" filter="url(#f1kcm1dcn7dno5)" height="36.4883" rx="12.5" ry="12.5" style="stroke:#383838;stroke-width:1.5;" width="155" x="302" y="678.8594"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="135" x="312" y="702.3945">ElasticIpAddress (1)</text><rect fill="#F8F8F8" filter="url(#f1kcm1dcn7dno5)" height="36.4883" rx="12.5" ry="12.5" style="stroke:#383838;stroke-width:1.5;" width="33" x="507" y="678.8594"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="13" x="517" y="702.3945">ip</text><path d="M457,697.1035 L467,697.1035 C482,697.1035 482,697.1035 497,697.1035 L507,697.1035 " fill="none" style="stroke:#383838;stroke-width:1.0;"/><path d="M252,471.1504 L262,471.1504 C277,471.1504 277,697.1035 292,697.1035 L302,697.1035 " fill="none" style="stroke:#383838;stroke-width:1.0;"/><rect fill="#F8F8F8" filter="url(#f1kcm1dcn7dno5)" height="36.4883" rx="12.5" ry="12.5" style="stroke:#383838;stroke-width:1.5;" width="85" x="302" y="735.3477"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="65" x="312" y="758.8828">Image (1)</text><rect fill="#F8F8F8" filter="url(#f1kcm1dcn7dno5)" height="36.4883" rx="12.5" ry="12.5" style="stroke:#383838;stroke-width:1.5;" width="114" x="437" y="735.3477"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="94" x="447" y="758.8828">ubuntu 20.04</text><path d="M387,753.5918 L397,753.5918 C412,753.5918 412,753.5918 427,753.5918 L437,753.5918 " fill="none" style="stroke:#383838;stroke-width:1.0;"/><path d="M252,471.1504 L262,471.1504 C277,471.1504 277,753.5918 292,753.5918 L302,753.5918 " fill="none" style="stroke:#383838;stroke-width:1.0;"/><rect fill="#F8F8F8" filter="url(#f1kcm1dcn7dno5)" height="36.4883" rx="12.5" ry="12.5" style="stroke:#383838;stroke-width:1.5;" width="95" x="302" y="791.8359"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="75" x="312" y="815.3711">Volume (1)</text><rect fill="#F8F8F8" filter="url(#f1kcm1dcn7dno5)" height="36.4883" rx="12.5" ry="12.5" style="stroke:#383838;stroke-width:1.5;" width="70" x="447" y="791.8359"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="50" x="457" y="815.3711">volume</text><path d="M397,810.0801 L407,810.0801 C422,810.0801 422,810.0801 437,810.0801 L447,810.0801 " fill="none" style="stroke:#383838;stroke-width:1.0;"/><path d="M252,471.1504 L262,471.1504 C277,471.1504 277,810.0801 292,810.0801 L302,810.0801 " fill="none" style="stroke:#383838;stroke-width:1.0;"/><rect fill="#F8F8F8" filter="url(#f1kcm1dcn7dno5)" height="36.4883" rx="12.5" ry="12.5" style="stroke:#383838;stroke-width:1.5;" width="100" x="302" y="848.3242"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="80" x="312" y="871.8594">Instance (1)</text><rect fill="#F8F8F8" filter="url(#f1kcm1dcn7dno5)" height="36.4883" rx="12.5" ry="12.5" style="stroke:#383838;stroke-width:1.5;" width="62" x="452" y="848.3242"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="42" x="462" y="871.8594">server</text><path d="M402,866.5684 L412,866.5684 C427,866.5684 427,866.5684 442,866.5684 L452,866.5684 " fill="none" style="stroke:#383838;stroke-width:1.0;"/><path d="M252,471.1504 L262,471.1504 C277,471.1504 277,866.5684 292,866.5684 L302,866.5684 " fill="none" style="stroke:#383838;stroke-width:1.0;"/><path d="M158,640.6152 L168,640.6152 C183,640.6152 183,471.1504 198,471.1504 L208,471.1504 " fill="none" style="stroke:#383838;stroke-width:1.0;"/><rect fill="#F8F8F8" filter="url(#f1kcm1dcn7dno5)" height="36.4883" rx="12.5" ry="12.5" style="stroke:#383838;stroke-width:1.5;" width="128" x="208" y="904.8125"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="108" x="218" y="928.3477">route53Domain</text><rect fill="#F8F8F8" filter="url(#f1kcm1dcn7dno5)" height="36.4883" rx="12.5" ry="12.5" style="stroke:#383838;stroke-width:1.5;" width="96" x="386" y="904.8125"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="76" x="396" y="928.3477">Domain (1)</text><rect fill="#F8F8F8" filter="url(#f1kcm1dcn7dno5)" height="36.4883" rx="12.5" ry="12.5" style="stroke:#383838;stroke-width:1.5;" width="115" x="532" y="904.8125"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="95" x="542" y="928.3477">grucloud.com</text><path d="M482,923.0566 L492,923.0566 C507,923.0566 507,923.0566 522,923.0566 L532,923.0566 " fill="none" style="stroke:#383838;stroke-width:1.0;"/><path d="M336,923.0566 L346,923.0566 C361,923.0566 361,923.0566 376,923.0566 L386,923.0566 " fill="none" style="stroke:#383838;stroke-width:1.0;"/><path d="M158,640.6152 L168,640.6152 C183,640.6152 183,923.0566 198,923.0566 L208,923.0566 " fill="none" style="stroke:#383838;stroke-width:1.0;"/><rect fill="#F8F8F8" filter="url(#f1kcm1dcn7dno5)" height="36.4883" rx="12.5" ry="12.5" style="stroke:#383838;stroke-width:1.5;" width="75" x="208" y="1074.2773"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="55" x="218" y="1097.8125">route53</text><rect fill="#F8F8F8" filter="url(#f1kcm1dcn7dno5)" height="36.4883" rx="12.5" ry="12.5" style="stroke:#383838;stroke-width:1.5;" width="125" x="333" y="961.3008"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="105" x="343" y="984.8359">HostedZone (1)</text><rect fill="#F8F8F8" filter="url(#f1kcm1dcn7dno5)" height="36.4883" rx="12.5" ry="12.5" style="stroke:#383838;stroke-width:1.5;" width="119" x="508" y="961.3008"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="99" x="518" y="984.8359">grucloud.com.</text><path d="M458,979.5449 L468,979.5449 C483,979.5449 483,979.5449 498,979.5449 L508,979.5449 " fill="none" style="stroke:#383838;stroke-width:1.0;"/><path d="M283,1092.5215 L293,1092.5215 C308,1092.5215 308,979.5449 323,979.5449 L333,979.5449 " fill="none" style="stroke:#383838;stroke-width:1.0;"/><rect fill="#F8F8F8" filter="url(#f1kcm1dcn7dno5)" height="36.4883" rx="12.5" ry="12.5" style="stroke:#383838;stroke-width:1.5;" width="91" x="333" y="1102.5215"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="71" x="343" y="1126.0566">Record (4)</text><rect fill="#F8F8F8" filter="url(#f1kcm1dcn7dno5)" height="36.4883" rx="12.5" ry="12.5" style="stroke:#383838;stroke-width:1.5;" width="149" x="474" y="1017.7891"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="129" x="484" y="1041.3242">app.grucloud.com.</text><path d="M424,1120.7656 L434,1120.7656 C449,1120.7656 449,1036.0332 464,1036.0332 L474,1036.0332 " fill="none" style="stroke:#383838;stroke-width:1.0;"/><rect fill="#F8F8F8" filter="url(#f1kcm1dcn7dno5)" height="36.4883" rx="12.5" ry="12.5" style="stroke:#383838;stroke-width:1.5;" width="119" x="474" y="1074.2773"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="99" x="484" y="1097.8125">grucloud.com.</text><path d="M424,1120.7656 L434,1120.7656 C449,1120.7656 449,1092.5215 464,1092.5215 L474,1092.5215 " fill="none" style="stroke:#383838;stroke-width:1.0;"/><rect fill="#F8F8F8" filter="url(#f1kcm1dcn7dno5)" height="36.4883" rx="12.5" ry="12.5" style="stroke:#383838;stroke-width:1.5;" width="273" x="474" y="1130.7656"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="253" x="484" y="1154.3008">grucloud.com.-gitpage-record-www</text><path d="M424,1120.7656 L434,1120.7656 C449,1120.7656 449,1149.0098 464,1149.0098 L474,1149.0098 " fill="none" style="stroke:#383838;stroke-width:1.0;"/><rect fill="#F8F8F8" filter="url(#f1kcm1dcn7dno5)" height="36.4883" rx="12.5" ry="12.5" style="stroke:#383838;stroke-width:1.5;" width="149" x="474" y="1187.2539"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="129" x="484" y="1210.7891">grucloud.com.-mx</text><path d="M424,1120.7656 L434,1120.7656 C449,1120.7656 449,1205.498 464,1205.498 L474,1205.498 " fill="none" style="stroke:#383838;stroke-width:1.0;"/><path d="M283,1092.5215 L293,1092.5215 C308,1092.5215 308,1120.7656 323,1120.7656 L333,1120.7656 " fill="none" style="stroke:#383838;stroke-width:1.0;"/><path d="M158,640.6152 L168,640.6152 C183,640.6152 183,1092.5215 198,1092.5215 L208,1092.5215 " fill="none" style="stroke:#383838;stroke-width:1.0;"/><path d="M62,640.6152 L72,640.6152 C87,640.6152 87,640.6152 102,640.6152 L112,640.6152 " fill="none" style="stroke:#383838;stroke-width:1.0;"/><!--MD5=[2c13ea64b9deb2055c488cd5dc87ea7d]
-@startmindmap
-title Resources for project grucloud-aws
-skinparam monochrome true
-+ Infra
-++ aws
-+++ ec2
-++++ KeyPair (1)
-+++++ grucloud-app
-++++ Vpc (1)
-+++++ vpc
-++++ InternetGateway (1)
-+++++ ig
-++++ Subnet (1)
-+++++ subnet
-++++ RouteTable (1)
-+++++ route-table
-++++ Route (1)
-+++++ route-ig
-++++ SecurityGroup (1)
-+++++ securityGroup
-++++ SecurityGroupRuleIngress (4)
-+++++ sg-rule-ingress-ssh
-+++++ sg-rule-ingress-http
-+++++ sg-rule-ingress-https
-+++++ sg-rule-ingress-icmp
-++++ ElasticIpAddress (1)
-+++++ ip
-++++ Image (1)
-+++++ ubuntu 20.04
-++++ Volume (1)
-+++++ volume
-++++ Instance (1)
-+++++ server
-+++ route53Domain
-++++ Domain (1)
-+++++ grucloud.com
-+++ route53
-++++ HostedZone (1)
-+++++ grucloud.com.
-++++ Record (4)
-+++++ app.grucloud.com.
-+++++ grucloud.com.
-+++++ grucloud.com.-gitpage-record-www
-+++++ grucloud.com.-mx
-@endmindmap
-
-PlantUML version 1.2021.8(Sat Jun 26 10:20:59 CEST 2021)
-(GPL source distribution)
-Java Runtime: OpenJDK Runtime Environment
-JVM: OpenJDK 64-Bit Server VM
-Default Encoding: UTF-8
-Language: en
-Country: GB
---></g></svg>
\ No newline at end of file
diff --git a/deploy/playbook/group_vars/all/vars.yml b/deploy/playbook/group_vars/all/vars.yml
index 92d1c367..f28223e8 100644
--- a/deploy/playbook/group_vars/all/vars.yml
+++ b/deploy/playbook/group_vars/all/vars.yml
@@ -25,7 +25,9 @@ firewall_allowed_tcp_ports:
   - "80"
   - "443"
   - "9000"
-
+firewall_additional_rules:
+  - "iptables -t nat -A POSTROUTING -s 10.0.0.0/16 -j MASQUERADE"
+  - "iptables -A INPUT -p tcp -s 10.0.0.0/16 -j ACCEPT"
 # Database settings
 
 # External volume
diff --git a/server/package.json b/server/package.json
index 061cc2ac..47542f2a 100644
--- a/server/package.json
+++ b/server/package.json
@@ -34,6 +34,7 @@
   },
   "dependencies": {
     "@aws-sdk/client-ecs": "3.332.0",
+    "@aws-sdk/client-lambda": "3.429.0",
     "@aws-sdk/client-s3": "3.332.0",
     "@aws-sdk/client-sts": "3.429.0",
     "@aws-sdk/s3-request-presigner": "3.332.0",
diff --git a/server/src/plugins/cloudDiagram/api/runApi.js b/server/src/plugins/cloudDiagram/api/runApi.js
index 2782b4a5..19ffcbf6 100644
--- a/server/src/plugins/cloudDiagram/api/runApi.js
+++ b/server/src/plugins/cloudDiagram/api/runApi.js
@@ -26,9 +26,12 @@ const { contextSet404, contextSetOk } = require("utils/koaCommon");
 const { middlewareUserBelongsToOrg } = require("../middleware");
 const { DockerGcCreate } = require("../utils/rungc");
 const { ecsTaskRun } = require("../utils/ecsTaskRun");
+const { lambdaRun } = require("../utils/lambdaRun");
 
 const { getSignedUrl } = require("@aws-sdk/s3-request-presigner");
-const { S3Client, GetObjectCommand } = require("@aws-sdk/client-s3");
+const { GetObjectCommand } = require("@aws-sdk/client-s3");
+
+const { createS3Client } = require("../utils/S3Client");
 
 const logger = require("logfilename")(__filename);
 const { transformEnv } = require("../utils/envUtils");
@@ -81,9 +84,12 @@ const buildS3SignedUrl = ({ config, context, filename }) =>
     }),
     tryCatch(
       pipe([
-        //TODO credentials
         (input) =>
-          getSignedUrl(new S3Client({}), new GetObjectCommand(input), {}),
+          getSignedUrl(
+            createS3Client(process.env),
+            new GetObjectCommand(input),
+            {}
+          ),
       ]),
       (error, bucket) =>
         pipe([
@@ -133,8 +139,8 @@ const buildCmd = ({
       bucketUpload,
       "--s3-key",
       `${org_id}/${project_id}/${workspace_id}/${run_id}`,
-      "--s3-local-dir",
-      "/app/my-repo/artifacts",
+      //"--s3-local-dir",
+      //"/app/my-repo/artifacts",
       // "--ws-url",
       // wsUrl,
       // "--ws-room",
@@ -148,6 +154,7 @@ const buildCmd = ({
 
 const buildGcFlow = ({
   repository_url,
+  working_directory,
   provider_type,
   bucketUpload,
   wsUrl,
@@ -162,22 +169,27 @@ const buildGcFlow = ({
     when(
       () => repository_url,
       pipe([
+        append({
+          name: "rm",
+          run: `rm -rf /tmp/my-repo/`,
+          workingDirectory: `/tmp/`,
+        }),
         append({
           name: "Clone Repo",
-          run: "git clone $GIT_REPO -b $GIT_BRANCH --depth 1 my-repo",
+          run: "git clone $GIT_REPO -b $GIT_BRANCH --depth 1 /tmp/my-repo",
+        }),
+        append({
+          name: "ls",
+          run: "ls -l",
+          workingDirectory: `/tmp/my-repo/${working_directory}`,
         }),
         append({
           name: "npm install",
           run: "npm install --loglevel=error",
-          workingDirectory: "my-repo",
+          workingDirectory: `/tmp/my-repo/${working_directory}`,
         }),
       ])
     ),
-    // append({
-    //   name: "ls",
-    //   run: "ls -l",
-    //   workingDirectory: "my-repo",
-    // }),
     append({
       name: "gc list",
       run: `node_modules/.bin/gc ${buildCmd({
@@ -190,12 +202,36 @@ const buildGcFlow = ({
         workspace_id,
         run_id,
       })}`,
-      workingDirectory: "my-repo",
+      workingDirectory: `/tmp/my-repo/${working_directory}`,
     }),
     (steps) => ({ steps }),
     JSON.stringify,
   ])();
 
+const grucloudEcsTask = ({ config }) =>
+  pipe([
+    ({ env_vars }) => ({
+      config,
+      container: {
+        name: "grucloud-cli",
+        command: [],
+        environment: pipe([
+          () => env_vars,
+          omit(["SERVICES"]),
+          map.entries(([name, value]) => [name, { name, value }]),
+          values,
+        ])(),
+      },
+    }),
+    tap((param) => {
+      assert(true);
+    }),
+    ecsTaskRun,
+    tap((param) => {
+      assert(true);
+    }),
+  ]);
+
 exports.RunApi = ({ app, models }) => {
   const { config } = app;
   const { aws, infra } = config;
@@ -290,6 +326,7 @@ exports.RunApi = ({ app, models }) => {
                           GC_FLOW: buildGcFlow({
                             servicesCmd,
                             repository_url: project.repository_url,
+                            working_directory: project.working_directory,
                             provider_type: cloudAuthentication.provider_type,
                             bucketUpload: aws.bucketUpload,
                             wsUrl: infra.wsUrl,
@@ -301,6 +338,13 @@ exports.RunApi = ({ app, models }) => {
                           WS_URL: infra.wsUrl,
                           WS_ROOM: `${org_id}/${project_id}/${workspace_id}/${run_id}`,
                         }),
+                        transformEnv({
+                          GRUCLOUD_OAUTH_SUBJECT: buildSubject({
+                            org_id,
+                            project_id,
+                            workspace_id,
+                          }),
+                        }),
                       ])(),
                   }),
                   tap((param) => {
@@ -339,45 +383,10 @@ exports.RunApi = ({ app, models }) => {
                         assert(Id);
                       }),
                     ]),
+                    eq(get("engine"), "lambda"),
+                    lambdaRun(config),
                     // default is ecs
-                    pipe([
-                      assign({
-                        servicesCmd: pipe([
-                          get("env_vars.SERVICES", []),
-                          flatMap((service) => ["--include-groups", service]),
-                        ]),
-                      }),
-                      ({ org_id, project_id, workspace_id, env_vars }) => ({
-                        config,
-                        container: {
-                          name: "grucloud-cli",
-                          command: [],
-                          environment: pipe([
-                            () => env_vars,
-                            omit(["SERVICES"]),
-                            transformEnv({
-                              GRUCLOUD_OAUTH_SUBJECT: buildSubject({
-                                org_id,
-                                project_id,
-                                workspace_id,
-                              }),
-                            }),
-                            map.entries(([name, value]) => [
-                              name,
-                              { name, value },
-                            ]),
-                            values,
-                          ])(),
-                        },
-                      }),
-                      tap((param) => {
-                        assert(true);
-                      }),
-                      ecsTaskRun,
-                      tap((param) => {
-                        assert(true);
-                      }),
-                    ]),
+                    grucloudEcsTask({ config }),
                   ]),
                 ])(),
             }),
diff --git a/server/src/plugins/cloudDiagram/test/test005Run.js b/server/src/plugins/cloudDiagram/test/test005Run.js
index e7dcd7ee..93323d93 100644
--- a/server/src/plugins/cloudDiagram/test/test005Run.js
+++ b/server/src/plugins/cloudDiagram/test/test005Run.js
@@ -14,13 +14,19 @@ const payloadCreateDocker = {
   reason: "my reason",
   kind: "list",
   status: "creating",
-  engine: "docker", // ecs or docker
+  engine: "docker",
 };
 const payloadCreateEcs = {
   reason: "my reason",
   kind: "list",
   status: "creating",
-  engine: "ecs", // ecs or docker
+  engine: "ecs",
+};
+const payloadCreateLambda = {
+  reason: "my reason",
+  kind: "list",
+  status: "creating",
+  engine: "lambda",
 };
 const WebSocket = require("ws");
 
@@ -70,25 +76,25 @@ describe("Run No Auth", function () {
   });
 });
 
-const runCrudDocker = async ({
+const runCrud = async ({
   client,
   org_id,
   project_id,
   workspace_id,
-  payloadCreateDocker,
+  payloadCreate,
 }) => {
   try {
     // Create
     const run = await client.post(
       `v1/org/${org_id}/project/${project_id}/workspace/${workspace_id}/run`,
-      payloadCreateDocker
+      payloadCreate
     );
     assert(run);
     const { run_id, container_id } = run;
     assert(run_id);
     assert(container_id);
 
-    assert.equal(run.reason, payloadCreateDocker.reason);
+    assert.equal(run.reason, payloadCreate.reason);
 
     const ws = new WebSocket(`ws://localhost:9000`);
     ws.on("open", () => {
@@ -181,23 +187,40 @@ describe("Run", function () {
     await client.login();
   });
   it("CRUD aws docker", async () => {
-    await runCrudDocker({
+    await runCrud({
       client,
       org_id,
       project_id: project_aws_id,
       workspace_id,
-      payloadCreateDocker,
+      payloadCreate: payloadCreateDocker,
     });
   });
   it("CRUD azure docker", async () => {
-    await runCrudDocker({
+    await runCrud({
       client,
       org_id,
       project_id: project_azure_id,
       workspace_id,
-      payloadCreateDocker,
+      payloadCreate: payloadCreateDocker,
     });
   });
+  it("CRUD aws lamda", async () => {
+    try {
+      // Create
+      const run = await client.post(
+        `v1/org/${org_id}/project/${project_id}/workspace/${workspace_id}/run`,
+        payloadCreateLambda
+      );
+      assert(run);
+      const { run_id, container_id } = run;
+      assert(run_id);
+      assert(container_id);
+    } catch (error) {
+      console.error(error);
+      throw error;
+    }
+  });
+
   it("CRUD ecs task", async () => {
     try {
       // Create
diff --git a/server/src/plugins/cloudDiagram/test/testEcsTask.js b/server/src/plugins/cloudDiagram/test/testEcsTask.js
index 746badf3..339cceaa 100644
--- a/server/src/plugins/cloudDiagram/test/testEcsTask.js
+++ b/server/src/plugins/cloudDiagram/test/testEcsTask.js
@@ -21,30 +21,32 @@ describe("EcsTask", function () {
         config,
         container: {
           name: "grucloud-cli",
-          command: [
-            "list",
-            "--json",
-            "grucloud-result.json",
-            "--infra",
-            `/app/iac.js`,
-            "--provider",
-            "aws",
-            "--s3-bucket",
-            aws.bucketUpload,
-            "--s3-key",
-            "my-org/my-project/my-workspace/3",
-            "--s3-local-dir",
-            "/app/artifacts",
-            "--ws-url",
-            infra.wsUrl,
-            "--ws-room",
-            "my-org/my-project/my-workspace/3",
-          ],
+          command: [],
           environment: [
-            { name: "AWSAccessKeyId", value: process.env.AWSAccessKeyId },
-            { name: "AWSSecretKey", value: process.env.AWSSecretKey },
-            { name: "AWS_REGION", value: process.env.AWS_REGION },
-            { name: "CONTINUOUS_INTEGRATION", value: "1" },
+            {
+              name: "GC_FLOW",
+              value: '{"steps":[{"name":"Env","run":"env"}]}',
+            },
+            {
+              name: "S3_BUCKET",
+              value: aws.bucketUpload,
+            },
+            {
+              name: "S3_BUCKET_KEY",
+              value: "test/steps.txt",
+            },
+            {
+              name: "S3_AWS_REGION",
+              value: process.env.S3_AWS_REGION,
+            },
+            {
+              name: "WS_URL",
+              value: infra.wsUrl,
+            },
+            {
+              name: "WS_ROOM",
+              value: "room-test",
+            },
           ],
         },
       });
diff --git a/server/src/plugins/cloudDiagram/utils/ECSClient.js b/server/src/plugins/cloudDiagram/utils/ECSClient.js
new file mode 100644
index 00000000..30fbd025
--- /dev/null
+++ b/server/src/plugins/cloudDiagram/utils/ECSClient.js
@@ -0,0 +1,24 @@
+const assert = require("assert");
+const { pipe, tap } = require("rubico");
+const { defaultsDeep, when } = require("rubico/x");
+
+const { ECSClient } = require("@aws-sdk/client-ecs");
+
+exports.createECSClient = (env) =>
+  pipe([
+    tap((params) => {
+      assert(env);
+      assert(env.AWS_REGION);
+    }),
+    () => ({ region: env.AWS_REGION }),
+    when(
+      () => env.AWSAccessKeyId,
+      defaultsDeep({
+        credentials: {
+          accessKeyId: env.AWSAccessKeyId,
+          secretAccessKey: env.AWSSecretKey,
+        },
+      })
+    ),
+    (params) => new ECSClient(params),
+  ])();
diff --git a/server/src/plugins/cloudDiagram/utils/LambdaClient.js b/server/src/plugins/cloudDiagram/utils/LambdaClient.js
new file mode 100644
index 00000000..f91a6f32
--- /dev/null
+++ b/server/src/plugins/cloudDiagram/utils/LambdaClient.js
@@ -0,0 +1,24 @@
+const assert = require("assert");
+const { pipe, tap } = require("rubico");
+const { defaultsDeep, when } = require("rubico/x");
+
+const { LambdaClient } = require("@aws-sdk/client-lambda");
+
+exports.createLambdaClient = (env) =>
+  pipe([
+    tap((params) => {
+      assert(env);
+      assert(env.AWS_REGION);
+    }),
+    () => ({ region: env.AWS_REGION }),
+    when(
+      () => env.AWSAccessKeyId,
+      defaultsDeep({
+        credentials: {
+          accessKeyId: env.AWSAccessKeyId,
+          secretAccessKey: env.AWSSecretKey,
+        },
+      })
+    ),
+    (params) => new LambdaClient(params),
+  ])();
diff --git a/server/src/plugins/cloudDiagram/utils/S3Client.js b/server/src/plugins/cloudDiagram/utils/S3Client.js
new file mode 100644
index 00000000..d15bcfcb
--- /dev/null
+++ b/server/src/plugins/cloudDiagram/utils/S3Client.js
@@ -0,0 +1,24 @@
+const assert = require("assert");
+const { pipe, tap } = require("rubico");
+const { defaultsDeep, when } = require("rubico/x");
+
+const { S3Client } = require("@aws-sdk/client-s3");
+
+exports.createS3Client = (env) =>
+  pipe([
+    tap((params) => {
+      assert(env);
+      assert(env.S3_AWS_REGION);
+    }),
+    () => ({ region: env.S3_AWS_REGION }),
+    when(
+      () => env.S3_AWSAccessKeyId,
+      defaultsDeep({
+        credentials: {
+          accessKeyId: env.S3_AWSAccessKeyId,
+          secretAccessKey: env.S3_AWSSecretKey,
+        },
+      })
+    ),
+    (params) => new S3Client(params),
+  ])();
diff --git a/server/src/plugins/cloudDiagram/utils/ecsTaskRun.js b/server/src/plugins/cloudDiagram/utils/ecsTaskRun.js
index 5592d2b2..1fe17024 100644
--- a/server/src/plugins/cloudDiagram/utils/ecsTaskRun.js
+++ b/server/src/plugins/cloudDiagram/utils/ecsTaskRun.js
@@ -2,7 +2,9 @@ const assert = require("assert");
 const { pipe, tap, get, tryCatch, switchCase } = require("rubico");
 const { first } = require("rubico/x");
 const { inspect } = require("node:util");
-const { RunTaskCommand, ECSClient } = require("@aws-sdk/client-ecs");
+const { RunTaskCommand } = require("@aws-sdk/client-ecs");
+
+const { createECSClient } = require("./ECSClient");
 
 const { AWSAccessKeyId, AWSSecretKey, AWS_REGION } = process.env;
 
@@ -20,6 +22,9 @@ exports.ecsTaskRun = ({ config: { ecs }, container }) =>
         );
         assert(ecs);
         assert(ecs.cluster);
+        assert(ecs.subnets);
+        assert(ecs.securityGroups);
+
         assert(AWSAccessKeyId);
         assert(AWSSecretKey);
         assert(AWS_REGION);
@@ -43,14 +48,7 @@ exports.ecsTaskRun = ({ config: { ecs }, container }) =>
         log.debug(`RunTaskCommand: ${JSON.stringify(input)}`);
       }),
       (input) => new RunTaskCommand(input),
-      (command) =>
-        new ECSClient({
-          region: process.env.AWS_REGION,
-          credentials: {
-            accessKeyId: process.env.AWSAccessKeyId,
-            secretAccessKey: process.env.AWSSecretKey,
-          },
-        }).send(command),
+      (command) => createECSClient(process.env).send(command),
       tap((params) => {
         assert(params);
       }),
diff --git a/server/src/plugins/cloudDiagram/utils/lambdaRun.js b/server/src/plugins/cloudDiagram/utils/lambdaRun.js
new file mode 100644
index 00000000..015d1d00
--- /dev/null
+++ b/server/src/plugins/cloudDiagram/utils/lambdaRun.js
@@ -0,0 +1,57 @@
+const assert = require("assert");
+const { pipe, tap, get, eq, tryCatch, switchCase } = require("rubico");
+const { InvokeCommand } = require("@aws-sdk/client-lambda");
+const { createLambdaClient } = require("./LambdaClient");
+const { AWSAccessKeyId, AWSSecretKey, AWS_REGION } = process.env;
+
+const log = require("logfilename")(__filename);
+
+exports.lambdaRun = ({ ecs }) =>
+  tryCatch(
+    pipe([
+      tap((params) => {
+        assert(ecs.subnets);
+        assert(ecs.securityGroups);
+        log.debug(
+          `lambdaRun subnets: ${ecs.subnets}, securityGroups: ${ecs.securityGroups}, AWS_REGION: ${AWS_REGION}`
+        );
+        assert(AWSAccessKeyId);
+        assert(AWSSecretKey);
+        assert(AWS_REGION);
+      }),
+      get("env_vars"),
+      tap((params) => {
+        assert(params);
+      }),
+      JSON.stringify,
+      (Payload) => ({
+        FunctionName: "grucloud",
+        InvocationType: "Event",
+        Payload,
+      }),
+      tap((input) => {
+        log.debug(`RunTaskCommand: ${JSON.stringify(input)}`);
+      }),
+      (input) => new InvokeCommand(input),
+      (command) => createLambdaClient(process.env).send(command),
+      tap((params) => {
+        assert(params);
+      }),
+      switchCase([
+        pipe([eq(get("StatusCode"), 202)]),
+        pipe([
+          tap((params) => {
+            assert(true);
+          }),
+        ]),
+        pipe([
+          tap((params) => {
+            log.error(`lambdaRun `, params);
+          }),
+        ]),
+      ]),
+    ]),
+    (error) => {
+      throw error;
+    }
+  );
diff --git a/server/src/plugins/cloudDiagram/utils/rungc.js b/server/src/plugins/cloudDiagram/utils/rungc.js
index 0edea71b..2ecd0acc 100644
--- a/server/src/plugins/cloudDiagram/utils/rungc.js
+++ b/server/src/plugins/cloudDiagram/utils/rungc.js
@@ -1,10 +1,8 @@
 const assert = require("assert");
-const { pipe, tap, assign, get, eq, map, pick, flatMap } = require("rubico");
+const { pipe, tap, assign, get, eq, map, pick } = require("rubico");
 const { values, unless } = require("rubico/x");
 const path = require("path");
 
-const { transformEnv } = require("./envUtils");
-
 exports.DockerGcRun = ({ app, models, ws }) => {
   assert(app);
   assert(models);
@@ -140,10 +138,9 @@ exports.DockerGcCreate = ({ app }) => {
         outputDot: `resources.dot`,
         outputSvg: `resources.svg`,
       }),
-
       assign({
         name: () => `${containerName}-${run_id}`,
-        Cmd: () => [],
+        Cmd: () => ["app.handler"],
         outputGcListLocalPath: ({ outputGcList }) =>
           path.resolve(outputDir, outputGcList),
         HostConfig: () => ({
@@ -155,7 +152,6 @@ exports.DockerGcCreate = ({ app }) => {
         Env: () =>
           pipe([
             () => env_vars,
-            transformEnv({ GRUCLOUD_OAUTH_SUBJECT }),
             map.entries(([key, value]) => [key, `${key}=${value}`]),
             values,
           ])(),
@@ -173,6 +169,7 @@ exports.DockerGcCreate = ({ app }) => {
               Env,
               HostConfig,
               WorkingDir: `/app/`,
+              Entrypoint: "/var/task/src/index.js",
             },
           }),
           tap((xxx) => {

From 2c75af3834953e0ebbbbfd6a0b92c28200223671 Mon Sep 17 00:00:00 2001
From: Frederic Heem <frederic.heem@gmail.com>
Date: Mon, 4 Dec 2023 17:51:18 -0300
Subject: [PATCH 11/16] kind = plan

---
 .travis.yml                                   | 34 -------------------
 server/src/plugins/cloudDiagram/api/runApi.js | 25 ++++++--------
 .../plugins/cloudDiagram/test/test005Run.js   | 16 ++++++++-
 3 files changed, 25 insertions(+), 50 deletions(-)
 delete mode 100644 .travis.yml

diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index fceef307..00000000
--- a/.travis.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-sudo: required
-dist: bionic
-language: node_js
-node_js:
-  - "13"
-
-services:
-  - xvfb
-  - postgresql
-  - redis
-
-addons:
-  chrome: stable
-  postgresql: "10"
-  apt:
-    packages:
-      - postgresql-10-postgis-2.4
-
-install:
-  - cd client
-  - npm i
-  - cd ../server
-  - npm i
-
-before_script:
-  - psql -c 'create database dev;' -U postgres
-  - psql -c 'create extension postgis;' -d dev -U postgres
-
-after_script:
-  - cd client
-  - npm run build
-  - npm test
-  - cd ../server
-  - npm test
diff --git a/server/src/plugins/cloudDiagram/api/runApi.js b/server/src/plugins/cloudDiagram/api/runApi.js
index 19ffcbf6..a4b7c97b 100644
--- a/server/src/plugins/cloudDiagram/api/runApi.js
+++ b/server/src/plugins/cloudDiagram/api/runApi.js
@@ -118,6 +118,7 @@ const buildCmd = ({
   project_id,
   workspace_id,
   run_id,
+  kind,
 }) =>
   pipe([
     tap((param) => {
@@ -125,30 +126,20 @@ const buildCmd = ({
       assert(wsUrl);
       assert(provider_type);
       assert(run_id);
+      assert(kind);
     }),
     () => [
-      "list",
+      kind,
       "--json",
       "artifacts/grucloud-result.json",
-      "--graph",
-      // "--infra",
-      // `/app/iac.js`,
-      // "--provider",
-      // provider_type,
       "--s3-bucket",
       bucketUpload,
       "--s3-key",
       `${org_id}/${project_id}/${workspace_id}/${run_id}`,
-      //"--s3-local-dir",
-      //"/app/my-repo/artifacts",
-      // "--ws-url",
-      // wsUrl,
-      // "--ws-room",
-      // `${org_id}/${project_id}/${workspace_id}/${run_id}`,
-      "--title",
-      '""',
+
       ...servicesCmd,
     ],
+    when(() => kind == "list", append(["--graph", "--title", '""'])),
     callProp("join", " "),
   ])();
 
@@ -163,6 +154,7 @@ const buildGcFlow = ({
   project_id,
   workspace_id,
   run_id,
+  kind,
 }) =>
   pipe([
     () => [],
@@ -191,7 +183,7 @@ const buildGcFlow = ({
       ])
     ),
     append({
-      name: "gc list",
+      name: `gc ${kind}`,
       run: `node_modules/.bin/gc ${buildCmd({
         servicesCmd,
         bucketUpload,
@@ -201,6 +193,7 @@ const buildGcFlow = ({
         project_id,
         workspace_id,
         run_id,
+        kind,
       })}`,
       workingDirectory: `/tmp/my-repo/${working_directory}`,
     }),
@@ -314,6 +307,7 @@ exports.RunApi = ({ app, models }) => {
                       project_id,
                       workspace_id,
                       run_id,
+                      kind,
                     }) =>
                       pipe([
                         () => cloudAuthentication.env_vars,
@@ -334,6 +328,7 @@ exports.RunApi = ({ app, models }) => {
                             project_id,
                             workspace_id,
                             run_id,
+                            kind,
                           }),
                           WS_URL: infra.wsUrl,
                           WS_ROOM: `${org_id}/${project_id}/${workspace_id}/${run_id}`,
diff --git a/server/src/plugins/cloudDiagram/test/test005Run.js b/server/src/plugins/cloudDiagram/test/test005Run.js
index 93323d93..a0a52d39 100644
--- a/server/src/plugins/cloudDiagram/test/test005Run.js
+++ b/server/src/plugins/cloudDiagram/test/test005Run.js
@@ -186,7 +186,7 @@ describe("Run", function () {
     client = testMngr.client("alice");
     await client.login();
   });
-  it("CRUD aws docker", async () => {
+  it("CRUD aws docker list", async () => {
     await runCrud({
       client,
       org_id,
@@ -195,6 +195,20 @@ describe("Run", function () {
       payloadCreate: payloadCreateDocker,
     });
   });
+  it("CRUD aws docker plan", async () => {
+    await runCrud({
+      client,
+      org_id,
+      project_id: project_aws_id,
+      workspace_id,
+      payloadCreate: {
+        reason: "my reason",
+        kind: "plan",
+        status: "creating",
+        engine: "docker",
+      },
+    });
+  });
   it("CRUD azure docker", async () => {
     await runCrud({
       client,

From 9176d08c3e9b9166f08390029193b984c841b58f Mon Sep 17 00:00:00 2001
From: Frederic Heem <frederic.heem@gmail.com>
Date: Tue, 5 Dec 2023 13:41:30 -0300
Subject: [PATCH 12/16] add apply and destroy

---
 server/src/plugins/cloudDiagram/api/runApi.js      | 14 +++++++++++++-
 server/src/plugins/cloudDiagram/test/test005Run.js | 14 ++++++++++++++
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/server/src/plugins/cloudDiagram/api/runApi.js b/server/src/plugins/cloudDiagram/api/runApi.js
index a4b7c97b..eee8f48c 100644
--- a/server/src/plugins/cloudDiagram/api/runApi.js
+++ b/server/src/plugins/cloudDiagram/api/runApi.js
@@ -20,6 +20,7 @@ const {
   append,
   when,
   callProp,
+  isIn,
 } = require("rubico/x");
 const { contextSet404, contextSetOk } = require("utils/koaCommon");
 
@@ -47,6 +48,7 @@ const runAttributes = [
   "status",
   "engine",
   "error",
+  "kind",
 ];
 
 const buildSubject = ({ org_id, project_id, workspace_id, phase = "plan" }) =>
@@ -140,6 +142,8 @@ const buildCmd = ({
       ...servicesCmd,
     ],
     when(() => kind == "list", append(["--graph", "--title", '""'])),
+    when(() => isIn(["apply", "destroy"])(kind), append("--force")),
+
     callProp("join", " "),
   ])();
 
@@ -166,6 +170,14 @@ const buildGcFlow = ({
           run: `rm -rf /tmp/my-repo/`,
           workingDirectory: `/tmp/`,
         }),
+        append({
+          name: "echo $GIT_REPO",
+          run: "echo $GIT_REPO",
+        }),
+        append({
+          name: "echo $GIT_BRANCH",
+          run: "echo $GIT_BRANCH",
+        }),
         append({
           name: "Clone Repo",
           run: "git clone $GIT_REPO -b $GIT_BRANCH --depth 1 /tmp/my-repo",
@@ -177,7 +189,7 @@ const buildGcFlow = ({
         }),
         append({
           name: "npm install",
-          run: "npm install --loglevel=error",
+          run: "npm install --loglevel=error  --no-audit",
           workingDirectory: `/tmp/my-repo/${working_directory}`,
         }),
       ])
diff --git a/server/src/plugins/cloudDiagram/test/test005Run.js b/server/src/plugins/cloudDiagram/test/test005Run.js
index a0a52d39..eb48973d 100644
--- a/server/src/plugins/cloudDiagram/test/test005Run.js
+++ b/server/src/plugins/cloudDiagram/test/test005Run.js
@@ -209,6 +209,20 @@ describe("Run", function () {
       },
     });
   });
+  it("CRUD aws docker apply", async () => {
+    await runCrud({
+      client,
+      org_id,
+      project_id: project_aws_id,
+      workspace_id,
+      payloadCreate: {
+        reason: "my reason",
+        kind: "apply",
+        status: "creating",
+        engine: "docker",
+      },
+    });
+  });
   it("CRUD azure docker", async () => {
     await runCrud({
       client,

From e2d22c10e8319d8db1683ffe47e70abdcae42073 Mon Sep 17 00:00:00 2001
From: Frederic Heem <frederic.heem@gmail.com>
Date: Thu, 7 Dec 2023 18:17:52 -0300
Subject: [PATCH 13/16] run api created at

---
 server/src/plugins/cloudDiagram/api/runApi.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/server/src/plugins/cloudDiagram/api/runApi.js b/server/src/plugins/cloudDiagram/api/runApi.js
index eee8f48c..57b08431 100644
--- a/server/src/plugins/cloudDiagram/api/runApi.js
+++ b/server/src/plugins/cloudDiagram/api/runApi.js
@@ -49,6 +49,7 @@ const runAttributes = [
   "engine",
   "error",
   "kind",
+  "created_at",
 ];
 
 const buildSubject = ({ org_id, project_id, workspace_id, phase = "plan" }) =>

From 89614400e8ce6be41f9a7a08b8d04a250ba5ed82 Mon Sep 17 00:00:00 2001
From: Frederic Heem <frederic.heem@gmail.com>
Date: Fri, 8 Dec 2023 19:40:52 -0300
Subject: [PATCH 14/16] updated_at

---
 server/src/plugins/cloudDiagram/api/runApi.js  | 1 +
 server/src/plugins/cloudDiagram/utils/rungc.js | 1 +
 2 files changed, 2 insertions(+)

diff --git a/server/src/plugins/cloudDiagram/api/runApi.js b/server/src/plugins/cloudDiagram/api/runApi.js
index 57b08431..6339552d 100644
--- a/server/src/plugins/cloudDiagram/api/runApi.js
+++ b/server/src/plugins/cloudDiagram/api/runApi.js
@@ -50,6 +50,7 @@ const runAttributes = [
   "error",
   "kind",
   "created_at",
+  "updated_at",
 ];
 
 const buildSubject = ({ org_id, project_id, workspace_id, phase = "plan" }) =>
diff --git a/server/src/plugins/cloudDiagram/utils/rungc.js b/server/src/plugins/cloudDiagram/utils/rungc.js
index 2ecd0acc..66b52ff3 100644
--- a/server/src/plugins/cloudDiagram/utils/rungc.js
+++ b/server/src/plugins/cloudDiagram/utils/rungc.js
@@ -62,6 +62,7 @@ exports.DockerGcRun = ({ app, models, ws }) => {
       (container_state) => ({
         status: "completed",
         container_state,
+        updated_at: new Date().toUTCString(),
       }),
       unless(
         eq(get("container_state.ExitCode"), 0),

From 6e8ccf139a006df99c4a8d830c6d0c883e7386f3 Mon Sep 17 00:00:00 2001
From: Frederic Heem <frederic.heem@gmail.com>
Date: Sat, 9 Dec 2023 10:17:05 -0300
Subject: [PATCH 15/16] gzip_types

---
 deploy/playbook/templates/web.nginx.conf.j2 | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/deploy/playbook/templates/web.nginx.conf.j2 b/deploy/playbook/templates/web.nginx.conf.j2
index 35410760..4f282210 100644
--- a/deploy/playbook/templates/web.nginx.conf.j2
+++ b/deploy/playbook/templates/web.nginx.conf.j2
@@ -24,7 +24,22 @@ http {
   access_log /var/log/nginx/access.log main;
   sendfile on;
   gzip on;
-
+  gzip_types
+    # text/html is always compressed by HttpGzipModule
+    text/css
+    text/javascript
+    text/xml
+    text/plain
+    text/x-component
+    application/javascript
+    application/json
+    application/xml
+    application/rss+xml
+    font/truetype
+    font/opentype
+    application/vnd.ms-fontobject
+    image/svg+xml;
+    
   server {
     listen 443 ssl;
     http2  on;

From 811d1c14bcb362e95154e350bacb3f5b78499529 Mon Sep 17 00:00:00 2001
From: Frederic Heem <frederic.heem@gmail.com>
Date: Sat, 16 Dec 2023 19:03:19 -0300
Subject: [PATCH 16/16] run args

---
 server/src/plugins/cloudDiagram/api/runApi.js             | 8 +++++++-
 .../src/plugins/cloudDiagram/migrations/010.do.app.do.sql | 1 +
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/server/src/plugins/cloudDiagram/api/runApi.js b/server/src/plugins/cloudDiagram/api/runApi.js
index 6339552d..b409e21c 100644
--- a/server/src/plugins/cloudDiagram/api/runApi.js
+++ b/server/src/plugins/cloudDiagram/api/runApi.js
@@ -49,6 +49,7 @@ const runAttributes = [
   "engine",
   "error",
   "kind",
+  "args",
   "created_at",
   "updated_at",
 ];
@@ -114,6 +115,7 @@ const buildS3SignedUrl = ({ config, context, filename }) =>
   ]);
 
 const buildCmd = ({
+  args = "",
   servicesCmd,
   bucketUpload,
   wsUrl,
@@ -140,8 +142,8 @@ const buildCmd = ({
       bucketUpload,
       "--s3-key",
       `${org_id}/${project_id}/${workspace_id}/${run_id}`,
-
       ...servicesCmd,
+      args,
     ],
     when(() => kind == "list", append(["--graph", "--title", '""'])),
     when(() => isIn(["apply", "destroy"])(kind), append("--force")),
@@ -161,6 +163,7 @@ const buildGcFlow = ({
   workspace_id,
   run_id,
   kind,
+  args,
 }) =>
   pipe([
     () => [],
@@ -199,6 +202,7 @@ const buildGcFlow = ({
     append({
       name: `gc ${kind}`,
       run: `node_modules/.bin/gc ${buildCmd({
+        args,
         servicesCmd,
         bucketUpload,
         wsUrl,
@@ -322,6 +326,7 @@ exports.RunApi = ({ app, models }) => {
                       workspace_id,
                       run_id,
                       kind,
+                      args,
                     }) =>
                       pipe([
                         () => cloudAuthentication.env_vars,
@@ -343,6 +348,7 @@ exports.RunApi = ({ app, models }) => {
                             workspace_id,
                             run_id,
                             kind,
+                            args,
                           }),
                           WS_URL: infra.wsUrl,
                           WS_ROOM: `${org_id}/${project_id}/${workspace_id}/${run_id}`,
diff --git a/server/src/plugins/cloudDiagram/migrations/010.do.app.do.sql b/server/src/plugins/cloudDiagram/migrations/010.do.app.do.sql
index 350b7ee9..59827746 100644
--- a/server/src/plugins/cloudDiagram/migrations/010.do.app.do.sql
+++ b/server/src/plugins/cloudDiagram/migrations/010.do.app.do.sql
@@ -56,6 +56,7 @@ CREATE TABLE IF NOT EXISTS run (
   run_id SERIAL,
   reason TEXT,
   kind TEXT NOT NULL,
+  args TEXT,
   engine TEXT,
   container_id TEXT,
   container_state JSONB,