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

Fix block folding #307

Merged
merged 3 commits into from
Jan 10, 2021
Merged

Fix block folding #307

merged 3 commits into from
Jan 10, 2021

Conversation

kenyon
Copy link
Member

@kenyon kenyon commented Nov 22, 2020

This pull request improves the format of blocks produced by eyaml.

  • Indentation was changed to the more typical YAML indentation of two spaces, instead of four.
  • The block is evenly folded, rather than having the first line longer than the rest.

Before:

    ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEw
    DQYJKoZIhvcNAQEBBQAEggEAqrb9MgggAdRMD063Nzs8pIVWdfHe0bOXMLD2
    ZufGtM3ZsJux23gmSwRm0Ba86mMofdr+NXc1ErKEdQM3qYHZ02sIaENqOcgd
    dcLTJ1+zC2sBMAg/DbE21wVUGju6QPa6fTiYtGnQLzOKgDgQlqPm4xgU5V5J
    xS0WNJ0eVM+3FsEaw7zjOdg01ooMXUe8qhCBGzf/E0taCMuESU/L5ZsVSfju
    Cew1+AQ1sjzra8b+rW0Xyj9BzIiUOKV+Q1C2e2u7UPKREQueuzNyH8Xf1XWH
    p/ilTHDR1suX/ByRWpK+B0zT3c3eLQi0KvjCnM2rDlglNDHQu5ZGDQ67gNAs
    rZ9o8jA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBAHhOZ2CwkrG2wc4K+T
    c1eegBBsuGd8WwZhetIvNgGWXYvf]

After:

  ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBAD
  AFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAuYmADidSlCIBpX70ZF1Jru2RD9
  KInWspl/19R8xNcsrEZ5XS6lFuXTmLDlWuxj4+JWDZ5d/JDgi7xZOVfeiGdb
  mbVmS54+2/INDMxGI+0nCnzYuxHAl/y4VEE4RKF2NMoBHdzke0QpTirsJJbm
  md8+hMUVHiKepNotYNlYd06usZp6vXUsqnmwjuJqJg0zzA9LPvUmlzIK6pnl
  85r4WW2WGdO3byGEmAanyTn9P6ENv0SuxrrWDUKIG1HfPcu5xvUMTh0ei9eb
  BQAmxY6aOKCMWZUnsdW1FF19yejf2+SBrXJZDk67NjamXD4co36OuLlKA2KA
  ow87kGlsQ+lHoVhTA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDpBywfdQ
  qNcuulHx2HE5AigBAM8EnE1YqBmqe7+WZIPPRK]

@kenyon
Copy link
Member Author

kenyon commented Nov 22, 2020

The test failure with Puppet 5 is unrelated to these changes, it was failing already.

bastelfreak
bastelfreak approved these changes Nov 22, 2020
View reviewed changes
Copy link
Member

@bastelfreak bastelfreak 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, but somebody else with more knowledge about hiera-eyaml should review this as well

igalic
igalic approved these changes Nov 23, 2020
View reviewed changes
Copy link

@igalic igalic left a comment

Choose a reason for hiding this comment

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

looks pretty good

lib/hiera/backend/eyaml/encryptor.rb Show resolved Hide resolved
@kenyon
Copy link
Member Author

kenyon commented Jan 7, 2021

What's with that WIP status? Seems like it's stuck.

@ghoneycutt
Copy link
Member

@kenyon The tests are failing related to github_changelog_generator. You might be able to fix this by changing

https://github.com/voxpupuli/hiera-eyaml/blob/master/Gemfile#L23

from if RUBY_VERSION >= '2.2.2' to if RUBY_VERSION >= '2.5.0'

@kenyon
Copy link
Member Author

kenyon commented Jan 8, 2021

@kenyon The tests are failing related to github_changelog_generator. You might be able to fix this by changing

https://github.com/voxpupuli/hiera-eyaml/blob/master/Gemfile#L23

from if RUBY_VERSION >= '2.2.2' to if RUBY_VERSION >= '2.5.0'

#308 fixes the Travis build at least. But the WIP check is still stuck there too. 😕

@kenyon
Copy link
Member Author

kenyon commented Jan 10, 2021

I will rebase this after #309 is merged.

@ghoneycutt ghoneycutt merged commit 4260370 into voxpupuli:master Jan 10, 2021
@kBite kBite mentioned this pull request Apr 19, 2021
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@igalic igalic igalic approved these changes

@bastelfreak bastelfreak bastelfreak approved these changes

@kBite kBite Awaiting requested review from kBite

Assignees
No one assigned
Labels
bug
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@kenyon @ghoneycutt @bastelfreak @igalic