mirror of
https://github.com/andwati/zitadel.git
synced 2026-10-18 05:52:51 +00:00
chore: Service Account Naming Consistency (#11557)
# Which Problems Are Solved Inconsistent naming of service account, found in the following variations: - Machine User - machine user - Service User - Machine Account - Technical Account - User: Type Machine # How the Problems Are Solved Attentive search and replace. Localizations have been translated using Copilot # Additional Changes Some unused methods have been removed from the Go code. # Additional Context - Closes #11285
This commit is contained in:
+3
-3
@@ -845,7 +845,7 @@ SystemDefaults:
|
||||
# - "scrypt"
|
||||
# - "pbkdf2" # verifier for all pbkdf2 hash modes.
|
||||
SecretHasher:
|
||||
# Set hasher configuration for machine users, API and OIDC client secrets.
|
||||
# Set hasher configuration for service accounts, API and OIDC client secrets.
|
||||
Hasher:
|
||||
# Supported algorithms: "argon2i", "argon2id", "bcrypt", "scrypt", "pbkdf2"
|
||||
# Depending on the algorithm, different configuration options take effect.
|
||||
@@ -964,7 +964,7 @@ DefaultInstance:
|
||||
Org:
|
||||
Name: ZITADEL # ZITADEL_DEFAULTINSTANCE_ORG_NAME
|
||||
# In the DefaultInstance.Org.Human section, the initial organization's admin user with the role IAM_OWNER is defined.
|
||||
# If DefaultInstance.Org.Machine.Machine is defined, a service user is created with the IAM_OWNER role.
|
||||
# If DefaultInstance.Org.Machine.Machine is defined, a service account is created with the IAM_OWNER role.
|
||||
Human:
|
||||
# In case that UserLoginMustBeDomain is false (default) and if you don't overwrite the username with an email,
|
||||
# it will be suffixed by the org domain (org-name + domain from config).
|
||||
@@ -984,7 +984,7 @@ DefaultInstance:
|
||||
Verified: # ZITADEL_DEFAULTINSTANCE_ORG_HUMAN_PHONE_VERIFIED
|
||||
Password: # ZITADEL_DEFAULTINSTANCE_ORG_HUMAN_PASSWORD
|
||||
# In the DefaultInstance.Org.Machine section, the initial organization's admin user with the role IAM_OWNER is defined.
|
||||
# If DefaultInstance.Org.Machine.Machine is defined, a service user is created with the IAM_OWNER role.
|
||||
# If DefaultInstance.Org.Machine.Machine is defined, a service account is created with the IAM_OWNER role.
|
||||
Machine:
|
||||
Machine:
|
||||
Username: # ZITADEL_DEFAULTINSTANCE_ORG_MACHINE_MACHINE_USERNAME
|
||||
|
||||
@@ -38,7 +38,7 @@ BEGIN
|
||||
RETURN;
|
||||
END IF;
|
||||
|
||||
-- if human/machine user
|
||||
-- if human/service account
|
||||
DECLARE
|
||||
matched_roles TEXT[] := eventstore.find_roles(req_instance_id, perm);
|
||||
BEGIN
|
||||
|
||||
@@ -29,7 +29,7 @@ BEGIN
|
||||
RETURN;
|
||||
END IF;
|
||||
|
||||
-- if human/machine user
|
||||
-- if human/service account
|
||||
SELECT * FROM eventstore.permitted_orgs(
|
||||
req_instance_id
|
||||
, auth_user_id
|
||||
|
||||
@@ -122,7 +122,7 @@ FirstInstance:
|
||||
Org:
|
||||
Name: ZITADEL # ZITADEL_FIRSTINSTANCE_ORG_NAME
|
||||
# In the FirstInstance.Org.Human section, the initial organization's admin user with the role IAM_OWNER is defined.
|
||||
# If FirstInstance.Org.Machine.Machine is defined, a service user is created with the IAM_OWNER role.
|
||||
# If FirstInstance.Org.Machine.Machine is defined, a service account is created with the IAM_OWNER role.
|
||||
Human:
|
||||
# In case UserLoginMustBeDomain is false (default) and you don't overwrite the username with an email,
|
||||
# it will be suffixed by the org domain (org-name + domain from config).
|
||||
@@ -144,7 +144,7 @@ FirstInstance:
|
||||
Password: Password1! # ZITADEL_FIRSTINSTANCE_ORG_HUMAN_PASSWORD
|
||||
PasswordChangeRequired: true # ZITADEL_FIRSTINSTANCE_ORG_HUMAN_PASSWORDCHANGEREQUIRED
|
||||
# In the FirstInstance.Org.Machine section, the initial organization's admin user with the role IAM_OWNER is defined.
|
||||
# If FirstInstance.Org.Machine.Machine is defined, a service user is created with the IAM_OWNER role.
|
||||
# If FirstInstance.Org.Machine.Machine is defined, a service account is created with the IAM_OWNER role.
|
||||
Machine:
|
||||
Machine:
|
||||
Username: # ZITADEL_FIRSTINSTANCE_ORG_MACHINE_MACHINE_USERNAME
|
||||
|
||||
Reference in New Issue
Block a user