platformatic 0.23.2 → 0.25.0

package/lib/gh.js

@@ -9,12 +9,12 @@ import pino from 'pino'
 import pretty from 'pino-pretty'
 import ConfigManager from '@platformatic/config'
 
-export const createGHAction = async (logger, workspaceId, env, config, buildTS, type, projectDir = process.cwd()) => {
+export const createGHAction = async (logger, env, config, buildTS, type, projectDir = process.cwd()) => {
   if (type === 'static') {
-    await createStaticWorkspaceGHAction(logger, workspaceId, env, config, projectDir, buildTS)
+    await createStaticWorkspaceGHAction(logger, env, config, projectDir, buildTS)
     return
   }
-  await createDynamicWorkspaceGHAction(logger, workspaceId, env, config, projectDir, buildTS)
+  await createDynamicWorkspaceGHAction(logger, env, config, projectDir, buildTS)
 }
 
 const logger = pino(pretty({
@@ -43,18 +43,11 @@ export const gh = async (argv) => {
       config: 'c',
       type: 't',
       help: 'h',
-      build: 'b',
-      workspace: 'w'
+      build: 'b'
     },
     boolean: ['build']
   })
 
-  // Validations:
-  if (!args.workspace) {
-    logger.error('Workspace ID is required')
-    process.exit(1)
-  }
-
   if (!['static', 'dynamic'].includes(args.type)) {
     logger.error(`Invalid type: [${args.type}]. Type must be either static or dynamic`)
     process.exit(1)
@@ -80,8 +73,9 @@ export const gh = async (argv) => {
     plt_custom_variable: 'change-me',
     custom_variable1: 'change-me'
   }
-  await createGHAction(logger, args.workspace, env, configFilename, args.build, args.type)
+  await createGHAction(logger, env, configFilename, args.build, args.type)
 
+  const workspaceName = args.type === 'static' ? 'PLATFORMATIC_STATIC_WORKSPACE_ID ' : 'PLATFORMATIC_DYNAMIC_WORKSPACE_ID'
   const secretName = args.type === 'static' ? 'PLATFORMATIC_STATIC_WORKSPACE_API_KEY' : 'PLATFORMATIC_DYNAMIC_WORKSPACE_API_KEY'
-  logger.info(`Github action successfully created for workspace ${args.workspace}, please add ${secretName} as repository secret.`)
+  logger.info(`Github action successfully created please add ${workspaceName} and ${secretName} as repository secrets.`)
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "platformatic",
-  "version": "0.23.2",
+  "version": "0.25.0",
   "description": "Platformatic CLI",
   "main": "cli.js",
   "type": "module",
@@ -36,26 +36,26 @@
     "split2": "^4.2.0",
     "standard": "^17.0.0",
     "tap": "^16.3.4",
-    "undici": "^5.22.0"
+    "undici": "^5.22.1"
   },
   "dependencies": {
-    "@platformatic/deploy-client": "^0.1.2",
     "colorette": "^2.0.20",
     "commist": "^3.2.0",
     "desm": "^1.3.0",
     "help-me": "^4.2.0",
-    "inquirer": "^9.2.0",
+    "inquirer": "^9.2.6",
     "minimist": "^1.2.8",
-    "pino": "^8.12.0",
+    "pino": "^8.14.1",
     "pino-pretty": "^10.0.0",
-    "@platformatic/authenticate": "0.23.2",
-    "@platformatic/client-cli": "0.23.2",
-    "@platformatic/config": "0.23.2",
-    "@platformatic/db": "0.23.2",
-    "@platformatic/metaconfig": "0.23.2",
-    "@platformatic/service": "0.23.2",
-    "@platformatic/start": "0.23.2",
-    "create-platformatic": "0.23.2"
+    "@platformatic/authenticate": "0.25.0",
+    "@platformatic/client-cli": "0.25.0",
+    "@platformatic/config": "0.25.0",
+    "@platformatic/db": "0.25.0",
+    "@platformatic/deploy-client": "0.25.0",
+    "@platformatic/metaconfig": "0.25.0",
+    "@platformatic/service": "0.25.0",
+    "@platformatic/start": "0.25.0",
+    "create-platformatic": "0.25.0"
   },
   "scripts": {
     "test": "standard | snazzy && c8 --100 tap --no-coverage test/*.test.js",

package/test/fixtures/app-to-deploy/platformatic.db.json

@@ -1,9 +1,10 @@
 {
+  "$schema": "https://platformatic.dev/schemas/v0.23.2/db",
   "server": {
     "hostname": "127.0.0.1",
     "port": 3042
   },
-  "core": {
+  "db": {
     "connectionString": "sqlite://db.sqlite",
     "graphql": true,
     "ignore": {

package/test/gh.test.js

@@ -8,23 +8,23 @@ import { dirname, join } from 'path'
 import mkdirp from 'mkdirp'
 
 let count = 0
-const workspaceId = 'WORKSPACE-ID-TEST'
 
 test('creates a deploy config for static workspace', async (t) => {
   const dest = join(tmpdir(), `test-cli-gh-${process.pid}-${count++}`)
 
+  t.comment(`working in ${dest}`)
   await mkdirp(dest)
   await cp(
     join(dirname(fileURLToPath(import.meta.url)), 'fixtures', 'v0.16.0.db.json'),
     join(dest, 'platformatic.db.json'))
 
-  await execa('node', [cliPath, 'gh', '-w', workspaceId], {
+  await execa('node', [cliPath, 'gh'], {
     cwd: dest
   })
 
   const deployWorkflow = await readFile(join(dest, '.github', 'workflows', 'platformatic-static-workspace-deploy.yml'), 'utf8')
+  t.ok(deployWorkflow.indexOf('PLATFORMATIC_STATIC_WORKSPACE_ID') !== -1)
   t.ok(deployWorkflow.indexOf('PLATFORMATIC_STATIC_WORKSPACE_API_KEY') !== -1)
-  t.ok(deployWorkflow.indexOf('WORKSPACE-ID-TEST') !== -1)
 })
 
 test('creates a deploy config for dynamic workspace', async (t) => {
@@ -35,31 +35,13 @@ test('creates a deploy config for dynamic workspace', async (t) => {
     join(dirname(fileURLToPath(import.meta.url)), 'fixtures', 'v0.16.0.db.json'),
     join(dest, 'platformatic.db.json'))
 
-  await execa('node', [cliPath, 'gh', '-w', workspaceId, '-t', 'dynamic'], {
+  await execa('node', [cliPath, 'gh', '-t', 'dynamic'], {
     cwd: dest
   })
 
   const deployWorkflow = await readFile(join(dest, '.github', 'workflows', 'platformatic-dynamic-workspace-deploy.yml'), 'utf8')
+  t.ok(deployWorkflow.indexOf('PLATFORMATIC_DYNAMIC_WORKSPACE_ID') !== -1)
   t.ok(deployWorkflow.indexOf('PLATFORMATIC_DYNAMIC_WORKSPACE_API_KEY') !== -1)
-  t.ok(deployWorkflow.indexOf('WORKSPACE-ID-TEST') !== -1)
-})
-
-test('creation fails if workspace is missing', async (t) => {
-  const dest = join(tmpdir(), `test-cli-gh-${process.pid}-${count++}`)
-
-  await mkdirp(dest)
-  await cp(
-    join(dirname(fileURLToPath(import.meta.url)), 'fixtures', 'v0.16.0.db.json'),
-    join(dest, 'platformatic.db.json'))
-
-  try {
-    await execa('node', [cliPath, 'gh'], {
-      cwd: dest
-    })
-    t.fail('should have failed')
-  } catch ({ stdout }) {
-    t.ok(stdout.indexOf('Workspace ID is required') !== -1)
-  }
 })
 
 test('creation fails if workspace type is not static or dynamic', async (t) => {
@@ -71,7 +53,7 @@ test('creation fails if workspace type is not static or dynamic', async (t) => {
     join(dest, 'platformatic.db.json'))
 
   try {
-    await execa('node', [cliPath, 'gh', '-w', workspaceId, '-t', 'XXXXX'], {
+    await execa('node', [cliPath, 'gh', '-t', 'XXXXX'], {
       cwd: dest
     })
     t.fail('should have failed')
@@ -84,7 +66,7 @@ test('creation fails if no config file is found', async (t) => {
   const dest = join(tmpdir(), `test-cli-gh-${process.pid}-${count++}`)
   await mkdirp(dest)
   try {
-    await execa('node', [cliPath, 'gh', '-w', workspaceId], {
+    await execa('node', [cliPath, 'gh'], {
       cwd: dest
     })
     t.fail('should have failed')
@@ -103,7 +85,7 @@ test('creates a deploy must warn that a .env exists', async (t) => {
 
   await writeFile(join(dest, '.env'), 'TEST=1')
 
-  const { stdout } = await execa('node', [cliPath, 'gh', '-w', workspaceId], {
+  const { stdout } = await execa('node', [cliPath, 'gh'], {
     cwd: dest
   })
   t.ok(stdout.indexOf('Found .env file') !== -1)