Skip to content

Commit

Permalink
Remove libbeat/common/transport/httpcommon and `libbeat/common/tran…
Browse files Browse the repository at this point in the history 
…sport/tlscommon` (#31579)
  • Loading branch information
@kvch
kvch authored May 17, 2022
1 parent d2b3e9e commit 5129d6c
Show file tree
Hide file tree
Showing 136 changed files with 124 additions and 5,624 deletions.
2 changes: 1 addition & 1 deletion dev-tools/cmd/dashboards/export_dashboards.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ import (
"path/filepath"
"time"

"github.com/elastic/beats/v7/libbeat/common/transport/httpcommon"
"github.com/elastic/beats/v7/libbeat/dashboards"
"github.com/elastic/beats/v7/libbeat/kibana"
"github.com/elastic/elastic-agent-libs/transport/httpcommon"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion filebeat/fileset/pipelines_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"

"github.com/elastic/beats/v7/libbeat/common/transport/httpcommon"
"github.com/elastic/beats/v7/libbeat/esleg/eslegclient"
"github.com/elastic/elastic-agent-libs/logp"
"github.com/elastic/elastic-agent-libs/transport/httpcommon"
)

func TestLoadPipelinesWithMultiPipelineFileset(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion filebeat/input/kafka/config.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@ import (
"github.com/elastic/beats/v7/libbeat/common/cfgwarn"
"github.com/elastic/beats/v7/libbeat/common/kafka"
"github.com/elastic/beats/v7/libbeat/common/transport/kerberos"
"github.com/elastic/beats/v7/libbeat/common/transport/tlscommon"
"github.com/elastic/beats/v7/libbeat/reader/parser"
"github.com/elastic/elastic-agent-libs/monitoring"
"github.com/elastic/elastic-agent-libs/monitoring/adapter"
"github.com/elastic/elastic-agent-libs/transport/tlscommon"
)

type kafkaInputConfig struct {
Expand Down
2 changes: 1 addition & 1 deletion filebeat/input/mqtt/client.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ package mqtt
import (
libmqtt "github.com/eclipse/paho.mqtt.golang"

"github.com/elastic/beats/v7/libbeat/common/transport/tlscommon"
"github.com/elastic/elastic-agent-libs/transport/tlscommon"
)

func createClientOptions(config mqttInputConfig, onConnectHandler func(client libmqtt.Client)) (*libmqtt.ClientOptions, error) {
Expand Down
2 changes: 1 addition & 1 deletion filebeat/input/mqtt/config.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ package mqtt
import (
"errors"

"github.com/elastic/beats/v7/libbeat/common/transport/tlscommon"
"github.com/elastic/elastic-agent-libs/transport/tlscommon"
)

type mqttInputConfig struct {
Expand Down
2 changes: 1 addition & 1 deletion filebeat/inputsource/tcp/config.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
"time"

"github.com/elastic/beats/v7/libbeat/common/cfgtype"
"github.com/elastic/beats/v7/libbeat/common/transport/tlscommon"
"github.com/elastic/elastic-agent-libs/transport/tlscommon"
)

// Name is the human readable name and identifier.
Expand Down
2 changes: 1 addition & 1 deletion filebeat/inputsource/tcp/handler.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (
"net"

"github.com/elastic/beats/v7/filebeat/inputsource"
"github.com/elastic/beats/v7/libbeat/common/transport/tlscommon"
"github.com/elastic/elastic-agent-libs/transport/tlscommon"
)

// MetadataCallback returns common metadata about a tcp connection
Expand Down
2 changes: 1 addition & 1 deletion filebeat/inputsource/tcp/server.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import (

"github.com/elastic/beats/v7/filebeat/inputsource"
"github.com/elastic/beats/v7/filebeat/inputsource/common/streaming"
"github.com/elastic/beats/v7/libbeat/common/transport/tlscommon"
"github.com/elastic/elastic-agent-libs/transport/tlscommon"
)

// Server represent a TCP server
Expand Down
2 changes: 1 addition & 1 deletion heartbeat/monitors/active/dialchain/dialchain.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ package dialchain

import (
"github.com/elastic/beats/v7/libbeat/beat"
"github.com/elastic/beats/v7/libbeat/common/transport"
"github.com/elastic/elastic-agent-libs/transport"
)

// DialerChain composes builders for multiple network layers, used to build
Expand Down
2 changes: 1 addition & 1 deletion heartbeat/monitors/active/dialchain/dialers.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ import (
"github.com/elastic/beats/v7/heartbeat/eventext"
"github.com/elastic/beats/v7/heartbeat/look"
"github.com/elastic/beats/v7/libbeat/beat"
"github.com/elastic/beats/v7/libbeat/common/transport"
"github.com/elastic/elastic-agent-libs/logp"
"github.com/elastic/elastic-agent-libs/mapstr"
"github.com/elastic/elastic-agent-libs/transport"
)

// TCPDialer creates a new NetDialer with constant event fields and default
Expand Down
2 changes: 1 addition & 1 deletion heartbeat/monitors/active/dialchain/socks5.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ import (

"github.com/elastic/beats/v7/heartbeat/look"
"github.com/elastic/beats/v7/libbeat/beat"
"github.com/elastic/beats/v7/libbeat/common/transport"
"github.com/elastic/elastic-agent-libs/logp"
"github.com/elastic/elastic-agent-libs/transport"
)

// SOCKS5Layer configures a SOCKS5 proxy layer in a DialerChain.
Expand Down
4 changes: 2 additions & 2 deletions heartbeat/monitors/active/dialchain/tls.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ import (

"github.com/elastic/beats/v7/heartbeat/monitors/active/dialchain/tlsmeta"
"github.com/elastic/beats/v7/libbeat/beat"
"github.com/elastic/beats/v7/libbeat/common/transport"
"github.com/elastic/beats/v7/libbeat/common/transport/tlscommon"
"github.com/elastic/elastic-agent-libs/transport"
"github.com/elastic/elastic-agent-libs/transport/tlscommon"
)

// TLSLayer configures the TLS layer in a DialerChain.
Expand Down
2 changes: 1 addition & 1 deletion heartbeat/monitors/active/dialchain/tlsmeta/tlsmeta.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ import (
"time"

"github.com/elastic/beats/v7/heartbeat/look"
"github.com/elastic/beats/v7/libbeat/common/transport/tlscommon"
"github.com/elastic/elastic-agent-libs/mapstr"
"github.com/elastic/elastic-agent-libs/transport/tlscommon"
)

// UnknownTLSHandshakeDuration to be used in AddTLSMetadata when the duration of the TLS handshake can't be determined.
Expand Down
2 changes: 1 addition & 1 deletion heartbeat/monitors/active/dialchain/util.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
"time"

"github.com/elastic/beats/v7/libbeat/beat"
"github.com/elastic/beats/v7/libbeat/common/transport"
"github.com/elastic/elastic-agent-libs/transport"
)

type timer struct {
Expand Down
2 changes: 1 addition & 1 deletion heartbeat/monitors/active/http/config.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ import (
"time"

"github.com/elastic/beats/v7/heartbeat/monitors"
"github.com/elastic/beats/v7/libbeat/common/transport/httpcommon"
"github.com/elastic/beats/v7/libbeat/conditions"
"github.com/elastic/elastic-agent-libs/transport/httpcommon"
)

type Config struct {
Expand Down
4 changes: 2 additions & 2 deletions heartbeat/monitors/active/http/http.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@ import (

"github.com/elastic/beats/v7/heartbeat/monitors/jobs"
"github.com/elastic/beats/v7/heartbeat/monitors/wrappers"
"github.com/elastic/beats/v7/libbeat/common/transport/httpcommon"
"github.com/elastic/beats/v7/libbeat/common/transport/tlscommon"
"github.com/elastic/beats/v7/libbeat/common/useragent"
"github.com/elastic/elastic-agent-libs/transport/httpcommon"
"github.com/elastic/elastic-agent-libs/transport/tlscommon"
)

func init() {
Expand Down
2 changes: 1 addition & 1 deletion heartbeat/monitors/active/http/simple_transp.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import (
"net/url"
"strings"

"github.com/elastic/beats/v7/libbeat/common/transport"
"github.com/elastic/elastic-agent-libs/transport"
)

const (
Expand Down
4 changes: 2 additions & 2 deletions heartbeat/monitors/active/http/task.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ import (
"github.com/elastic/beats/v7/heartbeat/monitors/jobs"
"github.com/elastic/beats/v7/heartbeat/reason"
"github.com/elastic/beats/v7/libbeat/beat"
"github.com/elastic/beats/v7/libbeat/common/transport/httpcommon"
"github.com/elastic/beats/v7/libbeat/common/transport/tlscommon"
"github.com/elastic/elastic-agent-libs/transport/httpcommon"
"github.com/elastic/elastic-agent-libs/transport/tlscommon"
)

type requestFactory func() (*http.Request, error)
Expand Down
4 changes: 2 additions & 2 deletions heartbeat/monitors/active/tcp/config.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ import (
"time"

"github.com/elastic/beats/v7/heartbeat/monitors"
"github.com/elastic/beats/v7/libbeat/common/transport"
"github.com/elastic/beats/v7/libbeat/common/transport/tlscommon"
"github.com/elastic/elastic-agent-libs/transport"
"github.com/elastic/elastic-agent-libs/transport/tlscommon"
)

type config struct {
Expand Down
4 changes: 2 additions & 2 deletions heartbeat/monitors/active/tcp/tcp.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,11 @@ import (
"github.com/elastic/beats/v7/heartbeat/monitors/wrappers"
"github.com/elastic/beats/v7/heartbeat/reason"
"github.com/elastic/beats/v7/libbeat/beat"
"github.com/elastic/beats/v7/libbeat/common/transport"
"github.com/elastic/beats/v7/libbeat/common/transport/tlscommon"
conf "github.com/elastic/elastic-agent-libs/config"
"github.com/elastic/elastic-agent-libs/logp"
"github.com/elastic/elastic-agent-libs/mapstr"
"github.com/elastic/elastic-agent-libs/transport"
"github.com/elastic/elastic-agent-libs/transport/tlscommon"
)

func init() {
Expand Down
2 changes: 1 addition & 1 deletion libbeat/cmd/test/output.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import (
"github.com/elastic/beats/v7/libbeat/cmd/instance"
"github.com/elastic/beats/v7/libbeat/idxmgmt"
"github.com/elastic/beats/v7/libbeat/outputs"
"github.com/elastic/beats/v7/libbeat/testing"
"github.com/elastic/elastic-agent-libs/testing"
)

func GenTestOutputCmd(settings instance.Settings) *cobra.Command {
Expand Down
Loading

0 comments on commit 5129d6c

Please sign in to comment.