Skip to content

Commit

Permalink
update dependencies and rename module
Browse files Browse the repository at this point in the history
renaming the module from github.com/trivago/gollum to just gollum
fixes issues with accidentally importint the previous gollum tag
instead of using the current module.
  • Loading branch information
arnecls committed Jun 7, 2021
1 parent 479cafe commit b79b0cd
Show file tree
Hide file tree
Showing 1,430 changed files with 254,287 additions and 111,253 deletions.
5 changes: 3 additions & 2 deletions consumer/awsKinesis.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,12 @@ import (
"sync"
"time"

"gollum/core"
"gollum/core/components"

"github.com/aws/aws-sdk-go/aws"
"github.com/aws/aws-sdk-go/aws/awserr"
"github.com/aws/aws-sdk-go/service/kinesis"
"github.com/trivago/gollum/core"
"github.com/trivago/gollum/core/components"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion consumer/console.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"sync"
"time"

"github.com/trivago/gollum/core"
"gollum/core"
"github.com/trivago/tgo"
"github.com/trivago/tgo/tio"
)
Expand Down
4 changes: 2 additions & 2 deletions consumer/consumers_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ package consumer

import (
"fmt"
"github.com/trivago/gollum/core"
_ "github.com/trivago/gollum/router"
"gollum/core"
_ "gollum/router"
"runtime/debug"
"testing"
)
Expand Down
3 changes: 2 additions & 1 deletion consumer/file.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,9 @@ import (
"sync"
"time"

"gollum/core"

"github.com/sirupsen/logrus"
"github.com/trivago/gollum/core"
"github.com/trivago/tgo"
"github.com/trivago/tgo/tio"
)
Expand Down
3 changes: 2 additions & 1 deletion consumer/http.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,9 @@ import (
"sync"
"time"

"gollum/core"

auth "github.com/abbot/go-http-auth"
"github.com/trivago/gollum/core"
"github.com/trivago/tgo/tnet"
)

Expand Down
3 changes: 2 additions & 1 deletion consumer/kafka.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,10 @@ import (
"sync/atomic"
"time"

"gollum/core"

kafka "github.com/Shopify/sarama"
cluster "github.com/bsm/sarama-cluster"
"github.com/trivago/gollum/core"
"github.com/trivago/tgo/tsync"
)

Expand Down
3 changes: 2 additions & 1 deletion consumer/profiler.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@ import (
"sync"
"time"

"github.com/trivago/gollum/core"
"gollum/core"

"github.com/trivago/tgo"
)

Expand Down
3 changes: 2 additions & 1 deletion consumer/proxy.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@ import (
"strings"
"sync"

"github.com/trivago/gollum/core"
"gollum/core"

"github.com/trivago/tgo"
"github.com/trivago/tgo/tio"
"github.com/trivago/tgo/tnet"
Expand Down
9 changes: 5 additions & 4 deletions consumer/proxyclient.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,15 @@
package consumer

import (
"github.com/sirupsen/logrus"
"github.com/trivago/gollum/core"
"github.com/trivago/tgo"
"github.com/trivago/tgo/tio"
"gollum/core"
"io"
"net"
"syscall"
"time"

"github.com/sirupsen/logrus"
"github.com/trivago/tgo"
"github.com/trivago/tgo/tio"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion consumer/socket.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ import (
"sync"
"time"

"github.com/trivago/gollum/core"
"github.com/trivago/tgo"
"github.com/trivago/tgo/tio"
"github.com/trivago/tgo/tnet"
"gollum/core"
)

const (
Expand Down
3 changes: 2 additions & 1 deletion consumer/syslogd.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@ import (

"github.com/trivago/tgo/tcontainer"

"github.com/trivago/gollum/core"
"gollum/core"

"github.com/trivago/tgo/tnet"
syslog "gopkg.in/mcuadros/go-syslog.v2"
"gopkg.in/mcuadros/go-syslog.v2/format"
Expand Down
3 changes: 2 additions & 1 deletion contrib/deprecated/producer/s3.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,14 @@ import (
"sync/atomic"
"time"

"gollum/core"

"github.com/aws/aws-sdk-go/aws"
"github.com/aws/aws-sdk-go/aws/credentials"
"github.com/aws/aws-sdk-go/aws/credentials/stscreds"
"github.com/aws/aws-sdk-go/aws/session"
"github.com/aws/aws-sdk-go/service/s3"
metrics "github.com/rcrowley/go-metrics"
"github.com/trivago/gollum/core"
"github.com/trivago/tgo/tcontainer"
)

Expand Down
5 changes: 3 additions & 2 deletions contrib/native/kafka/kafkaproducer.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,9 @@ import (
"sync/atomic"
"time"

kafka "github.com/trivago/gollum/contrib/native/kafka/librdkafka"
"github.com/trivago/gollum/core"
kafka "gollum/contrib/native/kafka/librdkafka"
"gollum/core"

"github.com/trivago/tgo"
)

Expand Down
3 changes: 2 additions & 1 deletion contrib/native/pcap/pcaphttp.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,9 @@ import (
"sync"
"time"

"gollum/core"

"github.com/miekg/pcap"
"github.com/trivago/gollum/core"
)

// PcapHTTPConsumer consumer
Expand Down
3 changes: 2 additions & 1 deletion contrib/native/systemd/systemdconsumer.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,9 @@ import (
"sync"
"time"

"gollum/core"

"github.com/coreos/go-systemd/sdjournal"
"github.com/trivago/gollum/core"
)

// SystemdConsumer consumer plugin
Expand Down
5 changes: 3 additions & 2 deletions coordinator.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,10 @@ import (
"sync"
"time"

"gollum/core"
"gollum/logger"

"github.com/sirupsen/logrus"
"github.com/trivago/gollum/core"
"github.com/trivago/gollum/logger"
"github.com/trivago/tgo"
)

Expand Down
3 changes: 2 additions & 1 deletion core/components/awsMultiClient.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,12 @@ package components
import (
"fmt"

"gollum/core"

"github.com/aws/aws-sdk-go/aws"
"github.com/aws/aws-sdk-go/aws/credentials"
"github.com/aws/aws-sdk-go/aws/credentials/stscreds"
"github.com/aws/aws-sdk-go/aws/session"
"github.com/trivago/gollum/core"
)

// DefaultAwsRegion defines the default region to use
Expand Down
3 changes: 2 additions & 1 deletion core/components/batchedWriterAssembly.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,9 @@ import (
"io"
"time"

"gollum/core"

"github.com/sirupsen/logrus"
"github.com/trivago/gollum/core"
"github.com/trivago/tgo/tmath"
)

Expand Down
2 changes: 1 addition & 1 deletion core/components/rotateConfig.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import (
"strings"
"time"

"github.com/trivago/gollum/core"
"gollum/core"
)

// RotateConfig defines rotation settings
Expand Down
3 changes: 2 additions & 1 deletion core/logconsumer.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,10 @@ import (
"sync"
"time"

"gollum/logger"

"github.com/rcrowley/go-metrics"
"github.com/sirupsen/logrus"
"github.com/trivago/gollum/logger"
)

// LogConsumer is an internal consumer plugin used indirectly by the gollum log
Expand Down
2 changes: 1 addition & 1 deletion filter/any.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
package filter

import (
"github.com/trivago/gollum/core"
"gollum/core"
)

// Any filter plugin
Expand Down
3 changes: 2 additions & 1 deletion filter/any_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@ package filter
import (
"testing"

"github.com/trivago/gollum/core"
"gollum/core"

"github.com/trivago/tgo/ttesting"
)

Expand Down
2 changes: 1 addition & 1 deletion filter/filters_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
package filter

import (
"github.com/trivago/gollum/core"
"gollum/core"
"runtime/debug"
"testing"
)
Expand Down
2 changes: 1 addition & 1 deletion filter/none.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
package filter

import (
"github.com/trivago/gollum/core"
"gollum/core"
)

// None filter plugin
Expand Down
3 changes: 2 additions & 1 deletion filter/none_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@ package filter
import (
"testing"

"github.com/trivago/gollum/core"
"gollum/core"

"github.com/trivago/tgo/ttesting"
)

Expand Down
3 changes: 2 additions & 1 deletion filter/rate.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,9 @@ import (
"sync/atomic"
"time"

"gollum/core"

"github.com/rcrowley/go-metrics"
"github.com/trivago/gollum/core"
)

// Rate filter plugin
Expand Down
2 changes: 1 addition & 1 deletion filter/rate_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ import (
"testing"
"time"

"github.com/trivago/gollum/core"
"github.com/trivago/tgo/ttesting"
"gollum/core"
)

func TestFilterRate(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion filter/regexp.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ package filter
import (
"regexp"

"github.com/trivago/gollum/core"
"gollum/core"
)

// RegExp filter
Expand Down
3 changes: 2 additions & 1 deletion filter/regexp_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@ package filter
import (
"testing"

"github.com/trivago/gollum/core"
"gollum/core"

"github.com/trivago/tgo/ttesting"
)

Expand Down
2 changes: 1 addition & 1 deletion filter/sample.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ package filter
import (
"sync/atomic"

"github.com/trivago/gollum/core"
"gollum/core"
)

// Sample filter plugin
Expand Down
3 changes: 2 additions & 1 deletion filter/sample_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@ package filter
import (
"testing"

"github.com/trivago/gollum/core"
"gollum/core"

"github.com/trivago/tgo/ttesting"
)

Expand Down
2 changes: 1 addition & 1 deletion filter/stream.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
package filter

import (
"github.com/trivago/gollum/core"
"gollum/core"
)

// Stream filter plugin
Expand Down
3 changes: 2 additions & 1 deletion filter/stream_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@ package filter
import (
"testing"

"github.com/trivago/gollum/core"
"gollum/core"

"github.com/trivago/tgo/ttesting"
)

Expand Down
3 changes: 2 additions & 1 deletion flags.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,9 @@ package main
import (
"fmt"

"gollum/core"

"github.com/sirupsen/logrus"
"github.com/trivago/gollum/core"
"github.com/trivago/tgo/tflag"
)

Expand Down
3 changes: 2 additions & 1 deletion format/agent.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,9 @@ package format
import (
"strings"

"gollum/core"

"github.com/mssola/user_agent"
"github.com/trivago/gollum/core"
)

// Agent formatter
Expand Down
3 changes: 2 additions & 1 deletion format/agent_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@ package format
import (
"testing"

"github.com/trivago/gollum/core"
"gollum/core"

"github.com/trivago/tgo/ttesting"
)

Expand Down
Loading

0 comments on commit b79b0cd

Please sign in to comment.