Skip to content

Commit

Permalink
remove unused legacy mixer store code (istio#2207)
Browse files Browse the repository at this point in the history
Automatic merge from submit-queue.

remove unused legacy mixer store code

**What this PR does / why we need it**:

**Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes #

**Special notes for your reviewer**:

**Release note**:

```release-note
none
```
  • Loading branch information
jmuk authored and istio-merge-robot committed Dec 16, 2017
1 parent 64df35f commit d084b68
Show file tree
Hide file tree
Showing 9 changed files with 22 additions and 384 deletions.
3 changes: 2 additions & 1 deletion mixer/cmd/mixs/cmd/validator.go
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down
23 changes: 2 additions & 21 deletions mixer/pkg/config/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -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",
],
)
10 changes: 0 additions & 10 deletions mixer/pkg/config/adapterInfoRegistry.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
3 changes: 0 additions & 3 deletions mixer/pkg/config/store/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -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",
],
Expand All @@ -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",
Expand Down
156 changes: 0 additions & 156 deletions mixer/pkg/config/store/fsstore.go

This file was deleted.

138 changes: 0 additions & 138 deletions mixer/pkg/config/store/store.go

This file was deleted.

Loading

0 comments on commit d084b68

Please sign in to comment.