diff --git a/docs/content/en/integration/openid-connect/argocd/index.md b/docs/content/en/integration/openid-connect/argocd/index.md index 8ca8b954..a1cf67cd 100644 --- a/docs/content/en/integration/openid-connect/argocd/index.md +++ b/docs/content/en/integration/openid-connect/argocd/index.md @@ -1,6 +1,6 @@ --- -title: "ArgoCD" -description: "Integrating ArgoCD with the Authelia OpenID Connect Provider." +title: "Argo CD" +description: "Integrating Argo CD with the Authelia OpenID Connect Provider." lead: "" date: 2022-07-13T03:42:47+10:00 draft: false @@ -17,7 +17,7 @@ community: true * [Authelia] * [v4.36.2](https://github.com/authelia/authelia/releases/tag/v4.36.2) -* [ArgoCD] +* [Argo CD] * v2.4.5 ## Before You Begin @@ -31,21 +31,21 @@ This example makes the following assumptions: * __Application Root URL:__ `https://argocd.example.com` * __Authelia Root URL:__ `https://auth.example.com` * __Client ID:__ `argocd` -* __CLI Client ID:__ `argocd-cli` * __Client Secret:__ `argocd_client_secret` +* __CLI Client ID:__ `argocd-cli` ## Configuration ### Application -To configure [ArgoCD] to utilize Authelia as an [OpenID Connect] Provider use the following configuration: +To configure [Argo CD] to utilize Authelia as an [OpenID Connect] Provider use the following configuration: ```yaml name: Authelia issuer: https://auth.example.com clientID: argocd -cliClientID: argocd-cli clientSecret: argocd_client_secret +cliClientID: argocd-cli requestedScopes: - openid - profile @@ -56,12 +56,12 @@ requestedScopes: ### Authelia The following YAML configuration is an example __Authelia__ -[client configuration](../../../configuration/identity-providers/open-id-connect.md#clients) for use with [ArgoCD] +[client configuration](../../../configuration/identity-providers/open-id-connect.md#clients) for use with [Argo CD] which will operate with the above example: ```yaml - id: argocd - description: ArgoCD + description: Argo CD redirect_uris: - https://argocd.example.com/auth/callback scopes: @@ -72,7 +72,7 @@ which will operate with the above example: secret: argocd_client_secret userinfo_signing_algorithm: none - id: argocd-cli - description: ArgoCD CLI + description: Argo CD (CLI) public: true redirect_uris: - http://localhost:8085/auth/callback @@ -86,10 +86,10 @@ which will operate with the above example: ## See Also -* [ArgoCD OpenID Connect Documentation](https://argo-cd.readthedocs.io/en/stable/operator-manual/user-management/#existing-oidc-provider) +* [Argo CD OpenID Connect Documentation](https://argo-cd.readthedocs.io/en/stable/operator-manual/user-management/#existing-oidc-provider) [Authelia]: https://www.authelia.com -[ArgoCD]: https://argo-cd.readthedocs.io/en/stable/ +[Argo CD]: https://argo-cd.readthedocs.io/en/stable/ [OpenID Connect]: ../../openid-connect/introduction.md diff --git a/internal/commands/acl.go b/internal/commands/acl.go index 7a6cd4fd..528e12fb 100644 --- a/internal/commands/acl.go +++ b/internal/commands/acl.go @@ -74,11 +74,9 @@ func accessControlCheckRunE(cmd *cobra.Command, _ []string) (err error) { return err } - v := schema.NewStructValidator() + validator.ValidateAccessControl(accessControlConfig, val) - validator.ValidateAccessControl(accessControlConfig, v) - - if v.HasErrors() || v.HasWarnings() { + if val.HasErrors() || val.HasWarnings() { return errors.New("your configuration has errors") }