chore: refactor redundant code

Author: Akash Jain

src/commands/delete-lambda.ts

@@ -25,7 +25,7 @@ export default class DeleteLambda extends BaseCommand {
   async run() {
     const opts = this.parse(DeleteLambda)
     const {apiServer, authFile} = getEnvironment(opts.flags.environment)
-    let endpoint = opts.flags.endpoint || ''
+    const endpoint = await this.convertToGraphQLUid(apiServer, authFile, opts.flags.endpoint) || ''
 
     const token = await this.getAccessToken(apiServer, authFile)
     if (!token) {
@@ -37,11 +37,6 @@ export default class DeleteLambda extends BaseCommand {
       return
     }
 
-    if (!endpoint.match(/0x[0-9a-f]+/)) {
-      const backend = await this.findBackendByUrl(apiServer, token, endpoint)
-      endpoint = backend?.uid || ''
-    }
-
     const {error, response} = await this.patchBackend(apiServer, token, endpoint, {lambdaScript: ''})
     if (error) {
       this.error(error)

src/commands/lambda-logs.ts

@@ -25,18 +25,13 @@ export default class LambdaLogs extends BaseCommand {
   async run() {
     const opts = this.parse(LambdaLogs)
     const {apiServer, authFile} = getEnvironment(opts.flags.environment)
-    let endpoint = opts.flags.endpoint || ''
+    const endpoint = await this.convertToGraphQLUid(apiServer, authFile, opts.flags.endpoint) || ''
 
     const token = await this.getAccessToken(apiServer, authFile)
     if (!token) {
       this.error('Please login with `slash-graphql` login')
     }
 
-    if (!endpoint.match(/0x[0-9a-f]+/)) {
-      const backend = await this.findBackendByUrl(apiServer, token, endpoint)
-      endpoint = backend?.uid || ''
-    }
-
     const start = new Date()
     start.setHours(start.getHours() - opts.flags.hours)
     const {errors, data} = await this.sendGraphQLRequest(apiServer, token, GET_LAMBDA_LOGS, {

src/commands/restore-backend.ts

@@ -40,12 +40,8 @@ export default class RestoreBackend extends BaseCommand {
     async run() {
       const opts = this.parse(RestoreBackend)
       const backend = await this.backendFromOpts(opts)
-      let sourceID = opts.flags.source
-
-      if (!sourceID.match(/0x[0-9a-f]+/)) {
-        const {apiServer, authFile} = getEnvironment(opts.flags.environment)
-        sourceID = await this.convertToGraphQLUid(apiServer, authFile, sourceID) || ''
-      }
+      const {apiServer, authFile} = getEnvironment(opts.flags.environment)
+      const sourceID = await this.convertToGraphQLUid(apiServer, authFile, opts.flags.source) || ''
 
       if (!(opts.flags.confirm || await this.confirm())) {
         this.log('Aborting')

src/commands/update-backend.ts

@@ -1,34 +1,33 @@
 import {BaseCommand} from '../lib'
 import {getEnvironment} from '../lib/environments'
 import {flags} from '@oclif/command'
-import fetch from 'node-fetch'
 import {cli} from 'cli-ux'
 
 export default class UpdateBackend extends BaseCommand {
   static description = 'Update Backend'
 
   static examples = [
-    '$ slash-graphql update-backend -n "New Name" 0xid',
+    '$ slash-graphql update-backend -e 0xid -n "New Name" -m flexible',
   ]
 
   static flags = {
     ...BaseCommand.commonFlags,
+    ...BaseCommand.endpointFlags,
     name: flags.string({char: 'n', description: 'Name'}),
     organizationId: flags.string({char: 'o', description: 'Organization UID', default: ''}),
     confirm: flags.boolean({char: 'y', description: 'Skip Confirmation', default: false}),
-    'deployment-mode': flags.string({char: 'm', description: 'Deployment Mode', options: ['readonly', 'graphql', 'flexible']}),
+    mode: flags.string({char: 'm', description: 'Backend Mode', options: ['readonly', 'graphql', 'flexible']}),
   }
 
-  static args = [{name: 'id', description: 'Backend UID', required: true}]
-
   confirm() {
-    this.log('Depending on which properties you are updating, this may cause your cluster to restart. Your data will be preserved')
+    this.log('Depending on which properties you are updating, this may cause your backend to restart. Your data will be preserved')
     return cli.confirm('Are you sure you want to proceed?')
   }
 
   async run() {
     const opts = this.parse(UpdateBackend)
     const {apiServer, authFile} = getEnvironment(opts.flags.environment)
+    const endpoint = await this.convertToGraphQLUid(apiServer, authFile, opts.flags.endpoint) || ''
 
     const token = await this.getAccessToken(apiServer, authFile)
     if (!token) {
@@ -39,8 +38,8 @@ export default class UpdateBackend extends BaseCommand {
     if (opts.flags.name) {
       updates.name = opts.flags.name
     }
-    if (opts.flags['deployment-mode']) {
-      updates.deploymentMode = opts.flags['deployment-mode']
+    if (opts.flags.mode) {
+      updates.deploymentMode = opts.flags.mode
     }
     if (opts.flags.organizationId) {
       updates.organizationId = opts.flags.organizationId
@@ -55,19 +54,10 @@ export default class UpdateBackend extends BaseCommand {
       return
     }
 
-    const response = await fetch(`${apiServer}/deployment/${opts.args.id}`, {
-      method: 'PATCH',
-      headers: {
-        'Content-Type': 'application/json',
-        Authorization: `Bearer ${token}`,
-      },
-      body: JSON.stringify(updates),
-    })
-    if (response.status !== 200) {
-      this.error(`Error while updating backend\n${await response.text()}`)
-    }
-    if (!opts.flags.quiet) {
-      this.log('Updated Backend')
+    const {error, response} = await this.patchBackend(apiServer, token, endpoint, updates)
+    if (error) {
+      this.error(error)
     }
+    this.log(response.message)
   }
 }

src/commands/update-lambda.ts

@@ -20,18 +20,13 @@ export default class LambdaLogs extends BaseCommand {
     async run() {
       const opts = this.parse(LambdaLogs)
       const {apiServer, authFile} = getEnvironment(opts.flags.environment)
-      let endpoint = opts.flags.endpoint || ''
+      const endpoint = await this.convertToGraphQLUid(apiServer, authFile, opts.flags.endpoint) || ''
 
       const token = await this.getAccessToken(apiServer, authFile)
       if (!token) {
         this.error('Please login with `slash-graphql` login')
       }
 
-      if (!endpoint.match(/0x[0-9a-f]+/)) {
-        const backend = await this.findBackendByUrl(apiServer, token, endpoint)
-        endpoint = backend?.uid || ''
-      }
-
       const data = fs.readFileSync(opts.flags.file, 'utf8')
       const lambdaScript = Buffer.from(data).toString('base64')
       const {error, response} = await this.patchBackend(apiServer, token, endpoint, {lambdaScript})