Add IPv6 support #37

paramite · 2024-05-28T15:17:59Z

This patch makes bridge accept IPv6 addresses as amqp_url value.

csibbitt

This LGTM but I'd like to know it's tested before we merge.

bridge.h

softwarefactory-project-zuul · 2024-05-28T17:42:16Z

Build failed (check pipeline). Post recheck (without leading slash)
to rerun all jobs. Make sure the failure cause has been resolved before
you rerun jobs.

https://review.rdoproject.org/zuul/buildset/7de835f5d677447f8e8cda8be0809828

❌ stf-crc-ocp_412-local_build FAILURE in 21m 52s
❌ stf-crc-ocp_414-local_build FAILURE in 1h 01m 02s
❌ stf-crc-ocp_412-local_build-index_deploy FAILURE in 1h 05m 41s
❌ stf-crc-ocp_414-local_build-index_deploy FAILURE in 1h 02m 04s

vkmc · 2024-05-29T07:24:25Z

recheck

softwarefactory-project-zuul · 2024-05-29T08:52:29Z

Build failed (check pipeline). Post recheck (without leading slash)
to rerun all jobs. Make sure the failure cause has been resolved before
you rerun jobs.

https://review.rdoproject.org/zuul/buildset/d0ae14586cbd4b9fa39988bf0722d9a0

❌ stf-crc-ocp_412-local_build RETRY_LIMIT in 19m 09s
❌ stf-crc-ocp_414-local_build FAILURE in 57m 31s
❌ stf-crc-ocp_412-local_build-index_deploy FAILURE in 22m 40s
❌ stf-crc-ocp_414-local_build-index_deploy FAILURE in 1h 02m 15s

vkmc · 2024-05-29T13:07:10Z

There is some recurring failure in the CI, not related to the timeouts. It seems that the bridge container is constantly failing. See for example https://review.rdoproject.org/zuul/build/e7227852b3a747bf857a1168dddc1c71/log/controller/controller/post_oc_describe_pod_default-cloud1-ceil-event-smartgateway-7b5d4fcd79-5fswr.log in the stf-crc-ocp_414-local_build. We don't really have access to the container logs IIRC.

vkmc

Seems there is something wrong when trying to start the smart-gateway with this change.

softwarefactory-project-zuul · 2024-05-29T17:57:59Z

Build failed (check pipeline). Post recheck (without leading slash)
to rerun all jobs. Make sure the failure cause has been resolved before
you rerun jobs.

https://review.rdoproject.org/zuul/buildset/f436f1100762481ab5ca65482b6fbca2

❌ stf-crc-ocp_412-local_build FAILURE in 21m 11s
❌ stf-crc-ocp_414-local_build FAILURE in 58m 10s
❌ stf-crc-ocp_412-local_build-index_deploy FAILURE in 20m 31s
❌ stf-crc-ocp_414-local_build-index_deploy FAILURE in 1h 00m 55s

This patch makes bridge accept IPv6 addresses as amqp_url value.

tests.c

vyzigold · 2024-05-29T19:57:05Z

The ending of the new regex is the cause of the CI failures. It seems the "[^\\s]" doesn't work as intended instead of matching "non-whitespace" it seems to match "non-'s' character". And because we use "s" in the address in the CI, it fails. Otherwise an impressive work. Thank you.

csibbitt · 2024-05-29T20:12:28Z

The ending of the new regex is the cause of the CI failures. It seems the "[^\\s]" doesn't work as intended instead of matching "non-whitespace" it seems to match "non-'s' character". And because we use "s" in the address in the CI, it fails. Otherwise an impressive work. Thank you.

I reproduced this locally, if I change /baz to /bas in a unit test I get a segfault instead of a pass. :)

I've pushed a commit that fixes this and leaves the /bas version there to prove it.

csibbitt · 2024-05-29T19:49:57Z

bridge.h

+    "(([a-z]+)(:([a-z]+))*@)*([a-zA-Z_0-9.-]+|\\[[:a-fA-F0-9]+\\])(:([0-9]+))" \
+    "?(/[^\\s]*)?$"


Suggested change

"(([a-z]+)(:([a-z]+))*@)*([a-zA-Z_0-9.-]+|\\[[:a-fA-F0-9]+\\])(:([0-9]+))" \

"?(/[^\\s]*)?$"

"(([a-z]+)(:([a-z]+))*@)*([a-zA-Z_0-9.-]+|\\[[:a-fA-F0-9]+\\])(:([0-9]+))?"\

"(/[^\\s]*)?$"

Does this violate the linter? It took me a bit longer to parse this with the ? on the second line

Here the port # is optional, but there are no unit tests that leave out the port #. FWIW I edited the port and the check for it out of a random test and it worked.

csibbitt · 2024-05-29T20:01:44Z

bridge.c

@@ -275,16 +236,21 @@ int main(int argc, char **argv) {

    match_regex(AMQP_URL_REGEX, matches, 10, app.amqp_con.url);
    if (matches[3] != NULL) {
-        app.amqp_con.user = strdup(matches[2]);
+        app.amqp_con.user = strdup(matches[3]);


Good find! This is an old bug that we should have caught in the initial review years ago.

softwarefactory-project-zuul · 2024-05-29T20:51:15Z

Build failed (check pipeline). Post recheck (without leading slash)
to rerun all jobs. Make sure the failure cause has been resolved before
you rerun jobs.

https://review.rdoproject.org/zuul/buildset/0468b5339a1e407786344751d64f5b11

❌ stf-crc-ocp_412-local_build FAILURE in 23m 51s
❌ stf-crc-ocp_414-local_build FAILURE in 59m 16s
❌ stf-crc-ocp_412-local_build-index_deploy FAILURE in 1h 00m 43s
❌ stf-crc-ocp_414-local_build-index_deploy FAILURE in 1h 06m 12s

softwarefactory-project-zuul · 2024-05-29T21:03:36Z

Build failed (check pipeline). Post recheck (without leading slash)
to rerun all jobs. Make sure the failure cause has been resolved before
you rerun jobs.

https://review.rdoproject.org/zuul/buildset/1863dc58ead042f39b78644968a3275f

❌ stf-crc-ocp_412-local_build FAILURE in 55m 35s
❌ stf-crc-ocp_414-local_build FAILURE in 59m 12s
❌ stf-crc-ocp_412-local_build-index_deploy RETRY_LIMIT in 20m 38s
❌ stf-crc-ocp_414-local_build-index_deploy TIMED_OUT in 1h 07m 48s

softwarefactory-project-zuul · 2024-05-29T21:43:56Z

Build failed (check pipeline). Post recheck (without leading slash)
to rerun all jobs. Make sure the failure cause has been resolved before
you rerun jobs.

https://review.rdoproject.org/zuul/buildset/5ad98ea6ecc64ee6a0ec29ef18f6ff2a

✔️ stf-crc-ocp_412-local_build SUCCESS in 38m 10s
✔️ stf-crc-ocp_414-local_build SUCCESS in 39m 59s
❌ stf-crc-ocp_412-local_build-index_deploy FAILURE in 20m 20s
✔️ stf-crc-ocp_414-local_build-index_deploy SUCCESS in 47m 30s

softwarefactory-project-zuul · 2024-05-30T08:48:09Z

Build failed (check pipeline). Post recheck (without leading slash)
to rerun all jobs. Make sure the failure cause has been resolved before
you rerun jobs.

https://review.rdoproject.org/zuul/buildset/b51d7a850e3c40f28bf8e1afed8106c6

❌ stf-crc-ocp_412-local_build RETRY_LIMIT in 20m 15s
❌ stf-crc-ocp_414-local_build FAILURE in 47m 12s
❌ stf-crc-ocp_412-local_build-index_deploy FAILURE in 23m 32s
✔️ stf-crc-ocp_414-local_build-index_deploy SUCCESS in 49m 47s

paramite · 2024-05-30T12:25:51Z

recheck

softwarefactory-project-zuul · 2024-05-30T13:36:19Z

Build failed (check pipeline). Post recheck (without leading slash)
to rerun all jobs. Make sure the failure cause has been resolved before
you rerun jobs.

https://review.rdoproject.org/zuul/buildset/839a8cda38ba496786d5c41b4d97f9ee

❌ stf-crc-ocp_412-local_build FAILURE in 23m 48s
✔️ stf-crc-ocp_414-local_build SUCCESS in 45m 01s
❌ stf-crc-ocp_412-local_build-index_deploy FAILURE in 20m 56s
✔️ stf-crc-ocp_414-local_build-index_deploy SUCCESS in 51m 04s

paramite · 2024-05-30T14:16:30Z

recheck

softwarefactory-project-zuul · 2024-05-30T15:21:24Z

Build failed (check pipeline). Post recheck (without leading slash)
to rerun all jobs. Make sure the failure cause has been resolved before
you rerun jobs.

https://review.rdoproject.org/zuul/buildset/be9f9f5d5f704012a2508d658596583c

❌ stf-crc-ocp_412-local_build FAILURE in 20m 34s
✔️ stf-crc-ocp_414-local_build SUCCESS in 40m 53s
❌ stf-crc-ocp_412-local_build-index_deploy RETRY_LIMIT in 19m 53s
❌ stf-crc-ocp_414-local_build-index_deploy RETRY_LIMIT in 7s

vkmc · 2024-05-31T06:55:19Z

recheck

softwarefactory-project-zuul · 2024-05-31T07:43:05Z

Build failed (check pipeline). Post recheck (without leading slash)
to rerun all jobs. Make sure the failure cause has been resolved before
you rerun jobs.

https://review.rdoproject.org/zuul/buildset/4083e97099934b15a550a988499978da

❌ stf-crc-ocp_412-local_build FAILURE in 22m 18s
✔️ stf-crc-ocp_414-local_build SUCCESS in 43m 07s
❌ stf-crc-ocp_412-local_build-index_deploy FAILURE in 22m 40s
✔️ stf-crc-ocp_414-local_build-index_deploy SUCCESS in 44m 41s

vkmc

Code looks good, and thanks so much for enhancing test coverage and automation as well!

* [zuul] Add zuul jobs to sg-bridge (#33) Depends-On: http://github.com/infrawatch/service-telemetry-operator/pull/512 * [zuul] Use the stf-crc-jobs project template (#34) Instead of updating the .zuul.yaml file everytime infrawatch/service-telemetry-operator adds a new job, the project-template can be updated in STO, which will propogate the change to the project and avoid leaving gaps in testing. Depends-On: infrawatch/service-telemetry-operator#514 * Bump actions checkout to v4 (#36) Bump actions checkout to v4 since Node.js 16 actions are deprecated. We need to update to Node.js 20, which is included in actions/checkout@v4. * Rebuild obj files on %.h changes (#38) * Add IPv6 support (#37) * Add IPv6 support This patch makes bridge accept IPv6 addresses as amqp_url value. * Committing clang-format changes * Eliminate implicit-function-declaration in tests * Correct character class in AMQP_URL_REGEX --------- Co-authored-by: InfraWatch CI <[email protected]> Co-authored-by: Chris Sibbitt <[email protected]> Co-authored-by: Victoria Martinez de la Cruz <[email protected]> * Update repo info for opstools (#39) Centos8s went EOL on 31.05.2024 so the packages have been moved to centos vault mirror the repo config we use needs to be updated --------- Co-authored-by: Emma Foley <[email protected]> Co-authored-by: Jaromír Wysoglad <[email protected]> Co-authored-by: Martin Mágr <[email protected]> Co-authored-by: InfraWatch CI <[email protected]> Co-authored-by: Chris Sibbitt <[email protected]>

vkmc self-requested a review May 28, 2024 15:23

csibbitt approved these changes May 28, 2024

View reviewed changes

bridge.h Outdated Show resolved Hide resolved

csibbitt mentioned this pull request May 28, 2024

Enable QDR port 5671 to listen on both IPv4 and IPv6 infrawatch/service-telemetry-operator#599

Merged

vkmc requested changes May 29, 2024

View reviewed changes

paramite force-pushed the ipv6 branch 3 times, most recently from 6084660 to 07f0cf2 Compare May 29, 2024 15:11

paramite force-pushed the ipv6 branch 12 times, most recently from cef5bff to 3faee27 Compare May 29, 2024 18:50

Add IPv6 support

7c93e0f

This patch makes bridge accept IPv6 addresses as amqp_url value.

paramite force-pushed the ipv6 branch from d142c52 to 7c93e0f Compare May 29, 2024 18:57

InfraWatch CI and others added 2 commits May 29, 2024 18:58

Committing clang-format changes

1de858f

Eliminate implicit-function-declaration in tests

9b0c070

csibbitt reviewed May 29, 2024

View reviewed changes

tests.c Show resolved Hide resolved

Correct character class in AMQP_URL_REGEX

6ddd013

csibbitt approved these changes May 29, 2024

View reviewed changes

Merge branch 'master' into ipv6

bb2dfb8

vkmc self-requested a review May 31, 2024 08:59

vkmc approved these changes May 31, 2024

View reviewed changes

vkmc merged commit bf54f32 into infrawatch:master May 31, 2024
1 of 2 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add IPv6 support #37

Add IPv6 support #37

paramite commented May 28, 2024

csibbitt left a comment

softwarefactory-project-zuul bot commented May 28, 2024

vkmc commented May 29, 2024

softwarefactory-project-zuul bot commented May 29, 2024

vkmc commented May 29, 2024

vkmc left a comment

softwarefactory-project-zuul bot commented May 29, 2024

vyzigold commented May 29, 2024

csibbitt commented May 29, 2024 •

edited

Loading

csibbitt May 29, 2024

csibbitt May 29, 2024

csibbitt May 29, 2024

softwarefactory-project-zuul bot commented May 29, 2024

softwarefactory-project-zuul bot commented May 29, 2024

softwarefactory-project-zuul bot commented May 29, 2024

softwarefactory-project-zuul bot commented May 30, 2024

paramite commented May 30, 2024

softwarefactory-project-zuul bot commented May 30, 2024

paramite commented May 30, 2024

softwarefactory-project-zuul bot commented May 30, 2024

vkmc commented May 31, 2024

softwarefactory-project-zuul bot commented May 31, 2024

vkmc left a comment

		"(([a-z]+)(:([a-z]+))@)([a-zA-Z_0-9.-]+\|\\[[:a-fA-F0-9]+\\])(:([0-9]+))" \
		"?(/[^\\s]*)?$"

Add IPv6 support #37

Add IPv6 support #37

Conversation

paramite commented May 28, 2024

csibbitt left a comment

Choose a reason for hiding this comment

softwarefactory-project-zuul bot commented May 28, 2024

vkmc commented May 29, 2024

softwarefactory-project-zuul bot commented May 29, 2024

vkmc commented May 29, 2024

vkmc left a comment

Choose a reason for hiding this comment

softwarefactory-project-zuul bot commented May 29, 2024

vyzigold commented May 29, 2024

csibbitt commented May 29, 2024 • edited Loading

csibbitt May 29, 2024

Choose a reason for hiding this comment

csibbitt May 29, 2024

Choose a reason for hiding this comment

csibbitt May 29, 2024

Choose a reason for hiding this comment

softwarefactory-project-zuul bot commented May 29, 2024

softwarefactory-project-zuul bot commented May 29, 2024

softwarefactory-project-zuul bot commented May 29, 2024

softwarefactory-project-zuul bot commented May 30, 2024

paramite commented May 30, 2024

softwarefactory-project-zuul bot commented May 30, 2024

paramite commented May 30, 2024

softwarefactory-project-zuul bot commented May 30, 2024

vkmc commented May 31, 2024

softwarefactory-project-zuul bot commented May 31, 2024

vkmc left a comment

Choose a reason for hiding this comment

csibbitt commented May 29, 2024 •

edited

Loading