fix import

Signed-off-by: Vasiliy Tolstov <v.tolstov@selfip.ru>
This commit is contained in:
Василий Толстов 2015-11-09 08:24:52 +00:00
parent 668f322607
commit d407b82968
63 changed files with 92 additions and 92 deletions

4
build
View File

@ -1,7 +1,7 @@
#!/bin/bash -ex #!/bin/bash -ex
ORG_PATH="github.com/vtolstov" ORG_PATH="github.com/coreos"
REPO_PATH="${ORG_PATH}/cloudinit" REPO_PATH="${ORG_PATH}/coreos-cloudinit"
VERSION=$(git describe --tags) VERSION=$(git describe --tags)
GLDFLAGS="-X main.version \"${VERSION}\"" GLDFLAGS="-X main.version \"${VERSION}\""

View File

@ -39,7 +39,7 @@ import (
"github.com/coreos/coreos-cloudinit/network" "github.com/coreos/coreos-cloudinit/network"
"github.com/coreos/coreos-cloudinit/pkg" "github.com/coreos/coreos-cloudinit/pkg"
"github.com/coreos/coreos-cloudinit/system" "github.com/coreos/coreos-cloudinit/system"
"github.com/vtolstov/cloudinit/datasource/metadata/openstack" "github.com/coreos/coreos-cloudinit/datasource/metadata/openstack"
) )
const ( const (

View File

@ -18,8 +18,8 @@ import (
"reflect" "reflect"
"testing" "testing"
"github.com/vtolstov/cloudinit/config" "github.com/coreos/coreos-cloudinit/config"
"github.com/vtolstov/cloudinit/datasource" "github.com/coreos/coreos-cloudinit/datasource"
) )
func TestMergeConfigs(t *testing.T) { func TestMergeConfigs(t *testing.T) {

View File

@ -21,7 +21,7 @@ import (
"reflect" "reflect"
"strings" "strings"
"github.com/vtolstov/cloudinit/config" "github.com/coreos/coreos-cloudinit/config"
) )
type rule func(config node, report *Report) type rule func(config node, report *Report)

View File

@ -21,7 +21,7 @@ import (
"strconv" "strconv"
"strings" "strings"
"github.com/vtolstov/cloudinit/config" "github.com/coreos/coreos-cloudinit/config"
yaml "gopkg.in/yaml.v2" yaml "gopkg.in/yaml.v2"
) )

View File

@ -21,7 +21,7 @@ import (
"os" "os"
"path" "path"
"github.com/vtolstov/cloudinit/datasource" "github.com/coreos/coreos-cloudinit/datasource"
) )
const ( const (

View File

@ -18,8 +18,8 @@ import (
"reflect" "reflect"
"testing" "testing"
"github.com/vtolstov/cloudinit/datasource" "github.com/coreos/coreos-cloudinit/datasource"
"github.com/vtolstov/cloudinit/datasource/test" "github.com/coreos/coreos-cloudinit/datasource/test"
) )
func TestFetchMetadata(t *testing.T) { func TestFetchMetadata(t *testing.T) {

View File

@ -18,7 +18,7 @@ import (
"io/ioutil" "io/ioutil"
"os" "os"
"github.com/vtolstov/cloudinit/datasource" "github.com/coreos/coreos-cloudinit/datasource"
) )
type localFile struct { type localFile struct {

View File

@ -19,8 +19,8 @@ import (
"net" "net"
"strconv" "strconv"
"github.com/vtolstov/cloudinit/datasource" "github.com/coreos/coreos-cloudinit/datasource"
"github.com/vtolstov/cloudinit/datasource/metadata" "github.com/coreos/coreos-cloudinit/datasource/metadata"
) )
const ( const (

View File

@ -20,10 +20,10 @@ import (
"reflect" "reflect"
"testing" "testing"
"github.com/vtolstov/cloudinit/datasource" "github.com/coreos/coreos-cloudinit/datasource"
"github.com/vtolstov/cloudinit/datasource/metadata" "github.com/coreos/coreos-cloudinit/datasource/metadata"
"github.com/vtolstov/cloudinit/datasource/metadata/test" "github.com/coreos/coreos-cloudinit/datasource/metadata/test"
"github.com/vtolstov/cloudinit/pkg" "github.com/coreos/coreos-cloudinit/pkg"
) )
func TestType(t *testing.T) { func TestType(t *testing.T) {

View File

@ -22,9 +22,9 @@ import (
"net" "net"
"strings" "strings"
"github.com/vtolstov/cloudinit/datasource" "github.com/coreos/coreos-cloudinit/datasource"
"github.com/vtolstov/cloudinit/datasource/metadata" "github.com/coreos/coreos-cloudinit/datasource/metadata"
"github.com/vtolstov/cloudinit/pkg" "github.com/coreos/coreos-cloudinit/pkg"
) )
const ( const (

View File

@ -20,10 +20,10 @@ import (
"reflect" "reflect"
"testing" "testing"
"github.com/vtolstov/cloudinit/datasource" "github.com/coreos/coreos-cloudinit/datasource"
"github.com/vtolstov/cloudinit/datasource/metadata" "github.com/coreos/coreos-cloudinit/datasource/metadata"
"github.com/vtolstov/cloudinit/datasource/metadata/test" "github.com/coreos/coreos-cloudinit/datasource/metadata/test"
"github.com/vtolstov/cloudinit/pkg" "github.com/coreos/coreos-cloudinit/pkg"
) )
func TestType(t *testing.T) { func TestType(t *testing.T) {

View File

@ -17,7 +17,7 @@ package metadata
import ( import (
"strings" "strings"
"github.com/vtolstov/cloudinit/pkg" "github.com/coreos/coreos-cloudinit/pkg"
) )
type MetadataService struct { type MetadataService struct {

View File

@ -19,8 +19,8 @@ import (
"fmt" "fmt"
"testing" "testing"
"github.com/vtolstov/cloudinit/datasource/metadata/test" "github.com/coreos/coreos-cloudinit/datasource/metadata/test"
"github.com/vtolstov/cloudinit/pkg" "github.com/coreos/coreos-cloudinit/pkg"
) )
func TestAvailabilityChanges(t *testing.T) { func TestAvailabilityChanges(t *testing.T) {

View File

@ -21,8 +21,8 @@ import (
"net" "net"
"strconv" "strconv"
"github.com/vtolstov/cloudinit/datasource" "github.com/coreos/coreos-cloudinit/datasource"
"github.com/vtolstov/cloudinit/datasource/metadata" "github.com/coreos/coreos-cloudinit/datasource/metadata"
) )
const ( const (

View File

@ -21,9 +21,9 @@ import (
"fmt" "fmt"
"testing" "testing"
"github.com/vtolstov/cloudinit/datasource/metadata" "github.com/coreos/coreos-cloudinit/datasource/metadata"
"github.com/vtolstov/cloudinit/datasource/metadata/test" "github.com/coreos/coreos-cloudinit/datasource/metadata/test"
"github.com/vtolstov/cloudinit/pkg" "github.com/coreos/coreos-cloudinit/pkg"
) )
func TestType(t *testing.T) { func TestType(t *testing.T) {

View File

@ -17,7 +17,7 @@ package test
import ( import (
"fmt" "fmt"
"github.com/vtolstov/cloudinit/pkg" "github.com/coreos/coreos-cloudinit/pkg"
) )
type HttpClient struct { type HttpClient struct {

View File

@ -20,8 +20,8 @@ import (
"log" "log"
"strings" "strings"
"github.com/vtolstov/cloudinit/datasource" "github.com/coreos/coreos-cloudinit/datasource"
"github.com/vtolstov/cloudinit/pkg" "github.com/coreos/coreos-cloudinit/pkg"
) )
const ( const (

View File

@ -15,8 +15,8 @@
package url package url
import ( import (
"github.com/vtolstov/cloudinit/datasource" "github.com/coreos/coreos-cloudinit/datasource"
"github.com/vtolstov/cloudinit/pkg" "github.com/coreos/coreos-cloudinit/pkg"
) )
type remoteFile struct { type remoteFile struct {

View File

@ -22,7 +22,7 @@ import (
"os" "os"
"path" "path"
"github.com/vtolstov/cloudinit/datasource" "github.com/coreos/coreos-cloudinit/datasource"
) )
type waagent struct { type waagent struct {

View File

@ -19,8 +19,8 @@ import (
"reflect" "reflect"
"testing" "testing"
"github.com/vtolstov/cloudinit/datasource" "github.com/coreos/coreos-cloudinit/datasource"
"github.com/vtolstov/cloudinit/datasource/test" "github.com/coreos/coreos-cloudinit/datasource/test"
) )
func TestFetchMetadata(t *testing.T) { func TestFetchMetadata(t *testing.T) {

View File

@ -23,9 +23,9 @@ import (
"path" "path"
"strings" "strings"
"github.com/vtolstov/cloudinit/config" "github.com/coreos/coreos-cloudinit/config"
"github.com/vtolstov/cloudinit/network" "github.com/coreos/coreos-cloudinit/network"
"github.com/vtolstov/cloudinit/system" "github.com/coreos/coreos-cloudinit/system"
) )
// CloudConfigFile represents a CoreOS specific configuration option that can generate // CloudConfigFile represents a CoreOS specific configuration option that can generate

View File

@ -18,9 +18,9 @@ import (
"reflect" "reflect"
"testing" "testing"
"github.com/vtolstov/cloudinit/config" "github.com/coreos/coreos-cloudinit/config"
"github.com/vtolstov/cloudinit/network" "github.com/coreos/coreos-cloudinit/network"
"github.com/vtolstov/cloudinit/system" "github.com/coreos/coreos-cloudinit/system"
) )
type TestUnitManager struct { type TestUnitManager struct {

View File

@ -21,9 +21,9 @@ import (
"regexp" "regexp"
"strings" "strings"
"github.com/vtolstov/cloudinit/config" "github.com/coreos/coreos-cloudinit/config"
"github.com/vtolstov/cloudinit/datasource" "github.com/coreos/coreos-cloudinit/datasource"
"github.com/vtolstov/cloudinit/system" "github.com/coreos/coreos-cloudinit/system"
) )
const DefaultSSHKeyName = "coreos-cloudinit" const DefaultSSHKeyName = "coreos-cloudinit"

View File

@ -21,8 +21,8 @@ import (
"path" "path"
"testing" "testing"
"github.com/vtolstov/cloudinit/datasource" "github.com/coreos/coreos-cloudinit/datasource"
"github.com/vtolstov/cloudinit/system" "github.com/coreos/coreos-cloudinit/system"
) )
func TestEnvironmentApply(t *testing.T) { func TestEnvironmentApply(t *testing.T) {

View File

@ -17,7 +17,7 @@ package initialize
import ( import (
"fmt" "fmt"
"github.com/vtolstov/cloudinit/system" "github.com/coreos/coreos-cloudinit/system"
) )
func SSHImportGithubUser(system_user string, github_user string) error { func SSHImportGithubUser(system_user string, github_user string) error {

View File

@ -18,8 +18,8 @@ import (
"encoding/json" "encoding/json"
"fmt" "fmt"
"github.com/vtolstov/cloudinit/pkg" "github.com/coreos/coreos-cloudinit/pkg"
"github.com/vtolstov/cloudinit/system" "github.com/coreos/coreos-cloudinit/system"
) )
type UserKey struct { type UserKey struct {

View File

@ -18,7 +18,7 @@ import (
"errors" "errors"
"log" "log"
"github.com/vtolstov/cloudinit/config" "github.com/coreos/coreos-cloudinit/config"
) )
var ( var (

View File

@ -17,7 +17,7 @@ package initialize
import ( import (
"testing" "testing"
"github.com/vtolstov/cloudinit/config" "github.com/coreos/coreos-cloudinit/config"
) )
func TestParseHeaderCRLF(t *testing.T) { func TestParseHeaderCRLF(t *testing.T) {

View File

@ -19,8 +19,8 @@ import (
"path" "path"
"strings" "strings"
"github.com/vtolstov/cloudinit/config" "github.com/coreos/coreos-cloudinit/config"
"github.com/vtolstov/cloudinit/system" "github.com/coreos/coreos-cloudinit/system"
) )
func PrepWorkspace(workspace string) error { func PrepWorkspace(workspace string) error {

View File

@ -19,7 +19,7 @@ import (
"log" "log"
"net" "net"
"github.com/vtolstov/cloudinit/datasource/metadata/digitalocean" "github.com/coreos/coreos-cloudinit/datasource/metadata/digitalocean"
) )
func ProcessDigitalOceanNetconf(config digitalocean.Metadata) ([]InterfaceGenerator, error) { func ProcessDigitalOceanNetconf(config digitalocean.Metadata) ([]InterfaceGenerator, error) {

View File

@ -20,7 +20,7 @@ import (
"reflect" "reflect"
"testing" "testing"
"github.com/vtolstov/cloudinit/datasource/metadata/digitalocean" "github.com/coreos/coreos-cloudinit/datasource/metadata/digitalocean"
) )
func TestParseNameservers(t *testing.T) { func TestParseNameservers(t *testing.T) {

View File

@ -18,7 +18,7 @@ import (
"fmt" "fmt"
"reflect" "reflect"
"github.com/vtolstov/cloudinit/config" "github.com/coreos/coreos-cloudinit/config"
) )
// serviceContents generates the contents for a drop-in unit given the config. // serviceContents generates the contents for a drop-in unit given the config.

View File

@ -22,7 +22,7 @@ import (
"syscall" "syscall"
"testing" "testing"
"github.com/vtolstov/cloudinit/config" "github.com/coreos/coreos-cloudinit/config"
) )
const ( const (

View File

@ -20,7 +20,7 @@ import (
"os" "os"
"path" "path"
"github.com/vtolstov/cloudinit/config" "github.com/coreos/coreos-cloudinit/config"
) )
const DefaultIpv4Address = "127.0.0.1" const DefaultIpv4Address = "127.0.0.1"

View File

@ -20,7 +20,7 @@ import (
"reflect" "reflect"
"testing" "testing"
"github.com/vtolstov/cloudinit/config" "github.com/coreos/coreos-cloudinit/config"
) )
func TestEtcdHostsFile(t *testing.T) { func TestEtcdHostsFile(t *testing.T) {

View File

@ -15,7 +15,7 @@
package system package system
import ( import (
"github.com/vtolstov/cloudinit/config" "github.com/coreos/coreos-cloudinit/config"
) )
// Etcd is a top-level structure which embeds its underlying configuration, // Etcd is a top-level structure which embeds its underlying configuration,

View File

@ -18,7 +18,7 @@ import (
"reflect" "reflect"
"testing" "testing"
"github.com/vtolstov/cloudinit/config" "github.com/coreos/coreos-cloudinit/config"
) )
func TestEtcdUnits(t *testing.T) { func TestEtcdUnits(t *testing.T) {

View File

@ -23,7 +23,7 @@ import (
"path" "path"
"strconv" "strconv"
"github.com/vtolstov/cloudinit/config" "github.com/coreos/coreos-cloudinit/config"
) )
// File is a top-level structure which embeds its underlying configuration, // File is a top-level structure which embeds its underlying configuration,

View File

@ -20,7 +20,7 @@ import (
"path" "path"
"testing" "testing"
"github.com/vtolstov/cloudinit/config" "github.com/coreos/coreos-cloudinit/config"
) )
func TestWriteFileUnencodedContent(t *testing.T) { func TestWriteFileUnencodedContent(t *testing.T) {

View File

@ -18,7 +18,7 @@ import (
"path" "path"
"strings" "strings"
"github.com/vtolstov/cloudinit/config" "github.com/coreos/coreos-cloudinit/config"
) )
// flannel is a top-level structure which embeds its underlying configuration, // flannel is a top-level structure which embeds its underlying configuration,

View File

@ -18,7 +18,7 @@ import (
"reflect" "reflect"
"testing" "testing"
"github.com/vtolstov/cloudinit/config" "github.com/coreos/coreos-cloudinit/config"
) )
func TestFlannelEnvVars(t *testing.T) { func TestFlannelEnvVars(t *testing.T) {

View File

@ -15,7 +15,7 @@
package system package system
import ( import (
"github.com/vtolstov/cloudinit/config" "github.com/coreos/coreos-cloudinit/config"
) )
// Fleet is a top-level structure which embeds its underlying configuration, // Fleet is a top-level structure which embeds its underlying configuration,

View File

@ -18,7 +18,7 @@ import (
"reflect" "reflect"
"testing" "testing"
"github.com/vtolstov/cloudinit/config" "github.com/coreos/coreos-cloudinit/config"
) )
func TestFleetUnits(t *testing.T) { func TestFleetUnits(t *testing.T) {

View File

@ -15,7 +15,7 @@
package system package system
import ( import (
"github.com/vtolstov/cloudinit/config" "github.com/coreos/coreos-cloudinit/config"
) )
// Locksmith is a top-level structure which embeds its underlying configuration, // Locksmith is a top-level structure which embeds its underlying configuration,

View File

@ -18,7 +18,7 @@ import (
"reflect" "reflect"
"testing" "testing"
"github.com/vtolstov/cloudinit/config" "github.com/coreos/coreos-cloudinit/config"
) )
func TestLocksmithUnits(t *testing.T) { func TestLocksmithUnits(t *testing.T) {

View File

@ -14,7 +14,7 @@
package system package system
import "github.com/vtolstov/cloudinit/network" import "github.com/coreos/coreos-cloudinit/network"
func RestartNetwork(interfaces []network.InterfaceGenerator) (err error) { func RestartNetwork(interfaces []network.InterfaceGenerator) (err error) {
return nil return nil

View File

@ -21,8 +21,8 @@ import (
"strings" "strings"
"github.com/vishvananda/netlink" "github.com/vishvananda/netlink"
"github.com/vtolstov/cloudinit/config" "github.com/coreos/coreos-cloudinit/config"
"github.com/vtolstov/cloudinit/network" "github.com/coreos/coreos-cloudinit/network"
) )
func RestartNetwork(interfaces []network.InterfaceGenerator) (err error) { func RestartNetwork(interfaces []network.InterfaceGenerator) (err error) {

View File

@ -14,7 +14,7 @@
package system package system
import "github.com/vtolstov/cloudinit/network" import "github.com/coreos/coreos-cloudinit/network"
func RestartNetwork(interfaces []network.InterfaceGenerator) (err error) { func RestartNetwork(interfaces []network.InterfaceGenerator) (err error) {
return nil return nil

View File

@ -14,7 +14,7 @@
package system package system
import "github.com/vtolstov/cloudinit/network" import "github.com/coreos/coreos-cloudinit/network"
func RestartNetwork(interfaces []network.InterfaceGenerator) (err error) { func RestartNetwork(interfaces []network.InterfaceGenerator) (err error) {
return nil return nil

View File

@ -18,7 +18,7 @@ import (
"fmt" "fmt"
"path" "path"
"github.com/vtolstov/cloudinit/config" "github.com/coreos/coreos-cloudinit/config"
) )
// OEM is a top-level structure which embeds its underlying configuration, // OEM is a top-level structure which embeds its underlying configuration,

View File

@ -18,7 +18,7 @@ import (
"reflect" "reflect"
"testing" "testing"
"github.com/vtolstov/cloudinit/config" "github.com/coreos/coreos-cloudinit/config"
) )
func TestOEMFile(t *testing.T) { func TestOEMFile(t *testing.T) {

View File

@ -22,7 +22,7 @@ import (
"path" "path"
"strings" "strings"
"github.com/vtolstov/cloudinit/config" "github.com/coreos/coreos-cloudinit/config"
) )
func NewUnitManager(root string) UnitManager { func NewUnitManager(root string) UnitManager {

View File

@ -21,7 +21,7 @@ import (
"path" "path"
"testing" "testing"
"github.com/vtolstov/cloudinit/config" "github.com/coreos/coreos-cloudinit/config"
) )
func TestPlaceUnit(t *testing.T) { func TestPlaceUnit(t *testing.T) {

View File

@ -20,7 +20,7 @@ import (
"path/filepath" "path/filepath"
"strings" "strings"
"github.com/vtolstov/cloudinit/config" "github.com/coreos/coreos-cloudinit/config"
) )
type UnitManager interface { type UnitManager interface {

View File

@ -17,7 +17,7 @@ package system
import ( import (
"testing" "testing"
"github.com/vtolstov/cloudinit/config" "github.com/coreos/coreos-cloudinit/config"
) )
func TestType(t *testing.T) { func TestType(t *testing.T) {

View File

@ -24,7 +24,7 @@ import (
"sort" "sort"
"strings" "strings"
"github.com/vtolstov/cloudinit/config" "github.com/coreos/coreos-cloudinit/config"
) )
const ( const (

View File

@ -20,7 +20,7 @@ import (
"strings" "strings"
"testing" "testing"
"github.com/vtolstov/cloudinit/config" "github.com/coreos/coreos-cloudinit/config"
) )
func testReadConfig(config string) func() (io.Reader, error) { func testReadConfig(config string) func() (io.Reader, error) {

View File

@ -18,7 +18,7 @@ import (
"os/exec" "os/exec"
"strings" "strings"
"github.com/vtolstov/cloudinit/config" "github.com/coreos/coreos-cloudinit/config"
) )
func UserHome(name string) (string, error) { func UserHome(name string) (string, error) {

View File

@ -20,7 +20,7 @@ import (
"os/exec" "os/exec"
"strings" "strings"
"github.com/vtolstov/cloudinit/config" "github.com/coreos/coreos-cloudinit/config"
) )
func CreateUser(u *config.User) error { func CreateUser(u *config.User) error {

View File

@ -20,7 +20,7 @@ import (
"os/exec" "os/exec"
"strings" "strings"
"github.com/vtolstov/cloudinit/config" "github.com/coreos/coreos-cloudinit/config"
) )
func CreateUser(u *config.User) error { func CreateUser(u *config.User) error {

View File

@ -20,7 +20,7 @@ import (
"os/exec" "os/exec"
"strings" "strings"
"github.com/vtolstov/cloudinit/config" "github.com/coreos/coreos-cloudinit/config"
) )
func CreateUser(u *config.User) error { func CreateUser(u *config.User) error {

View File

@ -20,7 +20,7 @@ import (
"os/exec" "os/exec"
"strings" "strings"
"github.com/vtolstov/cloudinit/config" "github.com/coreos/coreos-cloudinit/config"
) )
func CreateUser(u *config.User) error { func CreateUser(u *config.User) error {