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.

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

Jump to bottom

Remove mac-ca usage since it was only in tests #6043

Merged
merged 4 commits into from Oct 3, 2022
Merged

Remove mac-ca usage since it was only in tests #6043

merged 4 commits into from Oct 3, 2022

Conversation

Nokel81
Copy link
Collaborator

@Nokel81 Nokel81 commented Aug 17, 2022

  • Fully make injecting CAs injectable

Signed-off-by: Sebastian Malton sebastian@malton.name

resolves https://github.com/lensapp/lens/security/dependabot/45

@Nokel81 Nokel81 added the chore label Aug 17, 2022
@Nokel81 Nokel81 added this to the 6.1.0 milestone Aug 17, 2022
@Nokel81 Nokel81 requested a review from a team as a code owner August 17, 2022 16:04
@Nokel81 Nokel81 requested review from jweak and Iku-turso and removed request for a team August 17, 2022 16:04
aleksfront
aleksfront previously approved these changes Aug 18, 2022
View reviewed changes
@github-actions
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@Nokel81 Nokel81 force-pushed the remove-mac-ca-package branch 2 times, most recently from 75f926d to 732124d Compare August 18, 2022 14:37
@github-actions
Copy link
Contributor

Conflicts have been resolved. A maintainer will review the pull request shortly.

jansav
jansav previously approved these changes Aug 22, 2022
View reviewed changes
Copy link
Contributor

@jansav jansav left a comment

Choose a reason for hiding this comment

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

I don't see how PR name matches the implementation. Also this test seems to be something else than unit test?

However, the change here is minimal, so approving.

@Nokel81
Copy link
Collaborator Author

Nokel81 commented Aug 22, 2022

@jansav I had other stuff here... will try and investigate where it went

@Nokel81
Copy link
Collaborator Author

Nokel81 commented Aug 22, 2022

@jansav PTALA, I had to recreate the change oddly enough.

@Nokel81 Nokel81 force-pushed the remove-mac-ca-package branch 2 times, most recently from 4cf3a1e to 290acc5 Compare August 26, 2022 20:35
@github-actions
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions
Copy link
Contributor

Conflicts have been resolved. A maintainer will review the pull request shortly.

@Nokel81 Nokel81 removed this from the 6.1.0 milestone Sep 21, 2022
@github-actions
Copy link
Contributor

github-actions bot commented Oct 3, 2022

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions
Copy link
Contributor

github-actions bot commented Oct 3, 2022

Conflicts have been resolved. A maintainer will review the pull request shortly.

@github-actions
Copy link
Contributor

github-actions bot commented Oct 3, 2022

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@Nokel81
Make injecting CAs injectable, remove mac-ca as dependency
9bad482 
Signed-off-by: Sebastian Malton <sebastian@malton.name>
@Nokel81
Fix win-ca failing on electron renderer on windows
2702ed7 
Signed-off-by: Sebastian Malton <sebastian@malton.name>
@Nokel81
Fix the matcher under features/ for main
4ef3ea2 
Signed-off-by: Sebastian Malton <sebastian@malton.name>
@Nokel81
Fix lint
98d851a 
Signed-off-by: Sebastian Malton <sebastian@malton.name>
@Nokel81 Nokel81 added this to the 6.2.0 milestone Oct 3, 2022
@github-actions
Copy link
Contributor

github-actions bot commented Oct 3, 2022

Conflicts have been resolved. A maintainer will review the pull request shortly.

@Nokel81 Nokel81 merged commit f544386 into master Oct 3, 2022
@Nokel81 Nokel81 deleted the remove-mac-ca-package branch October 3, 2022 14:42
Nokel81 added a commit that referenced this pull request Oct 4, 2022
@Nokel81
Revert "Remove mac-ca usage since it was only in tests (#6043)"
a45449a 
This reverts commit f544386.
Nokel81 added a commit that referenced this pull request Oct 4, 2022
@Nokel81
Revert "Remove mac-ca usage since it was only in tests (#6043)"
fb1108a 
This reverts commit f544386.

Signed-off-by: Sebastian Malton <sebastian@malton.name>
Nokel81 added a commit that referenced this pull request Oct 4, 2022
@Nokel81
Revert "Remove mac-ca usage since it was only in tests (#6043)" (#6319)
ed073d6 
This reverts commit f544386.

Signed-off-by: Sebastian Malton <sebastian@malton.name>

Signed-off-by: Sebastian Malton <sebastian@malton.name>
Nokel81 added a commit that referenced this pull request Oct 4, 2022
@Nokel81
Remove mac-ca usage since it was only in tests (#6043)
0607ddc 
* Make injecting CAs injectable, remove mac-ca as dependency
* Fix win-ca failing on electron renderer on windows
* Fix the matcher under features/ for main

Signed-off-by: Sebastian Malton <sebastian@malton.name>
Nokel81 added a commit that referenced this pull request Oct 19, 2022
@Nokel81
Remove mac-ca usage since it was only in tests (#6043)
19b026a 
* Make injecting CAs injectable, remove mac-ca as dependency
* Fix win-ca failing on electron renderer on windows
* Fix the matcher under features/ for main

Signed-off-by: Sebastian Malton <sebastian@malton.name>
Nokel81 added a commit that referenced this pull request Oct 26, 2022
@Nokel81
Remove mac-ca usage since it was only in tests (#6043)
d4209ee 
* Make injecting CAs injectable, remove mac-ca as dependency
* Fix win-ca failing on electron renderer on windows
* Fix the matcher under features/ for main

Signed-off-by: Sebastian Malton <sebastian@malton.name>
Nokel81 added a commit that referenced this pull request Oct 31, 2022
@Nokel81
Remove mac-ca usage since it was only in tests (#6043)
e7076ca 
* Make injecting CAs injectable, remove mac-ca as dependency
* Fix win-ca failing on electron renderer on windows
* Fix the matcher under features/ for main

Signed-off-by: Sebastian Malton <sebastian@malton.name>
Nokel81 added a commit that referenced this pull request Nov 3, 2022
@Nokel81
Remove mac-ca usage since it was only in tests (#6043)
578623d 
* Make injecting CAs injectable, remove mac-ca as dependency
* Fix win-ca failing on electron renderer on windows
* Fix the matcher under features/ for main

Signed-off-by: Sebastian Malton <sebastian@malton.name>
Nokel81 added a commit that referenced this pull request Nov 8, 2022
@Nokel81
Remove mac-ca usage since it was only in tests (#6043)
830a406 
* Make injecting CAs injectable, remove mac-ca as dependency
* Fix win-ca failing on electron renderer on windows
* Fix the matcher under features/ for main

Signed-off-by: Sebastian Malton <sebastian@malton.name>
@Nokel81 Nokel81 mentioned this pull request Nov 17, 2022
Merged
Nokel81 added a commit that referenced this pull request Nov 21, 2022
@Nokel81
Remove mac-ca usage since it was only in tests (#6043)
7a37e2a 
* Make injecting CAs injectable, remove mac-ca as dependency
* Fix win-ca failing on electron renderer on windows
* Fix the matcher under features/ for main

Signed-off-by: Sebastian Malton <sebastian@malton.name>
Nokel81 added a commit that referenced this pull request Nov 22, 2022
@Nokel81
Remove mac-ca usage since it was only in tests (#6043) (#6321)
0eee5a0 
* Remove mac-ca usage since it was only in tests (#6043)

* Make injecting CAs injectable, remove mac-ca as dependency
* Fix win-ca failing on electron renderer on windows
* Fix the matcher under features/ for main

Signed-off-by: Sebastian Malton <sebastian@malton.name>

* Fix type errors from new types

Signed-off-by: Sebastian Malton <sebastian@malton.name>

* Temp change to see windows errors on CI

Signed-off-by: Sebastian Malton <sebastian@malton.name>

* Fix temp change

Signed-off-by: Sebastian Malton <sebastian@malton.name>

* Change error message for windows

Signed-off-by: Sebastian Malton <sebastian@malton.name>

* Increase maxBuffer size when reading windows CAs

Signed-off-by: Sebastian Malton <sebastian@malton.name>

* Switch back to running integration tests on windows

Signed-off-by: Sebastian Malton <sebastian@malton.name>

* Fix usage after rebase

Signed-off-by: Sebastian Malton <sebastian@malton.name>

* Update lock file

Signed-off-by: Sebastian Malton <sebastian@malton.name>

Signed-off-by: Sebastian Malton <sebastian@malton.name>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jansav jansav jansav left review comments

@aleksfront aleksfront aleksfront left review comments

@jweak jweak Awaiting requested review from jweak jweak is a code owner automatically assigned from lensapp/lens-ide

@Iku-turso Iku-turso Awaiting requested review from Iku-turso

Assignees
No one assigned
Labels
area/security chore
Projects
None yet
Milestone
6.2.0
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@Nokel81 @jansav @Iku-turso @aleksfront