fix: all enums same style (#262)

* fix: all enums same style

* fix: rename process to reduce

* add some missing enum renaming

Co-authored-by: Livio Amstutz <livio.a@gmail.com>

pkg/admin/api/grpc/org_converter.go

@@ -148,9 +148,9 @@ func userFromModel(user *usr_model.User) *User {
 
 func orgStateFromModel(state org_model.OrgState) OrgState {
 	switch state {
-	case org_model.ORGSTATE_ACTIVE:
+	case org_model.OrgStateActive:
 		return OrgState_ORGSTATE_ACTIVE
-	case org_model.ORGSTATE_INACTIVE:
+	case org_model.OrgStateInactive:
 		return OrgState_ORGSTATE_INACTIVE
 	default:
 		return OrgState_ORGSTATE_UNSPECIFIED
@@ -159,11 +159,11 @@ func orgStateFromModel(state org_model.OrgState) OrgState {
 
 func genderFromModel(gender usr_model.Gender) Gender {
 	switch gender {
-	case usr_model.GENDER_FEMALE:
+	case usr_model.GenderFemale:
 		return Gender_GENDER_FEMALE
-	case usr_model.GENDER_MALE:
+	case usr_model.GenderMale:
 		return Gender_GENDER_MALE
-	case usr_model.GENDER_DIVERSE:
+	case usr_model.GenderDiverse:
 		return Gender_GENDER_DIVERSE
 	default:
 		return Gender_GENDER_UNSPECIFIED
@@ -173,23 +173,23 @@ func genderFromModel(gender usr_model.Gender) Gender {
 func genderToModel(gender Gender) usr_model.Gender {
 	switch gender {
 	case Gender_GENDER_FEMALE:
-		return usr_model.GENDER_FEMALE
+		return usr_model.GenderFemale
 	case Gender_GENDER_MALE:
-		return usr_model.GENDER_MALE
+		return usr_model.GenderMale
 	case Gender_GENDER_DIVERSE:
-		return usr_model.GENDER_DIVERSE
+		return usr_model.GenderDiverse
 	default:
-		return usr_model.GENDER_UNDEFINED
+		return usr_model.GenderUnspecified
 	}
 }
 
 func userStateFromModel(state usr_model.UserState) UserState {
 	switch state {
-	case usr_model.USERSTATE_ACTIVE:
+	case usr_model.UserStateActive:
 		return UserState_USERSTATE_ACTIVE
-	case usr_model.USERSTATE_INACTIVE:
+	case usr_model.UserStateInactive:
 		return UserState_USERSTATE_INACTIVE
-	case usr_model.USERSTATE_LOCKED:
+	case usr_model.UserStateLocked:
 		return UserState_USERSTATE_LOCKED
 	default:
 		return UserState_USERSTATE_UNSPECIFIED
@@ -227,24 +227,24 @@ func orgQueryToModel(query *OrgSearchQuery) *org_model.OrgSearchQuery {
 func orgQueryKeyToModel(key OrgSearchKey) org_model.OrgSearchKey {
 	switch key {
 	case OrgSearchKey_ORGSEARCHKEY_DOMAIN:
-		return org_model.ORGSEARCHKEY_ORG_DOMAIN
+		return org_model.OrgSearchKeyOrgDomain
 	case OrgSearchKey_ORGSEARCHKEY_ORG_NAME:
-		return org_model.ORGSEARCHKEY_ORG_NAME
+		return org_model.OrgSearchKeyOrgName
 	case OrgSearchKey_ORGSEARCHKEY_STATE:
-		return org_model.ORGSEARCHKEY_STATE
+		return org_model.OrgSearchKeyState
 	default:
-		return org_model.ORGSEARCHKEY_UNSPECIFIED
+		return org_model.OrgSearchKeyUnspecified
 	}
 }
 
 func orgQueryMethodToModel(method OrgSearchMethod) model.SearchMethod {
 	switch method {
 	case OrgSearchMethod_ORGSEARCHMETHOD_CONTAINS:
-		return model.SEARCHMETHOD_CONTAINS
+		return model.SearchMethodContains
 	case OrgSearchMethod_ORGSEARCHMETHOD_EQUALS:
-		return model.SEARCHMETHOD_EQUALS
+		return model.SearchMethodEquals
 	case OrgSearchMethod_ORGSEARCHMETHOD_STARTS_WITH:
-		return model.SEARCHMETHOD_STARTS_WITH
+		return model.SearchMethodStartsWith
 	default:
 		return 0
 	}

pkg/auth/api/grpc/search_converter.go

@@ -5,18 +5,18 @@ import "github.com/caos/zitadel/internal/model"
 func searchMethodToModel(method SearchMethod) model.SearchMethod {
 	switch method {
 	case SearchMethod_SEARCHMETHOD_EQUALS:
-		return model.SEARCHMETHOD_EQUALS
+		return model.SearchMethodEquals
 	case SearchMethod_SEARCHMETHOD_CONTAINS:
-		return model.SEARCHMETHOD_CONTAINS
+		return model.SearchMethodContains
 	case SearchMethod_SEARCHMETHOD_STARTS_WITH:
-		return model.SEARCHMETHOD_STARTS_WITH
+		return model.SearchMethodStartsWith
 	case SearchMethod_SEARCHMETHOD_EQUALS_IGNORE_CASE:
-		return model.SEARCHMETHOD_EQUALS_IGNORE_CASE
+		return model.SearchMethodEqualsIgnoreCase
 	case SearchMethod_SEARCHMETHOD_CONTAINS_IGNORE_CASE:
-		return model.SEARCHMETHOD_CONTAINS_IGNORE_CASE
+		return model.SearchMethodContainsIgnoreCase
 	case SearchMethod_SEARCHMETHOD_STARTS_WITH_IGNORE_CASE:
-		return model.SEARCHMETHOD_STARTS_WITH_IGNORE_CASE
+		return model.SearchMethodStartsWithIgnoreCase
 	default:
-		return model.SEARCHMETHOD_EQUALS
+		return model.SearchMethodEquals
 	}
 }

pkg/auth/api/grpc/user_converter.go

@@ -258,15 +258,15 @@ func otpFromModel(otp *usr_model.OTP) *MfaOtpResponse {
 
 func userStateFromModel(state usr_model.UserState) UserState {
 	switch state {
-	case usr_model.USERSTATE_ACTIVE:
+	case usr_model.UserStateActive:
 		return UserState_USERSTATE_ACTIVE
-	case usr_model.USERSTATE_INACTIVE:
+	case usr_model.UserStateInactive:
 		return UserState_USERSTATE_INACTIVE
-	case usr_model.USERSTATE_LOCKED:
+	case usr_model.UserStateLocked:
 		return UserState_USERSTATE_LOCKED
-	case usr_model.USERSTATE_INITIAL:
+	case usr_model.UserStateInitial:
 		return UserState_USERSTATE_INITIAL
-	case usr_model.USERSTATE_SUSPEND:
+	case usr_model.UserStateSuspend:
 		return UserState_USERSTATE_SUSPEND
 	default:
 		return UserState_USERSTATE_UNSPECIFIED
@@ -275,11 +275,11 @@ func userStateFromModel(state usr_model.UserState) UserState {
 
 func genderFromModel(gender usr_model.Gender) Gender {
 	switch gender {
-	case usr_model.GENDER_FEMALE:
+	case usr_model.GenderFemale:
 		return Gender_GENDER_FEMALE
-	case usr_model.GENDER_MALE:
+	case usr_model.GenderMale:
 		return Gender_GENDER_MALE
-	case usr_model.GENDER_DIVERSE:
+	case usr_model.GenderDiverse:
 		return Gender_GENDER_DIVERSE
 	default:
 		return Gender_GENDER_UNSPECIFIED
@@ -289,21 +289,21 @@ func genderFromModel(gender usr_model.Gender) Gender {
 func genderToModel(gender Gender) usr_model.Gender {
 	switch gender {
 	case Gender_GENDER_FEMALE:
-		return usr_model.GENDER_FEMALE
+		return usr_model.GenderFemale
 	case Gender_GENDER_MALE:
-		return usr_model.GENDER_MALE
+		return usr_model.GenderMale
 	case Gender_GENDER_DIVERSE:
-		return usr_model.GENDER_DIVERSE
+		return usr_model.GenderDiverse
 	default:
-		return usr_model.GENDER_UNDEFINED
+		return usr_model.GenderUnspecified
 	}
 }
 
 func mfaStateFromModel(state usr_model.MfaState) MFAState {
 	switch state {
-	case usr_model.MFASTATE_READY:
+	case usr_model.MfaStateReady:
 		return MFAState_MFASTATE_NOT_READY
-	case usr_model.MFASTATE_NOTREADY:
+	case usr_model.MfaStateNotReady:
 		return MFAState_MFASTATE_NOT_READY
 	default:
 		return MFAState_MFASTATE_UNSPECIFIED

pkg/auth/api/grpc/user_grant_converter.go

@@ -31,11 +31,11 @@ func userGrantSearchQueryToModel(query *UserGrantSearchQuery) *grant_model.UserG
 func userGrantSearchKeyToModel(key UserGrantSearchKey) grant_model.UserGrantSearchKey {
 	switch key {
 	case UserGrantSearchKey_UserGrantSearchKey_ORG_ID:
-		return grant_model.USERGRANTSEARCHKEY_RESOURCEOWNER
+		return grant_model.UserGrantSearchKeyResourceOwner
 	case UserGrantSearchKey_UserGrantSearchKey_PROJECT_ID:
-		return grant_model.USERGRANTSEARCHKEY_PROJECT_ID
+		return grant_model.UserGrantSearchKeyProjectID
 	default:
-		return grant_model.USERGRANTSEARCHKEY_UNSPECIFIED
+		return grant_model.UserGrantSearchKeyUnspecified
 	}
 }
 
@@ -44,7 +44,7 @@ func myProjectOrgSearchRequestRequestsToModel(request *MyProjectOrgSearchRequest
 		Offset:        request.Offset,
 		Limit:         request.Limit,
 		Asc:           request.Asc,
-		SortingColumn: grant_model.USERGRANTSEARCHKEY_RESOURCEOWNER,
+		SortingColumn: grant_model.UserGrantSearchKeyResourceOwner,
 		Queries:       myProjectOrgSearchQueriesToModel(request.Queries),
 	}
 }
@@ -68,9 +68,9 @@ func myProjectOrgSearchQueryToModel(query *MyProjectOrgSearchQuery) *grant_model
 func myProjectOrgSearchKeyToModel(key MyProjectOrgSearchKey) grant_model.UserGrantSearchKey {
 	switch key {
 	case MyProjectOrgSearchKey_MYPROJECTORGSEARCHKEY_ORG_NAME:
-		return grant_model.USERGRANTSEARCHKEY_ORG_NAME
+		return grant_model.UserGrantSearchKeyOrgName
 	default:
-		return grant_model.USERGRANTSEARCHKEY_UNSPECIFIED
+		return grant_model.UserGrantSearchKeyUnspecified
 	}
 }
 

pkg/auth/api/oidc/client.go

@@ -27,7 +27,7 @@ func (o *OPStorage) GetClientByClientID(ctx context.Context, id string) (op.Clie
 	if err != nil {
 		return nil, err
 	}
-	if client.State != proj_model.APPSTATE_ACTIVE {
+	if client.State != proj_model.AppStateActive {
 		return nil, errors.ThrowPreconditionFailed(nil, "OIDC-sdaGg", "client is not active")
 	}
 	return ClientFromBusiness(client, o.defaultLoginURL, o.defaultAccessTokenLifetime, o.defaultIdTokenLifetime)
@@ -86,11 +86,11 @@ func (o *OPStorage) GetUserinfoFromScopes(ctx context.Context, userID string, sc
 
 func getGender(gender user_model.Gender) string {
 	switch gender {
-	case user_model.GENDER_FEMALE:
+	case user_model.GenderFemale:
 		return "female"
-	case user_model.GENDER_MALE:
+	case user_model.GenderMale:
 		return "male"
-	case user_model.GENDER_DIVERSE:
+	case user_model.GenderDiverse:
 		return "diverse"
 	}
 	return ""

pkg/auth/api/oidc/client_converter.go

@@ -61,11 +61,11 @@ func (c *Client) AccessTokenType() op.AccessTokenType {
 
 func authMethodToOIDC(authType model.OIDCAuthMethodType) op.AuthMethod {
 	switch authType {
-	case model.OIDCAUTHMETHODTYPE_BASIC:
+	case model.OIDCAuthMethodTypeBasic:
 		return op.AuthMethodBasic
-	case model.OIDCAUTHMETHODTYPE_POST:
+	case model.OIDCAuthMethodTypePost:
 		return op.AuthMethodPost
-	case model.OIDCAUTHMETHODTYPE_NONE:
+	case model.OIDCAuthMethodTypeNone:
 		return op.AuthMethodNone
 	default:
 		return op.AuthMethodBasic

pkg/management/api/grpc/application_converter.go

@@ -31,7 +31,7 @@ func appFromModel(app *proj_model.Application) *Application {
 }
 
 func appConfigFromModel(app *proj_model.Application) isApplication_AppConfig {
-	if app.Type == proj_model.APPTYPE_OIDC {
+	if app.Type == proj_model.AppTypeOIDC {
 		return &Application_OidcConfig{
 			OidcConfig: oidcConfigFromModel(app.OIDCConfig),
 		}
@@ -70,7 +70,7 @@ func oidcAppCreateToModel(app *OIDCApplicationCreate) *proj_model.Application {
 			AggregateID: app.ProjectId,
 		},
 		Name: app.Name,
-		Type: proj_model.APPTYPE_OIDC,
+		Type: proj_model.AppTypeOIDC,
 		OIDCConfig: &proj_model.OIDCConfig{
 			RedirectUris:           app.RedirectUris,
 			ResponseTypes:          oidcResponseTypesToModel(app.ResponseTypes),
@@ -120,7 +120,7 @@ func applicationSearchQueriesToModel(projectID string, queries []*ApplicationSea
 	for i, q := range queries {
 		converted[i] = applicationSearchQueryToModel(q)
 	}
-	converted[len(queries)] = &proj_model.ApplicationSearchQuery{Key: proj_model.APPLICATIONSEARCHKEY_PROJECT_ID, Method: model.SEARCHMETHOD_EQUALS, Value: projectID}
+	converted[len(queries)] = &proj_model.ApplicationSearchQuery{Key: proj_model.AppSearchKeyProjectID, Method: model.SearchMethodEquals, Value: projectID}
 
 	return converted
 }
@@ -133,12 +133,12 @@ func applicationSearchQueryToModel(query *ApplicationSearchQuery) *proj_model.Ap
 	}
 }
 
-func applicationSearchKeyToModel(key ApplicationSearchKey) proj_model.ApplicationSearchKey {
+func applicationSearchKeyToModel(key ApplicationSearchKey) proj_model.AppSearchKey {
 	switch key {
 	case ApplicationSearchKey_APPLICATIONSEARCHKEY_APP_NAME:
-		return proj_model.APPLICATIONSEARCHKEY_NAME
+		return proj_model.AppSearchKeyName
 	default:
-		return proj_model.APPLICATIONSEARCHKEY_UNSPECIFIED
+		return proj_model.AppSearchKeyUnspecified
 	}
 }
 
@@ -184,9 +184,9 @@ func applicationViewFromModel(application *proj_model.ApplicationView) *Applicat
 
 func appStateFromModel(state proj_model.AppState) AppState {
 	switch state {
-	case proj_model.APPSTATE_ACTIVE:
+	case proj_model.AppStateActive:
 		return AppState_APPSTATE_ACTIVE
-	case proj_model.APPSTATE_INACTIVE:
+	case proj_model.AppStateInactive:
 		return AppState_APPSTATE_INACTIVE
 	default:
 		return AppState_APPSTATE_UNSPECIFIED
@@ -195,18 +195,18 @@ func appStateFromModel(state proj_model.AppState) AppState {
 
 func oidcResponseTypesToModel(responseTypes []OIDCResponseType) []proj_model.OIDCResponseType {
 	if responseTypes == nil || len(responseTypes) == 0 {
-		return []proj_model.OIDCResponseType{proj_model.OIDCRESPONSETYPE_CODE}
+		return []proj_model.OIDCResponseType{proj_model.OIDCResponseTypeCode}
 	}
 	oidcResponseTypes := make([]proj_model.OIDCResponseType, len(responseTypes))
 
 	for i, responseType := range responseTypes {
 		switch responseType {
 		case OIDCResponseType_OIDCRESPONSETYPE_CODE:
-			oidcResponseTypes[i] = proj_model.OIDCRESPONSETYPE_CODE
+			oidcResponseTypes[i] = proj_model.OIDCResponseTypeCode
 		case OIDCResponseType_OIDCRESPONSETYPE_ID_TOKEN:
-			oidcResponseTypes[i] = proj_model.OIDCRESPONSETYPE_ID_TOKEN
+			oidcResponseTypes[i] = proj_model.OIDCResponseTypeIDToken
 		case OIDCResponseType_OIDCRESPONSETYPE_TOKEN:
-			oidcResponseTypes[i] = proj_model.OIDCRESPONSETYPE_TOKEN
+			oidcResponseTypes[i] = proj_model.OIDCResponseTypeToken
 		}
 	}
 
@@ -218,11 +218,11 @@ func oidcResponseTypesFromModel(responseTypes []proj_model.OIDCResponseType) []O
 
 	for i, responseType := range responseTypes {
 		switch responseType {
-		case proj_model.OIDCRESPONSETYPE_CODE:
+		case proj_model.OIDCResponseTypeCode:
 			oidcResponseTypes[i] = OIDCResponseType_OIDCRESPONSETYPE_CODE
-		case proj_model.OIDCRESPONSETYPE_ID_TOKEN:
+		case proj_model.OIDCResponseTypeIDToken:
 			oidcResponseTypes[i] = OIDCResponseType_OIDCRESPONSETYPE_ID_TOKEN
-		case proj_model.OIDCRESPONSETYPE_TOKEN:
+		case proj_model.OIDCResponseTypeToken:
 			oidcResponseTypes[i] = OIDCResponseType_OIDCRESPONSETYPE_TOKEN
 		}
 	}
@@ -232,18 +232,18 @@ func oidcResponseTypesFromModel(responseTypes []proj_model.OIDCResponseType) []O
 
 func oidcGrantTypesToModel(grantTypes []OIDCGrantType) []proj_model.OIDCGrantType {
 	if grantTypes == nil || len(grantTypes) == 0 {
-		return []proj_model.OIDCGrantType{proj_model.OIDCGRANTTYPE_AUTHORIZATION_CODE}
+		return []proj_model.OIDCGrantType{proj_model.OIDCGrantTypeAuthorizationCode}
 	}
 	oidcGrantTypes := make([]proj_model.OIDCGrantType, len(grantTypes))
 
 	for i, grantType := range grantTypes {
 		switch grantType {
 		case OIDCGrantType_OIDCGRANTTYPE_AUTHORIZATION_CODE:
-			oidcGrantTypes[i] = proj_model.OIDCGRANTTYPE_AUTHORIZATION_CODE
+			oidcGrantTypes[i] = proj_model.OIDCGrantTypeAuthorizationCode
 		case OIDCGrantType_OIDCGRANTTYPE_IMPLICIT:
-			oidcGrantTypes[i] = proj_model.OIDCGRANTTYPE_IMPLICIT
+			oidcGrantTypes[i] = proj_model.OIDCGrantTypeImplicit
 		case OIDCGrantType_OIDCGRANTTYPE_REFRESH_TOKEN:
-			oidcGrantTypes[i] = proj_model.OIDCGRANTTYPE_REFRESH_TOKEN
+			oidcGrantTypes[i] = proj_model.OIDCGrantTypeRefreshToken
 		}
 	}
 	return oidcGrantTypes
@@ -254,11 +254,11 @@ func oidcGrantTypesFromModel(grantTypes []proj_model.OIDCGrantType) []OIDCGrantT
 
 	for i, grantType := range grantTypes {
 		switch grantType {
-		case proj_model.OIDCGRANTTYPE_AUTHORIZATION_CODE:
+		case proj_model.OIDCGrantTypeAuthorizationCode:
 			oidcGrantTypes[i] = OIDCGrantType_OIDCGRANTTYPE_AUTHORIZATION_CODE
-		case proj_model.OIDCGRANTTYPE_IMPLICIT:
+		case proj_model.OIDCGrantTypeImplicit:
 			oidcGrantTypes[i] = OIDCGrantType_OIDCGRANTTYPE_IMPLICIT
-		case proj_model.OIDCGRANTTYPE_REFRESH_TOKEN:
+		case proj_model.OIDCGrantTypeRefreshToken:
 			oidcGrantTypes[i] = OIDCGrantType_OIDCGRANTTYPE_REFRESH_TOKEN
 		}
 	}
@@ -268,22 +268,22 @@ func oidcGrantTypesFromModel(grantTypes []proj_model.OIDCGrantType) []OIDCGrantT
 func oidcApplicationTypeToModel(appType OIDCApplicationType) proj_model.OIDCApplicationType {
 	switch appType {
 	case OIDCApplicationType_OIDCAPPLICATIONTYPE_WEB:
-		return proj_model.OIDCAPPLICATIONTYPE_WEB
+		return proj_model.OIDCApplicationTypeWeb
 	case OIDCApplicationType_OIDCAPPLICATIONTYPE_USER_AGENT:
-		return proj_model.OIDCAPPLICATIONTYPE_USER_AGENT
+		return proj_model.OIDCApplicationTypeUserAgent
 	case OIDCApplicationType_OIDCAPPLICATIONTYPE_NATIVE:
-		return proj_model.OIDCAPPLICATIONTYPE_NATIVE
+		return proj_model.OIDCApplicationTypeNative
 	}
-	return proj_model.OIDCAPPLICATIONTYPE_WEB
+	return proj_model.OIDCApplicationTypeWeb
 }
 
 func oidcApplicationTypeFromModel(appType proj_model.OIDCApplicationType) OIDCApplicationType {
 	switch appType {
-	case proj_model.OIDCAPPLICATIONTYPE_WEB:
+	case proj_model.OIDCApplicationTypeWeb:
 		return OIDCApplicationType_OIDCAPPLICATIONTYPE_WEB
-	case proj_model.OIDCAPPLICATIONTYPE_USER_AGENT:
+	case proj_model.OIDCApplicationTypeUserAgent:
 		return OIDCApplicationType_OIDCAPPLICATIONTYPE_USER_AGENT
-	case proj_model.OIDCAPPLICATIONTYPE_NATIVE:
+	case proj_model.OIDCApplicationTypeNative:
 		return OIDCApplicationType_OIDCAPPLICATIONTYPE_NATIVE
 	default:
 		return OIDCApplicationType_OIDCAPPLICATIONTYPE_WEB
@@ -293,23 +293,23 @@ func oidcApplicationTypeFromModel(appType proj_model.OIDCApplicationType) OIDCAp
 func oidcAuthMethodTypeToModel(authType OIDCAuthMethodType) proj_model.OIDCAuthMethodType {
 	switch authType {
 	case OIDCAuthMethodType_OIDCAUTHMETHODTYPE_BASIC:
-		return proj_model.OIDCAUTHMETHODTYPE_BASIC
+		return proj_model.OIDCAuthMethodTypeBasic
 	case OIDCAuthMethodType_OIDCAUTHMETHODTYPE_POST:
-		return proj_model.OIDCAUTHMETHODTYPE_POST
+		return proj_model.OIDCAuthMethodTypePost
 	case OIDCAuthMethodType_OIDCAUTHMETHODTYPE_NONE:
-		return proj_model.OIDCAUTHMETHODTYPE_NONE
+		return proj_model.OIDCAuthMethodTypeNone
 	default:
-		return proj_model.OIDCAUTHMETHODTYPE_BASIC
+		return proj_model.OIDCAuthMethodTypeBasic
 	}
 }
 
 func oidcAuthMethodTypeFromModel(authType proj_model.OIDCAuthMethodType) OIDCAuthMethodType {
 	switch authType {
-	case proj_model.OIDCAUTHMETHODTYPE_BASIC:
+	case proj_model.OIDCAuthMethodTypeBasic:
 		return OIDCAuthMethodType_OIDCAUTHMETHODTYPE_BASIC
-	case proj_model.OIDCAUTHMETHODTYPE_POST:
+	case proj_model.OIDCAuthMethodTypePost:
 		return OIDCAuthMethodType_OIDCAUTHMETHODTYPE_POST
-	case proj_model.OIDCAUTHMETHODTYPE_NONE:
+	case proj_model.OIDCAuthMethodTypeNone:
 		return OIDCAuthMethodType_OIDCAUTHMETHODTYPE_NONE
 	default:
 		return OIDCAuthMethodType_OIDCAUTHMETHODTYPE_BASIC

pkg/management/api/grpc/org_converter.go

@@ -52,9 +52,9 @@ func orgViewFromModel(org *org_model.OrgView) *OrgView {
 
 func orgStateFromModel(state org_model.OrgState) OrgState {
 	switch state {
-	case org_model.ORGSTATE_ACTIVE:
+	case org_model.OrgStateActive:
 		return OrgState_ORGSTATE_ACTIVE
-	case org_model.ORGSTATE_INACTIVE:
+	case org_model.OrgStateInactive:
 		return OrgState_ORGSTATE_INACTIVE
 	default:
 		return OrgState_ORGSTATE_UNSPECIFIED
@@ -128,9 +128,9 @@ func orgDomainSearchQueryToModel(query *OrgDomainSearchQuery) *org_model.OrgDoma
 func orgDomainSearchKeyToModel(key OrgDomainSearchKey) org_model.OrgDomainSearchKey {
 	switch key {
 	case OrgDomainSearchKey_ORGDOMAINSEARCHKEY_DOMAIN:
-		return org_model.ORGDOMAINSEARCHKEY_DOMAIN
+		return org_model.OrgDomainSearchKeyDomain
 	default:
-		return org_model.ORGDOMAINSEARCHKEY_UNSPECIFIED
+		return org_model.OrgDomainSearchKeyUnspecified
 	}
 }
 

pkg/management/api/grpc/org_member_converter.go

@@ -70,32 +70,32 @@ func orgMemberSearchQueryToModel(query *OrgMemberSearchQuery) *org_model.OrgMemb
 func orgMemberSearchKeyToModel(key OrgMemberSearchKey) org_model.OrgMemberSearchKey {
 	switch key {
 	case OrgMemberSearchKey_ORGMEMBERSEARCHKEY_EMAIL:
-		return org_model.ORGMEMBERSEARCHKEY_EMAIL
+		return org_model.OrgMemberSearchKeyEmail
 	case OrgMemberSearchKey_ORGMEMBERSEARCHKEY_FIRST_NAME:
-		return org_model.ORGMEMBERSEARCHKEY_FIRST_NAME
+		return org_model.OrgMemberSearchKeyFirstName
 	case OrgMemberSearchKey_ORGMEMBERSEARCHKEY_LAST_NAME:
-		return org_model.ORGMEMBERSEARCHKEY_LAST_NAME
+		return org_model.OrgMemberSearchKeyLastName
 	case OrgMemberSearchKey_ORGMEMBERSEARCHKEY_USER_ID:
-		return org_model.ORGMEMBERSEARCHKEY_USER_ID
+		return org_model.OrgMemberSearchKeyUserID
 	default:
-		return org_model.ORGMEMBERSEARCHKEY_UNSPECIFIED
+		return org_model.OrgMemberSearchKeyUnspecified
 	}
 }
 
 func orgMemberSearchMethodToModel(key SearchMethod) model.SearchMethod {
 	switch key {
 	case SearchMethod_SEARCHMETHOD_CONTAINS:
-		return model.SEARCHMETHOD_CONTAINS
+		return model.SearchMethodContains
 	case SearchMethod_SEARCHMETHOD_CONTAINS_IGNORE_CASE:
-		return model.SEARCHMETHOD_CONTAINS_IGNORE_CASE
+		return model.SearchMethodContainsIgnoreCase
 	case SearchMethod_SEARCHMETHOD_EQUALS:
-		return model.SEARCHMETHOD_EQUALS
+		return model.SearchMethodEquals
 	case SearchMethod_SEARCHMETHOD_EQUALS_IGNORE_CASE:
-		return model.SEARCHMETHOD_EQUALS_IGNORE_CASE
+		return model.SearchMethodEqualsIgnoreCase
 	case SearchMethod_SEARCHMETHOD_STARTS_WITH:
-		return model.SEARCHMETHOD_STARTS_WITH
+		return model.SearchMethodStartsWith
 	case SearchMethod_SEARCHMETHOD_STARTS_WITH_IGNORE_CASE:
-		return model.SEARCHMETHOD_STARTS_WITH_IGNORE_CASE
+		return model.SearchMethodStartsWithIgnoreCase
 	default:
 		return -1
 	}

pkg/management/api/grpc/project_converter.go

@@ -96,9 +96,9 @@ func projectRoleViewFromModel(role *proj_model.ProjectRoleView) *ProjectRoleView
 
 func projectStateFromModel(state proj_model.ProjectState) ProjectState {
 	switch state {
-	case proj_model.PROJECTSTATE_ACTIVE:
+	case proj_model.ProjectStateActive:
 		return ProjectState_PROJECTSTATE_ACTIVE
-	case proj_model.PROJECTSTATE_INACTIVE:
+	case proj_model.ProjectStateInactive:
 		return ProjectState_PROJECTSTATE_INACTIVE
 	default:
 		return ProjectState_PROJECTSTATE_UNSPECIFIED
@@ -202,9 +202,9 @@ func projectSearchQueryToModel(query *ProjectSearchQuery) *proj_model.ProjectVie
 func projectSearchKeyToModel(key ProjectSearchKey) proj_model.ProjectViewSearchKey {
 	switch key {
 	case ProjectSearchKey_PROJECTSEARCHKEY_PROJECT_NAME:
-		return proj_model.PROJECTSEARCHKEY_NAME
+		return proj_model.ProjectViewSearchKeyName
 	default:
-		return proj_model.PROJECTSEARCHKEY_UNSPECIFIED
+		return proj_model.ProjectViewSearchKeyUnspecified
 	}
 }
 
@@ -227,9 +227,9 @@ func grantedProjectSearchQueryToModel(query *ProjectSearchQuery) *proj_model.Pro
 func projectGrantSearchKeyToModel(key ProjectSearchKey) proj_model.ProjectGrantViewSearchKey {
 	switch key {
 	case ProjectSearchKey_PROJECTSEARCHKEY_PROJECT_NAME:
-		return proj_model.GRANTEDPROJECTSEARCHKEY_NAME
+		return proj_model.GrantedProjectSearchKeyName
 	default:
-		return proj_model.GRANTEDPROJECTSEARCHKEY_UNSPECIFIED
+		return proj_model.GrantedProjectSearchKeyUnspecified
 	}
 }
 
@@ -260,11 +260,11 @@ func projectRoleSearchQueryToModel(query *ProjectRoleSearchQuery) *proj_model.Pr
 func projectRoleSearchKeyToModel(key ProjectRoleSearchKey) proj_model.ProjectRoleSearchKey {
 	switch key {
 	case ProjectRoleSearchKey_PROJECTROLESEARCHKEY_KEY:
-		return proj_model.PROJECTROLESEARCHKEY_KEY
+		return proj_model.ProjectRoleSearchKeyKey
 	case ProjectRoleSearchKey_PROJECTROLESEARCHKEY_DISPLAY_NAME:
-		return proj_model.PROJECTROLESEARCHKEY_DISPLAY_NAME
+		return proj_model.ProjectRoleSearchKeyDisplayName
 	default:
-		return proj_model.PROJECTROLESEARCHKEY_UNSPECIFIED
+		return proj_model.ProjectRoleSearchKeyUnspecified
 	}
 }
 

pkg/management/api/grpc/project_grant_converter.go

@@ -58,8 +58,8 @@ func projectGrantSearchRequestsToModel(request *ProjectGrantSearchRequest) *proj
 func projectGrantSearchQueriesToModel(projectId string, queries []*ProjectGrantSearchQuery) []*proj_model.ProjectGrantViewSearchQuery {
 	converted := make([]*proj_model.ProjectGrantViewSearchQuery, 0)
 	converted = append(converted, &proj_model.ProjectGrantViewSearchQuery{
-		Key:    proj_model.GRANTEDPROJECTSEARCHKEY_PROJECTID,
-		Method: model.SEARCHMETHOD_EQUALS,
+		Key:    proj_model.GrantedProjectSearchKeyProjectID,
+		Method: model.SearchMethodEquals,
 		Value:  projectId,
 	})
 	for i, query := range queries {
@@ -79,11 +79,11 @@ func projectGrantSearchQueryToModel(query *ProjectGrantSearchQuery) *proj_model.
 func projectGrantViewSearchKeyToModel(key ProjectGrantSearchKey) proj_model.ProjectGrantViewSearchKey {
 	switch key {
 	case ProjectGrantSearchKey_PROJECTGRANTSEARCHKEY_PROJECT_NAME:
-		return proj_model.GRANTEDPROJECTSEARCHKEY_PROJECTID
+		return proj_model.GrantedProjectSearchKeyProjectID
 	case ProjectGrantSearchKey_PROJECTGRANTSEARCHKEY_ROLE_KEY:
-		return proj_model.GRANTEDPROJECTSEARCHKEY_ROLE_KEYS
+		return proj_model.GrantedProjectSearchKeyRoleKeys
 	default:
-		return proj_model.GRANTEDPROJECTSEARCHKEY_UNSPECIFIED
+		return proj_model.GrantedProjectSearchKeyUnspecified
 	}
 }
 
@@ -129,9 +129,9 @@ func projectGrantFromGrantedProjectModel(project *proj_model.ProjectGrantView) *
 
 func projectGrantStateFromModel(state proj_model.ProjectGrantState) ProjectGrantState {
 	switch state {
-	case proj_model.PROJECTGRANTSTATE_ACTIVE:
+	case proj_model.ProjectGrantStateActive:
 		return ProjectGrantState_PROJECTGRANTSTATE_ACTIVE
-	case proj_model.PROJECTGRANTSTATE_INACTIVE:
+	case proj_model.ProjectGrantStateInactive:
 		return ProjectGrantState_PROJECTGRANTSTATE_INACTIVE
 	default:
 		return ProjectGrantState_PROJECTGRANTSTATE_UNSPECIFIED
@@ -140,9 +140,9 @@ func projectGrantStateFromModel(state proj_model.ProjectGrantState) ProjectGrant
 
 func projectGrantStateFromProjectStateModel(state proj_model.ProjectState) ProjectGrantState {
 	switch state {
-	case proj_model.PROJECTSTATE_ACTIVE:
+	case proj_model.ProjectStateActive:
 		return ProjectGrantState_PROJECTGRANTSTATE_ACTIVE
-	case proj_model.PROJECTSTATE_INACTIVE:
+	case proj_model.ProjectStateInactive:
 		return ProjectGrantState_PROJECTGRANTSTATE_INACTIVE
 	default:
 		return ProjectGrantState_PROJECTGRANTSTATE_UNSPECIFIED

pkg/management/api/grpc/project_grant_member_converter.go

@@ -72,15 +72,15 @@ func projectGrantMemberSearchQueryToModel(query *ProjectGrantMemberSearchQuery)
 func projectGrantMemberSearchKeyToModel(key ProjectGrantMemberSearchKey) proj_model.ProjectGrantMemberSearchKey {
 	switch key {
 	case ProjectGrantMemberSearchKey_PROJECTGRANTMEMBERSEARCHKEY_EMAIL:
-		return proj_model.PROJECTGRANTMEMBERSEARCHKEY_EMAIL
+		return proj_model.ProjectGrantMemberSearchKeyEmail
 	case ProjectGrantMemberSearchKey_PROJECTGRANTMEMBERSEARCHKEY_FIRST_NAME:
-		return proj_model.PROJECTGRANTMEMBERSEARCHKEY_FIRST_NAME
+		return proj_model.ProjectGrantMemberSearchKeyFirstName
 	case ProjectGrantMemberSearchKey_PROJECTGRANTMEMBERSEARCHKEY_LAST_NAME:
-		return proj_model.PROJECTGRANTMEMBERSEARCHKEY_LAST_NAME
+		return proj_model.ProjectGrantMemberSearchKeyLastName
 	case ProjectGrantMemberSearchKey_PROJECTGRANTMEMBERSEARCHKEY_USER_NAME:
-		return proj_model.PROJECTGRANTMEMBERSEARCHKEY_USER_NAME
+		return proj_model.ProjectGrantMemberSearchKeyUserName
 	default:
-		return proj_model.PROJECTGRANTMEMBERSEARCHKEY_UNSPECIFIED
+		return proj_model.ProjectGrantMemberSearchKeyUnspecified
 	}
 }
 

pkg/management/api/grpc/project_member_converter.go

@@ -70,15 +70,15 @@ func projectMemberSearchQueryToModel(query *ProjectMemberSearchQuery) *proj_mode
 func projectMemberSearchKeyToModel(key ProjectMemberSearchKey) proj_model.ProjectMemberSearchKey {
 	switch key {
 	case ProjectMemberSearchKey_PROJECTMEMBERSEARCHKEY_EMAIL:
-		return proj_model.PROJECTMEMBERSEARCHKEY_EMAIL
+		return proj_model.ProjectMemberSearchKeyEmail
 	case ProjectMemberSearchKey_PROJECTMEMBERSEARCHKEY_FIRST_NAME:
-		return proj_model.PROJECTMEMBERSEARCHKEY_FIRST_NAME
+		return proj_model.ProjectMemberSearchKeyFirstName
 	case ProjectMemberSearchKey_PROJECTMEMBERSEARCHKEY_LAST_NAME:
-		return proj_model.PROJECTMEMBERSEARCHKEY_LAST_NAME
+		return proj_model.ProjectMemberSearchKeyLastName
 	case ProjectMemberSearchKey_PROJECTMEMBERSEARCHKEY_USER_NAME:
-		return proj_model.PROJECTMEMBERSEARCHKEY_USER_NAME
+		return proj_model.ProjectMemberSearchKeyUserName
 	default:
-		return proj_model.PROJECTMEMBERSEARCHKEY_UNSPECIFIED
+		return proj_model.ProjectMemberSearchKeyUnspecified
 	}
 }
 

pkg/management/api/grpc/search_converter.go

@@ -5,24 +5,24 @@ import "github.com/caos/zitadel/internal/model"
 func searchMethodToModel(method SearchMethod) model.SearchMethod {
 	switch method {
 	case SearchMethod_SEARCHMETHOD_EQUALS:
-		return model.SEARCHMETHOD_EQUALS
+		return model.SearchMethodEquals
 	case SearchMethod_SEARCHMETHOD_CONTAINS:
-		return model.SEARCHMETHOD_CONTAINS
+		return model.SearchMethodContains
 	case SearchMethod_SEARCHMETHOD_STARTS_WITH:
-		return model.SEARCHMETHOD_STARTS_WITH
+		return model.SearchMethodStartsWith
 	case SearchMethod_SEARCHMETHOD_EQUALS_IGNORE_CASE:
-		return model.SEARCHMETHOD_EQUALS_IGNORE_CASE
+		return model.SearchMethodEqualsIgnoreCase
 	case SearchMethod_SEARCHMETHOD_CONTAINS_IGNORE_CASE:
-		return model.SEARCHMETHOD_CONTAINS_IGNORE_CASE
+		return model.SearchMethodContainsIgnoreCase
 	case SearchMethod_SEARCHMETHOD_STARTS_WITH_IGNORE_CASE:
-		return model.SEARCHMETHOD_STARTS_WITH_IGNORE_CASE
+		return model.SearchMethodStartsWithIgnoreCase
 	case SearchMethod_SEARCHMETHOD_NOT_EQUALS:
-		return model.SEARCHMETHOD_NOT_EQUALS
+		return model.SearchMethodNotEquals
 	case SearchMethod_SEARCHMETHOD_IS_ONE_OF:
-		return model.SEARCHMETHOD_IS_ONE_OF
+		return model.SearchMethodIsOneOf
 	case SearchMethod_SEARCHMETHOD_LIST_CONTAINS:
-		return model.SEARCHMETHOD_LIST_CONTAINS
+		return model.SearchMethodListContains
 	default:
-		return model.SEARCHMETHOD_EQUALS
+		return model.SearchMethodEquals
 	}
 }

pkg/management/api/grpc/user_converter.go

@@ -119,21 +119,21 @@ func userSearchQueryToModel(query *UserSearchQuery) *usr_model.UserSearchQuery {
 func userSearchKeyToModel(key UserSearchKey) usr_model.UserSearchKey {
 	switch key {
 	case UserSearchKey_USERSEARCHKEY_USER_NAME:
-		return usr_model.USERSEARCHKEY_USER_NAME
+		return usr_model.UserSearchKeyUserName
 	case UserSearchKey_USERSEARCHKEY_FIRST_NAME:
-		return usr_model.USERSEARCHKEY_FIRST_NAME
+		return usr_model.UserSearchKeyFirstName
 	case UserSearchKey_USERSEARCHKEY_LAST_NAME:
-		return usr_model.USERSEARCHKEY_LAST_NAME
+		return usr_model.UserSearchKeyLastName
 	case UserSearchKey_USERSEARCHKEY_NICK_NAME:
-		return usr_model.USERSEARCHKEY_NICK_NAME
+		return usr_model.UserSearchKeyNickName
 	case UserSearchKey_USERSEARCHKEY_DISPLAY_NAME:
-		return usr_model.USERSEARCHKEY_DISPLAY_NAME
+		return usr_model.UserSearchKeyDisplayName
 	case UserSearchKey_USERSEARCHKEY_EMAIL:
-		return usr_model.USERSEARCHKEY_EMAIL
+		return usr_model.UserSearchKeyEmail
 	case UserSearchKey_USERSEARCHKEY_STATE:
-		return usr_model.USERSEARCHKEY_STATE
+		return usr_model.UserSearchKeyState
 	default:
-		return usr_model.USERSEARCHKEY_UNSPECIFIED
+		return usr_model.UserSearchKeyUnspecified
 	}
 }
 
@@ -409,25 +409,25 @@ func mfaFromModel(mfa *usr_model.MultiFactor) *MultiFactor {
 func notifyTypeToModel(state NotificationType) usr_model.NotificationType {
 	switch state {
 	case NotificationType_NOTIFICATIONTYPE_EMAIL:
-		return usr_model.NOTIFICATIONTYPE_EMAIL
+		return usr_model.NotificationTypeEmail
 	case NotificationType_NOTIFICATIONTYPE_SMS:
-		return usr_model.NOTIFICATIONTYPE_SMS
+		return usr_model.NotificationTypeSms
 	default:
-		return usr_model.NOTIFICATIONTYPE_EMAIL
+		return usr_model.NotificationTypeEmail
 	}
 }
 
 func userStateFromModel(state usr_model.UserState) UserState {
 	switch state {
-	case usr_model.USERSTATE_ACTIVE:
+	case usr_model.UserStateActive:
 		return UserState_USERSTATE_ACTIVE
-	case usr_model.USERSTATE_INACTIVE:
+	case usr_model.UserStateInactive:
 		return UserState_USERSTATE_INACTIVE
-	case usr_model.USERSTATE_LOCKED:
+	case usr_model.UserStateLocked:
 		return UserState_USERSTATE_LOCKED
-	case usr_model.USERSTATE_INITIAL:
+	case usr_model.UserStateInitial:
 		return UserState_USERSTATE_INITIAL
-	case usr_model.USERSTATE_SUSPEND:
+	case usr_model.UserStateSuspend:
 		return UserState_USERSTATE_SUSPEND
 	default:
 		return UserState_USERSTATE_UNSPECIFIED
@@ -436,11 +436,11 @@ func userStateFromModel(state usr_model.UserState) UserState {
 
 func genderFromModel(gender usr_model.Gender) Gender {
 	switch gender {
-	case usr_model.GENDER_FEMALE:
+	case usr_model.GenderFemale:
 		return Gender_GENDER_FEMALE
-	case usr_model.GENDER_MALE:
+	case usr_model.GenderMale:
 		return Gender_GENDER_MALE
-	case usr_model.GENDER_DIVERSE:
+	case usr_model.GenderDiverse:
 		return Gender_GENDER_DIVERSE
 	default:
 		return Gender_GENDER_UNSPECIFIED
@@ -450,21 +450,21 @@ func genderFromModel(gender usr_model.Gender) Gender {
 func genderToModel(gender Gender) usr_model.Gender {
 	switch gender {
 	case Gender_GENDER_FEMALE:
-		return usr_model.GENDER_FEMALE
+		return usr_model.GenderFemale
 	case Gender_GENDER_MALE:
-		return usr_model.GENDER_MALE
+		return usr_model.GenderMale
 	case Gender_GENDER_DIVERSE:
-		return usr_model.GENDER_DIVERSE
+		return usr_model.GenderDiverse
 	default:
-		return usr_model.GENDER_UNDEFINED
+		return usr_model.GenderUnspecified
 	}
 }
 
-func mfaTypeFromModel(mfatype usr_model.MFAType) MfaType {
+func mfaTypeFromModel(mfatype usr_model.MfaType) MfaType {
 	switch mfatype {
-	case usr_model.MFATYPE_OTP:
+	case usr_model.MfaTypeOTP:
 		return MfaType_MFATYPE_OTP
-	case usr_model.MFATYPE_SMS:
+	case usr_model.MfaTypeSMS:
 		return MfaType_MFATYPE_SMS
 	default:
 		return MfaType_MFATYPE_UNSPECIFIED
@@ -473,9 +473,9 @@ func mfaTypeFromModel(mfatype usr_model.MFAType) MfaType {
 
 func mfaStateFromModel(state usr_model.MfaState) MFAState {
 	switch state {
-	case usr_model.MFASTATE_READY:
+	case usr_model.MfaStateReady:
 		return MFAState_MFASTATE_READY
-	case usr_model.MFASTATE_NOTREADY:
+	case usr_model.MfaStateNotReady:
 		return MFAState_MFASTATE_NOT_READY
 	default:
 		return MFAState_MFASTATE_UNSPECIFIED

pkg/management/api/grpc/user_grant_converter.go

@@ -115,15 +115,15 @@ func userGrantSearchQueryToModel(query *UserGrantSearchQuery) *grant_model.UserG
 func userGrantSearchKeyToModel(key UserGrantSearchKey) grant_model.UserGrantSearchKey {
 	switch key {
 	case UserGrantSearchKey_USERGRANTSEARCHKEY_ORG_ID:
-		return grant_model.USERGRANTSEARCHKEY_RESOURCEOWNER
+		return grant_model.UserGrantSearchKeyResourceOwner
 	case UserGrantSearchKey_USERGRANTSEARCHKEY_PROJECT_ID:
-		return grant_model.USERGRANTSEARCHKEY_PROJECT_ID
+		return grant_model.UserGrantSearchKeyProjectID
 	case UserGrantSearchKey_USERGRANTSEARCHKEY_USER_ID:
-		return grant_model.USERGRANTSEARCHKEY_USER_ID
+		return grant_model.UserGrantSearchKeyUserID
 	case UserGrantSearchKey_USERGRANTSEARCHKEY_ROLE_KEY:
-		return grant_model.USERGRANTSEARCHKEY_ROLE_KEY
+		return grant_model.UserGrantSearchKeyRoleKey
 	default:
-		return grant_model.USERGRANTSEARCHKEY_UNSPECIFIED
+		return grant_model.UserGrantSearchKeyUnspecified
 	}
 }
 
@@ -171,9 +171,9 @@ func userGrantViewFromModel(grant *grant_model.UserGrantView) *UserGrantView {
 
 func usergrantStateFromModel(state grant_model.UserGrantState) UserGrantState {
 	switch state {
-	case grant_model.USERGRANTSTATE_ACTIVE:
+	case grant_model.UserGrantStateActive:
 		return UserGrantState_USERGRANTSTATE_ACTIVE
-	case grant_model.USERGRANTSTATE_INACTIVE:
+	case grant_model.UserGrantStateInactive:
 		return UserGrantState_USERGRANTSTATE_INACTIVE
 	default:
 		return UserGrantState_USERGRANTSTATE_UNSPECIFIED