Infra Pipeline: Modular Environment Setups

.gitignore

@@ -1,5 +1,6 @@
 node_modules
 build
+!**/default-manifests/build
 .idea
 yarn-error.log
 coverage

appveyor.yml → appveyor.yaml

@@ -23,4 +23,4 @@ test_script:
   - docker version
   - docker-compose version
   - ps: "& 'C:/Program Files/Docker/Docker/DockerCli.exe' -SwitchDaemon -SwitchLinuxEngine"
-  - yarn test:ci
+  - yarn test:ci 

packages/cli/lang/en.json

@@ -13,6 +13,46 @@
   "commands_build_options_t": "Use the development server's ENS instance",
   "commands_build_options_w": "Automatically rebuild when changes are made (default: false)",
   "commands_build_options_v": "Verbose output (default: false)",
+  "commands_infra_description": "Manage infrastructure for your Web3API",
+  "commands_infra_actions_subtitle": "Infra allows you to execute the following commands:",
+  "commands_infra_options_options": "options",
+  "commands_infra_options_manifest": "manifest",
+  "commands_infra_options_i_node": "node",
+  "commands_infra_options_h": "Show usage information",
+  "commands_infra_options_m": "Use only specified modules",
+  "commands_infra_options_v": "Verbose output (default: false)",
+  "commands_infra_options_p": "Use a preset infra environment",
+  "commands_infra_options_d": "Run in detached mode",
+  "commands_infra_moduleName": "module-name",
+  "commands_infra_presetName": "preset-name",
+  "commands_infra_manifestPath": "manifest-path",
+  "commands_infra_manifestPathDescription": "Web3API Manifest path",
+  "commands_infra_command_up": "Start Web3API infrastructure",
+  "commands_infra_command_down": "Stop Web3API infrastructure",
+  "commands_infra_command_vars": "Show Web3API infrastructure's required .env variables",
+  "commands_infra_command_config": "Validate and display Web3API infrastructure's bundled docker-compose manifest",
+  "commands_infra_error_never": "This should never happen...",
+  "commands_infra_error_noCommand": "No command given",
+  "commands_infra_error_unrecognizedCommand": "Unrecognized command: {command}",
+  "commands_infra_error_noModulesMatch": "{modules} did not match any module names",
+  "commands_infra_error_noModulesDeclared": "No modules declared",
+  "commands_infra_modulesUsed_text": "Using infra modules",
+  "commands_infra_options_command": "command",
+  "commands_infra_options_start": "Startup the test env",
+  "commands_infra_options_stop": "Shutdown the test env",
+  "commands_infra_options_env_vars": "Show environment variables",
+  "commands_infra_shutdown_error": "Failed to shutdown test environment",
+  "commands_infra_shutdown_text": "Shutting down test environment...",
+  "commands_infra_shutdown_warning": "Warning shutting down test environment",
+  "commands_infra_startup_error": "Failed to start test environment",
+  "commands_infra_startup_text": "Starting test environment...",
+  "commands_infra_startup_warning": "Warning starting test environment",
+  "commands_infra_vars_text": "Extracting environment variables",
+  "commands_infra_vars_warning": "Warning extracting environment variables",
+  "commands_infra_vars_error": "Error extracting environment variables",
+  "commands_infra_manifest_text": "Aggregating manifest",
+  "commands_infra_manifest_warning": "Warning aggregating manifest",
+  "commands_infra_manifest_error": "Error aggregating manifest",
   "commands_build_uriViewers": "URI Viewers",
   "commands_deploy_description": "Deploys/Publishes a Web3API",
   "commands_deploy_options_options": "options",
@@ -140,7 +180,7 @@
   "commands_query_error_noApi": "API needs to be initialized",
   "commands_query_error_readFail": "Failed to read query {query}",
   "commands_query_error_noRecipeScriptFound": "Recipe script not found at path: {path}",
-  "commands_query_error_noTestEnvFound": "w3 test-env not found, please run 'w3 test-env up'",
+  "commands_query_error_noTestEnvFound": "w3 test-env not found, please run 'w3 infra up --preset=eth-ens-ipfs'",
   "commands_testEnv_description": "Manage a test environment for Web3API",
   "commands_testEnv_error_never": "This should never happen...",
   "commands_testEnv_error_noCommand": "No command given",
@@ -226,5 +266,6 @@
   "lib_watcher_alreadyWatching": "Watcher session is already in progress. Directory: {dir}",
   "lib_wasm_rust_invalidModule": "Module paths must point to Cargo.toml files. Found: {path}",
   "lib_docker_invalidImageId": "Invalid docker image ID returned: {imageId}",
-  "lib_docker_noInstall": "Docker executable not found in PATH"
+  "lib_docker_noInstall": "Docker executable not found in PATH",
+  "lib_infra_unrecognizedModule": "Unrecognized modules: {modules}"
 }

packages/cli/lang/es.json

@@ -15,6 +15,46 @@
   "commands_build_options_w": "Automatically rebuild when changes are made (default: false)",
   "commands_build_options_v": "Verbose output (default: false)",
   "commands_build_uriViewers": "URI Viewers",
+  "commands_infra_description": "Manage infrastructure for your Web3API",
+  "commands_infra_actions_subtitle": "Infra allows you to execute the following commands:",
+  "commands_infra_options_options": "options",
+  "commands_infra_options_manifest": "manifest",
+  "commands_infra_options_i_node": "node",
+  "commands_infra_options_h": "Show usage information",
+  "commands_infra_options_m": "Use only specified modules",
+  "commands_infra_options_v": "Verbose output (default: false)",
+  "commands_infra_options_p": "Use a preset infra environment",
+  "commands_infra_options_d": "Run in detached mode",
+  "commands_infra_moduleName": "module-name",
+  "commands_infra_presetName": "preset-name",
+  "commands_infra_manifestPath": "manifest-path",
+  "commands_infra_manifestPathDescription": "Web3API Manifest path",
+  "commands_infra_command_up": "Start Web3API infrastructure",
+  "commands_infra_command_down": "Stop Web3API infrastructure",
+  "commands_infra_command_vars": "Show Web3API infrastructure's required .env variables",
+  "commands_infra_command_config": "Validate and display Web3API infrastructure's bundled docker-compose manifest",
+  "commands_infra_error_never": "This should never happen...",
+  "commands_infra_error_noCommand": "No command given",
+  "commands_infra_error_unrecognizedCommand": "Unrecognized command: {command}",
+  "commands_infra_error_noModulesMatch": "{modules} did not match any module names",
+  "commands_infra_error_noModulesDeclared": "No modules declared",
+  "commands_infra_modulesUsed_text": "Using infra modules",
+  "commands_infra_options_command": "command",
+  "commands_infra_options_start": "Startup the test env",
+  "commands_infra_options_stop": "Shutdown the test env",
+  "commands_infra_options_env_vars": "Show environment variables",
+  "commands_infra_shutdown_error": "Failed to shutdown test environment",
+  "commands_infra_shutdown_text": "Shutting down test environment...",
+  "commands_infra_shutdown_warning": "Warning shutting down test environment",
+  "commands_infra_startup_error": "Failed to start test environment",
+  "commands_infra_startup_text": "Starting test environment...",
+  "commands_infra_startup_warning": "Warning starting test environment",
+  "commands_infra_vars_text": "Extracting environment variables",
+  "commands_infra_vars_warning": "Warning extracting environment variables",
+  "commands_infra_vars_error": "Error extracting environment variables",
+  "commands_infra_manifest_text": "Aggregating manifest",
+  "commands_infra_manifest_warning": "Warning aggregating manifest",
+  "commands_infra_manifest_error": "Error aggregating manifest",
   "commands_deploy_description": "Deploys/Publishes a Web3API",
   "commands_deploy_options_options": "options",
   "commands_deploy_options_o_path": "path",
@@ -141,7 +181,7 @@
   "commands_query_error_noApi": "API needs to be initialized",
   "commands_query_error_readFail": "Failed to read query {query}",
   "commands_query_error_noRecipeScriptFound": "Recipe script not found at path: {path}",
-  "commands_query_error_noTestEnvFound": "w3 test-env not found, please run 'w3 test-env up'",
+  "commands_query_error_noTestEnvFound": "w3 test-env not found, please run 'w3 infra up --preset=eth-ens-ipfs'",
   "commands_testEnv_description": "Manage a test environment for Web3API",
   "commands_testEnv_error_never": "This should never happen...",
   "commands_testEnv_error_noCommand": "No command given",
@@ -227,5 +267,6 @@
   "lib_watcher_alreadyWatching": "Watcher session is already in progress. Directory: {dir}",
   "lib_wasm_rust_invalidModule": "Module paths must point to Cargo.toml files. Found: {path}",
   "lib_docker_invalidImageId": "Invalid docker image ID returned: {imageId}",
-  "lib_docker_noInstall": "Docker executable not found in PATH"
+  "lib_docker_noInstall": "Docker executable not found in PATH",
+  "lib_infra_unrecognizedModule": "Unrecognized modules: {modules}"
 }

packages/cli/package.json

@@ -16,9 +16,10 @@
     "w3": "bin/w3"
   },
   "scripts": {
-    "build": "rimraf ./build && tsc --project tsconfig.build.json && yarn build:envs && yarn build:deployers",
+    "build": "rimraf ./build && tsc --project tsconfig.build.json && yarn build:envs && yarn build:deployers && yarn build:manifests",
     "build:envs": "copyfiles ./src/lib/build-envs/**/**/* ./build/lib/build-envs/ -u 3",
     "build:deployers": "copyfiles ./src/lib/deployers/**/web3api.deploy.ext.json ./build/lib/deployers -u 3",
+    "build:manifests": "copyfiles ./src/lib/default-manifests/**/**/* ./build/lib/default-manifests -u 3",
     "prebuild": "ts-node ./scripts/generateIntlTypes.ts",
     "build:fast": "rimraf ./build && tsc --project tsconfig.build.json && yarn build:envs",
     "lint": "eslint --color -c ../../.eslintrc.js .",
@@ -34,7 +35,6 @@
     "@formatjs/intl": "1.8.2",
     "@web3api/asyncify-js": "0.0.1-prealpha.82",
     "@web3api/client-js": "0.0.1-prealpha.82",
-    "@web3api/client-test-env": "0.0.1-prealpha.82",
     "@web3api/core-js": "0.0.1-prealpha.82",
     "@web3api/ens-plugin-js": "0.0.1-prealpha.82",
     "@web3api/ethereum-plugin-js": "0.0.1-prealpha.82",
@@ -55,6 +55,7 @@
     "gluegun": "4.6.1",
     "graphql-tag": "2.11.0",
     "ipfs-http-client": "48.1.3",
+    "docker-compose": "0.23.17",
     "js-yaml": "3.14.0",
     "jsonschema": "1.4.0",
     "mustache": "4.0.1",

packages/cli/src/__tests__/e2e/deploy.spec.ts

@@ -6,7 +6,6 @@ import {
   stopTestEnvironment,
 } from "@web3api/test-env-js";
 import { GetPathToCliTestFiles } from "@web3api/test-cases";
-import axios from "axios";
 import { Web3ApiClient } from "@web3api/client-js";
 import { ethereumPlugin } from "@web3api/ethereum-plugin-js";
 import { Wallet } from "ethers";
@@ -33,8 +32,7 @@ const testCaseRoot = path.join(GetPathToCliTestFiles(), "api/deploy");
     path.join(testCaseRoot, testCases[index]);
 
 const setup = async (domainNames: string[]) => {
-  const { ethereum } = await initTestEnvironment();
-  const { data } = await axios.get("http://localhost:4040/deploy-ens");
+  const { ethereum, ...data } = await initTestEnvironment();
 
   const ensAddress = data.ensAddress
   const resolverAddress = data.resolverAddress
@@ -49,7 +47,6 @@ const setup = async (domainNames: string[]) => {
   };
 
   const ethereumPluginUri = "w3://ens/ethereum.web3api.eth"
-
   const client = new Web3ApiClient({
     plugins: [
       {
@@ -144,12 +141,6 @@ describe("e2e tests for deploy command", () => {
     expect(sanitizedOutput).toContain(
       "Successfully executed stage 'from_deploy'"
     );
-    expect(sanitizedOutput).toContain(
-      "Successfully executed stage 'from_deploy2'"
-    );
-    expect(sanitizedOutput).toContain(
-      "Successfully executed stage 'from_uri'"
-    );
   });
 
   test("Should show warning if no manifest ext is found in deploy package", async () => {

packages/cli/src/__tests__/e2e/help.spec.ts

@@ -2,6 +2,7 @@ import { clearStyle, w3Cli } from "./utils";
 
 import { runCLI } from "@web3api/test-env-js";
 
+
 const HELP = `Usage: w3 [options] [command]
 
 Options:
@@ -15,7 +16,7 @@ Commands:
   deploy|d [options]          Deploys/Publishes a Web3API
   plugin|p                    Build/generate types for the plugin
   query|q [options] <recipe>  Query Web3APIs using recipe scripts
-  test-env|t                  Manage a test environment for Web3API
+  infra|i [options] <action>  Manage infrastructure for your Web3API
   help [command]              display help for command
 `;