Skip to content
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

@W-16566993: Migrating From SFDX to SFCLI #3829

Merged
merged 11 commits into from
Oct 14, 2024
Merged

Conversation

lakshmi2506
Copy link
Contributor

@lakshmi2506 lakshmi2506 commented Sep 17, 2024

W-16566993

Migrating from SFDX CLI to SF CLI

@lakshmi2506 lakshmi2506 requested a review from a team as a code owner September 17, 2024 10:39
@lakshmi2506
Copy link
Contributor Author

Hi @jkasturi-sf @jstvz @vsbharath

Please review the PR
Thank you

Copy link
Contributor

@jstvz jstvz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @lakshmi2506. Needs a few changes.

cumulusci/core/keychain/base_project_keychain.py Outdated Show resolved Hide resolved
cumulusci/core/config/scratch_org_config.py Outdated Show resolved Hide resolved
cumulusci/core/config/scratch_org_config.py Outdated Show resolved Hide resolved
cumulusci/core/config/scratch_org_config.py Outdated Show resolved Hide resolved
cumulusci/core/keychain/base_project_keychain.py Outdated Show resolved Hide resolved
cumulusci/tasks/connectedapp.py Outdated Show resolved Hide resolved
cumulusci/tasks/salesforce/sourcetracking.py Outdated Show resolved Hide resolved
@@ -302,10 +302,11 @@ def retrieve_components(
os.path.join(package_xml_path, "package.xml"),
"-w",
"5",
"-c",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why add the --ignore-conflicts option here? We weren't passing --forceoverwrite before?

Copy link
Contributor Author

@lakshmi2506 lakshmi2506 Sep 24, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(cci_venv) l.ramireddy@lramire-ltmnypt easy-org-provision % cci task run retrieve_changes --org dev
[09/24/24 11:17:35] Getting org info from Salesforce CLI for [email protected]
[09/24/24 11:17:39] Beginning task: RetrieveChanges
As user: [email protected]
In org: 00DO4000006Oxhp

                Querying Salesforce for changed source members                                                     
                Profile: Admin                                                                                     

[09/24/24 11:17:40] Retrieving components with command: sf project retrieve start -a 59.0 -x
/var/folders/tq/td7hb8n97tzdkw6011gqn55h0000gn/T/tmp35ank3o5/package.xml -w 5
STATE FULL NAME TYPE FILE PATH
──────── ───────── ─────── ──────────────────────────────────────────────────────────────────────────────────────────────────────────────────
Conflict Admin Profile /Users/l.ramireddy/Desktop/easy-org-provision/force-app/main/default/provision_org/profiles/Admin.profile-meta.xml
Preparing retrieve request... Error
Error (1): There are changes in your local files that conflict with the org changes you're trying to retrieve.

Try this:

To overwrite the local changes, rerun this command with the --ignore-conflicts flag.
To overwrite the remote changes, run the "sf project deploy start" command with the --ignore-conflicts flag.

Error: Command exited with return code 1

Which used to work properly with the old sfdx commands. To avoid this errors added the --ignore-conflicts

cumulusci/tasks/salesforce/tests/test_sourcetracking.py Outdated Show resolved Hide resolved
docs/env-var-reference.md Outdated Show resolved Hide resolved
@jstvz jstvz added internal Pull requests from IPDE team and removed in review labels Sep 23, 2024
@lakshmi2506 lakshmi2506 requested a review from jstvz September 24, 2024 06:20
@jstvz jstvz added the critical-change Listed under Critical Changes in release notes label Sep 24, 2024
@jstvz jstvz changed the base branch from main to cumulusci-v4 October 14, 2024 15:39
@jstvz jstvz merged commit e3658cf into cumulusci-v4 Oct 14, 2024
21 checks passed
@jstvz jstvz deleted the feature/sfdx_to_sf branch October 14, 2024 15:39
jstvz added a commit that referenced this pull request Nov 12, 2024
[W-16566993](https://gus.lightning.force.com/a07EE00001zeux8YAA)

Migrating from SFDX CLI to SF CLI

---------

Co-authored-by: James Estevez <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
critical-change Listed under Critical Changes in release notes internal Pull requests from IPDE team
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants