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

fix: replace 'blocklist' and 'whitelist' with 'blocked' and 'allowed' #1077

Merged
merged 5 commits into from Jan 9, 2024

Conversation

jouni
Copy link
Member

@jouni jouni commented Dec 18, 2023

Fixes #645

Mark the existing methods as deprecated and introduce methods with new names.

Fall back to the old configuration properties if the new ones aren't used.

@CLAassistant
Copy link

CLAassistant commented Dec 18, 2023

CLA assistant check
All committers have signed the CLA.

@jouni
Copy link
Member Author

jouni commented Dec 18, 2023

I admit I did the changes almost “blindfolded”. I didn't run any tests or otherwise verify that it works. I hope someone can tell me how to do that, or do it for me 😄

Copy link
Contributor

@mcollovati mcollovati left a comment

Choose a reason for hiding this comment

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

A bunch of comments.
Validation is failing, I'll try it locally

@mcollovati
Copy link
Contributor

The same changes should be applied also on Flow repository.

jouni and others added 3 commits January 8, 2024 10:42
Co-authored-by: Marco Collovati <marco@vaadin.com>
Co-authored-by: Marco Collovati <marco@vaadin.com>
Copy link

sonarcloud bot commented Jan 8, 2024

Quality Gate Failed Quality Gate failed

Failed conditions

C Reliability Rating on New Code (required ≥ A)

See analysis details on SonarCloud

idea Catch issues before they fail your Quality Gate with our IDE extension SonarLint SonarLint

@Artur-
Copy link
Member

Artur- commented Jan 8, 2024

Shouldn't this be done in https://github.com/vaadin/flow/tree/main/vaadin-spring ? This repository is for old Flow versions

@mcollovati
Copy link
Contributor

Shouldn't this be done in https://github.com/vaadin/flow/tree/main/vaadin-spring ? This repository is for old Flow versions

I'll create a PR in the flow repo

Copy link
Contributor

@mcollovati mcollovati left a comment

Choose a reason for hiding this comment

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

The PR looks good, but tests are still failing, although they pass locally.
I'm looking into it, but in the meanwhile I'll create a specular PR on the Flow repository

@mcollovati
Copy link
Contributor

vaadin/flow#18405

@mcollovati
Copy link
Contributor

Tests failed because of issues with pnpm cache; browser console reported messages like

http://ip-address:8888/parent-template 0:0 Uncaught DOMException: Failed to execute 'define' on 'CustomElementRegist…-module" has already been used with this registry
http://ip-address:8888/parent-template 0:0 Uncaught DOMException: Failed to execute 'define' on 'CustomElementRegist…-module" has already been used with this registry

Cleaning pnpm cache before executing the validation fixed the job

@mcollovati
Copy link
Contributor

@mshabarov LGTM, I don't know if you also want to take a look at it

Copy link
Contributor

@mshabarov mshabarov left a comment

Choose a reason for hiding this comment

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

Looks good to me.

"Blocked-packages" and "allowed-packages" names are inline with what we previously discussed in Slack.

@mshabarov mshabarov merged commit 0af3dca into 12.4 Jan 9, 2024
4 of 5 checks passed
@mshabarov mshabarov deleted the fix/blocked-and-allowed branch January 9, 2024 07:20
@mshabarov
Copy link
Contributor

We have to pick this into 19.1 branch as well.

@vaadin-bot
Copy link
Collaborator

Hi @jouni , this commit cannot be picked to 19.1 by this bot, can you take a look and pick it manually?
Error Message: Error: Command failed: git cherry-pick 0af3dca
error: could not apply 0af3dca... fix: replace 'blocklist' and 'whitelist' with 'blocked' and 'allowed' (#1077)
hint: After resolving the conflicts, mark them with
hint: "git add/rm ", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".

mcollovati added a commit that referenced this pull request Jan 9, 2024
…#1077)

---------

Co-authored-by: Marco Collovati <marco@vaadin.com>
mcollovati added a commit that referenced this pull request Jan 9, 2024
@jouni
Copy link
Member Author

jouni commented Jan 11, 2024

Thanks for helping out with the finalization tasks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Alternative names for blacklisted-packages and whitelisted-packages
6 participants