Skip to content

Commit

Permalink
Move rebac admin to jimmhttp (#1409)
Browse files Browse the repository at this point in the history
  • Loading branch information
@ale8k
ale8k authored Oct 21, 2024
1 parent 8e69fee commit b466a77
Show file tree
Hide file tree
Showing 20 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion cmd/jimmsrv/service/service.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ import (
"github.com/canonical/jimm/v3/internal/jimm"
jimmcreds "github.com/canonical/jimm/v3/internal/jimm/credentials"
"github.com/canonical/jimm/v3/internal/jimmhttp"
"github.com/canonical/jimm/v3/internal/jimmhttp/rebac_admin"
"github.com/canonical/jimm/v3/internal/jimmjwx"
"github.com/canonical/jimm/v3/internal/jujuapi"
"github.com/canonical/jimm/v3/internal/jujuclient"
Expand All @@ -40,7 +41,6 @@ import (
"github.com/canonical/jimm/v3/internal/openfga"
ofganames "github.com/canonical/jimm/v3/internal/openfga/names"
"github.com/canonical/jimm/v3/internal/pubsub"
"github.com/canonical/jimm/v3/internal/rebac_admin"
"github.com/canonical/jimm/v3/internal/vault"
)

Expand Down
0 internal/rebac_admin/backend.go → internal/jimmhttp/rebac_admin/backend.go
View file
File renamed without changes.
0 internal/rebac_admin/capabilities.go → ...rnal/jimmhttp/rebac_admin/capabilities.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion internal/rebac_admin/capabilities_test.go → ...jimmhttp/rebac_admin/capabilities_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (

qt "github.com/frankban/quicktest"

"github.com/canonical/jimm/v3/internal/rebac_admin"
"github.com/canonical/jimm/v3/internal/jimmhttp/rebac_admin"
"github.com/canonical/jimm/v3/internal/testutils/jimmtest"
)

Expand Down
0 internal/rebac_admin/entitlements.go → ...rnal/jimmhttp/rebac_admin/entitlements.go
View file
File renamed without changes.
0 internal/rebac_admin/export_test.go → internal/jimmhttp/rebac_admin/export_test.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion internal/rebac_admin/groups.go → internal/jimmhttp/rebac_admin/groups.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ import (

"github.com/canonical/jimm/v3/internal/common/pagination"
"github.com/canonical/jimm/v3/internal/errors"
"github.com/canonical/jimm/v3/internal/jimmhttp/rebac_admin/utils"
"github.com/canonical/jimm/v3/internal/jujuapi"
ofganames "github.com/canonical/jimm/v3/internal/openfga/names"
"github.com/canonical/jimm/v3/internal/rebac_admin/utils"
apiparams "github.com/canonical/jimm/v3/pkg/api/params"
jimmnames "github.com/canonical/jimm/v3/pkg/names"
)
Expand Down
2 changes: 1 addition & 1 deletion ...al/rebac_admin/groups_integration_test.go → ...tp/rebac_admin/groups_integration_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ import (
"github.com/juju/names/v5"
gc "gopkg.in/check.v1"

"github.com/canonical/jimm/v3/internal/jimmhttp/rebac_admin"
"github.com/canonical/jimm/v3/internal/openfga"
ofganames "github.com/canonical/jimm/v3/internal/openfga/names"
"github.com/canonical/jimm/v3/internal/rebac_admin"
"github.com/canonical/jimm/v3/internal/testutils/jimmtest"
jimmnames "github.com/canonical/jimm/v3/pkg/names"
)
Expand Down
2 changes: 1 addition & 1 deletion internal/rebac_admin/groups_test.go → internal/jimmhttp/rebac_admin/groups_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ import (

"github.com/canonical/jimm/v3/internal/common/pagination"
"github.com/canonical/jimm/v3/internal/dbmodel"
"github.com/canonical/jimm/v3/internal/jimmhttp/rebac_admin"
"github.com/canonical/jimm/v3/internal/openfga"
"github.com/canonical/jimm/v3/internal/rebac_admin"
"github.com/canonical/jimm/v3/internal/testutils/jimmtest"
"github.com/canonical/jimm/v3/internal/testutils/jimmtest/mocks"
"github.com/canonical/jimm/v3/pkg/api/params"
Expand Down
2 changes: 1 addition & 1 deletion internal/rebac_admin/identities.go → internal/jimmhttp/rebac_admin/identities.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ import (

"github.com/canonical/jimm/v3/internal/common/pagination"
"github.com/canonical/jimm/v3/internal/errors"
"github.com/canonical/jimm/v3/internal/jimmhttp/rebac_admin/utils"
"github.com/canonical/jimm/v3/internal/jujuapi"
"github.com/canonical/jimm/v3/internal/openfga"
ofganames "github.com/canonical/jimm/v3/internal/openfga/names"
"github.com/canonical/jimm/v3/internal/rebac_admin/utils"
apiparams "github.com/canonical/jimm/v3/pkg/api/params"
)

Expand Down
2 changes: 1 addition & 1 deletion ...ebac_admin/identities_integration_test.go → ...ebac_admin/identities_integration_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ import (
"github.com/juju/names/v5"
gc "gopkg.in/check.v1"

"github.com/canonical/jimm/v3/internal/jimmhttp/rebac_admin"
"github.com/canonical/jimm/v3/internal/openfga"
ofganames "github.com/canonical/jimm/v3/internal/openfga/names"
"github.com/canonical/jimm/v3/internal/rebac_admin"
"github.com/canonical/jimm/v3/internal/testutils/jimmtest"
"github.com/canonical/jimm/v3/pkg/api/params"
jimmnames "github.com/canonical/jimm/v3/pkg/names"
Expand Down
2 changes: 1 addition & 1 deletion internal/rebac_admin/identities_test.go → ...l/jimmhttp/rebac_admin/identities_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ import (
"github.com/canonical/jimm/v3/internal/common/utils"
"github.com/canonical/jimm/v3/internal/dbmodel"
jimmm_errors "github.com/canonical/jimm/v3/internal/errors"
"github.com/canonical/jimm/v3/internal/jimmhttp/rebac_admin"
"github.com/canonical/jimm/v3/internal/openfga"
"github.com/canonical/jimm/v3/internal/rebac_admin"
"github.com/canonical/jimm/v3/internal/testutils/jimmtest"
"github.com/canonical/jimm/v3/internal/testutils/jimmtest/mocks"
"github.com/canonical/jimm/v3/pkg/api/params"
Expand Down
0 internal/rebac_admin/package_test.go → ...rnal/jimmhttp/rebac_admin/package_test.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion internal/rebac_admin/resources.go → internal/jimmhttp/rebac_admin/resources.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ import (
"github.com/canonical/jimm/v3/internal/common/pagination"
"github.com/canonical/jimm/v3/internal/db"
"github.com/canonical/jimm/v3/internal/errors"
"github.com/canonical/jimm/v3/internal/jimmhttp/rebac_admin/utils"
"github.com/canonical/jimm/v3/internal/jujuapi"
"github.com/canonical/jimm/v3/internal/rebac_admin/utils"
)

type resourcesService struct {
Expand Down
2 changes: 1 addition & 1 deletion ...rebac_admin/resources_integration_test.go → ...rebac_admin/resources_integration_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
gc "gopkg.in/check.v1"

"github.com/canonical/jimm/v3/internal/common/utils"
"github.com/canonical/jimm/v3/internal/rebac_admin"
"github.com/canonical/jimm/v3/internal/jimmhttp/rebac_admin"
"github.com/canonical/jimm/v3/internal/testutils/jimmtest"
)

Expand Down
2 changes: 1 addition & 1 deletion internal/rebac_admin/resources_test.go → ...al/jimmhttp/rebac_admin/resources_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ import (
"github.com/canonical/jimm/v3/internal/common/pagination"
"github.com/canonical/jimm/v3/internal/common/utils"
"github.com/canonical/jimm/v3/internal/db"
"github.com/canonical/jimm/v3/internal/jimmhttp/rebac_admin"
"github.com/canonical/jimm/v3/internal/openfga"
"github.com/canonical/jimm/v3/internal/rebac_admin"
"github.com/canonical/jimm/v3/internal/testutils/jimmtest"
)

Expand Down
0 internal/rebac_admin/utils/auth.go → internal/jimmhttp/rebac_admin/utils/auth.go
View file
File renamed without changes.
0 internal/rebac_admin/utils/errors.go → ...rnal/jimmhttp/rebac_admin/utils/errors.go
View file
File renamed without changes.
0 internal/rebac_admin/utils/types.go → internal/jimmhttp/rebac_admin/utils/types.go
View file
File renamed without changes.
0 internal/rebac_admin/utils/utils.go → internal/jimmhttp/rebac_admin/utils/utils.go
View file
File renamed without changes.

0 comments on commit b466a77

Please sign in to comment.