AJ-1490, AJ-423: update workbench-libs and mockserver

[davidangb]

This PR covers:

• https://broadworkbench.atlassian.net/browse/AJ-423: Upgrade Orch's mockserver-netty to current
• https://broadworkbench.atlassian.net/browse/AJ-1490: Upgrade workbenchLibsHash for all workbench-libs libraries in orch

This PR intentionally does not cover other updates, such as updating workbench-libs in the automation/ subdirectory, or updating workbench-util (AJ-424), akka (AJ-421) or sentry libs (AJ-422). To keep scope down, those should be separate PRs.

Update Orch's three workbench-libs dependencies to latest versions.

This required a corresponding update to mockserver-netty. This update carries some syntax changes in test code. All of the code changes in this PR are purely for compatibility with the updates.

---

Have you read CONTRIBUTING.md lately? If not, do that first.

I, the developer opening this PR, do solemnly pinky swear that:

• I've followed the instructions if I've made any changes to the API, especially if they're breaking changes
• I've updated the RC_XXX release ticket with any manual steps required to release this change
• I've updated the FISMA documentation if I've made any security-related changes, including auth, encryption, or auditing

In all cases:

• Get two thumbsworth of review and PO signoff if necessary
• Verify all tests go green
• Squash and merge; you can delete your branch after this unless it's for a hotfix. In that case, don't delete it!
• Test this change deployed correctly and works on dev environment after deployment

[davidangb]

this fixes an issue in sbt assembly, which we run as part of deployment and tests, but developers typically do not run locally. sbt assembly compiles the fat jar, and hit an error trying to de-duplicate okio-jvm META-INF/okio.kotlin_module and okio META-INF/okio.kotlin_module. This fix takes the same approach as the merge strategy for kotlin-stdlib and otlin-stdlib-common just above in this file.

[davidangb]

these are syntax/behavior differences in the updated mockserver library, as are almost all the other changes in this PR.

[jladieu]

I see you only had to do this URL escaping once in this PR...but it also looks pretty ugly -- if you had to do this 20 times, once for each test case, what would your solution look like?

I'm asking not because I want you to implement that solution (since this is just a one-off) but just curious what it'd look like in Scala :)

[davidangb]

I would take one of two routes:

wrap the escaping in something terser, like StreamingPassthrough.escapePathSegment, so you end up with:

          .withPath(s"${workspaceBasePath}/%s/%s/submissions/%s/workflows/%s"
            .format(mockSpacedWorkspace.namespace, escapePathSegment(mockSpacedWorkspace.name), mockValidId, mockValidId)))

this isn't a big win, but it's nicer.

Alternately, I would make an implicit class that provides methods for strings; then, I could call my custom method directly on the thing I wanted to escape:

    implicit class StringEscaper(s: String) {
      def escape: String = UrlEscapers.urlPathSegmentEscaper().escape(s)
    }

…
          .withPath(s"${workspaceBasePath}/%s/%s/submissions/%s/workflows/%s"
            .format(mockSpacedWorkspace.namespace, mockSpacedWorkspace.name.escape, mockValidId, mockValidId)))

[davidangb]

the workbench-libs updates hit a conflict with Orch's older version of mockserver, so I needed to update mockserver too.

[codecov]

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (995acf9) 69.36% compared to head (28c8da8) 69.92%.

❗ Current head 28c8da8 differs from pull request most recent head a8c6478. Consider uploading reports for the commit a8c6478 to get more accurate results

Additional details and impacted files

@@             Coverage Diff             @@
##           develop    #1250      +/-   ##
===========================================
+ Coverage    69.36%   69.92%   +0.56%     
===========================================
  Files           97      101       +4     
  Lines         3401     3501     +100     
  Branches       381      391      +10     
===========================================
+ Hits          2359     2448      +89     
- Misses        1042     1053      +11     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

[jladieu]

Without reading anything else from this repo (eg: its readme), I am guessing this hash is just a github sha from the workbenchLibsRepo.

Might be worth an inline comment with a link to where that list of hashes is, for quicker lookup, assuming this is something that needs to be discovered & changed whenever we need to bump our dep here.

[davidangb]

I added a comment (and yes, it is in the workbench-libs readme)