ExternalVendorCode/balena-cli
1
0
Fork 0
mirror of https://github.com/balena-io/balena-cli.git synced 2025-02-07 03:29:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Clean up logging and add spinner

Browse Source 
Signed-off-by: Kyle Harding <kyle@balena.io>
This commit is contained in:
Kyle Harding 2021-10-14 15:47:50 -04:00 committed by ab77
parent 4cd8af904e
commit bb011ff1b9
No known key found for this signature in database
GPG Key ID: D094F44E5E29445A
1 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
lib/commands/instance/init.ts
View File

@ -17,7 +17,7 @@
import { IArg } from '@oclif/parser/lib/args'; import { IArg } from '@oclif/parser/lib/args';
import Command from '../../command'; import Command from '../../command';
import { stripIndent } from '../../utils/lazy'; import { stripIndent, getVisuals } from '../../utils/lazy';
import { import {
applicationIdInfo, applicationIdInfo,
} from '../../utils/messages'; } from '../../utils/messages';
@ -115,8 +115,6 @@ export default class InstanceInitCmd extends Command {
const configFile = JSON.parse(fs.readFileSync(params.configFile).toString()) const configFile = JSON.parse(fs.readFileSync(params.configFile).toString())
console.log('Checking if image already exists...')
const imageName = options.imageName || 'balenaOS-qemux86-64' const imageName = options.imageName || 'balenaOS-qemux86-64'
let skipUpload = false let skipUpload = false
let imageID = 0 let imageID = 0
@ -127,6 +125,8 @@ export default class InstanceInitCmd extends Command {
let images = [] let images = []
const num = options.num || 1 const num = options.num || 1
console.log(`Checking if image '${imageName}' already exists...`)
do { do {
res = await fetch(`https://api.digitalocean.com/v2/images?per_page=200&page=${page}`, { res = await fetch(`https://api.digitalocean.com/v2/images?per_page=200&page=${page}`, {
headers: { headers: {
@ -134,10 +134,9 @@ export default class InstanceInitCmd extends Command {
} }
}) })
responseBody = await res.json() responseBody = await res.json()
console.log(responseBody.images.length)
for (const image of responseBody.images) { for (const image of responseBody.images) {
if (image.name === imageName) { if (image.name === imageName) {
console.log('Image already exists, skipping upload.') console.log('Image exists, skipping upload.')
skipUpload = true skipUpload = true
imageID = image.id imageID = image.id
break break
@ -148,13 +147,12 @@ export default class InstanceInitCmd extends Command {
} while (images.length === 200) } while (images.length === 200)
if (!skipUpload) { if (!skipUpload) {
console.log('Existing image with same name not found, creating digitalocean image...')
if (!options.apiKey) { if (!options.apiKey) {
console.log('Missing digitalocean api key, please provide with --apiKey <api_key>') console.log('DigitalOcean API key is required, please provide with --apiKey <api_key>')
} }
console.log('Uploading image...') console.log('Uploading image to DigitalOcean...')
res = await fetch('https://api.digitalocean.com/v2/images', { res = await fetch('https://api.digitalocean.com/v2/images', {
method: 'POST', method: 'POST',
headers: { headers: {
@ -165,19 +163,25 @@ export default class InstanceInitCmd extends Command {
name: imageName, name: imageName,
url: `https://api.balena-cloud.com/download?fileType=.gz&appId=1833771&deviceType=qemux86-64`, url: `https://api.balena-cloud.com/download?fileType=.gz&appId=1833771&deviceType=qemux86-64`,
distribution: 'Unknown', distribution: 'Unknown',
region: 'nyc1', region: options.region || 'nyc1',
description: 'balenaOS custom image', description: 'balenaOS custom image',
tags: [ tags: [
'balenaOS' 'balenaOS'
] ]
}) })
}) })
console.log('Image sent.') console.log('Image uploaded.')
const visuals = getVisuals();
const spinner = new visuals.Spinner(
`Waiting for image to be ready`,
);
responseBody = await res.json() responseBody = await res.json()
imageID = responseBody.image.id imageID = responseBody.image.id
spinner.start();
do { do {
console.log('Waiting for image to be ready...') // console.log('Waiting for image to be ready...')
await new Promise((r) => setTimeout(() => r(null), 2000)) // Sleep for 2 seconds await new Promise((r) => setTimeout(() => r(null), 2000)) // Sleep for 2 seconds
res = await fetch(`https://api.digitalocean.com/v2/images/${imageID}`, { res = await fetch(`https://api.digitalocean.com/v2/images/${imageID}`, {
headers: { headers: {
@ -186,10 +190,11 @@ export default class InstanceInitCmd extends Command {
}) })
responseBody = await res.json() responseBody = await res.json()
} while (responseBody.image.status !== 'available') } while (responseBody.image.status !== 'available')
console.log('Image available.') // console.log('Image available.')
spinner.stop();
} }
console.log('Getting ssh key info') console.log('Getting DigitalOcean SSH keys...')
res = await fetch('https://api.digitalocean.com/v2/account/keys', { res = await fetch('https://api.digitalocean.com/v2/account/keys', {
headers: { headers: {
authorization: `Bearer ${options.apiKey}` authorization: `Bearer ${options.apiKey}`
@ -203,7 +208,7 @@ export default class InstanceInitCmd extends Command {
for (let i = 0; i < num; i++) { for (let i = 0; i < num; i++) {
dropletNames.push(randomName()) dropletNames.push(randomName())
} }
console.log('Creating droplets', dropletNames.join(', ')) console.log('Creating DigitalOcean droplets:', dropletNames.join(', '))
res = await fetch('https://api.digitalocean.com/v2/droplets', { res = await fetch('https://api.digitalocean.com/v2/droplets', {
method: 'POST', method: 'POST',
body: JSON.stringify({ body: JSON.stringify({
@ -223,7 +228,7 @@ export default class InstanceInitCmd extends Command {
} }
}) })
console.log('Done! the device should show soon!') console.log('Done! The device should appear in your Dashboard in a few minutes!')
} }
} }