Merge branch 'main' into LANTERN-805-wrshealthbundlequerierparser

.github/workflows/static.yml

@@ -5,19 +5,22 @@ on: [push]
 jobs:
   Golintr:
       name: Go Lintr
-      runs-on: macOS-latest
+      runs-on: ubuntu-22.04
       steps:
         - uses: actions/checkout@v2
         - name: Install golangci-lint\
-          run: brew install golangci-lint
+          run: sudo snap install golangci-lint --classic
+
         - name: Run Go Lintr
           run: make lint_go
   Rlintr:
-    runs-on: macOS-latest
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v2
 
       - uses: r-lib/actions/setup-r@v2
-
+        with:
+          r-version: '4.1.3'
+
       - name: Lint R Files
-        run: cd ./scripts && ./lintr.sh
+        run: cd ./scripts && ./lintr.sh

.github/workflows/test.yml

@@ -4,14 +4,14 @@ on: [push]
 
 jobs:
   test-unit:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v2
       - name: Go Unit Tests
         id: go-unit-tests
         run: make test
   test-integration:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v2
       - name: Start System
@@ -48,7 +48,7 @@ jobs:
         id: go-integration-tests
         run: ./scripts/wait-for-it.sh localhost:5432 -- ./scripts/wait-for-it.sh localhost:15672 -- ./scripts/wait-for-it.sh localhost:5672 -- make test_int
   test-e2e:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v2
       - name: Start System

VERSION

@@ -1 +1 @@
-VERSION=2.3.6
+VERSION=2.3.7

capabilityquerier/go.mod

@@ -3,8 +3,8 @@ module github.com/onc-healthit/lantern-back-end/capabilityquerier
 go 1.16
 
 require (
-	github.com/onc-healthit/lantern-back-end/endpointmanager v0.0.0-20241031222212-dbc35bf03756
-	github.com/onc-healthit/lantern-back-end/lanternmq v0.0.0-20241031222212-dbc35bf03756
+	github.com/onc-healthit/lantern-back-end/endpointmanager v0.0.0-20241127145057-f9579599f6d8
+	github.com/onc-healthit/lantern-back-end/lanternmq v0.0.0-20241127145057-f9579599f6d8
 	github.com/pkg/errors v0.9.1
 	github.com/sirupsen/logrus v1.8.1
 	github.com/spf13/viper v1.10.1

capabilityquerier/go.sum

@@ -559,8 +559,9 @@ github.com/onc-healthit/lantern-back-end/endpointmanager v0.0.0-20240828212004-3
 github.com/onc-healthit/lantern-back-end/endpointmanager v0.0.0-20240911204302-fe8913c82d64/go.mod h1:k+8qcaQI6YE2sBfwYHquaT15IgpuuVdIQmvWJYqTOrw=
 github.com/onc-healthit/lantern-back-end/endpointmanager v0.0.0-20240925181546-5c7ae33e5fcf/go.mod h1:61S9YpAxWHx/XdkoqM8jBBoK4ZY6LO2RxI8IY2Iceow=
 github.com/onc-healthit/lantern-back-end/endpointmanager v0.0.0-20241007214039-ddf774cc1452/go.mod h1:eBdu8Xc3mHX+sf2IPGMW4lFeneAzh5q8uG/Pep6/rrg=
-github.com/onc-healthit/lantern-back-end/endpointmanager v0.0.0-20241031222212-dbc35bf03756 h1:7WEGS8eesmWS/SMLraR9YQ7eQCZixWrYmAPGnkov/dY=
 github.com/onc-healthit/lantern-back-end/endpointmanager v0.0.0-20241031222212-dbc35bf03756/go.mod h1:8UoDWgoR5HgR7xXwM9ihK4rDUby/Q5BKRxRqTSNbsbY=
+github.com/onc-healthit/lantern-back-end/endpointmanager v0.0.0-20241127145057-f9579599f6d8 h1:hHN0AdFsN/lXEmeaVNQbrQ/w4+/biFDKhxl6dRS84pM=
+github.com/onc-healthit/lantern-back-end/endpointmanager v0.0.0-20241127145057-f9579599f6d8/go.mod h1:2jUEQiQ5GO4nBzhkHEzz2TNULjj7wk35hi7ABmXEG7M=
 github.com/onc-healthit/lantern-back-end/lanternmq v0.0.0-20200318142043-2e3efa6899ea/go.mod h1:RW06wTVLYNRw9cNhK2cGtSJYYbsBq7Hom1ffIGV7RZU=
 github.com/onc-healthit/lantern-back-end/lanternmq v0.0.0-20200325112617-d9df26e6fd2b/go.mod h1:RW06wTVLYNRw9cNhK2cGtSJYYbsBq7Hom1ffIGV7RZU=
 github.com/onc-healthit/lantern-back-end/lanternmq v0.0.0-20200714154604-c91fcf38666d/go.mod h1:4kCE/In3mdWmUl/FJ1l9eUPXhYnYGS3WpnEAegQGpCg=
@@ -678,8 +679,9 @@ github.com/onc-healthit/lantern-back-end/lanternmq v0.0.0-20240828212004-32ed2f8
 github.com/onc-healthit/lantern-back-end/lanternmq v0.0.0-20240911204302-fe8913c82d64/go.mod h1:i6DbIDT6cQh6Rmbisg2dAxxS+ysX1KlS1gLxg1CXxRs=
 github.com/onc-healthit/lantern-back-end/lanternmq v0.0.0-20240925181546-5c7ae33e5fcf/go.mod h1:Zezr8o3zFufdiokKxcjMoqVncC5VaXXyoO1GdL05la4=
 github.com/onc-healthit/lantern-back-end/lanternmq v0.0.0-20241007214039-ddf774cc1452/go.mod h1:O+IR9FPMZdBEdNolzWqodCDulZWUpEAH8q519OhqXzY=
-github.com/onc-healthit/lantern-back-end/lanternmq v0.0.0-20241031222212-dbc35bf03756 h1:qyCdNlV7znYvrZuLozJ8TAryaCwhc4wZpP4ryNLGsi8=
 github.com/onc-healthit/lantern-back-end/lanternmq v0.0.0-20241031222212-dbc35bf03756/go.mod h1:L0vHmzsUhOnVSwROsQ1wh443IwzcXMq857+BirffRWg=
+github.com/onc-healthit/lantern-back-end/lanternmq v0.0.0-20241127145057-f9579599f6d8 h1:GLNtegrgdsXIvyQNONUr3FkE1ClKGN07+ypoIv424o8=
+github.com/onc-healthit/lantern-back-end/lanternmq v0.0.0-20241127145057-f9579599f6d8/go.mod h1:zj9Er0ZmpN99+HwdDU6fw7SE+GsuSSt6viblEX6dzVE=
 github.com/onc-healthit/lantern-back-end/networkstatsquerier v0.0.0-20200319114800-a2d86dc950c6/go.mod h1:jPu3HTPUBd+0vKKBa4yKFouFWo+HvwXoY4hKCrfiAOw=
 github.com/onc-healthit/lantern-back-end/networkstatsquerier v0.0.0-20200325112617-d9df26e6fd2b/go.mod h1:jPu3HTPUBd+0vKKBa4yKFouFWo+HvwXoY4hKCrfiAOw=
 github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=

capabilityreceiver/go.mod

@@ -4,8 +4,8 @@ go 1.16
 
 require (
 	github.com/lib/pq v1.3.0
-	github.com/onc-healthit/lantern-back-end/endpointmanager v0.0.0-20241031222212-dbc35bf03756
-	github.com/onc-healthit/lantern-back-end/lanternmq v0.0.0-20241031222212-dbc35bf03756
+	github.com/onc-healthit/lantern-back-end/endpointmanager v0.0.0-20241127145057-f9579599f6d8
+	github.com/onc-healthit/lantern-back-end/lanternmq v0.0.0-20241127145057-f9579599f6d8
 	github.com/pkg/errors v0.9.1
 	github.com/sirupsen/logrus v1.8.1
 	github.com/spf13/viper v1.10.1

capabilityreceiver/go.sum

@@ -559,8 +559,9 @@ github.com/onc-healthit/lantern-back-end/endpointmanager v0.0.0-20240828212004-3
 github.com/onc-healthit/lantern-back-end/endpointmanager v0.0.0-20240911204302-fe8913c82d64/go.mod h1:k+8qcaQI6YE2sBfwYHquaT15IgpuuVdIQmvWJYqTOrw=
 github.com/onc-healthit/lantern-back-end/endpointmanager v0.0.0-20240925181546-5c7ae33e5fcf/go.mod h1:61S9YpAxWHx/XdkoqM8jBBoK4ZY6LO2RxI8IY2Iceow=
 github.com/onc-healthit/lantern-back-end/endpointmanager v0.0.0-20241007214039-ddf774cc1452/go.mod h1:eBdu8Xc3mHX+sf2IPGMW4lFeneAzh5q8uG/Pep6/rrg=
-github.com/onc-healthit/lantern-back-end/endpointmanager v0.0.0-20241031222212-dbc35bf03756 h1:7WEGS8eesmWS/SMLraR9YQ7eQCZixWrYmAPGnkov/dY=
 github.com/onc-healthit/lantern-back-end/endpointmanager v0.0.0-20241031222212-dbc35bf03756/go.mod h1:8UoDWgoR5HgR7xXwM9ihK4rDUby/Q5BKRxRqTSNbsbY=
+github.com/onc-healthit/lantern-back-end/endpointmanager v0.0.0-20241127145057-f9579599f6d8 h1:hHN0AdFsN/lXEmeaVNQbrQ/w4+/biFDKhxl6dRS84pM=
+github.com/onc-healthit/lantern-back-end/endpointmanager v0.0.0-20241127145057-f9579599f6d8/go.mod h1:2jUEQiQ5GO4nBzhkHEzz2TNULjj7wk35hi7ABmXEG7M=
 github.com/onc-healthit/lantern-back-end/lanternmq v0.0.0-20200318142043-2e3efa6899ea/go.mod h1:RW06wTVLYNRw9cNhK2cGtSJYYbsBq7Hom1ffIGV7RZU=
 github.com/onc-healthit/lantern-back-end/lanternmq v0.0.0-20200325112617-d9df26e6fd2b/go.mod h1:RW06wTVLYNRw9cNhK2cGtSJYYbsBq7Hom1ffIGV7RZU=
 github.com/onc-healthit/lantern-back-end/lanternmq v0.0.0-20200714154604-c91fcf38666d/go.mod h1:4kCE/In3mdWmUl/FJ1l9eUPXhYnYGS3WpnEAegQGpCg=
@@ -678,8 +679,9 @@ github.com/onc-healthit/lantern-back-end/lanternmq v0.0.0-20240828212004-32ed2f8
 github.com/onc-healthit/lantern-back-end/lanternmq v0.0.0-20240911204302-fe8913c82d64/go.mod h1:i6DbIDT6cQh6Rmbisg2dAxxS+ysX1KlS1gLxg1CXxRs=
 github.com/onc-healthit/lantern-back-end/lanternmq v0.0.0-20240925181546-5c7ae33e5fcf/go.mod h1:Zezr8o3zFufdiokKxcjMoqVncC5VaXXyoO1GdL05la4=
 github.com/onc-healthit/lantern-back-end/lanternmq v0.0.0-20241007214039-ddf774cc1452/go.mod h1:O+IR9FPMZdBEdNolzWqodCDulZWUpEAH8q519OhqXzY=
-github.com/onc-healthit/lantern-back-end/lanternmq v0.0.0-20241031222212-dbc35bf03756 h1:qyCdNlV7znYvrZuLozJ8TAryaCwhc4wZpP4ryNLGsi8=
 github.com/onc-healthit/lantern-back-end/lanternmq v0.0.0-20241031222212-dbc35bf03756/go.mod h1:L0vHmzsUhOnVSwROsQ1wh443IwzcXMq857+BirffRWg=
+github.com/onc-healthit/lantern-back-end/lanternmq v0.0.0-20241127145057-f9579599f6d8 h1:GLNtegrgdsXIvyQNONUr3FkE1ClKGN07+ypoIv424o8=
+github.com/onc-healthit/lantern-back-end/lanternmq v0.0.0-20241127145057-f9579599f6d8/go.mod h1:zj9Er0ZmpN99+HwdDU6fw7SE+GsuSSt6viblEX6dzVE=
 github.com/onc-healthit/lantern-back-end/networkstatsquerier v0.0.0-20200319114800-a2d86dc950c6/go.mod h1:jPu3HTPUBd+0vKKBa4yKFouFWo+HvwXoY4hKCrfiAOw=
 github.com/onc-healthit/lantern-back-end/networkstatsquerier v0.0.0-20200325112617-d9df26e6fd2b/go.mod h1:jPu3HTPUBd+0vKKBa4yKFouFWo+HvwXoY4hKCrfiAOw=
 github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=

e2e/go.mod

@@ -3,9 +3,9 @@ module github.com/onc-healthit/lantern-back-end/e2e
 go 1.16
 
 require (
-	github.com/onc-healthit/lantern-back-end/capabilityreceiver v0.0.0-20241031222212-dbc35bf03756
-	github.com/onc-healthit/lantern-back-end/endpointmanager v0.0.0-20241031222212-dbc35bf03756
-	github.com/onc-healthit/lantern-back-end/lanternmq v0.0.0-20241031222212-dbc35bf03756
+	github.com/onc-healthit/lantern-back-end/capabilityreceiver v0.0.0-20241127145057-f9579599f6d8
+	github.com/onc-healthit/lantern-back-end/endpointmanager v0.0.0-20241127145057-f9579599f6d8
+	github.com/onc-healthit/lantern-back-end/lanternmq v0.0.0-20241127145057-f9579599f6d8
 	github.com/spf13/viper v1.10.1
 	github.com/streadway/amqp v0.0.0-20200108173154-1c71cc93ed71
 	github.com/stretchr/testify v1.7.0

e2e/go.sum

@@ -443,8 +443,8 @@ github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn
 github.com/onc-healthit/lantern-back-end v0.0.0-20200319114800-a2d86dc950c6 h1:+wJAkmqrYYmQ5tH7o9ssLXq4UMwEeDZEdv/hQwABaoE=
 github.com/onc-healthit/lantern-back-end v0.0.0-20200319114800-a2d86dc950c6/go.mod h1:D1+Dbr7oRkqfpFVytc9HB9DcaqbVhG63FMi0WxLakUE=
 github.com/onc-healthit/lantern-back-end/capabilityquerier v0.0.0-20200325112617-d9df26e6fd2b/go.mod h1:coNhm1eDaFhpn7ludPQYFlLFntXTyIb+7VPO5Wb2fBc=
-github.com/onc-healthit/lantern-back-end/capabilityreceiver v0.0.0-20241031222212-dbc35bf03756 h1:TSX488Rxond+y9z/FmBg/s61aRvpdLDj5kmrRL0EkzA=
-github.com/onc-healthit/lantern-back-end/capabilityreceiver v0.0.0-20241031222212-dbc35bf03756/go.mod h1:Ta6DcCE6CFBI3sj61RHyV87eIK5bHc50vOBdpYU7OT4=
+github.com/onc-healthit/lantern-back-end/capabilityreceiver v0.0.0-20241127145057-f9579599f6d8 h1:u+VcURG2TJkAoVnxPwdaqFt1/KaKSR3kjspK5zi6P2A=
+github.com/onc-healthit/lantern-back-end/capabilityreceiver v0.0.0-20241127145057-f9579599f6d8/go.mod h1:KS1btp+9zr29zoKPUOq3mz+zL5wrc0X7GQslPTioORQ=
 github.com/onc-healthit/lantern-back-end/endpointmanager v0.0.0-20200319151735-49dd5d7c3af0/go.mod h1:IYetlCA7Jkwo2HjEJkzRiwN4hVUB+5p3Kss5z40DQPQ=
 github.com/onc-healthit/lantern-back-end/endpointmanager v0.0.0-20200413101328-40c884330475/go.mod h1:T69VgfMPvmUJ6YhQxbqCAcdzZ25V5i3QMCp7BHrldUw=
 github.com/onc-healthit/lantern-back-end/endpointmanager v0.0.0-20200715113835-555f2079fc47/go.mod h1:rrFFaNYYgDpZXQU3A8BzI1SQbFcPNeXMcwdvxvDIBWA=
@@ -561,8 +561,9 @@ github.com/onc-healthit/lantern-back-end/endpointmanager v0.0.0-20240828212004-3
 github.com/onc-healthit/lantern-back-end/endpointmanager v0.0.0-20240911204302-fe8913c82d64/go.mod h1:k+8qcaQI6YE2sBfwYHquaT15IgpuuVdIQmvWJYqTOrw=
 github.com/onc-healthit/lantern-back-end/endpointmanager v0.0.0-20240925181546-5c7ae33e5fcf/go.mod h1:61S9YpAxWHx/XdkoqM8jBBoK4ZY6LO2RxI8IY2Iceow=
 github.com/onc-healthit/lantern-back-end/endpointmanager v0.0.0-20241007214039-ddf774cc1452/go.mod h1:eBdu8Xc3mHX+sf2IPGMW4lFeneAzh5q8uG/Pep6/rrg=
-github.com/onc-healthit/lantern-back-end/endpointmanager v0.0.0-20241031222212-dbc35bf03756 h1:7WEGS8eesmWS/SMLraR9YQ7eQCZixWrYmAPGnkov/dY=
 github.com/onc-healthit/lantern-back-end/endpointmanager v0.0.0-20241031222212-dbc35bf03756/go.mod h1:8UoDWgoR5HgR7xXwM9ihK4rDUby/Q5BKRxRqTSNbsbY=
+github.com/onc-healthit/lantern-back-end/endpointmanager v0.0.0-20241127145057-f9579599f6d8 h1:hHN0AdFsN/lXEmeaVNQbrQ/w4+/biFDKhxl6dRS84pM=
+github.com/onc-healthit/lantern-back-end/endpointmanager v0.0.0-20241127145057-f9579599f6d8/go.mod h1:2jUEQiQ5GO4nBzhkHEzz2TNULjj7wk35hi7ABmXEG7M=
 github.com/onc-healthit/lantern-back-end/lanternmq v0.0.0-20200318142043-2e3efa6899ea/go.mod h1:RW06wTVLYNRw9cNhK2cGtSJYYbsBq7Hom1ffIGV7RZU=
 github.com/onc-healthit/lantern-back-end/lanternmq v0.0.0-20200325112617-d9df26e6fd2b/go.mod h1:RW06wTVLYNRw9cNhK2cGtSJYYbsBq7Hom1ffIGV7RZU=
 github.com/onc-healthit/lantern-back-end/lanternmq v0.0.0-20200714154604-c91fcf38666d/go.mod h1:4kCE/In3mdWmUl/FJ1l9eUPXhYnYGS3WpnEAegQGpCg=
@@ -680,8 +681,9 @@ github.com/onc-healthit/lantern-back-end/lanternmq v0.0.0-20240828212004-32ed2f8
 github.com/onc-healthit/lantern-back-end/lanternmq v0.0.0-20240911204302-fe8913c82d64/go.mod h1:i6DbIDT6cQh6Rmbisg2dAxxS+ysX1KlS1gLxg1CXxRs=
 github.com/onc-healthit/lantern-back-end/lanternmq v0.0.0-20240925181546-5c7ae33e5fcf/go.mod h1:Zezr8o3zFufdiokKxcjMoqVncC5VaXXyoO1GdL05la4=
 github.com/onc-healthit/lantern-back-end/lanternmq v0.0.0-20241007214039-ddf774cc1452/go.mod h1:O+IR9FPMZdBEdNolzWqodCDulZWUpEAH8q519OhqXzY=
-github.com/onc-healthit/lantern-back-end/lanternmq v0.0.0-20241031222212-dbc35bf03756 h1:qyCdNlV7znYvrZuLozJ8TAryaCwhc4wZpP4ryNLGsi8=
 github.com/onc-healthit/lantern-back-end/lanternmq v0.0.0-20241031222212-dbc35bf03756/go.mod h1:L0vHmzsUhOnVSwROsQ1wh443IwzcXMq857+BirffRWg=
+github.com/onc-healthit/lantern-back-end/lanternmq v0.0.0-20241127145057-f9579599f6d8 h1:GLNtegrgdsXIvyQNONUr3FkE1ClKGN07+ypoIv424o8=
+github.com/onc-healthit/lantern-back-end/lanternmq v0.0.0-20241127145057-f9579599f6d8/go.mod h1:zj9Er0ZmpN99+HwdDU6fw7SE+GsuSSt6viblEX6dzVE=
 github.com/onc-healthit/lantern-back-end/networkstatsquerier v0.0.0-20200319114800-a2d86dc950c6/go.mod h1:jPu3HTPUBd+0vKKBa4yKFouFWo+HvwXoY4hKCrfiAOw=
 github.com/onc-healthit/lantern-back-end/networkstatsquerier v0.0.0-20200325112617-d9df26e6fd2b/go.mod h1:jPu3HTPUBd+0vKKBa4yKFouFWo+HvwXoY4hKCrfiAOw=
 github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=

endpointmanager/go.mod

@@ -7,7 +7,7 @@ require (
 	github.com/chromedp/chromedp v0.7.8
 	github.com/google/go-cmp v0.5.7
 	github.com/lib/pq v1.3.0
-	github.com/onc-healthit/lantern-back-end/lanternmq v0.0.0-20241031222212-dbc35bf03756
+	github.com/onc-healthit/lantern-back-end/lanternmq v0.0.0-20241127145057-f9579599f6d8
 	github.com/pkg/errors v0.9.1
 	github.com/sirupsen/logrus v1.8.1
 	github.com/spf13/viper v1.10.1