Skip to content

Commit

Permalink
chore(authz): Move authz to pkg (chainloop-dev#1030)
Browse files Browse the repository at this point in the history 
Signed-off-by: Javier Rodriguez <[email protected]>
  • Loading branch information
@javirln
javirln authored Jun 25, 2024
1 parent 95f3882 commit 48faa88
Show file tree
Hide file tree
Showing 43 changed files with 42 additions and 42 deletions.
2 changes: 1 addition & 1 deletion app/controlplane/cmd/wire.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@
package main

import (
"github.com/chainloop-dev/chainloop/app/controlplane/internal/authz"
conf "github.com/chainloop-dev/chainloop/app/controlplane/internal/conf/controlplane/config/v1"
"github.com/chainloop-dev/chainloop/app/controlplane/internal/dispatcher"
"github.com/chainloop-dev/chainloop/app/controlplane/internal/server"
"github.com/chainloop-dev/chainloop/app/controlplane/internal/service"
"github.com/chainloop-dev/chainloop/app/controlplane/pkg/authz"
"github.com/chainloop-dev/chainloop/app/controlplane/pkg/biz"
"github.com/chainloop-dev/chainloop/app/controlplane/pkg/data"
"github.com/chainloop-dev/chainloop/app/controlplane/plugins/sdk/v1"
Expand Down
2 changes: 1 addition & 1 deletion app/controlplane/cmd/wire_gen.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions app/controlplane/internal/server/grpc.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ import (
"regexp"

v1 "github.com/chainloop-dev/chainloop/app/controlplane/api/controlplane/v1"
"github.com/chainloop-dev/chainloop/app/controlplane/internal/authz"
authzMiddleware "github.com/chainloop-dev/chainloop/app/controlplane/internal/authz/middleware"
conf "github.com/chainloop-dev/chainloop/app/controlplane/internal/conf/controlplane/config/v1"
"github.com/chainloop-dev/chainloop/app/controlplane/internal/usercontext/attjwtmiddleware"
"github.com/chainloop-dev/chainloop/app/controlplane/pkg/authz"
authzMiddleware "github.com/chainloop-dev/chainloop/app/controlplane/pkg/authz/middleware"
"github.com/chainloop-dev/chainloop/app/controlplane/pkg/biz"
"github.com/chainloop-dev/chainloop/app/controlplane/pkg/jwt/user"

Expand Down
2 changes: 1 addition & 1 deletion app/controlplane/internal/service/cascredential.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ import (
"context"

pb "github.com/chainloop-dev/chainloop/app/controlplane/api/controlplane/v1"
"github.com/chainloop-dev/chainloop/app/controlplane/pkg/authz"
errors "github.com/go-kratos/kratos/v2/errors"

"github.com/chainloop-dev/chainloop/app/controlplane/internal/authz"
"github.com/chainloop-dev/chainloop/app/controlplane/pkg/biz"
casJWT "github.com/chainloop-dev/chainloop/internal/robotaccount/cas"
)
Expand Down
2 changes: 1 addition & 1 deletion app/controlplane/internal/service/organization.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import (
"context"

pb "github.com/chainloop-dev/chainloop/app/controlplane/api/controlplane/v1"
"github.com/chainloop-dev/chainloop/app/controlplane/internal/authz"
"github.com/chainloop-dev/chainloop/app/controlplane/pkg/authz"
"github.com/chainloop-dev/chainloop/app/controlplane/pkg/biz"
)

Expand Down
2 changes: 1 addition & 1 deletion app/controlplane/internal/service/user.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"google.golang.org/protobuf/types/known/timestamppb"

pb "github.com/chainloop-dev/chainloop/app/controlplane/api/controlplane/v1"
"github.com/chainloop-dev/chainloop/app/controlplane/internal/authz"
"github.com/chainloop-dev/chainloop/app/controlplane/pkg/authz"
"github.com/chainloop-dev/chainloop/app/controlplane/pkg/biz"
errors "github.com/go-kratos/kratos/v2/errors"
)
Expand Down
2 changes: 1 addition & 1 deletion app/controlplane/internal/usercontext/apitoken_middleware.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ import (
"github.com/go-kratos/kratos/v2/log"
"github.com/golang-jwt/jwt/v4"

"github.com/chainloop-dev/chainloop/app/controlplane/internal/authz"
"github.com/chainloop-dev/chainloop/app/controlplane/internal/usercontext/attjwtmiddleware"
"github.com/chainloop-dev/chainloop/app/controlplane/pkg/authz"
"github.com/chainloop-dev/chainloop/app/controlplane/pkg/biz"
"github.com/chainloop-dev/chainloop/app/controlplane/pkg/jwt/apitoken"
"github.com/go-kratos/kratos/v2/middleware"
Expand Down
2 changes: 1 addition & 1 deletion app/controlplane/internal/usercontext/currentorganization_middleware_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
"io"
"testing"

"github.com/chainloop-dev/chainloop/app/controlplane/internal/authz"
"github.com/chainloop-dev/chainloop/app/controlplane/pkg/authz"
"github.com/chainloop-dev/chainloop/app/controlplane/pkg/biz"
bizMocks "github.com/chainloop-dev/chainloop/app/controlplane/pkg/biz/mocks"
userjwtbuilder "github.com/chainloop-dev/chainloop/app/controlplane/pkg/jwt/user"
Expand Down
0 app/controlplane/internal/authz/authz.go → app/controlplane/pkg/authz/authz.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion .../internal/authz/authz_integration_test.go → ...plane/pkg/authz/authz_integration_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"time"

"github.com/cenkalti/backoff/v4"
"github.com/chainloop-dev/chainloop/app/controlplane/internal/authz"
"github.com/chainloop-dev/chainloop/app/controlplane/pkg/authz"
"github.com/chainloop-dev/chainloop/app/controlplane/pkg/biz/testhelpers"
"github.com/google/uuid"
"github.com/stretchr/testify/assert"
Expand Down
0 ...controlplane/internal/authz/authz_test.go → app/controlplane/pkg/authz/authz_test.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion ...e/internal/authz/middleware/middleware.go → ...lplane/pkg/authz/middleware/middleware.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ import (

errorsAPI "github.com/go-kratos/kratos/v2/errors"

"github.com/chainloop-dev/chainloop/app/controlplane/internal/authz"
"github.com/chainloop-dev/chainloop/app/controlplane/internal/usercontext"
"github.com/chainloop-dev/chainloop/app/controlplane/pkg/authz"
"github.com/go-kratos/kratos/v2/log"
"github.com/go-kratos/kratos/v2/middleware"
"github.com/go-kratos/kratos/v2/transport"
Expand Down
4 changes: 2 additions & 2 deletions ...ernal/authz/middleware/middleware_test.go → ...e/pkg/authz/middleware/middleware_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ import (
"io"
"testing"

"github.com/chainloop-dev/chainloop/app/controlplane/internal/authz"
"github.com/chainloop-dev/chainloop/app/controlplane/internal/authz/middleware/mocks"
"github.com/chainloop-dev/chainloop/app/controlplane/internal/usercontext"
"github.com/chainloop-dev/chainloop/app/controlplane/pkg/authz"
"github.com/chainloop-dev/chainloop/app/controlplane/pkg/authz/middleware/mocks"
"github.com/go-kratos/kratos/v2/errors"
"github.com/go-kratos/kratos/v2/log"
"github.com/go-kratos/kratos/v2/transport"
Expand Down
2 changes: 1 addition & 1 deletion ...ternal/authz/middleware/mocks/Enforcer.go → ...ne/pkg/authz/middleware/mocks/Enforcer.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 app/controlplane/internal/authz/model.conf → app/controlplane/pkg/authz/model.conf
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion app/controlplane/pkg/biz/apitoken.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ import (
"fmt"
"time"

"github.com/chainloop-dev/chainloop/app/controlplane/internal/authz"
conf "github.com/chainloop-dev/chainloop/app/controlplane/internal/conf/controlplane/config/v1"
"github.com/chainloop-dev/chainloop/app/controlplane/pkg/authz"
"github.com/chainloop-dev/chainloop/app/controlplane/pkg/jwt"
"github.com/chainloop-dev/chainloop/app/controlplane/pkg/jwt/apitoken"
"github.com/chainloop-dev/chainloop/pkg/servicelogger"
Expand Down
2 changes: 1 addition & 1 deletion app/controlplane/pkg/biz/apitoken_integration_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"testing"
"time"

"github.com/chainloop-dev/chainloop/app/controlplane/internal/authz"
"github.com/chainloop-dev/chainloop/app/controlplane/pkg/authz"
"github.com/chainloop-dev/chainloop/app/controlplane/pkg/biz"
"github.com/chainloop-dev/chainloop/app/controlplane/pkg/biz/testhelpers"
"github.com/golang-jwt/jwt/v4"
Expand Down
2 changes: 1 addition & 1 deletion app/controlplane/pkg/biz/membership.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
"fmt"
"time"

"github.com/chainloop-dev/chainloop/app/controlplane/internal/authz"
"github.com/chainloop-dev/chainloop/app/controlplane/pkg/authz"
"github.com/go-kratos/kratos/v2/log"
"github.com/google/uuid"
)
Expand Down
2 changes: 1 addition & 1 deletion app/controlplane/pkg/biz/membership_integration_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import (
"context"
"testing"

"github.com/chainloop-dev/chainloop/app/controlplane/internal/authz"
"github.com/chainloop-dev/chainloop/app/controlplane/pkg/authz"
"github.com/chainloop-dev/chainloop/app/controlplane/pkg/biz"
"github.com/chainloop-dev/chainloop/app/controlplane/pkg/biz/testhelpers"

Expand Down
2 changes: 1 addition & 1 deletion app/controlplane/pkg/biz/organization.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ import (
"io"
"time"

"github.com/chainloop-dev/chainloop/app/controlplane/internal/authz"
conf "github.com/chainloop-dev/chainloop/app/controlplane/internal/conf/controlplane/config/v1"
"github.com/chainloop-dev/chainloop/app/controlplane/pkg/authz"
"github.com/chainloop-dev/chainloop/pkg/servicelogger"
"github.com/go-kratos/kratos/v2/log"
"github.com/google/uuid"
Expand Down
2 changes: 1 addition & 1 deletion app/controlplane/pkg/biz/organization_integration_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ import (
"testing"

v1 "github.com/chainloop-dev/chainloop/app/controlplane/api/controlplane/v1"
"github.com/chainloop-dev/chainloop/app/controlplane/internal/authz"
conf "github.com/chainloop-dev/chainloop/app/controlplane/internal/conf/controlplane/config/v1"
"github.com/chainloop-dev/chainloop/app/controlplane/pkg/authz"
"github.com/chainloop-dev/chainloop/app/controlplane/pkg/biz"
"github.com/chainloop-dev/chainloop/app/controlplane/pkg/biz/testhelpers"
"github.com/chainloop-dev/chainloop/app/controlplane/plugins/sdk/v1"
Expand Down
2 changes: 1 addition & 1 deletion app/controlplane/pkg/biz/orginvitation.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
"fmt"
"time"

"github.com/chainloop-dev/chainloop/app/controlplane/internal/authz"
"github.com/chainloop-dev/chainloop/app/controlplane/pkg/authz"
"github.com/chainloop-dev/chainloop/pkg/servicelogger"
"github.com/go-kratos/kratos/v2/log"
"github.com/google/uuid"
Expand Down
2 changes: 1 addition & 1 deletion app/controlplane/pkg/biz/orginvitation_integration_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
"fmt"
"testing"

"github.com/chainloop-dev/chainloop/app/controlplane/internal/authz"
"github.com/chainloop-dev/chainloop/app/controlplane/pkg/authz"
"github.com/chainloop-dev/chainloop/app/controlplane/pkg/biz"
"github.com/chainloop-dev/chainloop/app/controlplane/pkg/biz/testhelpers"
"github.com/google/uuid"
Expand Down
2 changes: 1 addition & 1 deletion app/controlplane/pkg/biz/testhelpers/database.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ import (
// Required for the database waitFor strategy
_ "github.com/lib/pq"

"github.com/chainloop-dev/chainloop/app/controlplane/internal/authz"
conf "github.com/chainloop-dev/chainloop/app/controlplane/internal/conf/controlplane/config/v1"
"github.com/chainloop-dev/chainloop/app/controlplane/pkg/authz"
"github.com/chainloop-dev/chainloop/app/controlplane/pkg/biz"
"github.com/chainloop-dev/chainloop/app/controlplane/pkg/data"
"github.com/chainloop-dev/chainloop/app/controlplane/plugins/sdk/v1"
Expand Down
2 changes: 1 addition & 1 deletion app/controlplane/pkg/biz/testhelpers/wire.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ package testhelpers
import (
"testing"

"github.com/chainloop-dev/chainloop/app/controlplane/internal/authz"
conf "github.com/chainloop-dev/chainloop/app/controlplane/internal/conf/controlplane/config/v1"
"github.com/chainloop-dev/chainloop/app/controlplane/pkg/authz"
"github.com/chainloop-dev/chainloop/app/controlplane/pkg/biz"
"github.com/chainloop-dev/chainloop/app/controlplane/pkg/data"
"github.com/chainloop-dev/chainloop/app/controlplane/plugins/sdk/v1"
Expand Down
2 changes: 1 addition & 1 deletion app/controlplane/pkg/biz/testhelpers/wire_gen.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion app/controlplane/pkg/biz/user.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ import (
"time"

pb "github.com/chainloop-dev/chainloop/app/controlplane/api/controlplane/v1"
"github.com/chainloop-dev/chainloop/app/controlplane/internal/authz"
conf "github.com/chainloop-dev/chainloop/app/controlplane/internal/conf/controlplane/config/v1"
"github.com/chainloop-dev/chainloop/app/controlplane/pkg/authz"
"github.com/go-kratos/kratos/v2/log"
"github.com/google/uuid"
)
Expand Down
2 changes: 1 addition & 1 deletion app/controlplane/pkg/biz/user_integration_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ import (
"testing"

v1 "github.com/chainloop-dev/chainloop/app/controlplane/api/controlplane/v1"
"github.com/chainloop-dev/chainloop/app/controlplane/internal/authz"
conf "github.com/chainloop-dev/chainloop/app/controlplane/internal/conf/controlplane/config/v1"
"github.com/chainloop-dev/chainloop/app/controlplane/pkg/authz"
"github.com/chainloop-dev/chainloop/app/controlplane/pkg/biz"
"github.com/chainloop-dev/chainloop/app/controlplane/pkg/biz/testhelpers"

Expand Down
2 changes: 1 addition & 1 deletion app/controlplane/pkg/data/ent/membership.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion app/controlplane/pkg/data/ent/membership/membership.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion app/controlplane/pkg/data/ent/membership/where.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion app/controlplane/pkg/data/ent/membership_create.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion app/controlplane/pkg/data/ent/membership_update.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion app/controlplane/pkg/data/ent/mutation.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion app/controlplane/pkg/data/ent/orginvitation.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion app/controlplane/pkg/data/ent/orginvitation/orginvitation.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion app/controlplane/pkg/data/ent/orginvitation/where.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion app/controlplane/pkg/data/ent/orginvitation_create.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion app/controlplane/pkg/data/ent/orginvitation_update.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion app/controlplane/pkg/data/ent/schema/membership.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (
"entgo.io/ent/schema/edge"
"entgo.io/ent/schema/field"
"entgo.io/ent/schema/index"
"github.com/chainloop-dev/chainloop/app/controlplane/internal/authz"
"github.com/chainloop-dev/chainloop/app/controlplane/pkg/authz"
"github.com/google/uuid"
)

Expand Down
2 changes: 1 addition & 1 deletion app/controlplane/pkg/data/ent/schema/orginvitation.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
"entgo.io/ent/dialect/entsql"
"entgo.io/ent/schema/edge"
"entgo.io/ent/schema/field"
"github.com/chainloop-dev/chainloop/app/controlplane/internal/authz"
"github.com/chainloop-dev/chainloop/app/controlplane/pkg/authz"
"github.com/chainloop-dev/chainloop/app/controlplane/pkg/biz"
"github.com/google/uuid"
)
Expand Down
2 changes: 1 addition & 1 deletion app/controlplane/pkg/data/membership.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import (
"context"
"fmt"

"github.com/chainloop-dev/chainloop/app/controlplane/internal/authz"
"github.com/chainloop-dev/chainloop/app/controlplane/pkg/authz"
"github.com/chainloop-dev/chainloop/app/controlplane/pkg/biz"
"github.com/chainloop-dev/chainloop/app/controlplane/pkg/data/ent"
"github.com/chainloop-dev/chainloop/app/controlplane/pkg/data/ent/membership"
Expand Down
2 changes: 1 addition & 1 deletion app/controlplane/pkg/data/orginvitation.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
"fmt"
"time"

"github.com/chainloop-dev/chainloop/app/controlplane/internal/authz"
"github.com/chainloop-dev/chainloop/app/controlplane/pkg/authz"
"github.com/chainloop-dev/chainloop/app/controlplane/pkg/biz"
"github.com/chainloop-dev/chainloop/app/controlplane/pkg/data/ent"
"github.com/chainloop-dev/chainloop/app/controlplane/pkg/data/ent/orginvitation"
Expand Down

0 comments on commit 48faa88

Please sign in to comment.