rewrite go imports

This commit is contained in:
Mike Danese
2015-08-05 15:03:47 -07:00
parent 9a3fb3cb1f
commit 8e33cbfa28
844 changed files with 3659 additions and 3659 deletions

View File

@@ -17,7 +17,7 @@ limitations under the License.
package runtime
import (
"github.com/GoogleCloudPlatform/kubernetes/pkg/util/yaml"
"k8s.io/kubernetes/pkg/util/yaml"
)
// CodecFor returns a Codec that invokes Encode with the provided version.

View File

@@ -23,7 +23,7 @@ import (
"strconv"
"strings"
"github.com/GoogleCloudPlatform/kubernetes/pkg/conversion"
"k8s.io/kubernetes/pkg/conversion"
)
// JSONKeyMapper uses the struct tags on a conversion to determine the key value for

View File

@@ -26,17 +26,17 @@ import (
"path"
"testing"
"github.com/GoogleCloudPlatform/kubernetes/pkg/api"
"github.com/GoogleCloudPlatform/kubernetes/pkg/api/testapi"
_ "github.com/GoogleCloudPlatform/kubernetes/pkg/api/v1"
"github.com/GoogleCloudPlatform/kubernetes/pkg/runtime"
"github.com/GoogleCloudPlatform/kubernetes/pkg/util"
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/testapi"
_ "k8s.io/kubernetes/pkg/api/v1"
"k8s.io/kubernetes/pkg/runtime"
"k8s.io/kubernetes/pkg/util"
)
func generateConversions(t *testing.T, version string) bytes.Buffer {
g := runtime.NewConversionGenerator(api.Scheme.Raw(), path.Join("github.com/GoogleCloudPlatform/kubernetes/pkg/api", version))
apiShort := g.AddImport("github.com/GoogleCloudPlatform/kubernetes/pkg/api")
g.AddImport("github.com/GoogleCloudPlatform/kubernetes/pkg/api/resource")
g := runtime.NewConversionGenerator(api.Scheme.Raw(), path.Join("k8s.io/kubernetes/pkg/api", version))
apiShort := g.AddImport("k8s.io/kubernetes/pkg/api")
g.AddImport("k8s.io/kubernetes/pkg/api/resource")
// TODO(wojtek-t): Change the overwrites to a flag.
g.OverwritePackage(version, "")
for _, knownType := range api.Scheme.KnownTypes(version) {

View File

@@ -24,8 +24,8 @@ import (
"sort"
"strings"
"github.com/GoogleCloudPlatform/kubernetes/pkg/conversion"
"github.com/GoogleCloudPlatform/kubernetes/pkg/util"
"k8s.io/kubernetes/pkg/conversion"
"k8s.io/kubernetes/pkg/util"
)
type ConversionGenerator interface {
@@ -50,7 +50,7 @@ func NewConversionGenerator(scheme *conversion.Scheme, targetPkg string) Convers
}
g.targetPackage(targetPkg)
g.AddImport("reflect")
g.AddImport("github.com/GoogleCloudPlatform/kubernetes/pkg/conversion")
g.AddImport("k8s.io/kubernetes/pkg/conversion")
return g
}

View File

@@ -20,7 +20,7 @@ import (
"reflect"
"testing"
"github.com/GoogleCloudPlatform/kubernetes/pkg/runtime"
"k8s.io/kubernetes/pkg/runtime"
)
type InternalComplex struct {

View File

@@ -25,11 +25,11 @@ import (
"path"
"testing"
"github.com/GoogleCloudPlatform/kubernetes/pkg/api"
"github.com/GoogleCloudPlatform/kubernetes/pkg/api/testapi"
_ "github.com/GoogleCloudPlatform/kubernetes/pkg/api/v1"
"github.com/GoogleCloudPlatform/kubernetes/pkg/runtime"
"github.com/GoogleCloudPlatform/kubernetes/pkg/util"
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/testapi"
_ "k8s.io/kubernetes/pkg/api/v1"
"k8s.io/kubernetes/pkg/runtime"
"k8s.io/kubernetes/pkg/util"
"github.com/golang/glog"
)
@@ -42,8 +42,8 @@ func generateDeepCopies(t *testing.T, version string) bytes.Buffer {
registerTo = "Scheme"
}
g := runtime.NewDeepCopyGenerator(api.Scheme.Raw(), path.Join("github.com/GoogleCloudPlatform/kubernetes/pkg/api", testedVersion), util.NewStringSet("github.com/GoogleCloudPlatform/kubernetes"))
g.AddImport("github.com/GoogleCloudPlatform/kubernetes/pkg/api")
g := runtime.NewDeepCopyGenerator(api.Scheme.Raw(), path.Join("k8s.io/kubernetes/pkg/api", testedVersion), util.NewStringSet("k8s.io/kubernetes"))
g.AddImport("k8s.io/kubernetes/pkg/api")
g.OverwritePackage(version, "")
for _, knownType := range api.Scheme.KnownTypes(testedVersion) {

View File

@@ -24,8 +24,8 @@ import (
"sort"
"strings"
"github.com/GoogleCloudPlatform/kubernetes/pkg/conversion"
"github.com/GoogleCloudPlatform/kubernetes/pkg/util"
"k8s.io/kubernetes/pkg/conversion"
"k8s.io/kubernetes/pkg/util"
)
// TODO(wojtek-t): As suggested in #8320, we should consider the strategy
@@ -81,7 +81,7 @@ func NewDeepCopyGenerator(scheme *conversion.Scheme, targetPkg string, include u
include: include,
}
g.targetPackage(targetPkg)
g.AddImport("github.com/GoogleCloudPlatform/kubernetes/pkg/conversion")
g.AddImport("k8s.io/kubernetes/pkg/conversion")
return g
}

View File

@@ -21,9 +21,9 @@ import (
"reflect"
"testing"
"github.com/GoogleCloudPlatform/kubernetes/pkg/api"
"github.com/GoogleCloudPlatform/kubernetes/pkg/runtime"
"github.com/GoogleCloudPlatform/kubernetes/pkg/util"
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/runtime"
"k8s.io/kubernetes/pkg/util"
)
type EmbeddedTest struct {

View File

@@ -17,7 +17,7 @@ limitations under the License.
package runtime
import (
"github.com/GoogleCloudPlatform/kubernetes/pkg/conversion"
"k8s.io/kubernetes/pkg/conversion"
)
// IsNotRegisteredError returns true if the error indicates the provided

View File

@@ -20,7 +20,7 @@ import (
"encoding/json"
"testing"
"github.com/GoogleCloudPlatform/kubernetes/pkg/runtime"
"k8s.io/kubernetes/pkg/runtime"
)
func TestEmbeddedRawExtensionMarshal(t *testing.T) {

View File

@@ -20,7 +20,7 @@ import (
"fmt"
"reflect"
"github.com/GoogleCloudPlatform/kubernetes/pkg/conversion"
"k8s.io/kubernetes/pkg/conversion"
)
// IsListType returns true if the provided Object has a slice called Items

View File

@@ -20,10 +20,10 @@ import (
"reflect"
"testing"
"github.com/GoogleCloudPlatform/kubernetes/pkg/api"
"github.com/GoogleCloudPlatform/kubernetes/pkg/api/testapi"
"github.com/GoogleCloudPlatform/kubernetes/pkg/runtime"
"github.com/GoogleCloudPlatform/kubernetes/pkg/util"
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/testapi"
"k8s.io/kubernetes/pkg/runtime"
"k8s.io/kubernetes/pkg/util"
"github.com/google/gofuzz"
)

View File

@@ -22,7 +22,7 @@ import (
"net/url"
"reflect"
"github.com/GoogleCloudPlatform/kubernetes/pkg/conversion"
"k8s.io/kubernetes/pkg/conversion"
)
// Scheme defines methods for serializing and deserializing API objects. It

View File

@@ -20,8 +20,8 @@ import (
"reflect"
"testing"
"github.com/GoogleCloudPlatform/kubernetes/pkg/conversion"
"github.com/GoogleCloudPlatform/kubernetes/pkg/runtime"
"k8s.io/kubernetes/pkg/conversion"
"k8s.io/kubernetes/pkg/runtime"
)
type TypeMeta struct {

View File

@@ -21,7 +21,7 @@ import (
"fmt"
"reflect"
"github.com/GoogleCloudPlatform/kubernetes/pkg/conversion"
"k8s.io/kubernetes/pkg/conversion"
)
// UnstructuredJSONScheme is capable of converting JSON data into the Unstructured

View File

@@ -20,9 +20,9 @@ import (
"fmt"
"testing"
"github.com/GoogleCloudPlatform/kubernetes/pkg/api"
"github.com/GoogleCloudPlatform/kubernetes/pkg/api/testapi"
"github.com/GoogleCloudPlatform/kubernetes/pkg/runtime"
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/testapi"
"k8s.io/kubernetes/pkg/runtime"
)
func TestDecodeUnstructured(t *testing.T) {