Skip to content

Commit

Permalink
Rename mixer/pkg/runtime2 to mixer/pkg/runtime (istio#4518)
Browse files Browse the repository at this point in the history
  • Loading branch information
@geeknoid
geeknoid authored Mar 24, 2018
1 parent 7bbd60d commit e0f2810
Show file tree
Hide file tree
Showing 66 changed files with 70 additions and 71 deletions.
15 changes: 7 additions & 8 deletions codecov.requirement
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,14 +84,13 @@ istio.io/istio/mixer/pkg/il/text:94 [96.5]
istio.io/istio/mixer/pkg/mockapi:87 [89.9]
istio.io/istio/mixer/pkg/perf:72 [74.9]
istio.io/istio/mixer/pkg/pool:100 [100.0]
istio.io/istio/mixer/pkg/runtime:90 [92.8]
istio.io/istio/mixer/pkg/runtime2:100 [100.0]
istio.io/istio/mixer/pkg/runtime2/config:100 [100.0]
istio.io/istio/mixer/pkg/runtime2/dispatcher:96 [98.4]
istio.io/istio/mixer/pkg/runtime2/handler:94 [96.9]
istio.io/istio/mixer/pkg/runtime2/routing:100 [100.0]
istio.io/istio/mixer/pkg/runtime2/testing/data:2 [4.6]
istio.io/istio/mixer/pkg/runtime2/testing/util:0 [0.0]
istio.io/istio/mixer/pkg/runtime:100 [100.0]
istio.io/istio/mixer/pkg/runtime/config:100 [100.0]
istio.io/istio/mixer/pkg/runtime/dispatcher:96 [98.4]
istio.io/istio/mixer/pkg/runtime/handler:94 [96.9]
istio.io/istio/mixer/pkg/runtime/routing:100 [100.0]
istio.io/istio/mixer/pkg/runtime/testing/data:2 [4.6]
istio.io/istio/mixer/pkg/runtime/testing/util:0 [0.0]
istio.io/istio/mixer/pkg/server:97 [99.4]
istio.io/istio/mixer/pkg/status:77 [79.3]
istio.io/istio/mixer/pkg/template:46 [48.9]
Expand Down
2 changes: 1 addition & 1 deletion codecov.skip
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
istio.io/istio/mixer/pkg/mockapi
istio.io/istio/mixer/pkg/perf
istio.io/istio/mixer/pkg/runtime2/testing
istio.io/istio/mixer/pkg/runtime/testing
istio.io/istio/mixer/tools/codegen*
istio.io/istio/mixer/template/sample
istio.io/istio/mixer/test
Expand Down
6 changes: 3 additions & 3 deletions mixer/cmd/mixs/cmd/crd.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (

"istio.io/istio/mixer/cmd/shared"
"istio.io/istio/mixer/pkg/adapter"
mixerRuntime "istio.io/istio/mixer/pkg/runtime2"
"istio.io/istio/mixer/pkg/runtime"
"istio.io/istio/mixer/pkg/template"
)

Expand All @@ -43,8 +43,8 @@ func crdCmd(tmplInfos map[string]template.Info, adapters []adapter.InfoFn, print
Use: "all",
Short: "List all CRDs",
Run: func(cmd *cobra.Command, args []string) {
printCrd(printf, fatalf, mixerRuntime.RulesKind, "istio.io.mixer", "core")
printCrd(printf, fatalf, mixerRuntime.AttributeManifestKind, "istio.io.mixer", "core")
printCrd(printf, fatalf, runtime.RulesKind, "istio.io.mixer", "core")
printCrd(printf, fatalf, runtime.AttributeManifestKind, "istio.io.mixer", "core")
listCrdsAdapters(printf, fatalf, adapters)
listCrdsInstances(printf, fatalf, tmplInfos)
},
Expand Down
4 changes: 2 additions & 2 deletions mixer/cmd/mixs/cmd/validator.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ import (
"istio.io/istio/mixer/pkg/config/crd"
"istio.io/istio/mixer/pkg/config/store"
"istio.io/istio/mixer/pkg/il/evaluator"
runtimeConfig "istio.io/istio/mixer/pkg/runtime2/config"
"istio.io/istio/mixer/pkg/runtime2/validator"
runtimeConfig "istio.io/istio/mixer/pkg/runtime/config"
"istio.io/istio/mixer/pkg/runtime/validator"
"istio.io/istio/mixer/pkg/template"
)

Expand Down
2 changes: 1 addition & 1 deletion mixer/pkg/api/grpcServer.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import (
"istio.io/istio/mixer/pkg/adapter"
"istio.io/istio/mixer/pkg/attribute"
"istio.io/istio/mixer/pkg/pool"
"istio.io/istio/mixer/pkg/runtime2/dispatcher"
"istio.io/istio/mixer/pkg/runtime/dispatcher"
"istio.io/istio/mixer/pkg/status"
"istio.io/istio/pkg/log"
)
Expand Down
2 changes: 1 addition & 1 deletion mixer/pkg/api/grpcServer_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import (
"istio.io/istio/mixer/pkg/adapter"
"istio.io/istio/mixer/pkg/attribute"
"istio.io/istio/mixer/pkg/pool"
"istio.io/istio/mixer/pkg/runtime2/dispatcher"
"istio.io/istio/mixer/pkg/runtime/dispatcher"
"istio.io/istio/mixer/pkg/status"
"istio.io/istio/pkg/log"
)
Expand Down
2 changes: 1 addition & 1 deletion mixer/pkg/api/perf_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import (
"istio.io/istio/mixer/pkg/adapter"
"istio.io/istio/mixer/pkg/attribute"
"istio.io/istio/mixer/pkg/pool"
"istio.io/istio/mixer/pkg/runtime2/dispatcher"
"istio.io/istio/mixer/pkg/runtime/dispatcher"
"istio.io/istio/mixer/pkg/status"
)

Expand Down
0 mixer/pkg/runtime2/config/config_test.go → mixer/pkg/runtime/config/config_test.go
View file
File renamed without changes.
0 mixer/pkg/runtime2/config/const.go → mixer/pkg/runtime/config/const.go
View file
File renamed without changes.
0 mixer/pkg/runtime2/config/ephemeral.go → mixer/pkg/runtime/config/ephemeral.go
View file
File renamed without changes.
0 mixer/pkg/runtime2/config/kinds.go → mixer/pkg/runtime/config/kinds.go
View file
File renamed without changes.
0 mixer/pkg/runtime2/config/kinds_test.go → mixer/pkg/runtime/config/kinds_test.go
View file
File renamed without changes.
0 mixer/pkg/runtime2/config/monitoring.go → mixer/pkg/runtime/config/monitoring.go
View file
File renamed without changes.
0 mixer/pkg/runtime2/config/queries.go → mixer/pkg/runtime/config/queries.go
View file
File renamed without changes.
0 mixer/pkg/runtime2/config/queries_test.go → mixer/pkg/runtime/config/queries_test.go
View file
File renamed without changes.
0 mixer/pkg/runtime2/config/resourceType.go → mixer/pkg/runtime/config/resourceType.go
View file
File renamed without changes.
0 .../pkg/runtime2/config/resourceType_test.go → ...r/pkg/runtime/config/resourceType_test.go
View file
File renamed without changes.
0 mixer/pkg/runtime2/config/snapshot.go → mixer/pkg/runtime/config/snapshot.go
View file
File renamed without changes.
0 mixer/pkg/runtime2/config/strings.go → mixer/pkg/runtime/config/strings.go
View file
File renamed without changes.
0 mixer/pkg/runtime2/config/util.go → mixer/pkg/runtime/config/util.go
View file
File renamed without changes.
0 mixer/pkg/runtime2/config/util_test.go → mixer/pkg/runtime/config/util_test.go
View file
File renamed without changes.
6 changes: 3 additions & 3 deletions mixer/pkg/runtime2/dispatcher/dispatcher.go → mixer/pkg/runtime/dispatcher/dispatcher.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ import (
"istio.io/istio/mixer/pkg/adapter"
"istio.io/istio/mixer/pkg/attribute"
"istio.io/istio/mixer/pkg/pool"
"istio.io/istio/mixer/pkg/runtime2/config"
"istio.io/istio/mixer/pkg/runtime2/routing"
"istio.io/istio/mixer/pkg/runtime/config"
"istio.io/istio/mixer/pkg/runtime/routing"
"istio.io/istio/mixer/pkg/status"
"istio.io/istio/pkg/log"
)
Expand Down Expand Up @@ -79,7 +79,7 @@ type QuotaMethodArgs struct {
BestEffort bool
}

// Impl is the runtime2 implementation of the Dispatcher interface.
// Impl is the runtime implementation of the Dispatcher interface.
type Impl struct {
identityAttribute string

Expand Down
8 changes: 4 additions & 4 deletions ...kg/runtime2/dispatcher/dispatcher_test.go → ...pkg/runtime/dispatcher/dispatcher_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@ import (
"istio.io/istio/mixer/pkg/attribute"
"istio.io/istio/mixer/pkg/il/compiled"
"istio.io/istio/mixer/pkg/pool"
"istio.io/istio/mixer/pkg/runtime2/handler"
"istio.io/istio/mixer/pkg/runtime2/routing"
"istio.io/istio/mixer/pkg/runtime2/testing/data"
"istio.io/istio/mixer/pkg/runtime2/testing/util"
"istio.io/istio/mixer/pkg/runtime/handler"
"istio.io/istio/mixer/pkg/runtime/routing"
"istio.io/istio/mixer/pkg/runtime/testing/data"
"istio.io/istio/mixer/pkg/runtime/testing/util"
"istio.io/istio/pkg/log"
)

Expand Down
2 changes: 1 addition & 1 deletion .../pkg/runtime2/dispatcher/dispatchstate.go → ...r/pkg/runtime/dispatcher/dispatchstate.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import (

"istio.io/istio/mixer/pkg/adapter"
"istio.io/istio/mixer/pkg/attribute"
"istio.io/istio/mixer/pkg/runtime2/routing"
"istio.io/istio/mixer/pkg/runtime/routing"
"istio.io/istio/mixer/pkg/template"
)

Expand Down
2 changes: 1 addition & 1 deletion ...runtime2/dispatcher/dispatchstate_test.go → .../runtime/dispatcher/dispatchstate_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (

"istio.io/istio/mixer/pkg/adapter"
"istio.io/istio/mixer/pkg/attribute"
"istio.io/istio/mixer/pkg/runtime2/routing"
"istio.io/istio/mixer/pkg/runtime/routing"
)

func TestDispatchStatePool(t *testing.T) {
Expand Down
0 mixer/pkg/runtime2/dispatcher/monitoring.go → mixer/pkg/runtime/dispatcher/monitoring.go
View file
File renamed without changes.
0 mixer/pkg/runtime2/dispatcher/session.go → mixer/pkg/runtime/dispatcher/session.go
View file
File renamed without changes.
0 ...r/pkg/runtime2/dispatcher/session_test.go → mixer/pkg/runtime/dispatcher/session_test.go
View file
File renamed without changes.
0 mixer/pkg/runtime2/dispatcher/tracing.go → mixer/pkg/runtime/dispatcher/tracing.go
View file
File renamed without changes.
0 mixer/pkg/runtime2/dispatcher/util.go → mixer/pkg/runtime/dispatcher/util.go
View file
File renamed without changes.
0 mixer/pkg/runtime2/dispatcher/util_test.go → mixer/pkg/runtime/dispatcher/util_test.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion mixer/pkg/runtime2/handler/env.go → mixer/pkg/runtime/handler/env.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ func (e env) reportStrayWorkers() error {
// Basically, even if the adapter would have closed everything before returning from Close function, our
// counter might get delayed decremented, causing this false positive error.
// Therefore, we need a new retry kind logic on handler Close to give time for counters to get updated
// before making this as a red flag error. runtime2 work has plans to implement this stuff, we can revisit
// before making this as a red flag error. runtime work has plans to implement this stuff, we can revisit
// this to-do then. Same for the code below related to workers.
_ = e.Logger().Errorf("adapter did not close all the scheduled daemons")
}
Expand Down
0 mixer/pkg/runtime2/handler/env_test.go → mixer/pkg/runtime/handler/env_test.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion mixer/pkg/runtime2/handler/factory.go → mixer/pkg/runtime/handler/factory.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import (
"istio.io/istio/mixer/pkg/adapter"
"istio.io/istio/mixer/pkg/expr"
"istio.io/istio/mixer/pkg/il/evaluator"
"istio.io/istio/mixer/pkg/runtime2/config"
"istio.io/istio/mixer/pkg/runtime/config"
"istio.io/istio/mixer/pkg/template"
"istio.io/istio/pkg/log"
)
Expand Down
6 changes: 3 additions & 3 deletions mixer/pkg/runtime2/handler/factory_test.go → mixer/pkg/runtime/handler/factory_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ package handler
import (
"testing"

"istio.io/istio/mixer/pkg/runtime2/config"
"istio.io/istio/mixer/pkg/runtime2/testing/data"
"istio.io/istio/mixer/pkg/runtime2/testing/util"
"istio.io/istio/mixer/pkg/runtime/config"
"istio.io/istio/mixer/pkg/runtime/testing/data"
"istio.io/istio/mixer/pkg/runtime/testing/util"
)

func TestBasic(t *testing.T) {
Expand Down
0 mixer/pkg/runtime2/handler/logger.go → mixer/pkg/runtime/handler/logger.go
View file
File renamed without changes.
0 mixer/pkg/runtime2/handler/monitoring.go → mixer/pkg/runtime/handler/monitoring.go
View file
File renamed without changes.
0 mixer/pkg/runtime2/handler/safe.go → mixer/pkg/runtime/handler/safe.go
View file
File renamed without changes.
0 mixer/pkg/runtime2/handler/safe_test.go → mixer/pkg/runtime/handler/safe_test.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion mixer/pkg/runtime2/handler/signature.go → mixer/pkg/runtime/handler/signature.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (

"github.com/gogo/protobuf/proto"

"istio.io/istio/mixer/pkg/runtime2/config"
"istio.io/istio/mixer/pkg/runtime/config"
"istio.io/istio/pkg/log"
)

Expand Down
2 changes: 1 addition & 1 deletion mixer/pkg/runtime2/handler/signature_test.go → mixer/pkg/runtime/handler/signature_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
"github.com/gogo/protobuf/proto"

"istio.io/istio/mixer/pkg/adapter"
"istio.io/istio/mixer/pkg/runtime2/config"
"istio.io/istio/mixer/pkg/runtime/config"
)

type fakeProto struct {
Expand Down
2 changes: 1 addition & 1 deletion mixer/pkg/runtime2/handler/table.go → mixer/pkg/runtime/handler/table.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ package handler
import (
"istio.io/istio/mixer/pkg/adapter"
"istio.io/istio/mixer/pkg/pool"
"istio.io/istio/mixer/pkg/runtime2/config"
"istio.io/istio/mixer/pkg/runtime/config"
"istio.io/istio/pkg/log"
)

Expand Down
6 changes: 3 additions & 3 deletions mixer/pkg/runtime2/handler/table_test.go → mixer/pkg/runtime/handler/table_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ import (
dto "github.com/prometheus/client_model/go"

"istio.io/istio/mixer/pkg/pool"
"istio.io/istio/mixer/pkg/runtime2/config"
"istio.io/istio/mixer/pkg/runtime2/testing/data"
"istio.io/istio/mixer/pkg/runtime2/testing/util"
"istio.io/istio/mixer/pkg/runtime/config"
"istio.io/istio/mixer/pkg/runtime/testing/data"
"istio.io/istio/mixer/pkg/runtime/testing/util"
)

// Create a standard global config with Handler H1, Instance I1 and rule R1 referencing I1 and H1.
Expand Down
4 changes: 2 additions & 2 deletions mixer/pkg/runtime2/routing/builder.go → mixer/pkg/runtime/routing/builder.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,8 @@ import (
descriptor "istio.io/api/policy/v1beta1"
"istio.io/istio/mixer/pkg/expr"
"istio.io/istio/mixer/pkg/il/compiled"
"istio.io/istio/mixer/pkg/runtime2/config"
"istio.io/istio/mixer/pkg/runtime2/handler"
"istio.io/istio/mixer/pkg/runtime/config"
"istio.io/istio/mixer/pkg/runtime/handler"
"istio.io/istio/mixer/pkg/template"
"istio.io/istio/pkg/log"
)
Expand Down
8 changes: 4 additions & 4 deletions mixer/pkg/runtime2/routing/builder_test.go → mixer/pkg/runtime/routing/builder_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ import (

"istio.io/istio/mixer/pkg/adapter"
"istio.io/istio/mixer/pkg/il/compiled"
"istio.io/istio/mixer/pkg/runtime2/config"
"istio.io/istio/mixer/pkg/runtime2/handler"
"istio.io/istio/mixer/pkg/runtime2/testing/data"
"istio.io/istio/mixer/pkg/runtime2/testing/util"
"istio.io/istio/mixer/pkg/runtime/config"
"istio.io/istio/mixer/pkg/runtime/handler"
"istio.io/istio/mixer/pkg/runtime/testing/data"
"istio.io/istio/mixer/pkg/runtime/testing/util"
"istio.io/istio/mixer/pkg/template"
)

Expand Down
0 mixer/pkg/runtime2/routing/debug.go → mixer/pkg/runtime/routing/debug.go
View file
File renamed without changes.
0 mixer/pkg/runtime2/routing/monitoring.go → mixer/pkg/runtime/routing/monitoring.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion ...r/pkg/runtime2/routing/monitoring_test.go → mixer/pkg/runtime/routing/monitoring_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import (
"time"

tpb "istio.io/api/mixer/adapter/model/v1beta1"
"istio.io/istio/mixer/pkg/runtime2/testing/data"
"istio.io/istio/mixer/pkg/runtime/testing/data"
)

func TestDestinationCounters_Update(t *testing.T) {
Expand Down
0 mixer/pkg/runtime2/routing/string.go → mixer/pkg/runtime/routing/string.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion mixer/pkg/runtime2/routing/table.go → mixer/pkg/runtime/routing/table.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import (
"istio.io/istio/mixer/pkg/adapter"
"istio.io/istio/mixer/pkg/attribute"
"istio.io/istio/mixer/pkg/il/compiled"
"istio.io/istio/mixer/pkg/runtime2/config"
"istio.io/istio/mixer/pkg/runtime/config"
"istio.io/istio/mixer/pkg/template"
"istio.io/istio/pkg/log"
)
Expand Down
2 changes: 1 addition & 1 deletion mixer/pkg/runtime2/routing/table_test.go → mixer/pkg/runtime/routing/table_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import (

tpb "istio.io/api/mixer/adapter/model/v1beta1"
"istio.io/istio/mixer/pkg/attribute"
"istio.io/istio/mixer/pkg/runtime2/testing/data"
"istio.io/istio/mixer/pkg/runtime/testing/data"
)

var tableTests = []struct {
Expand Down
10 changes: 5 additions & 5 deletions mixer/pkg/runtime2/runtime.go → mixer/pkg/runtime/runtime.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.

package runtime2
package runtime

import (
"errors"
Expand All @@ -24,10 +24,10 @@ import (
"istio.io/istio/mixer/pkg/config/store"
"istio.io/istio/mixer/pkg/il/compiled"
"istio.io/istio/mixer/pkg/pool"
"istio.io/istio/mixer/pkg/runtime2/config"
"istio.io/istio/mixer/pkg/runtime2/dispatcher"
"istio.io/istio/mixer/pkg/runtime2/handler"
"istio.io/istio/mixer/pkg/runtime2/routing"
"istio.io/istio/mixer/pkg/runtime/config"
"istio.io/istio/mixer/pkg/runtime/dispatcher"
"istio.io/istio/mixer/pkg/runtime/handler"
"istio.io/istio/mixer/pkg/runtime/routing"
"istio.io/istio/mixer/pkg/template"
"istio.io/istio/pkg/log"
"istio.io/istio/pkg/probe"
Expand Down
6 changes: 3 additions & 3 deletions mixer/pkg/runtime2/runtime_test.go → mixer/pkg/runtime/runtime_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.

package runtime2
package runtime

import (
"context"
Expand All @@ -30,8 +30,8 @@ import (
"istio.io/istio/mixer/pkg/attribute"
"istio.io/istio/mixer/pkg/config/store"
"istio.io/istio/mixer/pkg/pool"
"istio.io/istio/mixer/pkg/runtime2/config"
"istio.io/istio/mixer/pkg/runtime2/testing/data"
"istio.io/istio/mixer/pkg/runtime/config"
"istio.io/istio/mixer/pkg/runtime/testing/data"
"istio.io/istio/pkg/probe"
)

Expand Down
0 mixer/pkg/runtime2/testing/data/adapters.go → mixer/pkg/runtime/testing/data/adapters.go
View file
File renamed without changes.
0 mixer/pkg/runtime2/testing/data/data.go → mixer/pkg/runtime/testing/data/data.go
View file
File renamed without changes.
0 mixer/pkg/runtime2/testing/data/logger.go → mixer/pkg/runtime/testing/data/logger.go
View file
File renamed without changes.
0 .../pkg/runtime2/testing/data/logger_test.go → ...r/pkg/runtime/testing/data/logger_test.go
View file
File renamed without changes.
0 mixer/pkg/runtime2/testing/data/templates.go → mixer/pkg/runtime/testing/data/templates.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion mixer/pkg/runtime2/testing/util/snapshot.go → mixer/pkg/runtime/testing/util/snapshot.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import (

"istio.io/istio/mixer/pkg/adapter"
"istio.io/istio/mixer/pkg/config/storetest"
"istio.io/istio/mixer/pkg/runtime2/config"
"istio.io/istio/mixer/pkg/runtime/config"
"istio.io/istio/mixer/pkg/template"
)

Expand Down
2 changes: 1 addition & 1 deletion mixer/pkg/runtime2/validator/validator.go → mixer/pkg/runtime/validator/validator.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import (
"istio.io/istio/mixer/pkg/adapter"
"istio.io/istio/mixer/pkg/config/store"
"istio.io/istio/mixer/pkg/expr"
"istio.io/istio/mixer/pkg/runtime2/config"
"istio.io/istio/mixer/pkg/runtime/config"
"istio.io/istio/mixer/pkg/template"
"istio.io/istio/pkg/cache"
"istio.io/istio/pkg/log"
Expand Down
0 .../pkg/runtime2/validator/validator_test.go → ...r/pkg/runtime/validator/validator_test.go
View file
File renamed without changes.
0 .../pkg/runtime2/validator/validatorcache.go → ...r/pkg/runtime/validator/validatorcache.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion ...runtime2/validator/validatorcache_test.go → .../runtime/validator/validatorcache_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import (
cpb "istio.io/api/policy/v1beta1"
"istio.io/istio/mixer/pkg/config/store"
"istio.io/istio/mixer/pkg/config/storetest"
"istio.io/istio/mixer/pkg/runtime2/config"
"istio.io/istio/mixer/pkg/runtime/config"
"istio.io/istio/pkg/cache"
)

Expand Down
4 changes: 2 additions & 2 deletions mixer/pkg/server/args.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (

"istio.io/istio/mixer/pkg/adapter"
"istio.io/istio/mixer/pkg/config/store"
mixerRuntime "istio.io/istio/mixer/pkg/runtime2"
"istio.io/istio/mixer/pkg/runtime"
"istio.io/istio/mixer/pkg/template"
"istio.io/istio/pkg/log"
"istio.io/istio/pkg/probe"
Expand Down Expand Up @@ -105,7 +105,7 @@ func DefaultArgs() *Args {
MaxConcurrentStreams: 1024,
APIWorkerPoolSize: 1024,
AdapterWorkerPoolSize: 1024,
ConfigDefaultNamespace: mixerRuntime.DefaultConfigNamespace,
ConfigDefaultNamespace: runtime.DefaultConfigNamespace,
ConfigIdentityAttribute: "destination.service",
ConfigIdentityAttributeDomain: "svc.cluster.local",
LoggingOptions: log.DefaultOptions(),
Expand Down
Loading

0 comments on commit e0f2810

Please sign in to comment.