diff --git a/cmd/humbox/main.go b/cmd/humbox/main.go index 249f1f19..81b0be33 100644 --- a/cmd/humbox/main.go +++ b/cmd/humbox/main.go @@ -193,7 +193,7 @@ func handler(resp http.ResponseWriter, req *http.Request) { if req.URL.Path == "/" { log.Printf("Request by %s to %s %s", req.RemoteAddr, req.Method, req.URL) - resp.Header().Set("Location", "http://github.com/snapcore/spread") + resp.Header().Set("Location", "http://github.com/canonical/spread") resp.WriteHeader(http.StatusTemporaryRedirect) return } @@ -390,7 +390,7 @@ func sendError(resp http.ResponseWriter, err error, args ...interface{}) { } func sendNotFound(resp http.ResponseWriter, req *http.Request) { - sendError(resp, errNotFound, `path %s unsupported; see the documentation at github.com/snapcore/spread`, req.URL.Path) + sendError(resp, errNotFound, `path %s unsupported; see the documentation at github.com/canonical/spread`, req.URL.Path) } func sendBadMethod(resp http.ResponseWriter, req *http.Request) { diff --git a/cmd/spread/main.go b/cmd/spread/main.go index 57ac5e2f..3c2df561 100644 --- a/cmd/spread/main.go +++ b/cmd/spread/main.go @@ -12,7 +12,7 @@ import ( "time" "github.com/niemeyer/pretty" - "github.com/snapcore/spread/spread" + "github.com/canonical/spread/spread" ) var ( diff --git a/go.mod b/go.mod index 92d3b231..fd4c21b4 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/snapcore/spread +module github.com/canonical/spread go 1.23.0 diff --git a/spread.yaml b/spread.yaml index 982e71c2..6aaf3840 100644 --- a/spread.yaml +++ b/spread.yaml @@ -36,10 +36,10 @@ exclude: - tests/.spread-reuse.yaml - $CACHE_DISABLED -path: /home/test/src/github.com/snapcore/spread +path: /home/test/src/github.com/canonical/spread suites: - tests/: + tests/: summary: Integration tests prepare: | diff --git a/spread/client.go b/spread/client.go index 9615d532..8d63ab12 100644 --- a/spread/client.go +++ b/spread/client.go @@ -356,9 +356,9 @@ func (c *Client) runPart(script string, dir string, env *Environment, mode outpu buf.WriteString(rc(false, "REBOOT() { { set +xu; } 2> /dev/null; [ -z \"$1\" ] && echo '' || echo \"\"; exit 213; }\n")) buf.WriteString(rc(false, "ERROR() { { set +xu; } 2> /dev/null; [ -z \"$1\" ] && echo '' || echo \"\"; exit 213; }\n")) // We are not using pipes here, see: - // https://github.com/snapcore/spread/pull/64 + // https://github.com/canonical/spread/pull/64 // We also run it in a subshell, see - // https://github.com/snapcore/spread/pull/67 + // https://github.com/canonical/spread/pull/67 buf.WriteString(rc(true, "MATCH() ( { set +xu; } 2> /dev/null; [ ${#@} -gt 0 ] || { echo \"error: missing regexp argument\"; return 1; }; local stdin=\"$(cat)\"; grep -q -E \"$@\" <<< \"$stdin\" || { res=$?; echo \"grep error: pattern not found, got:\n$stdin\">&2; if [ $res != 1 ]; then echo \"unexpected grep exit status: $res\"; fi; return 1; }; )\n")) buf.WriteString(rc(true, "NOMATCH() ( { set +xu; } 2> /dev/null; [ ${#@} -gt 0 ] || { echo \"error: missing regexp argument\"; return 1; }; local stdin=\"$(cat)\"; if echo \"$stdin\" | grep -q -E \"$@\"; then echo \"NOMATCH pattern='$@' found in:\n$stdin\">&2; return 1; fi; )\n")) buf.WriteString("export DEBIAN_FRONTEND=noninteractive\n") diff --git a/spread/client_test.go b/spread/client_test.go index 0916726d..82f56c87 100644 --- a/spread/client_test.go +++ b/spread/client_test.go @@ -8,7 +8,7 @@ import ( . "gopkg.in/check.v1" - "github.com/snapcore/spread/spread" + "github.com/canonical/spread/spread" ) type clientSuite struct{} diff --git a/spread/google_test.go b/spread/google_test.go index af8c3478..b9dd3413 100644 --- a/spread/google_test.go +++ b/spread/google_test.go @@ -4,7 +4,7 @@ import ( "net/http" "net/http/httptest" - "github.com/snapcore/spread/spread" + "github.com/canonical/spread/spread" . "gopkg.in/check.v1" ) diff --git a/spread/lxd_test.go b/spread/lxd_test.go index a0c59763..36429dc2 100644 --- a/spread/lxd_test.go +++ b/spread/lxd_test.go @@ -5,7 +5,7 @@ import ( . "gopkg.in/check.v1" - "github.com/snapcore/spread/spread" + "github.com/canonical/spread/spread" ) type lxdSuite struct{} diff --git a/spread/openstack.go b/spread/openstack.go index 97c17fca..5d7db2ba 100644 --- a/spread/openstack.go +++ b/spread/openstack.go @@ -263,7 +263,7 @@ func (p *openstackProvider) findImage(imageName string) (*glance.ImageDetail, er var lastCreatedDate time.Time // TODO: consider using an image cache just like the google backend - // (https://github.com/snapcore/spread/pull/175 needs to be fixed first) + // (https://github.com/canonical/spread/pull/175 needs to be fixed first) images, err := p.imageClient.ListImagesDetail() if err != nil { return nil, fmt.Errorf("cannot retrieve images list: %v", &openstackError{err}) diff --git a/spread/openstack_test.go b/spread/openstack_test.go index 76494c7d..80e105c7 100644 --- a/spread/openstack_test.go +++ b/spread/openstack_test.go @@ -14,7 +14,7 @@ import ( "github.com/go-goose/goose/v5/nova" "golang.org/x/crypto/ssh" - "github.com/snapcore/spread/spread" + "github.com/canonical/spread/spread" . "gopkg.in/check.v1" ) diff --git a/spread/project_test.go b/spread/project_test.go index da2652d1..ba6192df 100644 --- a/spread/project_test.go +++ b/spread/project_test.go @@ -8,8 +8,8 @@ import ( . "gopkg.in/check.v1" "gopkg.in/yaml.v2" - "github.com/snapcore/spread/spread" - "github.com/snapcore/spread/spread/testutil" + "github.com/canonical/spread/spread" + "github.com/canonical/spread/spread/testutil" ) func Test(t *testing.T) { TestingT(t) } diff --git a/spread/qemu_test.go b/spread/qemu_test.go index 760b0e6a..6076bec3 100644 --- a/spread/qemu_test.go +++ b/spread/qemu_test.go @@ -5,7 +5,7 @@ import ( "path/filepath" "strings" - "github.com/snapcore/spread/spread" + "github.com/canonical/spread/spread" . "gopkg.in/check.v1" ) diff --git a/spread/testutil/reindent_test.go b/spread/testutil/reindent_test.go index 1125e327..a880880c 100644 --- a/spread/testutil/reindent_test.go +++ b/spread/testutil/reindent_test.go @@ -6,7 +6,7 @@ import ( . "gopkg.in/check.v1" - "github.com/snapcore/spread/spread/testutil" + "github.com/canonical/spread/spread/testutil" ) type S struct{} diff --git a/tests/repack/spread.yaml b/tests/repack/spread.yaml index c21b0c43..8a27da3f 100644 --- a/tests/repack/spread.yaml +++ b/tests/repack/spread.yaml @@ -7,7 +7,7 @@ backends: environment: GOPATH: /gopath - GOPKG: github.com/snapcore/spread + GOPKG: github.com/canonical/spread PATH: $GOPATH/bin:$PATH DELTA_REF: 08dbc8b DELTA_PREFIX: spread-$DELTA_REF/ @@ -44,7 +44,7 @@ prepare: | rmdir $DELTA_PREFIX suites: - checks/: + checks/: summary: Verification tasks. # vim:ts=4:sw=4:et