mirror of
https://github.com/larksuite/cli.git
synced 2026-09-14 18:42:53 +08:00
1a9f637866
* fix(apps): make db --environment optional, auto-select branch server-side All db shortcuts defaulted --environment to "dev", which forced single-env apps (whose DB lives on the online branch, with no dev branch) to fail with "Invalid DB Branch: dev" unless the user explicitly passed --environment online. Change the default to empty: when --environment is omitted the CLI sends no env, letting the server pick the branch by the app's multi-env state (multi-env → dev, single-env → online), matching miaoda-cli's behavior of not carrying dbBranch when unset. Explicit --environment dev|online is unchanged; explicit dev on a single-env app still errors as expected. - 10 db shortcuts: dbEnvFlags default "dev" → "" (+db-execute, +db-table-list, +db-table-get, +db-quota-get, +db-data-export, +db-data-import, +db-changelog-list, +db-audit-list/-set/-status) - dry-run e2e assertions updated: default env is now unset, not "dev" - skill docs (lark-apps-db, lark-apps-db-execute) describe the auto-select * fix(apps): omit empty --environment param; refine dry-run tests and skill doc Address PR #1735 review: - omit-empty: when --environment is unset, drop the env query key entirely instead of sending env="" — matches the family's omit-empty convention (cf. page_token) and miaoda-cli's "no dbBranch when unset". Add dbEnvParams helper; apply across all db shortcuts (execute, table-list/-get, quota-get, changelog-list, audit-list/-set/-status, data-export/-import) plus the export/import query params, queryExportTotal and audit-list table/status probes. - e2e dry-run assertions pin env is omitted via .Exists() (was Equal ""). - skill doc (lark-apps-db): rewrite the --environment guidance from an agent's decision POV — read vs write, single-env writes hit online prod, explicit dev on single-env as a probe; drop redundant/changelog phrasing. * fix(apps): db recovery --environment support + diff/migrate display fixes - +db-recovery-diff/-apply: add --environment (env → query param on submit and both status polls), aligned with the recovery env IDL - recovery diff: parse string row counts (inserted/deleted arrive as strings) so they render as "-N rows" instead of "no changes"; drop the redundant per-table data-row line when a schema action (drop/restore/alter) exists for the same table; count tables_affected by distinct tables - +db-env-migrate: run a dry_run preview before apply to backfill the change count when the server reports changes_applied=0 on a cold apply (matches miaoda-cli's diff-then-apply) - lark-apps-db.md: drop the redundant recovery clause (recovery follows the standard --environment rule) * test(apps): cover no-env dry-run defaults + numericAsFloat string path Address CodeRabbit review threads on PR #1735: - numericAsFloat: add numeric-string cases ("13.5", " 13.5 ", int, empty) - db-data-import: assert dry-run omits env when --environment unset (table still defaults to file basename) - db-quota-get: assert dry-run omits env when --environment unset
102 lines
3.6 KiB
Go
102 lines
3.6 KiB
Go
// Copyright (c) 2026 Lark Technologies Pte. Ltd.
|
||
// SPDX-License-Identifier: MIT
|
||
|
||
package apps
|
||
|
||
import (
|
||
"context"
|
||
"fmt"
|
||
"io"
|
||
|
||
"github.com/larksuite/cli/shortcuts/common"
|
||
)
|
||
|
||
// AppsDBQuotaGet reports an app's database storage usage and object counts.
|
||
//
|
||
// GET /apps/{app_id}/db/quota。storage_quota_bytes / usage_percent 在配额未对接(=0)时
|
||
// 不输出(与 +file-quota-get 一致);tables / views 始终输出。
|
||
var AppsDBQuotaGet = common.Shortcut{
|
||
Service: appsService,
|
||
Command: "+db-quota-get",
|
||
Description: "Get an app's database storage usage",
|
||
Risk: "read",
|
||
Tips: []string{
|
||
"Example: lark-cli apps +db-quota-get --app-id <app_id>",
|
||
"Example: lark-cli apps +db-quota-get --app-id <app_id> --environment dev",
|
||
},
|
||
Scopes: []string{"spark:app:read"},
|
||
AuthTypes: []string{"user"},
|
||
HasFormat: true,
|
||
Flags: append([]common.Flag{
|
||
{Name: "app-id", Desc: "Miaoda app id", Required: true},
|
||
}, dbEnvFlags("", []string{"dev", "online"}, "target db environment; leave unset to auto-select (multi-env app uses dev, single-env uses online), or pass dev/online")...),
|
||
Validate: func(ctx context.Context, rctx *common.RuntimeContext) error {
|
||
if _, err := requireAppID(rctx.Str("app-id")); err != nil {
|
||
return err
|
||
}
|
||
return rejectLegacyEnvFlag(rctx)
|
||
},
|
||
DryRun: func(ctx context.Context, rctx *common.RuntimeContext) *common.DryRunAPI {
|
||
appID, _ := requireAppID(rctx.Str("app-id"))
|
||
return common.NewDryRunAPI().
|
||
GET(appDbQuotaPath(appID)).
|
||
Desc("Get Miaoda app database storage usage").
|
||
Params(dbEnvParams(rctx, map[string]interface{}{}))
|
||
},
|
||
Execute: func(ctx context.Context, rctx *common.RuntimeContext) error {
|
||
appID, err := requireAppID(rctx.Str("app-id"))
|
||
if err != nil {
|
||
return err
|
||
}
|
||
data, err := rctx.CallAPITyped("GET", appDbQuotaPath(appID), dbEnvParams(rctx, map[string]interface{}{}), nil)
|
||
if err != nil {
|
||
return withAppsHint(err, appIDListHint)
|
||
}
|
||
out := projectDbQuota(data)
|
||
rctx.OutFormat(out, nil, func(w io.Writer) {
|
||
renderDbQuotaPretty(w, out)
|
||
})
|
||
return nil
|
||
},
|
||
}
|
||
|
||
// projectDbQuota 白名单投影 db quota 字段:只保留 storage_used_bytes / tables / views,
|
||
// 配额已对接时再加 storage_quota_bytes / usage_percent。不透传后端其它字段,避免无用字段消耗上下文。
|
||
func projectDbQuota(data map[string]interface{}) map[string]interface{} {
|
||
out := map[string]interface{}{"storage_used_bytes": data["storage_used_bytes"]}
|
||
for _, k := range []string{"tables", "views"} {
|
||
if v, ok := data[k]; ok {
|
||
out[k] = v
|
||
}
|
||
}
|
||
// 配额未对接(storage_quota_bytes=0/缺失)时不输出 quota / usage_percent。
|
||
if q, ok := numericAsFloat(data["storage_quota_bytes"]); ok && q > 0 {
|
||
out["storage_quota_bytes"] = data["storage_quota_bytes"]
|
||
if v, ok := data["usage_percent"]; ok {
|
||
out["usage_percent"] = v
|
||
}
|
||
}
|
||
return out
|
||
}
|
||
|
||
// renderDbQuotaPretty 打 Storage(已用 / 配额 (百分比))与 Tables / Views 行(标签对齐 miaoda-cli)。
|
||
func renderDbQuotaPretty(w io.Writer, data map[string]interface{}) {
|
||
used := humanBytes(data["storage_used_bytes"])
|
||
usage := used
|
||
if q, ok := numericAsFloat(data["storage_quota_bytes"]); ok && q > 0 {
|
||
pct := ""
|
||
if p, ok := numericAsFloat(data["usage_percent"]); ok {
|
||
pct = fmt.Sprintf(" (%.1f%%)", p)
|
||
}
|
||
usage = fmt.Sprintf("%s / %s%s", used, humanBytes(data["storage_quota_bytes"]), pct)
|
||
}
|
||
pairs := [][2]string{{"Storage", usage}}
|
||
if f, ok := numericAsFloat(data["tables"]); ok {
|
||
pairs = append(pairs, [2]string{"Tables", fmt.Sprintf("%d", int64(f))})
|
||
}
|
||
if f, ok := numericAsFloat(data["views"]); ok {
|
||
pairs = append(pairs, [2]string{"Views", fmt.Sprintf("%d", int64(f))})
|
||
}
|
||
renderKeyValuePairs(w, pairs)
|
||
}
|