Skip to content

Commit 0bd2cfc

Browse files
committed
feat: use LINGO_API_KEY as primary env var, deprecate LINGODOTDEV_API_KEY
1 parent 844b36d commit 0bd2cfc

6 files changed

Lines changed: 49 additions & 10 deletions

File tree

packages/cli/src/cli/cmd/ci/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ export default new Command()
7474

7575
if (!settings.auth.apiKey) {
7676
console.error(
77-
"No API key provided. Set LINGODOTDEV_API_KEY environment variable or use --api-key flag.",
77+
"No API key provided. Set LINGO_API_KEY environment variable or use --api-key flag.",
7878
);
7979
return;
8080
}

packages/cli/src/cli/cmd/ci/platforms/_base.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ export abstract class PlatformKit<
4747

4848
get config() {
4949
const env = Z.object({
50+
LINGO_API_KEY: Z.string().optional(),
5051
LINGODOTDEV_API_KEY: Z.string().optional(),
5152
LINGODOTDEV_PULL_REQUEST: Z.preprocess(
5253
(val) => val === "true" || val === true,
@@ -68,7 +69,7 @@ export abstract class PlatformKit<
6869
}).parse(process.env);
6970

7071
return {
71-
replexicaApiKey: env.LINGODOTDEV_API_KEY || "",
72+
replexicaApiKey: env.LINGO_API_KEY || env.LINGODOTDEV_API_KEY || "",
7273
isPullRequestMode: env.LINGODOTDEV_PULL_REQUEST,
7374
commitMessage: env.LINGODOTDEV_COMMIT_MESSAGE || defaultMessage,
7475
pullRequestTitle: env.LINGODOTDEV_PULL_REQUEST_TITLE || defaultMessage,

packages/cli/src/cli/cmd/login.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ Press Enter to open the browser for authentication.
4949
5050
---
5151
52-
Having issues? Put LINGODOTDEV_API_KEY in your .env file instead.
52+
Having issues? Put LINGO_API_KEY in your .env file instead.
5353
`.trim() + "\n",
5454
);
5555

packages/cli/src/cli/localizer/lingodotdev.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ export default function createLingoDotDevLocalizer(
2121
To fix this issue:
2222
1. Run ${chalk.dim("lingo.dev login")} to authenticate, or
2323
2. Use the ${chalk.dim("--api-key")} flag to provide an API key.
24-
3. Set ${chalk.dim("LINGODOTDEV_API_KEY")} environment variable.
24+
3. Set ${chalk.dim("LINGO_API_KEY")} environment variable.
2525
`,
2626
);
2727
}

packages/cli/src/cli/utils/init-ci-cd.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ jobs:
105105
- uses: actions/checkout@v4
106106
- uses: lingodotdev/lingo.dev@main
107107
with:
108-
api-key: \${{ secrets.LINGODOTDEV_API_KEY }}
108+
api-key: \${{ secrets.LINGO_API_KEY }}
109109
`,
110110
},
111111
spinner,

packages/cli/src/cli/utils/settings.ts

Lines changed: 43 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,10 @@ export function getSettings(explicitApiKey: string | undefined): CliSettings {
2323
env.LINGO_API_KEY ||
2424
env.LINGODOTDEV_API_KEY ||
2525
systemFile.auth?.apiKey ||
26+
systemFile.auth?.vnext?.apiKey ||
2627
defaults.auth.apiKey,
2728
apiUrl:
29+
env.LINGO_API_URL ||
2830
env.LINGODOTDEV_API_URL ||
2931
systemFile.auth?.apiUrl ||
3032
defaults.auth.apiUrl,
@@ -98,10 +100,11 @@ function _loadDefaults(): CliSettings {
98100

99101
function _loadEnv() {
100102
return Z.looseObject({
103+
LINGO_API_KEY: Z.string().optional(),
104+
LINGO_API_URL: Z.string().optional(),
101105
LINGODOTDEV_API_KEY: Z.string().optional(),
102106
LINGODOTDEV_API_URL: Z.string().optional(),
103107
LINGODOTDEV_WEB_URL: Z.string().optional(),
104-
LINGO_API_KEY: Z.string().optional(),
105108
OPENAI_API_KEY: Z.string().optional(),
106109
ANTHROPIC_API_KEY: Z.string().optional(),
107110
GROQ_API_KEY: Z.string().optional(),
@@ -123,6 +126,9 @@ function _loadSystemFile() {
123126
apiKey: Z.string().optional(),
124127
apiUrl: Z.string().optional(),
125128
webUrl: Z.string().optional(),
129+
vnext: Z.object({
130+
apiKey: Z.string().optional(),
131+
}).optional(),
126132
}).optional(),
127133
llm: Z.looseObject({
128134
openaiApiKey: Z.string().optional(),
@@ -151,14 +157,40 @@ function _getSettingsFilePath(): string {
151157
function _legacyEnvVarWarning() {
152158
const env = _loadEnv();
153159

154-
if (env.REPLEXICA_API_KEY && !env.LINGODOTDEV_API_KEY) {
160+
if (env.REPLEXICA_API_KEY && !env.LINGO_API_KEY && !env.LINGODOTDEV_API_KEY) {
155161
console.warn(
156162
"\x1b[33m%s\x1b[0m",
157163
`
158164
⚠️ WARNING: REPLEXICA_API_KEY env var is deprecated ⚠️
159165
===========================================================
160166
161-
Please use LINGODOTDEV_API_KEY instead.
167+
Please use LINGO_API_KEY instead.
168+
===========================================================
169+
`,
170+
);
171+
}
172+
173+
if (env.LINGODOTDEV_API_KEY && !env.LINGO_API_KEY) {
174+
console.warn(
175+
"\x1b[33m%s\x1b[0m",
176+
`
177+
⚠️ WARNING: LINGODOTDEV_API_KEY env var is deprecated ⚠️
178+
===========================================================
179+
180+
Please use LINGO_API_KEY instead.
181+
===========================================================
182+
`,
183+
);
184+
}
185+
186+
if (env.LINGODOTDEV_API_URL && !env.LINGO_API_URL) {
187+
console.warn(
188+
"\x1b[33m%s\x1b[0m",
189+
`
190+
⚠️ WARNING: LINGODOTDEV_API_URL env var is deprecated ⚠️
191+
===========================================================
192+
193+
Please use LINGO_API_URL instead.
162194
===========================================================
163195
`,
164196
);
@@ -211,10 +243,10 @@ function _envVarsInfo() {
211243
`ℹ️ Using MISTRAL_API_KEY env var instead of key from user config`,
212244
);
213245
}
214-
if (env.LINGODOTDEV_API_URL) {
246+
if (env.LINGO_API_URL || env.LINGODOTDEV_API_URL) {
215247
console.info(
216248
"\x1b[36m%s\x1b[0m",
217-
`ℹ️ Using LINGODOTDEV_API_URL: ${env.LINGODOTDEV_API_URL}`,
249+
`ℹ️ Using custom API URL: ${env.LINGO_API_URL || env.LINGODOTDEV_API_URL}`,
218250
);
219251
}
220252
if (env.LINGODOTDEV_WEB_URL) {
@@ -223,4 +255,10 @@ function _envVarsInfo() {
223255
`ℹ️ Using LINGODOTDEV_WEB_URL: ${env.LINGODOTDEV_WEB_URL}`,
224256
);
225257
}
258+
if (env.LINGO_API_KEY && systemFile.auth?.vnext?.apiKey) {
259+
console.info(
260+
"\x1b[36m%s\x1b[0m",
261+
`ℹ️ Using LINGO_API_KEY env var instead of key from user config`,
262+
);
263+
}
226264
}

0 commit comments

Comments
 (0)