should this be a list? Or a dict using the selector keys as the keys?

If it should be a dict the lambda inside the map below should be:

dict(map(lambda x: (x, re.compile('^{}$'.format(selectors[x]))), selectors))

FWIW, fails in beta with ValueError: /conftool/v1/pools is not a directory

I don't see the _confctl_setup method -> self._conftool_setup().

This has never been true before and I'm not certain the code in this if works. Will the user's permissions be checked and rejected by conftool? Other things to worry about?

See questions about pooling line 103

Is this logic correct? It used to be max(len(canaries)/4, 1). Now it seems to be the maximum of the count of canaries or 1.

This comment may no longer be accurate depending on line 386

yes, obviously, I must've deleted it when reformatting.

This means that etcd is misconfigured there. Nothing to do with the code. FWIW I think in beta we should avoid using etcd/conftool.

yes, sigh. Thanks for spotting this. I really wrote careless code yesterday.

Oh well, funny :D I didn't realize it.

On one hand, it's true that if conftool_conf is False, then confctl_schema is None, but on the other hand the whole point of my change is to make it possible to read values from etcd in scap.

I'd suggest we move this part to a function we leave uncalled, and appropriately marked as such? It's two chunks of code we could do without. in the main() body.

If you agree, I will do as much in this patchset.

I dropped the /4 for no reason, yes it should still be there. Also it should be "servers" not "canaries"

I'd suggest we move this part to a function we leave uncalled, and appropriately marked as such? It's two chunks of code we could do without. in the main() body.

If you agree, I will do as much in this patchset.

Seems fine to me, or we could drop the code entirely, if we want to bring it back we have git history.