-
Notifications
You must be signed in to change notification settings - Fork 1.4k
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
chore: renamed non-inclusive language #18319
Merged
Merged
Changes from all commits
Commits
Show all changes
12 commits
Select commit
Hold shift + click to select a range
9b69aeb
Renamed non-inclusive language
Gilbert09 2ef228c
Update plugin-server/src/worker/ingestion/event-pipeline/runner.ts
Gilbert09 a9973b7
Update UI snapshots for `chromium` (2)
github-actions[bot] 119900b
Update UI snapshots for `webkit` (2)
github-actions[bot] 083ba77
Update UI snapshots for `chromium` (2)
github-actions[bot] 054f820
Update UI snapshots for `webkit` (2)
github-actions[bot] d24c29f
Remove woke linting and revert any changes that arent blacklisting/wh…
Gilbert09 03842a3
Update UI snapshots for `chromium` (2)
github-actions[bot] 5c8c545
Added wokeignore to git ignore
Gilbert09 e5db976
Merge branch 'master' into tom/inclusion
Gilbert09 fcd6346
Update query snapshots
github-actions[bot] d069d2f
Update query snapshots
github-actions[bot] 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 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 |
---|---|---|
|
@@ -54,4 +54,4 @@ gen/ | |
.antlr | ||
upgrade/ | ||
hogvm/typescript/dist | ||
|
||
.wokeignore |
Binary file modified
BIN
-1.05 KB
(99%)
frontend/__snapshots__/scenes-app-notebooks--recordings-playlist.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains 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 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 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 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 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 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 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 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 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 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 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 |
---|---|---|
|
@@ -491,7 +491,7 @@ def test_api_social_login_cannot_create_second_organization(self, mock_sso_provi | |
response, "/login?error_code=no_new_organizations" | ||
) # show the user an error; operation not permitted | ||
|
||
def run_test_for_whitelisted_domain(self, mock_sso_providers, mock_request, mock_capture): | ||
def run_test_for_allowed_domain(self, mock_sso_providers, mock_request, mock_capture): | ||
# Make sure Google Auth is valid for this test instance | ||
mock_sso_providers.return_value = {"google-oauth2": True} | ||
|
||
|
@@ -536,18 +536,18 @@ def run_test_for_whitelisted_domain(self, mock_sso_providers, mock_request, mock | |
@mock.patch("posthog.api.authentication.get_instance_available_sso_providers") | ||
@mock.patch("posthog.tasks.user_identify.identify_task") | ||
@pytest.mark.ee | ||
def test_social_signup_with_whitelisted_domain_on_self_hosted( | ||
def test_social_signup_with_allowed_domain_on_self_hosted( | ||
self, mock_identify, mock_sso_providers, mock_request, mock_capture | ||
): | ||
self.run_test_for_whitelisted_domain(mock_sso_providers, mock_request, mock_capture) | ||
self.run_test_for_allowed_domain(mock_sso_providers, mock_request, mock_capture) | ||
|
||
@patch("posthoganalytics.capture") | ||
@mock.patch("ee.billing.billing_manager.BillingManager.update_billing_distinct_ids") | ||
@mock.patch("social_core.backends.base.BaseAuth.request") | ||
@mock.patch("posthog.api.authentication.get_instance_available_sso_providers") | ||
@mock.patch("posthog.tasks.user_identify.identify_task") | ||
@pytest.mark.ee | ||
def test_social_signup_with_whitelisted_domain_on_cloud( | ||
def test_social_signup_with_allowed_domain_on_cloud( | ||
self, | ||
mock_identify, | ||
mock_sso_providers, | ||
|
@@ -556,13 +556,13 @@ def test_social_signup_with_whitelisted_domain_on_cloud( | |
mock_capture, | ||
): | ||
with self.is_cloud(True): | ||
self.run_test_for_whitelisted_domain(mock_sso_providers, mock_request, mock_capture) | ||
self.run_test_for_allowed_domain(mock_sso_providers, mock_request, mock_capture) | ||
assert mock_update_distinct_ids.called_once() | ||
|
||
@mock.patch("social_core.backends.base.BaseAuth.request") | ||
@mock.patch("posthog.api.authentication.get_instance_available_sso_providers") | ||
@pytest.mark.ee | ||
def test_social_signup_with_whitelisted_domain_on_cloud_reverse(self, mock_sso_providers, mock_request): | ||
def test_social_signup_with_allowed_domain_on_cloud_reverse(self, mock_sso_providers, mock_request): | ||
with self.is_cloud(True): | ||
# user already exists | ||
User.objects.create(email="[email protected]", distinct_id=str(uuid.uuid4())) | ||
|
@@ -608,9 +608,7 @@ def test_social_signup_with_whitelisted_domain_on_cloud_reverse(self, mock_sso_p | |
@mock.patch("social_core.backends.base.BaseAuth.request") | ||
@mock.patch("posthog.api.authentication.get_instance_available_sso_providers") | ||
@pytest.mark.ee | ||
def test_cannot_social_signup_with_whitelisted_but_jit_provisioning_disabled( | ||
self, mock_sso_providers, mock_request | ||
): | ||
def test_cannot_social_signup_with_allowed_but_jit_provisioning_disabled(self, mock_sso_providers, mock_request): | ||
mock_sso_providers.return_value = {"google-oauth2": True} | ||
new_org = Organization.objects.create(name="Test org") | ||
OrganizationDomain.objects.create( | ||
|
@@ -639,7 +637,7 @@ def test_cannot_social_signup_with_whitelisted_but_jit_provisioning_disabled( | |
@mock.patch("social_core.backends.base.BaseAuth.request") | ||
@mock.patch("posthog.api.authentication.get_instance_available_sso_providers") | ||
@pytest.mark.ee | ||
def test_cannot_social_signup_with_whitelisted_but_unverified_domain(self, mock_sso_providers, mock_request): | ||
def test_cannot_social_signup_with_allowed_but_unverified_domain(self, mock_sso_providers, mock_request): | ||
mock_sso_providers.return_value = {"google-oauth2": True} | ||
new_org = Organization.objects.create(name="Test org") | ||
OrganizationDomain.objects.create( | ||
|
@@ -668,7 +666,7 @@ def test_cannot_social_signup_with_whitelisted_but_unverified_domain(self, mock_ | |
@mock.patch("social_core.backends.base.BaseAuth.request") | ||
@mock.patch("posthog.api.authentication.get_instance_available_sso_providers") | ||
@pytest.mark.ee | ||
def test_api_cannot_use_whitelist_for_different_domain(self, mock_sso_providers, mock_request): | ||
def test_api_cannot_use_allow_list_for_different_domain(self, mock_sso_providers, mock_request): | ||
mock_sso_providers.return_value = {"google-oauth2": True} | ||
new_org = Organization.objects.create(name="Test org") | ||
OrganizationDomain.objects.create( | ||
|
@@ -697,7 +695,7 @@ def test_api_cannot_use_whitelist_for_different_domain(self, mock_sso_providers, | |
@mock.patch("social_core.backends.base.BaseAuth.request") | ||
@mock.patch("posthog.api.authentication.get_instance_available_sso_providers") | ||
@pytest.mark.ee | ||
def test_social_signup_to_existing_org_without_whitelisted_domain_on_cloud(self, mock_sso_providers, mock_request): | ||
def test_social_signup_to_existing_org_without_allowed_domain_on_cloud(self, mock_sso_providers, mock_request): | ||
with self.is_cloud(True): | ||
mock_sso_providers.return_value = {"google-oauth2": True} | ||
Organization.objects.create(name="Hogflix Movies") | ||
|
This file contains 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
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.
Could this impact analytics that are relied on?
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.
Great question.
@tiina303 Git blame tells me you were the last around these parts of the code. Do you know whether there are any implications for changing this?
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.
ooh indeed great catch, it is changing the metric label, so yes filtering for it in
grafana-prod-us
would break / need updatingThere 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.
All good with this one. For any metrics I'd just search in the charts repo, where we have dashboards/alerts https://github.com/search?q=repo%3APostHog%2Fcharts%20blacklisted&type=code
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.
Sorry, I'm rather new with Grafana and I'm not too sure what I'm looking for in there. Considering the search in the charts repo returns nothing for me, are we all good, or are those two things not connected?
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.
yes the search returns nothing (for neither repo), so we don't use the label explicitly in alerts nor dashboards.
example alerts conf: https://github.com/PostHog/charts/blob/main/config/vmalert/alerts/pipeline.yml
example dashboard conf: https://github.com/PostHog/posthog-cloud-infra/blob/fb2a10888e5c8ac2cb7c2268f1c710e38e49c9f2/terraform/modules/grafana/dashboards/webhooks.json#L1165