Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

moving from CanonicalLtd to canonical #1001

Merged
merged 2 commits into from
Jul 14, 2023
Merged

moving from CanonicalLtd to canonical #1001

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
489d6ef
moving from CanonicalLtd to canonical
mina1460 Jul 14, 2023
503cfa4
minor fix
mina1460 Jul 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
export GO111MODULE=on
export DOCKER_BUILDKIT=1

PROJECT := github.com/CanonicalLtd/jimm
PROJECT := github.com/canonical/jimm

GIT_COMMIT := $(shell git rev-parse --verify HEAD)
GIT_VERSION := $(shell git describe --abbrev=0 --dirty)
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ considered a work in progress.
To start using JIMM, first ensure you have a valid Go environment,
then run the following:

go get github.com/CanonicalLtd/jimm
go get github.com/canonical/jimm

## Go dependencies

Expand Down
2 changes: 1 addition & 1 deletion api/jimm.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ package api
import (
jujuparams "github.com/juju/juju/rpc/params"

"github.com/CanonicalLtd/jimm/api/params"
"github.com/canonical/jimm/api/params"
)

// An APICaller implements the interface required to make API calls.
Expand Down
8 changes: 4 additions & 4 deletions cmd/jimmctl/cmd/addcloudtocontroller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,19 +10,19 @@ import (
"github.com/juju/gnuflag"
jujuapi "github.com/juju/juju/api"
"github.com/juju/juju/apiserver/common"
"github.com/juju/juju/rpc/params"
"github.com/juju/juju/cloud"
jujucmd "github.com/juju/juju/cmd"
jujucmdcloud "github.com/juju/juju/cmd/juju/cloud"
jujucmdcommon "github.com/juju/juju/cmd/juju/common"
"github.com/juju/juju/cmd/modelcmd"
"github.com/juju/juju/jujuclient"
"github.com/juju/juju/rpc/params"
"github.com/juju/names/v4"

"github.com/CanonicalLtd/jimm/api"
apiparams "github.com/CanonicalLtd/jimm/api/params"
"github.com/canonical/jimm/api"
apiparams "github.com/canonical/jimm/api/params"

"github.com/CanonicalLtd/jimm/internal/errors"
"github.com/canonical/jimm/internal/errors"
)

var (
Expand Down
6 changes: 3 additions & 3 deletions cmd/jimmctl/cmd/addcloudtocontroller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ import (

gc "gopkg.in/check.v1"

"github.com/CanonicalLtd/jimm/cmd/jimmctl/cmd"
"github.com/CanonicalLtd/jimm/internal/dbmodel"
"github.com/CanonicalLtd/jimm/internal/errors"
"github.com/canonical/jimm/cmd/jimmctl/cmd"
"github.com/canonical/jimm/internal/dbmodel"
"github.com/canonical/jimm/internal/errors"
)

type addCloudToControllerSuite struct {
Expand Down
6 changes: 3 additions & 3 deletions cmd/jimmctl/cmd/addcontroller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ import (
"github.com/juju/juju/jujuclient"
"sigs.k8s.io/yaml"

"github.com/CanonicalLtd/jimm/api"
apiparams "github.com/CanonicalLtd/jimm/api/params"
"github.com/CanonicalLtd/jimm/internal/errors"
"github.com/canonical/jimm/api"
apiparams "github.com/canonical/jimm/api/params"
"github.com/canonical/jimm/internal/errors"
)

var (
Expand Down
6 changes: 3 additions & 3 deletions cmd/jimmctl/cmd/addcontroller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ import (
gc "gopkg.in/check.v1"
"sigs.k8s.io/yaml"

apiparams "github.com/CanonicalLtd/jimm/api/params"
"github.com/CanonicalLtd/jimm/cmd/jimmctl/cmd"
"github.com/CanonicalLtd/jimm/internal/jimmtest"
apiparams "github.com/canonical/jimm/api/params"
"github.com/canonical/jimm/cmd/jimmctl/cmd"
"github.com/canonical/jimm/internal/jimmtest"
)

type addControllerSuite struct {
Expand Down
2 changes: 1 addition & 1 deletion cmd/jimmctl/cmd/controllerinfo.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (
"github.com/juju/juju/jujuclient"
"sigs.k8s.io/yaml"

apiparams "github.com/CanonicalLtd/jimm/api/params"
apiparams "github.com/canonical/jimm/api/params"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion cmd/jimmctl/cmd/controllerinfo_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
"github.com/juju/juju/jujuclient"
gc "gopkg.in/check.v1"

"github.com/CanonicalLtd/jimm/cmd/jimmctl/cmd"
"github.com/canonical/jimm/cmd/jimmctl/cmd"
)

type controllerInfoSuite struct {
Expand Down
6 changes: 3 additions & 3 deletions cmd/jimmctl/cmd/grantauditlogaccess.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ import (
"github.com/juju/juju/jujuclient"
"github.com/juju/names/v4"

"github.com/CanonicalLtd/jimm/api"
apiparams "github.com/CanonicalLtd/jimm/api/params"
"github.com/CanonicalLtd/jimm/internal/errors"
"github.com/canonical/jimm/api"
apiparams "github.com/canonical/jimm/api/params"
"github.com/canonical/jimm/internal/errors"
)

var grantAuditLogAccessDoc = `
Expand Down
2 changes: 1 addition & 1 deletion cmd/jimmctl/cmd/grantauditlogaccess_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"github.com/juju/cmd/v3/cmdtesting"
gc "gopkg.in/check.v1"

"github.com/CanonicalLtd/jimm/cmd/jimmctl/cmd"
"github.com/canonical/jimm/cmd/jimmctl/cmd"
)

type grantAuditLogAccessSuite struct {
Expand Down
2 changes: 1 addition & 1 deletion cmd/jimmctl/cmd/importcloudcredentials.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import (
"github.com/juju/juju/jujuclient"
"github.com/juju/names/v4"

"github.com/CanonicalLtd/jimm/internal/errors"
"github.com/canonical/jimm/internal/errors"
)

const importCloudCredentialsDoc = `
Expand Down
4 changes: 2 additions & 2 deletions cmd/jimmctl/cmd/importcloudcredentials_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import (
"github.com/juju/cmd/v3/cmdtesting"
gc "gopkg.in/check.v1"

"github.com/CanonicalLtd/jimm/cmd/jimmctl/cmd"
"github.com/CanonicalLtd/jimm/internal/dbmodel"
"github.com/canonical/jimm/cmd/jimmctl/cmd"
"github.com/canonical/jimm/internal/dbmodel"
)

type importCloudCredentialsSuite struct {
Expand Down
6 changes: 3 additions & 3 deletions cmd/jimmctl/cmd/importmodel.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ import (
"github.com/juju/juju/jujuclient"
"github.com/juju/names/v4"

"github.com/CanonicalLtd/jimm/api"
apiparams "github.com/CanonicalLtd/jimm/api/params"
"github.com/CanonicalLtd/jimm/internal/errors"
"github.com/canonical/jimm/api"
apiparams "github.com/canonical/jimm/api/params"
"github.com/canonical/jimm/internal/errors"
)

const importModelCommandDoc = `
Expand Down
6 changes: 3 additions & 3 deletions cmd/jimmctl/cmd/importmodel_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ import (
"github.com/juju/names/v4"
gc "gopkg.in/check.v1"

"github.com/CanonicalLtd/jimm/cmd/jimmctl/cmd"
"github.com/CanonicalLtd/jimm/internal/dbmodel"
"github.com/CanonicalLtd/jimm/internal/jimmtest"
"github.com/canonical/jimm/cmd/jimmctl/cmd"
"github.com/canonical/jimm/internal/dbmodel"
"github.com/canonical/jimm/internal/jimmtest"
)

type importModelSuite struct {
Expand Down
12 changes: 6 additions & 6 deletions cmd/jimmctl/cmd/jimmsuite_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@ import (
"github.com/juju/names/v4"
gc "gopkg.in/check.v1"

service "github.com/CanonicalLtd/jimm"
"github.com/CanonicalLtd/jimm/internal/db"
"github.com/CanonicalLtd/jimm/internal/dbmodel"
"github.com/CanonicalLtd/jimm/internal/jimm"
"github.com/CanonicalLtd/jimm/internal/jimmtest"
"github.com/CanonicalLtd/jimm/internal/jujuclient"
service "github.com/canonical/jimm"
"github.com/canonical/jimm/internal/db"
"github.com/canonical/jimm/internal/dbmodel"
"github.com/canonical/jimm/internal/jimm"
"github.com/canonical/jimm/internal/jimmtest"
"github.com/canonical/jimm/internal/jujuclient"
)

type gcTester struct {
Expand Down
6 changes: 3 additions & 3 deletions cmd/jimmctl/cmd/listauditevents.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ import (
"github.com/juju/juju/cmd/modelcmd"
"github.com/juju/juju/jujuclient"

"github.com/CanonicalLtd/jimm/api"
apiparams "github.com/CanonicalLtd/jimm/api/params"
"github.com/CanonicalLtd/jimm/internal/errors"
"github.com/canonical/jimm/api"
apiparams "github.com/canonical/jimm/api/params"
"github.com/canonical/jimm/internal/errors"
)

var listAuditEventsCommandDoc = `
Expand Down
4 changes: 2 additions & 2 deletions cmd/jimmctl/cmd/listauditevents_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
"github.com/juju/names/v4"
gc "gopkg.in/check.v1"

"github.com/CanonicalLtd/jimm/cmd/jimmctl/cmd"
"github.com/CanonicalLtd/jimm/internal/jimmtest"
"github.com/canonical/jimm/cmd/jimmctl/cmd"
"github.com/canonical/jimm/internal/jimmtest"
)

type listAuditEventsSuite struct {
Expand Down
4 changes: 2 additions & 2 deletions cmd/jimmctl/cmd/listcontrollers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import (
"github.com/juju/juju/cmd/modelcmd"
"github.com/juju/juju/jujuclient"

"github.com/CanonicalLtd/jimm/api"
"github.com/CanonicalLtd/jimm/internal/errors"
"github.com/canonical/jimm/api"
"github.com/canonical/jimm/internal/errors"
)

var listControllersComandDoc = `
Expand Down
4 changes: 2 additions & 2 deletions cmd/jimmctl/cmd/listcontrollers_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"github.com/juju/cmd/v3/cmdtesting"
gc "gopkg.in/check.v1"

"github.com/CanonicalLtd/jimm/cmd/jimmctl/cmd"
"github.com/CanonicalLtd/jimm/internal/jimmtest"
"github.com/canonical/jimm/cmd/jimmctl/cmd"
"github.com/canonical/jimm/internal/jimmtest"
)

var (
Expand Down
6 changes: 3 additions & 3 deletions cmd/jimmctl/cmd/modelstatus.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ import (
"github.com/juju/juju/jujuclient"
"github.com/juju/names/v4"

"github.com/CanonicalLtd/jimm/api"
apiparams "github.com/CanonicalLtd/jimm/api/params"
"github.com/CanonicalLtd/jimm/internal/errors"
"github.com/canonical/jimm/api"
apiparams "github.com/canonical/jimm/api/params"
"github.com/canonical/jimm/internal/errors"
)

var modelStatusCommandDoc = `
Expand Down
4 changes: 2 additions & 2 deletions cmd/jimmctl/cmd/modelstatus_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
"github.com/juju/names/v4"
gc "gopkg.in/check.v1"

"github.com/CanonicalLtd/jimm/cmd/jimmctl/cmd"
"github.com/CanonicalLtd/jimm/internal/jimmtest"
"github.com/canonical/jimm/cmd/jimmctl/cmd"
"github.com/canonical/jimm/internal/jimmtest"
)

var (
Expand Down
6 changes: 3 additions & 3 deletions cmd/jimmctl/cmd/removecloudfromcontroller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ import (
"github.com/juju/juju/jujuclient"
"github.com/juju/names/v4"

"github.com/CanonicalLtd/jimm/api"
apiparams "github.com/CanonicalLtd/jimm/api/params"
"github.com/canonical/jimm/api"
apiparams "github.com/canonical/jimm/api/params"

"github.com/CanonicalLtd/jimm/internal/errors"
"github.com/canonical/jimm/internal/errors"
)

var (
Expand Down
4 changes: 2 additions & 2 deletions cmd/jimmctl/cmd/removecloudfromcontroller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (

gc "gopkg.in/check.v1"

apiparams "github.com/CanonicalLtd/jimm/api/params"
"github.com/CanonicalLtd/jimm/cmd/jimmctl/cmd"
apiparams "github.com/canonical/jimm/api/params"
"github.com/canonical/jimm/cmd/jimmctl/cmd"
)

type removeCloudFromControllerSuite struct {
Expand Down
6 changes: 3 additions & 3 deletions cmd/jimmctl/cmd/removecontroller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ import (
"github.com/juju/juju/cmd/modelcmd"
"github.com/juju/juju/jujuclient"

"github.com/CanonicalLtd/jimm/api"
apiparams "github.com/CanonicalLtd/jimm/api/params"
"github.com/CanonicalLtd/jimm/internal/errors"
"github.com/canonical/jimm/api"
apiparams "github.com/canonical/jimm/api/params"
"github.com/canonical/jimm/internal/errors"
)

var (
Expand Down
4 changes: 2 additions & 2 deletions cmd/jimmctl/cmd/removecontroller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"github.com/juju/cmd/v3/cmdtesting"
gc "gopkg.in/check.v1"

"github.com/CanonicalLtd/jimm/cmd/jimmctl/cmd"
"github.com/CanonicalLtd/jimm/internal/jimmtest"
"github.com/canonical/jimm/cmd/jimmctl/cmd"
"github.com/canonical/jimm/internal/jimmtest"
)

type removeControllerSuite struct {
Expand Down
6 changes: 3 additions & 3 deletions cmd/jimmctl/cmd/revokeauditlogaccess.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ import (
"github.com/juju/juju/jujuclient"
"github.com/juju/names/v4"

"github.com/CanonicalLtd/jimm/api"
apiparams "github.com/CanonicalLtd/jimm/api/params"
"github.com/CanonicalLtd/jimm/internal/errors"
"github.com/canonical/jimm/api"
apiparams "github.com/canonical/jimm/api/params"
"github.com/canonical/jimm/internal/errors"
)

var revokeAuditLogAccessDoc = `
Expand Down
2 changes: 1 addition & 1 deletion cmd/jimmctl/cmd/revokeauditlogaccess_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"github.com/juju/cmd/v3/cmdtesting"
gc "gopkg.in/check.v1"

"github.com/CanonicalLtd/jimm/cmd/jimmctl/cmd"
"github.com/canonical/jimm/cmd/jimmctl/cmd"
)

type revokeAuditLogAccessSuite struct {
Expand Down
6 changes: 3 additions & 3 deletions cmd/jimmctl/cmd/setcontrollerdeprecated.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ import (
"github.com/juju/juju/cmd/modelcmd"
"github.com/juju/juju/jujuclient"

"github.com/CanonicalLtd/jimm/api"
apiparams "github.com/CanonicalLtd/jimm/api/params"
"github.com/CanonicalLtd/jimm/internal/errors"
"github.com/canonical/jimm/api"
apiparams "github.com/canonical/jimm/api/params"
"github.com/canonical/jimm/internal/errors"
)

var setControllerDeprecatedDoc = `
Expand Down
4 changes: 2 additions & 2 deletions cmd/jimmctl/cmd/setcontrollerdeprecated_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"github.com/juju/cmd/v3/cmdtesting"
gc "gopkg.in/check.v1"

"github.com/CanonicalLtd/jimm/cmd/jimmctl/cmd"
"github.com/CanonicalLtd/jimm/internal/jimmtest"
"github.com/canonical/jimm/cmd/jimmctl/cmd"
"github.com/canonical/jimm/internal/jimmtest"
)

type setControllerDeprecatedSuite struct {
Expand Down
6 changes: 3 additions & 3 deletions cmd/jimmctl/cmd/updatemigratedmodel.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ import (
"github.com/juju/juju/jujuclient"
"github.com/juju/names/v4"

"github.com/CanonicalLtd/jimm/api"
apiparams "github.com/CanonicalLtd/jimm/api/params"
"github.com/CanonicalLtd/jimm/internal/errors"
"github.com/canonical/jimm/api"
apiparams "github.com/canonical/jimm/api/params"
"github.com/canonical/jimm/internal/errors"
)

const updateMigratedModelCommandDoc = `
Expand Down
6 changes: 3 additions & 3 deletions cmd/jimmctl/cmd/updatemigratedmodel_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ import (
"github.com/juju/names/v4"
gc "gopkg.in/check.v1"

"github.com/CanonicalLtd/jimm/cmd/jimmctl/cmd"
"github.com/CanonicalLtd/jimm/internal/dbmodel"
"github.com/CanonicalLtd/jimm/internal/jimmtest"
"github.com/canonical/jimm/cmd/jimmctl/cmd"
"github.com/canonical/jimm/internal/dbmodel"
"github.com/canonical/jimm/internal/jimmtest"
)

type updateMigratedModelSuite struct {
Expand Down
2 changes: 1 addition & 1 deletion cmd/jimmctl/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (

jujucmd "github.com/juju/cmd/v3"

"github.com/CanonicalLtd/jimm/cmd/jimmctl/cmd"
"github.com/canonical/jimm/cmd/jimmctl/cmd"
)

var jimmctlDoc = `
Expand Down
Loading