-
Notifications
You must be signed in to change notification settings - Fork 3
Wr/exit codes @W-21513440@ #378
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
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
a49a606
fix: first pass at exit codes
WillieRuemmele 0d9429c
Merge branch 'main' into wr/exitCodes
WillieRuemmele b6d5eaa
docs: move envs/exit codes to their own help sections
WillieRuemmele 514283d
test: fix NUTs
WillieRuemmele 06d70a6
test: fix NUTs
WillieRuemmele 85b249d
fix: expand error codes to other commands
WillieRuemmele 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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -13,8 +13,8 @@ | |
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| import { SfCommand, Flags } from '@salesforce/sf-plugins-core'; | ||
| import { Messages } from '@salesforce/core'; | ||
| import { SfCommand, Flags, toHelpSection } from '@salesforce/sf-plugins-core'; | ||
| import { Messages, SfError, Lifecycle, EnvironmentVariable } from '@salesforce/core'; | ||
| import { getAgentForActivation } from '../../agentActivation.js'; | ||
| import { AgentActivateResult } from './activate.js'; | ||
|
|
||
|
|
@@ -27,6 +27,17 @@ export default class AgentDeactivate extends SfCommand<AgentActivateResult> { | |
| public static readonly examples = messages.getMessages('examples'); | ||
| public static enableJsonFlag = true; | ||
|
|
||
| public static readonly envVariablesSection = toHelpSection( | ||
| 'ENVIRONMENT VARIABLES', | ||
| EnvironmentVariable.SF_TARGET_ORG | ||
| ); | ||
|
|
||
| public static readonly errorCodes = toHelpSection('ERROR CODES', { | ||
| 'Succeeded (0)': 'Agent deactivated successfully.', | ||
| 'NotFound (2)': 'Agent not found in the org.', | ||
| 'DeactivationFailed (4)': 'Failed to deactivate the agent due to API or network errors.', | ||
| }); | ||
|
|
||
| public static readonly flags = { | ||
| 'target-org': Flags.requiredOrg(), | ||
| 'api-version': Flags.orgApiVersion(), | ||
|
|
@@ -46,9 +57,44 @@ export default class AgentDeactivate extends SfCommand<AgentActivateResult> { | |
| throw messages.createError('error.missingRequiredFlags', ['api-name']); | ||
| } | ||
|
|
||
| const agent = await getAgentForActivation({ targetOrg, status: 'Inactive', apiNameFlag }); | ||
| const result = await agent.deactivate(); | ||
| // Get agent with error tracking | ||
| let agent; | ||
| try { | ||
| agent = await getAgentForActivation({ targetOrg, status: 'Inactive', apiNameFlag }); | ||
| } catch (error) { | ||
| const wrapped = SfError.wrap(error); | ||
| if (wrapped.message.toLowerCase().includes('not found') || wrapped.message.toLowerCase().includes('no agent')) { | ||
| await Lifecycle.getInstance().emitTelemetry({ eventName: 'agent_deactivate_agent_not_found' }); | ||
| throw new SfError( | ||
| messages.getMessage('error.agentNotFound', [apiNameFlag ?? 'unknown']), | ||
| 'AgentNotFound', | ||
| [], | ||
| 2, | ||
| wrapped | ||
| ); | ||
| } | ||
| await Lifecycle.getInstance().emitTelemetry({ eventName: 'agent_deactivate_get_agent_failed' }); | ||
| throw wrapped; | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Same. |
||
| } | ||
|
|
||
| // Deactivate with error tracking | ||
| let result; | ||
| try { | ||
| result = await agent.deactivate(); | ||
| } catch (error) { | ||
| const wrapped = SfError.wrap(error); | ||
| await Lifecycle.getInstance().emitTelemetry({ eventName: 'agent_deactivate_failed' }); | ||
| throw new SfError( | ||
| messages.getMessage('error.deactivationFailed', [wrapped.message]), | ||
| 'DeactivationFailed', | ||
| [wrapped.message], | ||
| 4, | ||
| wrapped | ||
| ); | ||
| } | ||
|
|
||
| const metadata = await agent.getBotMetadata(); | ||
| await Lifecycle.getInstance().emitTelemetry({ eventName: 'agent_deactivate_success' }); | ||
|
|
||
| this.log(`${metadata.DeveloperName} v${result.VersionNumber} deactivated.`); | ||
| return { success: true, version: result.VersionNumber }; | ||
|
|
||
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Shouldn't this have errorCode=4?
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
2 => not found error, meaning
getAgentForActivationthrew an error4 => API error,
agent.activate(version);threw an errorthey should follow this