Uh oh!
There was an error while loading. Please reload this page.
- Notifications
You must be signed in to change notification settings - Fork 17
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
Uh oh!
There was an error while loading. Please reload this page.
Merged
Added proxy support #2252
Changes from all 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
Uh oh!
There was an error while loading. Please reload this page.
Jump to
Jump to file
Failed to load files.
Loading
Uh oh!
There was an error while loading. Please reload this page.
Diff view
Diff view
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
Uh oh!
There was an error while loading. Please reload this page.
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -22,8 +22,8 @@ | ||
| "test:unit:report": "nyc --extension .ts mocha --forbid-only \"test/unit/**/*.test.ts\"" | ||
| }, | ||
| "dependencies": { | ||
| "@contentstack/cli-command": "~1.7.1", | ||
| "@contentstack/cli-utilities": "~1.16.1", | ||
| "@contentstack/cli-command": "~1.7.2", | ||
| "@contentstack/cli-utilities": "~1.17.0", | ||
sunil-lakshman marked this conversation as resolved.
Uh oh!There was an error while loading. Please reload this page. | ||
| "@oclif/core": "^4.3.0", | ||
| "@oclif/plugin-help": "^6.2.28", | ||
| "otplib": "^12.0.1" | ||
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 |
|---|---|---|
| @@ -17,8 +17,8 @@ | ||
| }, | ||
| "dependencies": { | ||
| "@contentstack/cli-cm-seed": "~1.14.1", | ||
| "@contentstack/cli-command": "~1.7.1", | ||
| "@contentstack/cli-utilities": "~1.16.1", | ||
| "@contentstack/cli-command": "~1.7.2", | ||
| "@contentstack/cli-utilities": "~1.17.0", | ||
sunil-lakshman marked this conversation as resolved.
Uh oh!There was an error while loading. Please reload this page. | ||
| "@oclif/core": "^4.3.0", | ||
| "@oclif/plugin-help": "^6.2.28", | ||
| "inquirer": "8.2.7", | ||
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 |
|---|---|---|
| @@ -1,14 +1,14 @@ | ||
| { | ||
| "name": "@contentstack/cli-cm-branches", | ||
| "description": "Contentstack CLI plugin to do branches operations", | ||
| "version": "1.6.2", | ||
| "version": "1.6.3", | ||
| "author": "Contentstack", | ||
| "bugs": "https://github.com/contentstack/cli/issues", | ||
| "dependencies": { | ||
| "@contentstack/cli-command": "~1.7.1", | ||
| "@contentstack/cli-command": "~1.7.2", | ||
| "@oclif/core": "^4.3.0", | ||
| "@oclif/plugin-help": "^6.2.28", | ||
| "@contentstack/cli-utilities": "~1.16.1", | ||
| "@contentstack/cli-utilities": "~1.17.0", | ||
sunil-lakshman marked this conversation as resolved.
Uh oh!There was an error while loading. Please reload this page. | ||
| "chalk": "^4.1.2", | ||
| "just-diff": "^6.0.2", | ||
| "lodash": "^4.17.21" | ||
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -5,9 +5,9 @@ | ||
| "author": "Contentstack", | ||
| "bugs": "https://github.com/contentstack/cli/issues", | ||
| "dependencies": { | ||
| "@contentstack/cli-command": "~1.7.1", | ||
| "@contentstack/cli-command": "~1.7.2", | ||
| "@contentstack/cli-config": "~1.17.0", | ||
| "@contentstack/cli-utilities": "~1.16.1", | ||
| "@contentstack/cli-utilities": "~1.17.0", | ||
sunil-lakshman marked this conversation as resolved.
Uh oh!There was an error while loading. Please reload this page. | ||
| "@oclif/core": "^4.3.0", | ||
| "@oclif/plugin-help": "^6.2.28", | ||
| "chalk": "^4.1.2", | ||
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,7 @@ | ||
| { | ||
| "name": "@contentstack/cli-command", | ||
| "description": "Contentstack CLI plugin for configuration", | ||
| "version": "1.7.1", | ||
| "version": "1.7.2", | ||
| "author": "Contentstack", | ||
| "main": "lib/index.js", | ||
| "types": "lib/index.d.ts", | ||
| @@ -19,7 +19,7 @@ | ||
| "test:unit": "mocha --timeout 10000 --forbid-only \"test/unit/**/*.test.ts\"" | ||
| }, | ||
| "dependencies": { | ||
| "@contentstack/cli-utilities": "~1.16.1", | ||
| "@contentstack/cli-utilities": "~1.17.0", | ||
sunil-lakshman marked this conversation as resolved.
Uh oh!There was an error while loading. Please reload this page. | ||
| "contentstack": "^3.25.3", | ||
| "@oclif/core": "^4.3.0", | ||
| "@oclif/plugin-help": "^6.2.28" | ||
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
57 changes: 57 additions & 0 deletions
57 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,57 @@ | ||
| import { cliux, configHandler, TableHeader, log, handleAndLogError } from '@contentstack/cli-utilities'; | ||
| import { BaseCommand } from '../../../base-command'; | ||
| export default class ProxyGetCommand extends BaseCommand<typeof ProxyGetCommand> { | ||
| static description = 'Get proxy configuration for CLI'; | ||
| static examples = ['csdx config:get:proxy']; | ||
| async run() { | ||
| try { | ||
| log.debug('Starting proxy configuration retrieval', this.contextDetails); | ||
| const globalProxyConfig = configHandler.get('proxy'); | ||
| if (globalProxyConfig) { | ||
| log.debug('Proxy configuration found in global config', this.contextDetails); | ||
| let usernameValue = 'Not set'; | ||
| if (globalProxyConfig.auth?.username) { | ||
| usernameValue = globalProxyConfig.auth.username; | ||
| } | ||
| const proxyConfigList = [ | ||
| { | ||
| Setting: 'Host', | ||
| Value: globalProxyConfig.host || 'Not set', | ||
| }, | ||
| { | ||
| Setting: 'Port', | ||
| Value: globalProxyConfig.port ? String(globalProxyConfig.port) : 'Not set', | ||
| }, | ||
| { | ||
| Setting: 'Protocol', | ||
| Value: globalProxyConfig.protocol || 'Not set', | ||
| }, | ||
| { | ||
| Setting: 'Username', | ||
| Value: usernameValue, | ||
| }, | ||
| { | ||
| Setting: 'Password', | ||
| Value: globalProxyConfig.auth?.password ? '***' : 'Not set', | ||
| }, | ||
| ]; | ||
| const headers: TableHeader[] = [{ value: 'Setting' }, { value: 'Value' }]; | ||
| cliux.table(headers, proxyConfigList); | ||
| log.info('Proxy configuration displayed successfully', this.contextDetails); | ||
| } else { | ||
| log.debug('No proxy configuration found in global config', this.contextDetails); | ||
| } | ||
| } catch (error) { | ||
| handleAndLogError(error, { ...this.contextDetails, module: 'config-get-proxy' }); | ||
| } | ||
| } | ||
| } | ||
26 changes: 26 additions & 0 deletions
26 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,26 @@ | ||
| import { configHandler, log, handleAndLogError } from '@contentstack/cli-utilities'; | ||
| import { BaseCommand } from '../../../base-command'; | ||
| export default class ProxyRemoveCommand extends BaseCommand<typeof ProxyRemoveCommand> { | ||
| static description = 'Remove proxy configuration from global config'; | ||
| static examples = ['csdx config:remove:proxy']; | ||
| async run() { | ||
| try { | ||
| log.debug('Starting proxy configuration removal', this.contextDetails); | ||
| const currentProxy = configHandler.get('proxy'); | ||
| if (!currentProxy) { | ||
| log.debug('No proxy configuration found in global config', this.contextDetails); | ||
| return; | ||
| } | ||
| log.debug('Removing proxy configuration from global config', this.contextDetails); | ||
| configHandler.delete('proxy'); | ||
| log.success('Proxy configuration removed from global config successfully', this.contextDetails); | ||
| } catch (error) { | ||
| handleAndLogError(error, { ...this.contextDetails, module: 'config-remove-proxy' }); | ||
| } | ||
| } | ||
| } | ||
Oops, something went wrong.
Uh oh!
There was an error while loading. Please reload this page.
Oops, something went wrong.
Uh oh!
There was an error while loading. Please reload this page.
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.