Rename repo from common to pkg, and move packages up a level.

shamsher31 · May 13, 2019 · 0187f41 · 0187f41
1 parent db2ea8f
commit 0187f41
Show file tree

Hide file tree

Showing 113 changed files with 46 additions and 46 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -3,7 +3,7 @@ jobs:
   build:
     docker:
       - image: gcr.io/istio-testing/circleci:2019-04-22
-    working_directory: /go/src/istio.io/common
+    working_directory: /go/src/istio.io/pkg
     steps:
       - checkout
       - run:
@@ -14,7 +14,7 @@ jobs:
   lint:
     docker:
       - image: gcr.io/istio-testing/circleci:2019-04-22
-    working_directory: /go/src/istio.io/common
+    working_directory: /go/src/istio.io/pkg
     steps:
       - checkout
       - run:
@@ -24,7 +24,7 @@ jobs:
   test:
     docker:
       - image: gcr.io/istio-testing/circleci:2019-04-22
-    working_directory: /go/src/istio.io/common
+    working_directory: /go/src/istio.io/pkg
     steps:
       - checkout
       - run:

diff --git a/README.md b/README.md
@@ -1,10 +1,10 @@
-[![CircleCI](https://circleci.com/gh/istio/common.svg?style=svg)](https://circleci.com/gh/istio/common)
-[![Mergify Status](https://gh.mergify.io/badges/istio/common.png?style=cut)](https://mergify.io)
-[![codecov.io](https://codecov.io/gh/istio/common/branch/master/graph/badge.svg)](https://codecov.io/gh/istio/common)
-[![Go Report Card](https://goreportcard.com/badge/github.com/istio/common)](https://goreportcard.com/report/github.com/istio/common)
+[![CircleCI](https://circleci.com/gh/istio/pkg.svg?style=svg)](https://circleci.com/gh/istio/pkg)
+[![Mergify Status](https://gh.mergify.io/badges/istio/pkg.png?style=cut)](https://mergify.io)
+[![codecov.io](https://codecov.io/gh/istio/pkg/branch/master/graph/badge.svg)](https://codecov.io/gh/istio/pkg)
+[![Go Report Card](https://goreportcard.com/badge/github.com/istio/pkg)](https://goreportcard.com/report/github.com/istio/pkg)
 [![GoDoc](https://godoc.org/istio.io/common?status.svg)](https://godoc.org/istio.io/common)
-[![GolangCI](https://golangci.com/badges/github.com/istio/common.svg)](https://golangci.com/r/github.com/istio/common)
+[![GolangCI](https://golangci.com/badges/github.com/istio/pkg.svg)](https://golangci.com/r/github.com/istio/pkg)
 
-# Istio Common Functionality
+# Common Istio Packages
 
-Common functionality leveraged by many other repos.
+Common packages leveraged by other repos.
diff --git a/pkg/annotations/annotation.go → annotations/annotation.go b/pkg/annotations/annotation.go → annotations/annotation.go
@@ -20,7 +20,7 @@ import (
 	"sort"
 	"sync"
 
-	"istio.io/common/pkg/log"
+	"istio.io/pkg/log"
 )
 
 // Annotation describes a single resource annotation

diff --git a/pkg/annotations/annotation_test.go → annotations/annotation_test.go b/pkg/annotations/annotation_test.go → annotations/annotation_test.go
diff --git a/pkg/appsignals/watcher.go → appsignals/watcher.go b/pkg/appsignals/watcher.go → appsignals/watcher.go
@@ -22,7 +22,7 @@ import (
 
 	"github.com/howeyc/fsnotify"
 
-	"istio.io/common/pkg/log"
+	"istio.io/pkg/log"
 )
 
 var handlers struct {

diff --git a/pkg/appsignals/watcher_test.go → appsignals/watcher_test.go b/pkg/appsignals/watcher_test.go → appsignals/watcher_test.go
diff --git a/pkg/cache/bench.baseline → cache/bench.baseline b/pkg/cache/bench.baseline → cache/bench.baseline
diff --git a/pkg/cache/cache.go → cache/cache.go b/pkg/cache/cache.go → cache/cache.go
diff --git a/pkg/cache/cache_test.go → cache/cache_test.go b/pkg/cache/cache_test.go → cache/cache_test.go
diff --git a/pkg/cache/lruCache.go → cache/lruCache.go b/pkg/cache/lruCache.go → cache/lruCache.go
diff --git a/pkg/cache/lruCache_test.go → cache/lruCache_test.go b/pkg/cache/lruCache_test.go → cache/lruCache_test.go
diff --git a/pkg/cache/ttlCache.go → cache/ttlCache.go b/pkg/cache/ttlCache.go → cache/ttlCache.go
diff --git a/pkg/cache/ttlCache_test.go → cache/ttlCache_test.go b/pkg/cache/ttlCache_test.go → cache/ttlCache_test.go
diff --git a/pkg/collateral/cobra.go → collateral/cobra.go b/pkg/collateral/cobra.go → collateral/cobra.go
diff --git a/pkg/collateral/control.go → collateral/control.go b/pkg/collateral/control.go → collateral/control.go
@@ -44,8 +44,8 @@ import (
 	"github.com/spf13/cobra/doc"
 	"github.com/spf13/pflag"
 
-	"istio.io/common/pkg/annotations"
-	"istio.io/common/pkg/env"
+	"istio.io/pkg/annotations"
+	"istio.io/pkg/env"
 )
 
 // Control determines the behavior of the EmitCollateral function

diff --git a/pkg/ctrlz/assets/assets.gen.go → ctrlz/assets/assets.gen.go b/pkg/ctrlz/assets/assets.gen.go → ctrlz/assets/assets.gen.go
diff --git a/pkg/ctrlz/assets/assets.go → ctrlz/assets/assets.go b/pkg/ctrlz/assets/assets.go → ctrlz/assets/assets.go
diff --git a/pkg/ctrlz/assets/static/css/all.css → ctrlz/assets/static/css/all.css b/pkg/ctrlz/assets/static/css/all.css → ctrlz/assets/static/css/all.css
diff --git a/...assets/static/css/bootstrap-4.0.0.min.css → ...assets/static/css/bootstrap-4.0.0.min.css b/...assets/static/css/bootstrap-4.0.0.min.css → ...assets/static/css/bootstrap-4.0.0.min.css
diff --git a/.../assets/static/css/dark_syntax-1.14.0.css → .../assets/static/css/dark_syntax-1.14.0.css b/.../assets/static/css/dark_syntax-1.14.0.css → .../assets/static/css/dark_syntax-1.14.0.css
diff --git a/...sets/static/css/fontawesome-all-5.0.6.css → ...sets/static/css/fontawesome-all-5.0.6.css b/...sets/static/css/fontawesome-all-5.0.6.css → ...sets/static/css/fontawesome-all-5.0.6.css
diff --git a/pkg/ctrlz/assets/static/css/fonts.css → ctrlz/assets/static/css/fonts.css b/pkg/ctrlz/assets/static/css/fonts.css → ctrlz/assets/static/css/fonts.css
diff --git a/...ssets/static/favicons/android-144x144.png → ...ssets/static/favicons/android-144x144.png b/...ssets/static/favicons/android-144x144.png → ...ssets/static/favicons/android-144x144.png
diff --git a/...ssets/static/favicons/android-192x192.png → ...ssets/static/favicons/android-192x192.png b/...ssets/static/favicons/android-192x192.png → ...ssets/static/favicons/android-192x192.png
diff --git a/.../assets/static/favicons/android-36x36.png → .../assets/static/favicons/android-36x36.png b/.../assets/static/favicons/android-36x36.png → .../assets/static/favicons/android-36x36.png
diff --git a/.../assets/static/favicons/android-48x48.png → .../assets/static/favicons/android-48x48.png b/.../assets/static/favicons/android-48x48.png → .../assets/static/favicons/android-48x48.png
diff --git a/.../assets/static/favicons/android-72x72.png → .../assets/static/favicons/android-72x72.png b/.../assets/static/favicons/android-72x72.png → .../assets/static/favicons/android-72x72.png
diff --git a/...assets/static/favicons/android-96x196.png → ...assets/static/favicons/android-96x196.png b/...assets/static/favicons/android-96x196.png → ...assets/static/favicons/android-96x196.png
diff --git a/...tic/favicons/apple-touch-icon-180x180.png → ...tic/favicons/apple-touch-icon-180x180.png b/...tic/favicons/apple-touch-icon-180x180.png → ...tic/favicons/apple-touch-icon-180x180.png
diff --git a/.../assets/static/favicons/favicon-16x16.png → .../assets/static/favicons/favicon-16x16.png b/.../assets/static/favicons/favicon-16x16.png → .../assets/static/favicons/favicon-16x16.png
diff --git a/.../assets/static/favicons/favicon-32x32.png → .../assets/static/favicons/favicon-32x32.png b/.../assets/static/favicons/favicon-32x32.png → .../assets/static/favicons/favicon-32x32.png
diff --git a/pkg/ctrlz/assets/static/favicons/favicon.ico → ctrlz/assets/static/favicons/favicon.ico b/pkg/ctrlz/assets/static/favicons/favicon.ico → ctrlz/assets/static/favicons/favicon.ico
diff --git a/...lz/assets/static/favicons/pwa-192x192.png → ctrlz/assets/static/favicons/pwa-192x192.png b/...lz/assets/static/favicons/pwa-192x192.png → ctrlz/assets/static/favicons/pwa-192x192.png
diff --git a/...lz/assets/static/favicons/pwa-512x512.png → ctrlz/assets/static/favicons/pwa-512x512.png b/...lz/assets/static/favicons/pwa-512x512.png → ctrlz/assets/static/favicons/pwa-512x512.png
diff --git a/...lz/assets/static/favicons/tile150x150.png → ctrlz/assets/static/favicons/tile150x150.png b/...lz/assets/static/favicons/tile150x150.png → ctrlz/assets/static/favicons/tile150x150.png
diff --git a/...lz/assets/static/favicons/tile310x150.png → ctrlz/assets/static/favicons/tile310x150.png b/...lz/assets/static/favicons/tile310x150.png → ctrlz/assets/static/favicons/tile310x150.png
diff --git a/...lz/assets/static/favicons/tile310x310.png → ctrlz/assets/static/favicons/tile310x310.png b/...lz/assets/static/favicons/tile310x310.png → ctrlz/assets/static/favicons/tile310x310.png
diff --git a/...trlz/assets/static/favicons/tile70x70.png → ctrlz/assets/static/favicons/tile70x70.png b/...trlz/assets/static/favicons/tile70x70.png → ctrlz/assets/static/favicons/tile70x70.png
diff --git a/...lz/assets/static/img/exclamation-mark.svg → ctrlz/assets/static/img/exclamation-mark.svg b/...lz/assets/static/img/exclamation-mark.svg → ctrlz/assets/static/img/exclamation-mark.svg
diff --git a/...z/assets/static/js/bootstrap-4.0.0.min.js → ...z/assets/static/js/bootstrap-4.0.0.min.js b/...z/assets/static/js/bootstrap-4.0.0.min.js → ...z/assets/static/js/bootstrap-4.0.0.min.js
diff --git a/...z/assets/static/js/clipboard-1.7.1.min.js → ...z/assets/static/js/clipboard-1.7.1.min.js b/...z/assets/static/js/clipboard-1.7.1.min.js → ...z/assets/static/js/clipboard-1.7.1.min.js
diff --git a/...assets/static/js/jquery-3.2.1.slim.min.js → ...assets/static/js/jquery-3.2.1.slim.min.js b/...assets/static/js/jquery-3.2.1.slim.min.js → ...assets/static/js/jquery-3.2.1.slim.min.js
diff --git a/pkg/ctrlz/assets/static/js/misc.js → ctrlz/assets/static/js/misc.js b/pkg/ctrlz/assets/static/js/misc.js → ctrlz/assets/static/js/misc.js
diff --git a/...rlz/assets/static/js/popper-1.12.9.min.js → ctrlz/assets/static/js/popper-1.12.9.min.js b/...rlz/assets/static/js/popper-1.12.9.min.js → ctrlz/assets/static/js/popper-1.12.9.min.js
diff --git a/...trlz/assets/static/js/prism-1.14.0.min.js → ctrlz/assets/static/js/prism-1.14.0.min.js b/...trlz/assets/static/js/prism-1.14.0.min.js → ctrlz/assets/static/js/prism-1.14.0.min.js
diff --git a/pkg/ctrlz/assets/static/manifest.json → ctrlz/assets/static/manifest.json b/pkg/ctrlz/assets/static/manifest.json → ctrlz/assets/static/manifest.json
diff --git a/pkg/ctrlz/assets/templates/404.html → ctrlz/assets/templates/404.html b/pkg/ctrlz/assets/templates/404.html → ctrlz/assets/templates/404.html
diff --git a/pkg/ctrlz/assets/templates/home.html → ctrlz/assets/templates/home.html b/pkg/ctrlz/assets/templates/home.html → ctrlz/assets/templates/home.html
diff --git a/pkg/ctrlz/assets/templates/layouts/base.html → ctrlz/assets/templates/layouts/base.html b/pkg/ctrlz/assets/templates/layouts/base.html → ctrlz/assets/templates/layouts/base.html
diff --git a/pkg/ctrlz/assets/templates/layouts/main.html → ctrlz/assets/templates/layouts/main.html b/pkg/ctrlz/assets/templates/layouts/main.html → ctrlz/assets/templates/layouts/main.html
diff --git a/...trlz/assets/templates/modules/header.html → ctrlz/assets/templates/modules/header.html b/...trlz/assets/templates/modules/header.html → ctrlz/assets/templates/modules/header.html
diff --git a/...ssets/templates/modules/last-refresh.html → ...ssets/templates/modules/last-refresh.html b/...ssets/templates/modules/last-refresh.html → ...ssets/templates/modules/last-refresh.html
diff --git a/...rlz/assets/templates/modules/sidebar.html → ctrlz/assets/templates/modules/sidebar.html b/...rlz/assets/templates/modules/sidebar.html → ctrlz/assets/templates/modules/sidebar.html
diff --git a/pkg/ctrlz/ctrlz.go → ctrlz/ctrlz.go b/pkg/ctrlz/ctrlz.go → ctrlz/ctrlz.go
@@ -35,10 +35,10 @@ import (
 
 	"github.com/gorilla/mux"
 
-	"istio.io/common/pkg/ctrlz/assets"
-	"istio.io/common/pkg/ctrlz/fw"
-	"istio.io/common/pkg/ctrlz/topics"
-	"istio.io/common/pkg/log"
+	"istio.io/pkg/ctrlz/assets"
+	"istio.io/pkg/ctrlz/fw"
+	"istio.io/pkg/ctrlz/topics"
+	"istio.io/pkg/log"
 )
 
 var coreTopics = []fw.Topic{

diff --git a/pkg/ctrlz/ctrlz_test.go → ctrlz/ctrlz_test.go b/pkg/ctrlz/ctrlz_test.go → ctrlz/ctrlz_test.go
@@ -21,7 +21,7 @@ import (
 	"testing"
 	"time"
 
-	"istio.io/common/pkg/appsignals"
+	"istio.io/pkg/appsignals"
 )
 
 func TestStartStopEnabled(t *testing.T) {

diff --git a/pkg/ctrlz/fw/context.go → ctrlz/fw/context.go b/pkg/ctrlz/fw/context.go → ctrlz/fw/context.go
diff --git a/pkg/ctrlz/fw/utils.go → ctrlz/fw/utils.go b/pkg/ctrlz/fw/utils.go → ctrlz/fw/utils.go
diff --git a/pkg/ctrlz/home.go → ctrlz/home.go b/pkg/ctrlz/home.go → ctrlz/home.go
@@ -25,8 +25,8 @@ import (
 
 	"github.com/gorilla/mux"
 
-	"istio.io/common/pkg/ctrlz/assets"
-	"istio.io/common/pkg/ctrlz/fw"
+	"istio.io/pkg/ctrlz/assets"
+	"istio.io/pkg/ctrlz/fw"
 )
 
 var mimeTypes = map[string]string{

diff --git a/pkg/ctrlz/options.go → ctrlz/options.go b/pkg/ctrlz/options.go → ctrlz/options.go
diff --git a/pkg/ctrlz/topics/args.go → ctrlz/topics/args.go b/pkg/ctrlz/topics/args.go → ctrlz/topics/args.go
@@ -19,8 +19,8 @@ import (
 	"net/http"
 	"os"
 
-	"istio.io/common/pkg/ctrlz/fw"
-	"istio.io/common/pkg/ctrlz/topics/assets"
+	"istio.io/pkg/ctrlz/fw"
+	"istio.io/pkg/ctrlz/topics/assets"
 )
 
 type argsTopic struct {

diff --git a/pkg/ctrlz/topics/assets/assets.gen.go → ctrlz/topics/assets/assets.gen.go b/pkg/ctrlz/topics/assets/assets.gen.go → ctrlz/topics/assets/assets.gen.go
diff --git a/pkg/ctrlz/topics/assets/assets.go → ctrlz/topics/assets/assets.go b/pkg/ctrlz/topics/assets/assets.go → ctrlz/topics/assets/assets.go
diff --git a/pkg/ctrlz/topics/assets/templates/args.html → ctrlz/topics/assets/templates/args.html b/pkg/ctrlz/topics/assets/templates/args.html → ctrlz/topics/assets/templates/args.html
diff --git a/...ics/assets/templates/collection/item.html → ...ics/assets/templates/collection/item.html b/...ics/assets/templates/collection/item.html → ...ics/assets/templates/collection/item.html
diff --git a/...ics/assets/templates/collection/list.html → ...ics/assets/templates/collection/list.html b/...ics/assets/templates/collection/list.html → ...ics/assets/templates/collection/list.html
diff --git a/...ics/assets/templates/collection/main.html → ...ics/assets/templates/collection/main.html b/...ics/assets/templates/collection/main.html → ...ics/assets/templates/collection/main.html
diff --git a/pkg/ctrlz/topics/assets/templates/env.html → ctrlz/topics/assets/templates/env.html b/pkg/ctrlz/topics/assets/templates/env.html → ctrlz/topics/assets/templates/env.html
diff --git a/pkg/ctrlz/topics/assets/templates/mem.html → ctrlz/topics/assets/templates/mem.html b/pkg/ctrlz/topics/assets/templates/mem.html → ctrlz/topics/assets/templates/mem.html
diff --git a/...trlz/topics/assets/templates/metrics.html → ctrlz/topics/assets/templates/metrics.html b/...trlz/topics/assets/templates/metrics.html → ctrlz/topics/assets/templates/metrics.html
diff --git a/pkg/ctrlz/topics/assets/templates/proc.html → ctrlz/topics/assets/templates/proc.html b/pkg/ctrlz/topics/assets/templates/proc.html → ctrlz/topics/assets/templates/proc.html
diff --git a/...ctrlz/topics/assets/templates/scopes.html → ctrlz/topics/assets/templates/scopes.html b/...ctrlz/topics/assets/templates/scopes.html → ctrlz/topics/assets/templates/scopes.html
diff --git a/...trlz/topics/assets/templates/signals.html → ctrlz/topics/assets/templates/signals.html b/...trlz/topics/assets/templates/signals.html → ctrlz/topics/assets/templates/signals.html
diff --git a/...trlz/topics/assets/templates/version.html → ctrlz/topics/assets/templates/version.html b/...trlz/topics/assets/templates/version.html → ctrlz/topics/assets/templates/version.html
diff --git a/pkg/ctrlz/topics/collection.go → ctrlz/topics/collection.go b/pkg/ctrlz/topics/collection.go → ctrlz/topics/collection.go
@@ -23,8 +23,8 @@ import (
 
 	yaml "gopkg.in/yaml.v2"
 
-	"istio.io/common/pkg/ctrlz/fw"
-	"istio.io/common/pkg/ctrlz/topics/assets"
+	"istio.io/pkg/ctrlz/fw"
+	"istio.io/pkg/ctrlz/topics/assets"
 )
 
 // ReadableCollection is a staticCollection collection of entries to be exposed via CtrlZ.

diff --git a/pkg/ctrlz/topics/env.go → ctrlz/topics/env.go b/pkg/ctrlz/topics/env.go → ctrlz/topics/env.go
@@ -21,8 +21,8 @@ import (
 	"sort"
 	"strings"
 
-	"istio.io/common/pkg/ctrlz/fw"
-	"istio.io/common/pkg/ctrlz/topics/assets"
+	"istio.io/pkg/ctrlz/fw"
+	"istio.io/pkg/ctrlz/topics/assets"
 )
 
 type envTopic struct {

diff --git a/pkg/ctrlz/topics/mem.go → ctrlz/topics/mem.go b/pkg/ctrlz/topics/mem.go → ctrlz/topics/mem.go
@@ -20,8 +20,8 @@ import (
 	"net/http"
 	"runtime"
 
-	"istio.io/common/pkg/ctrlz/fw"
-	"istio.io/common/pkg/ctrlz/topics/assets"
+	"istio.io/pkg/ctrlz/fw"
+	"istio.io/pkg/ctrlz/topics/assets"
 )
 
 type memTopic struct {

diff --git a/pkg/ctrlz/topics/metrics.go → ctrlz/topics/metrics.go b/pkg/ctrlz/topics/metrics.go → ctrlz/topics/metrics.go
@@ -21,8 +21,8 @@ import (
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/prom2json"
 
-	"istio.io/common/pkg/ctrlz/fw"
-	"istio.io/common/pkg/ctrlz/topics/assets"
+	"istio.io/pkg/ctrlz/fw"
+	"istio.io/pkg/ctrlz/topics/assets"
 )
 
 type metricsTopic struct {

diff --git a/pkg/ctrlz/topics/proc.go → ctrlz/topics/proc.go b/pkg/ctrlz/topics/proc.go → ctrlz/topics/proc.go
@@ -20,8 +20,8 @@ import (
 	"os"
 	"runtime"
 
-	"istio.io/common/pkg/ctrlz/fw"
-	"istio.io/common/pkg/ctrlz/topics/assets"
+	"istio.io/pkg/ctrlz/fw"
+	"istio.io/pkg/ctrlz/topics/assets"
 )
 
 type procTopic struct {

diff --git a/pkg/ctrlz/topics/scopes.go → ctrlz/topics/scopes.go b/pkg/ctrlz/topics/scopes.go → ctrlz/topics/scopes.go
@@ -22,9 +22,9 @@ import (
 
 	"github.com/gorilla/mux"
 
-	"istio.io/common/pkg/ctrlz/fw"
-	"istio.io/common/pkg/ctrlz/topics/assets"
-	"istio.io/common/pkg/log"
+	"istio.io/pkg/ctrlz/fw"
+	"istio.io/pkg/ctrlz/topics/assets"
+	"istio.io/pkg/log"
 )
 
 type scopeTopic struct {

diff --git a/pkg/ctrlz/topics/signals.go → ctrlz/topics/signals.go b/pkg/ctrlz/topics/signals.go → ctrlz/topics/signals.go
@@ -20,9 +20,9 @@ import (
 	"net/http"
 	"syscall"
 
-	"istio.io/common/pkg/appsignals"
-	"istio.io/common/pkg/ctrlz/fw"
-	"istio.io/common/pkg/ctrlz/topics/assets"
+	"istio.io/pkg/appsignals"
+	"istio.io/pkg/ctrlz/fw"
+	"istio.io/pkg/ctrlz/topics/assets"
 )
 
 type signalsTopic struct {

diff --git a/pkg/ctrlz/topics/version.go → ctrlz/topics/version.go b/pkg/ctrlz/topics/version.go → ctrlz/topics/version.go
@@ -18,9 +18,9 @@ import (
 	"html/template"
 	"net/http"
 
-	"istio.io/common/pkg/ctrlz/fw"
-	"istio.io/common/pkg/ctrlz/topics/assets"
-	"istio.io/common/pkg/version"
+	"istio.io/pkg/ctrlz/fw"
+	"istio.io/pkg/ctrlz/topics/assets"
+	"istio.io/pkg/version"
 )
 
 type versionTopic struct {

diff --git a/pkg/env/var.go → env/var.go b/pkg/env/var.go → env/var.go
@@ -23,7 +23,7 @@ import (
 	"sync"
 	"time"
 
-	"istio.io/common/pkg/log"
+	"istio.io/pkg/log"
 )
 
 // The type of a variable's value

diff --git a/pkg/env/var_test.go → env/var_test.go b/pkg/env/var_test.go → env/var_test.go
diff --git a/pkg/filewatcher/fakefilewatcher.go → filewatcher/fakefilewatcher.go b/pkg/filewatcher/fakefilewatcher.go → filewatcher/fakefilewatcher.go
diff --git a/pkg/filewatcher/fakefilewatcher_test.go → filewatcher/fakefilewatcher_test.go b/pkg/filewatcher/fakefilewatcher_test.go → filewatcher/fakefilewatcher_test.go
diff --git a/pkg/filewatcher/filewatcher.go → filewatcher/filewatcher.go b/pkg/filewatcher/filewatcher.go → filewatcher/filewatcher.go
diff --git a/pkg/filewatcher/filewatcher_test.go → filewatcher/filewatcher_test.go b/pkg/filewatcher/filewatcher_test.go → filewatcher/filewatcher_test.go
diff --git a/go.mod b/go.mod
@@ -1,4 +1,4 @@
-module istio.io/common
+module istio.io/pkg
 
 go 1.12
 

diff --git a/pkg/log/config.go → log/config.go b/pkg/log/config.go → log/config.go
diff --git a/pkg/log/config_test.go → log/config_test.go b/pkg/log/config_test.go → log/config_test.go
diff --git a/pkg/log/default.go → log/default.go b/pkg/log/default.go → log/default.go
diff --git a/pkg/log/default_test.go → log/default_test.go b/pkg/log/default_test.go → log/default_test.go
diff --git a/pkg/log/options.go → log/options.go b/pkg/log/options.go → log/options.go
diff --git a/pkg/log/options_test.go → log/options_test.go b/pkg/log/options_test.go → log/options_test.go
diff --git a/pkg/log/scope.go → log/scope.go b/pkg/log/scope.go → log/scope.go
diff --git a/pkg/log/scope_test.go → log/scope_test.go b/pkg/log/scope_test.go → log/scope_test.go
diff --git a/pkg/probe/client.go → probe/client.go b/pkg/probe/client.go → probe/client.go
diff --git a/pkg/probe/client_test.go → probe/client_test.go b/pkg/probe/client_test.go → probe/client_test.go
diff --git a/pkg/probe/controller.go → probe/controller.go b/pkg/probe/controller.go → probe/controller.go
@@ -24,7 +24,7 @@ import (
 
 	multierror "github.com/hashicorp/go-multierror"
 
-	"istio.io/common/pkg/log"
+	"istio.io/pkg/log"
 )
 
 // Controller provides the internal interface to handle events coming

diff --git a/pkg/probe/controller_test.go → probe/controller_test.go b/pkg/probe/controller_test.go → probe/controller_test.go
diff --git a/pkg/probe/option.go → probe/option.go b/pkg/probe/option.go → probe/option.go
diff --git a/pkg/probe/option_test.go → probe/option_test.go b/pkg/probe/option_test.go → probe/option_test.go
diff --git a/pkg/probe/probe.go → probe/probe.go b/pkg/probe/probe.go → probe/probe.go
diff --git a/pkg/probe/probe_test.go → probe/probe_test.go b/pkg/probe/probe_test.go → probe/probe_test.go
diff --git a/pkg/timedfn/withtimeout.go → timedfn/withtimeout.go b/pkg/timedfn/withtimeout.go → timedfn/withtimeout.go
diff --git a/pkg/timedfn/withtimeout_test.go → timedfn/withtimeout_test.go b/pkg/timedfn/withtimeout_test.go → timedfn/withtimeout_test.go
diff --git a/pkg/version/cobra.go → version/cobra.go b/pkg/version/cobra.go → version/cobra.go
diff --git a/pkg/version/cobra_test.go → version/cobra_test.go b/pkg/version/cobra_test.go → version/cobra_test.go
diff --git a/pkg/version/stats.go → version/stats.go b/pkg/version/stats.go → version/stats.go
diff --git a/pkg/version/stats_linux.go → version/stats_linux.go b/pkg/version/stats_linux.go → version/stats_linux.go
@@ -21,7 +21,7 @@ import (
 	"go.opencensus.io/stats/view"
 	"go.opencensus.io/tag"
 
-	"istio.io/common/pkg/log"
+	"istio.io/pkg/log"
 )
 
 // Note that this code uses go.opencensus.io/stats,

diff --git a/pkg/version/version.go → version/version.go b/pkg/version/version.go → version/version.go
diff --git a/pkg/version/version_linux_test.go → version/version_linux_test.go b/pkg/version/version_linux_test.go → version/version_linux_test.go
diff --git a/pkg/version/version_test.go → version/version_test.go b/pkg/version/version_test.go → version/version_test.go
-Original file line number
+Diff line change
@@ Expand Up / @@ -20,7 +20,7 @@ import ( @@
     	"sort"
     	"sync"
-    	"istio.io/common/pkg/log"
+    	"istio.io/pkg/log"
     )
     // Annotation describes a single resource annotation
@@ Expand Down @@