Skip to content

Commit

Permalink
Relicense debug/checkups and debug/shipper to ee (#1478)
Browse files Browse the repository at this point in the history
  • Loading branch information
@RebeccaMahany
RebeccaMahany authored Nov 28, 2023
1 parent 8448894 commit dc7816c
Show file tree
Hide file tree
Showing 54 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion cmd/launcher/doctor.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ import (

"github.com/go-kit/kit/log"
"github.com/kolide/kit/logutil"
"github.com/kolide/launcher/ee/debug/checkups"
"github.com/kolide/launcher/pkg/agent/flags"
"github.com/kolide/launcher/pkg/agent/knapsack"
"github.com/kolide/launcher/pkg/debug/checkups"
"github.com/kolide/launcher/pkg/launcher"
)

Expand Down
4 changes: 2 additions & 2 deletions cmd/launcher/flare.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ import (
"github.com/go-kit/kit/log"
"github.com/go-kit/kit/log/level"
"github.com/kolide/kit/ulid"
"github.com/kolide/launcher/ee/debug/checkups"
"github.com/kolide/launcher/ee/debug/shipper"
"github.com/kolide/launcher/pkg/agent/flags"
"github.com/kolide/launcher/pkg/agent/knapsack"
"github.com/kolide/launcher/pkg/agent/storage/inmemory"
"github.com/kolide/launcher/pkg/debug/checkups"
"github.com/kolide/launcher/pkg/debug/shipper"
"github.com/kolide/launcher/pkg/launcher"
"github.com/peterbourgon/ff/v3"
)
Expand Down
2 changes: 1 addition & 1 deletion cmd/launcher/launcher.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ import (
"github.com/kolide/launcher/ee/control/consumers/flareconsumer"
"github.com/kolide/launcher/ee/control/consumers/keyvalueconsumer"
"github.com/kolide/launcher/ee/control/consumers/notificationconsumer"
"github.com/kolide/launcher/ee/debug/checkups"
desktopRunner "github.com/kolide/launcher/ee/desktop/runner"
"github.com/kolide/launcher/ee/localserver"
"github.com/kolide/launcher/ee/tuf"
Expand All @@ -43,7 +44,6 @@ import (
"github.com/kolide/launcher/pkg/backoff"
"github.com/kolide/launcher/pkg/contexts/ctxlog"
"github.com/kolide/launcher/pkg/debug"
"github.com/kolide/launcher/pkg/debug/checkups"
"github.com/kolide/launcher/pkg/launcher"
"github.com/kolide/launcher/pkg/log/logshipper"
"github.com/kolide/launcher/pkg/log/multislogger"
Expand Down
4 changes: 2 additions & 2 deletions ee/control/consumers/flareconsumer/flareconsumer.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ import (
"log/slog"
"time"

"github.com/kolide/launcher/ee/debug/checkups"
"github.com/kolide/launcher/ee/debug/shipper"
"github.com/kolide/launcher/pkg/agent/types"
"github.com/kolide/launcher/pkg/debug/checkups"
"github.com/kolide/launcher/pkg/debug/shipper"
)

const (
Expand Down
0 pkg/debug/checkups/bboltdb.go → ee/debug/checkups/bboltdb.go
View file
File renamed without changes.
0 pkg/debug/checkups/binary_directory.go → ee/debug/checkups/binary_directory.go
View file
File renamed without changes.
0 pkg/debug/checkups/checkpoint.go → ee/debug/checkups/checkpoint.go
View file
File renamed without changes.
0 pkg/debug/checkups/checkpoint_test.go → ee/debug/checkups/checkpoint_test.go
View file
File renamed without changes.
0 pkg/debug/checkups/checkups.go → ee/debug/checkups/checkups.go
View file
File renamed without changes.
0 pkg/debug/checkups/connectivity.go → ee/debug/checkups/connectivity.go
View file
File renamed without changes.
0 pkg/debug/checkups/dns.go → ee/debug/checkups/dns.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion pkg/debug/checkups/dns_test.go → ee/debug/checkups/dns_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
"strings"
"testing"

"github.com/kolide/launcher/ee/debug/checkups/mocks"
typesMocks "github.com/kolide/launcher/pkg/agent/types/mocks"
"github.com/kolide/launcher/pkg/debug/checkups/mocks"
"github.com/stretchr/testify/mock"
"github.com/stretchr/testify/require"
)
Expand Down
0 pkg/debug/checkups/enroll-secret.go → ee/debug/checkups/enroll-secret.go
View file
File renamed without changes.
0 ...s/flare-environment-platform-specifics.go → ...s/flare-environment-platform-specifics.go
View file
File renamed without changes.
0 ...environment-platform-specifics_windows.go → ...environment-platform-specifics_windows.go
View file
File renamed without changes.
0 pkg/debug/checkups/gnome_extensions_linux.go → ee/debug/checkups/gnome_extensions_linux.go
View file
File renamed without changes.
0 pkg/debug/checkups/gnome_extensions_other.go → ee/debug/checkups/gnome_extensions_other.go
View file
File renamed without changes.
0 pkg/debug/checkups/helpers_other.go → ee/debug/checkups/helpers_other.go
View file
File renamed without changes.
0 pkg/debug/checkups/helpers_windows.go → ee/debug/checkups/helpers_windows.go
View file
File renamed without changes.
0 pkg/debug/checkups/host.go → ee/debug/checkups/host.go
View file
File renamed without changes.
0 pkg/debug/checkups/host_test.go → ee/debug/checkups/host_test.go
View file
File renamed without changes.
0 pkg/debug/checkups/install.go → ee/debug/checkups/install.go
View file
File renamed without changes.
0 pkg/debug/checkups/launchd_darwin.go → ee/debug/checkups/launchd_darwin.go
View file
File renamed without changes.
0 pkg/debug/checkups/launchd_other.go → ee/debug/checkups/launchd_other.go
View file
File renamed without changes.
0 pkg/debug/checkups/launcher_flags.go → ee/debug/checkups/launcher_flags.go
View file
File renamed without changes.
0 pkg/debug/checkups/logs.go → ee/debug/checkups/logs.go
View file
File renamed without changes.
0 pkg/debug/checkups/mocks/HostResolver.go → ee/debug/checkups/mocks/HostResolver.go
View file
File renamed without changes.
0 pkg/debug/checkups/network.go → ee/debug/checkups/network.go
View file
File renamed without changes.
0 pkg/debug/checkups/network_darwin.go → ee/debug/checkups/network_darwin.go
View file
File renamed without changes.
0 pkg/debug/checkups/network_linux.go → ee/debug/checkups/network_linux.go
View file
File renamed without changes.
0 pkg/debug/checkups/network_windows.go → ee/debug/checkups/network_windows.go
View file
File renamed without changes.
0 pkg/debug/checkups/notary.go → ee/debug/checkups/notary.go
View file
File renamed without changes.
0 pkg/debug/checkups/osq_config_conflicts.go → ee/debug/checkups/osq_config_conflicts.go
View file
File renamed without changes.
0 pkg/debug/checkups/osq_data.go → ee/debug/checkups/osq_data.go
View file
File renamed without changes.
0 pkg/debug/checkups/osquery.go → ee/debug/checkups/osquery.go
View file
File renamed without changes.
0 pkg/debug/checkups/platform.go → ee/debug/checkups/platform.go
View file
File renamed without changes.
0 pkg/debug/checkups/power_other.go → ee/debug/checkups/power_other.go
View file
File renamed without changes.
0 pkg/debug/checkups/power_windows.go → ee/debug/checkups/power_windows.go
View file
File renamed without changes.
0 pkg/debug/checkups/processes.go → ee/debug/checkups/processes.go
View file
File renamed without changes.
0 pkg/debug/checkups/quarantine.go → ee/debug/checkups/quarantine.go
View file
File renamed without changes.
0 pkg/debug/checkups/quarantine_test.go → ee/debug/checkups/quarantine_test.go
View file
File renamed without changes.
0 pkg/debug/checkups/root_directory.go → ee/debug/checkups/root_directory.go
View file
File renamed without changes.
0 pkg/debug/checkups/runtime.go → ee/debug/checkups/runtime.go
View file
File renamed without changes.
0 pkg/debug/checkups/server_data.go → ee/debug/checkups/server_data.go
View file
File renamed without changes.
0 pkg/debug/checkups/services_other.go → ee/debug/checkups/services_other.go
View file
File renamed without changes.
0 pkg/debug/checkups/services_windows.go → ee/debug/checkups/services_windows.go
View file
File renamed without changes.
0 pkg/debug/checkups/system_time.go → ee/debug/checkups/system_time.go
View file
File renamed without changes.
0 pkg/debug/checkups/tuf.go → ee/debug/checkups/tuf.go
View file
File renamed without changes.
0 pkg/debug/checkups/tuf_test.go → ee/debug/checkups/tuf_test.go
View file
File renamed without changes.
0 pkg/debug/checkups/util.go → ee/debug/checkups/util.go
View file
File renamed without changes.
0 pkg/debug/checkups/version.go → ee/debug/checkups/version.go
View file
File renamed without changes.
0 pkg/debug/shipper/README.MD → ee/debug/shipper/README.MD
View file
File renamed without changes.
0 pkg/debug/shipper/shipper.go → ee/debug/shipper/shipper.go
View file
File renamed without changes.
0 pkg/debug/shipper/shipper_test.go → ee/debug/shipper/shipper_test.go
View file
File renamed without changes.

0 comments on commit dc7816c

Please sign in to comment.