Move storage, mesos, global container integrations under cmd/internal

qijun · Mar 23, 2020 · 855ad76 · 855ad76
1 parent d4cce1c
commit 855ad76
Show file tree

Hide file tree

Showing 28 changed files with 20 additions and 15 deletions.
diff --git a/cmd/cadvisor.go b/cmd/cadvisor.go
@@ -35,7 +35,7 @@ import (
 	"github.com/google/cadvisor/version"
 
 	// Register container providers
-	_ "github.com/google/cadvisor/container/install"
+	_ "github.com/google/cadvisor/cmd/internal/container/install"
 
 	// Register CloudProviders
 	_ "github.com/google/cadvisor/utils/cloudinfo/aws"

diff --git a/container/install/install.go → cmd/internal/container/install/install.go b/container/install/install.go → cmd/internal/container/install/install.go
@@ -16,9 +16,9 @@
 package install
 
 import (
+	_ "github.com/google/cadvisor/cmd/internal/container/mesos/install"
 	_ "github.com/google/cadvisor/container/containerd/install"
 	_ "github.com/google/cadvisor/container/crio/install"
 	_ "github.com/google/cadvisor/container/docker/install"
-	_ "github.com/google/cadvisor/container/mesos/install"
 	_ "github.com/google/cadvisor/container/systemd/install"
 )
diff --git a/container/mesos/client.go → cmd/internal/container/mesos/client.go b/container/mesos/client.go → cmd/internal/container/mesos/client.go
diff --git a/container/mesos/client_test.go → cmd/internal/container/mesos/client_test.go b/container/mesos/client_test.go → cmd/internal/container/mesos/client_test.go
diff --git a/container/mesos/factory.go → cmd/internal/container/mesos/factory.go b/container/mesos/factory.go → cmd/internal/container/mesos/factory.go
diff --git a/container/mesos/factory_test.go → cmd/internal/container/mesos/factory_test.go b/container/mesos/factory_test.go → cmd/internal/container/mesos/factory_test.go
diff --git a/container/mesos/handler.go → cmd/internal/container/mesos/handler.go b/container/mesos/handler.go → cmd/internal/container/mesos/handler.go
diff --git a/container/mesos/handler_test.go → cmd/internal/container/mesos/handler_test.go b/container/mesos/handler_test.go → cmd/internal/container/mesos/handler_test.go
diff --git a/container/mesos/install/install.go → ...ternal/container/mesos/install/install.go b/container/mesos/install/install.go → ...ternal/container/mesos/install/install.go
@@ -16,8 +16,8 @@
 package install
 
 import (
+	"github.com/google/cadvisor/cmd/internal/container/mesos"
 	"github.com/google/cadvisor/container"
-	"github.com/google/cadvisor/container/mesos"
 	"k8s.io/klog"
 )
 

diff --git a/container/mesos/mesos_agent.go → cmd/internal/container/mesos/mesos_agent.go b/container/mesos/mesos_agent.go → cmd/internal/container/mesos/mesos_agent.go
diff --git a/container/mesos/mesos_agent_test.go → ...ernal/container/mesos/mesos_agent_test.go b/container/mesos/mesos_agent_test.go → ...ernal/container/mesos/mesos_agent_test.go
diff --git a/container/mesos/plugin.go → cmd/internal/container/mesos/plugin.go b/container/mesos/plugin.go → cmd/internal/container/mesos/plugin.go
diff --git a/storage/bigquery/README.md → cmd/internal/storage/bigquery/README.md b/storage/bigquery/README.md → cmd/internal/storage/bigquery/README.md
diff --git a/storage/bigquery/bigquery.go → cmd/internal/storage/bigquery/bigquery.go b/storage/bigquery/bigquery.go → cmd/internal/storage/bigquery/bigquery.go
@@ -17,9 +17,9 @@ package bigquery
 import (
 	"os"
 
+	"github.com/google/cadvisor/cmd/internal/storage/bigquery/client"
 	info "github.com/google/cadvisor/info/v1"
 	"github.com/google/cadvisor/storage"
-	"github.com/google/cadvisor/storage/bigquery/client"
 
 	bigquery "google.golang.org/api/bigquery/v2"
 )

diff --git a/storage/bigquery/client/client.go → ...nternal/storage/bigquery/client/client.go b/storage/bigquery/client/client.go → ...nternal/storage/bigquery/client/client.go
diff --git a/storage/bigquery/client/example/example.go → ...torage/bigquery/client/example/example.go b/storage/bigquery/client/example/example.go → ...torage/bigquery/client/example/example.go
@@ -20,7 +20,7 @@ import (
 	"time"
 
 	"github.com/SeanDolphin/bqschema"
-	"github.com/google/cadvisor/storage/bigquery/client"
+	"github.com/google/cadvisor/cmd/internal/storage/bigquery/client"
 )
 
 type container struct {

diff --git a/storage/elasticsearch/elasticsearch.go → ...al/storage/elasticsearch/elasticsearch.go b/storage/elasticsearch/elasticsearch.go → ...al/storage/elasticsearch/elasticsearch.go
diff --git a/storage/influxdb/influxdb.go → cmd/internal/storage/influxdb/influxdb.go b/storage/influxdb/influxdb.go → cmd/internal/storage/influxdb/influxdb.go
diff --git a/storage/influxdb/influxdb_test.go → ...nternal/storage/influxdb/influxdb_test.go b/storage/influxdb/influxdb_test.go → ...nternal/storage/influxdb/influxdb_test.go
@@ -25,9 +25,9 @@ import (
 	"testing"
 	"time"
 
+	"github.com/google/cadvisor/cmd/internal/storage/test"
 	info "github.com/google/cadvisor/info/v1"
 	"github.com/google/cadvisor/storage"
-	"github.com/google/cadvisor/storage/test"
 
 	influxdb "github.com/influxdb/influxdb/client"
 	"github.com/stretchr/testify/assert"

diff --git a/storage/kafka/kafka.go → cmd/internal/storage/kafka/kafka.go b/storage/kafka/kafka.go → cmd/internal/storage/kafka/kafka.go
diff --git a/storage/redis/redis.go → cmd/internal/storage/redis/redis.go b/storage/redis/redis.go → cmd/internal/storage/redis/redis.go
diff --git a/storage/statsd/client/client.go → cmd/internal/storage/statsd/client/client.go b/storage/statsd/client/client.go → cmd/internal/storage/statsd/client/client.go
diff --git a/storage/statsd/statsd.go → cmd/internal/storage/statsd/statsd.go b/storage/statsd/statsd.go → cmd/internal/storage/statsd/statsd.go
@@ -15,9 +15,9 @@
 package statsd
 
 import (
+	client "github.com/google/cadvisor/cmd/internal/storage/statsd/client"
 	info "github.com/google/cadvisor/info/v1"
 	"github.com/google/cadvisor/storage"
-	client "github.com/google/cadvisor/storage/statsd/client"
 )
 
 func init() {

diff --git a/storage/stdout/stdout.go → cmd/internal/storage/stdout/stdout.go b/storage/stdout/stdout.go → cmd/internal/storage/stdout/stdout.go
diff --git a/storage/test/mock.go → cmd/internal/storage/test/mock.go b/storage/test/mock.go → cmd/internal/storage/test/mock.go
diff --git a/storage/test/storagetests.go → cmd/internal/storage/test/storagetests.go b/storage/test/storagetests.go → cmd/internal/storage/test/storagetests.go
diff --git a/cmd/storagedriver.go b/cmd/storagedriver.go
@@ -21,14 +21,14 @@ import (
 	"time"
 
 	"github.com/google/cadvisor/cache/memory"
+	_ "github.com/google/cadvisor/cmd/internal/storage/bigquery"
+	_ "github.com/google/cadvisor/cmd/internal/storage/elasticsearch"
+	_ "github.com/google/cadvisor/cmd/internal/storage/influxdb"
+	_ "github.com/google/cadvisor/cmd/internal/storage/kafka"
+	_ "github.com/google/cadvisor/cmd/internal/storage/redis"
+	_ "github.com/google/cadvisor/cmd/internal/storage/statsd"
+	_ "github.com/google/cadvisor/cmd/internal/storage/stdout"
 	"github.com/google/cadvisor/storage"
-	_ "github.com/google/cadvisor/storage/bigquery"
-	_ "github.com/google/cadvisor/storage/elasticsearch"
-	_ "github.com/google/cadvisor/storage/influxdb"
-	_ "github.com/google/cadvisor/storage/kafka"
-	_ "github.com/google/cadvisor/storage/redis"
-	_ "github.com/google/cadvisor/storage/statsd"
-	_ "github.com/google/cadvisor/storage/stdout"
 
 	"k8s.io/klog"
 )

diff --git a/manager/manager_test.go b/manager/manager_test.go
@@ -36,7 +36,12 @@ import (
 	"github.com/stretchr/testify/assert"
 	clock "k8s.io/utils/clock/testing"
 
-	_ "github.com/google/cadvisor/container/install"
+	// install all the container runtimes included in the library version for testing.
+	// as these are moved to cmd/internal/container, remove them from here.
+	_ "github.com/google/cadvisor/container/containerd/install"
+	_ "github.com/google/cadvisor/container/crio/install"
+	_ "github.com/google/cadvisor/container/docker/install"
+	_ "github.com/google/cadvisor/container/systemd/install"
 )
 
 // TODO(vmarmol): Refactor these tests.