@cloudbase/cli 2.0.12 → 2.1.0

package/src/run/service/update.ts

@@ -1,82 +0,0 @@
-import { CloudBaseError, logger } from '@cloudbase/toolbox'
-import inquirer from 'inquirer'
-import { describeCloudRunServerDetail } from '..'
-import { ITcbrServiceOptions } from '../../types'
-import { callTcbrApi } from '../../utils'
-import { tcbrServiceOptions } from './common'
-import { getBuildStatus, getLogs } from './showLogs'
-
-export async function updateCloudRunServer(serviceConfigOptions) {
-    try {
-        const res = await callTcbrApi('UpdateCloudRunServer', serviceConfigOptions)
-        return res
-    } catch (error) {
-        console.log(error)
-    }
-}
-
-export async function updateTcbrService(options: ITcbrServiceOptions) {
-    const { data: serviceDetail } = await describeCloudRunServerDetail({
-        envId: options.envId,
-        serviceName: options.serviceName
-    })
-    if(serviceDetail === undefined) {
-        // 服务不存在
-        throw new CloudBaseError('当前服务不存在，请使用 tcb run service:create 创建服务')
-    }
-    // 查询是否存在发布单
-    /* const { IsExist: isExist } = await describeWxCloudBaseRunReleaseOrder({ 
-                                            envId: options.envId, 
-                                            serviceName: options.serviceName
-                                        })
-    if(isExist) {
-        throw new CloudBaseError('服务正在更新部署，请稍后再试，或查看实时部署日志')
-    } */
-    const status = await getBuildStatus(options.envId, options.serviceName)
-    if(status === 'pending') {
-        throw new CloudBaseError('服务正在更新部署，请稍后再试，或查看实时部署日志')
-    }
-
-    // 获取上次的服务配置信息
-    const previousServerConfig = serviceDetail?.ServerConfig
-
-    const newServiceOptions = await tcbrServiceOptions(options, true, true, previousServerConfig)
-
-    // 二次确认
-    if(!options.noConfirm) {
-        const { confirm } = await inquirer.prompt([
-            {
-                type: 'confirm',
-                name: 'confirm',
-                message: '确定要更新服务吗？',
-            }
-        ])
-        if(!confirm) {
-            return
-        }
-    }
-
-    const updateRes: any = await updateCloudRunServer(newServiceOptions)
-
-    if(updateRes instanceof Error) {
-        // 当前有发布任务在运行中
-        throw new CloudBaseError('当前已有部署发布任务运行中，请稍后再试，或查看实时部署日志')
-    }
-
-    const taskId = updateRes.data?.TaskId
-
-    if(options.json) {
-        console.log(JSON.stringify(updateRes, null, 2))
-    }
-
-    if(process.argv.includes('--verbose')) {
-        await getLogs({
-            envId: options.envId,
-            taskId,
-            serviceName: options.serviceName
-        })
-        console.log(`本次任务的 TaskID： ${taskId}`)
-    } else {
-        logger.success('更新服务成功, 本次任务的 TaskID: ' + taskId)
-    }
-}

package/src/run/standalonegateway/create.ts

@@ -1,24 +0,0 @@
-import { ICreateStandaloneGateway } from '../../types'
-import { CloudBaseError } from '../../error'
-import { CloudApiService } from '../../utils'
-
-const tcbService = CloudApiService.getInstance('tcb')
-
-export const createStandaloneGateway = async (options: ICreateStandaloneGateway) => {
-    const res = await tcbService.request('CreateStandaloneGateway', {
-        EnvId: options.envId,
-        GatewayAlias: options.gatewayAlias,
-        GatewayDesc: options.gatewayDesc,
-        VpcId: options.vpcId,
-        SubnetIds: options.subnetIds,
-        PackageVersion: options.packageVersion
-    })
-    const { GatewayName } = res
-    if (GatewayName === undefined) {
-        const {
-            Error: { Message }
-        } = res
-        throw new CloudBaseError(Message)
-    }
-    return GatewayName
-}

package/src/run/standalonegateway/destroy.ts

@@ -1,19 +0,0 @@
-import { IDestroyStandaloneGateway } from '../../types'
-import { CloudBaseError } from '../../error'
-import { CloudApiService } from '../../utils'
-
-const tcbService = CloudApiService.getInstance('tcb')
-
-export const destroyStandalonegateway = async (options: IDestroyStandaloneGateway) => {
-    const res = await tcbService.request('DestroyStandaloneGateway', {
-        EnvId: options.envId,
-        IsForce: true,
-        GatewayName: options.gatewayName
-    })
-
-    const { Error: Message } = res
-    if (Message !== undefined) {
-        throw new CloudBaseError(JSON.stringify(Message))
-    }
-    return res
-}

package/src/run/standalonegateway/index.ts

@@ -1,5 +0,0 @@
-export * from './list'
-export * from './create'
-export * from './destroy'
-export * from './package'
-export * from './turn'

package/src/run/standalonegateway/list.ts

@@ -1,74 +0,0 @@
-import { IListStandaloneGateway } from '../../types'
-import { CloudBaseError } from '../../error'
-import { CloudApiService } from '../../utils'
-
-const tcbService = CloudApiService.getInstance('tcb')
-
-export const listStandalonegateway = async (options: IListStandaloneGateway) => {
-    const res = await tcbService.request('DescribeStandaloneGateway', {
-        EnvId: options.envId,
-        GatewayName: options.gatewayName,
-        GatewayAlias: options.gatewayAlias
-    })
-    // const res = {
-    //     StandaloneGatewayList: [
-    //         {
-    //             CPU: 2,
-    //             GateWayStatus: 'Success',
-    //             GatewayAlias: 'StandaloneGateway',
-    //             GatewayDesc: 'gateway',
-    //             GatewayName: 'x-tcb-cbr-gateway-4e9w8r711205c5',
-    //             InternalClbIp: '10.0.0.30',
-    //             Mem: 4,
-    //             PackageVersion: 'starter',
-    //             PublicClbIp: '1.15.159.47',
-    //             ServiceInfo: [
-    //                 {
-    //                     ServiceName: 'coylexie',
-    //                     Status: 'off'
-    //                 },
-    //                 {
-    //                     ServiceName: 'test',
-    //                     Status: 'on'
-    //                 }
-    //             ],
-    //             SubnetIds: ['subnet-g6ey7mid'],
-    //             VpcId: 'vpc-n73jhksu'
-    //         }
-    //     ],
-    //     Total: 1,
-    //     Error: {
-    //         Message: 'No Error'
-    //     }
-    // }
-    const { StandaloneGatewayList } = res
-    if (StandaloneGatewayList !== undefined) {
-        return StandaloneGatewayList.map((item) => [
-            item['GatewayName'],
-            item['GateWayStatus'],
-            item['GatewayAlias'],
-            item['PackageVersion'],
-            // item['Mem'],
-            // item['CPU'],
-            beautifySubnetList(item['SubnetIds']),
-            item['PublicClbIp'],
-            item['InternalClbIp'],
-            beautifyServiceList(item['ServiceInfo'])
-            // item['GatewayDesc'],
-        ])
-    } else {
-        const {
-            Error: { Message }
-        } = res
-        throw new CloudBaseError(Message)
-    }
-}
-
-const beautifySubnetList = (list: Array<string>) => list.join('\n')
-
-const beautifyServiceList = (list: Array<Record<string, string>>) =>
-    list
-        .map(
-            (item) => '服务 ' + item['ServiceName'] + (item['Status'] === 'on' ? ' 开启' : ' 未开启')
-        )
-        .join('\n')

package/src/run/standalonegateway/package/index.ts

@@ -1 +0,0 @@
-export * from './list'

package/src/run/standalonegateway/package/list.ts

@@ -1,24 +0,0 @@
-import { IListPackageStandaloneGateway } from '../../../types'
-import { CloudBaseError } from '../../../error'
-import { CloudApiService } from '../../../utils'
-
-const tcbService = CloudApiService.getInstance('tcb')
-
-export const listPackageStandalonegateway = async (options: IListPackageStandaloneGateway) => {
-    const res = await tcbService.request('DescribeStandaloneGatewayPackage', {
-        EnvId: options.envId,
-        PackageVersion: options.packageVersion
-    })
-    const { StandaloneGatewayPackageList } = res
-    if (StandaloneGatewayPackageList === undefined) {
-        const {
-            Error: { Message }
-        } = res
-        throw new CloudBaseError(Message)
-    }
-    return StandaloneGatewayPackageList.map((item) => [
-        item['CPU'],
-        item['Mem'],
-        item['PackageVersion']
-    ])
-}

package/src/run/standalonegateway/turn/index.ts

@@ -1,2 +0,0 @@
-export * from './on'
-export * from './off'

package/src/run/standalonegateway/turn/off.ts

@@ -1,19 +0,0 @@
-import { ITurnOffStandaloneGateway } from '../../../types'
-import { CloudBaseError } from '../../../error'
-import { CloudApiService } from '../../../utils'
-
-const tcbService = CloudApiService.getInstance('tcb')
-
-export const turnOffStandalonegateway = async (options: ITurnOffStandaloneGateway) => {
-    const res = await tcbService.request('TurnOffStandaloneGateway', {
-        EnvId: options.envId,
-        GatewayName: options.gatewayName,
-        ServiceNameList: options.serviceList
-    })
-
-    const { Error: Message } = res
-    if (Message !== undefined) {
-        throw new CloudBaseError(JSON.stringify(Message))
-    }
-    return res
-}

package/src/run/standalonegateway/turn/on.ts

@@ -1,19 +0,0 @@
-import { ITurnOnStandaloneGateway } from '../../../types'
-import { CloudBaseError } from '../../../error'
-import { CloudApiService } from '../../../utils'
-
-const tcbService = CloudApiService.getInstance('tcb')
-
-export const turnOnStandalonegateway = async (options: ITurnOnStandaloneGateway) => {
-    const res = await tcbService.request('TurnOnStandaloneGateway', {
-        EnvId: options.envId,
-        GatewayName: options.gatewayName,
-        ServiceNameList: options.serviceList
-    })
-    
-    const { Error: Message } = res
-    if (Message !== undefined) {
-        throw new CloudBaseError(JSON.stringify(Message))
-    }
-    return res
-}

package/src/run/version/create.ts

@@ -1,68 +0,0 @@
-import { CloudApiService } from '../../utils'
-import { ICreateVersion, ILogCreateVersion } from '../../types'
-
-const tcbService = CloudApiService.getInstance('tcb')
-
-export const createVersion = async (options: ICreateVersion) => {
-    const { Result, RunId } = await tcbService.request('CreateCloudBaseRunServerVersion', {
-        EnvId: options.envId,
-        ServerName: options.serverName,
-        ContainerPort: options.containerPort,
-        UploadType: options.uploadType,
-        FlowRatio: options.flowRatio,
-        VersionRemark: options.versionRemark,
-
-        EnableUnion: options.enableUnion,
-        Cpu: options.cpu,
-        Mem: options.mem,
-        MinNum: options.minNum,
-        MaxNum: options.maxNum,
-        PolicyType: options.policyType,
-        PolicyThreshold: options.policyThreshold,
-
-        ...(options.uploadType !== 'image' ? { DockerfilePath: options.dockerfilePath } : {}),
-        CustomLogs: options.customLogs,
-        EnvParams: options.envParams,
-        InitialDelaySeconds: options.initialDelaySeconds,
-
-        ...(options.uploadType === 'package'
-            ? {
-                  PackageName: options.packageName,
-                  PackageVersion: options.packageVersion,
-                  DockerfilePath: options.dockerfilePath
-              }
-            : options.uploadType === 'image'
-            ? {
-                  ImageInfo: options.imageInfo
-              }
-            : {
-                  RepositoryType: options.repositoryType,
-                  Branch: options.branch,
-                  CodeDetail: options.codeDetail,
-                  DockerfilePath: options.dockerfilePath
-              })
-    })
-
-    return { Result, RunId }
-}
-
-export const logCreate = async (options: ILogCreateVersion) => {
-    let { Logs } = await tcbService.request('DescribeCloudBaseRunProcessLog', {
-        EnvId: options.envId,
-        RunId: options.runId
-    })
-
-    return Logs
-}
-
-export const basicOperate = async (options: ILogCreateVersion) => {
-    let {
-        Percent,
-        ActionDetail: { Status }
-    } = await tcbService.request('DescribeCloudBaseRunOperateBasic', {
-        EnvId: options.envId,
-        RunId: options.runId
-    })
-
-    return { Percent, Status }
-}

package/src/run/version/delete.ts

@@ -1,16 +0,0 @@
-import { CloudApiService } from '../../utils'
-import {
-    IDeleteVersion
-} from '../../types'
-
-const tcbService = CloudApiService.getInstance('tcb')
-
-export const deleteVersion = async (options: IDeleteVersion) => {
-    const { Result } = await tcbService.request('DeleteCloudBaseRunServerVersion', {
-        EnvId: options.envId,
-        ServerName: options.serverName,
-        VersionName: options.versionName
-    })
-
-    return Result
-}

package/src/run/version/index.ts

@@ -1,6 +0,0 @@
-export * from './list'
-export * from './delete'
-export * from './modify'
-export * from './create'
-export * from './repo'
-export * from './update'

package/src/run/version/list.ts

@@ -1,17 +0,0 @@
-import { CloudApiService } from '../../utils'
-import {
-    IListVersionOptions
-} from '../../types'
-
-const tcbService = CloudApiService.getInstance('tcb')
-
-export const listVersion = async (options: IListVersionOptions) => {
-    const { VersionItems } = await tcbService.request('DescribeCloudBaseRunServer', {
-        EnvId: options.envId,
-        Limit: options.limit ? options.limit : 100,
-        Offset: options.offset ? options.offset : 0,
-        ServerName: options.serverName
-    })
-
-    return VersionItems
-}

package/src/run/version/modify.ts

@@ -1,17 +0,0 @@
-import { CloudApiService } from '../../utils'
-import {
-    IModifyVersion
-} from '../../types'
-
-const tcbService = CloudApiService.getInstance('tcb')
-
-export const modifyVersion = async (options: IModifyVersion) => {
-    const { Result } = await tcbService.request('ModifyCloudBaseRunServerFlowConf', {
-        EnvId: options.envId,
-        ServerName: options.serverName,
-        TrafficType: options.trafficType,
-        VersionFlowItems: options.versionFlowItems
-    })
-
-    return Result
-}

package/src/run/version/repo.ts

@@ -1,28 +0,0 @@
-import { CloudApiService } from '../../utils'
-import {
-    IListCodeRepo,
-    IListBranch
-} from '../../types'
-
-const tcbService = CloudApiService.getInstance('tcb')
-
-export const listRepo = async (options: IListCodeRepo) => {
-    const { IsFinished, RepoList, Error } = await tcbService.request('DescribeCloudBaseCodeRepos', {
-        Channel: options.channel,
-        PageNumber: options.pageNumber,
-        PageSize: options.pageSize
-    })
-
-    return { IsFinished, RepoList, Error }
-}
-
-export const listBranch = async (options: IListBranch) => {
-    const { IsFinished, BranchList } = await tcbService.request('DescribeCloudBaseCodeBranch', {
-        Channel: options.channel,
-        PageNumber: options.pageNumber,
-        PageSize: options.pageSize,
-        RepoName: options.repoName
-    })
-
-    return { IsFinished, BranchList }
-}

package/src/run/version/update.ts

@@ -1,59 +0,0 @@
-import { CloudApiService } from '../../utils'
-import {
-    IDescribeRunVersion,
-    IUpdateVersion
-} from '../../types'
-
-const tcbService = CloudApiService.getInstance('tcb')
-
-export const updateVersion = async (options: IUpdateVersion) => {
-    const { Result, RunId } = await tcbService.request('RollUpdateCloudBaseRunServerVersion',
-        {
-            EnvId: options.envId,
-            ServerName: options.serverName,
-            VersionName: options.versionName,
-            ContainerPort: options.containerPort,
-            UploadType: options.uploadType,
-            FlowRatio: options.flowRatio,
-            VersionRemark: options.versionRemark,
-
-            EnableUnion: options.enableUnion,
-            Cpu: String(options.cpu),
-            Mem: String(options.mem),
-            MinNum: String(options.minNum),
-            MaxNum: String(options.maxNum),
-            PolicyType: options.policyType,
-            PolicyThreshold: String(options.policyThreshold),
-
-            ...(options.uploadType !== 'image' ? { DockerfilePath: options.dockerfilePath } : {}),
-            CustomLogs: options.customLogs,
-            EnvParams: options.envParams,
-            InitialDelaySeconds: options.initialDelaySeconds,
-
-            ...(options.uploadType === 'package' ? {
-                PackageName: options.packageName,
-                PackageVersion: options.packageVersion,
-                DockerfilePath: options.dockerfilePath
-            } : options.uploadType === 'image' ? {
-                ImageInfo: options.imageInfo
-            } : {
-                RepositoryType: options.repositoryType,
-                Branch: options.branch,
-                CodeDetail: options.codeDetail,
-                DockerfilePath: options.dockerfilePath
-            })
-        },
-    )
-
-    return { Result, RunId }
-}
-
-export const describeRunVersion = async (options: IDescribeRunVersion) => {
-    const res = await tcbService.request('DescribeCloudBaseRunServerVersion', {
-        EnvId: options.envId,
-        ServerName: options.serverName,
-        VersionName: options.versionName
-    })
-
-    return res
-}

package/src/storage.ts

@@ -1,114 +0,0 @@
-import { getStorageService } from './utils'
-import { CloudBaseError } from './error'
-
-interface IStorageOptions {
-    envId: string
-    localPath: string
-    cloudPath: string
-    parallel?: number
-    retryCount?: number
-    retryInterval?: number
-}
-
-interface IStorageCloudOptions {
-    envId: string
-    cloudPath: string
-    cloudPaths?: string[]
-}
-
-export async function uploadFile(options: IStorageOptions) {
-    const { envId, localPath, cloudPath } = options
-    const storageService = await getStorageService(envId)
-    return storageService.uploadFile({
-        localPath,
-        cloudPath
-    })
-}
-
-export async function uploadDirectory(options: IStorageOptions) {
-    const { envId, localPath, cloudPath, retryInterval, parallel, retryCount } = options
-    const storageService = await getStorageService(envId)
-    return storageService.uploadDirectory({
-        localPath,
-        cloudPath,
-        retryInterval,
-        retryCount,
-        parallel
-    })
-}
-
-export async function downloadFile(options: IStorageOptions) {
-    const { envId, localPath, cloudPath } = options
-    const storageService = await getStorageService(envId)
-    return storageService.downloadFile({
-        cloudPath,
-        localPath
-    })
-}
-
-export async function downloadDirectory(options: IStorageOptions) {
-    const { envId, localPath, cloudPath } = options
-    const storageService = await getStorageService(envId)
-
-    return storageService.downloadDirectory({
-        cloudPath,
-        localPath
-    })
-}
-
-export async function deleteFile(options: IStorageCloudOptions) {
-    const { envId, cloudPath, cloudPaths } = options
-    const storageService = await getStorageService(envId)
-
-    if (cloudPaths?.length) {
-        return storageService.deleteFile(cloudPaths)
-    }
-
-    return storageService.deleteFile([cloudPath])
-}
-
-export async function deleteDirectory(options: IStorageCloudOptions) {
-    const { envId, cloudPath } = options
-    const storageService = await getStorageService(envId)
-
-    return storageService.deleteDirectory(cloudPath)
-}
-
-export async function list(options: IStorageCloudOptions) {
-    const { envId, cloudPath } = options
-    const storageService = await getStorageService(envId)
-
-    return storageService.listDirectoryFiles(cloudPath)
-}
-
-export async function getUrl(options: IStorageCloudOptions) {
-    const { envId, cloudPaths } = options
-    const storageService = await getStorageService(envId)
-
-    return storageService.getTemporaryUrl(cloudPaths)
-}
-
-export async function detail(options: IStorageCloudOptions) {
-    const { envId, cloudPath } = options
-    const storageService = await getStorageService(envId)
-
-    return storageService.getFileInfo(cloudPath)
-}
-
-export async function getAcl(options) {
-    const { envId } = options
-    const storageService = await getStorageService(envId)
-
-    return storageService.getStorageAcl()
-}
-
-export async function setAcl(options) {
-    const { envId, acl } = options
-    const validAcl = ['READONLY', 'PRIVATE', 'ADMINWRITE', 'ADMINONLY']
-    if (!validAcl.includes(acl)) {
-        throw new CloudBaseError('非法的权限值，仅支持：READONLY, PRIVATE, ADMINWRITE, ADMINONLY')
-    }
-    const storageService = await getStorageService(envId)
-
-    return storageService.setStorageAcl(acl)
-}

package/src/third/index.ts

@@ -1,13 +0,0 @@
-import { CloudApiService } from '../utils'
-const tcbService = CloudApiService.getInstance('tcb')
-
-// 解除第三方小程序绑定
-export async function deleteThirdPartAttach(options) {
-    const { ThirdPartAppid, TypeFlag } = options
-    const res: any = await tcbService.request('DeleteThirdPartAttach', {
-        ThirdPartAppid,
-        TypeFlag
-    })
-
-    return res
-}