Skip to content

Commit

Permalink
Merge pull request #93 from Kuadrant/kuadrant-org
Browse files Browse the repository at this point in the history
Update 3scale-labs refs -> kuadrant
  • Loading branch information
guicassolato authored Apr 22, 2021
2 parents 3c1713d + 93b6256 commit a53c0df
Show file tree
Hide file tree
Showing 40 changed files with 84 additions and 84 deletions.
2 changes: 1 addition & 1 deletion PROJECT
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
domain: authorino.3scale.net
layout: go.kubebuilder.io/v2
projectName: authorino
repo: github.com/3scale-labs/authorino/
repo: github.com/kuadrant/authorino/
resources:
- group: config
kind: Service
Expand Down
6 changes: 3 additions & 3 deletions controllers/secret_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import (
"context"
"reflect"

"github.com/3scale-labs/authorino/api/v1beta1"
configv1beta1 "github.com/3scale-labs/authorino/api/v1beta1"
"github.com/3scale-labs/authorino/pkg/common"
"github.com/kuadrant/authorino/api/v1beta1"
configv1beta1 "github.com/kuadrant/authorino/api/v1beta1"
"github.com/kuadrant/authorino/pkg/common"

"github.com/go-logr/logr"
v1 "k8s.io/api/core/v1"
Expand Down
2 changes: 1 addition & 1 deletion controllers/secret_controller_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package controllers
import (
"testing"

"github.com/3scale-labs/authorino/api/v1beta1"
"github.com/kuadrant/authorino/api/v1beta1"
"gotest.tools/assert"

v1 "k8s.io/api/core/v1"
Expand Down
18 changes: 9 additions & 9 deletions controllers/service_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,15 @@ import (
"context"
"fmt"

configv1beta1 "github.com/3scale-labs/authorino/api/v1beta1"
"github.com/3scale-labs/authorino/pkg/cache"
"github.com/3scale-labs/authorino/pkg/common"
"github.com/3scale-labs/authorino/pkg/common/auth_credentials"
"github.com/3scale-labs/authorino/pkg/config"
authorinoService "github.com/3scale-labs/authorino/pkg/config"
authorinoAuthorization "github.com/3scale-labs/authorino/pkg/config/authorization"
authorinoIdentity "github.com/3scale-labs/authorino/pkg/config/identity"
authorinoMetadata "github.com/3scale-labs/authorino/pkg/config/metadata"
configv1beta1 "github.com/kuadrant/authorino/api/v1beta1"
"github.com/kuadrant/authorino/pkg/cache"
"github.com/kuadrant/authorino/pkg/common"
"github.com/kuadrant/authorino/pkg/common/auth_credentials"
"github.com/kuadrant/authorino/pkg/config"
authorinoService "github.com/kuadrant/authorino/pkg/config"
authorinoAuthorization "github.com/kuadrant/authorino/pkg/config/authorization"
authorinoIdentity "github.com/kuadrant/authorino/pkg/config/identity"
authorinoMetadata "github.com/kuadrant/authorino/pkg/config/metadata"

"github.com/go-logr/logr"
v1 "k8s.io/api/core/v1"
Expand Down
6 changes: 3 additions & 3 deletions controllers/service_controller_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ import (
"os"
"testing"

"github.com/3scale-labs/authorino/api/v1beta1"
"github.com/3scale-labs/authorino/pkg/cache"
. "github.com/3scale-labs/authorino/pkg/common/mocks"
"github.com/kuadrant/authorino/api/v1beta1"
"github.com/kuadrant/authorino/pkg/cache"
. "github.com/kuadrant/authorino/pkg/common/mocks"

"gotest.tools/assert"
v1 "k8s.io/api/core/v1"
Expand Down
2 changes: 1 addition & 1 deletion controllers/suite_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import (
logf "sigs.k8s.io/controller-runtime/pkg/log"
"sigs.k8s.io/controller-runtime/pkg/log/zap"

configv1beta1 "github.com/3scale-labs/authorino/api/v1beta1"
configv1beta1 "github.com/kuadrant/authorino/api/v1beta1"
// +kubebuilder:scaffold:imports
)

Expand Down
16 changes: 8 additions & 8 deletions docs/architecture.md
Original file line number Diff line number Diff line change
Expand Up @@ -80,11 +80,11 @@ The authorization policies evaluated in phase (iii) can use any info from the au
</tr>
<tr>
<td>mTLS</td>
<td>Planned (<a href="https://github.com/3scale-labs/authorino/issues/8">#8</a>)</td>
<td>Planned (<a href="https://github.com/kuadrant/authorino/issues/8">#8</a>)</td>
</tr>
<tr>
<td>HMAC</td>
<td>Planned (<a href="https://github.com/3scale-labs/authorino/issues/9">#9</a>)</td>
<td>Planned (<a href="https://github.com/kuadrant/authorino/issues/9">#9</a>)</td>
</tr>
<tr>
<td>OAuth 2.0 (token introspection)</td>
Expand Down Expand Up @@ -113,7 +113,7 @@ The authorization policies evaluated in phase (iii) can use any info from the au
</tr>
<tr>
<td>HTTP GET-by-POST</td>
<td>Planned (<a href="https://github.com/3scale-labs/authorino/issues/10">#10</a>)</td>
<td>Planned (<a href="https://github.com/kuadrant/authorino/issues/10">#10</a>)</td>
</tr>
<tr>
<td rowspan="4">Policy enforcement</td>
Expand Down Expand Up @@ -143,27 +143,27 @@ The authorization policies evaluated in phase (iii) can use any info from the au
</tr>
<tr>
<td>Revoked access tokens</td>
<td>In analysis (<a href="https://github.com/3scale-labs/authorino/issues/19">#19</a>)</td>
<td>In analysis (<a href="https://github.com/kuadrant/authorino/issues/19">#19</a>)</td>
</tr>
<tr>
<td>Resource data</td>
<td>Planned (<a href="https://github.com/3scale-labs/authorino/issues/21">#21</a>)</td>
<td>Planned (<a href="https://github.com/kuadrant/authorino/issues/21">#21</a>)</td>
</tr>
<tr>
<td>Compiled Rego policies</td>
<td>Ready</td>
</tr>
<tr>
<td>Repeated requests</td>
<td>In analysis (<a href="https://github.com/3scale-labs/authorino/issues/20">#20</a>)</td>
<td>In analysis (<a href="https://github.com/kuadrant/authorino/issues/20">#20</a>)</td>
</tr>
<tr>
<td colspan="2">Mutate request with auth data</td>
<td>Planned (<a href="https://github.com/3scale-labs/authorino/issues/22">#22</a>)</td>
<td>Planned (<a href="https://github.com/kuadrant/authorino/issues/22">#22</a>)</td>
</tr>
<tr>
<td colspan="2">Token normalization (Edge Auth)</td>
<td>In analysis (<a href="https://github.com/3scale-labs/authorino/issues/24">#24</a>)</td>
<td>In analysis (<a href="https://github.com/kuadrant/authorino/issues/24">#24</a>)</td>
</tr>
<tr>
<td colspan="2">Multitenancy (multiple upstreams and hosts)</td>
Expand Down
6 changes: 3 additions & 3 deletions docs/contributing.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

## Open issues

Start by checking the list of [issues](https://github.com/3scale-labs/authorino/issues) in GitHub. Maybe your idea was discussed in the past or is part of an ongoing conversation.
Start by checking the list of [issues](https://github.com/kuadrant/authorino/issues) in GitHub. Maybe your idea was discussed in the past or is part of an ongoing conversation.

In case it is a new idea for enhancement, a bug fix, a question or whatever unprecedented contribution you want to share, before sending a pull-request, please make sure to [describe the issue](https://github.com/3scale-labs/authorino/issues/new) so we can have a conversation together and help you fin dthe best way to get your contribution merged.
In case it is a new idea for enhancement, a bug fix, a question or whatever unprecedented contribution you want to share, before sending a pull-request, please make sure to [describe the issue](https://github.com/kuadrant/authorino/issues/new) so we can have a conversation together and help you fin dthe best way to get your contribution merged.

## Local setup

Expand All @@ -16,7 +16,7 @@ Make sure you have installed:
Then fork the repo and download the Golang dependencies:

```sh
git clone [email protected]:3scale-labs/authorino.git && cd authorino
git clone [email protected]:kuadrant/authorino.git && cd authorino
make vendor
```

Expand Down
2 changes: 1 addition & 1 deletion docs/deploy.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
This is the easiest way to get Authorino's Kubernetes resources and deployment utils.

```sh
git clone [email protected]:3scale-labs/authorino.git && cd authorino
git clone [email protected]:kuadrant/authorino.git && cd authorino
```

## Meet the requirements
Expand Down
2 changes: 1 addition & 1 deletion docs/tutorials/showcase/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ On top of this platform, the following applications compose the stack for this t
## Clone the repo

```sh
$ git clone [email protected]:3scale-labs/authorino.git && cd authorino
$ git clone [email protected]:kuadrant/authorino.git && cd authorino
```

## Setup the trial local environment
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/3scale-labs/authorino
module github.com/kuadrant/authorino

go 1.15

Expand Down
8 changes: 4 additions & 4 deletions main.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ import (
"google.golang.org/grpc"
healthpb "google.golang.org/grpc/health/grpc_health_v1"

configv1beta1 "github.com/3scale-labs/authorino/api/v1beta1"
"github.com/3scale-labs/authorino/controllers"
"github.com/3scale-labs/authorino/pkg/cache"
"github.com/3scale-labs/authorino/pkg/service"
configv1beta1 "github.com/kuadrant/authorino/api/v1beta1"
"github.com/kuadrant/authorino/controllers"
"github.com/kuadrant/authorino/pkg/cache"
"github.com/kuadrant/authorino/pkg/service"

"k8s.io/apimachinery/pkg/runtime"
utilruntime "k8s.io/apimachinery/pkg/util/runtime"
Expand Down
2 changes: 1 addition & 1 deletion pkg/cache/cache.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"fmt"
"sync"

"github.com/3scale-labs/authorino/pkg/config"
"github.com/kuadrant/authorino/pkg/config"
)

type Cache struct {
Expand Down
4 changes: 2 additions & 2 deletions pkg/cache/cache_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"context"
"testing"

"github.com/3scale-labs/authorino/pkg/common"
"github.com/3scale-labs/authorino/pkg/config"
"github.com/kuadrant/authorino/pkg/common"
"github.com/kuadrant/authorino/pkg/config"
"gotest.tools/assert"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/common/auth.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package common
import (
"golang.org/x/net/context"

"github.com/3scale-labs/authorino/pkg/common/auth_credentials"
"github.com/kuadrant/authorino/pkg/common/auth_credentials"

envoy_auth "github.com/envoyproxy/go-control-plane/envoy/service/auth/v3"
v1 "k8s.io/api/core/v1"
Expand Down
4 changes: 2 additions & 2 deletions pkg/common/mocks/mock_common.go

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

4 changes: 2 additions & 2 deletions pkg/config/authorization.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"context"
"fmt"

"github.com/3scale-labs/authorino/pkg/common"
"github.com/3scale-labs/authorino/pkg/config/authorization"
"github.com/kuadrant/authorino/pkg/common"
"github.com/kuadrant/authorino/pkg/config/authorization"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion pkg/config/authorization/json.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"fmt"
"regexp"

"github.com/3scale-labs/authorino/pkg/common"
"github.com/kuadrant/authorino/pkg/common"

"github.com/tidwall/gjson"
)
Expand Down
2 changes: 1 addition & 1 deletion pkg/config/authorization/json_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package authorization
import (
"testing"

mock_common "github.com/3scale-labs/authorino/pkg/common/mocks"
mock_common "github.com/kuadrant/authorino/pkg/common/mocks"

envoy_auth "github.com/envoyproxy/go-control-plane/envoy/service/auth/v3"
. "github.com/golang/mock/gomock"
Expand Down
2 changes: 1 addition & 1 deletion pkg/config/authorization/opa.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"crypto/md5"
"fmt"

"github.com/3scale-labs/authorino/pkg/common"
"github.com/kuadrant/authorino/pkg/common"

"github.com/open-policy-agent/opa/rego"
ctrl "sigs.k8s.io/controller-runtime"
Expand Down
2 changes: 1 addition & 1 deletion pkg/config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package config
import (
"fmt"

"github.com/3scale-labs/authorino/pkg/common"
"github.com/kuadrant/authorino/pkg/common"
)

// APIConfig holds the static configuration to be evaluated in the auth pipeline
Expand Down
6 changes: 3 additions & 3 deletions pkg/config/identity.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import (
"context"
"fmt"

"github.com/3scale-labs/authorino/pkg/common"
"github.com/3scale-labs/authorino/pkg/common/auth_credentials"
"github.com/3scale-labs/authorino/pkg/config/identity"
"github.com/kuadrant/authorino/pkg/common"
"github.com/kuadrant/authorino/pkg/common/auth_credentials"
"github.com/kuadrant/authorino/pkg/config/identity"

v1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/types"
Expand Down
4 changes: 2 additions & 2 deletions pkg/config/identity/api_key.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
"k8s.io/apimachinery/pkg/types"
"sigs.k8s.io/controller-runtime/pkg/client"

"github.com/3scale-labs/authorino/pkg/common"
"github.com/3scale-labs/authorino/pkg/common/auth_credentials"
"github.com/kuadrant/authorino/pkg/common"
"github.com/kuadrant/authorino/pkg/common/auth_credentials"
ctrl "sigs.k8s.io/controller-runtime"
)

Expand Down
4 changes: 2 additions & 2 deletions pkg/config/identity/api_key_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"fmt"
"testing"

. "github.com/3scale-labs/authorino/pkg/common/auth_credentials/mocks"
. "github.com/3scale-labs/authorino/pkg/common/mocks"
. "github.com/kuadrant/authorino/pkg/common/auth_credentials/mocks"
. "github.com/kuadrant/authorino/pkg/common/mocks"

. "github.com/golang/mock/gomock"
v1 "k8s.io/api/core/v1"
Expand Down
4 changes: 2 additions & 2 deletions pkg/config/identity/hmac.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package identity
import (
"context"

"github.com/3scale-labs/authorino/pkg/common"
"github.com/3scale-labs/authorino/pkg/common/auth_credentials"
"github.com/kuadrant/authorino/pkg/common"
"github.com/kuadrant/authorino/pkg/common/auth_credentials"
)

type HMAC struct {
Expand Down
4 changes: 2 additions & 2 deletions pkg/config/identity/kubernetes_auth.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"context"
"fmt"

"github.com/3scale-labs/authorino/pkg/common"
"github.com/3scale-labs/authorino/pkg/common/auth_credentials"
"github.com/kuadrant/authorino/pkg/common"
"github.com/kuadrant/authorino/pkg/common/auth_credentials"

jwt "github.com/dgrijalva/jwt-go"
authv1 "k8s.io/api/authentication/v1"
Expand Down
4 changes: 2 additions & 2 deletions pkg/config/identity/kubernetes_auth_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"encoding/json"
"testing"

mock_auth_credentials "github.com/3scale-labs/authorino/pkg/common/auth_credentials/mocks"
mock_common "github.com/3scale-labs/authorino/pkg/common/mocks"
mock_auth_credentials "github.com/kuadrant/authorino/pkg/common/auth_credentials/mocks"
mock_common "github.com/kuadrant/authorino/pkg/common/mocks"

envoy_auth "github.com/envoyproxy/go-control-plane/envoy/service/auth/v3"
"github.com/golang/mock/gomock"
Expand Down
4 changes: 2 additions & 2 deletions pkg/config/identity/mtls.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package identity
import (
"context"

"github.com/3scale-labs/authorino/pkg/common"
"github.com/3scale-labs/authorino/pkg/common/auth_credentials"
"github.com/kuadrant/authorino/pkg/common"
"github.com/kuadrant/authorino/pkg/common/auth_credentials"
)

type MTLS struct {
Expand Down
4 changes: 2 additions & 2 deletions pkg/config/identity/oauth2.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
"net/http"
"net/url"

"github.com/3scale-labs/authorino/pkg/common"
"github.com/3scale-labs/authorino/pkg/common/auth_credentials"
"github.com/kuadrant/authorino/pkg/common"
"github.com/kuadrant/authorino/pkg/common/auth_credentials"
)

type OAuth2 struct {
Expand Down
4 changes: 2 additions & 2 deletions pkg/config/identity/oauth2_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"fmt"
"testing"

. "github.com/3scale-labs/authorino/pkg/common/auth_credentials/mocks"
. "github.com/3scale-labs/authorino/pkg/common/mocks"
. "github.com/kuadrant/authorino/pkg/common/auth_credentials/mocks"
. "github.com/kuadrant/authorino/pkg/common/mocks"

. "github.com/golang/mock/gomock"

Expand Down
4 changes: 2 additions & 2 deletions pkg/config/identity/oidc.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"context"
"net/url"

"github.com/3scale-labs/authorino/pkg/common"
"github.com/3scale-labs/authorino/pkg/common/auth_credentials"
"github.com/kuadrant/authorino/pkg/common"
"github.com/kuadrant/authorino/pkg/common/auth_credentials"

goidc "github.com/coreos/go-oidc"
)
Expand Down
Loading

0 comments on commit a53c0df

Please sign in to comment.