platformatic 2.0.0-alpha.5 → 2.0.0-alpha.6

package/cli.js

@@ -13,7 +13,7 @@ import { join } from 'desm'
 import { isColorSupported } from 'colorette'
 import helpMe from 'help-me'
 import { upgrade } from './lib/upgrade.js'
-import { download } from './lib/download.js'
+import { resolve } from './lib/resolve.js'
 import { logo } from './lib/ascii.js'
 import {
   runControl,
@@ -67,7 +67,7 @@ program.register('ps', async (args) => getRuntimesCommand(args))
 program.register('inject', async (args) => injectRuntimeCommand(args))
 program.register('logs', async (args) => streamRuntimeLogsCommand(args))
 program.register('upgrade', upgrade)
-program.register('download', download)
+program.register('resolve', resolve)
 program.register('client', client)
 program.register('compile', async (args) => await compile(args) ? null : process.exit(1))
 program.register('help', help.toStdout)

package/help/{download.txt → resolve.txt}

@@ -1,18 +1,20 @@
-Download Platformatic Runtime external services
+Resolve Platformatic Runtime external services
 
 ``` bash
- $ platformatic download
+ $ platformatic resolve
 ```
 
 Options:
 
 * `-c, --config FILE` - Path to the runtime configuration file.
+* `-u, --username string` - Username for the service repository.
+* `-p, --password string` - Password for the service repository.
 
-Platformatic download command downloads runtime services that have the `url` in their configuration.
+Platformatic resolve command resolves runtime services that have the `url` in their configuration.
 By default services are cloned with `git` to the `external` directory inside the runtime directory.
 To change the directory where a service is cloned, you can set the `path` property in the service configuration.
 
-After cloning the service, the download command will set the relative path to the service in the runtime configuration file.
+After cloning the service, the resolve command will set the relative path to the service in the runtime configuration file.
 
 Example of the runtime platformatic.json configuration file:
 

package/lib/{download.js → resolve.js}

@@ -8,14 +8,17 @@ import pretty from 'pino-pretty'
 import { execa } from 'execa'
 import fjs from 'fast-json-stringify'
 
-const DOWNLOAD_SERVICES_DIRNAME = 'external'
+const RESOLVED_SERVICES_DIRNAME = 'external'
 
-export async function download (argv) {
+export async function resolve (argv) {
   const args = parseArgs(argv, {
     alias: {
       config: 'c',
+      username: 'u',
+      password: 'p',
     },
     boolean: ['test'],
+    string: ['config', 'username', 'password'],
     default: { test: false },
   })
 
@@ -24,14 +27,18 @@ export async function download (argv) {
     ignore: 'hostname,pid',
   }))
   try {
-    await downloadServices(args.config, logger, args.test)
+    await resolveServices(args.config, logger, {
+      test: args.test,
+      username: args.username,
+      password: args.password,
+    })
   } catch (err) {
     console.log(err)
     process.exit(1)
   }
 }
 
-async function downloadServices (config, logger, isTest = false) {
+async function resolveServices (config, logger, options = {}) {
   const store = new Store({
     cwd: process.cwd(),
     logger,
@@ -58,10 +65,10 @@ async function downloadServices (config, logger, isTest = false) {
   }
 
   const projectDir = configManager.dirname
-  const externalDir = join(projectDir, DOWNLOAD_SERVICES_DIRNAME)
+  const externalDir = join(projectDir, RESOLVED_SERVICES_DIRNAME)
 
   if (!config.services || config.services.length === 0) {
-    logger.info('No external services to download')
+    logger.info('No external services to resolve')
     return
   }
 
@@ -86,13 +93,22 @@ async function downloadServices (config, logger, isTest = false) {
       const relativePath = relative(projectDir, path)
 
       logger.info(`Cloning ${service.url} into ${relativePath}`)
-      if (!isTest) {
-        await execa('git', ['clone', service.url, path])
+      if (!options.test) {
+        let url = service.url
+        if (options.username && options.password) {
+          const urlObj = new URL(service.url)
+          if (!urlObj.username && !urlObj.password) {
+            urlObj.username = options.username
+            urlObj.password = options.password
+          }
+          url = urlObj.href
+        }
+        await execa('git', ['clone', url, path])
       }
 
       // TODO: replace it with a proper runtime build step
-      logger.info(`Downloading dependencies for service "${service.id}"`)
-      if (!isTest) {
+      logger.info(`Resolving dependencies for service "${service.id}"`)
+      if (!options.test) {
         await execa('npm', ['i'], { cwd: path })
       }
 
@@ -107,7 +123,7 @@ async function downloadServices (config, logger, isTest = false) {
 
   await writeFile(configManager.fullPath, newConfig, 'utf8')
 
-  logger.info('✅ All external services have been downloaded')
+  logger.info('✅ All external services have been resolved')
 }
 
 async function isDirectoryNotEmpty (directoryPath) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "platformatic",
-  "version": "2.0.0-alpha.5",
+  "version": "2.0.0-alpha.6",
   "description": "Platformatic CLI",
   "main": "cli.js",
   "type": "module",
@@ -37,9 +37,9 @@
     "neostandard": "^0.11.1",
     "split2": "^4.2.0",
     "typescript": "^5.5.3",
-    "@platformatic/composer": "2.0.0-alpha.5",
-    "@platformatic/service": "2.0.0-alpha.5",
-    "@platformatic/db": "2.0.0-alpha.5"
+    "@platformatic/db": "2.0.0-alpha.6",
+    "@platformatic/composer": "2.0.0-alpha.6",
+    "@platformatic/service": "2.0.0-alpha.6"
   },
   "dependencies": {
     "@fastify/error": "^3.4.1",
@@ -56,14 +56,14 @@
     "pino": "^8.19.0",
     "pino-pretty": "^11.0.0",
     "undici": "^6.9.0",
-    "@platformatic/client-cli": "2.0.0-alpha.5",
-    "@platformatic/control": "2.0.0-alpha.5",
-    "@platformatic/db": "2.0.0-alpha.5",
-    "@platformatic/frontend-template": "2.0.0-alpha.5",
-    "@platformatic/runtime": "2.0.0-alpha.5",
-    "create-platformatic": "2.0.0-alpha.5",
-    "@platformatic/utils": "2.0.0-alpha.5",
-    "@platformatic/config": "2.0.0-alpha.5"
+    "@platformatic/client-cli": "2.0.0-alpha.6",
+    "@platformatic/config": "2.0.0-alpha.6",
+    "@platformatic/control": "2.0.0-alpha.6",
+    "@platformatic/db": "2.0.0-alpha.6",
+    "@platformatic/frontend-template": "2.0.0-alpha.6",
+    "@platformatic/utils": "2.0.0-alpha.6",
+    "create-platformatic": "2.0.0-alpha.6",
+    "@platformatic/runtime": "2.0.0-alpha.6"
   },
   "scripts": {
     "test": "pnpm run lint && borp --timeout=180000 --concurrency 1",