sfdx-hardis 6.0.4-beta202508131002.0 → 6.0.5-beta202508132214.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +9 -0
- package/lib/commands/hardis/cache/clear.js +2 -1
- package/lib/commands/hardis/cache/clear.js.map +1 -1
- package/lib/commands/hardis/config/get.js +1 -1
- package/lib/commands/hardis/config/get.js.map +1 -1
- package/lib/commands/hardis/doc/extract/permsetgroups.js +5 -5
- package/lib/commands/hardis/doc/extract/permsetgroups.js.map +1 -1
- package/lib/commands/hardis/doc/fieldusage.js +5 -5
- package/lib/commands/hardis/doc/fieldusage.js.map +1 -1
- package/lib/commands/hardis/doc/flow2markdown.js +2 -2
- package/lib/commands/hardis/doc/flow2markdown.js.map +1 -1
- package/lib/commands/hardis/doc/mkdocs-to-cf.js +19 -19
- package/lib/commands/hardis/doc/mkdocs-to-cf.js.map +1 -1
- package/lib/commands/hardis/doc/mkdocs-to-salesforce.js +12 -12
- package/lib/commands/hardis/doc/mkdocs-to-salesforce.js.map +1 -1
- package/lib/commands/hardis/doc/override-prompts.js +14 -14
- package/lib/commands/hardis/doc/override-prompts.js.map +1 -1
- package/lib/commands/hardis/doc/plugin/generate.js +4 -4
- package/lib/commands/hardis/doc/plugin/generate.js.map +1 -1
- package/lib/commands/hardis/doc/project2markdown.js +40 -40
- package/lib/commands/hardis/doc/project2markdown.js.map +1 -1
- package/lib/commands/hardis/git/pull-requests/extract.js +1 -1
- package/lib/commands/hardis/git/pull-requests/extract.js.map +1 -1
- package/lib/commands/hardis/lint/access.js +7 -7
- package/lib/commands/hardis/lint/access.js.map +1 -1
- package/lib/commands/hardis/lint/metadatastatus.js +1 -1
- package/lib/commands/hardis/lint/metadatastatus.js.map +1 -1
- package/lib/commands/hardis/lint/missingattributes.js +1 -1
- package/lib/commands/hardis/lint/missingattributes.js.map +1 -1
- package/lib/commands/hardis/lint/unusedmetadatas.js +13 -13
- package/lib/commands/hardis/lint/unusedmetadatas.js.map +1 -1
- package/lib/commands/hardis/mdapi/deploy.js +3 -3
- package/lib/commands/hardis/mdapi/deploy.js.map +1 -1
- package/lib/commands/hardis/misc/custom-label-translations.js +18 -18
- package/lib/commands/hardis/misc/custom-label-translations.js.map +1 -1
- package/lib/commands/hardis/misc/purge-references.js +2 -2
- package/lib/commands/hardis/misc/purge-references.js.map +1 -1
- package/lib/commands/hardis/misc/servicenow-report.js +8 -8
- package/lib/commands/hardis/misc/servicenow-report.js.map +1 -1
- package/lib/commands/hardis/misc/toml2csv.js +16 -16
- package/lib/commands/hardis/misc/toml2csv.js.map +1 -1
- package/lib/commands/hardis/org/community/update.js +5 -5
- package/lib/commands/hardis/org/community/update.js.map +1 -1
- package/lib/commands/hardis/org/configure/data.js +5 -5
- package/lib/commands/hardis/org/configure/data.js.map +1 -1
- package/lib/commands/hardis/org/configure/files.js +1 -1
- package/lib/commands/hardis/org/configure/files.js.map +1 -1
- package/lib/commands/hardis/org/configure/monitoring.js +11 -11
- package/lib/commands/hardis/org/configure/monitoring.js.map +1 -1
- package/lib/commands/hardis/org/create.js +7 -7
- package/lib/commands/hardis/org/create.js.map +1 -1
- package/lib/commands/hardis/org/data/delete.js +1 -1
- package/lib/commands/hardis/org/data/delete.js.map +1 -1
- package/lib/commands/hardis/org/data/export.js +1 -1
- package/lib/commands/hardis/org/data/export.js.map +1 -1
- package/lib/commands/hardis/org/data/import.js +1 -1
- package/lib/commands/hardis/org/data/import.js.map +1 -1
- package/lib/commands/hardis/org/diagnose/audittrail.js +14 -14
- package/lib/commands/hardis/org/diagnose/audittrail.js.map +1 -1
- package/lib/commands/hardis/org/diagnose/instanceupgrade.js +3 -3
- package/lib/commands/hardis/org/diagnose/instanceupgrade.js.map +1 -1
- package/lib/commands/hardis/org/diagnose/legacyapi.js +17 -17
- package/lib/commands/hardis/org/diagnose/legacyapi.js.map +1 -1
- package/lib/commands/hardis/org/diagnose/licenses.js +2 -2
- package/lib/commands/hardis/org/diagnose/licenses.js.map +1 -1
- package/lib/commands/hardis/org/diagnose/releaseupdates.js +3 -3
- package/lib/commands/hardis/org/diagnose/releaseupdates.js.map +1 -1
- package/lib/commands/hardis/org/diagnose/unused-apex-classes.js +7 -7
- package/lib/commands/hardis/org/diagnose/unused-apex-classes.js.map +1 -1
- package/lib/commands/hardis/org/diagnose/unused-connected-apps.js +7 -7
- package/lib/commands/hardis/org/diagnose/unused-connected-apps.js.map +1 -1
- package/lib/commands/hardis/org/diagnose/unusedlicenses.js +10 -10
- package/lib/commands/hardis/org/diagnose/unusedlicenses.js.map +1 -1
- package/lib/commands/hardis/org/diagnose/unusedusers.js +3 -3
- package/lib/commands/hardis/org/diagnose/unusedusers.js.map +1 -1
- package/lib/commands/hardis/org/files/export.js +1 -1
- package/lib/commands/hardis/org/files/export.js.map +1 -1
- package/lib/commands/hardis/org/files/import.js +1 -1
- package/lib/commands/hardis/org/files/import.js.map +1 -1
- package/lib/commands/hardis/org/fix/listviewmine.js +1 -1
- package/lib/commands/hardis/org/fix/listviewmine.js.map +1 -1
- package/lib/commands/hardis/org/generate/packagexmlfull.js +3 -3
- package/lib/commands/hardis/org/generate/packagexmlfull.js.map +1 -1
- package/lib/commands/hardis/org/monitor/all.js +10 -10
- package/lib/commands/hardis/org/monitor/all.js.map +1 -1
- package/lib/commands/hardis/org/monitor/backup.js +22 -22
- package/lib/commands/hardis/org/monitor/backup.js.map +1 -1
- package/lib/commands/hardis/org/monitor/limits.js +4 -4
- package/lib/commands/hardis/org/monitor/limits.js.map +1 -1
- package/lib/commands/hardis/org/multi-org-query.js +8 -8
- package/lib/commands/hardis/org/multi-org-query.js.map +1 -1
- package/lib/commands/hardis/org/purge/apexlog.js +2 -2
- package/lib/commands/hardis/org/purge/apexlog.js.map +1 -1
- package/lib/commands/hardis/org/purge/flow.js +14 -14
- package/lib/commands/hardis/org/purge/flow.js.map +1 -1
- package/lib/commands/hardis/org/retrieve/packageconfig.js +3 -3
- package/lib/commands/hardis/org/retrieve/packageconfig.js.map +1 -1
- package/lib/commands/hardis/org/retrieve/sources/analytics.js +3 -3
- package/lib/commands/hardis/org/retrieve/sources/analytics.js.map +1 -1
- package/lib/commands/hardis/org/retrieve/sources/dx.js +11 -11
- package/lib/commands/hardis/org/retrieve/sources/dx.js.map +1 -1
- package/lib/commands/hardis/org/retrieve/sources/dx2.js +2 -2
- package/lib/commands/hardis/org/retrieve/sources/dx2.js.map +1 -1
- package/lib/commands/hardis/org/retrieve/sources/metadata.js +16 -16
- package/lib/commands/hardis/org/retrieve/sources/metadata.js.map +1 -1
- package/lib/commands/hardis/org/retrieve/sources/retrofit.js +11 -11
- package/lib/commands/hardis/org/retrieve/sources/retrofit.js.map +1 -1
- package/lib/commands/hardis/org/select.js +2 -2
- package/lib/commands/hardis/org/select.js.map +1 -1
- package/lib/commands/hardis/org/test/apex.js +8 -8
- package/lib/commands/hardis/org/test/apex.js.map +1 -1
- package/lib/commands/hardis/org/user/activateinvalid.js +7 -7
- package/lib/commands/hardis/org/user/activateinvalid.js.map +1 -1
- package/lib/commands/hardis/org/user/freeze.js +10 -10
- package/lib/commands/hardis/org/user/freeze.js.map +1 -1
- package/lib/commands/hardis/org/user/unfreeze.js +10 -10
- package/lib/commands/hardis/org/user/unfreeze.js.map +1 -1
- package/lib/commands/hardis/package/create.js +1 -1
- package/lib/commands/hardis/package/create.js.map +1 -1
- package/lib/commands/hardis/package/install.js +1 -1
- package/lib/commands/hardis/package/install.js.map +1 -1
- package/lib/commands/hardis/package/mergexml.js +1 -1
- package/lib/commands/hardis/package/mergexml.js.map +1 -1
- package/lib/commands/hardis/package/version/create.js +2 -2
- package/lib/commands/hardis/package/version/create.js.map +1 -1
- package/lib/commands/hardis/package/version/promote.js +3 -3
- package/lib/commands/hardis/package/version/promote.js.map +1 -1
- package/lib/commands/hardis/project/audit/apiversion.js +8 -8
- package/lib/commands/hardis/project/audit/apiversion.js.map +1 -1
- package/lib/commands/hardis/project/audit/callincallout.js +2 -2
- package/lib/commands/hardis/project/audit/callincallout.js.map +1 -1
- package/lib/commands/hardis/project/audit/duplicatefiles.js +4 -4
- package/lib/commands/hardis/project/audit/duplicatefiles.js.map +1 -1
- package/lib/commands/hardis/project/audit/remotesites.js +2 -2
- package/lib/commands/hardis/project/audit/remotesites.js.map +1 -1
- package/lib/commands/hardis/project/clean/emptyitems.js +3 -3
- package/lib/commands/hardis/project/clean/emptyitems.js.map +1 -1
- package/lib/commands/hardis/project/clean/filter-xml-content.js +14 -14
- package/lib/commands/hardis/project/clean/filter-xml-content.js.map +1 -1
- package/lib/commands/hardis/project/clean/flowpositions.js +3 -3
- package/lib/commands/hardis/project/clean/flowpositions.js.map +1 -1
- package/lib/commands/hardis/project/clean/hiddenitems.js +3 -3
- package/lib/commands/hardis/project/clean/hiddenitems.js.map +1 -1
- package/lib/commands/hardis/project/clean/listviews.js +3 -3
- package/lib/commands/hardis/project/clean/listviews.js.map +1 -1
- package/lib/commands/hardis/project/clean/manageditems.js +2 -2
- package/lib/commands/hardis/project/clean/manageditems.js.map +1 -1
- package/lib/commands/hardis/project/clean/minimizeprofiles.js +4 -4
- package/lib/commands/hardis/project/clean/minimizeprofiles.js.map +1 -1
- package/lib/commands/hardis/project/clean/orgmissingitems.js +5 -5
- package/lib/commands/hardis/project/clean/orgmissingitems.js.map +1 -1
- package/lib/commands/hardis/project/clean/references.js +8 -8
- package/lib/commands/hardis/project/clean/references.js.map +1 -1
- package/lib/commands/hardis/project/clean/retrievefolders.js +1 -1
- package/lib/commands/hardis/project/clean/retrievefolders.js.map +1 -1
- package/lib/commands/hardis/project/clean/sensitive-metadatas.js +3 -3
- package/lib/commands/hardis/project/clean/sensitive-metadatas.js.map +1 -1
- package/lib/commands/hardis/project/clean/standarditems.js +5 -5
- package/lib/commands/hardis/project/clean/standarditems.js.map +1 -1
- package/lib/commands/hardis/project/clean/systemdebug.js +2 -2
- package/lib/commands/hardis/project/clean/systemdebug.js.map +1 -1
- package/lib/commands/hardis/project/clean/xml.js +5 -5
- package/lib/commands/hardis/project/clean/xml.js.map +1 -1
- package/lib/commands/hardis/project/configure/auth.js +3 -3
- package/lib/commands/hardis/project/configure/auth.js.map +1 -1
- package/lib/commands/hardis/project/convert/profilestopermsets.js +2 -2
- package/lib/commands/hardis/project/convert/profilestopermsets.js.map +1 -1
- package/lib/commands/hardis/project/create.js +4 -4
- package/lib/commands/hardis/project/create.js.map +1 -1
- package/lib/commands/hardis/project/deploy/notify.js +4 -4
- package/lib/commands/hardis/project/deploy/notify.js.map +1 -1
- package/lib/commands/hardis/project/deploy/smart.js +25 -25
- package/lib/commands/hardis/project/deploy/smart.js.map +1 -1
- package/lib/commands/hardis/project/deploy/sources/metadata.js +7 -7
- package/lib/commands/hardis/project/deploy/sources/metadata.js.map +1 -1
- package/lib/commands/hardis/project/fix/profiletabs.js +2 -2
- package/lib/commands/hardis/project/fix/profiletabs.js.map +1 -1
- package/lib/commands/hardis/project/fix/v53flexipages.js +4 -4
- package/lib/commands/hardis/project/fix/v53flexipages.js.map +1 -1
- package/lib/commands/hardis/project/generate/bypass.js +20 -20
- package/lib/commands/hardis/project/generate/bypass.js.map +1 -1
- package/lib/commands/hardis/project/generate/flow-git-diff.js +2 -2
- package/lib/commands/hardis/project/generate/flow-git-diff.js.map +1 -1
- package/lib/commands/hardis/project/generate/gitdelta.js +3 -3
- package/lib/commands/hardis/project/generate/gitdelta.js.map +1 -1
- package/lib/commands/hardis/project/lint.js +3 -3
- package/lib/commands/hardis/project/lint.js.map +1 -1
- package/lib/commands/hardis/project/metadata/findduplicates.js +7 -7
- package/lib/commands/hardis/project/metadata/findduplicates.js.map +1 -1
- package/lib/commands/hardis/scratch/create.js +14 -14
- package/lib/commands/hardis/scratch/create.js.map +1 -1
- package/lib/commands/hardis/scratch/delete.js +1 -1
- package/lib/commands/hardis/scratch/delete.js.map +1 -1
- package/lib/commands/hardis/scratch/pool/create.js +3 -3
- package/lib/commands/hardis/scratch/pool/create.js.map +1 -1
- package/lib/commands/hardis/scratch/pool/localauth.js +1 -1
- package/lib/commands/hardis/scratch/pool/localauth.js.map +1 -1
- package/lib/commands/hardis/scratch/pool/refresh.js +13 -13
- package/lib/commands/hardis/scratch/pool/refresh.js.map +1 -1
- package/lib/commands/hardis/scratch/pool/reset.js +4 -4
- package/lib/commands/hardis/scratch/pool/reset.js.map +1 -1
- package/lib/commands/hardis/scratch/pool/view.js +4 -4
- package/lib/commands/hardis/scratch/pool/view.js.map +1 -1
- package/lib/commands/hardis/scratch/pull.js +3 -2
- package/lib/commands/hardis/scratch/pull.js.map +1 -1
- package/lib/commands/hardis/source/deploy.js +3 -3
- package/lib/commands/hardis/source/deploy.js.map +1 -1
- package/lib/commands/hardis/source/push.js +3 -3
- package/lib/commands/hardis/source/push.js.map +1 -1
- package/lib/commands/hardis/source/retrieve.js +3 -3
- package/lib/commands/hardis/source/retrieve.js.map +1 -1
- package/lib/commands/hardis/work/new.js +16 -16
- package/lib/commands/hardis/work/new.js.map +1 -1
- package/lib/commands/hardis/work/refresh.js +12 -12
- package/lib/commands/hardis/work/refresh.js.map +1 -1
- package/lib/commands/hardis/work/resetselection.js +3 -3
- package/lib/commands/hardis/work/resetselection.js.map +1 -1
- package/lib/commands/hardis/work/save.js +35 -29
- package/lib/commands/hardis/work/save.js.map +1 -1
- package/lib/common/aiProvider/agentforceProvider.js +5 -5
- package/lib/common/aiProvider/agentforceProvider.js.map +1 -1
- package/lib/common/aiProvider/index.js +6 -6
- package/lib/common/aiProvider/index.js.map +1 -1
- package/lib/common/aiProvider/langchainProvider.js +7 -7
- package/lib/common/aiProvider/langchainProvider.js.map +1 -1
- package/lib/common/aiProvider/openaiProvider.js +5 -5
- package/lib/common/aiProvider/openaiProvider.js.map +1 -1
- package/lib/common/aiProvider/promptTemplates.js +4 -4
- package/lib/common/aiProvider/promptTemplates.js.map +1 -1
- package/lib/common/docBuilder/docBuilderPackageXml.js +3 -3
- package/lib/common/docBuilder/docBuilderPackageXml.js.map +1 -1
- package/lib/common/docBuilder/docBuilderRoles.js +2 -2
- package/lib/common/docBuilder/docBuilderRoles.js.map +1 -1
- package/lib/common/docBuilder/docBuilderRoot.js +4 -4
- package/lib/common/docBuilder/docBuilderRoot.js.map +1 -1
- package/lib/common/docBuilder/docUtils.js +7 -7
- package/lib/common/docBuilder/docUtils.js.map +1 -1
- package/lib/common/docBuilder/objectModelBuilder.js +1 -1
- package/lib/common/docBuilder/objectModelBuilder.js.map +1 -1
- package/lib/common/gitProvider/azureDevops.js +31 -31
- package/lib/common/gitProvider/azureDevops.js.map +1 -1
- package/lib/common/gitProvider/bitbucket.js +16 -16
- package/lib/common/gitProvider/bitbucket.js.map +1 -1
- package/lib/common/gitProvider/gitProviderRoot.js +10 -10
- package/lib/common/gitProvider/gitProviderRoot.js.map +1 -1
- package/lib/common/gitProvider/github.js +11 -11
- package/lib/common/gitProvider/github.js.map +1 -1
- package/lib/common/gitProvider/gitlab.js +6 -6
- package/lib/common/gitProvider/gitlab.js.map +1 -1
- package/lib/common/gitProvider/index.js +14 -14
- package/lib/common/gitProvider/index.js.map +1 -1
- package/lib/common/gitProvider/utilsMarkdown.js +2 -2
- package/lib/common/gitProvider/utilsMarkdown.js.map +1 -1
- package/lib/common/keyValueProviders/localtest.js +1 -1
- package/lib/common/keyValueProviders/localtest.js.map +1 -1
- package/lib/common/keyValueProviders/salesforce.js +4 -4
- package/lib/common/keyValueProviders/salesforce.js.map +1 -1
- package/lib/common/metadata-utils/index.js +18 -18
- package/lib/common/metadata-utils/index.js.map +1 -1
- package/lib/common/notifProvider/apiProvider.js +12 -12
- package/lib/common/notifProvider/apiProvider.js.map +1 -1
- package/lib/common/notifProvider/emailProvider.js +3 -3
- package/lib/common/notifProvider/emailProvider.js.map +1 -1
- package/lib/common/notifProvider/index.js +6 -6
- package/lib/common/notifProvider/index.js.map +1 -1
- package/lib/common/notifProvider/notifProviderRoot.js +1 -1
- package/lib/common/notifProvider/notifProviderRoot.js.map +1 -1
- package/lib/common/notifProvider/slackProvider.js +3 -3
- package/lib/common/notifProvider/slackProvider.js.map +1 -1
- package/lib/common/notifProvider/teamsProvider.js +2 -2
- package/lib/common/notifProvider/teamsProvider.js.map +1 -1
- package/lib/common/ticketProvider/azureBoardsProvider.js +8 -8
- package/lib/common/ticketProvider/azureBoardsProvider.js.map +1 -1
- package/lib/common/ticketProvider/index.js +1 -1
- package/lib/common/ticketProvider/index.js.map +1 -1
- package/lib/common/ticketProvider/jiraProvider.js +12 -12
- package/lib/common/ticketProvider/jiraProvider.js.map +1 -1
- package/lib/common/ticketProvider/ticketProviderRoot.js +2 -2
- package/lib/common/ticketProvider/ticketProviderRoot.js.map +1 -1
- package/lib/common/utils/apiUtils.js +37 -19
- package/lib/common/utils/apiUtils.js.map +1 -1
- package/lib/common/utils/authUtils.js +9 -9
- package/lib/common/utils/authUtils.js.map +1 -1
- package/lib/common/utils/classUtils.js +4 -4
- package/lib/common/utils/classUtils.js.map +1 -1
- package/lib/common/utils/dataUtils.js +8 -8
- package/lib/common/utils/dataUtils.js.map +1 -1
- package/lib/common/utils/deployTipJson.js +2 -2
- package/lib/common/utils/deployTipJson.js.map +1 -1
- package/lib/common/utils/deployTips.js +2 -2
- package/lib/common/utils/deployTips.js.map +1 -1
- package/lib/common/utils/deployUtils.js +89 -89
- package/lib/common/utils/deployUtils.js.map +1 -1
- package/lib/common/utils/emailUtils.js +3 -3
- package/lib/common/utils/emailUtils.js.map +1 -1
- package/lib/common/utils/filesUtils.d.ts +5 -1
- package/lib/common/utils/filesUtils.js +48 -48
- package/lib/common/utils/filesUtils.js.map +1 -1
- package/lib/common/utils/gitUtils.js +12 -12
- package/lib/common/utils/gitUtils.js.map +1 -1
- package/lib/common/utils/index.d.ts +2 -1
- package/lib/common/utils/index.js +60 -79
- package/lib/common/utils/index.js.map +1 -1
- package/lib/common/utils/markdownUtils.js +2 -2
- package/lib/common/utils/markdownUtils.js.map +1 -1
- package/lib/common/utils/mermaidUtils.js +19 -19
- package/lib/common/utils/mermaidUtils.js.map +1 -1
- package/lib/common/utils/orgConfigUtils.js +8 -8
- package/lib/common/utils/orgConfigUtils.js.map +1 -1
- package/lib/common/utils/orgUtils.js +21 -21
- package/lib/common/utils/orgUtils.js.map +1 -1
- package/lib/common/utils/poolUtils.js +13 -13
- package/lib/common/utils/poolUtils.js.map +1 -1
- package/lib/common/utils/profileUtils.js +1 -1
- package/lib/common/utils/profileUtils.js.map +1 -1
- package/lib/common/utils/projectUtils.js +9 -9
- package/lib/common/utils/projectUtils.js.map +1 -1
- package/lib/common/utils/prompts.js +62 -12
- package/lib/common/utils/prompts.js.map +1 -1
- package/lib/common/utils/workaroundUtils.js +2 -2
- package/lib/common/utils/workaroundUtils.js.map +1 -1
- package/lib/common/utils/wrapUtils.js +3 -3
- package/lib/common/utils/wrapUtils.js.map +1 -1
- package/lib/common/utils/xmlUtils.js +10 -10
- package/lib/common/utils/xmlUtils.js.map +1 -1
- package/lib/common/websocketClient.d.ts +1 -1
- package/lib/common/websocketClient.js +7 -6
- package/lib/common/websocketClient.js.map +1 -1
- package/lib/config/index.js +3 -3
- package/lib/config/index.js.map +1 -1
- package/lib/hooks/finally/notify.js +2 -2
- package/lib/hooks/finally/notify.js.map +1 -1
- package/lib/hooks/prerun/check-dependencies.js +7 -7
- package/lib/hooks/prerun/check-dependencies.js.map +1 -1
- package/oclif.manifest.json +607 -607
- package/package.json +1 -1
|
@@ -92,7 +92,7 @@ export class JiraProvider extends TicketProviderRoot {
|
|
|
92
92
|
async collectTicketsInfo(tickets) {
|
|
93
93
|
const jiraTicketsNumber = tickets.filter((ticket) => ticket.provider === "JIRA").length;
|
|
94
94
|
if (jiraTicketsNumber > 0) {
|
|
95
|
-
uxLog(this, c.cyan(`[JiraProvider] Now trying to collect ${jiraTicketsNumber} tickets infos from JIRA server ` + process.env.JIRA_HOST + " ..."));
|
|
95
|
+
uxLog("action", this, c.cyan(`[JiraProvider] Now trying to collect ${jiraTicketsNumber} tickets infos from JIRA server ` + process.env.JIRA_HOST + " ..."));
|
|
96
96
|
}
|
|
97
97
|
for (const ticket of tickets) {
|
|
98
98
|
if (ticket.provider === "JIRA") {
|
|
@@ -101,7 +101,7 @@ export class JiraProvider extends TicketProviderRoot {
|
|
|
101
101
|
ticketInfo = await this.jiraClient.getIssue(ticket.id);
|
|
102
102
|
}
|
|
103
103
|
catch (e) {
|
|
104
|
-
uxLog(this, c.yellow(`[JiraApi] Error while trying to get ${ticket.id} information: ${e.message}`));
|
|
104
|
+
uxLog("warning", this, c.yellow(`[JiraApi] Error while trying to get ${ticket.id} information: ${e.message}`));
|
|
105
105
|
}
|
|
106
106
|
if (ticketInfo) {
|
|
107
107
|
const body = ticketInfo?.fields?.description?.content?.length > 0
|
|
@@ -113,26 +113,26 @@ export class JiraProvider extends TicketProviderRoot {
|
|
|
113
113
|
ticket.status = ticketInfo.fields?.status?.id || "";
|
|
114
114
|
ticket.statusLabel = ticketInfo.fields?.status?.name || "";
|
|
115
115
|
if (ticket.subject === "") {
|
|
116
|
-
uxLog(this, c.yellow("[JiraProvider] Unable to collect JIRA ticket info for " + ticket.id));
|
|
116
|
+
uxLog("warning", this, c.yellow("[JiraProvider] Unable to collect JIRA ticket info for " + ticket.id));
|
|
117
117
|
if (JSON.stringify(ticketInfo).includes("<!DOCTYPE html>")) {
|
|
118
|
-
uxLog(this, c.grey("[JiraProvider] This is probably a JIRA auth config issue, as HTML is returned"));
|
|
118
|
+
uxLog("log", this, c.grey("[JiraProvider] This is probably a JIRA auth config issue, as HTML is returned"));
|
|
119
119
|
}
|
|
120
120
|
else {
|
|
121
|
-
uxLog(this, c.grey(JSON.stringify(ticketInfo)));
|
|
121
|
+
uxLog("log", this, c.grey(JSON.stringify(ticketInfo)));
|
|
122
122
|
}
|
|
123
123
|
ticket.foundOnServer = false;
|
|
124
124
|
}
|
|
125
|
-
uxLog(this, c.grey("[JiraProvider] Collected data for ticket " + ticket.id));
|
|
125
|
+
uxLog("log", this, c.grey("[JiraProvider] Collected data for ticket " + ticket.id));
|
|
126
126
|
}
|
|
127
127
|
else {
|
|
128
|
-
uxLog(this, c.yellow("[JiraProvider] Unable to get JIRA issue " + ticket.id));
|
|
128
|
+
uxLog("warning", this, c.yellow("[JiraProvider] Unable to get JIRA issue " + ticket.id));
|
|
129
129
|
}
|
|
130
130
|
}
|
|
131
131
|
}
|
|
132
132
|
return tickets;
|
|
133
133
|
}
|
|
134
134
|
async postDeploymentComments(tickets, org, pullRequestInfo) {
|
|
135
|
-
uxLog(this, c.cyan(`[JiraProvider] Try to post comments on ${tickets.length} tickets...`));
|
|
135
|
+
uxLog("action", this, c.cyan(`[JiraProvider] Try to post comments on ${tickets.length} tickets...`));
|
|
136
136
|
const genericHtmlResponseError = "Probably config/access error since response is HTML";
|
|
137
137
|
const orgMarkdown = JSON.parse(await getOrgMarkdown(org, "jira"));
|
|
138
138
|
const branchMarkdown = JSON.parse(await getBranchMarkdown("jira"));
|
|
@@ -162,7 +162,7 @@ export class JiraProvider extends TicketProviderRoot {
|
|
|
162
162
|
commentedTickets.push(ticket);
|
|
163
163
|
}
|
|
164
164
|
catch (e6) {
|
|
165
|
-
uxLog(this, c.yellow(`[JiraProvider] Error while posting comment on ${ticket.id}: ${e6.message}`));
|
|
165
|
+
uxLog("warning", this, c.yellow(`[JiraProvider] Error while posting comment on ${ticket.id}: ${e6.message}`));
|
|
166
166
|
}
|
|
167
167
|
// Add deployment label to JIRA ticket
|
|
168
168
|
try {
|
|
@@ -178,14 +178,14 @@ export class JiraProvider extends TicketProviderRoot {
|
|
|
178
178
|
if (e6.message != null && e6.message.includes("<!doctype html>")) {
|
|
179
179
|
e6.message = genericHtmlResponseError;
|
|
180
180
|
}
|
|
181
|
-
uxLog(this, c.yellow(`[JiraProvider] Error while adding label ${tag} on ${ticket.id}: ${e6.message}`));
|
|
181
|
+
uxLog("warning", this, c.yellow(`[JiraProvider] Error while adding label ${tag} on ${ticket.id}: ${e6.message}`));
|
|
182
182
|
}
|
|
183
183
|
}
|
|
184
184
|
}
|
|
185
185
|
// Summary
|
|
186
186
|
if (commentedTickets.length > 0 || taggedTickets.length > 0) {
|
|
187
|
-
uxLog(this, c.
|
|
188
|
-
uxLog(this, c.
|
|
187
|
+
uxLog("log", this, c.grey(`[JiraProvider] Posted comments on ${commentedTickets.length} ticket(s): ` + commentedTickets.map((ticket) => ticket.id).join(", ")));
|
|
188
|
+
uxLog("log", this, c.grey(`[JiraProvider] Added label ${tag} on ${taggedTickets.length} ticket(s): ` + taggedTickets.map((ticket) => ticket.id).join(", ")));
|
|
189
189
|
}
|
|
190
190
|
return tickets;
|
|
191
191
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"jiraProvider.js","sourceRoot":"","sources":["../../../src/common/ticketProvider/jiraProvider.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"jiraProvider.js","sourceRoot":"","sources":["../../../src/common/ticketProvider/jiraProvider.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,12 +9,12 @@ export class TicketProviderRoot {
|
|
|
9
9
|
throw new SfError("getLabel should be implemented on this call");
|
|
10
10
|
}
|
|
11
11
|
async collectTicketsInfo(tickets) {
|
|
12
|
-
uxLog(this, c.yellow("collectTicketsInfo is not implemented on " + this.getLabel()));
|
|
12
|
+
uxLog("warning", this, c.yellow("collectTicketsInfo is not implemented on " + this.getLabel()));
|
|
13
13
|
return tickets;
|
|
14
14
|
}
|
|
15
15
|
// eslint-disable-next-line @typescript-eslint/no-unused-vars
|
|
16
16
|
async postDeploymentComments(tickets, _org, _pullRequestInfo) {
|
|
17
|
-
uxLog(this, c.yellow("postDeploymentComments is not implemented on " + this.getLabel()));
|
|
17
|
+
uxLog("warning", this, c.yellow("postDeploymentComments is not implemented on " + this.getLabel()));
|
|
18
18
|
return tickets;
|
|
19
19
|
}
|
|
20
20
|
async getDeploymentTag() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ticketProviderRoot.js","sourceRoot":"","sources":["../../../src/common/ticketProvider/ticketProviderRoot.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAC3C,OAAO,CAAC,MAAM,OAAO,CAAC;AAEtB,OAAO,EAAE,mBAAmB,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAC/D,OAAO,EAAyB,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAE7E,MAAM,OAAgB,kBAAkB;IAC/B,QAAQ,GAAG,KAAK,CAAC;IACd,KAAK,CAAgB;IAExB,QAAQ;QACb,MAAM,IAAI,OAAO,CAAC,6CAA6C,CAAC,CAAC;IACnE,CAAC;IAEM,KAAK,CAAC,kBAAkB,CAAC,OAAiB;QAC/C,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,2CAA2C,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"ticketProviderRoot.js","sourceRoot":"","sources":["../../../src/common/ticketProvider/ticketProviderRoot.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAC3C,OAAO,CAAC,MAAM,OAAO,CAAC;AAEtB,OAAO,EAAE,mBAAmB,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAC/D,OAAO,EAAyB,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAE7E,MAAM,OAAgB,kBAAkB;IAC/B,QAAQ,GAAG,KAAK,CAAC;IACd,KAAK,CAAgB;IAExB,QAAQ;QACb,MAAM,IAAI,OAAO,CAAC,6CAA6C,CAAC,CAAC;IACnE,CAAC;IAEM,KAAK,CAAC,kBAAkB,CAAC,OAAiB;QAC/C,KAAK,CAAC,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,2CAA2C,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC;QAChG,OAAO,OAAO,CAAC;IACjB,CAAC;IAED,6DAA6D;IACtD,KAAK,CAAC,sBAAsB,CAAC,OAAiB,EAAE,IAAY,EAAE,gBAA8C;QACjH,KAAK,CAAC,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,+CAA+C,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC;QACpG,OAAO,OAAO,CAAC;IACjB,CAAC;IAEM,KAAK,CAAC,gBAAgB;QAC3B,MAAM,gBAAgB,GAAG,MAAM,mBAAmB,EAAE,IAAI,EAAE,CAAC;QAC3D,IAAI,GAAG,GAAG,gBAAgB,CAAC,WAAW,EAAE,GAAG,WAAW,CAAC;QAEvD,IAAI,WAAW,CAAC,mBAAmB,EAAE,EAAE,CAAC;YACtC,MAAM,MAAM,GAAG,MAAM,WAAW,CAAC,kBAAkB,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC;YACxE,MAAM,YAAY,GAAG,MAAM,EAAE,YAAY,IAAI,OAAO,CAAC,GAAG,CAAC,mBAAmB,CAAC;YAC7E,IAAI,YAAY,EAAE,CAAC;gBACjB,GAAG,GAAG,YAAY,CAAC,WAAW,EAAE,GAAG,WAAW,CAAC;YACjD,CAAC;QACH,CAAC;QAED,IAAI,OAAO,CAAC,GAAG,EAAE,qBAAqB,IAAI,CAAC,CAAC,OAAO,CAAC,GAAG,EAAE,qBAAqB,IAAI,EAAE,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;YACrG,MAAM,WAAW,GAAG,GAAG,CAAC,OAAO,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC;YACjD,GAAG,GAAG,OAAO,CAAC,GAAG,EAAE,qBAAqB,CAAC,OAAO,CAAC,UAAU,EAAE,WAAW,CAAC,CAAC;QAC5E,CAAC;QAED,OAAO,GAAG,CAAC;IACb,CAAC;CACF"}
|
|
@@ -2,13 +2,14 @@ import { execSfdxJson, uxLog } from './index.js';
|
|
|
2
2
|
import c from 'chalk';
|
|
3
3
|
import ora from 'ora';
|
|
4
4
|
import { WebSocketClient } from '../websocketClient.js';
|
|
5
|
+
import { generateCsvFile, generateReportPath } from './filesUtils.js';
|
|
5
6
|
// Constants for record limits
|
|
6
7
|
const MAX_CHUNKS = Number(process.env.SOQL_MAX_BATCHES ?? 50);
|
|
7
8
|
const CHUNK_SIZE = Number(process.env.SOQL_CHUNK_SIZE ?? 200);
|
|
8
9
|
const MAX_RECORDS = MAX_CHUNKS * CHUNK_SIZE;
|
|
9
10
|
// Perform simple SOQL query (max results: 10000)
|
|
10
11
|
export async function soqlQuery(soqlQuery, conn) {
|
|
11
|
-
uxLog(this, c.grey('[SOQL Query] ' +
|
|
12
|
+
uxLog("log", this, c.grey('[SOQL Query] ' +
|
|
12
13
|
c.italic(soqlQuery.length > 500 ? soqlQuery.substr(0, 500) + '...' : soqlQuery)));
|
|
13
14
|
// First query
|
|
14
15
|
const res = await conn.query(soqlQuery);
|
|
@@ -16,26 +17,26 @@ export async function soqlQuery(soqlQuery, conn) {
|
|
|
16
17
|
let batchCount = 1;
|
|
17
18
|
// Get all page results
|
|
18
19
|
while (pageRes.done === false && pageRes.nextRecordsUrl && batchCount < MAX_CHUNKS) {
|
|
19
|
-
uxLog(this, c.grey(`Fetching batch ${batchCount + 1}/${MAX_CHUNKS}...`));
|
|
20
|
+
uxLog("log", this, c.grey(`Fetching batch ${batchCount + 1}/${MAX_CHUNKS}...`));
|
|
20
21
|
pageRes = await conn.queryMore(pageRes.nextRecordsUrl);
|
|
21
22
|
res.records.push(...pageRes.records);
|
|
22
23
|
batchCount++;
|
|
23
24
|
}
|
|
24
25
|
if (!pageRes.done) {
|
|
25
|
-
uxLog(this, c.yellow(`Warning: Query limit of ${MAX_RECORDS} records reached. Some records were not retrieved.`));
|
|
26
|
-
uxLog(this, c.yellow(`Consider using bulkQuery for larger datasets.`));
|
|
26
|
+
uxLog("warning", this, c.yellow(`Warning: Query limit of ${MAX_RECORDS} records reached. Some records were not retrieved.`));
|
|
27
|
+
uxLog("warning", this, c.yellow(`Consider using bulkQuery for larger datasets.`));
|
|
27
28
|
}
|
|
28
29
|
if (batchCount > 1) {
|
|
29
|
-
uxLog(this, c.grey(`[SOQL Query] Retrieved ${res.records.length} records in ${batchCount} chunks(s)`));
|
|
30
|
+
uxLog("log", this, c.grey(`[SOQL Query] Retrieved ${res.records.length} records in ${batchCount} chunks(s)`));
|
|
30
31
|
}
|
|
31
32
|
else {
|
|
32
|
-
uxLog(this, c.grey(`[SOQL Query] Retrieved ${res.records.length} records`));
|
|
33
|
+
uxLog("log", this, c.grey(`[SOQL Query] Retrieved ${res.records.length} records`));
|
|
33
34
|
}
|
|
34
35
|
return res;
|
|
35
36
|
}
|
|
36
37
|
// Perform simple SOQL query with Tooling API
|
|
37
38
|
export async function soqlQueryTooling(soqlQuery, conn) {
|
|
38
|
-
uxLog(this, c.grey('[SOQL Query Tooling] ' +
|
|
39
|
+
uxLog("log", this, c.grey('[SOQL Query Tooling] ' +
|
|
39
40
|
c.italic(soqlQuery.length > 500 ? soqlQuery.substr(0, 500) + '...' : soqlQuery)));
|
|
40
41
|
// First query
|
|
41
42
|
const res = await conn.tooling.query(soqlQuery);
|
|
@@ -48,10 +49,10 @@ export async function soqlQueryTooling(soqlQuery, conn) {
|
|
|
48
49
|
batchCount++;
|
|
49
50
|
}
|
|
50
51
|
if (batchCount > 1) {
|
|
51
|
-
uxLog(this, c.grey(`[SOQL Query Tooling] Retrieved ${res.records.length} records in ${batchCount} chunks(s)`));
|
|
52
|
+
uxLog("log", this, c.grey(`[SOQL Query Tooling] Retrieved ${res.records.length} records in ${batchCount} chunks(s)`));
|
|
52
53
|
}
|
|
53
54
|
else {
|
|
54
|
-
uxLog(this, c.grey(`[SOQL Query Tooling] Retrieved ${res.records.length} records`));
|
|
55
|
+
uxLog("log", this, c.grey(`[SOQL Query Tooling] Retrieved ${res.records.length} records`));
|
|
55
56
|
}
|
|
56
57
|
return res;
|
|
57
58
|
}
|
|
@@ -60,7 +61,7 @@ const maxRetry = Number(process.env.BULK_QUERY_RETRY || 5);
|
|
|
60
61
|
// Same than soqlQuery but using bulk. Do not use if there will be too many results for javascript to handle in memory
|
|
61
62
|
export async function bulkQuery(soqlQuery, conn, retries = 3) {
|
|
62
63
|
const queryLabel = soqlQuery.length > 500 ? soqlQuery.substr(0, 500) + '...' : soqlQuery;
|
|
63
|
-
uxLog(this, c.grey('[BulkApiV2] ' + c.italic(queryLabel)));
|
|
64
|
+
uxLog("log", this, c.grey('[BulkApiV2] ' + c.italic(queryLabel)));
|
|
64
65
|
conn.bulk.pollInterval = 5000; // 5 sec
|
|
65
66
|
conn.bulk.pollTimeout = 60000; // 60 sec
|
|
66
67
|
// Start query
|
|
@@ -68,14 +69,14 @@ export async function bulkQuery(soqlQuery, conn, retries = 3) {
|
|
|
68
69
|
spinnerQ = ora({ text: `[BulkApiV2] Bulk Query: ${queryLabel}`, spinner: 'moon' }).start();
|
|
69
70
|
const recordStream = await conn.bulk2.query(soqlQuery);
|
|
70
71
|
recordStream.on('error', (err) => {
|
|
71
|
-
uxLog(this, c.yellow('Bulk Query error: ' + err));
|
|
72
|
+
uxLog("warning", this, c.yellow('Bulk Query error: ' + err));
|
|
72
73
|
globalThis.sfdxHardisFatalError = true;
|
|
73
74
|
});
|
|
74
75
|
// Wait for all results
|
|
75
76
|
const records = await recordStream.toArray();
|
|
76
77
|
spinnerQ.succeed(`[BulkApiV2] Bulk Query completed with ${records.length} results.`);
|
|
77
78
|
if (WebSocketClient.isAliveWithLwcUI()) {
|
|
78
|
-
uxLog(this, c.grey(`[BulkApiV2] Bulk Query completed with ${records.length} results.`));
|
|
79
|
+
uxLog("log", this, c.grey(`[BulkApiV2] Bulk Query completed with ${records.length} results.`));
|
|
79
80
|
}
|
|
80
81
|
return { records: records };
|
|
81
82
|
}
|
|
@@ -83,7 +84,7 @@ export async function bulkQuery(soqlQuery, conn, retries = 3) {
|
|
|
83
84
|
spinnerQ.fail(`[BulkApiV2] Bulk query error: ${e.message}`);
|
|
84
85
|
// Try again if the reason is a timeout and max number of retries is not reached yet
|
|
85
86
|
if ((e + '').includes('ETIMEDOUT') && retries < maxRetry) {
|
|
86
|
-
uxLog(this, c.yellow('[BulkApiV2] Bulk Query retry attempt #' + retries + 1));
|
|
87
|
+
uxLog("warning", this, c.yellow('[BulkApiV2] Bulk Query retry attempt #' + retries + 1));
|
|
87
88
|
return await bulkQuery(soqlQuery, conn, retries + 1);
|
|
88
89
|
}
|
|
89
90
|
else {
|
|
@@ -126,11 +127,11 @@ export async function bulkQueryByChunks(soqlQuery, conn, batchSize = 100000, ret
|
|
|
126
127
|
let spinner;
|
|
127
128
|
// Same than soqlQuery but using bulk. Do not use if there will be too many results for javascript to handle in memory
|
|
128
129
|
export async function bulkUpdate(objectName, action, records, conn) {
|
|
129
|
-
uxLog(this, c.grey(`
|
|
130
|
+
uxLog("log", this, c.grey(`[BulkApiV2] Bulk ${c.bold(action.toUpperCase())} on (${c.bold(records.length)} records of object ${c.bold(objectName)}`));
|
|
130
131
|
conn.bulk2.pollInterval = 5000; // 5 sec
|
|
131
132
|
conn.bulk2.pollTimeout = 60000; // 60 sec
|
|
132
133
|
// Initialize Job
|
|
133
|
-
spinner = ora({ text: `[BulkApiV2] Bulk
|
|
134
|
+
spinner = ora({ text: `[BulkApiV2] Bulk ${c.bold(action.toUpperCase())} on (${c.bold(records.length)} records of object ${c.bold(objectName)}`, spinner: 'moon' }).start();
|
|
134
135
|
const job = conn.bulk2.createJob({
|
|
135
136
|
operation: action,
|
|
136
137
|
object: objectName,
|
|
@@ -151,7 +152,24 @@ export async function bulkUpdate(objectName, action, records, conn) {
|
|
|
151
152
|
});
|
|
152
153
|
await job.poll();
|
|
153
154
|
const res = await job.getAllResults();
|
|
154
|
-
spinner.succeed(`Bulk
|
|
155
|
+
spinner.succeed(`[BulkApiV2] Bulk ${action.toUpperCase()} on ${objectName} completed.`);
|
|
156
|
+
uxLog("log", this, c.grey(`[BulkApiV2] Bulk ${action.toUpperCase()} on ${objectName} completed.
|
|
157
|
+
- Success: ${res.successfulResults.length} records
|
|
158
|
+
- Failed: ${res.failedResults.length} records
|
|
159
|
+
- Unprocessed: ${res.unprocessedRecords.length} records`));
|
|
160
|
+
const outputFile = await generateReportPath('bulk', `${objectName}-${action}`, { withDate: true });
|
|
161
|
+
if (res.failedResults.length > 0) {
|
|
162
|
+
uxLog("warning", this, c.yellow(`[BulkApiV2] Some records failed to ${action}. Check the results for details.`));
|
|
163
|
+
}
|
|
164
|
+
await generateCsvFile(res.successfulResults, outputFile.replace('.csv', '-successful.csv'), {
|
|
165
|
+
csvFileTitle: `CSV: ${objectName} - ${action} - Successful`,
|
|
166
|
+
noExcel: true
|
|
167
|
+
});
|
|
168
|
+
await generateCsvFile(res.failedResults, outputFile.replace('.csv', '-failed.csv'), {
|
|
169
|
+
csvFileTitle: `CSV: ${objectName} - ${action} - Failed`,
|
|
170
|
+
noExcel: true
|
|
171
|
+
});
|
|
172
|
+
// Return results
|
|
155
173
|
return res;
|
|
156
174
|
}
|
|
157
175
|
export async function bulkDelete(objectName, recordIds, conn) {
|
|
@@ -159,14 +177,14 @@ export async function bulkDelete(objectName, recordIds, conn) {
|
|
|
159
177
|
return await bulkUpdate(objectName, "delete", records, conn);
|
|
160
178
|
}
|
|
161
179
|
export async function bulkDeleteTooling(objectName, recordsIds, conn) {
|
|
162
|
-
uxLog(this, c.grey(`[ToolingApi] Delete ${recordsIds.length} records on ${objectName}: ${JSON.stringify(recordsIds)}`));
|
|
180
|
+
uxLog("log", this, c.grey(`[ToolingApi] Delete ${recordsIds.length} records on ${objectName}: ${JSON.stringify(recordsIds)}`));
|
|
163
181
|
try {
|
|
164
182
|
const deleteJobResults = await conn.tooling.destroy(objectName, recordsIds, { allOrNone: false });
|
|
165
183
|
return deleteJobResults;
|
|
166
184
|
}
|
|
167
185
|
catch (e) {
|
|
168
|
-
uxLog(this, c.yellow(`[ToolingApi] jsforce error while calling Tooling API. Fallback to to unitary delete (longer but should work !)`));
|
|
169
|
-
uxLog(this, c.grey(e.message));
|
|
186
|
+
uxLog("warning", this, c.yellow(`[ToolingApi] jsforce error while calling Tooling API. Fallback to to unitary delete (longer but should work !)`));
|
|
187
|
+
uxLog("log", this, c.grey(e.message));
|
|
170
188
|
const deleteJobResults = [];
|
|
171
189
|
for (const record of recordsIds) {
|
|
172
190
|
const deleteCommand = `sf data:delete:record --sobject ${objectName} --record-id ${record} --target-org ${conn.getUsername()} --use-tooling-api`;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"apiUtils.js","sourceRoot":"","sources":["../../../src/common/utils/apiUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AACjD,OAAO,CAAC,MAAM,OAAO,CAAC;AAEtB,OAAO,GAAY,MAAM,KAAK,CAAC;AAC/B,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"apiUtils.js","sourceRoot":"","sources":["../../../src/common/utils/apiUtils.ts"],"names":[],"mappings":"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"}
|
|
@@ -58,12 +58,12 @@ export async function authOrg(orgAlias, options) {
|
|
|
58
58
|
globalThis.currentOrgApiVersion = orgInfoResult.result.apiVersion;
|
|
59
59
|
}
|
|
60
60
|
// Set as default username or devhubusername
|
|
61
|
-
uxLog(this, `[sfdx-hardis] You are already ${c.green('connected')} as ${c.green(orgInfoResult.result.username)} on org ${c.green(orgInfoResult.result.instanceUrl)} (apiVersion ${globalThis.currentOrgApiVersion})`);
|
|
61
|
+
uxLog("other", this, `[sfdx-hardis] You are already ${c.green('connected')} as ${c.green(orgInfoResult.result.username)} on org ${c.green(orgInfoResult.result.instanceUrl)} (apiVersion ${globalThis.currentOrgApiVersion})`);
|
|
62
62
|
if (orgInfoResult.result.expirationDate) {
|
|
63
|
-
uxLog(this, c.cyan(`[sfdx-hardis] Org expiration date: ${c.yellow(orgInfoResult.result.expirationDate)}`));
|
|
63
|
+
uxLog("action", this, c.cyan(`[sfdx-hardis] Org expiration date: ${c.yellow(orgInfoResult.result.expirationDate)}`));
|
|
64
64
|
}
|
|
65
65
|
if (!isCI) {
|
|
66
|
-
uxLog(this, c.yellow(c.italic(`[sfdx-hardis] If this is NOT the org you want to play with, ${c.whiteBright(c.bold('hit CTRL+C'))}, then input ${c.whiteBright(c.bold('sf hardis:org:select'))}`)));
|
|
66
|
+
uxLog("warning", this, c.yellow(c.italic(`[sfdx-hardis] If this is NOT the org you want to play with, ${c.whiteBright(c.bold('hit CTRL+C'))}, then input ${c.whiteBright(c.bold('sf hardis:org:select'))}`)));
|
|
67
67
|
}
|
|
68
68
|
if (setDefaultOrg) {
|
|
69
69
|
const setDefaultOrgCommand = `sf config set ${alias ? alias : isDevHub ? 'target-dev-hub' : 'target-org'}=${orgInfoResult.result.username}`;
|
|
@@ -96,7 +96,7 @@ export async function authOrg(orgAlias, options) {
|
|
|
96
96
|
(isDevHub ? ` --set-default-dev-hub` : (setDefaultOrg ? ` --set-default` : '')) +
|
|
97
97
|
(!orgAlias.includes('force://') ? ` --alias ${orgAlias}` : '');
|
|
98
98
|
await execCommand(authCommand, this, { fail: true, output: false });
|
|
99
|
-
uxLog(this, c.cyan('Successfully logged using sfdxAuthUrl'));
|
|
99
|
+
uxLog("action", this, c.cyan('Successfully logged using sfdxAuthUrl'));
|
|
100
100
|
await fs.remove(authFile);
|
|
101
101
|
return;
|
|
102
102
|
}
|
|
@@ -196,7 +196,7 @@ export async function authOrg(orgAlias, options) {
|
|
|
196
196
|
loginCommandArgs.push('--set-default');
|
|
197
197
|
}
|
|
198
198
|
const commandStr = 'sf ' + loginCommandArgs.join(' ');
|
|
199
|
-
uxLog(this, `[sfdx-hardis][command] ${c.bold(c.bgWhite(c.blue(commandStr)))}`);
|
|
199
|
+
uxLog("other", this, `[sfdx-hardis][command] ${c.bold(c.bgWhite(c.blue(commandStr)))}`);
|
|
200
200
|
loginResult = crossSpawn.sync('sf', loginCommandArgs, { stdio: 'inherit' });
|
|
201
201
|
}
|
|
202
202
|
// Web Login if device login not used
|
|
@@ -211,13 +211,13 @@ export async function authOrg(orgAlias, options) {
|
|
|
211
211
|
catch (e) {
|
|
212
212
|
// Give instructions if server is unavailable
|
|
213
213
|
if ((e.message || '').includes('Cannot start the OAuth redirect server on port')) {
|
|
214
|
-
uxLog(this, c.yellow(c.bold('You might have a ghost SF CLI command. Open Task Manager, search for Node.js processes, kill them, then try again')));
|
|
214
|
+
uxLog("warning", this, c.yellow(c.bold('You might have a ghost SF CLI command. Open Task Manager, search for Node.js processes, kill them, then try again')));
|
|
215
215
|
}
|
|
216
216
|
throw e;
|
|
217
217
|
}
|
|
218
218
|
}
|
|
219
219
|
await clearCache('sf org list');
|
|
220
|
-
uxLog(this, c.grey(JSON.stringify(loginResult, null, 2)));
|
|
220
|
+
uxLog("log", this, c.grey(JSON.stringify(loginResult, null, 2)));
|
|
221
221
|
logged = loginResult.status === 0;
|
|
222
222
|
username = loginResult?.username || 'err';
|
|
223
223
|
instanceUrl = loginResult?.instanceUrl || instanceUrl;
|
|
@@ -246,7 +246,7 @@ export async function authOrg(orgAlias, options) {
|
|
|
246
246
|
username = configGetRes?.result[0]?.value || '';
|
|
247
247
|
}
|
|
248
248
|
}
|
|
249
|
-
uxLog(this, `Successfully logged to ${c.green(instanceUrl)} with ${c.green(username)}`);
|
|
249
|
+
uxLog("other", this, `Successfully logged to ${c.green(instanceUrl)} with ${c.green(username)}`);
|
|
250
250
|
WebSocketClient.sendRefreshStatusMessage();
|
|
251
251
|
// Assign org to SfCommands
|
|
252
252
|
// if (isDevHub) {
|
|
@@ -258,7 +258,7 @@ export async function authOrg(orgAlias, options) {
|
|
|
258
258
|
// }
|
|
259
259
|
// Display warning message in case of local usage (not CI), and not login command
|
|
260
260
|
if (!(options?.Command?.id || "").startsWith("hardis:auth:login") && updateSfCliCommandOrg === true) {
|
|
261
|
-
uxLog(this, c.yellow("*** IF YOU SEE AN AUTH ERROR PLEASE RUN AGAIN THE SAME COMMAND :) ***"));
|
|
261
|
+
uxLog("warning", this, c.yellow("*** IF YOU SEE AN AUTH ERROR PLEASE RUN AGAIN THE SAME COMMAND :) ***"));
|
|
262
262
|
}
|
|
263
263
|
}
|
|
264
264
|
else {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"authUtils.js","sourceRoot":"","sources":["../../../src/common/utils/authUtils.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"authUtils.js","sourceRoot":"","sources":["../../../src/common/utils/authUtils.ts"],"names":[],"mappings":"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"}
|
|
@@ -19,7 +19,7 @@ function findSubstringInFile(filePath, substring) {
|
|
|
19
19
|
// Detect all test classes under the repository
|
|
20
20
|
export async function getApexTestClasses(classRegexFilter = "", excludeSeeAllData = false) {
|
|
21
21
|
const pathToBrowser = process.cwd();
|
|
22
|
-
uxLog(this, c.grey(`Finding all repository APEX tests in ${c.bold(pathToBrowser)}`));
|
|
22
|
+
uxLog("log", this, c.grey(`Finding all repository APEX tests in ${c.bold(pathToBrowser)}`));
|
|
23
23
|
// Find all APEX classes
|
|
24
24
|
const testClasses = [];
|
|
25
25
|
const allFiles = await readFilesRecursive(pathToBrowser)
|
|
@@ -34,7 +34,7 @@ export async function getApexTestClasses(classRegexFilter = "", excludeSeeAllDat
|
|
|
34
34
|
const className = entry.fileName.substring(0, entry.fileName.length - 4);
|
|
35
35
|
// Check if need to exclude SeeAllData=true
|
|
36
36
|
if (excludeSeeAllData === true && (await findSubstringInFile(entry.fullPath, "SeeAllData=true"))) {
|
|
37
|
-
uxLog(this, c.grey(`Filtered class ${className} because is contains SeeAllData=true`));
|
|
37
|
+
uxLog("log", this, c.grey(`Filtered class ${className} because is contains SeeAllData=true`));
|
|
38
38
|
continue;
|
|
39
39
|
}
|
|
40
40
|
// Check if regex filter
|
|
@@ -43,7 +43,7 @@ export async function getApexTestClasses(classRegexFilter = "", excludeSeeAllDat
|
|
|
43
43
|
}
|
|
44
44
|
}
|
|
45
45
|
}
|
|
46
|
-
uxLog(this, c.grey(`Found APEX tests: ${c.bold(testClasses.join())}`));
|
|
46
|
+
uxLog("log", this, c.grey(`Found APEX tests: ${c.bold(testClasses.join())}`));
|
|
47
47
|
return testClasses;
|
|
48
48
|
}
|
|
49
49
|
async function matchRegexFilter(classRegexFilter, className) {
|
|
@@ -51,7 +51,7 @@ async function matchRegexFilter(classRegexFilter, className) {
|
|
|
51
51
|
if ((await countRegexMatches(new RegExp(classRegexFilter), className)) > 0) {
|
|
52
52
|
return true;
|
|
53
53
|
}
|
|
54
|
-
uxLog(this, c.grey(`Filtered class ${className} because not matching RegExp ${classRegexFilter}`));
|
|
54
|
+
uxLog("log", this, c.grey(`Filtered class ${className} because not matching RegExp ${classRegexFilter}`));
|
|
55
55
|
return false;
|
|
56
56
|
}
|
|
57
57
|
return true;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"classUtils.js","sourceRoot":"","sources":["../../../src/common/utils/classUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AACtD,OAAO,CAAC,MAAM,OAAO,CAAC;AACtB,OAAO,kBAAkB,MAAM,sBAAsB,CAAC;AACtD,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAC7B,OAAO,KAAK,EAAE,MAAM,IAAI,CAAC;AAEzB,SAAS,mBAAmB,CAAC,QAAgB,EAAE,SAAiB;IAC9D,OAAO,IAAI,OAAO,CAAU,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QAC9C,EAAE,CAAC,QAAQ,CAAC,QAAQ,EAAE,MAAM,EAAE,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE;YAC1C,IAAI,GAAG,EAAE,CAAC;gBACR,MAAM,CAAC,GAAG,CAAC,CAAC;gBACZ,OAAO;YACT,CAAC;YACD,MAAM,OAAO,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC;YACnC,SAAS,GAAG,SAAS,CAAC,WAAW,EAAE,CAAC;YACpC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QAC7C,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC;AAED,+CAA+C;AAC/C,MAAM,CAAC,KAAK,UAAU,kBAAkB,CAAC,mBAA2B,EAAE,EAAE,iBAAiB,GAAG,KAAK;IAC/F,MAAM,aAAa,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;IACpC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,wCAAwC,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"classUtils.js","sourceRoot":"","sources":["../../../src/common/utils/classUtils.ts"],"names":[],"mappings":"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"}
|
|
@@ -13,9 +13,9 @@ export async function importData(sfdmuPath, commandThis, options = {}) {
|
|
|
13
13
|
if (dtl?.isDelete === true) {
|
|
14
14
|
throw new SfError('Your export.json contains deletion info, please use appropriate delete command');
|
|
15
15
|
}
|
|
16
|
-
uxLog(commandThis, c.cyan(`Importing data from ${c.green(dtl?.full_label)} ...`));
|
|
16
|
+
uxLog("action", commandThis, c.cyan(`Importing data from ${c.green(dtl?.full_label)} ...`));
|
|
17
17
|
/* jscpd:ignore-start */
|
|
18
|
-
uxLog(commandThis, c.italic(c.grey(dtl?.description)));
|
|
18
|
+
uxLog("log", commandThis, c.italic(c.grey(dtl?.description)));
|
|
19
19
|
const targetUsername = options.targetUsername || commandThis.org.getConnection().username;
|
|
20
20
|
await fs.ensureDir(path.join(sfdmuPath, 'logs'));
|
|
21
21
|
const config = await getConfig('branch');
|
|
@@ -47,11 +47,11 @@ export async function deleteData(sfdmuPath, commandThis, options = {}) {
|
|
|
47
47
|
throw new SfError(`To run this delete SFDMU script in production, you need to define "runnableInProduction": true in its export.json file`);
|
|
48
48
|
}
|
|
49
49
|
if (isProdOrg === true && !config.sfdmuCanModify) {
|
|
50
|
-
uxLog(this, c.yellow(`If you see a sfdmu error, you probably need to add a property sfdmuCanModify: YOUR_ORG_INSTANCE_URL in the related config/branches/.sfdx-hardis.YOUR_BRANCH.yml config file.`));
|
|
50
|
+
uxLog("warning", this, c.yellow(`If you see a sfdmu error, you probably need to add a property sfdmuCanModify: YOUR_ORG_INSTANCE_URL in the related config/branches/.sfdx-hardis.YOUR_BRANCH.yml config file.`));
|
|
51
51
|
}
|
|
52
52
|
// Delete using sfdmu
|
|
53
|
-
uxLog(commandThis, c.cyan(`Deleting data from ${c.green(dtl?.full_label)} ...`));
|
|
54
|
-
uxLog(commandThis, c.italic(c.grey(dtl?.description)));
|
|
53
|
+
uxLog("action", commandThis, c.cyan(`Deleting data from ${c.green(dtl?.full_label)} ...`));
|
|
54
|
+
uxLog("log", commandThis, c.italic(c.grey(dtl?.description)));
|
|
55
55
|
const targetUsername = options.targetUsername || options.conn.username;
|
|
56
56
|
await fs.ensureDir(path.join(sfdmuPath, 'logs'));
|
|
57
57
|
const dataImportCommand = 'sf sfdmu:run' +
|
|
@@ -74,8 +74,8 @@ export async function exportData(sfdmuPath, commandThis, options = {}) {
|
|
|
74
74
|
throw new SfError('Your export.json contains deletion info, please use appropriate delete command');
|
|
75
75
|
}
|
|
76
76
|
/* jscpd:ignore-end */
|
|
77
|
-
uxLog(commandThis, c.cyan(`Exporting data from ${c.green(dtl?.full_label)} ...`));
|
|
78
|
-
uxLog(commandThis, c.italic(c.grey(dtl?.description)));
|
|
77
|
+
uxLog("action", commandThis, c.cyan(`Exporting data from ${c.green(dtl?.full_label)} ...`));
|
|
78
|
+
uxLog("log", commandThis, c.italic(c.grey(dtl?.description)));
|
|
79
79
|
const sourceUsername = options.sourceUsername || commandThis.org.getConnection().username;
|
|
80
80
|
await fs.ensureDir(path.join(sfdmuPath, 'logs'));
|
|
81
81
|
const dataImportCommand = `sf sfdmu:run --sourceusername ${sourceUsername} --targetusername csvfile -p ${sfdmuPath} --noprompt`; // keep target username until sfdmu migrates to SF cli base
|
|
@@ -118,7 +118,7 @@ export async function selectDataWorkspace(opts = { selectDataLabel: 'Please sele
|
|
|
118
118
|
export async function getDataWorkspaceDetail(dataWorkspace) {
|
|
119
119
|
const exportFile = path.join(dataWorkspace, 'export.json');
|
|
120
120
|
if (!fs.existsSync(exportFile)) {
|
|
121
|
-
uxLog(this, c.yellow(`Your SFDMU folder ${c.bold(dataWorkspace)} must contain an ${c.bold('export.json')} configuration file`));
|
|
121
|
+
uxLog("warning", this, c.yellow(`Your SFDMU folder ${c.bold(dataWorkspace)} must contain an ${c.bold('export.json')} configuration file`));
|
|
122
122
|
return null;
|
|
123
123
|
}
|
|
124
124
|
const exportFileJson = JSON.parse(await fs.readFile(exportFile, 'utf8'));
|