Skip to content

fix(varlock): do not prependHttps when a protocol is already set #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
WalksWithASwagger wants to merge 1 commit into from
Closed

fix(varlock): do not prependHttps when a protocol is already set #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .bumpy/fix-url-prepend-https.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
varlock: patch
---

Do not prependHttps when a URL already has a protocol
6 changes: 5 additions & 1 deletion packages/varlock/src/env-graph/lib/data-types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -393,7 +393,11 @@ const UrlDataType = createEnvGraphDataType(
generatePlaceholder: (seed) => `https://${seed}.invalid/`,
coerce(rawVal) {
const val = coerceToString(rawVal);
if (settings?.prependHttps && !val.startsWith('https://')) return `https://${val}`;
// Only prepend when no URI scheme is present (docs: "if no protocol is specified").
// Checking only https:// used to turn http://example.com into https://http://example.com.
if (settings?.prependHttps && !/^[a-zA-Z][a-zA-Z\d+.-]*:\/\//.test(val)) {
return `https://${val}`;
}
return val;
},
validate(val) {
Expand Down
9 changes: 9 additions & 0 deletions packages/varlock/src/env-graph/test/data-types.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,15 @@ describe('url data type', () => {
expect(g.configSchema.MY_URL.isValid).toBe(true);
expect(g.configSchema.MY_URL.resolvedValue).toBe('https://example.com');
});

it('does not prepend when another protocol is already present', async () => {
const g = await loadAndResolve(outdent`
# @type=url(prependHttps=true)
MY_URL=http://example.com
`);
expect(g.configSchema.MY_URL.isValid).toBe(true);
expect(g.configSchema.MY_URL.resolvedValue).toBe('http://example.com');
});
});

describe('noTrailingSlash', () => {
Expand Down
Loading