@ossy/cli 0.0.3-alpha → 0.0.4-alpha

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ossy/cli",
-  "version": "0.0.3-alpha",
+  "version": "0.0.4-alpha",
   "description": "Command line tool that makes it easier to interact with our APIs",
   "source": "./src/index.js",
   "main": "./src/index.js",

package/src/cms/cli.js

@@ -3,16 +3,11 @@ import { resolve } from 'path'
 import { readFileSync } from 'fs'
 import arg from 'arg'
 import fetch from 'node-fetch'
-import { logInfo, logErrorAndReject, logDebug } from '../log.js'
-
-const config = {
-  apiUrl: 'https://api.ossy.se/api/v0',
-  // apiUrl: 'http://localhost:3001/api/v0'
-}
+import { logInfo, logError, logErrorAndReject, logDebug } from '../log.js'
 
 const Api = {
-  uploadResourceTemplates: (token, workspaceId, resourceTemplates) => {
-    const endpoint = `${config.apiUrl}/workspaces/${workspaceId}/resource-templates`
+  uploadResourceTemplates: (apiUrl, token, workspaceId, resourceTemplates) => {
+    const endpoint = `${apiUrl}/workspaces/${workspaceId}/resource-templates`
 
     const fetchOptions = {
       method: 'POST',
@@ -34,19 +29,20 @@ const importResourceTemplates = options => {
     '--authentication': String,
     '--a': '--authentication',
 
-    '--ossy-file': String,
-    '-o': '--ossy-file',
+    '--config': String,
+    '-c': '--config',
   }, { argv: options })
 
   logInfo({ message: '[CMS] reading files' })
-  const token = parsedArgs['--authentication']
-  const filePath = resolve(parsedArgs['--ossy-file'])
+  const token = parsedArgs['--authentication'];
+  const filePath = resolve(parsedArgs['--config'])
 
   if (!token) return logErrorAndReject({ message: '[CMS] No token provided with --authentication'})
 
   return resolveConfigImport(filePath)
     .then(module => {
       const config = module?.default
+      const apiUrl = config?.apiUrl || 'https://api.ossy.se/api/v0'
       const workspaceId = config?.workspaceId
       const resourceTemplates = config?.resourceTemplates
 
@@ -54,9 +50,12 @@ const importResourceTemplates = options => {
       if (!resourceTemplates) return logErrorAndReject({ message: '[CMS] No resource templates provided in ossy.json'})
 
       logInfo({ message: '[CMS] uploading resource templates' })
-      return Api.uploadResourceTemplates(token, workspaceId, resourceTemplates)
-          .then(() => logInfo({ message: '[CMS] Done' }))
-          .catch(error => logErrorAndReject({ message: '[CMS] Error', error }))
+
+      Api.uploadResourceTemplates(apiUrl, token, workspaceId, resourceTemplates)
+          .then(response => {
+            logInfo({ message: '[CMS] Done' })
+          })
+          .catch(error => logError({ message: '[CMS] Error', error }))
     })
 
 }