Skip to content

Merge top-level IdP config traversal functions, check for improper IdP config #28

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
Closed
stlaz wants to merge 4 commits into from
Closed

Merge top-level IdP config traversal functions, check for improper IdP config #28

stlaz wants to merge 4 commits into from

Conversation

@stlaz
Copy link
Contributor

@stlaz stlaz commented Jan 17, 2019

This PR does a bunch refactorings:

  • removes unnecessary creations of idpDataSync structures, uses only one such struct instead
  • simplifies the way sourceData objects are stored in idpDataSync structure so that there's but a small amount of boilerplate
  • merges the configsync:convertToData() and idp:convertProviderCOnfigToOsinBytes() functions to only traverse the IdP config once

It also adds checking for improperly created IdP configs so that we don't panic.

@openshift-ci-robot openshift-ci-robot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Jan 17, 2019
@stlaz stlaz mentioned this pull request Jan 17, 2019
Closed
@stlaz
Copy link
Contributor Author

stlaz commented Jan 17, 2019 •
edited
Loading

Code is ready for review, I only need to test that it works.

edit: Note that commit Get secret/configmaps information from config for all IdPs is just a base taken from #24

@stlaz
Copy link
Contributor Author

stlaz commented Jan 17, 2019

/hold
--^

@openshift-ci-robot openshift-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jan 17, 2019
@stlaz
Copy link
Contributor Author

stlaz commented Jan 17, 2019

/hold cancel
It appears to work \o/

@stlaz stlaz removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jan 17, 2019
@stlaz
Copy link
Contributor Author

stlaz commented Jan 18, 2019

/retest

2 similar comments
@stlaz
Copy link
Contributor Author

stlaz commented Jan 22, 2019

/retest

@stlaz
Copy link
Contributor Author

stlaz commented Jan 22, 2019

/retest

@enj
Copy link
Contributor

enj commented Jan 23, 2019

/hold

Wait for #34

@openshift-ci-robot openshift-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jan 23, 2019
@stlaz
Copy link
Contributor Author

stlaz commented Jan 23, 2019

/retest

2 similar comments
@stlaz
Copy link
Contributor Author

stlaz commented Jan 23, 2019

/retest

@stlaz
Copy link
Contributor Author

stlaz commented Jan 24, 2019

/retest

@stlaz
Copy link
Contributor Author

stlaz commented Jan 24, 2019

Rebased on current master.

@openshift-ci-robot openshift-ci-robot added approved Indicates a PR has been approved by an approver from all required OWNERS files. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. labels Jan 24, 2019
@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Jan 30, 2019

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: stlaz

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci-robot openshift-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jan 30, 2019
@stlaz
Copy link
Contributor Author

stlaz commented Jan 30, 2019

Rebased

@stlaz
Merge convertToData() and convertProviderConfigToOsinBytes()
680157c 
Both these functions traverse the top level config's identity
providers, make it one so only one traversal is performed.
@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Jan 30, 2019

@stlaz: The following test failed, say /retest to rerun them all:

Test name Commit Details Rerun command
ci/prow/e2e-aws 447526a link /test e2e-aws

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

@enj enj mentioned this pull request Jan 30, 2019
Merged
@enj
Copy link
Contributor

enj commented Jan 30, 2019

@stlaz PTAL at #54 which includes this and other fixes.

@enj enj closed this Jan 30, 2019
@stlaz stlaz deleted the idp_mapping3 branch February 18, 2019 07:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@enj enj Awaiting requested review from enj

@mrogers950 mrogers950 Awaiting requested review from mrogers950

Assignees

No one assigned

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@stlaz @enj @openshift-ci-robot