Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(deps): update module github.com/cheshir/go-mq to v2 #57

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 1 addition & 7 deletions go.mod
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@ go 1.23

require (
github.com/Khan/genqlient v0.8.0
github.com/cheshir/go-mq v1.2.0
github.com/cheshir/go-mq/v2 v2.0.1
github.com/dgrijalva/jwt-go v3.2.0+incompatible
github.com/joho/godotenv v1.5.1
github.com/matryer/try v0.0.0-20161228173917-9ac251b645a2
@@ -16,7 +16,6 @@ require (
github.com/NeowayLabs/wabbit v0.0.0-20210927194032-73ad61d1620e // indirect
github.com/containerd/log v0.1.0 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/docker/go-units v0.5.0 // indirect
github.com/dustin/go-humanize v1.0.1 // indirect
github.com/go-ini/ini v1.67.0 // indirect
github.com/goccy/go-json v0.10.4 // indirect
@@ -27,7 +26,6 @@ require (
github.com/minio/md5-simd v1.1.2 // indirect
github.com/moby/docker-image-spec v1.3.1 // indirect
github.com/moby/patternmatcher v0.6.0 // indirect
github.com/moby/sys/sequential v0.5.0 // indirect
github.com/moby/sys/user v0.1.0 // indirect
github.com/moby/sys/userns v0.1.0 // indirect
github.com/opencontainers/image-spec v1.1.0-rc2.0.20221005185240-3a7f492d3f1b // indirect
@@ -36,13 +34,11 @@ require (
github.com/rabbitmq/amqp091-go v1.10.0 // indirect
github.com/rogpeppe/go-internal v1.10.0 // indirect
github.com/rs/xid v1.6.0 // indirect
github.com/streadway/amqp v1.1.0 // indirect
github.com/stretchr/objx v0.5.2 // indirect
github.com/vektah/gqlparser/v2 v2.5.21 // indirect
golang.org/x/crypto v0.31.0 // indirect
golang.org/x/sys v0.28.0 // indirect
golang.org/x/text v0.21.0 // indirect
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
)

replace (
@@ -53,9 +49,7 @@ replace (
require (
github.com/CycloneDX/cyclonedx-go v0.9.2
github.com/cheekybits/is v0.0.0-20150225183255-68e9c0620927 // indirect
github.com/fsouza/go-dockerclient v1.7.3 // indirect
github.com/minio/minio-go/v7 v7.0.82
github.com/tiago4orion/conjure v0.0.0-20150908101743-93cb30b9d218 // indirect
golang.org/x/net v0.33.0 // indirect
gopkg.in/yaml.v3 v3.0.1
)
1,277 changes: 1,261 additions & 16 deletions go.sum

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion internal/handler/main.go
Original file line number Diff line number Diff line change
@@ -22,7 +22,7 @@
"github.com/minio/minio-go/v7"
"github.com/minio/minio-go/v7/pkg/credentials"

"github.com/cheshir/go-mq"
"github.com/cheshir/go-mq/v2"
"github.com/matryer/try"
"github.com/uselagoon/lagoon/services/insights-handler/internal/lagoonclient"
"github.com/uselagoon/lagoon/services/insights-handler/internal/lagoonclient/jwt"
@@ -217,7 +217,7 @@

// Consumer handles consuming messages sent to the queue that this action handler is connected to and processes them accordingly
func (h *Messaging) Consumer() {
var messageQueue mq.MQ

Check failure on line 220 in internal/handler/main.go

GitHub Actions / test-suite

undefined: mq.MQ

// if no mq is found when the goroutine starts, retry a few times before exiting
// default is 10 retry with 30 second delay = 5 minutes
@@ -645,7 +645,7 @@
}

// toLagoonInsights sends logs to the lagoon-insights message queue
func (h *Messaging) toLagoonInsights(messageQueue mq.MQ, message map[string]interface{}) {

Check failure on line 648 in internal/handler/main.go

GitHub Actions / test-suite

undefined: mq.MQ
msgBytes, err := json.Marshal(message)
if err != nil {
// TODO: BETTER ERROR HANDLING
2 changes: 1 addition & 1 deletion internal/handler/main_test.go
Original file line number Diff line number Diff line change
@@ -11,7 +11,7 @@ import (
"testing"

cdx "github.com/CycloneDX/cyclonedx-go"
"github.com/cheshir/go-mq"
"github.com/cheshir/go-mq/v2"
"github.com/joho/godotenv"
"github.com/stretchr/testify/mock"
"github.com/uselagoon/lagoon/services/insights-handler/internal/lagoonclient"
2 changes: 1 addition & 1 deletion internal/handler/messaging.go
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@ package handler
import (
"encoding/json"
"fmt"
"github.com/cheshir/go-mq"
"github.com/cheshir/go-mq/v2"
"log/slog"
"sort"
"strconv"
2 changes: 1 addition & 1 deletion internal/handler/processing.go
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@ import (
"context"
"encoding/json"
"github.com/Khan/genqlient/graphql"
"github.com/cheshir/go-mq"
"github.com/cheshir/go-mq/v2"
"github.com/uselagoon/lagoon/services/insights-handler/internal/lagoonclient"
"log/slog"
"net/http"
2 changes: 1 addition & 1 deletion main.go
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@ package main
import (
"flag"
"fmt"
"github.com/cheshir/go-mq"
"github.com/cheshir/go-mq/v2"
"github.com/uselagoon/lagoon/services/insights-handler/internal/handler"
"log/slog"
"os"