rewrite import paths

This commit is contained in:
Daniel Smith
2016-08-30 10:12:09 -07:00
parent 7766f5e992
commit 2709f07c71
27 changed files with 66 additions and 66 deletions

View File

@@ -22,13 +22,13 @@ import (
"path/filepath" "path/filepath"
"strings" "strings"
"k8s.io/kubernetes/cmd/libs/go2idl/args" "k8s.io/gengo/args"
clientgenargs "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/args" clientgenargs "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/args"
"k8s.io/kubernetes/cmd/libs/go2idl/client-gen/generators/fake" "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/generators/fake"
"k8s.io/kubernetes/cmd/libs/go2idl/client-gen/generators/normalization" "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/generators/normalization"
"k8s.io/kubernetes/cmd/libs/go2idl/generator" "k8s.io/gengo/generator"
"k8s.io/kubernetes/cmd/libs/go2idl/namer" "k8s.io/gengo/namer"
"k8s.io/kubernetes/cmd/libs/go2idl/types" "k8s.io/gengo/types"
"k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/api/unversioned"
"github.com/golang/glog" "github.com/golang/glog"

View File

@@ -24,8 +24,8 @@ import (
clientgenargs "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/args" clientgenargs "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/args"
"k8s.io/kubernetes/cmd/libs/go2idl/client-gen/generators/normalization" "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/generators/normalization"
"k8s.io/kubernetes/cmd/libs/go2idl/generator" "k8s.io/gengo/generator"
"k8s.io/kubernetes/cmd/libs/go2idl/types" "k8s.io/gengo/types"
"k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/api/unversioned"
) )

View File

@@ -22,9 +22,9 @@ import (
"path/filepath" "path/filepath"
"k8s.io/kubernetes/cmd/libs/go2idl/client-gen/generators/normalization" "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/generators/normalization"
"k8s.io/kubernetes/cmd/libs/go2idl/generator" "k8s.io/gengo/generator"
"k8s.io/kubernetes/cmd/libs/go2idl/namer" "k8s.io/gengo/namer"
"k8s.io/kubernetes/cmd/libs/go2idl/types" "k8s.io/gengo/types"
"k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/api/unversioned"
) )

View File

@@ -21,9 +21,9 @@ import (
"io" "io"
"path/filepath" "path/filepath"
"k8s.io/kubernetes/cmd/libs/go2idl/generator" "k8s.io/gengo/generator"
"k8s.io/kubernetes/cmd/libs/go2idl/namer" "k8s.io/gengo/namer"
"k8s.io/kubernetes/cmd/libs/go2idl/types" "k8s.io/gengo/types"
) )
// genFakeForGroup produces a file for a group client, e.g. ExtensionsClient for the extension group. // genFakeForGroup produces a file for a group client, e.g. ExtensionsClient for the extension group.

View File

@@ -21,9 +21,9 @@ import (
"path/filepath" "path/filepath"
"strings" "strings"
"k8s.io/kubernetes/cmd/libs/go2idl/generator" "k8s.io/gengo/generator"
"k8s.io/kubernetes/cmd/libs/go2idl/namer" "k8s.io/gengo/namer"
"k8s.io/kubernetes/cmd/libs/go2idl/types" "k8s.io/gengo/types"
) )
// genFakeForType produces a file for each top-level type. // genFakeForType produces a file for each top-level type.

View File

@@ -22,9 +22,9 @@ import (
"path/filepath" "path/filepath"
"k8s.io/kubernetes/cmd/libs/go2idl/client-gen/generators/normalization" "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/generators/normalization"
"k8s.io/kubernetes/cmd/libs/go2idl/generator" "k8s.io/gengo/generator"
"k8s.io/kubernetes/cmd/libs/go2idl/namer" "k8s.io/gengo/namer"
"k8s.io/kubernetes/cmd/libs/go2idl/types" "k8s.io/gengo/types"
"k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/api/unversioned"
) )

View File

@@ -22,8 +22,8 @@ import (
"path/filepath" "path/filepath"
"strings" "strings"
"k8s.io/kubernetes/cmd/libs/go2idl/generator" "k8s.io/gengo/generator"
"k8s.io/kubernetes/cmd/libs/go2idl/types" "k8s.io/gengo/types"
) )
// genExpansion produces a file for a group client, e.g. ExtensionsClient for the extension group. // genExpansion produces a file for a group client, e.g. ExtensionsClient for the extension group.

View File

@@ -20,9 +20,9 @@ import (
"io" "io"
"k8s.io/kubernetes/cmd/libs/go2idl/client-gen/generators/normalization" "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/generators/normalization"
"k8s.io/kubernetes/cmd/libs/go2idl/generator" "k8s.io/gengo/generator"
"k8s.io/kubernetes/cmd/libs/go2idl/namer" "k8s.io/gengo/namer"
"k8s.io/kubernetes/cmd/libs/go2idl/types" "k8s.io/gengo/types"
) )
// genGroup produces a file for a group client, e.g. ExtensionsClient for the extension group. // genGroup produces a file for a group client, e.g. ExtensionsClient for the extension group.

View File

@@ -21,9 +21,9 @@ import (
"path/filepath" "path/filepath"
"strings" "strings"
"k8s.io/kubernetes/cmd/libs/go2idl/generator" "k8s.io/gengo/generator"
"k8s.io/kubernetes/cmd/libs/go2idl/namer" "k8s.io/gengo/namer"
"k8s.io/kubernetes/cmd/libs/go2idl/types" "k8s.io/gengo/types"
) )
// genClientForType produces a file for each top-level type. // genClientForType produces a file for each top-level type.

View File

@@ -18,7 +18,7 @@ package generators
import ( import (
"github.com/golang/glog" "github.com/golang/glog"
"k8s.io/kubernetes/cmd/libs/go2idl/types" "k8s.io/gengo/types"
) )
// extractBoolTagOrDie gets the comment-tags for the key and asserts that, if // extractBoolTagOrDie gets the comment-tags for the key and asserts that, if

View File

@@ -22,7 +22,7 @@ import (
"path/filepath" "path/filepath"
"strings" "strings"
"k8s.io/kubernetes/cmd/libs/go2idl/args" "k8s.io/gengo/args"
clientgenargs "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/args" clientgenargs "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/args"
"k8s.io/kubernetes/cmd/libs/go2idl/client-gen/generators" "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/generators"
"k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/api/unversioned"

View File

@@ -23,10 +23,10 @@ import (
"path/filepath" "path/filepath"
"strings" "strings"
"k8s.io/kubernetes/cmd/libs/go2idl/args" "k8s.io/gengo/args"
"k8s.io/kubernetes/cmd/libs/go2idl/generator" "k8s.io/gengo/generator"
"k8s.io/kubernetes/cmd/libs/go2idl/namer" "k8s.io/gengo/namer"
"k8s.io/kubernetes/cmd/libs/go2idl/types" "k8s.io/gengo/types"
"k8s.io/kubernetes/pkg/util/sets" "k8s.io/kubernetes/pkg/util/sets"
"github.com/golang/glog" "github.com/golang/glog"

View File

@@ -35,7 +35,7 @@ limitations under the License.
package main package main
import ( import (
"k8s.io/kubernetes/cmd/libs/go2idl/args" "k8s.io/gengo/args"
"k8s.io/kubernetes/cmd/libs/go2idl/conversion-gen/generators" "k8s.io/kubernetes/cmd/libs/go2idl/conversion-gen/generators"
"github.com/golang/glog" "github.com/golang/glog"

View File

@@ -22,10 +22,10 @@ import (
"path/filepath" "path/filepath"
"strings" "strings"
"k8s.io/kubernetes/cmd/libs/go2idl/args" "k8s.io/gengo/args"
"k8s.io/kubernetes/cmd/libs/go2idl/generator" "k8s.io/gengo/generator"
"k8s.io/kubernetes/cmd/libs/go2idl/namer" "k8s.io/gengo/namer"
"k8s.io/kubernetes/cmd/libs/go2idl/types" "k8s.io/gengo/types"
"k8s.io/kubernetes/pkg/util/sets" "k8s.io/kubernetes/pkg/util/sets"
"github.com/golang/glog" "github.com/golang/glog"

View File

@@ -19,7 +19,7 @@ package generators
import ( import (
"testing" "testing"
"k8s.io/kubernetes/cmd/libs/go2idl/types" "k8s.io/gengo/types"
) )
func Test_isRootedUnder(t *testing.T) { func Test_isRootedUnder(t *testing.T) {

View File

@@ -48,7 +48,7 @@ limitations under the License.
package main package main
import ( import (
"k8s.io/kubernetes/cmd/libs/go2idl/args" "k8s.io/gengo/args"
"k8s.io/kubernetes/cmd/libs/go2idl/deepcopy-gen/generators" "k8s.io/kubernetes/cmd/libs/go2idl/deepcopy-gen/generators"
"github.com/golang/glog" "github.com/golang/glog"

View File

@@ -26,11 +26,11 @@ import (
"path/filepath" "path/filepath"
"strings" "strings"
"k8s.io/kubernetes/cmd/libs/go2idl/args" "k8s.io/gengo/args"
"k8s.io/kubernetes/cmd/libs/go2idl/generator" "k8s.io/gengo/generator"
"k8s.io/kubernetes/cmd/libs/go2idl/namer" "k8s.io/gengo/namer"
"k8s.io/kubernetes/cmd/libs/go2idl/parser" "k8s.io/gengo/parser"
"k8s.io/kubernetes/cmd/libs/go2idl/types" "k8s.io/gengo/types"
flag "github.com/spf13/pflag" flag "github.com/spf13/pflag"
) )

View File

@@ -27,9 +27,9 @@ import (
"github.com/golang/glog" "github.com/golang/glog"
"k8s.io/kubernetes/cmd/libs/go2idl/generator" "k8s.io/gengo/generator"
"k8s.io/kubernetes/cmd/libs/go2idl/namer" "k8s.io/gengo/namer"
"k8s.io/kubernetes/cmd/libs/go2idl/types" "k8s.io/gengo/types"
) )
// genProtoIDL produces a .proto IDL. // genProtoIDL produces a .proto IDL.

View File

@@ -17,8 +17,8 @@ limitations under the License.
package protobuf package protobuf
import ( import (
"k8s.io/kubernetes/cmd/libs/go2idl/namer" "k8s.io/gengo/namer"
"k8s.io/kubernetes/cmd/libs/go2idl/types" "k8s.io/gengo/types"
) )
type ImportTracker struct { type ImportTracker struct {

View File

@@ -21,9 +21,9 @@ import (
"reflect" "reflect"
"strings" "strings"
"k8s.io/kubernetes/cmd/libs/go2idl/generator" "k8s.io/gengo/generator"
"k8s.io/kubernetes/cmd/libs/go2idl/namer" "k8s.io/gengo/namer"
"k8s.io/kubernetes/cmd/libs/go2idl/types" "k8s.io/gengo/types"
) )
type localNamer struct { type localNamer struct {

View File

@@ -25,8 +25,8 @@ import (
"reflect" "reflect"
"strings" "strings"
"k8s.io/kubernetes/cmd/libs/go2idl/generator" "k8s.io/gengo/generator"
"k8s.io/kubernetes/cmd/libs/go2idl/types" "k8s.io/gengo/types"
) )
func newProtobufPackage(packagePath, packageName string, generateAll bool, omitFieldTypes map[types.Name]struct{}) *protobufPackage { func newProtobufPackage(packagePath, packageName string, generateAll bool, omitFieldTypes map[types.Name]struct{}) *protobufPackage {

View File

@@ -18,7 +18,7 @@ package protobuf
import ( import (
"github.com/golang/glog" "github.com/golang/glog"
"k8s.io/kubernetes/cmd/libs/go2idl/types" "k8s.io/gengo/types"
) )
// extractBoolTagOrDie gets the comment-tags for the key and asserts that, if // extractBoolTagOrDie gets the comment-tags for the key and asserts that, if

View File

@@ -28,10 +28,10 @@ import (
"sort" "sort"
"strings" "strings"
"k8s.io/kubernetes/cmd/libs/go2idl/args" "k8s.io/gengo/args"
"k8s.io/kubernetes/cmd/libs/go2idl/generator" "k8s.io/gengo/generator"
"k8s.io/kubernetes/cmd/libs/go2idl/namer" "k8s.io/gengo/namer"
"k8s.io/kubernetes/cmd/libs/go2idl/types" "k8s.io/gengo/types"
"github.com/golang/glog" "github.com/golang/glog"
) )

View File

@@ -58,7 +58,7 @@ package main
import ( import (
"os" "os"
"k8s.io/kubernetes/cmd/libs/go2idl/args" "k8s.io/gengo/args"
"k8s.io/kubernetes/cmd/libs/go2idl/import-boss/generators" "k8s.io/kubernetes/cmd/libs/go2idl/import-boss/generators"
"github.com/golang/glog" "github.com/golang/glog"

View File

@@ -20,10 +20,10 @@ package generators
import ( import (
"io" "io"
"k8s.io/kubernetes/cmd/libs/go2idl/args" "k8s.io/gengo/args"
"k8s.io/kubernetes/cmd/libs/go2idl/generator" "k8s.io/gengo/generator"
"k8s.io/kubernetes/cmd/libs/go2idl/namer" "k8s.io/gengo/namer"
"k8s.io/kubernetes/cmd/libs/go2idl/types" "k8s.io/gengo/types"
"github.com/golang/glog" "github.com/golang/glog"
) )

View File

@@ -18,7 +18,7 @@ package generators
import ( import (
"github.com/golang/glog" "github.com/golang/glog"
"k8s.io/kubernetes/cmd/libs/go2idl/types" "k8s.io/gengo/types"
) )
// extractBoolTagOrDie gets the comment-tags for the key and asserts that, if // extractBoolTagOrDie gets the comment-tags for the key and asserts that, if

View File

@@ -27,7 +27,7 @@ package main
import ( import (
"os" "os"
"k8s.io/kubernetes/cmd/libs/go2idl/args" "k8s.io/gengo/args"
"k8s.io/kubernetes/cmd/libs/go2idl/set-gen/generators" "k8s.io/kubernetes/cmd/libs/go2idl/set-gen/generators"
"github.com/golang/glog" "github.com/golang/glog"