Skip to content

feat: add support for custom base url filtering #3808

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.

Sign up for GitHub

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

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

feat: add support for custom base url filtering #3808

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
826f138
feat: add support for custom base url filtering
louis-murray Jun 27, 2024
d4a8151
chore: drop port from test url
louis-murray Jun 27, 2024
27ae35e
chore: fix test properly
louis-murray Jun 27, 2024
83162b0
Merge branch 'main' into customUrlFilter
jstvz Jul 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion cumulusci/core/config/org_config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
SANDBOX_MYDOMAIN_RE = re.compile(r"\.cs\d+\.my\.(.*)salesforce\.com")
MYDOMAIN_RE = re.compile(r"\.my\.(.*)salesforce\.com")


VersionInfo = namedtuple("VersionInfo", ["id", "number"])


Expand Down Expand Up @@ -155,10 +154,20 @@ def _refresh_token(self, keychain, connected_app):
@property
def lightning_base_url(self):
instance_url = self.instance_url.rstrip("/")
if "SF_CUSTOM_URL_RE" in os.environ and "SF_CUSTOM_URL_BASE" in os.environ:
checkCustom = True
SF_CUSTOM_URL_RE = re.compile(r"%s" % os.environ.get("SF_CUSTOM_URL_RE"))
else:
checkCustom = False

if SANDBOX_MYDOMAIN_RE.search(instance_url):
return SANDBOX_MYDOMAIN_RE.sub(r".lightning.\1force.com", instance_url)
elif MYDOMAIN_RE.search(instance_url):
return MYDOMAIN_RE.sub(r".lightning.\1force.com", instance_url)
elif checkCustom and SF_CUSTOM_URL_RE.search(instance_url):
return SF_CUSTOM_URL_RE.sub(
r"%s" % os.environ.get("SF_CUSTOM_URL_BASE"), instance_url
)
else:
return self.instance_url.split(".")[0] + ".lightning.force.com"

Expand Down
16 changes: 16 additions & 0 deletions cumulusci/core/config/tests/test_config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1035,6 +1035,22 @@ def test_lightning_base_url__mydomain(self):
config = OrgConfig({"instance_url": "https://foo.my.salesforce.com"}, "test")
assert config.lightning_base_url == "https://foo.lightning.force.com"

def test_lightning_base_url__env_provided(self):
with mock.patch.dict(
os.environ,
{
"SF_CUSTOM_URL_RE": "\\.test\\.url\\.dev",
"SF_CUSTOM_URL_BASE": ".api.url.dev",
},
):
config = OrgConfig(
{
"instance_url": "https://special.custom.test.url.dev",
},
"test",
)
assert config.lightning_base_url == "https://special.custom.api.url.dev"

@responses.activate
def test_get_salesforce_version(self):
responses.add(
Expand Down
Loading