Fix CaptureAll and support for RawM WithResource

[HanStolpo]

We fix the implementation of the CaptureAll instance. Previously paths would never be matched since the instance did not consume the rest of the path like CaptureAll does. The rest of the path is now captured and replaced with a * place holder and this is also the case for enumerating the endpoint.

We also add instances for RawM and WithResource and add a test case to the spec to check that CaptureAll and RawM behave as expected.

[HanStolpo]

The tests run successfully locally with

• GHC 9.8.2
• servant-0.20.2

[worm2fed]

Hi @HanStolpo thank you for your PR. Loogs good for me, but tests in CI are failing. Could you please fix it?

[HanStolpo]

Sure I will fix it, I just am not sure what the actual failure in CI is, it looks like its stack related but I didn't change anything in the stack config, ah but I guess the cabal file gets generated from the stack.yaml.

[worm2fed]

@HanStolpo yes, you should change stack (package.yaml) instead of cabal)

[HanStolpo]

I looks like I will have to add some CPP to support different servant versions I think one of or both RawM and WithResource might not be in all the supported servant versions

[worm2fed]

Probably yes
I didn't used this for more then a year, so a bit out of context

[HanStolpo]

Okay yes I see RawM and WithResource is only from 0.20

[HanStolpo]

Okay I generated the cabal file from the updated package.yaml file and version gated the RawM and WithResource instances, I also changed the tests to use Raw instead of RawM for simplicity.

[HanStolpo]

Sorry the version gating is not quite correct

[HanStolpo]

Okay I fixed the version gating. It might be useful to also run tests with later GHCs / Servant versions. I didn't look at the workflow stuff though.

[worm2fed]

@HanStolpo actually, previously it was correct... no there is 0.2.0
Here is an example)

servant-prometheus/lib/Prometheus/Servant/Internal.hs

Line 105 in 8d46288

#if MIN_VERSION_servant(0,18,2)

[worm2fed]

yes, that'll be good to launch with matrix, maybe will add this later