Skip to content

Commit

Permalink
yamllint
Browse files Browse the repository at this point in the history
  • Loading branch information
baszoetekouw committed Oct 22, 2024
1 parent aef9957 commit a3c4cf2
Show file tree
Hide file tree
Showing 25 changed files with 177 additions and 107 deletions.
15 changes: 15 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
root = true

[*]
indent_style = space
indent_size = 4
tab_width = 4
end_of_line = lf
charset = utf-8
trim_trailing_whitespace = true
insert_final_newline = true
max_line_length = 120

[*.{yml,yaml,yml.j2,yaml.j2}]
max_line_length = 120
indent_size = 2
3 changes: 2 additions & 1 deletion .github/workflows/build-push-test-docker-image.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
---
name: build-push-test-docker-image

on:
Expand All @@ -24,7 +25,7 @@ jobs:
registry: ghcr.io
username: ${{ github.repository_owner }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Set docker labels and tags
id: meta
uses: docker/metadata-action@v5
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/stepup-behat.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
---
name: stepup-behat
on:
pull_request:
Expand Down
32 changes: 32 additions & 0 deletions .yamllint
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
---
# custom config for yamllint

extends: default

rules:
braces:
min-spaces-inside: 0
max-spaces-inside: -1
brackets:
min-spaces-inside: 0
max-spaces-inside: -1
commas:
max-spaces-before: 0
min-spaces-after: 0
max-spaces-after: -1
comments:
require-starting-space: no
comments-indentation: disable
colons:
max-spaces-before: 0
max-spaces-after: -1
empty-lines:
max-end: 1
indentation:
spaces: 2
indent-sequences: true
check-multi-line-strings: false
line-length:
max: 120
allow-non-breakable-words: false
truthy: disable
73 changes: 37 additions & 36 deletions core/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
---
services:
haproxy:
image: ghcr.io/openconext/openconext-basecontainers/haproxy28:latest
Expand Down Expand Up @@ -274,42 +275,42 @@ services:
- "extras"

inviteclient:
image: ghcr.io/openconext/openconext-invite/inviteclient:0.0.21
volumes:
- ./:/config
environment:
HTTPD_CSP: ""
HTTPD_SERVERNAME: "invite.dev.openconext.local"
networks:
coreconextdev:
hostname: inviteclient.docker
depends_on:
engine:
condition: service_healthy
mariadb:
condition: service_healthy
profiles:
- "extras"
- "teams"
image: ghcr.io/openconext/openconext-invite/inviteclient:0.0.21
volumes:
- ./:/config
environment:
HTTPD_CSP: ""
HTTPD_SERVERNAME: "invite.dev.openconext.local"
networks:
coreconextdev:
hostname: inviteclient.docker
depends_on:
engine:
condition: service_healthy
mariadb:
condition: service_healthy
profiles:
- "extras"
- "teams"

invitewelcome:
image: ghcr.io/openconext/openconext-invite/invitewelcome:0.0.21
volumes:
- ./:/config
environment:
HTTPD_CSP: ""
HTTPD_SERVERNAME: "invite.dev.openconext.local"
networks:
coreconextdev:
hostname: inviteclient.docker
depends_on:
engine:
condition: service_healthy
mariadb:
condition: service_healthy
profiles:
- "extras"
- "teams"
image: ghcr.io/openconext/openconext-invite/invitewelcome:0.0.21
volumes:
- ./:/config
environment:
HTTPD_CSP: ""
HTTPD_SERVERNAME: "invite.dev.openconext.local"
networks:
coreconextdev:
hostname: inviteclient.docker
depends_on:
engine:
condition: service_healthy
mariadb:
condition: service_healthy
profiles:
- "extras"
- "teams"

voot:
image: ghcr.io/openconext/openconext-voot/voot:6.2.0
Expand Down Expand Up @@ -346,7 +347,7 @@ services:
- "teams"
- "extras"
- "php"

pdpserver:
image: ghcr.io/openconext/openconext-pdp/pdp-server:5.1.0
mem_limit: 200m
Expand Down
1 change: 1 addition & 0 deletions core/engine/docker-compose.override.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
---
services:
engine:
image: ghcr.io/openconext/openconext-basecontainers/${ENGINE_PHP_IMAGE:-php72-apache2-node14-composer2:latest}
Expand Down
3 changes: 2 additions & 1 deletion core/engine/parameters.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
---
parameters:
##########################################################################################
## GLOBAL SETTINGS
Expand Down Expand Up @@ -36,7 +37,7 @@ parameters:
## * How attributes are displayed in Profile and Consent
## * How attributes are Normalized and Denormalized
## * How attributes are validated
attribute_definition_file_path: %kernel.project_dir%/../application/configs/attributes.json
attribute_definition_file_path: "%kernel.project_dir%/../application/configs/attributes.json"

## The Signing / Encryption keys used for the SAML2 authentication and metadata
## When EngineBlock signs responses (when it acts as an Idp)
Expand Down
1 change: 1 addition & 0 deletions core/manage/application.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
---
cookie:
secure: true
# Options are 'Strict', 'Lax' or 'None'
Expand Down
1 change: 1 addition & 0 deletions core/manage/manage-api-users.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
---
apiUsers:
- {
name: "dashboard",
Expand Down
1 change: 1 addition & 0 deletions core/mujina/application.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
---
# The logging configuration.
logging:
config: file:////config/mujina/logback.xml
Expand Down
1 change: 1 addition & 0 deletions core/profile/docker-compose.override.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
---
services:
profile:
image: ghcr.io/openconext/openconext-basecontainers/${PROFILE_PHP_IMAGE:-php82-apache2-node20-composer2:latest}
Expand Down
1 change: 1 addition & 0 deletions core/userlifecycle/docker-compose.override.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
---
services:
userlifecycle:
image: ghcr.io/openconext/openconext-basecontainers/${USERLIFECYCLE_PHP_IMAGE:-php82-apache2-node20-composer2:latest}
Expand Down
57 changes: 29 additions & 28 deletions core/userlifecycle/parameters.yml
Original file line number Diff line number Diff line change
@@ -1,36 +1,37 @@
---
# This file is a "template" of what your parameters.yml file should look like
# Set parameters here that may be different on each deployment target of the app, e.g. development, staging, production.
# http://symfony.com/doc/current/best_practices/configuration.html#infrastructure-related-configuration
parameters:
database_host: mariadb
database_port: ~
database_name: userlifecycle
database_user: userlifecyclerw
database_password: secret
# You should uncomment this if you want to use pdo_sqlite
#database_path: '%kernel.root_dir%/../var/data/data.sqlite'
database_host: mariadb
database_port: ~
database_name: userlifecycle
database_user: userlifecyclerw
database_password: secret
# You should uncomment this if you want to use pdo_sqlite
#database_path: '%kernel.root_dir%/../var/data/data.sqlite'

# A secret key that's used to generate certain security-related tokens
secret: ThisTokenIsNotSoSecretChangeIt
# A secret key that's used to generate certain security-related tokens
secret: ThisTokenIsNotSoSecretChangeIt

# The clients should be configured with an api url, username and password. Basic auth is the only supported auth
# mechanism at this point.
open_conext_user_lifecycle_clients:
# The service name is used for naming the dynamically created service and should be written in snake case
my_service_name:
# The API Url excluding the endpoint engine:
url: 'https://engine-api.dev.openconext.local'
username: "lifecycle"
password: "secret"
verify_ssl: true
# By default ssl verification is enabled, can be switched of by setting it to false
# The maximum number of users that can be deprovisioned during the batch deprovision run.
user_quota: 1500
# The clients should be configured with an api url, username and password. Basic auth is the only supported auth
# mechanism at this point.
open_conext_user_lifecycle_clients:
# The service name is used for naming the dynamically created service and should be written in snake case
my_service_name:
# The API Url excluding the endpoint engine:
url: 'https://engine-api.dev.openconext.local'
username: "lifecycle"
password: "secret"
verify_ssl: true
# By default ssl verification is enabled, can be switched of by setting it to false
# The maximum number of users that can be deprovisioned during the batch deprovision run.
user_quota: 1500

# The inactivity period after which a user is deprovisioned. The period is in months.
inactivity_period: 37
# The inactivity period after which a user is deprovisioned. The period is in months.
inactivity_period: 37

# is the deprovision api enabled?
deprovision_api_settings_enabled: true
deprovision_api_settings_username: userlifecycle
deprovision_api_settings_password: secret
# is the deprovision api enabled?
deprovision_api_settings_enabled: true
deprovision_api_settings_username: userlifecycle
deprovision_api_settings_password: secret
3 changes: 2 additions & 1 deletion stepup/azuremfa/docker-compose.override.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
---
services:
azuremfa:
image: ghcr.io/openconext/openconext-basecontainers/${AZUREMFA_PHP_IMAGE:-php72-apache2-node14-composer2:latest}
image: ghcr.io/openconext/openconext-basecontainers/${AZUREMFA_PHP_IMAGE:-php72-apache2-node14-composer2:latest}
volumes:
- ${AZUREMFA_CODE_PATH}:/var/www/html
environment:
Expand Down
3 changes: 2 additions & 1 deletion stepup/demogssp/docker-compose.override.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
---
services:
demogssp:
image: ghcr.io/openconext/openconext-basecontainers/${DEMOGSSP_PHP_IMAGE:-php72-apache2-node14-composer2:latest}
volumes:
- ${DEMOGSSP_CODE_PATH}:/var/www/html
environment:
- APP_ENV=${APP_ENV:-dev}
- APP_DEBUG=true
- APP_DEBUG=true
5 changes: 3 additions & 2 deletions stepup/docker-compose-behat.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
---
services:
behat:

behat:
image: ghcr.io/openconext/openconext-devconf/openconext-devconf:test
environment:
- APP_ENV=${APP_ENV:-prod}
Expand Down
1 change: 1 addition & 0 deletions stepup/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
---
services:

haproxy:
Expand Down
1 change: 1 addition & 0 deletions stepup/gateway/docker-compose.override.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
---
services:
gateway:
image: ghcr.io/openconext/openconext-basecontainers/${GATEWAY_PHP_IMAGE:-php72-apache2-node14-composer2:latest}
Expand Down
1 change: 1 addition & 0 deletions stepup/middleware/docker-compose.override.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
---
services:
middleware:
image: ghcr.io/openconext/openconext-basecontainers/${MIDDLEWARE_PHP_IMAGE:-php72-apache2-node14-composer2:latest}
Expand Down
1 change: 1 addition & 0 deletions stepup/ra/docker-compose.override.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
---
services:
ra:
image: ghcr.io/openconext/openconext-basecontainers/${RA_PHP_IMAGE:-php72-apache2-node14-composer2:latest}
Expand Down
3 changes: 2 additions & 1 deletion stepup/selfservice/docker-compose.override.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
---
services:
selfservice:
image: ghcr.io/openconext/openconext-basecontainers/${SELFSERVICE_PHP_IMAGE:-php72-apache2-node14-composer2:latest}
image: ghcr.io/openconext/openconext-basecontainers/${SELFSERVICE_PHP_IMAGE:-php72-apache2-node14-composer2:latest}
volumes:
- ${SELFSERVICE_CODE_PATH}:/var/www/html
environment:
Expand Down
1 change: 1 addition & 0 deletions stepup/ssp/docker-compose.override.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
---
services:
ssp:
volumes:
Expand Down
Loading

0 comments on commit a3c4cf2

Please sign in to comment.