Skip to content

Commit 72138cf

Browse files
lavalamplavalamp
committed
update import paths
1 parent 073b146 commit 72138cf

34 files changed

+69
-69
lines changed

‎args/args.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@ import (
2727
"strings"
2828
"time"
2929

30-
"k8s.io/kubernetes/cmd/libs/go2idl/generator"
31-
"k8s.io/kubernetes/cmd/libs/go2idl/namer"
32-
"k8s.io/kubernetes/cmd/libs/go2idl/parser"
33-
"k8s.io/kubernetes/cmd/libs/go2idl/types"
30+
"k8s.io/gengo/generator"
31+
"k8s.io/gengo/namer"
32+
"k8s.io/gengo/parser"
33+
"k8s.io/gengo/types"
3434
utilflag "k8s.io/kubernetes/pkg/util/flag"
3535
"k8s.io/kubernetes/pkg/util/logs"
3636

‎examples/deepcopy-gen/generators/deepcopy.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ import (
2222
"path/filepath"
2323
"strings"
2424

25-
"k8s.io/kubernetes/cmd/libs/go2idl/args"
26-
"k8s.io/kubernetes/cmd/libs/go2idl/generator"
27-
"k8s.io/kubernetes/cmd/libs/go2idl/namer"
28-
"k8s.io/kubernetes/cmd/libs/go2idl/types"
25+
"k8s.io/gengo/args"
26+
"k8s.io/gengo/generator"
27+
"k8s.io/gengo/namer"
28+
"k8s.io/gengo/types"
2929
"k8s.io/kubernetes/pkg/util/sets"
3030

3131
"github.com/golang/glog"

‎examples/deepcopy-gen/generators/deepcopy_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ package generators
1919
import (
2020
"testing"
2121

22-
"k8s.io/kubernetes/cmd/libs/go2idl/types"
22+
"k8s.io/gengo/types"
2323
)
2424

2525
func Test_isRootedUnder(t *testing.T) {

‎examples/deepcopy-gen/main.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ limitations under the License.
4848
package main
4949

5050
import (
51-
"k8s.io/kubernetes/cmd/libs/go2idl/args"
52-
"k8s.io/kubernetes/cmd/libs/go2idl/deepcopy-gen/generators"
51+
"k8s.io/gengo/args"
52+
"k8s.io/gengo/examples/deepcopy-gen/generators"
5353

5454
"github.com/golang/glog"
5555
"github.com/spf13/pflag"

‎examples/go-to-protobuf/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ limitations under the License.
1919
package main
2020

2121
import (
22-
"k8s.io/kubernetes/cmd/libs/go2idl/go-to-protobuf/protobuf"
22+
"k8s.io/gengo/examples/go-to-protobuf/protobuf"
2323

2424
flag "github.com/spf13/pflag"
2525
)

‎examples/go-to-protobuf/protobuf/cmd.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@ import (
2626
"path/filepath"
2727
"strings"
2828

29-
"k8s.io/kubernetes/cmd/libs/go2idl/args"
30-
"k8s.io/kubernetes/cmd/libs/go2idl/generator"
31-
"k8s.io/kubernetes/cmd/libs/go2idl/namer"
32-
"k8s.io/kubernetes/cmd/libs/go2idl/parser"
33-
"k8s.io/kubernetes/cmd/libs/go2idl/types"
29+
"k8s.io/gengo/args"
30+
"k8s.io/gengo/generator"
31+
"k8s.io/gengo/namer"
32+
"k8s.io/gengo/parser"
33+
"k8s.io/gengo/types"
3434

3535
flag "github.com/spf13/pflag"
3636
)

‎examples/go-to-protobuf/protobuf/generator.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ import (
2727

2828
"github.com/golang/glog"
2929

30-
"k8s.io/kubernetes/cmd/libs/go2idl/generator"
31-
"k8s.io/kubernetes/cmd/libs/go2idl/namer"
32-
"k8s.io/kubernetes/cmd/libs/go2idl/types"
30+
"k8s.io/gengo/generator"
31+
"k8s.io/gengo/namer"
32+
"k8s.io/gengo/types"
3333
)
3434

3535
// genProtoIDL produces a .proto IDL.

‎examples/go-to-protobuf/protobuf/import_tracker.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ limitations under the License.
1717
package protobuf
1818

1919
import (
20-
"k8s.io/kubernetes/cmd/libs/go2idl/namer"
21-
"k8s.io/kubernetes/cmd/libs/go2idl/types"
20+
"k8s.io/gengo/namer"
21+
"k8s.io/gengo/types"
2222
)
2323

2424
type ImportTracker struct {

‎examples/go-to-protobuf/protobuf/namer.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ import (
2121
"reflect"
2222
"strings"
2323

24-
"k8s.io/kubernetes/cmd/libs/go2idl/generator"
25-
"k8s.io/kubernetes/cmd/libs/go2idl/namer"
26-
"k8s.io/kubernetes/cmd/libs/go2idl/types"
24+
"k8s.io/gengo/generator"
25+
"k8s.io/gengo/namer"
26+
"k8s.io/gengo/types"
2727
)
2828

2929
type localNamer struct {

‎examples/go-to-protobuf/protobuf/package.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ import (
2525
"reflect"
2626
"strings"
2727

28-
"k8s.io/kubernetes/cmd/libs/go2idl/generator"
29-
"k8s.io/kubernetes/cmd/libs/go2idl/types"
28+
"k8s.io/gengo/generator"
29+
"k8s.io/gengo/types"
3030
)
3131

3232
func newProtobufPackage(packagePath, packageName string, generateAll bool, omitFieldTypes map[types.Name]struct{}) *protobufPackage {

‎examples/go-to-protobuf/protobuf/tags.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ package protobuf
1818

1919
import (
2020
"github.com/golang/glog"
21-
"k8s.io/kubernetes/cmd/libs/go2idl/types"
21+
"k8s.io/gengo/types"
2222
)
2323

2424
// extractBoolTagOrDie gets the comment-tags for the key and asserts that, if

‎examples/import-boss/generators/import_restrict.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@ import (
2828
"sort"
2929
"strings"
3030

31-
"k8s.io/kubernetes/cmd/libs/go2idl/args"
32-
"k8s.io/kubernetes/cmd/libs/go2idl/generator"
33-
"k8s.io/kubernetes/cmd/libs/go2idl/namer"
34-
"k8s.io/kubernetes/cmd/libs/go2idl/types"
31+
"k8s.io/gengo/args"
32+
"k8s.io/gengo/generator"
33+
"k8s.io/gengo/namer"
34+
"k8s.io/gengo/types"
3535

3636
"github.com/golang/glog"
3737
)

‎examples/import-boss/main.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ limitations under the License.
3333
// {
3434
// "SelectorRegexp": "k8s[.]io",
3535
// "AllowedPrefixes": [
36-
// "k8s.io/kubernetes/cmd/libs/go2idl",
36+
// "k8s.io/gengo",
3737
// "k8s.io/kubernetes/third_party"
3838
// ],
3939
// "ForbiddenPrefixes": [
@@ -58,8 +58,8 @@ package main
5858
import (
5959
"os"
6060

61-
"k8s.io/kubernetes/cmd/libs/go2idl/args"
62-
"k8s.io/kubernetes/cmd/libs/go2idl/import-boss/generators"
61+
"k8s.io/gengo/args"
62+
"k8s.io/gengo/examples/import-boss/generators"
6363

6464
"github.com/golang/glog"
6565
)

‎examples/set-gen/generators/sets.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ package generators
2020
import (
2121
"io"
2222

23-
"k8s.io/kubernetes/cmd/libs/go2idl/args"
24-
"k8s.io/kubernetes/cmd/libs/go2idl/generator"
25-
"k8s.io/kubernetes/cmd/libs/go2idl/namer"
26-
"k8s.io/kubernetes/cmd/libs/go2idl/types"
23+
"k8s.io/gengo/args"
24+
"k8s.io/gengo/generator"
25+
"k8s.io/gengo/namer"
26+
"k8s.io/gengo/types"
2727

2828
"github.com/golang/glog"
2929
)

‎examples/set-gen/generators/tags.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ package generators
1818

1919
import (
2020
"github.com/golang/glog"
21-
"k8s.io/kubernetes/cmd/libs/go2idl/types"
21+
"k8s.io/gengo/types"
2222
)
2323

2424
// extractBoolTagOrDie gets the comment-tags for the key and asserts that, if

‎examples/set-gen/main.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ package main
2727
import (
2828
"os"
2929

30-
"k8s.io/kubernetes/cmd/libs/go2idl/args"
31-
"k8s.io/kubernetes/cmd/libs/go2idl/set-gen/generators"
30+
"k8s.io/gengo/args"
31+
"k8s.io/gengo/examples/set-gen/generators"
3232

3333
"github.com/golang/glog"
3434
)

‎generator/default_generator.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ package generator
1919
import (
2020
"io"
2121

22-
"k8s.io/kubernetes/cmd/libs/go2idl/namer"
23-
"k8s.io/kubernetes/cmd/libs/go2idl/types"
22+
"k8s.io/gengo/namer"
23+
"k8s.io/gengo/types"
2424
)
2525

2626
const (

‎generator/default_package.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ limitations under the License.
1717
package generator
1818

1919
import (
20-
"k8s.io/kubernetes/cmd/libs/go2idl/types"
20+
"k8s.io/gengo/types"
2121
)
2222

2323
// DefaultPackage contains a default implementation of Package.

‎generator/doc.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,4 +28,4 @@ limitations under the License.
2828
// package. Additionally, all naming systems in the Context will be added as
2929
// functions to the parsed template, so that they can be called directly from
3030
// your templates!
31-
package generator // import "k8s.io/kubernetes/cmd/libs/go2idl/generator"
31+
package generator // import "k8s.io/gengo/generator"

‎generator/execute.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ import (
2626
"path/filepath"
2727
"strings"
2828

29-
"k8s.io/kubernetes/cmd/libs/go2idl/namer"
30-
"k8s.io/kubernetes/cmd/libs/go2idl/types"
29+
"k8s.io/gengo/namer"
30+
"k8s.io/gengo/types"
3131

3232
"github.com/golang/glog"
3333
)

‎generator/generator.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ import (
2020
"bytes"
2121
"io"
2222

23-
"k8s.io/kubernetes/cmd/libs/go2idl/namer"
24-
"k8s.io/kubernetes/cmd/libs/go2idl/parser"
25-
"k8s.io/kubernetes/cmd/libs/go2idl/types"
23+
"k8s.io/gengo/namer"
24+
"k8s.io/gengo/parser"
25+
"k8s.io/gengo/types"
2626
)
2727

2828
// Package contains the contract for generating a package.

‎generator/import_tracker.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ import (
2020
"path/filepath"
2121
"strings"
2222

23-
"k8s.io/kubernetes/cmd/libs/go2idl/namer"
24-
"k8s.io/kubernetes/cmd/libs/go2idl/types"
23+
"k8s.io/gengo/namer"
24+
"k8s.io/gengo/types"
2525
)
2626

2727
func NewImportTracker(typesToAdd ...*types.Type) namer.ImportTracker {

‎generator/snippet_writer_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ import (
2121
"strings"
2222
"testing"
2323

24-
"k8s.io/kubernetes/cmd/libs/go2idl/generator"
25-
"k8s.io/kubernetes/cmd/libs/go2idl/namer"
26-
"k8s.io/kubernetes/cmd/libs/go2idl/parser"
24+
"k8s.io/gengo/generator"
25+
"k8s.io/gengo/namer"
26+
"k8s.io/gengo/parser"
2727
)
2828

2929
func construct(t *testing.T, files map[string]string) *generator.Context {

‎namer/doc.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,4 +28,4 @@ limitations under the License.
2828
//
2929
// Additionally, a "RawNamer" can optionally keep track of what needs to be
3030
// imported.
31-
package namer // import "k8s.io/kubernetes/cmd/libs/go2idl/namer"
31+
package namer // import "k8s.io/gengo/namer"

‎namer/import_tracker.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ package namer
1919
import (
2020
"sort"
2121

22-
"k8s.io/kubernetes/cmd/libs/go2idl/types"
22+
"k8s.io/gengo/types"
2323
)
2424

2525
// ImportTracker may be passed to a namer.RawNamer, to track the imports needed

‎namer/namer.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020
"path/filepath"
2121
"strings"
2222

23-
"k8s.io/kubernetes/cmd/libs/go2idl/types"
23+
"k8s.io/gengo/types"
2424
)
2525

2626
// Returns whether a name is a private Go name.

‎namer/namer_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020
"reflect"
2121
"testing"
2222

23-
"k8s.io/kubernetes/cmd/libs/go2idl/types"
23+
"k8s.io/gengo/types"
2424
)
2525

2626
func TestNameStrategy(t *testing.T) {

‎namer/order.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ package namer
1919
import (
2020
"sort"
2121

22-
"k8s.io/kubernetes/cmd/libs/go2idl/types"
22+
"k8s.io/gengo/types"
2323
)
2424

2525
// Orderer produces an ordering of types given a Namer.

‎namer/plural_namer.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ package namer
1919
import (
2020
"strings"
2121

22-
"k8s.io/kubernetes/cmd/libs/go2idl/types"
22+
"k8s.io/gengo/types"
2323
)
2424

2525
type pluralNamer struct {

‎namer/plural_namer_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ package namer
1919
import (
2020
"testing"
2121

22-
"k8s.io/kubernetes/cmd/libs/go2idl/types"
22+
"k8s.io/gengo/types"
2323
)
2424

2525
func TestPluralNamer(t *testing.T) {

‎parser/doc.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,4 @@ limitations under the License.
1616

1717
// Package parser provides code to parse go files, type-check them, extract the
1818
// types.
19-
package parser // import "k8s.io/kubernetes/cmd/libs/go2idl/parser"
19+
package parser // import "k8s.io/gengo/parser"

‎parser/parse.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ import (
3030
"strings"
3131

3232
"github.com/golang/glog"
33-
"k8s.io/kubernetes/cmd/libs/go2idl/types"
33+
"k8s.io/gengo/types"
3434
)
3535

3636
// Builder lets you add all the go files in all the packages that you care

‎parser/parse_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ import (
2323
"testing"
2424
"text/template"
2525

26-
"k8s.io/kubernetes/cmd/libs/go2idl/namer"
27-
"k8s.io/kubernetes/cmd/libs/go2idl/parser"
28-
"k8s.io/kubernetes/cmd/libs/go2idl/types"
26+
"k8s.io/gengo/namer"
27+
"k8s.io/gengo/parser"
28+
"k8s.io/gengo/types"
2929
)
3030

3131
func construct(t *testing.T, files map[string]string, testNamer namer.Namer) (*parser.Builder, types.Universe, []*types.Type) {

‎types/doc.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,4 @@ limitations under the License.
1616

1717
// Package types contains go type information, packaged in a way that makes
1818
// auto-generation convenient, whether by template or straight go functions.
19-
package types // import "k8s.io/kubernetes/cmd/libs/go2idl/types"
19+
package types // import "k8s.io/gengo/types"

0 commit comments

Comments
 (0)