From dc7816c787b57a97cc7c554adb309d97af149e9e Mon Sep 17 00:00:00 2001 From: Rebecca Mahany-Horton Date: Tue, 28 Nov 2023 15:03:34 -0500 Subject: [PATCH] Relicense debug/checkups and debug/shipper to `ee` (#1478) --- cmd/launcher/doctor.go | 2 +- cmd/launcher/flare.go | 4 ++-- cmd/launcher/launcher.go | 2 +- ee/control/consumers/flareconsumer/flareconsumer.go | 4 ++-- {pkg => ee}/debug/checkups/bboltdb.go | 0 {pkg => ee}/debug/checkups/binary_directory.go | 0 {pkg => ee}/debug/checkups/checkpoint.go | 0 {pkg => ee}/debug/checkups/checkpoint_test.go | 0 {pkg => ee}/debug/checkups/checkups.go | 0 {pkg => ee}/debug/checkups/connectivity.go | 0 {pkg => ee}/debug/checkups/dns.go | 0 {pkg => ee}/debug/checkups/dns_test.go | 2 +- {pkg => ee}/debug/checkups/enroll-secret.go | 0 .../debug/checkups/flare-environment-platform-specifics.go | 0 .../checkups/flare-environment-platform-specifics_windows.go | 0 {pkg => ee}/debug/checkups/gnome_extensions_linux.go | 0 {pkg => ee}/debug/checkups/gnome_extensions_other.go | 0 {pkg => ee}/debug/checkups/helpers_other.go | 0 {pkg => ee}/debug/checkups/helpers_windows.go | 0 {pkg => ee}/debug/checkups/host.go | 0 {pkg => ee}/debug/checkups/host_test.go | 0 {pkg => ee}/debug/checkups/install.go | 0 {pkg => ee}/debug/checkups/launchd_darwin.go | 0 {pkg => ee}/debug/checkups/launchd_other.go | 0 {pkg => ee}/debug/checkups/launcher_flags.go | 0 {pkg => ee}/debug/checkups/logs.go | 0 {pkg => ee}/debug/checkups/mocks/HostResolver.go | 0 {pkg => ee}/debug/checkups/network.go | 0 {pkg => ee}/debug/checkups/network_darwin.go | 0 {pkg => ee}/debug/checkups/network_linux.go | 0 {pkg => ee}/debug/checkups/network_windows.go | 0 {pkg => ee}/debug/checkups/notary.go | 0 {pkg => ee}/debug/checkups/osq_config_conflicts.go | 0 {pkg => ee}/debug/checkups/osq_data.go | 0 {pkg => ee}/debug/checkups/osquery.go | 0 {pkg => ee}/debug/checkups/platform.go | 0 {pkg => ee}/debug/checkups/power_other.go | 0 {pkg => ee}/debug/checkups/power_windows.go | 0 {pkg => ee}/debug/checkups/processes.go | 0 {pkg => ee}/debug/checkups/quarantine.go | 0 {pkg => ee}/debug/checkups/quarantine_test.go | 0 {pkg => ee}/debug/checkups/root_directory.go | 0 {pkg => ee}/debug/checkups/runtime.go | 0 {pkg => ee}/debug/checkups/server_data.go | 0 {pkg => ee}/debug/checkups/services_other.go | 0 {pkg => ee}/debug/checkups/services_windows.go | 0 {pkg => ee}/debug/checkups/system_time.go | 0 {pkg => ee}/debug/checkups/tuf.go | 0 {pkg => ee}/debug/checkups/tuf_test.go | 0 {pkg => ee}/debug/checkups/util.go | 0 {pkg => ee}/debug/checkups/version.go | 0 {pkg => ee}/debug/shipper/README.MD | 0 {pkg => ee}/debug/shipper/shipper.go | 0 {pkg => ee}/debug/shipper/shipper_test.go | 0 54 files changed, 7 insertions(+), 7 deletions(-) rename {pkg => ee}/debug/checkups/bboltdb.go (100%) rename {pkg => ee}/debug/checkups/binary_directory.go (100%) rename {pkg => ee}/debug/checkups/checkpoint.go (100%) rename {pkg => ee}/debug/checkups/checkpoint_test.go (100%) rename {pkg => ee}/debug/checkups/checkups.go (100%) rename {pkg => ee}/debug/checkups/connectivity.go (100%) rename {pkg => ee}/debug/checkups/dns.go (100%) rename {pkg => ee}/debug/checkups/dns_test.go (99%) rename {pkg => ee}/debug/checkups/enroll-secret.go (100%) rename {pkg => ee}/debug/checkups/flare-environment-platform-specifics.go (100%) rename {pkg => ee}/debug/checkups/flare-environment-platform-specifics_windows.go (100%) rename {pkg => ee}/debug/checkups/gnome_extensions_linux.go (100%) rename {pkg => ee}/debug/checkups/gnome_extensions_other.go (100%) rename {pkg => ee}/debug/checkups/helpers_other.go (100%) rename {pkg => ee}/debug/checkups/helpers_windows.go (100%) rename {pkg => ee}/debug/checkups/host.go (100%) rename {pkg => ee}/debug/checkups/host_test.go (100%) rename {pkg => ee}/debug/checkups/install.go (100%) rename {pkg => ee}/debug/checkups/launchd_darwin.go (100%) rename {pkg => ee}/debug/checkups/launchd_other.go (100%) rename {pkg => ee}/debug/checkups/launcher_flags.go (100%) rename {pkg => ee}/debug/checkups/logs.go (100%) rename {pkg => ee}/debug/checkups/mocks/HostResolver.go (100%) rename {pkg => ee}/debug/checkups/network.go (100%) rename {pkg => ee}/debug/checkups/network_darwin.go (100%) rename {pkg => ee}/debug/checkups/network_linux.go (100%) rename {pkg => ee}/debug/checkups/network_windows.go (100%) rename {pkg => ee}/debug/checkups/notary.go (100%) rename {pkg => ee}/debug/checkups/osq_config_conflicts.go (100%) rename {pkg => ee}/debug/checkups/osq_data.go (100%) rename {pkg => ee}/debug/checkups/osquery.go (100%) rename {pkg => ee}/debug/checkups/platform.go (100%) rename {pkg => ee}/debug/checkups/power_other.go (100%) rename {pkg => ee}/debug/checkups/power_windows.go (100%) rename {pkg => ee}/debug/checkups/processes.go (100%) rename {pkg => ee}/debug/checkups/quarantine.go (100%) rename {pkg => ee}/debug/checkups/quarantine_test.go (100%) rename {pkg => ee}/debug/checkups/root_directory.go (100%) rename {pkg => ee}/debug/checkups/runtime.go (100%) rename {pkg => ee}/debug/checkups/server_data.go (100%) rename {pkg => ee}/debug/checkups/services_other.go (100%) rename {pkg => ee}/debug/checkups/services_windows.go (100%) rename {pkg => ee}/debug/checkups/system_time.go (100%) rename {pkg => ee}/debug/checkups/tuf.go (100%) rename {pkg => ee}/debug/checkups/tuf_test.go (100%) rename {pkg => ee}/debug/checkups/util.go (100%) rename {pkg => ee}/debug/checkups/version.go (100%) rename {pkg => ee}/debug/shipper/README.MD (100%) rename {pkg => ee}/debug/shipper/shipper.go (100%) rename {pkg => ee}/debug/shipper/shipper_test.go (100%) diff --git a/cmd/launcher/doctor.go b/cmd/launcher/doctor.go index a028a9eb6..caad1e6f1 100644 --- a/cmd/launcher/doctor.go +++ b/cmd/launcher/doctor.go @@ -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" ) diff --git a/cmd/launcher/flare.go b/cmd/launcher/flare.go index 4e29eae12..a15275fc9 100644 --- a/cmd/launcher/flare.go +++ b/cmd/launcher/flare.go @@ -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" ) diff --git a/cmd/launcher/launcher.go b/cmd/launcher/launcher.go index 48534c496..eeeff81ac 100644 --- a/cmd/launcher/launcher.go +++ b/cmd/launcher/launcher.go @@ -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" @@ -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" diff --git a/ee/control/consumers/flareconsumer/flareconsumer.go b/ee/control/consumers/flareconsumer/flareconsumer.go index c897271d7..583dbc7cf 100644 --- a/ee/control/consumers/flareconsumer/flareconsumer.go +++ b/ee/control/consumers/flareconsumer/flareconsumer.go @@ -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 ( diff --git a/pkg/debug/checkups/bboltdb.go b/ee/debug/checkups/bboltdb.go similarity index 100% rename from pkg/debug/checkups/bboltdb.go rename to ee/debug/checkups/bboltdb.go diff --git a/pkg/debug/checkups/binary_directory.go b/ee/debug/checkups/binary_directory.go similarity index 100% rename from pkg/debug/checkups/binary_directory.go rename to ee/debug/checkups/binary_directory.go diff --git a/pkg/debug/checkups/checkpoint.go b/ee/debug/checkups/checkpoint.go similarity index 100% rename from pkg/debug/checkups/checkpoint.go rename to ee/debug/checkups/checkpoint.go diff --git a/pkg/debug/checkups/checkpoint_test.go b/ee/debug/checkups/checkpoint_test.go similarity index 100% rename from pkg/debug/checkups/checkpoint_test.go rename to ee/debug/checkups/checkpoint_test.go diff --git a/pkg/debug/checkups/checkups.go b/ee/debug/checkups/checkups.go similarity index 100% rename from pkg/debug/checkups/checkups.go rename to ee/debug/checkups/checkups.go diff --git a/pkg/debug/checkups/connectivity.go b/ee/debug/checkups/connectivity.go similarity index 100% rename from pkg/debug/checkups/connectivity.go rename to ee/debug/checkups/connectivity.go diff --git a/pkg/debug/checkups/dns.go b/ee/debug/checkups/dns.go similarity index 100% rename from pkg/debug/checkups/dns.go rename to ee/debug/checkups/dns.go diff --git a/pkg/debug/checkups/dns_test.go b/ee/debug/checkups/dns_test.go similarity index 99% rename from pkg/debug/checkups/dns_test.go rename to ee/debug/checkups/dns_test.go index f1383a3ab..69e5a73ed 100644 --- a/pkg/debug/checkups/dns_test.go +++ b/ee/debug/checkups/dns_test.go @@ -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" ) diff --git a/pkg/debug/checkups/enroll-secret.go b/ee/debug/checkups/enroll-secret.go similarity index 100% rename from pkg/debug/checkups/enroll-secret.go rename to ee/debug/checkups/enroll-secret.go diff --git a/pkg/debug/checkups/flare-environment-platform-specifics.go b/ee/debug/checkups/flare-environment-platform-specifics.go similarity index 100% rename from pkg/debug/checkups/flare-environment-platform-specifics.go rename to ee/debug/checkups/flare-environment-platform-specifics.go diff --git a/pkg/debug/checkups/flare-environment-platform-specifics_windows.go b/ee/debug/checkups/flare-environment-platform-specifics_windows.go similarity index 100% rename from pkg/debug/checkups/flare-environment-platform-specifics_windows.go rename to ee/debug/checkups/flare-environment-platform-specifics_windows.go diff --git a/pkg/debug/checkups/gnome_extensions_linux.go b/ee/debug/checkups/gnome_extensions_linux.go similarity index 100% rename from pkg/debug/checkups/gnome_extensions_linux.go rename to ee/debug/checkups/gnome_extensions_linux.go diff --git a/pkg/debug/checkups/gnome_extensions_other.go b/ee/debug/checkups/gnome_extensions_other.go similarity index 100% rename from pkg/debug/checkups/gnome_extensions_other.go rename to ee/debug/checkups/gnome_extensions_other.go diff --git a/pkg/debug/checkups/helpers_other.go b/ee/debug/checkups/helpers_other.go similarity index 100% rename from pkg/debug/checkups/helpers_other.go rename to ee/debug/checkups/helpers_other.go diff --git a/pkg/debug/checkups/helpers_windows.go b/ee/debug/checkups/helpers_windows.go similarity index 100% rename from pkg/debug/checkups/helpers_windows.go rename to ee/debug/checkups/helpers_windows.go diff --git a/pkg/debug/checkups/host.go b/ee/debug/checkups/host.go similarity index 100% rename from pkg/debug/checkups/host.go rename to ee/debug/checkups/host.go diff --git a/pkg/debug/checkups/host_test.go b/ee/debug/checkups/host_test.go similarity index 100% rename from pkg/debug/checkups/host_test.go rename to ee/debug/checkups/host_test.go diff --git a/pkg/debug/checkups/install.go b/ee/debug/checkups/install.go similarity index 100% rename from pkg/debug/checkups/install.go rename to ee/debug/checkups/install.go diff --git a/pkg/debug/checkups/launchd_darwin.go b/ee/debug/checkups/launchd_darwin.go similarity index 100% rename from pkg/debug/checkups/launchd_darwin.go rename to ee/debug/checkups/launchd_darwin.go diff --git a/pkg/debug/checkups/launchd_other.go b/ee/debug/checkups/launchd_other.go similarity index 100% rename from pkg/debug/checkups/launchd_other.go rename to ee/debug/checkups/launchd_other.go diff --git a/pkg/debug/checkups/launcher_flags.go b/ee/debug/checkups/launcher_flags.go similarity index 100% rename from pkg/debug/checkups/launcher_flags.go rename to ee/debug/checkups/launcher_flags.go diff --git a/pkg/debug/checkups/logs.go b/ee/debug/checkups/logs.go similarity index 100% rename from pkg/debug/checkups/logs.go rename to ee/debug/checkups/logs.go diff --git a/pkg/debug/checkups/mocks/HostResolver.go b/ee/debug/checkups/mocks/HostResolver.go similarity index 100% rename from pkg/debug/checkups/mocks/HostResolver.go rename to ee/debug/checkups/mocks/HostResolver.go diff --git a/pkg/debug/checkups/network.go b/ee/debug/checkups/network.go similarity index 100% rename from pkg/debug/checkups/network.go rename to ee/debug/checkups/network.go diff --git a/pkg/debug/checkups/network_darwin.go b/ee/debug/checkups/network_darwin.go similarity index 100% rename from pkg/debug/checkups/network_darwin.go rename to ee/debug/checkups/network_darwin.go diff --git a/pkg/debug/checkups/network_linux.go b/ee/debug/checkups/network_linux.go similarity index 100% rename from pkg/debug/checkups/network_linux.go rename to ee/debug/checkups/network_linux.go diff --git a/pkg/debug/checkups/network_windows.go b/ee/debug/checkups/network_windows.go similarity index 100% rename from pkg/debug/checkups/network_windows.go rename to ee/debug/checkups/network_windows.go diff --git a/pkg/debug/checkups/notary.go b/ee/debug/checkups/notary.go similarity index 100% rename from pkg/debug/checkups/notary.go rename to ee/debug/checkups/notary.go diff --git a/pkg/debug/checkups/osq_config_conflicts.go b/ee/debug/checkups/osq_config_conflicts.go similarity index 100% rename from pkg/debug/checkups/osq_config_conflicts.go rename to ee/debug/checkups/osq_config_conflicts.go diff --git a/pkg/debug/checkups/osq_data.go b/ee/debug/checkups/osq_data.go similarity index 100% rename from pkg/debug/checkups/osq_data.go rename to ee/debug/checkups/osq_data.go diff --git a/pkg/debug/checkups/osquery.go b/ee/debug/checkups/osquery.go similarity index 100% rename from pkg/debug/checkups/osquery.go rename to ee/debug/checkups/osquery.go diff --git a/pkg/debug/checkups/platform.go b/ee/debug/checkups/platform.go similarity index 100% rename from pkg/debug/checkups/platform.go rename to ee/debug/checkups/platform.go diff --git a/pkg/debug/checkups/power_other.go b/ee/debug/checkups/power_other.go similarity index 100% rename from pkg/debug/checkups/power_other.go rename to ee/debug/checkups/power_other.go diff --git a/pkg/debug/checkups/power_windows.go b/ee/debug/checkups/power_windows.go similarity index 100% rename from pkg/debug/checkups/power_windows.go rename to ee/debug/checkups/power_windows.go diff --git a/pkg/debug/checkups/processes.go b/ee/debug/checkups/processes.go similarity index 100% rename from pkg/debug/checkups/processes.go rename to ee/debug/checkups/processes.go diff --git a/pkg/debug/checkups/quarantine.go b/ee/debug/checkups/quarantine.go similarity index 100% rename from pkg/debug/checkups/quarantine.go rename to ee/debug/checkups/quarantine.go diff --git a/pkg/debug/checkups/quarantine_test.go b/ee/debug/checkups/quarantine_test.go similarity index 100% rename from pkg/debug/checkups/quarantine_test.go rename to ee/debug/checkups/quarantine_test.go diff --git a/pkg/debug/checkups/root_directory.go b/ee/debug/checkups/root_directory.go similarity index 100% rename from pkg/debug/checkups/root_directory.go rename to ee/debug/checkups/root_directory.go diff --git a/pkg/debug/checkups/runtime.go b/ee/debug/checkups/runtime.go similarity index 100% rename from pkg/debug/checkups/runtime.go rename to ee/debug/checkups/runtime.go diff --git a/pkg/debug/checkups/server_data.go b/ee/debug/checkups/server_data.go similarity index 100% rename from pkg/debug/checkups/server_data.go rename to ee/debug/checkups/server_data.go diff --git a/pkg/debug/checkups/services_other.go b/ee/debug/checkups/services_other.go similarity index 100% rename from pkg/debug/checkups/services_other.go rename to ee/debug/checkups/services_other.go diff --git a/pkg/debug/checkups/services_windows.go b/ee/debug/checkups/services_windows.go similarity index 100% rename from pkg/debug/checkups/services_windows.go rename to ee/debug/checkups/services_windows.go diff --git a/pkg/debug/checkups/system_time.go b/ee/debug/checkups/system_time.go similarity index 100% rename from pkg/debug/checkups/system_time.go rename to ee/debug/checkups/system_time.go diff --git a/pkg/debug/checkups/tuf.go b/ee/debug/checkups/tuf.go similarity index 100% rename from pkg/debug/checkups/tuf.go rename to ee/debug/checkups/tuf.go diff --git a/pkg/debug/checkups/tuf_test.go b/ee/debug/checkups/tuf_test.go similarity index 100% rename from pkg/debug/checkups/tuf_test.go rename to ee/debug/checkups/tuf_test.go diff --git a/pkg/debug/checkups/util.go b/ee/debug/checkups/util.go similarity index 100% rename from pkg/debug/checkups/util.go rename to ee/debug/checkups/util.go diff --git a/pkg/debug/checkups/version.go b/ee/debug/checkups/version.go similarity index 100% rename from pkg/debug/checkups/version.go rename to ee/debug/checkups/version.go diff --git a/pkg/debug/shipper/README.MD b/ee/debug/shipper/README.MD similarity index 100% rename from pkg/debug/shipper/README.MD rename to ee/debug/shipper/README.MD diff --git a/pkg/debug/shipper/shipper.go b/ee/debug/shipper/shipper.go similarity index 100% rename from pkg/debug/shipper/shipper.go rename to ee/debug/shipper/shipper.go diff --git a/pkg/debug/shipper/shipper_test.go b/ee/debug/shipper/shipper_test.go similarity index 100% rename from pkg/debug/shipper/shipper_test.go rename to ee/debug/shipper/shipper_test.go