Skip to content

Commit

Permalink
Use new code.cloudfoundry.org import paths
Browse files Browse the repository at this point in the history
[#124914691]

Signed-off-by: Claudia Beresford <cberesford@pivotal.io>
  • Loading branch information
glestaris authored and Callisto13 committed Jul 14, 2016
1 parent 1a4e853 commit b56fce9
Show file tree
Hide file tree
Showing 212 changed files with 406 additions and 406 deletions.
4 changes: 2 additions & 2 deletions README.md
Expand Up @@ -5,12 +5,12 @@ A simple single-host OCI container manager.
## Developing and Deploying Guardian

For details on how to get started with developing or deploying Guardian please check out the
[Guardian Release repo](https://github.com/cloudfoundry-incubator/guardian-release/blob/master/README.md)
[Guardian Release repo](https://github.com/cloudfoundry/guardian-release/blob/master/README.md)

## Components

- **Gardeners Question Time (GQT):** A venerable British radio programme. And also a test suite.
- **Gardener:** Orchestrates the other components. Implements the Cloud Foundry Garden API.
- **[Garden Shed](http://github.com/cloudfoundry-incubator/garden-shed):** RootFS and volume management. Where stuff is kept in the garden.
- **[Garden Shed](http://github.com/cloudfoundry/garden-shed):** RootFS and volume management. Where stuff is kept in the garden.
- **RunDMC:** A tiny wrappper around RunC to manage a collection of RunC containers.
- **Kawasaki:** It's an amazing networker.
6 changes: 3 additions & 3 deletions cmd/dadoo/dadoo_linux_test.go
Expand Up @@ -12,10 +12,10 @@ import (
"syscall"
"time"

"code.cloudfoundry.org/garden"
"code.cloudfoundry.org/guardian/rundmc"
"code.cloudfoundry.org/guardian/rundmc/goci"
"code.cloudfoundry.org/lager/lagertest"
"github.com/cloudfoundry-incubator/garden"
"github.com/cloudfoundry-incubator/guardian/rundmc"
"github.com/cloudfoundry-incubator/guardian/rundmc/goci"
"github.com/cloudfoundry/gunk/command_runner/linux_command_runner"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
Expand Down
2 changes: 1 addition & 1 deletion cmd/dadoo/dadoo_suite_test.go
Expand Up @@ -25,7 +25,7 @@ func TestDadoo(t *testing.T) {
return nil
}

bins["dadoo_bin_path"], err = gexec.Build("github.com/cloudfoundry-incubator/guardian/cmd/dadoo")
bins["dadoo_bin_path"], err = gexec.Build("code.cloudfoundry.org/guardian/cmd/dadoo")
Expect(err).NotTo(HaveOccurred())

data, err := json.Marshal(bins)
Expand Down
4 changes: 2 additions & 2 deletions cmd/dadoo/main_linux.go
Expand Up @@ -14,8 +14,8 @@ import (
"syscall"
"time"

"github.com/cloudfoundry-incubator/garden"
"github.com/cloudfoundry-incubator/guardian/rundmc/dadoo"
"code.cloudfoundry.org/garden"
"code.cloudfoundry.org/guardian/rundmc/dadoo"
"github.com/eapache/go-resiliency/retrier"
"github.com/kr/pty"
"github.com/opencontainers/runc/libcontainer/system"
Expand Down
2 changes: 1 addition & 1 deletion cmd/guardian/main.go
Expand Up @@ -4,7 +4,7 @@ import (
"fmt"
"os"

"github.com/cloudfoundry-incubator/guardian/guardiancmd"
"code.cloudfoundry.org/guardian/guardiancmd"
"github.com/jessevdk/go-flags"
)

Expand Down
2 changes: 1 addition & 1 deletion cmd/the-secret-garden/the_secret_garden_suite_test.go
Expand Up @@ -26,7 +26,7 @@ func TestThesecretGarden(t *testing.T) {
return nil
}

bins["the_secret_garden"], err = gexec.Build("github.com/cloudfoundry-incubator/guardian/cmd/the-secret-garden")
bins["the_secret_garden"], err = gexec.Build("code.cloudfoundry.org/guardian/cmd/the-secret-garden")
Expect(err).NotTo(HaveOccurred())

data, err := json.Marshal(bins)
Expand Down
2 changes: 1 addition & 1 deletion gardener/container.go
Expand Up @@ -6,8 +6,8 @@ import (
"io"
"time"

"code.cloudfoundry.org/garden"
"code.cloudfoundry.org/lager"
"github.com/cloudfoundry-incubator/garden"
)

type container struct {
Expand Down
4 changes: 2 additions & 2 deletions gardener/gardener.go
Expand Up @@ -6,9 +6,9 @@ import (
"net/url"
"time"

"code.cloudfoundry.org/garden"
"code.cloudfoundry.org/garden-shed/rootfs_provider"
"code.cloudfoundry.org/lager"
"github.com/cloudfoundry-incubator/garden"
"github.com/cloudfoundry-incubator/garden-shed/rootfs_provider"
)

//go:generate counterfeiter . SysInfoProvider
Expand Down
8 changes: 4 additions & 4 deletions gardener/gardener_test.go
Expand Up @@ -6,12 +6,12 @@ import (
"net"
"time"

"code.cloudfoundry.org/garden"
"code.cloudfoundry.org/garden-shed/rootfs_provider"
"code.cloudfoundry.org/guardian/gardener"
fakes "code.cloudfoundry.org/guardian/gardener/gardenerfakes"
"code.cloudfoundry.org/lager"
"code.cloudfoundry.org/lager/lagertest"
"github.com/cloudfoundry-incubator/garden"
"github.com/cloudfoundry-incubator/garden-shed/rootfs_provider"
"github.com/cloudfoundry-incubator/guardian/gardener"
fakes "github.com/cloudfoundry-incubator/guardian/gardener/gardenerfakes"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
"github.com/onsi/gomega/gbytes"
Expand Down
4 changes: 2 additions & 2 deletions gardener/gardenerfakes/fake_containerizer.go
Expand Up @@ -5,9 +5,9 @@ import (
"io"
"sync"

"code.cloudfoundry.org/garden"
"code.cloudfoundry.org/guardian/gardener"
"code.cloudfoundry.org/lager"
"github.com/cloudfoundry-incubator/garden"
"github.com/cloudfoundry-incubator/guardian/gardener"
)

type FakeContainerizer struct {
Expand Down
4 changes: 2 additions & 2 deletions gardener/gardenerfakes/fake_networker.go
Expand Up @@ -4,9 +4,9 @@ package gardenerfakes
import (
"sync"

"code.cloudfoundry.org/garden"
"code.cloudfoundry.org/guardian/gardener"
"code.cloudfoundry.org/lager"
"github.com/cloudfoundry-incubator/garden"
"github.com/cloudfoundry-incubator/guardian/gardener"
)

type FakeNetworker struct {
Expand Down
4 changes: 2 additions & 2 deletions gardener/gardenerfakes/fake_property_manager.go
Expand Up @@ -4,8 +4,8 @@ package gardenerfakes
import (
"sync"

"github.com/cloudfoundry-incubator/garden"
"github.com/cloudfoundry-incubator/guardian/gardener"
"code.cloudfoundry.org/garden"
"code.cloudfoundry.org/guardian/gardener"
)

type FakePropertyManager struct {
Expand Down
2 changes: 1 addition & 1 deletion gardener/gardenerfakes/fake_restorer.go
Expand Up @@ -4,8 +4,8 @@ package gardenerfakes
import (
"sync"

"code.cloudfoundry.org/guardian/gardener"
"code.cloudfoundry.org/lager"
"github.com/cloudfoundry-incubator/guardian/gardener"
)

type FakeRestorer struct {
Expand Down
2 changes: 1 addition & 1 deletion gardener/gardenerfakes/fake_starter.go
Expand Up @@ -4,7 +4,7 @@ package gardenerfakes
import (
"sync"

"github.com/cloudfoundry-incubator/guardian/gardener"
"code.cloudfoundry.org/guardian/gardener"
)

type FakeStarter struct {
Expand Down
2 changes: 1 addition & 1 deletion gardener/gardenerfakes/fake_sys_info_provider.go
Expand Up @@ -4,7 +4,7 @@ package gardenerfakes
import (
"sync"

"github.com/cloudfoundry-incubator/guardian/gardener"
"code.cloudfoundry.org/guardian/gardener"
)

type FakeSysInfoProvider struct {
Expand Down
2 changes: 1 addition & 1 deletion gardener/gardenerfakes/fake_uid_generator.go
Expand Up @@ -4,7 +4,7 @@ package gardenerfakes
import (
"sync"

"github.com/cloudfoundry-incubator/guardian/gardener"
"code.cloudfoundry.org/guardian/gardener"
)

type FakeUidGenerator struct {
Expand Down
6 changes: 3 additions & 3 deletions gardener/gardenerfakes/fake_volume_creator.go
Expand Up @@ -4,10 +4,10 @@ package gardenerfakes
import (
"sync"

"code.cloudfoundry.org/garden"
"code.cloudfoundry.org/garden-shed/rootfs_provider"
"code.cloudfoundry.org/guardian/gardener"
"code.cloudfoundry.org/lager"
"github.com/cloudfoundry-incubator/garden"
"github.com/cloudfoundry-incubator/garden-shed/rootfs_provider"
"github.com/cloudfoundry-incubator/guardian/gardener"
)

type FakeVolumeCreator struct {
Expand Down
2 changes: 1 addition & 1 deletion gardener/noop_restorer_test.go
@@ -1,7 +1,7 @@
package gardener_test

import (
"github.com/cloudfoundry-incubator/guardian/gardener"
"code.cloudfoundry.org/guardian/gardener"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
)
Expand Down
4 changes: 2 additions & 2 deletions gardener/noop_volume_creator.go
Expand Up @@ -3,9 +3,9 @@ package gardener
import (
"errors"

"code.cloudfoundry.org/garden"
"code.cloudfoundry.org/garden-shed/rootfs_provider"
"code.cloudfoundry.org/lager"
"github.com/cloudfoundry-incubator/garden"
"github.com/cloudfoundry-incubator/garden-shed/rootfs_provider"
)

type NoopVolumeCreator struct{}
Expand Down
6 changes: 3 additions & 3 deletions gardener/noop_volume_creator_test.go
@@ -1,10 +1,10 @@
package gardener_test

import (
"code.cloudfoundry.org/garden"
"code.cloudfoundry.org/garden-shed/rootfs_provider"
"code.cloudfoundry.org/guardian/gardener"
"code.cloudfoundry.org/lager/lagertest"
"github.com/cloudfoundry-incubator/garden"
"github.com/cloudfoundry-incubator/garden-shed/rootfs_provider"
"github.com/cloudfoundry-incubator/guardian/gardener"

. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
Expand Down
4 changes: 2 additions & 2 deletions gardener/restorer_test.go
Expand Up @@ -3,10 +3,10 @@ package gardener_test
import (
"errors"

"code.cloudfoundry.org/guardian/gardener"
fakes "code.cloudfoundry.org/guardian/gardener/gardenerfakes"
"code.cloudfoundry.org/lager"
"code.cloudfoundry.org/lager/lagertest"
"github.com/cloudfoundry-incubator/guardian/gardener"
fakes "github.com/cloudfoundry-incubator/guardian/gardener/gardenerfakes"

. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
Expand Down
4 changes: 2 additions & 2 deletions gqt/bind_mount_test.go
Expand Up @@ -6,8 +6,8 @@ import (
"os"
"path/filepath"

"github.com/cloudfoundry-incubator/garden"
"github.com/cloudfoundry-incubator/guardian/gqt/runner"
"code.cloudfoundry.org/garden"
"code.cloudfoundry.org/guardian/gqt/runner"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
)
Expand Down
6 changes: 3 additions & 3 deletions gqt/create_test.go
Expand Up @@ -13,10 +13,10 @@ import (
"strconv"
"strings"

"github.com/cloudfoundry-incubator/garden"
"github.com/cloudfoundry-incubator/guardian/gqt/runner"
"code.cloudfoundry.org/garden"
"code.cloudfoundry.org/guardian/gqt/runner"

. "github.com/cloudfoundry-incubator/guardian/matchers"
. "code.cloudfoundry.org/guardian/matchers"
. "github.com/onsi/ginkgo"
. "github.com/onsi/ginkgo/extensions/table"
. "github.com/onsi/gomega"
Expand Down
4 changes: 2 additions & 2 deletions gqt/destroy_test.go
Expand Up @@ -6,8 +6,8 @@ import (
"path/filepath"
"time"

"github.com/cloudfoundry-incubator/garden"
"github.com/cloudfoundry-incubator/guardian/gqt/runner"
"code.cloudfoundry.org/garden"
"code.cloudfoundry.org/guardian/gqt/runner"

. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
Expand Down
4 changes: 2 additions & 2 deletions gqt/fuse_test.go
Expand Up @@ -4,8 +4,8 @@ import (
"io"
"os"

"github.com/cloudfoundry-incubator/garden"
"github.com/cloudfoundry-incubator/guardian/gqt/runner"
"code.cloudfoundry.org/garden"
"code.cloudfoundry.org/guardian/gqt/runner"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
"github.com/onsi/gomega/gbytes"
Expand Down
2 changes: 1 addition & 1 deletion gqt/garden_api_test.go
@@ -1,7 +1,7 @@
package gqt_test

import (
"github.com/cloudfoundry-incubator/guardian/gqt/runner"
"code.cloudfoundry.org/guardian/gqt/runner"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
)
Expand Down
16 changes: 8 additions & 8 deletions gqt/gqt_suite_test.go
Expand Up @@ -7,8 +7,8 @@ import (
"runtime"
"time"

"github.com/cloudfoundry-incubator/garden"
"github.com/cloudfoundry-incubator/guardian/gqt/runner"
"code.cloudfoundry.org/garden"
"code.cloudfoundry.org/guardian/gqt/runner"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
"github.com/onsi/gomega/gexec"
Expand Down Expand Up @@ -38,22 +38,22 @@ func TestGqt(t *testing.T) {
}

if bins["oci_runtime_path"] != "" {
bins["garden_bin_path"], err = gexec.Build("github.com/cloudfoundry-incubator/guardian/cmd/guardian", "-tags", "daemon", "-race")
bins["garden_bin_path"], err = gexec.Build("code.cloudfoundry.org/guardian/cmd/guardian", "-tags", "daemon", "-race")
Expect(err).NotTo(HaveOccurred())

bins["iodaemon_bin_path"], err = gexec.Build("github.com/cloudfoundry-incubator/guardian/rundmc/iodaemon/cmd/iodaemon")
bins["iodaemon_bin_path"], err = gexec.Build("code.cloudfoundry.org/guardian/rundmc/iodaemon/cmd/iodaemon")
Expect(err).NotTo(HaveOccurred())

bins["dadoo_bin_bin_bin"], err = gexec.Build("github.com/cloudfoundry-incubator/guardian/cmd/dadoo")
bins["dadoo_bin_bin_bin"], err = gexec.Build("code.cloudfoundry.org/guardian/cmd/dadoo")
Expect(err).NotTo(HaveOccurred())

bins["init_bin_path"], err = gexec.Build("github.com/cloudfoundry-incubator/guardian/cmd/init")
bins["init_bin_path"], err = gexec.Build("code.cloudfoundry.org/guardian/cmd/init")
Expect(err).NotTo(HaveOccurred())

bins["inspector-garden_bin_path"], err = gexec.Build("github.com/cloudfoundry-incubator/guardian/cmd/inspector-garden")
bins["inspector-garden_bin_path"], err = gexec.Build("code.cloudfoundry.org/guardian/cmd/inspector-garden")
Expect(err).NotTo(HaveOccurred())

bins["test_net_plugin_bin_path"], err = gexec.Build("github.com/cloudfoundry-incubator/guardian/gqt/cmd/networkplugin")
bins["test_net_plugin_bin_path"], err = gexec.Build("code.cloudfoundry.org/guardian/gqt/cmd/networkplugin")
Expect(err).NotTo(HaveOccurred())

cmd := exec.Command("make")
Expand Down
4 changes: 2 additions & 2 deletions gqt/graph_test.go
Expand Up @@ -7,8 +7,8 @@ import (
"path"
"path/filepath"

"github.com/cloudfoundry-incubator/garden"
"github.com/cloudfoundry-incubator/guardian/gqt/runner"
"code.cloudfoundry.org/garden"
"code.cloudfoundry.org/guardian/gqt/runner"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
"github.com/onsi/gomega/gbytes"
Expand Down
4 changes: 2 additions & 2 deletions gqt/info_test.go
Expand Up @@ -3,8 +3,8 @@ package gqt_test
import (
"path"

"github.com/cloudfoundry-incubator/garden"
"github.com/cloudfoundry-incubator/guardian/gqt/runner"
"code.cloudfoundry.org/garden"
"code.cloudfoundry.org/guardian/gqt/runner"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
)
Expand Down
6 changes: 3 additions & 3 deletions gqt/logging_test.go
@@ -1,8 +1,8 @@
package gqt_test

import (
"github.com/cloudfoundry-incubator/garden"
"github.com/cloudfoundry-incubator/guardian/gqt/runner"
"code.cloudfoundry.org/garden"
"code.cloudfoundry.org/guardian/gqt/runner"

. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
Expand All @@ -17,7 +17,7 @@ var _ = Describe("runC Logging", func() {
)

JustBeforeEach(func() {
binPath, err := gexec.Build("github.com/cloudfoundry-incubator/guardian/gqt/cmd/fake_runc")
binPath, err := gexec.Build("code.cloudfoundry.org/guardian/gqt/cmd/fake_runc")
Expect(err).NotTo(HaveOccurred())

containerSpec := garden.ContainerSpec{}
Expand Down
6 changes: 3 additions & 3 deletions gqt/net_test.go
Expand Up @@ -10,9 +10,9 @@ import (
"regexp"
"strings"

"github.com/cloudfoundry-incubator/garden"
"github.com/cloudfoundry-incubator/guardian/gardener"
"github.com/cloudfoundry-incubator/guardian/gqt/runner"
"code.cloudfoundry.org/garden"
"code.cloudfoundry.org/guardian/gardener"
"code.cloudfoundry.org/guardian/gqt/runner"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
"github.com/onsi/gomega/gbytes"
Expand Down

0 comments on commit b56fce9

Please sign in to comment.