From 4e5d28995a3b61ef335e307df766f5d623930222 Mon Sep 17 00:00:00 2001 From: Victor Vrantchan Date: Thu, 6 Jul 2017 10:06:23 -0400 Subject: [PATCH] remove updater as a dependency (#41) The upstream package was refactored and doesn't exist anymore. The functionality is actually being implemented in #34 so the correct dependencies will be added there. Because the updater package is missing, the dependency manager is corrupting the dependency cache for various pull requests. Closes #39 --- Gopkg.lock | 14 +------------- cmd/launcher/launcher.go | 15 --------------- 2 files changed, 1 insertion(+), 28 deletions(-) diff --git a/Gopkg.lock b/Gopkg.lock index 005248cd2..1b1d916b8 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -20,12 +20,6 @@ revision = "d2709f9f1f31ebcda9651b03077758c1f3a0018c" version = "v3.0.0" -[[projects]] - name = "github.com/docker/go" - packages = ["canonical/json"] - revision = "62e5ec7cf43f795986ec658df7cb317255772993" - version = "v1.5.1-1" - [[projects]] branch = "master" name = "github.com/kolide/kit" @@ -38,12 +32,6 @@ packages = [".","gen/osquery","plugin/config","plugin/logger","plugin/table"] revision = "5ff815310afd1fffe38a9a92c35e257d960fe71b" -[[projects]] - branch = "master" - name = "github.com/kolide/updater" - packages = [".","tuf"] - revision = "04e45b3f8fe303492c6cfe261ca6369c97f773f0" - [[projects]] branch = "master" name = "github.com/pkg/errors" @@ -65,6 +53,6 @@ [solve-meta] analyzer-name = "dep" analyzer-version = 1 - inputs-digest = "88f93a59a7832382d0f6c59515da6c9dde7d736f5baaaa7199f664b8fd4bac16" + inputs-digest = "3f71393f37f4ae32ae4286b1069b3cad243ad1362df06caed1b5a4ac5e1c0f6a" solver-name = "gps-cdcl" solver-version = 1 diff --git a/cmd/launcher/launcher.go b/cmd/launcher/launcher.go index e73018eb5..0dfac7c1d 100644 --- a/cmd/launcher/launcher.go +++ b/cmd/launcher/launcher.go @@ -12,7 +12,6 @@ import ( "github.com/kolide/launcher/osquery" "github.com/kolide/osquery-go/plugin/config" "github.com/kolide/osquery-go/plugin/logger" - "github.com/kolide/updater" ) var ( @@ -132,20 +131,6 @@ func main() { versionInfo := version.Version() log.Printf("Started kolide launcher, version %s, build %s\n", versionInfo.Version, versionInfo.Revision) - if opts.notaryServerUrl != "" { - osqueryUpdater, err := updater.Start(updater.Settings{}, updateOsquery) - if err != nil { - log.Fatalf("Error launching osqueryd updater service %s\n", err) - } - defer osqueryUpdater.Stop() - - launcherUpdater, err := updater.Start(updater.Settings{}, updateLauncher) - if err != nil { - log.Fatalf("Error launching osqueryd updater service %s\n", err) - } - defer launcherUpdater.Stop() - } - if _, err := osquery.LaunchOsqueryInstance( osquery.WithOsquerydBinary(opts.osquerydPath), osquery.WithRootDirectory(opts.rootDirectory),