-
Notifications
You must be signed in to change notification settings - Fork 16
Added proxy support #2252
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.
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
Merged
Merged
Added proxy support #2252
Changes from 8 commits
Commits
Show all changes
21 commits
Select commit
Hold shift + click to select a range
aa8e55d
Added proxy support
sunil-lakshman 4fa8521
Fixed PR comments
sunil-lakshman 4abb2b7
Fixed PR comments
sunil-lakshman 01beab5
Fixed PR comments
sunil-lakshman 19755ef
Merge branch 'development' into enh/proxy-setup
sunil-lakshman 8d3ef95
Proxy support added
sunil-lakshman b8d6335
Merge branch 'development' into enh/proxy-setup
sunil-lakshman 297eca4
updated license year
sunil-lakshman e912170
Fixed merge conflits
sunil-lakshman f67e678
Merge branch 'development' into enh/proxy-setup
sunil-lakshman 28727c0
Merge branch 'development' into enh/proxy-setup
netrajpatel 26f49a2
Fixed PR comments
sunil-lakshman bf0540e
Fixed PR comments
sunil-lakshman a626f76
Fixed merge conflits
sunil-lakshman d787942
Fixed PR comments
sunil-lakshman 345ec3f
Fixed PR comments
sunil-lakshman 8e83722
Fixed merge conflits
sunil-lakshman 225f41a
Updated tar package version
sunil-lakshman 9bca9e8
Host issue reolved
sunil-lakshman a67264d
Fixed merge conflits
sunil-lakshman a048374
Fixed merge conflits
sunil-lakshman File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
94 changes: 94 additions & 0 deletions
94
packages/contentstack-config/src/commands/config/get/proxy.ts
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,94 @@ | ||
| import { Command } from '@contentstack/cli-command'; | ||
|
sunil-lakshman marked this conversation as resolved.
Outdated
|
||
| import { cliux, configHandler, TableHeader } from '@contentstack/cli-utilities'; | ||
|
|
||
| export default class ProxyGetCommand extends Command { | ||
| static description = 'Get proxy configuration for CLI'; | ||
|
|
||
| static examples = ['csdx config:get:proxy']; | ||
|
|
||
| async run() { | ||
| try { | ||
| // Check all sources | ||
| const globalProxyConfig = configHandler.get('proxy'); | ||
| const envHttpsProxy = process.env.HTTPS_PROXY; | ||
| const envHttpProxy = process.env.HTTP_PROXY; | ||
|
sunil-lakshman marked this conversation as resolved.
Outdated
|
||
|
|
||
| // Determine which source is being used (priority order: Environment variables > Global config) | ||
| let activeSource = 'None'; | ||
| let proxyConfig: any = null; | ||
|
|
||
| if (envHttpsProxy || envHttpProxy) { | ||
| activeSource = 'Environment variables'; | ||
| const proxyUrl = envHttpsProxy || envHttpProxy; | ||
| try { | ||
| const url = new URL(proxyUrl); | ||
| proxyConfig = { | ||
| host: url.hostname, | ||
| port: url.port || (url.protocol === 'https:' ? '443' : '80'), | ||
| protocol: url.protocol.replace(':', ''), | ||
| username: url.username || undefined, | ||
| password: url.password ? '***' : undefined, | ||
| }; | ||
| } catch { | ||
| // Invalid URL, skip | ||
| } | ||
| } else if (globalProxyConfig) { | ||
| activeSource = 'Global config'; | ||
| proxyConfig = { | ||
| host: globalProxyConfig.host, | ||
| port: globalProxyConfig.port, | ||
| protocol: globalProxyConfig.protocol, | ||
| username: globalProxyConfig.auth?.username || undefined, | ||
| password: globalProxyConfig.auth?.password ? '***' : undefined, | ||
| }; | ||
| } | ||
|
|
||
| if (proxyConfig) { | ||
| const proxyConfigList = [ | ||
| { | ||
| Setting: 'Source', | ||
| Value: activeSource, | ||
| }, | ||
| { | ||
| Setting: 'Host', | ||
| Value: proxyConfig.host || 'Not set', | ||
| }, | ||
| { | ||
| Setting: 'Port', | ||
| Value: proxyConfig.port ? String(proxyConfig.port) : 'Not set', | ||
| }, | ||
| { | ||
| Setting: 'Protocol', | ||
| Value: proxyConfig.protocol || 'Not set', | ||
| }, | ||
| { | ||
| Setting: 'Username', | ||
| Value: proxyConfig.username ? (proxyConfig.username === '***' ? '***' : proxyConfig.username) : 'Not set', | ||
| }, | ||
| { | ||
| Setting: 'Password', | ||
| Value: proxyConfig.password ? '***' : 'Not set', | ||
| }, | ||
| ]; | ||
|
|
||
| const headers: TableHeader[] = [{ value: 'Setting' }, { value: 'Value' }]; | ||
|
|
||
| cliux.table(headers, proxyConfigList); | ||
| cliux.print('\nNote: Proxy configuration priority: Environment variables > Global config', { | ||
| color: 'dim', | ||
| }); | ||
| } else { | ||
| cliux.print('No proxy configuration found.', { color: 'yellow' }); | ||
| cliux.print('\nProxy can be configured via:'); | ||
| cliux.print(' 1. Global config: csdx config:set:proxy --host <host> --port <port>'); | ||
| cliux.print(' 2. Environment variables: HTTPS_PROXY or HTTP_PROXY'); | ||
| cliux.print(' - macOS/Linux: Set in ~/.zshrc, ~/.bashrc, or ~/.profile'); | ||
| cliux.print(' - Windows: Set via System Properties or PowerShell: $env:HTTPS_PROXY="..."'); | ||
| } | ||
| } catch (error) { | ||
| cliux.error('Error retrieving proxy configuration', error); | ||
| } | ||
| } | ||
| } | ||
|
|
||
|
|
||
27 changes: 27 additions & 0 deletions
27
packages/contentstack-config/src/commands/config/remove/proxy.ts
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| import { Command } from '@contentstack/cli-command'; | ||
|
sunil-lakshman marked this conversation as resolved.
Outdated
|
||
| import { cliux, configHandler } from '@contentstack/cli-utilities'; | ||
|
|
||
| export default class ProxyRemoveCommand extends Command { | ||
| static description = 'Remove proxy configuration from global config'; | ||
|
|
||
| static examples = ['csdx config:remove:proxy']; | ||
|
|
||
| async run() { | ||
| try { | ||
| const currentProxy = configHandler.get('proxy'); | ||
| if (!currentProxy) { | ||
| cliux.print('No proxy configuration found in global config.', { color: 'yellow' }); | ||
| return; | ||
| } | ||
|
|
||
| configHandler.delete('proxy'); | ||
| cliux.success('Proxy configuration removed from global config successfully.'); | ||
| cliux.print('\nNote: This only removes the global config. Proxy settings from environment variables (HTTPS_PROXY, HTTP_PROXY) will still be used if present.', { | ||
| color: 'dim', | ||
| }); | ||
| } catch (error) { | ||
| cliux.error('Failed to remove proxy configuration', error); | ||
| } | ||
| } | ||
| } | ||
|
|
||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.