mirror of
https://github.com/larksuite/cli.git
synced 2026-08-03 08:32:46 +08:00
7e34eccf3a
One conflict, in internal/envvars/read_test.go, and it stands for a real
disagreement rather than two edits to the same line.
This branch unexported CliAgentName into a package-private agentNameEnv while
trimming the envvars surface (8ba24311): at that point read.go and its test were
the constant's only readers. main then landed #2097, whose
internal/cmdutil/secheader_test.go sets the variable through envvars.CliAgentName
— a cross-package reader again, so the constant earns its export back. Keeping it
private would have meant spelling "LARKSUITE_CLI_AGENT_NAME" a second time in
cmdutil, which is what the constant exists to prevent.
So: CliAgentName is restored in envvars.go, read.go reads it instead of the private
duplicate, and read_test.go is taken from main — that keeps #2097's de-branding of
the fixtures ("sample-agent" in place of the two agent names the test used to
hardcode), which this branch had no stake in.
Verified on the merge result: go build ./..., go vet ./... and go test -count=1
over ./internal/... ./shortcuts/... ./events/... ./cmd/... ./extension/... are
clean, as are the layering ratchet and ci-workflow script suites.