Skip to content
This repository was archived by the owner on Feb 24, 2025. It is now read-only.

Fix default type check#500

Merged
jeremycline merged 5 commits intofedora-infra:developfrom
sijis:fix/default_type_checks
Jan 15, 2018
Merged

Fix default type check#500
jeremycline merged 5 commits intofedora-infra:developfrom
sijis:fix/default_type_checks

Conversation

@sijis
Copy link
Contributor

@sijis sijis commented Jan 8, 2018

While working on #499, I noticed some discrepancies in the validation of the configs in FedmsgConfig.

This attempts to address those discrepancies.

I used the generated output from fedmsg-config as the source of truth on what these values should be.

},
'relay_inbound': {
'default': u'tcp://127.0.0.1:2001',
'validator': _validate_none_or_type(six.text_type),
Copy link
Member

Choose a reason for hiding this comment

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

It doesn't make much sense to have a relay binding to multiple sockets. Did you run into this by trying to specify a list of values?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I did not run this using multiple entries.

I think the issue is mainly documentation related.

In my case, I just updated the example config and things worked fine. I never needed to add multiple values to this.

It is very likely I am wrong and reading the wrong documentation parts.

Copy link
Member

Choose a reason for hiding this comment

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

Ah, well the history here is I wrote documentation. There wasn't any documentation before and I took wild guesses. Recently I tried to add defaults to every setting and picked what I thought were reasonable defaults.

Although it looks like lists and strings are both handled correctly, it's not a setting that makes a bunch of sense as a list so I'm in favor of changing the documentation and config in fedmsg.d (really, that directory should go away, but I have no doubt that'd break something weird relying on it 😢 )

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I will definitely change/revert that list change in this PR.
I could also include documentation changes so that it references it as a string, not list. This would keep everything consistent, at least.

At quick check, tests fail removing the fedmsg.d directory. I bet packaging would have issues too. Although, both of those could be solved.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I've removed this commit completely.

@sijis
Copy link
Contributor Author

sijis commented Jan 12, 2018

Updated references of relay_inbound to be strings.

@codecov
Copy link

codecov bot commented Jan 12, 2018

Codecov Report

Merging #500 into develop will decrease coverage by 0.11%.
The diff coverage is n/a.

Impacted file tree graph

@@             Coverage Diff             @@
##           develop     #500      +/-   ##
===========================================
- Coverage    60.28%   60.17%   -0.12%     
===========================================
  Files           29       29              
  Lines         1750     1750              
  Branches       272      272              
===========================================
- Hits          1055     1053       -2     
- Misses         618      620       +2     
  Partials        77       77
Impacted Files Coverage Δ
fedmsg/core.py 45.6% <0%> (-1.1%) ⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update da90440...32e6e05. Read the comment docs.

Copy link
Member

@jeremycline jeremycline left a comment

Choose a reason for hiding this comment

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

Sorry, I should have made an note on the other changes on the first review. One small thing, but other than that it looks really good, thanks!

fedmsg/config.py Outdated
'crl_cache_expiry': {
'default': None,
'validator': _validate_none_or_type(six.text_type),
'default': 10,
Copy link
Member

Choose a reason for hiding this comment

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

The docs say this is in seconds (although the docs are a little unreliable) so 10 is a really small default for a CRL. Maybe an hour is more reasonable?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Good point. Updating...

Copy link
Member

Choose a reason for hiding this comment

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

I think you missed updating it in a few places? Additionally, an hour would be 60*60 (3600) since this is seconds, not minutes.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

You don't want to to expire in 1 minute? 😂
Let me try this again.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Totally missed several spots.
Alright I think it finally got this.
Also, sorry for the constant rebasing. Just trying to keep clean commits.

@jeremycline
Copy link
Member

Great, thanks for this!

@jeremycline jeremycline merged commit e753085 into fedora-infra:develop Jan 15, 2018
@sijis sijis deleted the fix/default_type_checks branch January 16, 2018 16:55
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants