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/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 }) => (
-
- );
-
- 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 }) => (
-
- {children}
-
-
- );
-
- 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 (
-
- );
- });
- 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 }) => (
-
- {item}
-
- );
-
- 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 @@
-
-
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 @@
-
-
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 @@
-
-
-
-
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 @@
-
-
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 @@
-OVHcloud_master_logo_fullcolor_RGB
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
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 }) => (
- <>
-
-
-
-
-
- {
- store.data.AWS_REGION = region;
- }}
- />
-
-
- ));
-};
-
-export const awsFormCreate = (context) => {
- const { tr } = context;
- const FormCreate = providerFormCreate(context);
- const Footer = providerConfigCreateFooter(context);
- const AwsConfigForm = awsConfigForm(context);
-
- return observer(({ store }) => (
-
-
- {tr.t("Create new AWS Infrastructure")}
-
-
-
- {tr.t(
- "Please provide the following information to create and scan a new infrastructure"
- )}
-
-
-
-
- ));
-};
-
-export const awsFormEdit = (context) => {
- const { tr } = context;
- const FormUpdate = providerFormUpdate(context);
- const AwsConfigForm = awsConfigForm(context);
- const Footer = providerConfigUpdateFooter(context);
-
- return observer(({ store, infraSettingsStore }) => (
-
-
- {tr.t("Update AWS Infrastructure")}
-
-
-
-
-
- ));
-};
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 }) => (
-
-
- Please follow the instructions to setup a service principal used by
- Grucloud to scan an Azure infrastructure.
-
- 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;
- }
- }
- `}
- >
-
- Subscription ID
-
- Retrieve the Subscription ID with the following command:{" "}
-
- az account show --query id -otsv
-
-
- Tenant ID
-
- Retrieve the AZURE_TENANT_ID with the following command:{" "}
-
- az account show
-
-
- App ID and PASSWORD
-
- Retrieve the APP_ID and PASSWORD by creating a
- service principal called grucloud:
-
- az ad sp create-for-rbac -n "grucloud"
-
-
-
-
-
-
-
- ));
-};
-
-export const azureFormCreate = (context) => {
- const { tr } = context;
- const FormCreate = providerFormCreate(context);
- const Content = azureFormContent(context);
- const Footer = providerConfigCreateFooter(context);
-
- return observer(({ store }) => (
-
-
- ));
-};
-
-export const azureFormEdit = (context) => {
- const { tr } = context;
- const FormUpdate = providerFormUpdate(context);
-
- const Content = azureFormContent(context);
- const Footer = providerConfigUpdateFooter(context);
-
- return observer(({ store, infraSettingsStore }) => (
-
-
- {tr.t("Update Azure Infrastructure")}
-
-
- ));
-};
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 }) =>
- (
-
- {region}
-
- );
-
-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 }) =>
- (
-
-
-
- Credential File
- {fileName}
-
-
- Project Name
- {content.project_id}
-
-
- Service Account
- {content.client_email}
-
-
-
- );
-
-const fileInputLabel =
- ({ tr, theme: { palette } }) =>
- ({}) =>
- (
- * {
- margin: 1rem;
- }
- svg {
- height: 2rem;
- path {
- fill: ${palette.text.primary};
- }
- }
- `,
- ]}
- >
-
-
{tr.t("Choose a credential file to upload")}
-
-
-
- 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.
-
- li {
- padding: 0.3rem 0;
- }
- `}
- >
-
- Visit the
-
- service account page
- {" "}
- on the google cloud console
-
- Select your project
-
- Click on CREATE SERVICE ACCOUNT
-
-
- Set the Service account name to 'grucloud' for instance
-
-
- Click on CREATE
-
- Select the basic role 'Viewer'
-
- Click on CONTINUE
-
-
- Click on DONE
-
-
- Go to the Actions column, click on the three dot icon of
- the newly created service account
-
-
- Click on Manage keys
-
-
- Click on ADD KEYS , then Create new key
-
-
- Click on CREATE to download the credential file in JSON
- format.
-
-
-
-
-
- ));
-};
-
-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 }) => (
-
-
- {tr.t("Update GCP Infrastructure")}
-
-
-
-
-
-
-
- ));
-};
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 }) => (
- <>
-
-
-
-
-
- ));
-};
-
-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 }) => (
-
- ));
-};
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( store.onSelectProject(item)} {...leftOver} raised>
- {item.title}
- {item.description}
-
- );
- return ProjectItem;
-};
-
-const importTypeItem = (context) => {
- const ListItem = listItem(context);
- const ImportTypeItem = ({ item, onClick, ...leftOver }) => (
- onClick(item)} raised>
- {item.title}
- {item.description}
-
- );
- 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 = [] }) => (
- {
- store.showNewProjectFromTemplate(false);
- }}
- >
- New infrastructure from a template
-
- Select an infrastructure template from the list below.
- li {
- margin: 1rem 0;
- }
- `}
- >
- projectId(item)}
- itemRenderer={ProjectItem}
- store={store}
- />
-
-
-
- store.showNewProjectFromTemplate(false)}>
- Cancel
-
-
-
- ));
-};
-
-const modalImportFromCloud = (context) => {
- const Modal = modal(context);
- const Button = button(context);
-
- return observer(({ store }) => (
- {
- store.showNewProjectFromTemplate(false);
- }}
- >
-
-
- TODO
-
-
- store.showImportFromCloud(false)}>Cancel
-
-
- ));
-};
-
-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 }) => (
-
- ));
-};
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 }) => (
-
- );
- 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 }) => (
-
- {/*
- {JSON.stringify(infraSettingsStore.data, null, 4)}
- */}
- {
- history.push(`/infra/detail/${store.id}/delete`, {
- id: store.id,
- ...toJS(infraSettingsStore.data),
- });
- }}
- >
- Danger zone...
-
-
- ));
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 }) => (
-
- {store.opGetById.data ? (
-
- ));
- const ScanLastUpdated = ({ updatedAt }) => (
- div {
- margin: 0.4rem 0;
- }
- `}
- >
-
- Last Scan
-
-
{`${
- updatedAt && formatDistance(new Date(updatedAt), new Date())
- } ago`}
-
span {
- margin: 0.3rem;
- }
- `}
- >
-
-
{stats.resources}
-
- {title}
-
- );
- const ProjectName = ({ name }) => (
-
- );
- const InfraItem = ({ item, store, onClick }) => {
- return (
- * {
- margin: 1rem;
- }
- `}
- onClick={(event) => {
- onClick(item);
- }}
- >
-
- );
- };
- 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 }) => (
-
- ));
-
- const InfraListContainer = observer(({ store }) => (
-
- {store.opGet.data && (
-
- ));
- 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(
-
-
-
-
-
-
-
-
-
- {
- store.data.OS_REGION_NAME = region;
- }}
- />
-
-
- ));
-};
-
-export const ovhFormCreate = (context) => {
- const { tr } = context;
- const FormCreate = providerFormCreate(context);
- const OvhConfigForm = ovhConfigForm(context);
- const Footer = providerConfigCreateFooter(context);
-
- return observer(({ store }) => (
-
-
- {tr.t("Create new OVH Infrastructure")}
-
-
-
- {tr.t(
- "Please provide the following information to create and scan a new infrastructure"
- )}
-
-
-
-
- ));
-};
-
-export const ovhFormEdit = (context) => {
- const { tr } = context;
- const FormUpdate = providerFormUpdate(context);
- const OvhConfigForm = ovhConfigForm(context);
- const Footer = providerConfigUpdateFooter(context);
-
- return observer(({ store, infraSettingsStore }) => (
-
-
- {tr.t("Update OVH Infrastructure")}
-
-
-
-
-
- ));
-};
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 }) => (
-
- {item}
-
- );
- 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 }) => (
-
- );
-};
-
-export const providerFormUpdate = (context) => {
- const Form = createForm(context);
- return ({ children }) => (
-
- );
-};
-
-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 }) => (
-
-
- store.core.create({
- data: store.buildPayload({ data: store.core.data }),
- })
- }
- label={tr.t("Create Infrastructure")}
- />
-
- ));
-};
-
-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 }) => (
- <>
-
-
- store.core.update({
- data: store.buildPayload({ data: store.core.data }),
- })
- }
- label={tr.t("Update Infrastructure")}
- />
-
- {type}
,
- ])();
-
-const providerLogo =
- ({ theme: { palette } }) =>
- ({ name }) =>
- (
-
-
-
- Resource Type
- Total
-
-
-
- {lives &&
- lives.map((live) => (
-
- {live.type}
- {live?.resources.length}
-
- ))}
-
-
- );
-
-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 () => (
- context.emitter.emit("step.previous")}>
- {"\u25c0"} Back
-
- );
-};
-
-export const buttonHistoryBack = (context) => {
- const Button = button(context);
- return () => (
- context.history.back()}>{"\u25c0"} Back
- );
-};
-
-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 {tr.t("Select Provider")} ,
- content: () =>
-
- );
- });
-};
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 }) => (
-
- {
- history.push(`profile/delete`, toJS(store.data));
- }}
- >
- Danger zone...
-
-
- ));
-
- return observer(function ProfileForm({ store }) {
- const { errors } = store;
- if (store.opGet.loading) {
- return h(spinner(context));
- }
- return (
-
-
-
- );
- });
-};
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(
-
-
- );
- }
- 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/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):
-
-
-
-> 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
-```
-
-
-
-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 @@
-
-
-
-
-
-
-graphname
-Project grucloud-aws
-Live Diagram
-
-cluster_aws
-Provider aws
-
-
-cluster_aws_
-
-
-
-
-Volume::::vol-034a467db1e71e984
-Volume
-vol-034a467db1e71e984
-
-
-
-KeyPair::::grucloud-app
-KeyPair
-grucloud-app
-
-
-
-Route53Domain::::grucloud.com
-Route53Domain
-grucloud.com
-
-
-
-IamRole::::arn:aws:iam::161408406883:role/OrganizationAccountAccessRole
-IamRole
-OrganizationAccountAccessRole
-
-
-
-HostedZone::::/hostedzone/Z0829805257L0AS74FNR9
-HostedZone
-grucloud.com.
-
-
-
-Vpc::::vpc-0a3a7a91cb6b0dccb
-Vpc
-vpc
-
-
-
-Vpc::::vpc-280b8555
-Vpc
-default
-
-
-
-Image::::ami-0a7ce59297fb8a731
-Image
-ubuntu 20.04
-
-
-
-Subnet::::subnet-2c0e760d
-Subnet
-default
-
-
-
-Subnet::::subnet-2c0e760d->Vpc::::vpc-280b8555
-
-
-
-Subnet::::subnet-ed027cb2
-Subnet
-default
-
-
-
-Subnet::::subnet-ed027cb2->Vpc::::vpc-280b8555
-
-
-
-Subnet::::subnet-a14e43ec
-Subnet
-default
-
-
-
-Subnet::::subnet-a14e43ec->Vpc::::vpc-280b8555
-
-
-
-Subnet::::subnet-becd4c8f
-Subnet
-default
-
-
-
-Subnet::::subnet-becd4c8f->Vpc::::vpc-280b8555
-
-
-
-Subnet::::subnet-f46b5cfa
-Subnet
-default
-
-
-
-Subnet::::subnet-f46b5cfa->Vpc::::vpc-280b8555
-
-
-
-Subnet::::subnet-22c5b744
-Subnet
-default
-
-
-
-Subnet::::subnet-22c5b744->Vpc::::vpc-280b8555
-
-
-
-Subnet::::subnet-0357436d6b0748d2e
-Subnet
-subnet
-
-
-
-Subnet::::subnet-0357436d6b0748d2e->Vpc::::vpc-0a3a7a91cb6b0dccb
-
-
-
-InternetGateway::::igw-0afcf265918398336
-InternetGateway
-ig
-
-
-
-InternetGateway::::igw-0afcf265918398336->Vpc::::vpc-0a3a7a91cb6b0dccb
-
-
-
-InternetGateway::::igw-a50bf6df
-InternetGateway
-igw-a50bf6df
-
-
-
-InternetGateway::::igw-a50bf6df->Vpc::::vpc-280b8555
-
-
-
-Route53Record::::A::grucloud.com.
-Route53Record
-grucloud.com.-ipv4
-
-
-
-Route53Record::::A::grucloud.com.->HostedZone::::/hostedzone/Z0829805257L0AS74FNR9
-
-
-
-ElasticIpAddress::::eipalloc-07efbd8b54f12f828
-ElasticIpAddress
-ip
-
-
-
-RouteTable::::rtb-c05f4bbe
-RouteTable
-rtb-c05f4bbe
-
-
-
-RouteTable::::rtb-c05f4bbe->Vpc::::vpc-280b8555
-
-
-
-RouteTable::::rtb-c05f4bbe->InternetGateway::::igw-a50bf6df
-
-
-
-RouteTable::::rtb-06b8e49ef9c983e40
-RouteTable
-rtb-06b8e49ef9c983e40
-
-
-
-RouteTable::::rtb-06b8e49ef9c983e40->Vpc::::vpc-0a3a7a91cb6b0dccb
-
-
-
-RouteTable::::rtb-097a54b361c1d896f
-RouteTable
-route-table
-
-
-
-RouteTable::::rtb-097a54b361c1d896f->Vpc::::vpc-0a3a7a91cb6b0dccb
-
-
-
-RouteTable::::rtb-097a54b361c1d896f->InternetGateway::::igw-0afcf265918398336
-
-
-
-SecurityGroupRuleIngress::::sg-rule-ingress-ssh
-SecurityGroupRuleIngress
-sg-rule-ingress-ssh
-
-
-
-SecurityGroup::::sg-0aed7dee5b6d71e6e
-SecurityGroup
-securityGroup
-
-
-
-SecurityGroupRuleIngress::::sg-rule-ingress-ssh->SecurityGroup::::sg-0aed7dee5b6d71e6e
-
-
-
-SecurityGroupRuleIngress::::sg-rule-ingress-http
-SecurityGroupRuleIngress
-sg-rule-ingress-http
-
-
-
-SecurityGroupRuleIngress::::sg-rule-ingress-http->SecurityGroup::::sg-0aed7dee5b6d71e6e
-
-
-
-SecurityGroupRuleIngress::::sg-rule-ingress-https
-SecurityGroupRuleIngress
-sg-rule-ingress-https
-
-
-
-SecurityGroupRuleIngress::::sg-rule-ingress-https->SecurityGroup::::sg-0aed7dee5b6d71e6e
-
-
-
-SecurityGroupRuleIngress::::sg-rule-ingress-icmp
-SecurityGroupRuleIngress
-sg-rule-ingress-icmp
-
-
-
-SecurityGroupRuleIngress::::sg-rule-ingress-icmp->SecurityGroup::::sg-0aed7dee5b6d71e6e
-
-
-
-Route::::route-ig
-Route
-route-ig
-
-
-
-Route::::route-ig->InternetGateway::::igw-0afcf265918398336
-
-
-
-Route::::route-ig->RouteTable::::rtb-097a54b361c1d896f
-
-
-
-EC2::::i-0c0c8b11cddee7365
-EC2
-server
-
-
-
-EC2::::i-0c0c8b11cddee7365->Volume::::vol-034a467db1e71e984
-
-
-
-EC2::::i-0c0c8b11cddee7365->KeyPair::::grucloud-app
-
-
-
-EC2::::i-0c0c8b11cddee7365->Vpc::::vpc-0a3a7a91cb6b0dccb
-
-
-
-EC2::::i-0c0c8b11cddee7365->Image::::ami-0a7ce59297fb8a731
-
-
-
-EC2::::i-0c0c8b11cddee7365->Subnet::::subnet-0357436d6b0748d2e
-
-
-
-NetworkInterface::::eni-009d9c6e09a0a6acc
-NetworkInterface
-eni-009d9c6e09a0a6acc
-
-
-
-EC2::::i-0c0c8b11cddee7365->NetworkInterface::::eni-009d9c6e09a0a6acc
-
-
-
-EC2::::i-0c0c8b11cddee7365->SecurityGroup::::sg-0aed7dee5b6d71e6e
-
-
-
-Volume::::vol-0716097719ad12517
-Volume
-volume
-
-
-
-NetworkInterface::::eni-009d9c6e09a0a6acc->Vpc::::vpc-0a3a7a91cb6b0dccb
-
-
-
-NetworkInterface::::eni-009d9c6e09a0a6acc->Subnet::::subnet-0357436d6b0748d2e
-
-
-
-NetworkInterface::::eni-009d9c6e09a0a6acc->SecurityGroup::::sg-0aed7dee5b6d71e6e
-
-
-
-SecurityGroup::::sg-006766c368b7e81d1
-SecurityGroup
-default
-
-
-
-SecurityGroup::::sg-006766c368b7e81d1->Vpc::::vpc-0a3a7a91cb6b0dccb
-
-
-
-SecurityGroup::::sg-006766c368b7e81d1->SecurityGroup::::sg-006766c368b7e81d1
-
-
-
-SecurityGroup::::sg-0aed7dee5b6d71e6e->Vpc::::vpc-0a3a7a91cb6b0dccb
-
-
-
-SecurityGroup::::sg-9643e293
-SecurityGroup
-default
-
-
-
-SecurityGroup::::sg-9643e293->Vpc::::vpc-280b8555
-
-
-
-SecurityGroup::::sg-9643e293->SecurityGroup::::sg-9643e293
-
-
-
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 @@
-
-
-
-
-
-
-graphname
-Project grucloud-aws
-
-Target Diagram
-
-cluster_aws
-Provider aws
-
-
-cluster_aws_
-
-
-
-
-KeyPair::grucloud-app
-KeyPair
-grucloud-app
-
-
-
-Vpc::vpc
-Vpc
-vpc
-
-
-
-InternetGateway::ig
-InternetGateway
-ig
-
-
-
-InternetGateway::ig->Vpc::vpc
-
-
-
-Subnet::subnet
-Subnet
-subnet
-
-
-
-Subnet::subnet->Vpc::vpc
-
-
-
-RouteTable::route-table
-RouteTable
-route-table
-
-
-
-RouteTable::route-table->Vpc::vpc
-
-
-
-RouteTable::route-table->Subnet::subnet
-
-
-
-Route::route-ig
-Route
-route-ig
-
-
-
-Route::route-ig->InternetGateway::ig
-
-
-
-Route::route-ig->RouteTable::route-table
-
-
-
-SecurityGroup::securityGroup
-SecurityGroup
-securityGroup
-
-
-
-SecurityGroup::securityGroup->Vpc::vpc
-
-
-
-SecurityGroup::securityGroup->Subnet::subnet
-
-
-
-SecurityGroupRuleIngress::sg-rule-ingress-ssh
-SecurityGroupRuleIngress
-sg-rule-ingress-ssh
-
-
-
-SecurityGroupRuleIngress::sg-rule-ingress-ssh->SecurityGroup::securityGroup
-
-
-
-SecurityGroupRuleIngress::sg-rule-ingress-http
-SecurityGroupRuleIngress
-sg-rule-ingress-http
-
-
-
-SecurityGroupRuleIngress::sg-rule-ingress-http->SecurityGroup::securityGroup
-
-
-
-SecurityGroupRuleIngress::sg-rule-ingress-https
-SecurityGroupRuleIngress
-sg-rule-ingress-https
-
-
-
-SecurityGroupRuleIngress::sg-rule-ingress-https->SecurityGroup::securityGroup
-
-
-
-SecurityGroupRuleIngress::sg-rule-ingress-icmp
-SecurityGroupRuleIngress
-sg-rule-ingress-icmp
-
-
-
-SecurityGroupRuleIngress::sg-rule-ingress-icmp->SecurityGroup::securityGroup
-
-
-
-ElasticIpAddress::ip
-ElasticIpAddress
-ip
-
-
-
-Image::ubuntu 20.04
-Image
-ubuntu 20.04
-
-
-
-Volume::volume
-Volume
-volume
-
-
-
-Instance::server
-Instance
-server
-
-
-
-Instance::server->KeyPair::grucloud-app
-
-
-
-Instance::server->Subnet::subnet
-
-
-
-Instance::server->SecurityGroup::securityGroup
-
-
-
-Instance::server->ElasticIpAddress::ip
-
-
-
-Instance::server->Image::ubuntu 20.04
-
-
-
-Instance::server->Volume::volume
-
-
-
-Domain::grucloud.com
-Domain
-grucloud.com
-
-
-
-HostedZone::grucloud.com.
-HostedZone
-grucloud.com.
-
-
-
-HostedZone::grucloud.com.->Domain::grucloud.com
-
-
-
-Record::app.grucloud.com.
-Record
-app.grucloud.com.
-
-
-
-Record::app.grucloud.com.->ElasticIpAddress::ip
-
-
-
-Record::app.grucloud.com.->HostedZone::grucloud.com.
-
-
-
-Record::grucloud.com.
-Record
-grucloud.com.
-
-
-
-Record::grucloud.com.->HostedZone::grucloud.com.
-
-
-
-Record::grucloud.com.-gitpage-record-www
-Record
-grucloud.com.-gitpage-record-www...
-
-
-
-Record::grucloud.com.-gitpage-record-www->HostedZone::grucloud.com.
-
-
-
-Record::grucloud.com.-mx
-Record
-grucloud.com.-mx
-
-
-
-Record::grucloud.com.-mx->HostedZone::grucloud.com.
-
-
-
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 @@
-Resources for project grucloud-aws 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