Merge pull request #89 from cerc-io/dboreham/npm-build-command

npm build command

app/build_npms.py

@@ -0,0 +1,88 @@
+# Copyright © 2022 Cerc
+
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http:#www.gnu.org/licenses/>.
+
+# Builds or pulls containers for the system components
+
+# env vars:
+# CERC_REPO_BASE_DIR defaults to ~/cerc
+
+import os
+from decouple import config
+import click
+import pkg_resources
+from python_on_whales import docker
+from .util import include_exclude_check
+
+@click.command()
+@click.option('--include', help="only build these packages")
+@click.option('--exclude', help="don\'t build these packages")
+@click.pass_context
+def command(ctx, include, exclude):
+    '''build the set of npm packages required for a complete stack'''
+
+    quiet = ctx.obj.quiet
+    verbose = ctx.obj.verbose
+    dry_run = ctx.obj.dry_run
+    local_stack = ctx.obj.local_stack
+
+    if local_stack:
+        dev_root_path = os.getcwd()[0:os.getcwd().rindex("stack-orchestrator")]
+        print(f'Local stack dev_root_path (CERC_REPO_BASE_DIR) overridden to: {dev_root_path}')
+    else:
+        dev_root_path = os.path.expanduser(config("CERC_REPO_BASE_DIR", default="~/cerc"))
+
+    if not quiet:
+        print(f'Dev Root is: {dev_root_path}')
+
+    if not os.path.isdir(dev_root_path):
+        print('Dev root directory doesn\'t exist, creating')
+
+    with pkg_resources.resource_stream(__name__, "data/npm-package-list.txt") as package_list_file:
+        packages = package_list_file.read().decode().splitlines()
+
+    if verbose:
+        print(f'Packages: {packages}')
+
+    def build_package(package):
+        if not quiet:
+            print(f"Building: {package}")
+        repo_dir = package
+        repo_full_path = os.path.join(dev_root_path, repo_dir)
+        # TODO: make the npm registry url configurable.
+        build_command = ["sh", "-c", "cd /workspace && build-npm-package-local-dependencies.sh http://host.docker.internal:3000/api/packages/cerc-io/npm/"]
+        if not dry_run:
+            if verbose:
+                print(f"Executing: {build_command}")
+            build_result = docker.run("cerc/builder-js",
+                                      remove=True,
+                                      interactive=True,
+                                      tty=True,
+                                      user=f"{os.getuid()}:{os.getgid()}",
+                                      envs={"CERC_NPM_AUTH_TOKEN": os.environ["CERC_NPM_AUTH_TOKEN"]},
+                                      add_hosts=[("host.docker.internal", "host-gateway")],
+                                      volumes=[(repo_full_path, "/workspace")],
+                                      command=build_command
+                                      )
+            # TODO: check result in build_result.returncode
+            print(f"Result is: {build_result}")
+        else:
+            print("Skipped")
+
+    for package in packages:
+        if include_exclude_check(package, include, exclude):
+            build_package(package)
+        else:
+            if verbose:
+                print(f"Excluding: {package}")

app/data/npm-package-list.txt

@@ -0,0 +1,4 @@
+gem
+laconic-sdk
+debug
+laconic-registry-cli

cli.py

@@ -17,6 +17,7 @@ import click
 
 from app import setup_repositories
 from app import build_containers
+from app import build_npms
 from app import deploy_system
 
 CONTEXT_SETTINGS = dict(help_option_names=['-h', '--help'])
@@ -44,4 +45,5 @@ def cli(ctx, quiet, verbose, dry_run, local_stack):
 
 cli.add_command(setup_repositories.command, "setup-repositories")
 cli.add_command(build_containers.command, "build-containers")
+cli.add_command(build_npms.command, "build-npms")
 cli.add_command(deploy_system.command, "deploy-system")

container-build/cerc-builder-js/README.md

@@ -12,6 +12,6 @@ it is possible to build packages manually by invoking `docker run` , for example
 ```
 $ docker run --rm -it --add-host host.docker.internal:host-gateway \
   -v ${HOME}/cerc/laconic-registry-cli:/workspace cerc/builder-js  \
-  sh -c 'cd /workspace && NPM_AUTH_TOKEN=6613572a28ebebaee20ccd90064251fa8c2b94f6 \
+  sh -c 'cd /workspace && CERC_NPM_AUTH_TOKEN=6613572a28ebebaee20ccd90064251fa8c2b94f6 \
   build-npm-package-local-dependencies.sh http://host.docker.internal:3000/api/packages/cerc-io/npm/ 0.1.8'
 ```

container-build/cerc-builder-js/build-npm-package-local-dependencies.sh

@@ -5,12 +5,12 @@
 if [ -n "$CERC_SCRIPT_DEBUG" ]; then
     set -x
 fi
-if [[ $# -ne 2 ]]; then
+if ! [[ $# -eq 1 || $# -eq 2 ]]; then
     echo "Illegal number of parameters" >&2
     exit 1
 fi
-if [[ -z "${NPM_AUTH_TOKEN}" ]]; then
+if [[ -z "${CERC_NPM_AUTH_TOKEN}" ]]; then
-    echo "NPM_AUTH_TOKEN is not set" >&2
+    echo "CERC_NPM_AUTH_TOKEN is not set" >&2
     exit 1
 fi
 local_npm_registry_url=$1
@@ -19,7 +19,7 @@ package_publish_version=$2
 npm_scope_for_local="@cerc-io"
 # We need to configure the local registry 
 npm config set ${npm_scope_for_local}:registry ${local_npm_registry_url}
-npm config set -- ${local_npm_registry_url}:_authToken ${NPM_AUTH_TOKEN}
+npm config set -- ${local_npm_registry_url}:_authToken ${CERC_NPM_AUTH_TOKEN}
 # Find the set of dependencies from the specified scope
 mapfile -t dependencies_from_scope < <(cat package.json | jq -r '.dependencies | with_entries(if (.key|test("^'${npm_scope_for_local}'/.*$")) then ( {key: .key, value: .value } ) else empty end ) | keys[]')
 echo "Fixing up dependencies"

container-build/cerc-builder-js/build-npm-package.sh

@@ -1,21 +1,26 @@
 #!/bin/bash
 # Usage: build-npm-package.sh <registry-url> <publish-with-this-version>
-# Note: supply the registry auth token in NPM_AUTH_TOKEN
+# Note: supply the registry auth token in CERC_NPM_AUTH_TOKEN
 if [ -n "$CERC_SCRIPT_DEBUG" ]; then
     set -x
 fi
-if [[ $# -ne 2 ]]; then
+if ! [[ $# -eq 1 || $# -eq 2 ]]; then
     echo "Illegal number of parameters" >&2
     exit 1
 fi
-if [[ -z "${NPM_AUTH_TOKEN}" ]]; then
+if [[ -z "${CERC_NPM_AUTH_TOKEN}" ]]; then
-    echo "NPM_AUTH_TOKEN is not set" >&2
+    echo "CERC_NPM_AUTH_TOKEN is not set" >&2
     exit 1
 fi
-local_npm_registry_url=$1
+if [[ $# -eq 2 ]]; then
     package_publish_version=$2
+else
+    package_publish_version=$( cat package.json | jq -r .version )
+fi
+local_npm_registry_url=$1
+npm config set @lirewine:registry ${local_npm_registry_url}
 npm config set @cerc-io:registry ${local_npm_registry_url}
-npm config set -- ${local_npm_registry_url}:_authToken ${NPM_AUTH_TOKEN}
+npm config set -- ${local_npm_registry_url}:_authToken ${CERC_NPM_AUTH_TOKEN}
 echo "Build and publish version ${package_publish_version}"
 yarn install
 yarn build