githubjoe
diff --git a/‎mixer/cmd/mixs/cmd/validator.go‎
Lines changed: 2 additions & 1 deletion b/‎mixer/cmd/mixs/cmd/validator.go‎
Lines changed: 2 additions & 1 deletion
diff --git a/‎mixer/pkg/config/BUILD‎
Lines changed: 2 additions & 21 deletions b/‎mixer/pkg/config/BUILD‎
Lines changed: 2 additions & 21 deletions
diff --git a/‎mixer/pkg/config/adapterInfoRegistry.go‎
Lines changed: 0 additions & 10 deletions b/‎mixer/pkg/config/adapterInfoRegistry.go‎
Lines changed: 0 additions & 10 deletions
diff --git a/‎mixer/pkg/config/store/BUILD‎
Lines changed: 0 additions & 3 deletions b/‎mixer/pkg/config/store/BUILD‎
Lines changed: 0 additions & 3 deletions
diff --git a/‎mixer/pkg/config/store/fsstore.go‎
Lines changed: 0 additions & 156 deletions b/‎mixer/pkg/config/store/fsstore.go‎
Lines changed: 0 additions & 156 deletions
diff --git a/‎mixer/pkg/config/store/store.go‎
Lines changed: 0 additions & 138 deletions b/‎mixer/pkg/config/store/store.go‎
Lines changed: 0 additions & 138 deletions
@@ -34,7 +34,8 @@ import (
 func validatorCmd(info map[string]template.Info, adapters []adapter.InfoFn, printf, fatalf shared.FormatFn) *cobra.Command {
 	vc := crd.ControllerOptions{}
 	var kubeconfig string
-	kinds := runtime.KindMap(config.InventoryMap(adapters), info)
+	tmplRepo := template.NewRepository(info)
+	kinds := runtime.KindMap(config.AdapterInfoMap(adapters, tmplRepo.SupportsTemplate), info)
 	vc.ResourceNames = make([]string, 0, len(kinds))
 	for name := range kinds {
 		vc.ResourceNames = append(vc.ResourceNames, pluralize(name))
 
@@ -11,40 +11,21 @@ go_library(
     visibility = ["//visibility:public"],
     deps = [
         "//mixer/pkg/adapter:go_default_library",
-        "//mixer/pkg/attribute:go_default_library",
         "//mixer/pkg/config/crd:go_default_library",
-        "//mixer/pkg/config/descriptor:go_default_library",
-        "//mixer/pkg/config/proto:go_default_library",
         "//mixer/pkg/config/store:go_default_library",
-        "//mixer/pkg/expr:go_default_library",
-        "//mixer/pkg/pool:go_default_library",
-        "//mixer/pkg/status:go_default_library",
-        "//mixer/pkg/template:go_default_library",
         "//pkg/log:go_default_library",
-        "@com_github_emicklei_go_restful//:go_default_library",
-        "@com_github_ghodss_yaml//:go_default_library",
-        "@com_github_gogo_protobuf//jsonpb:go_default_library",
-        "@com_github_gogo_protobuf//proto:go_default_library",
-        "@com_github_googleapis_googleapis//:google/rpc",
-        "@com_github_hashicorp_go_multierror//:go_default_library",
-        "@io_istio_api//mixer/v1/config/descriptor:descriptor",
     ],
 )
 
 go_test(
     name = "go_default_test",
     size = "small",
-    srcs = [
-        "adapterInfoRegistry_test.go",
-    ],
+    srcs = ["adapterInfoRegistry_test.go"],
     library = ":go_default_library",
     deps = [
-        "//mixer/pkg/il/testing:go_default_library",
+        "//mixer/pkg/template:go_default_library",
         "//mixer/template/sample:go_default_library",
         "//mixer/template/sample/report:go_default_library",
         "@com_github_gogo_protobuf//types:go_default_library",
-        "@com_github_golang_protobuf//ptypes/empty:go_default_library",
-        "@com_github_golang_protobuf//ptypes/wrappers:go_default_library",
-        "@org_uber_go_zap//zapcore:go_default_library",
     ],
 )
@@ -95,13 +95,3 @@ func doesBuilderSupportsTemplates(info adapter.Info, hndlrBldrValidator handlerB
 	}
 	return true, ""
 }
-
-// InventoryMap converts adapter inventory to a builder map.
-func InventoryMap(inv []adapter.InfoFn) map[string]*adapter.Info {
-	m := make(map[string]*adapter.Info, len(inv))
-	for _, ai := range inv {
-		bi := ai()
-		m[bi.Name] = &bi
-	}
-	return m
-}
@@ -6,11 +6,9 @@ go_library(
     name = "go_default_library",
     srcs = [
         "convert.go",
-        "fsstore.go",
         "fsstore2.go",
         "memstore.go",
         "queue.go",
-        "store.go",
         "store2.go",
         "validator.go",
     ],
@@ -31,7 +29,6 @@ go_test(
         "fsstore2_test.go",
         "queue_test.go",
         "store2_test.go",
-        "store_test.go",
         "validator_test.go",
     ],
     library = ":go_default_library",
Original file line number	Diff line number	Diff line change
`@@ -95,13 +95,3 @@ func doesBuilderSupportsTemplates(info adapter.Info, hndlrBldrValidator handlerB`
`95`	`95`	`}`
`96`	`96`	`return true, ""`
`97`	`97`	`}`
`98`		`-`
`99`		`-// InventoryMap converts adapter inventory to a builder map.`
`100`		`-func InventoryMap(inv []adapter.InfoFn) map[string]*adapter.Info {`
`101`		`- m := make(map[string]*adapter.Info, len(inv))`
`102`		`- for _, ai := range inv {`
`103`		`- bi := ai()`
`104`		`- m[bi.Name] = &bi`
`105`		`- }`
`106`		`- return m`
`107`		`-}`