diff --git a/pkg/apis/identity/v0alpha1/doc.go b/pkg/apis/iam/v0alpha1/doc.go similarity index 73% rename from pkg/apis/identity/v0alpha1/doc.go rename to pkg/apis/iam/v0alpha1/doc.go index 5aaa55b2731..ae200d6cfe5 100644 --- a/pkg/apis/identity/v0alpha1/doc.go +++ b/pkg/apis/iam/v0alpha1/doc.go @@ -1,6 +1,6 @@ // +k8s:deepcopy-gen=package // +k8s:openapi-gen=true // +k8s:defaulter-gen=TypeMeta -// +groupName=identity.grafana.app +// +groupName=iam.grafana.app -package v0alpha1 // import "github.com/grafana/grafana/pkg/apis/identity/v0alpha1" +package v0alpha1 // import "github.com/grafana/grafana/pkg/apis/iam/v0alpha1" diff --git a/pkg/apis/identity/v0alpha1/register.go b/pkg/apis/iam/v0alpha1/register.go similarity index 99% rename from pkg/apis/identity/v0alpha1/register.go rename to pkg/apis/iam/v0alpha1/register.go index e48274e60c9..f2b713dbe19 100644 --- a/pkg/apis/identity/v0alpha1/register.go +++ b/pkg/apis/iam/v0alpha1/register.go @@ -11,7 +11,7 @@ import ( ) const ( - GROUP = "identity.grafana.app" + GROUP = "iam.grafana.app" VERSION = "v0alpha1" APIVERSION = GROUP + "/" + VERSION ) diff --git a/pkg/apis/identity/v0alpha1/types_identity.go b/pkg/apis/iam/v0alpha1/types_identity.go similarity index 100% rename from pkg/apis/identity/v0alpha1/types_identity.go rename to pkg/apis/iam/v0alpha1/types_identity.go diff --git a/pkg/apis/identity/v0alpha1/types_servier_account.go b/pkg/apis/iam/v0alpha1/types_servier_account.go similarity index 100% rename from pkg/apis/identity/v0alpha1/types_servier_account.go rename to pkg/apis/iam/v0alpha1/types_servier_account.go diff --git a/pkg/apis/identity/v0alpha1/types_sso.go b/pkg/apis/iam/v0alpha1/types_sso.go similarity index 100% rename from pkg/apis/identity/v0alpha1/types_sso.go rename to pkg/apis/iam/v0alpha1/types_sso.go diff --git a/pkg/apis/identity/v0alpha1/types_team.go b/pkg/apis/iam/v0alpha1/types_team.go similarity index 100% rename from pkg/apis/identity/v0alpha1/types_team.go rename to pkg/apis/iam/v0alpha1/types_team.go diff --git a/pkg/apis/identity/v0alpha1/types_user.go b/pkg/apis/iam/v0alpha1/types_user.go similarity index 100% rename from pkg/apis/identity/v0alpha1/types_user.go rename to pkg/apis/iam/v0alpha1/types_user.go diff --git a/pkg/apis/identity/v0alpha1/zz_generated.deepcopy.go b/pkg/apis/iam/v0alpha1/zz_generated.deepcopy.go similarity index 100% rename from pkg/apis/identity/v0alpha1/zz_generated.deepcopy.go rename to pkg/apis/iam/v0alpha1/zz_generated.deepcopy.go diff --git a/pkg/apis/identity/v0alpha1/zz_generated.defaults.go b/pkg/apis/iam/v0alpha1/zz_generated.defaults.go similarity index 100% rename from pkg/apis/identity/v0alpha1/zz_generated.defaults.go rename to pkg/apis/iam/v0alpha1/zz_generated.defaults.go diff --git a/pkg/apis/identity/v0alpha1/zz_generated.openapi.go b/pkg/apis/iam/v0alpha1/zz_generated.openapi.go similarity index 77% rename from pkg/apis/identity/v0alpha1/zz_generated.openapi.go rename to pkg/apis/iam/v0alpha1/zz_generated.openapi.go index 3fee7aa66fe..1ec80097388 100644 --- a/pkg/apis/identity/v0alpha1/zz_generated.openapi.go +++ b/pkg/apis/iam/v0alpha1/zz_generated.openapi.go @@ -14,33 +14,33 @@ import ( func GetOpenAPIDefinitions(ref common.ReferenceCallback) map[string]common.OpenAPIDefinition { return map[string]common.OpenAPIDefinition{ - "github.com/grafana/grafana/pkg/apis/identity/v0alpha1.IdentityDisplay": schema_pkg_apis_identity_v0alpha1_IdentityDisplay(ref), - "github.com/grafana/grafana/pkg/apis/identity/v0alpha1.IdentityDisplayResults": schema_pkg_apis_identity_v0alpha1_IdentityDisplayResults(ref), - "github.com/grafana/grafana/pkg/apis/identity/v0alpha1.SSOSetting": schema_pkg_apis_identity_v0alpha1_SSOSetting(ref), - "github.com/grafana/grafana/pkg/apis/identity/v0alpha1.SSOSettingList": schema_pkg_apis_identity_v0alpha1_SSOSettingList(ref), - "github.com/grafana/grafana/pkg/apis/identity/v0alpha1.SSOSettingSpec": schema_pkg_apis_identity_v0alpha1_SSOSettingSpec(ref), - "github.com/grafana/grafana/pkg/apis/identity/v0alpha1.ServiceAccount": schema_pkg_apis_identity_v0alpha1_ServiceAccount(ref), - "github.com/grafana/grafana/pkg/apis/identity/v0alpha1.ServiceAccountList": schema_pkg_apis_identity_v0alpha1_ServiceAccountList(ref), - "github.com/grafana/grafana/pkg/apis/identity/v0alpha1.ServiceAccountSpec": schema_pkg_apis_identity_v0alpha1_ServiceAccountSpec(ref), - "github.com/grafana/grafana/pkg/apis/identity/v0alpha1.Team": schema_pkg_apis_identity_v0alpha1_Team(ref), - "github.com/grafana/grafana/pkg/apis/identity/v0alpha1.TeamBinding": schema_pkg_apis_identity_v0alpha1_TeamBinding(ref), - "github.com/grafana/grafana/pkg/apis/identity/v0alpha1.TeamBindingList": schema_pkg_apis_identity_v0alpha1_TeamBindingList(ref), - "github.com/grafana/grafana/pkg/apis/identity/v0alpha1.TeamBindingSpec": schema_pkg_apis_identity_v0alpha1_TeamBindingSpec(ref), - "github.com/grafana/grafana/pkg/apis/identity/v0alpha1.TeamList": schema_pkg_apis_identity_v0alpha1_TeamList(ref), - "github.com/grafana/grafana/pkg/apis/identity/v0alpha1.TeamMember": schema_pkg_apis_identity_v0alpha1_TeamMember(ref), - "github.com/grafana/grafana/pkg/apis/identity/v0alpha1.TeamMemberList": schema_pkg_apis_identity_v0alpha1_TeamMemberList(ref), - "github.com/grafana/grafana/pkg/apis/identity/v0alpha1.TeamRef": schema_pkg_apis_identity_v0alpha1_TeamRef(ref), - "github.com/grafana/grafana/pkg/apis/identity/v0alpha1.TeamSpec": schema_pkg_apis_identity_v0alpha1_TeamSpec(ref), - "github.com/grafana/grafana/pkg/apis/identity/v0alpha1.TeamSubject": schema_pkg_apis_identity_v0alpha1_TeamSubject(ref), - "github.com/grafana/grafana/pkg/apis/identity/v0alpha1.User": schema_pkg_apis_identity_v0alpha1_User(ref), - "github.com/grafana/grafana/pkg/apis/identity/v0alpha1.UserList": schema_pkg_apis_identity_v0alpha1_UserList(ref), - "github.com/grafana/grafana/pkg/apis/identity/v0alpha1.UserSpec": schema_pkg_apis_identity_v0alpha1_UserSpec(ref), - "github.com/grafana/grafana/pkg/apis/identity/v0alpha1.UserTeam": schema_pkg_apis_identity_v0alpha1_UserTeam(ref), - "github.com/grafana/grafana/pkg/apis/identity/v0alpha1.UserTeamList": schema_pkg_apis_identity_v0alpha1_UserTeamList(ref), + "github.com/grafana/grafana/pkg/apis/iam/v0alpha1.IdentityDisplay": schema_pkg_apis_iam_v0alpha1_IdentityDisplay(ref), + "github.com/grafana/grafana/pkg/apis/iam/v0alpha1.IdentityDisplayResults": schema_pkg_apis_iam_v0alpha1_IdentityDisplayResults(ref), + "github.com/grafana/grafana/pkg/apis/iam/v0alpha1.SSOSetting": schema_pkg_apis_iam_v0alpha1_SSOSetting(ref), + "github.com/grafana/grafana/pkg/apis/iam/v0alpha1.SSOSettingList": schema_pkg_apis_iam_v0alpha1_SSOSettingList(ref), + "github.com/grafana/grafana/pkg/apis/iam/v0alpha1.SSOSettingSpec": schema_pkg_apis_iam_v0alpha1_SSOSettingSpec(ref), + "github.com/grafana/grafana/pkg/apis/iam/v0alpha1.ServiceAccount": schema_pkg_apis_iam_v0alpha1_ServiceAccount(ref), + "github.com/grafana/grafana/pkg/apis/iam/v0alpha1.ServiceAccountList": schema_pkg_apis_iam_v0alpha1_ServiceAccountList(ref), + "github.com/grafana/grafana/pkg/apis/iam/v0alpha1.ServiceAccountSpec": schema_pkg_apis_iam_v0alpha1_ServiceAccountSpec(ref), + "github.com/grafana/grafana/pkg/apis/iam/v0alpha1.Team": schema_pkg_apis_iam_v0alpha1_Team(ref), + "github.com/grafana/grafana/pkg/apis/iam/v0alpha1.TeamBinding": schema_pkg_apis_iam_v0alpha1_TeamBinding(ref), + "github.com/grafana/grafana/pkg/apis/iam/v0alpha1.TeamBindingList": schema_pkg_apis_iam_v0alpha1_TeamBindingList(ref), + "github.com/grafana/grafana/pkg/apis/iam/v0alpha1.TeamBindingSpec": schema_pkg_apis_iam_v0alpha1_TeamBindingSpec(ref), + "github.com/grafana/grafana/pkg/apis/iam/v0alpha1.TeamList": schema_pkg_apis_iam_v0alpha1_TeamList(ref), + "github.com/grafana/grafana/pkg/apis/iam/v0alpha1.TeamMember": schema_pkg_apis_iam_v0alpha1_TeamMember(ref), + "github.com/grafana/grafana/pkg/apis/iam/v0alpha1.TeamMemberList": schema_pkg_apis_iam_v0alpha1_TeamMemberList(ref), + "github.com/grafana/grafana/pkg/apis/iam/v0alpha1.TeamRef": schema_pkg_apis_iam_v0alpha1_TeamRef(ref), + "github.com/grafana/grafana/pkg/apis/iam/v0alpha1.TeamSpec": schema_pkg_apis_iam_v0alpha1_TeamSpec(ref), + "github.com/grafana/grafana/pkg/apis/iam/v0alpha1.TeamSubject": schema_pkg_apis_iam_v0alpha1_TeamSubject(ref), + "github.com/grafana/grafana/pkg/apis/iam/v0alpha1.User": schema_pkg_apis_iam_v0alpha1_User(ref), + "github.com/grafana/grafana/pkg/apis/iam/v0alpha1.UserList": schema_pkg_apis_iam_v0alpha1_UserList(ref), + "github.com/grafana/grafana/pkg/apis/iam/v0alpha1.UserSpec": schema_pkg_apis_iam_v0alpha1_UserSpec(ref), + "github.com/grafana/grafana/pkg/apis/iam/v0alpha1.UserTeam": schema_pkg_apis_iam_v0alpha1_UserTeam(ref), + "github.com/grafana/grafana/pkg/apis/iam/v0alpha1.UserTeamList": schema_pkg_apis_iam_v0alpha1_UserTeamList(ref), } } -func schema_pkg_apis_identity_v0alpha1_IdentityDisplay(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_pkg_apis_iam_v0alpha1_IdentityDisplay(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -91,7 +91,7 @@ func schema_pkg_apis_identity_v0alpha1_IdentityDisplay(ref common.ReferenceCallb } } -func schema_pkg_apis_identity_v0alpha1_IdentityDisplayResults(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_pkg_apis_iam_v0alpha1_IdentityDisplayResults(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -144,7 +144,7 @@ func schema_pkg_apis_identity_v0alpha1_IdentityDisplayResults(ref common.Referen Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/grafana/grafana/pkg/apis/identity/v0alpha1.IdentityDisplay"), + Ref: ref("github.com/grafana/grafana/pkg/apis/iam/v0alpha1.IdentityDisplay"), }, }, }, @@ -175,11 +175,11 @@ func schema_pkg_apis_identity_v0alpha1_IdentityDisplayResults(ref common.Referen }, }, Dependencies: []string{ - "github.com/grafana/grafana/pkg/apis/identity/v0alpha1.IdentityDisplay"}, + "github.com/grafana/grafana/pkg/apis/iam/v0alpha1.IdentityDisplay"}, } } -func schema_pkg_apis_identity_v0alpha1_SSOSetting(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_pkg_apis_iam_v0alpha1_SSOSetting(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -209,18 +209,18 @@ func schema_pkg_apis_identity_v0alpha1_SSOSetting(ref common.ReferenceCallback) "spec": { SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/grafana/grafana/pkg/apis/identity/v0alpha1.SSOSettingSpec"), + Ref: ref("github.com/grafana/grafana/pkg/apis/iam/v0alpha1.SSOSettingSpec"), }, }, }, }, }, Dependencies: []string{ - "github.com/grafana/grafana/pkg/apis/identity/v0alpha1.SSOSettingSpec", "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"}, + "github.com/grafana/grafana/pkg/apis/iam/v0alpha1.SSOSettingSpec", "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"}, } } -func schema_pkg_apis_identity_v0alpha1_SSOSettingList(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_pkg_apis_iam_v0alpha1_SSOSettingList(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -253,7 +253,7 @@ func schema_pkg_apis_identity_v0alpha1_SSOSettingList(ref common.ReferenceCallba Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/grafana/grafana/pkg/apis/identity/v0alpha1.SSOSetting"), + Ref: ref("github.com/grafana/grafana/pkg/apis/iam/v0alpha1.SSOSetting"), }, }, }, @@ -263,11 +263,11 @@ func schema_pkg_apis_identity_v0alpha1_SSOSettingList(ref common.ReferenceCallba }, }, Dependencies: []string{ - "github.com/grafana/grafana/pkg/apis/identity/v0alpha1.SSOSetting", "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"}, + "github.com/grafana/grafana/pkg/apis/iam/v0alpha1.SSOSetting", "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"}, } } -func schema_pkg_apis_identity_v0alpha1_SSOSettingSpec(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_pkg_apis_iam_v0alpha1_SSOSettingSpec(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -297,7 +297,7 @@ func schema_pkg_apis_identity_v0alpha1_SSOSettingSpec(ref common.ReferenceCallba } } -func schema_pkg_apis_identity_v0alpha1_ServiceAccount(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_pkg_apis_iam_v0alpha1_ServiceAccount(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -326,18 +326,18 @@ func schema_pkg_apis_identity_v0alpha1_ServiceAccount(ref common.ReferenceCallba "spec": { SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/grafana/grafana/pkg/apis/identity/v0alpha1.ServiceAccountSpec"), + Ref: ref("github.com/grafana/grafana/pkg/apis/iam/v0alpha1.ServiceAccountSpec"), }, }, }, }, }, Dependencies: []string{ - "github.com/grafana/grafana/pkg/apis/identity/v0alpha1.ServiceAccountSpec", "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"}, + "github.com/grafana/grafana/pkg/apis/iam/v0alpha1.ServiceAccountSpec", "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"}, } } -func schema_pkg_apis_identity_v0alpha1_ServiceAccountList(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_pkg_apis_iam_v0alpha1_ServiceAccountList(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -370,7 +370,7 @@ func schema_pkg_apis_identity_v0alpha1_ServiceAccountList(ref common.ReferenceCa Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/grafana/grafana/pkg/apis/identity/v0alpha1.ServiceAccount"), + Ref: ref("github.com/grafana/grafana/pkg/apis/iam/v0alpha1.ServiceAccount"), }, }, }, @@ -380,11 +380,11 @@ func schema_pkg_apis_identity_v0alpha1_ServiceAccountList(ref common.ReferenceCa }, }, Dependencies: []string{ - "github.com/grafana/grafana/pkg/apis/identity/v0alpha1.ServiceAccount", "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"}, + "github.com/grafana/grafana/pkg/apis/iam/v0alpha1.ServiceAccount", "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"}, } } -func schema_pkg_apis_identity_v0alpha1_ServiceAccountSpec(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_pkg_apis_iam_v0alpha1_ServiceAccountSpec(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -420,7 +420,7 @@ func schema_pkg_apis_identity_v0alpha1_ServiceAccountSpec(ref common.ReferenceCa } } -func schema_pkg_apis_identity_v0alpha1_Team(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_pkg_apis_iam_v0alpha1_Team(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -449,18 +449,18 @@ func schema_pkg_apis_identity_v0alpha1_Team(ref common.ReferenceCallback) common "spec": { SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/grafana/grafana/pkg/apis/identity/v0alpha1.TeamSpec"), + Ref: ref("github.com/grafana/grafana/pkg/apis/iam/v0alpha1.TeamSpec"), }, }, }, }, }, Dependencies: []string{ - "github.com/grafana/grafana/pkg/apis/identity/v0alpha1.TeamSpec", "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"}, + "github.com/grafana/grafana/pkg/apis/iam/v0alpha1.TeamSpec", "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"}, } } -func schema_pkg_apis_identity_v0alpha1_TeamBinding(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_pkg_apis_iam_v0alpha1_TeamBinding(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -489,18 +489,18 @@ func schema_pkg_apis_identity_v0alpha1_TeamBinding(ref common.ReferenceCallback) "spec": { SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/grafana/grafana/pkg/apis/identity/v0alpha1.TeamBindingSpec"), + Ref: ref("github.com/grafana/grafana/pkg/apis/iam/v0alpha1.TeamBindingSpec"), }, }, }, }, }, Dependencies: []string{ - "github.com/grafana/grafana/pkg/apis/identity/v0alpha1.TeamBindingSpec", "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"}, + "github.com/grafana/grafana/pkg/apis/iam/v0alpha1.TeamBindingSpec", "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"}, } } -func schema_pkg_apis_identity_v0alpha1_TeamBindingList(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_pkg_apis_iam_v0alpha1_TeamBindingList(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -533,7 +533,7 @@ func schema_pkg_apis_identity_v0alpha1_TeamBindingList(ref common.ReferenceCallb Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/grafana/grafana/pkg/apis/identity/v0alpha1.TeamBinding"), + Ref: ref("github.com/grafana/grafana/pkg/apis/iam/v0alpha1.TeamBinding"), }, }, }, @@ -543,11 +543,11 @@ func schema_pkg_apis_identity_v0alpha1_TeamBindingList(ref common.ReferenceCallb }, }, Dependencies: []string{ - "github.com/grafana/grafana/pkg/apis/identity/v0alpha1.TeamBinding", "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"}, + "github.com/grafana/grafana/pkg/apis/iam/v0alpha1.TeamBinding", "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"}, } } -func schema_pkg_apis_identity_v0alpha1_TeamBindingSpec(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_pkg_apis_iam_v0alpha1_TeamBindingSpec(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -560,7 +560,7 @@ func schema_pkg_apis_identity_v0alpha1_TeamBindingSpec(ref common.ReferenceCallb Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/grafana/grafana/pkg/apis/identity/v0alpha1.TeamSubject"), + Ref: ref("github.com/grafana/grafana/pkg/apis/iam/v0alpha1.TeamSubject"), }, }, }, @@ -569,18 +569,18 @@ func schema_pkg_apis_identity_v0alpha1_TeamBindingSpec(ref common.ReferenceCallb "teamRef": { SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/grafana/grafana/pkg/apis/identity/v0alpha1.TeamRef"), + Ref: ref("github.com/grafana/grafana/pkg/apis/iam/v0alpha1.TeamRef"), }, }, }, }, }, Dependencies: []string{ - "github.com/grafana/grafana/pkg/apis/identity/v0alpha1.TeamRef", "github.com/grafana/grafana/pkg/apis/identity/v0alpha1.TeamSubject"}, + "github.com/grafana/grafana/pkg/apis/iam/v0alpha1.TeamRef", "github.com/grafana/grafana/pkg/apis/iam/v0alpha1.TeamSubject"}, } } -func schema_pkg_apis_identity_v0alpha1_TeamList(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_pkg_apis_iam_v0alpha1_TeamList(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -613,7 +613,7 @@ func schema_pkg_apis_identity_v0alpha1_TeamList(ref common.ReferenceCallback) co Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/grafana/grafana/pkg/apis/identity/v0alpha1.Team"), + Ref: ref("github.com/grafana/grafana/pkg/apis/iam/v0alpha1.Team"), }, }, }, @@ -623,11 +623,11 @@ func schema_pkg_apis_identity_v0alpha1_TeamList(ref common.ReferenceCallback) co }, }, Dependencies: []string{ - "github.com/grafana/grafana/pkg/apis/identity/v0alpha1.Team", "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"}, + "github.com/grafana/grafana/pkg/apis/iam/v0alpha1.Team", "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"}, } } -func schema_pkg_apis_identity_v0alpha1_TeamMember(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_pkg_apis_iam_v0alpha1_TeamMember(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -693,7 +693,7 @@ func schema_pkg_apis_identity_v0alpha1_TeamMember(ref common.ReferenceCallback) } } -func schema_pkg_apis_identity_v0alpha1_TeamMemberList(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_pkg_apis_iam_v0alpha1_TeamMemberList(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -726,7 +726,7 @@ func schema_pkg_apis_identity_v0alpha1_TeamMemberList(ref common.ReferenceCallba Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/grafana/grafana/pkg/apis/identity/v0alpha1.TeamMember"), + Ref: ref("github.com/grafana/grafana/pkg/apis/iam/v0alpha1.TeamMember"), }, }, }, @@ -736,11 +736,11 @@ func schema_pkg_apis_identity_v0alpha1_TeamMemberList(ref common.ReferenceCallba }, }, Dependencies: []string{ - "github.com/grafana/grafana/pkg/apis/identity/v0alpha1.TeamMember", "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"}, + "github.com/grafana/grafana/pkg/apis/iam/v0alpha1.TeamMember", "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"}, } } -func schema_pkg_apis_identity_v0alpha1_TeamRef(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_pkg_apis_iam_v0alpha1_TeamRef(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -759,7 +759,7 @@ func schema_pkg_apis_identity_v0alpha1_TeamRef(ref common.ReferenceCallback) com } } -func schema_pkg_apis_identity_v0alpha1_TeamSpec(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_pkg_apis_iam_v0alpha1_TeamSpec(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -783,7 +783,7 @@ func schema_pkg_apis_identity_v0alpha1_TeamSpec(ref common.ReferenceCallback) co } } -func schema_pkg_apis_identity_v0alpha1_TeamSubject(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_pkg_apis_iam_v0alpha1_TeamSubject(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -810,7 +810,7 @@ func schema_pkg_apis_identity_v0alpha1_TeamSubject(ref common.ReferenceCallback) } } -func schema_pkg_apis_identity_v0alpha1_User(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_pkg_apis_iam_v0alpha1_User(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -839,18 +839,18 @@ func schema_pkg_apis_identity_v0alpha1_User(ref common.ReferenceCallback) common "spec": { SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/grafana/grafana/pkg/apis/identity/v0alpha1.UserSpec"), + Ref: ref("github.com/grafana/grafana/pkg/apis/iam/v0alpha1.UserSpec"), }, }, }, }, }, Dependencies: []string{ - "github.com/grafana/grafana/pkg/apis/identity/v0alpha1.UserSpec", "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"}, + "github.com/grafana/grafana/pkg/apis/iam/v0alpha1.UserSpec", "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"}, } } -func schema_pkg_apis_identity_v0alpha1_UserList(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_pkg_apis_iam_v0alpha1_UserList(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -883,7 +883,7 @@ func schema_pkg_apis_identity_v0alpha1_UserList(ref common.ReferenceCallback) co Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/grafana/grafana/pkg/apis/identity/v0alpha1.User"), + Ref: ref("github.com/grafana/grafana/pkg/apis/iam/v0alpha1.User"), }, }, }, @@ -893,11 +893,11 @@ func schema_pkg_apis_identity_v0alpha1_UserList(ref common.ReferenceCallback) co }, }, Dependencies: []string{ - "github.com/grafana/grafana/pkg/apis/identity/v0alpha1.User", "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"}, + "github.com/grafana/grafana/pkg/apis/iam/v0alpha1.User", "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"}, } } -func schema_pkg_apis_identity_v0alpha1_UserSpec(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_pkg_apis_iam_v0alpha1_UserSpec(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -939,7 +939,7 @@ func schema_pkg_apis_identity_v0alpha1_UserSpec(ref common.ReferenceCallback) co } } -func schema_pkg_apis_identity_v0alpha1_UserTeam(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_pkg_apis_iam_v0alpha1_UserTeam(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -954,7 +954,7 @@ func schema_pkg_apis_identity_v0alpha1_UserTeam(ref common.ReferenceCallback) co "teamRef": { SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/grafana/grafana/pkg/apis/identity/v0alpha1.TeamRef"), + Ref: ref("github.com/grafana/grafana/pkg/apis/iam/v0alpha1.TeamRef"), }, }, "permission": { @@ -969,11 +969,11 @@ func schema_pkg_apis_identity_v0alpha1_UserTeam(ref common.ReferenceCallback) co }, }, Dependencies: []string{ - "github.com/grafana/grafana/pkg/apis/identity/v0alpha1.TeamRef"}, + "github.com/grafana/grafana/pkg/apis/iam/v0alpha1.TeamRef"}, } } -func schema_pkg_apis_identity_v0alpha1_UserTeamList(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_pkg_apis_iam_v0alpha1_UserTeamList(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -1006,7 +1006,7 @@ func schema_pkg_apis_identity_v0alpha1_UserTeamList(ref common.ReferenceCallback Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/grafana/grafana/pkg/apis/identity/v0alpha1.UserTeam"), + Ref: ref("github.com/grafana/grafana/pkg/apis/iam/v0alpha1.UserTeam"), }, }, }, @@ -1016,6 +1016,6 @@ func schema_pkg_apis_identity_v0alpha1_UserTeamList(ref common.ReferenceCallback }, }, Dependencies: []string{ - "github.com/grafana/grafana/pkg/apis/identity/v0alpha1.UserTeam", "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"}, + "github.com/grafana/grafana/pkg/apis/iam/v0alpha1.UserTeam", "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"}, } } diff --git a/pkg/apis/identity/v0alpha1/zz_generated.openapi_violation_exceptions.list b/pkg/apis/iam/v0alpha1/zz_generated.openapi_violation_exceptions.list similarity index 55% rename from pkg/apis/identity/v0alpha1/zz_generated.openapi_violation_exceptions.list rename to pkg/apis/iam/v0alpha1/zz_generated.openapi_violation_exceptions.list index ed0d379d152..afb10a855dc 100644 --- a/pkg/apis/identity/v0alpha1/zz_generated.openapi_violation_exceptions.list +++ b/pkg/apis/iam/v0alpha1/zz_generated.openapi_violation_exceptions.list @@ -1,3 +1,3 @@ -API rule violation: list_type_missing,github.com/grafana/grafana/pkg/apis/identity/v0alpha1,TeamBindingSpec,Subjects -API rule violation: names_match,github.com/grafana/grafana/pkg/apis/identity/v0alpha1,IdentityDisplay,IdentityType -API rule violation: names_match,github.com/grafana/grafana/pkg/apis/identity/v0alpha1,IdentityDisplay,InternalID +API rule violation: list_type_missing,github.com/grafana/grafana/pkg/apis/iam/v0alpha1,TeamBindingSpec,Subjects +API rule violation: names_match,github.com/grafana/grafana/pkg/apis/iam/v0alpha1,IdentityDisplay,IdentityType +API rule violation: names_match,github.com/grafana/grafana/pkg/apis/iam/v0alpha1,IdentityDisplay,InternalID diff --git a/pkg/registry/apis/apis.go b/pkg/registry/apis/apis.go index 9a50a7a844c..1702c9c338e 100644 --- a/pkg/registry/apis/apis.go +++ b/pkg/registry/apis/apis.go @@ -10,7 +10,7 @@ import ( "github.com/grafana/grafana/pkg/registry/apis/datasource" "github.com/grafana/grafana/pkg/registry/apis/featuretoggle" "github.com/grafana/grafana/pkg/registry/apis/folders" - "github.com/grafana/grafana/pkg/registry/apis/identity" + "github.com/grafana/grafana/pkg/registry/apis/iam" "github.com/grafana/grafana/pkg/registry/apis/peakq" "github.com/grafana/grafana/pkg/registry/apis/playlist" "github.com/grafana/grafana/pkg/registry/apis/query" @@ -33,7 +33,7 @@ func ProvideRegistryServiceSink( _ *datasource.DataSourceAPIBuilder, _ *folders.FolderAPIBuilder, _ *peakq.PeakQAPIBuilder, - _ *identity.IdentityAPIBuilder, + _ *iam.IdentityAccessManagementAPIBuilder, _ *scope.ScopeAPIBuilder, _ *query.QueryAPIBuilder, _ *notifications.NotificationsAPIBuilder, diff --git a/pkg/registry/apis/identity/common/common.go b/pkg/registry/apis/iam/common/common.go similarity index 88% rename from pkg/registry/apis/identity/common/common.go rename to pkg/registry/apis/iam/common/common.go index c696350570a..b13bb3043b3 100644 --- a/pkg/registry/apis/identity/common/common.go +++ b/pkg/registry/apis/iam/common/common.go @@ -3,7 +3,7 @@ package common import ( "strconv" - identityv0 "github.com/grafana/grafana/pkg/apis/identity/v0alpha1" + identityv0 "github.com/grafana/grafana/pkg/apis/iam/v0alpha1" "github.com/grafana/grafana/pkg/services/team" ) diff --git a/pkg/registry/apis/identity/common/pagination.go b/pkg/registry/apis/iam/common/pagination.go similarity index 100% rename from pkg/registry/apis/identity/common/pagination.go rename to pkg/registry/apis/iam/common/pagination.go diff --git a/pkg/registry/apis/identity/legacy/display.go b/pkg/registry/apis/iam/legacy/display.go similarity index 100% rename from pkg/registry/apis/identity/legacy/display.go rename to pkg/registry/apis/iam/legacy/display.go diff --git a/pkg/registry/apis/identity/legacy/display_query.sql b/pkg/registry/apis/iam/legacy/display_query.sql similarity index 100% rename from pkg/registry/apis/identity/legacy/display_query.sql rename to pkg/registry/apis/iam/legacy/display_query.sql diff --git a/pkg/registry/apis/identity/legacy/sql.go b/pkg/registry/apis/iam/legacy/sql.go similarity index 100% rename from pkg/registry/apis/identity/legacy/sql.go rename to pkg/registry/apis/iam/legacy/sql.go diff --git a/pkg/registry/apis/identity/legacy/sql_test.go b/pkg/registry/apis/iam/legacy/sql_test.go similarity index 98% rename from pkg/registry/apis/identity/legacy/sql_test.go rename to pkg/registry/apis/iam/legacy/sql_test.go index dc9812e1c45..612262ccf99 100644 --- a/pkg/registry/apis/identity/legacy/sql_test.go +++ b/pkg/registry/apis/iam/legacy/sql_test.go @@ -4,7 +4,7 @@ import ( "testing" "text/template" - "github.com/grafana/grafana/pkg/registry/apis/identity/common" + "github.com/grafana/grafana/pkg/registry/apis/iam/common" "github.com/grafana/grafana/pkg/storage/legacysql" "github.com/grafana/grafana/pkg/storage/unified/sql/sqltemplate" "github.com/grafana/grafana/pkg/storage/unified/sql/sqltemplate/mocks" diff --git a/pkg/registry/apis/identity/legacy/team.go b/pkg/registry/apis/iam/legacy/team.go similarity index 99% rename from pkg/registry/apis/identity/legacy/team.go rename to pkg/registry/apis/iam/legacy/team.go index 27f12dd6c6a..b5e1e5d0e12 100644 --- a/pkg/registry/apis/identity/legacy/team.go +++ b/pkg/registry/apis/iam/legacy/team.go @@ -8,7 +8,7 @@ import ( "github.com/grafana/authlib/claims" "github.com/grafana/grafana/pkg/apimachinery/identity" - "github.com/grafana/grafana/pkg/registry/apis/identity/common" + "github.com/grafana/grafana/pkg/registry/apis/iam/common" "github.com/grafana/grafana/pkg/services/team" "github.com/grafana/grafana/pkg/storage/legacysql" "github.com/grafana/grafana/pkg/storage/unified/sql/sqltemplate" diff --git a/pkg/registry/apis/identity/legacy/team_bindings_query.sql b/pkg/registry/apis/iam/legacy/team_bindings_query.sql similarity index 100% rename from pkg/registry/apis/identity/legacy/team_bindings_query.sql rename to pkg/registry/apis/iam/legacy/team_bindings_query.sql diff --git a/pkg/registry/apis/identity/legacy/team_members_query.sql b/pkg/registry/apis/iam/legacy/team_members_query.sql similarity index 100% rename from pkg/registry/apis/identity/legacy/team_members_query.sql rename to pkg/registry/apis/iam/legacy/team_members_query.sql diff --git a/pkg/registry/apis/identity/legacy/teams_query.sql b/pkg/registry/apis/iam/legacy/teams_query.sql similarity index 100% rename from pkg/registry/apis/identity/legacy/teams_query.sql rename to pkg/registry/apis/iam/legacy/teams_query.sql diff --git a/pkg/registry/apis/identity/legacy/testdata/mysql--display_query-display_ids.sql b/pkg/registry/apis/iam/legacy/testdata/mysql--display_query-display_ids.sql similarity index 100% rename from pkg/registry/apis/identity/legacy/testdata/mysql--display_query-display_ids.sql rename to pkg/registry/apis/iam/legacy/testdata/mysql--display_query-display_ids.sql diff --git a/pkg/registry/apis/identity/legacy/testdata/mysql--display_query-display_ids_uids.sql b/pkg/registry/apis/iam/legacy/testdata/mysql--display_query-display_ids_uids.sql similarity index 100% rename from pkg/registry/apis/identity/legacy/testdata/mysql--display_query-display_ids_uids.sql rename to pkg/registry/apis/iam/legacy/testdata/mysql--display_query-display_ids_uids.sql diff --git a/pkg/registry/apis/identity/legacy/testdata/mysql--display_query-display_uids.sql b/pkg/registry/apis/iam/legacy/testdata/mysql--display_query-display_uids.sql similarity index 100% rename from pkg/registry/apis/identity/legacy/testdata/mysql--display_query-display_uids.sql rename to pkg/registry/apis/iam/legacy/testdata/mysql--display_query-display_uids.sql diff --git a/pkg/registry/apis/identity/legacy/testdata/mysql--team_bindings_query-team_1_bindings.sql b/pkg/registry/apis/iam/legacy/testdata/mysql--team_bindings_query-team_1_bindings.sql similarity index 100% rename from pkg/registry/apis/identity/legacy/testdata/mysql--team_bindings_query-team_1_bindings.sql rename to pkg/registry/apis/iam/legacy/testdata/mysql--team_bindings_query-team_1_bindings.sql diff --git a/pkg/registry/apis/identity/legacy/testdata/mysql--team_bindings_query-team_bindings_page_1.sql b/pkg/registry/apis/iam/legacy/testdata/mysql--team_bindings_query-team_bindings_page_1.sql similarity index 100% rename from pkg/registry/apis/identity/legacy/testdata/mysql--team_bindings_query-team_bindings_page_1.sql rename to pkg/registry/apis/iam/legacy/testdata/mysql--team_bindings_query-team_bindings_page_1.sql diff --git a/pkg/registry/apis/identity/legacy/testdata/mysql--team_bindings_query-team_bindings_page_2.sql b/pkg/registry/apis/iam/legacy/testdata/mysql--team_bindings_query-team_bindings_page_2.sql similarity index 100% rename from pkg/registry/apis/identity/legacy/testdata/mysql--team_bindings_query-team_bindings_page_2.sql rename to pkg/registry/apis/iam/legacy/testdata/mysql--team_bindings_query-team_bindings_page_2.sql diff --git a/pkg/registry/apis/identity/legacy/testdata/mysql--team_members_query-team_1_members_page_1.sql b/pkg/registry/apis/iam/legacy/testdata/mysql--team_members_query-team_1_members_page_1.sql similarity index 100% rename from pkg/registry/apis/identity/legacy/testdata/mysql--team_members_query-team_1_members_page_1.sql rename to pkg/registry/apis/iam/legacy/testdata/mysql--team_members_query-team_1_members_page_1.sql diff --git a/pkg/registry/apis/identity/legacy/testdata/mysql--team_members_query-team_1_members_page_2.sql b/pkg/registry/apis/iam/legacy/testdata/mysql--team_members_query-team_1_members_page_2.sql similarity index 100% rename from pkg/registry/apis/identity/legacy/testdata/mysql--team_members_query-team_1_members_page_2.sql rename to pkg/registry/apis/iam/legacy/testdata/mysql--team_members_query-team_1_members_page_2.sql diff --git a/pkg/registry/apis/identity/legacy/testdata/mysql--teams_query-teams_page_1.sql b/pkg/registry/apis/iam/legacy/testdata/mysql--teams_query-teams_page_1.sql similarity index 100% rename from pkg/registry/apis/identity/legacy/testdata/mysql--teams_query-teams_page_1.sql rename to pkg/registry/apis/iam/legacy/testdata/mysql--teams_query-teams_page_1.sql diff --git a/pkg/registry/apis/identity/legacy/testdata/mysql--teams_query-teams_page_2.sql b/pkg/registry/apis/iam/legacy/testdata/mysql--teams_query-teams_page_2.sql similarity index 100% rename from pkg/registry/apis/identity/legacy/testdata/mysql--teams_query-teams_page_2.sql rename to pkg/registry/apis/iam/legacy/testdata/mysql--teams_query-teams_page_2.sql diff --git a/pkg/registry/apis/identity/legacy/testdata/mysql--teams_query-teams_uid.sql b/pkg/registry/apis/iam/legacy/testdata/mysql--teams_query-teams_uid.sql similarity index 100% rename from pkg/registry/apis/identity/legacy/testdata/mysql--teams_query-teams_uid.sql rename to pkg/registry/apis/iam/legacy/testdata/mysql--teams_query-teams_uid.sql diff --git a/pkg/registry/apis/identity/legacy/testdata/mysql--user_teams_query-team_1_members_page_1.sql b/pkg/registry/apis/iam/legacy/testdata/mysql--user_teams_query-team_1_members_page_1.sql similarity index 100% rename from pkg/registry/apis/identity/legacy/testdata/mysql--user_teams_query-team_1_members_page_1.sql rename to pkg/registry/apis/iam/legacy/testdata/mysql--user_teams_query-team_1_members_page_1.sql diff --git a/pkg/registry/apis/identity/legacy/testdata/mysql--user_teams_query-team_1_members_page_2.sql b/pkg/registry/apis/iam/legacy/testdata/mysql--user_teams_query-team_1_members_page_2.sql similarity index 100% rename from pkg/registry/apis/identity/legacy/testdata/mysql--user_teams_query-team_1_members_page_2.sql rename to pkg/registry/apis/iam/legacy/testdata/mysql--user_teams_query-team_1_members_page_2.sql diff --git a/pkg/registry/apis/identity/legacy/testdata/mysql--users_query-users_page_1.sql b/pkg/registry/apis/iam/legacy/testdata/mysql--users_query-users_page_1.sql similarity index 100% rename from pkg/registry/apis/identity/legacy/testdata/mysql--users_query-users_page_1.sql rename to pkg/registry/apis/iam/legacy/testdata/mysql--users_query-users_page_1.sql diff --git a/pkg/registry/apis/identity/legacy/testdata/mysql--users_query-users_page_2.sql b/pkg/registry/apis/iam/legacy/testdata/mysql--users_query-users_page_2.sql similarity index 100% rename from pkg/registry/apis/identity/legacy/testdata/mysql--users_query-users_page_2.sql rename to pkg/registry/apis/iam/legacy/testdata/mysql--users_query-users_page_2.sql diff --git a/pkg/registry/apis/identity/legacy/testdata/mysql--users_query-users_uid.sql b/pkg/registry/apis/iam/legacy/testdata/mysql--users_query-users_uid.sql similarity index 100% rename from pkg/registry/apis/identity/legacy/testdata/mysql--users_query-users_uid.sql rename to pkg/registry/apis/iam/legacy/testdata/mysql--users_query-users_uid.sql diff --git a/pkg/registry/apis/identity/legacy/testdata/postgres--display_query-display_ids.sql b/pkg/registry/apis/iam/legacy/testdata/postgres--display_query-display_ids.sql similarity index 100% rename from pkg/registry/apis/identity/legacy/testdata/postgres--display_query-display_ids.sql rename to pkg/registry/apis/iam/legacy/testdata/postgres--display_query-display_ids.sql diff --git a/pkg/registry/apis/identity/legacy/testdata/postgres--display_query-display_ids_uids.sql b/pkg/registry/apis/iam/legacy/testdata/postgres--display_query-display_ids_uids.sql similarity index 100% rename from pkg/registry/apis/identity/legacy/testdata/postgres--display_query-display_ids_uids.sql rename to pkg/registry/apis/iam/legacy/testdata/postgres--display_query-display_ids_uids.sql diff --git a/pkg/registry/apis/identity/legacy/testdata/postgres--display_query-display_uids.sql b/pkg/registry/apis/iam/legacy/testdata/postgres--display_query-display_uids.sql similarity index 100% rename from pkg/registry/apis/identity/legacy/testdata/postgres--display_query-display_uids.sql rename to pkg/registry/apis/iam/legacy/testdata/postgres--display_query-display_uids.sql diff --git a/pkg/registry/apis/identity/legacy/testdata/postgres--team_bindings_query-team_1_bindings.sql b/pkg/registry/apis/iam/legacy/testdata/postgres--team_bindings_query-team_1_bindings.sql similarity index 100% rename from pkg/registry/apis/identity/legacy/testdata/postgres--team_bindings_query-team_1_bindings.sql rename to pkg/registry/apis/iam/legacy/testdata/postgres--team_bindings_query-team_1_bindings.sql diff --git a/pkg/registry/apis/identity/legacy/testdata/postgres--team_bindings_query-team_bindings_page_1.sql b/pkg/registry/apis/iam/legacy/testdata/postgres--team_bindings_query-team_bindings_page_1.sql similarity index 100% rename from pkg/registry/apis/identity/legacy/testdata/postgres--team_bindings_query-team_bindings_page_1.sql rename to pkg/registry/apis/iam/legacy/testdata/postgres--team_bindings_query-team_bindings_page_1.sql diff --git a/pkg/registry/apis/identity/legacy/testdata/postgres--team_bindings_query-team_bindings_page_2.sql b/pkg/registry/apis/iam/legacy/testdata/postgres--team_bindings_query-team_bindings_page_2.sql similarity index 100% rename from pkg/registry/apis/identity/legacy/testdata/postgres--team_bindings_query-team_bindings_page_2.sql rename to pkg/registry/apis/iam/legacy/testdata/postgres--team_bindings_query-team_bindings_page_2.sql diff --git a/pkg/registry/apis/identity/legacy/testdata/postgres--team_members_query-team_1_members_page_1.sql b/pkg/registry/apis/iam/legacy/testdata/postgres--team_members_query-team_1_members_page_1.sql similarity index 100% rename from pkg/registry/apis/identity/legacy/testdata/postgres--team_members_query-team_1_members_page_1.sql rename to pkg/registry/apis/iam/legacy/testdata/postgres--team_members_query-team_1_members_page_1.sql diff --git a/pkg/registry/apis/identity/legacy/testdata/postgres--team_members_query-team_1_members_page_2.sql b/pkg/registry/apis/iam/legacy/testdata/postgres--team_members_query-team_1_members_page_2.sql similarity index 100% rename from pkg/registry/apis/identity/legacy/testdata/postgres--team_members_query-team_1_members_page_2.sql rename to pkg/registry/apis/iam/legacy/testdata/postgres--team_members_query-team_1_members_page_2.sql diff --git a/pkg/registry/apis/identity/legacy/testdata/postgres--teams_query-teams_page_1.sql b/pkg/registry/apis/iam/legacy/testdata/postgres--teams_query-teams_page_1.sql similarity index 100% rename from pkg/registry/apis/identity/legacy/testdata/postgres--teams_query-teams_page_1.sql rename to pkg/registry/apis/iam/legacy/testdata/postgres--teams_query-teams_page_1.sql diff --git a/pkg/registry/apis/identity/legacy/testdata/postgres--teams_query-teams_page_2.sql b/pkg/registry/apis/iam/legacy/testdata/postgres--teams_query-teams_page_2.sql similarity index 100% rename from pkg/registry/apis/identity/legacy/testdata/postgres--teams_query-teams_page_2.sql rename to pkg/registry/apis/iam/legacy/testdata/postgres--teams_query-teams_page_2.sql diff --git a/pkg/registry/apis/identity/legacy/testdata/postgres--teams_query-teams_uid.sql b/pkg/registry/apis/iam/legacy/testdata/postgres--teams_query-teams_uid.sql similarity index 100% rename from pkg/registry/apis/identity/legacy/testdata/postgres--teams_query-teams_uid.sql rename to pkg/registry/apis/iam/legacy/testdata/postgres--teams_query-teams_uid.sql diff --git a/pkg/registry/apis/identity/legacy/testdata/postgres--user_teams_query-team_1_members_page_1.sql b/pkg/registry/apis/iam/legacy/testdata/postgres--user_teams_query-team_1_members_page_1.sql similarity index 100% rename from pkg/registry/apis/identity/legacy/testdata/postgres--user_teams_query-team_1_members_page_1.sql rename to pkg/registry/apis/iam/legacy/testdata/postgres--user_teams_query-team_1_members_page_1.sql diff --git a/pkg/registry/apis/identity/legacy/testdata/postgres--user_teams_query-team_1_members_page_2.sql b/pkg/registry/apis/iam/legacy/testdata/postgres--user_teams_query-team_1_members_page_2.sql similarity index 100% rename from pkg/registry/apis/identity/legacy/testdata/postgres--user_teams_query-team_1_members_page_2.sql rename to pkg/registry/apis/iam/legacy/testdata/postgres--user_teams_query-team_1_members_page_2.sql diff --git a/pkg/registry/apis/identity/legacy/testdata/postgres--users_query-users_page_1.sql b/pkg/registry/apis/iam/legacy/testdata/postgres--users_query-users_page_1.sql similarity index 100% rename from pkg/registry/apis/identity/legacy/testdata/postgres--users_query-users_page_1.sql rename to pkg/registry/apis/iam/legacy/testdata/postgres--users_query-users_page_1.sql diff --git a/pkg/registry/apis/identity/legacy/testdata/postgres--users_query-users_page_2.sql b/pkg/registry/apis/iam/legacy/testdata/postgres--users_query-users_page_2.sql similarity index 100% rename from pkg/registry/apis/identity/legacy/testdata/postgres--users_query-users_page_2.sql rename to pkg/registry/apis/iam/legacy/testdata/postgres--users_query-users_page_2.sql diff --git a/pkg/registry/apis/identity/legacy/testdata/postgres--users_query-users_uid.sql b/pkg/registry/apis/iam/legacy/testdata/postgres--users_query-users_uid.sql similarity index 100% rename from pkg/registry/apis/identity/legacy/testdata/postgres--users_query-users_uid.sql rename to pkg/registry/apis/iam/legacy/testdata/postgres--users_query-users_uid.sql diff --git a/pkg/registry/apis/identity/legacy/testdata/sqlite--display_query-display_ids.sql b/pkg/registry/apis/iam/legacy/testdata/sqlite--display_query-display_ids.sql similarity index 100% rename from pkg/registry/apis/identity/legacy/testdata/sqlite--display_query-display_ids.sql rename to pkg/registry/apis/iam/legacy/testdata/sqlite--display_query-display_ids.sql diff --git a/pkg/registry/apis/identity/legacy/testdata/sqlite--display_query-display_ids_uids.sql b/pkg/registry/apis/iam/legacy/testdata/sqlite--display_query-display_ids_uids.sql similarity index 100% rename from pkg/registry/apis/identity/legacy/testdata/sqlite--display_query-display_ids_uids.sql rename to pkg/registry/apis/iam/legacy/testdata/sqlite--display_query-display_ids_uids.sql diff --git a/pkg/registry/apis/identity/legacy/testdata/sqlite--display_query-display_uids.sql b/pkg/registry/apis/iam/legacy/testdata/sqlite--display_query-display_uids.sql similarity index 100% rename from pkg/registry/apis/identity/legacy/testdata/sqlite--display_query-display_uids.sql rename to pkg/registry/apis/iam/legacy/testdata/sqlite--display_query-display_uids.sql diff --git a/pkg/registry/apis/identity/legacy/testdata/sqlite--team_bindings_query-team_1_bindings.sql b/pkg/registry/apis/iam/legacy/testdata/sqlite--team_bindings_query-team_1_bindings.sql similarity index 100% rename from pkg/registry/apis/identity/legacy/testdata/sqlite--team_bindings_query-team_1_bindings.sql rename to pkg/registry/apis/iam/legacy/testdata/sqlite--team_bindings_query-team_1_bindings.sql diff --git a/pkg/registry/apis/identity/legacy/testdata/sqlite--team_bindings_query-team_bindings_page_1.sql b/pkg/registry/apis/iam/legacy/testdata/sqlite--team_bindings_query-team_bindings_page_1.sql similarity index 100% rename from pkg/registry/apis/identity/legacy/testdata/sqlite--team_bindings_query-team_bindings_page_1.sql rename to pkg/registry/apis/iam/legacy/testdata/sqlite--team_bindings_query-team_bindings_page_1.sql diff --git a/pkg/registry/apis/identity/legacy/testdata/sqlite--team_bindings_query-team_bindings_page_2.sql b/pkg/registry/apis/iam/legacy/testdata/sqlite--team_bindings_query-team_bindings_page_2.sql similarity index 100% rename from pkg/registry/apis/identity/legacy/testdata/sqlite--team_bindings_query-team_bindings_page_2.sql rename to pkg/registry/apis/iam/legacy/testdata/sqlite--team_bindings_query-team_bindings_page_2.sql diff --git a/pkg/registry/apis/identity/legacy/testdata/sqlite--team_members_query-team_1_members_page_1.sql b/pkg/registry/apis/iam/legacy/testdata/sqlite--team_members_query-team_1_members_page_1.sql similarity index 100% rename from pkg/registry/apis/identity/legacy/testdata/sqlite--team_members_query-team_1_members_page_1.sql rename to pkg/registry/apis/iam/legacy/testdata/sqlite--team_members_query-team_1_members_page_1.sql diff --git a/pkg/registry/apis/identity/legacy/testdata/sqlite--team_members_query-team_1_members_page_2.sql b/pkg/registry/apis/iam/legacy/testdata/sqlite--team_members_query-team_1_members_page_2.sql similarity index 100% rename from pkg/registry/apis/identity/legacy/testdata/sqlite--team_members_query-team_1_members_page_2.sql rename to pkg/registry/apis/iam/legacy/testdata/sqlite--team_members_query-team_1_members_page_2.sql diff --git a/pkg/registry/apis/identity/legacy/testdata/sqlite--teams_query-teams_page_1.sql b/pkg/registry/apis/iam/legacy/testdata/sqlite--teams_query-teams_page_1.sql similarity index 100% rename from pkg/registry/apis/identity/legacy/testdata/sqlite--teams_query-teams_page_1.sql rename to pkg/registry/apis/iam/legacy/testdata/sqlite--teams_query-teams_page_1.sql diff --git a/pkg/registry/apis/identity/legacy/testdata/sqlite--teams_query-teams_page_2.sql b/pkg/registry/apis/iam/legacy/testdata/sqlite--teams_query-teams_page_2.sql similarity index 100% rename from pkg/registry/apis/identity/legacy/testdata/sqlite--teams_query-teams_page_2.sql rename to pkg/registry/apis/iam/legacy/testdata/sqlite--teams_query-teams_page_2.sql diff --git a/pkg/registry/apis/identity/legacy/testdata/sqlite--teams_query-teams_uid.sql b/pkg/registry/apis/iam/legacy/testdata/sqlite--teams_query-teams_uid.sql similarity index 100% rename from pkg/registry/apis/identity/legacy/testdata/sqlite--teams_query-teams_uid.sql rename to pkg/registry/apis/iam/legacy/testdata/sqlite--teams_query-teams_uid.sql diff --git a/pkg/registry/apis/identity/legacy/testdata/sqlite--user_teams_query-team_1_members_page_1.sql b/pkg/registry/apis/iam/legacy/testdata/sqlite--user_teams_query-team_1_members_page_1.sql similarity index 100% rename from pkg/registry/apis/identity/legacy/testdata/sqlite--user_teams_query-team_1_members_page_1.sql rename to pkg/registry/apis/iam/legacy/testdata/sqlite--user_teams_query-team_1_members_page_1.sql diff --git a/pkg/registry/apis/identity/legacy/testdata/sqlite--user_teams_query-team_1_members_page_2.sql b/pkg/registry/apis/iam/legacy/testdata/sqlite--user_teams_query-team_1_members_page_2.sql similarity index 100% rename from pkg/registry/apis/identity/legacy/testdata/sqlite--user_teams_query-team_1_members_page_2.sql rename to pkg/registry/apis/iam/legacy/testdata/sqlite--user_teams_query-team_1_members_page_2.sql diff --git a/pkg/registry/apis/identity/legacy/testdata/sqlite--users_query-users_page_1.sql b/pkg/registry/apis/iam/legacy/testdata/sqlite--users_query-users_page_1.sql similarity index 100% rename from pkg/registry/apis/identity/legacy/testdata/sqlite--users_query-users_page_1.sql rename to pkg/registry/apis/iam/legacy/testdata/sqlite--users_query-users_page_1.sql diff --git a/pkg/registry/apis/identity/legacy/testdata/sqlite--users_query-users_page_2.sql b/pkg/registry/apis/iam/legacy/testdata/sqlite--users_query-users_page_2.sql similarity index 100% rename from pkg/registry/apis/identity/legacy/testdata/sqlite--users_query-users_page_2.sql rename to pkg/registry/apis/iam/legacy/testdata/sqlite--users_query-users_page_2.sql diff --git a/pkg/registry/apis/identity/legacy/testdata/sqlite--users_query-users_uid.sql b/pkg/registry/apis/iam/legacy/testdata/sqlite--users_query-users_uid.sql similarity index 100% rename from pkg/registry/apis/identity/legacy/testdata/sqlite--users_query-users_uid.sql rename to pkg/registry/apis/iam/legacy/testdata/sqlite--users_query-users_uid.sql diff --git a/pkg/registry/apis/identity/legacy/user.go b/pkg/registry/apis/iam/legacy/user.go similarity index 98% rename from pkg/registry/apis/identity/legacy/user.go rename to pkg/registry/apis/iam/legacy/user.go index ba5f71312fe..7107aae029e 100644 --- a/pkg/registry/apis/identity/legacy/user.go +++ b/pkg/registry/apis/iam/legacy/user.go @@ -6,7 +6,7 @@ import ( "text/template" "github.com/grafana/authlib/claims" - "github.com/grafana/grafana/pkg/registry/apis/identity/common" + "github.com/grafana/grafana/pkg/registry/apis/iam/common" "github.com/grafana/grafana/pkg/services/team" "github.com/grafana/grafana/pkg/services/user" "github.com/grafana/grafana/pkg/storage/legacysql" diff --git a/pkg/registry/apis/identity/legacy/user_teams_query.sql b/pkg/registry/apis/iam/legacy/user_teams_query.sql similarity index 100% rename from pkg/registry/apis/identity/legacy/user_teams_query.sql rename to pkg/registry/apis/iam/legacy/user_teams_query.sql diff --git a/pkg/registry/apis/identity/legacy/users_query.sql b/pkg/registry/apis/iam/legacy/users_query.sql similarity index 100% rename from pkg/registry/apis/identity/legacy/users_query.sql rename to pkg/registry/apis/iam/legacy/users_query.sql diff --git a/pkg/registry/apis/identity/register.go b/pkg/registry/apis/iam/register.go similarity index 78% rename from pkg/registry/apis/identity/register.go rename to pkg/registry/apis/iam/register.go index 94287ecc6fb..87975306edc 100644 --- a/pkg/registry/apis/identity/register.go +++ b/pkg/registry/apis/iam/register.go @@ -1,8 +1,21 @@ -package identity +package iam import ( "context" + "github.com/grafana/grafana/pkg/apimachinery/identity" + identityv0 "github.com/grafana/grafana/pkg/apis/iam/v0alpha1" + grafanarest "github.com/grafana/grafana/pkg/apiserver/rest" + "github.com/grafana/grafana/pkg/infra/db" + "github.com/grafana/grafana/pkg/registry/apis/iam/legacy" + "github.com/grafana/grafana/pkg/registry/apis/iam/serviceaccount" + "github.com/grafana/grafana/pkg/registry/apis/iam/sso" + "github.com/grafana/grafana/pkg/registry/apis/iam/team" + "github.com/grafana/grafana/pkg/registry/apis/iam/user" + "github.com/grafana/grafana/pkg/services/apiserver/builder" + "github.com/grafana/grafana/pkg/services/featuremgmt" + "github.com/grafana/grafana/pkg/services/ssosettings" + "github.com/grafana/grafana/pkg/storage/legacysql" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" @@ -12,26 +25,12 @@ import ( "k8s.io/apiserver/pkg/registry/rest" genericapiserver "k8s.io/apiserver/pkg/server" common "k8s.io/kube-openapi/pkg/common" - - "github.com/grafana/grafana/pkg/apimachinery/identity" - identityv0 "github.com/grafana/grafana/pkg/apis/identity/v0alpha1" - grafanarest "github.com/grafana/grafana/pkg/apiserver/rest" - "github.com/grafana/grafana/pkg/infra/db" - "github.com/grafana/grafana/pkg/registry/apis/identity/legacy" - "github.com/grafana/grafana/pkg/registry/apis/identity/serviceaccount" - "github.com/grafana/grafana/pkg/registry/apis/identity/sso" - "github.com/grafana/grafana/pkg/registry/apis/identity/team" - "github.com/grafana/grafana/pkg/registry/apis/identity/user" - "github.com/grafana/grafana/pkg/services/apiserver/builder" - "github.com/grafana/grafana/pkg/services/featuremgmt" - "github.com/grafana/grafana/pkg/services/ssosettings" - "github.com/grafana/grafana/pkg/storage/legacysql" ) -var _ builder.APIGroupBuilder = (*IdentityAPIBuilder)(nil) +var _ builder.APIGroupBuilder = (*IdentityAccessManagementAPIBuilder)(nil) // This is used just so wire has something unique to return -type IdentityAPIBuilder struct { +type IdentityAccessManagementAPIBuilder struct { Store legacy.LegacyIdentityStore SSOService ssosettings.Service } @@ -41,12 +40,12 @@ func RegisterAPIService( apiregistration builder.APIRegistrar, ssoService ssosettings.Service, sql db.DB, -) (*IdentityAPIBuilder, error) { +) (*IdentityAccessManagementAPIBuilder, error) { if !features.IsEnabledGlobally(featuremgmt.FlagGrafanaAPIServerWithExperimentalAPIs) { return nil, nil // skip registration unless opting into experimental apis } - builder := &IdentityAPIBuilder{ + builder := &IdentityAccessManagementAPIBuilder{ Store: legacy.NewLegacySQLStores(legacysql.NewDatabaseProvider(sql)), SSOService: ssoService, } @@ -55,11 +54,11 @@ func RegisterAPIService( return builder, nil } -func (b *IdentityAPIBuilder) GetGroupVersion() schema.GroupVersion { +func (b *IdentityAccessManagementAPIBuilder) GetGroupVersion() schema.GroupVersion { return identityv0.SchemeGroupVersion } -func (b *IdentityAPIBuilder) InstallSchema(scheme *runtime.Scheme) error { +func (b *IdentityAccessManagementAPIBuilder) InstallSchema(scheme *runtime.Scheme) error { identityv0.AddKnownTypes(scheme, identityv0.VERSION) // Link this version to the internal representation. @@ -71,7 +70,7 @@ func (b *IdentityAPIBuilder) InstallSchema(scheme *runtime.Scheme) error { return scheme.SetVersionPriority(identityv0.SchemeGroupVersion) } -func (b *IdentityAPIBuilder) GetAPIGroupInfo( +func (b *IdentityAccessManagementAPIBuilder) GetAPIGroupInfo( scheme *runtime.Scheme, codecs serializer.CodecFactory, // pointer? optsGetter generic.RESTOptionsGetter, @@ -106,16 +105,16 @@ func (b *IdentityAPIBuilder) GetAPIGroupInfo( return &apiGroupInfo, nil } -func (b *IdentityAPIBuilder) GetOpenAPIDefinitions() common.GetOpenAPIDefinitions { +func (b *IdentityAccessManagementAPIBuilder) GetOpenAPIDefinitions() common.GetOpenAPIDefinitions { return identityv0.GetOpenAPIDefinitions } -func (b *IdentityAPIBuilder) GetAPIRoutes() *builder.APIRoutes { +func (b *IdentityAccessManagementAPIBuilder) GetAPIRoutes() *builder.APIRoutes { // no custom API routes return nil } -func (b *IdentityAPIBuilder) GetAuthorizer() authorizer.Authorizer { +func (b *IdentityAccessManagementAPIBuilder) GetAuthorizer() authorizer.Authorizer { // TODO: handle authorization based in entity. return authorizer.AuthorizerFunc( func(ctx context.Context, a authorizer.Attributes) (authorizer.Decision, string, error) { diff --git a/pkg/registry/apis/identity/serviceaccount/store.go b/pkg/registry/apis/iam/serviceaccount/store.go similarity index 94% rename from pkg/registry/apis/identity/serviceaccount/store.go rename to pkg/registry/apis/iam/serviceaccount/store.go index 2f6a87540a7..eb5b9521964 100644 --- a/pkg/registry/apis/identity/serviceaccount/store.go +++ b/pkg/registry/apis/iam/serviceaccount/store.go @@ -11,9 +11,9 @@ import ( "k8s.io/apiserver/pkg/registry/rest" "github.com/grafana/grafana/pkg/apimachinery/utils" - identityv0 "github.com/grafana/grafana/pkg/apis/identity/v0alpha1" - "github.com/grafana/grafana/pkg/registry/apis/identity/common" - "github.com/grafana/grafana/pkg/registry/apis/identity/legacy" + identityv0 "github.com/grafana/grafana/pkg/apis/iam/v0alpha1" + "github.com/grafana/grafana/pkg/registry/apis/iam/common" + "github.com/grafana/grafana/pkg/registry/apis/iam/legacy" "github.com/grafana/grafana/pkg/services/apiserver/endpoints/request" "github.com/grafana/grafana/pkg/services/user" ) diff --git a/pkg/registry/apis/identity/sso/store.go b/pkg/registry/apis/iam/sso/store.go similarity index 98% rename from pkg/registry/apis/identity/sso/store.go rename to pkg/registry/apis/iam/sso/store.go index 0e1fdf5f277..699be8b9dfe 100644 --- a/pkg/registry/apis/identity/sso/store.go +++ b/pkg/registry/apis/iam/sso/store.go @@ -14,7 +14,7 @@ import ( "k8s.io/apimachinery/pkg/types" "k8s.io/apiserver/pkg/registry/rest" - identityv0 "github.com/grafana/grafana/pkg/apis/identity/v0alpha1" + identityv0 "github.com/grafana/grafana/pkg/apis/iam/v0alpha1" "github.com/grafana/grafana/pkg/services/apiserver/endpoints/request" "github.com/grafana/grafana/pkg/services/ssosettings" ssomodels "github.com/grafana/grafana/pkg/services/ssosettings/models" diff --git a/pkg/registry/apis/identity/team/rest_members.go b/pkg/registry/apis/iam/team/rest_members.go similarity index 93% rename from pkg/registry/apis/identity/team/rest_members.go rename to pkg/registry/apis/iam/team/rest_members.go index e18eaa20146..13efb6783c1 100644 --- a/pkg/registry/apis/identity/team/rest_members.go +++ b/pkg/registry/apis/iam/team/rest_members.go @@ -9,9 +9,9 @@ import ( "github.com/grafana/authlib/claims" "github.com/grafana/grafana/pkg/api/dtos" - identityv0 "github.com/grafana/grafana/pkg/apis/identity/v0alpha1" - "github.com/grafana/grafana/pkg/registry/apis/identity/common" - "github.com/grafana/grafana/pkg/registry/apis/identity/legacy" + identityv0 "github.com/grafana/grafana/pkg/apis/iam/v0alpha1" + "github.com/grafana/grafana/pkg/registry/apis/iam/common" + "github.com/grafana/grafana/pkg/registry/apis/iam/legacy" "github.com/grafana/grafana/pkg/services/apiserver/endpoints/request" "github.com/grafana/grafana/pkg/setting" ) diff --git a/pkg/registry/apis/identity/team/store.go b/pkg/registry/apis/iam/team/store.go similarity index 94% rename from pkg/registry/apis/identity/team/store.go rename to pkg/registry/apis/iam/team/store.go index a18b4a9c082..5f70e46ac34 100644 --- a/pkg/registry/apis/identity/team/store.go +++ b/pkg/registry/apis/iam/team/store.go @@ -11,9 +11,9 @@ import ( "github.com/grafana/authlib/claims" "github.com/grafana/grafana/pkg/apimachinery/utils" - identityv0 "github.com/grafana/grafana/pkg/apis/identity/v0alpha1" - "github.com/grafana/grafana/pkg/registry/apis/identity/common" - "github.com/grafana/grafana/pkg/registry/apis/identity/legacy" + identityv0 "github.com/grafana/grafana/pkg/apis/iam/v0alpha1" + "github.com/grafana/grafana/pkg/registry/apis/iam/common" + "github.com/grafana/grafana/pkg/registry/apis/iam/legacy" "github.com/grafana/grafana/pkg/services/apiserver/endpoints/request" ) diff --git a/pkg/registry/apis/identity/team/store_binding.go b/pkg/registry/apis/iam/team/store_binding.go similarity index 95% rename from pkg/registry/apis/identity/team/store_binding.go rename to pkg/registry/apis/iam/team/store_binding.go index f3499ff82a3..b97ecf74a00 100644 --- a/pkg/registry/apis/identity/team/store_binding.go +++ b/pkg/registry/apis/iam/team/store_binding.go @@ -11,9 +11,9 @@ import ( "k8s.io/apiserver/pkg/registry/rest" "github.com/grafana/authlib/claims" - identityv0 "github.com/grafana/grafana/pkg/apis/identity/v0alpha1" - "github.com/grafana/grafana/pkg/registry/apis/identity/common" - "github.com/grafana/grafana/pkg/registry/apis/identity/legacy" + identityv0 "github.com/grafana/grafana/pkg/apis/iam/v0alpha1" + "github.com/grafana/grafana/pkg/registry/apis/iam/common" + "github.com/grafana/grafana/pkg/registry/apis/iam/legacy" "github.com/grafana/grafana/pkg/services/apiserver/endpoints/request" "github.com/grafana/grafana/pkg/services/team" ) diff --git a/pkg/registry/apis/identity/user/rest_display.go b/pkg/registry/apis/iam/user/rest_display.go similarity index 97% rename from pkg/registry/apis/identity/user/rest_display.go rename to pkg/registry/apis/iam/user/rest_display.go index c5d5ecf0202..480b331114c 100644 --- a/pkg/registry/apis/identity/user/rest_display.go +++ b/pkg/registry/apis/iam/user/rest_display.go @@ -8,8 +8,8 @@ import ( "github.com/grafana/authlib/claims" "github.com/grafana/grafana/pkg/api/dtos" - identity "github.com/grafana/grafana/pkg/apis/identity/v0alpha1" - "github.com/grafana/grafana/pkg/registry/apis/identity/legacy" + identity "github.com/grafana/grafana/pkg/apis/iam/v0alpha1" + "github.com/grafana/grafana/pkg/registry/apis/iam/legacy" "github.com/grafana/grafana/pkg/services/apiserver/endpoints/request" "github.com/grafana/grafana/pkg/setting" errorsK8s "k8s.io/apimachinery/pkg/api/errors" diff --git a/pkg/registry/apis/identity/user/rest_user_team.go b/pkg/registry/apis/iam/user/rest_user_team.go similarity index 92% rename from pkg/registry/apis/identity/user/rest_user_team.go rename to pkg/registry/apis/iam/user/rest_user_team.go index 5235dcc3592..ce086ea3db2 100644 --- a/pkg/registry/apis/identity/user/rest_user_team.go +++ b/pkg/registry/apis/iam/user/rest_user_team.go @@ -7,9 +7,9 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apiserver/pkg/registry/rest" - identityv0 "github.com/grafana/grafana/pkg/apis/identity/v0alpha1" - "github.com/grafana/grafana/pkg/registry/apis/identity/common" - "github.com/grafana/grafana/pkg/registry/apis/identity/legacy" + identityv0 "github.com/grafana/grafana/pkg/apis/iam/v0alpha1" + "github.com/grafana/grafana/pkg/registry/apis/iam/common" + "github.com/grafana/grafana/pkg/registry/apis/iam/legacy" "github.com/grafana/grafana/pkg/services/apiserver/endpoints/request" ) diff --git a/pkg/registry/apis/identity/user/store.go b/pkg/registry/apis/iam/user/store.go similarity index 94% rename from pkg/registry/apis/identity/user/store.go rename to pkg/registry/apis/iam/user/store.go index 9130638717f..5e955a978c7 100644 --- a/pkg/registry/apis/identity/user/store.go +++ b/pkg/registry/apis/iam/user/store.go @@ -11,9 +11,9 @@ import ( "k8s.io/apiserver/pkg/registry/rest" "github.com/grafana/grafana/pkg/apimachinery/utils" - identityv0 "github.com/grafana/grafana/pkg/apis/identity/v0alpha1" - "github.com/grafana/grafana/pkg/registry/apis/identity/common" - "github.com/grafana/grafana/pkg/registry/apis/identity/legacy" + identityv0 "github.com/grafana/grafana/pkg/apis/iam/v0alpha1" + "github.com/grafana/grafana/pkg/registry/apis/iam/common" + "github.com/grafana/grafana/pkg/registry/apis/iam/legacy" "github.com/grafana/grafana/pkg/services/apiserver/endpoints/request" "github.com/grafana/grafana/pkg/services/user" ) diff --git a/pkg/registry/apis/wireset.go b/pkg/registry/apis/wireset.go index f6ceafac35e..e9d3ac6adbf 100644 --- a/pkg/registry/apis/wireset.go +++ b/pkg/registry/apis/wireset.go @@ -9,7 +9,7 @@ import ( "github.com/grafana/grafana/pkg/registry/apis/datasource" "github.com/grafana/grafana/pkg/registry/apis/featuretoggle" "github.com/grafana/grafana/pkg/registry/apis/folders" - "github.com/grafana/grafana/pkg/registry/apis/identity" + "github.com/grafana/grafana/pkg/registry/apis/iam" "github.com/grafana/grafana/pkg/registry/apis/peakq" "github.com/grafana/grafana/pkg/registry/apis/playlist" "github.com/grafana/grafana/pkg/registry/apis/query" @@ -33,7 +33,7 @@ var WireSet = wire.NewSet( featuretoggle.RegisterAPIService, datasource.RegisterAPIService, folders.RegisterAPIService, - identity.RegisterAPIService, + iam.RegisterAPIService, peakq.RegisterAPIService, service.RegisterAPIService, query.RegisterAPIService, diff --git a/pkg/services/apiserver/builder/helper.go b/pkg/services/apiserver/builder/helper.go index afbb81680fe..7b14570c538 100644 --- a/pkg/services/apiserver/builder/helper.go +++ b/pkg/services/apiserver/builder/helper.go @@ -46,7 +46,7 @@ var pathRewriters = []filters.PathRewriter{ }, }, { - Pattern: regexp.MustCompile(`(/apis/identity.grafana.app/v0alpha1/namespaces/.*/display$)`), + Pattern: regexp.MustCompile(`(/apis/iam.grafana.app/v0alpha1/namespaces/.*/display$)`), ReplaceFunc: func(matches []string) string { return matches[1] + "/name" // connector requires a name }, diff --git a/pkg/tests/apis/identity/identity_test.go b/pkg/tests/apis/iam/iam_test.go similarity index 95% rename from pkg/tests/apis/identity/identity_test.go rename to pkg/tests/apis/iam/iam_test.go index d945c27f8d5..8703a02bb2e 100644 --- a/pkg/tests/apis/identity/identity_test.go +++ b/pkg/tests/apis/iam/iam_test.go @@ -15,13 +15,13 @@ import ( ) var gvrTeams = schema.GroupVersionResource{ - Group: "identity.grafana.app", + Group: "iam.grafana.app", Version: "v0alpha1", Resource: "teams", } var gvrUsers = schema.GroupVersionResource{ - Group: "identity.grafana.app", + Group: "iam.grafana.app", Version: "v0alpha1", Resource: "users", } @@ -42,7 +42,7 @@ func TestIntegrationRequiresDevMode(t *testing.T) { }, }) - _, err := helper.NewDiscoveryClient().ServerResourcesForGroupVersion("identity.grafana.app/v0alpha1") + _, err := helper.NewDiscoveryClient().ServerResourcesForGroupVersion("iam.grafana.app/v0alpha1") require.Error(t, err) } @@ -57,7 +57,7 @@ func TestIntegrationIdentity(t *testing.T) { featuremgmt.FlagGrafanaAPIServerWithExperimentalAPIs, // Required to start the example service }, }) - _, err := helper.NewDiscoveryClient().ServerResourcesForGroupVersion("identity.grafana.app/v0alpha1") + _, err := helper.NewDiscoveryClient().ServerResourcesForGroupVersion("iam.grafana.app/v0alpha1") require.NoError(t, err) t.Run("read only views", func(t *testing.T) { @@ -72,7 +72,7 @@ func TestIntegrationIdentity(t *testing.T) { require.JSONEq(t, `{ "items": [ { - "apiVersion": "identity.grafana.app/v0alpha1", + "apiVersion": "iam.grafana.app/v0alpha1", "kind": "Team", "metadata": { "annotations": {