Skip to content

Commit

Permalink
ACP-2626 Added configurationValidation (#12)
Browse files Browse the repository at this point in the history
* ACP-2626 Added configurationValidation
---------

Co-authored-by: Stanislav Matveyev <[email protected]>
  • Loading branch information
stereomon and matweew authored Jul 16, 2024
1 parent 28020a6 commit 7f6e791
Show file tree
Hide file tree
Showing 35 changed files with 981 additions and 334 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ composer.lock
# built resources
src/Generated
src/Orm/Zed/
src/Orm/Propel/Schema/
src/Orm/Propel/Migration_SQLite/
tests/_data/app_kernel_db

Expand Down
155 changes: 82 additions & 73 deletions composer.json
Original file line number Diff line number Diff line change
@@ -1,76 +1,85 @@
{
"name": "spryker/app-kernel",
"type": "library",
"description": "AppKernel module",
"license": "proprietary",
"require": {
"php": ">=8.1",
"spryker/app-kernel-extension": "dev-master",
"spryker/glue-application-extension": "^1.0.0",
"spryker/kernel": "^3.30.0",
"spryker/log": "^3.0.0",
"spryker/message-broker": "^1.11.0",
"spryker/propel-encryption-behavior": "^0.1.1",
"spryker/secrets-manager": "^1.0.0",
"spryker/secrets-manager-extension": "^1.0.0",
"spryker/symfony": "^3.0.0",
"spryker/transfer": "^3.33.0",
"spryker/util-encoding": "^2.0.0",
"spryker/util-text": "^1.0.0"
},
"require-dev": {
"codeception/codeception": "^5.0",
"codeception/module-asserts": "^3.0",
"phpstan/phpdoc-parser": "1.25.0",
"phpstan/phpstan": "1.10.66",
"rector/rector": "^0.19.0",
"spryker/code-sniffer": "*",
"spryker/container": "*",
"spryker/development": "^3.34.0",
"spryker/message-broker-aws": "^1.7.0",
"spryker/propel": "*",
"spryker/testify": "*",
"spryker/testify-async-api": "^0.1.4"
},
"autoload": {
"psr-4": {
"Spryker\\": "src/Spryker/",
"SprykerTest\\Glue\\AppKernel\\Helper\\": "tests/SprykerTest/Glue/AppKernel/_support/Helper/",
"SprykerTest\\Zed\\AppKernel\\Helper\\": "tests/SprykerTest/Zed/AppKernel/_support/Helper/",
"SprykerTest\\Shared\\AppKernel\\Helper\\": "tests/SprykerTest/Shared/AppKernel/_support/Helper/",
"SprykerTest\\Zed\\Propel\\Helper\\": "tests/SprykerTest/Zed/Propel/_support/Helper/"
}
},
"autoload-dev": {
"psr-4": {
"SprykerTest\\": "tests/SprykerTest/",
"Generated\\": "src/Generated/",
"Orm\\": "src/Orm/"
}
},
"minimum-stability": "dev",
"prefer-stable": true,
"scripts": {
"setup": "tests/bin/console app-kernel:setup && tests/bin/console transfer:generate && tests/bin/console transfer:databuilder:generate && tests/bin/console propel:install && tests/bin/console dev:ide-auto-completion:zed:generate && tests/bin/console dev:ide-auto-completion:glue:generate && tests/bin/console dev:ide-auto-completion:glue-backend:generate",
"cs-check": "phpcs -p src/ tests/",
"cs-fix": "phpcbf -p src/ tests/",
"stan": "phpstan analyze src/Spryker/",
"test": "codecept build && codecept run",
"test-cover": "codecept build && codecept run --coverage-xml",
"test-cover-html": "codecept build && codecept run --coverage-html",
"rector": "vendor/bin/rector process src/Spryker/ --config rector.php --ansi",
"rector-ci": "vendor/bin/rector process src/Spryker/ --config rector.php --ansi --dry-run",
"local-ci": "composer cs-fix && composer cs-check && composer stan && composer rector-ci && composer test"
},
"extra": {
"branch-alias": {
"dev-master": "1.0.x-dev"
}
},
"config": {
"sort-packages": true,
"allow-plugins": {
"dealerdirect/phpcodesniffer-composer-installer": true
}
"name": "spryker/app-kernel",
"type": "library",
"description": "AppKernel module",
"license": "proprietary",
"require": {
"php": ">=8.1",
"spryker/app-kernel-extension": "dev-master",
"spryker/glue-application-extension": "^1.0.0",
"spryker/kernel": "^3.30.0",
"spryker/log": "^3.0.0",
"spryker/message-broker": "^1.11.0",
"spryker/propel-encryption-behavior": "^0.1.1",
"spryker/secrets-manager": "^1.0.0",
"spryker/secrets-manager-extension": "^1.0.0",
"spryker/symfony": "^3.0.0",
"spryker/transfer": "^3.33.0",
"spryker/util-encoding": "^2.0.0",
"spryker/util-text": "^1.0.0"
},
"require-dev": {
"codeception/codeception": "^5.0",
"codeception/module-cli": "^2.0.0",
"codeception/module-filesystem": "^3.0.0",
"codeception/module-phpbrowser": "^3.0.0",
"codeception/module-rest": "^3.0.0",
"codeception/module-webdriver": "^3.0.0",
"phpstan/phpdoc-parser": "1.25.0",
"phpstan/phpstan": "1.10.66",
"rector/rector": "^0.19.0",
"spryker/code-sniffer": "*",
"spryker/container": "*",
"spryker/development": "^3.34.0",
"spryker/glue-application": "^1.64.0",
"spryker/glue-backend-api-application": "^1.6.0",
"spryker/glue-json-api-convention": "^1.3.0",
"spryker/http": "^1.11.0",
"spryker/message-broker-aws": "^1.7.0",
"spryker/propel": "*",
"spryker/testify": "*",
"spryker/testify-async-api": "^0.1.4"
},
"autoload": {
"psr-4": {
"Spryker\\": "src/Spryker/",
"SprykerTest\\Glue\\AppKernel\\Helper\\": "tests/SprykerTest/Glue/AppKernel/_support/Helper/",
"SprykerTest\\Glue\\Testify\\Helper\\": "tests/SprykerTest/Glue/Testify/_support/Helper/",
"SprykerTest\\Zed\\AppKernel\\Helper\\": "tests/SprykerTest/Zed/AppKernel/_support/Helper/",
"SprykerTest\\Shared\\AppKernel\\Helper\\": "tests/SprykerTest/Shared/AppKernel/_support/Helper/",
"SprykerTest\\Zed\\Propel\\Helper\\": "tests/SprykerTest/Zed/Propel/_support/Helper/"
}
},
"autoload-dev": {
"psr-4": {
"SprykerTest\\": "tests/SprykerTest/",
"Generated\\": "src/Generated/",
"Orm\\": "src/Orm/"
}
},
"minimum-stability": "dev",
"prefer-stable": true,
"scripts": {
"setup": "tests/bin/console app-kernel:setup && tests/bin/console transfer:generate && tests/bin/console transfer:databuilder:generate && tests/bin/console propel:install && tests/bin/console dev:ide-auto-completion:zed:generate && tests/bin/console dev:ide-auto-completion:glue:generate && tests/bin/console dev:ide-auto-completion:glue-backend:generate",
"cs-check": "phpcs -p src/ tests/",
"cs-fix": "phpcbf -p src/ tests/",
"stan": "phpstan analyze src/Spryker/",
"test": "codecept build && codecept run",
"test-cover": "codecept build && codecept run --coverage-xml",
"test-cover-html": "codecept build && codecept run --coverage-html",
"rector": "vendor/bin/rector process src/Spryker/ --config rector.php --ansi",
"rector-ci": "vendor/bin/rector process src/Spryker/ --config rector.php --ansi --dry-run",
"local-ci": "composer cs-fix && composer cs-check && composer stan && composer rector-ci && composer test"
},
"extra": {
"branch-alias": {
"dev-master": "1.0.x-dev"
}
},
"config": {
"sort-packages": true,
"allow-plugins": {
"dealerdirect/phpcodesniffer-composer-installer": true
}
}
}
48 changes: 44 additions & 4 deletions config/Shared/config_default.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,55 @@
use Generated\Shared\Transfer\AppConfigUpdatedTransfer;
use Ramsey\Uuid\Uuid;
use Spryker\Shared\AppKernel\AppKernelConstants;
use Spryker\Shared\Application\ApplicationConstants;
use Spryker\Shared\GlueBackendApiApplication\GlueBackendApiApplicationConstants;
use Spryker\Shared\GlueJsonApiConvention\GlueJsonApiConventionConstants;
use Spryker\Shared\Http\HttpConstants;
use Spryker\Shared\Kernel\KernelConstants;
use Spryker\Shared\MessageBroker\MessageBrokerConstants;
use Spryker\Shared\ZedRequest\ZedRequestConstants;
use Spryker\Zed\MessageBrokerAws\MessageBrokerAwsConfig;
use Spryker\Shared\MessageBrokerAws\MessageBrokerAwsConstants;

$config[MessageBrokerConstants::MESSAGE_TO_CHANNEL_MAP] = [
$config[AppKernelConstants::APP_IDENTIFIER] = Uuid::uuid4()->toString();

// ----------------------------------------------------------------------------
// ------------------------------ Glue Backend API ----------------------------
// ----------------------------------------------------------------------------
$config[GlueBackendApiApplicationConstants::GLUE_BACKEND_API_HOST] = 'api.payment.local';

$config[KernelConstants::ENABLE_CONTAINER_OVERRIDING] = true;
$config[KernelConstants::PROJECT_NAMESPACES] =
$config[GlueBackendApiApplicationConstants::PROJECT_NAMESPACES] = [
'Spryker',
];
$config[ZedRequestConstants::ZED_API_SSL_ENABLED] = (bool)getenv('SPRYKER_ZED_SSL_ENABLED');

$config[ApplicationConstants::BASE_URL_ZED] = sprintf(
'https://%s',
'api.kernel.local',
);

$config[AppKernelConstants::APP_IDENTIFIER] = Uuid::uuid4()->toString();

$config[HttpConstants::URI_SIGNER_SECRET_KEY] = Uuid::uuid4()->toString();

$config[GlueJsonApiConventionConstants::GLUE_DOMAIN] = sprintf(
'%s://%s',
getenv('SPRYKER_SSL_ENABLE') ? 'https' : 'http',
$config[GlueBackendApiApplicationConstants::GLUE_BACKEND_API_HOST] ?: 'localhost',
);

$config[MessageBrokerConstants::MESSAGE_TO_CHANNEL_MAP] =
$config[MessageBrokerAwsConstants::MESSAGE_TO_CHANNEL_MAP] = [
// App event
AppConfigUpdatedTransfer::class => 'app-events',
];

$config[MessageBrokerConstants::CHANNEL_TO_SENDER_TRANSPORT_MAP] = [
'app-events' => MessageBrokerAwsConfig::HTTP_CHANNEL_TRANSPORT,
$config[MessageBrokerConstants::CHANNEL_TO_TRANSPORT_MAP] = [
'app-events' => MessageBrokerAwsConfig::HTTP_TRANSPORT,
];

$config[AppKernelConstants::APP_IDENTIFIER] = Uuid::uuid4()->toString();
$config[MessageBrokerAwsConstants::CHANNEL_TO_SENDER_TRANSPORT_MAP] = [
'app-events' => MessageBrokerAwsConfig::HTTP_TRANSPORT,
];
2 changes: 2 additions & 0 deletions rector.php
Original file line number Diff line number Diff line change
Expand Up @@ -46,13 +46,15 @@
__DIR__ . '/src/Spryker/Zed/AppKernel/Dependency/Service/AppKernelToUtilEncodingServiceBridge.php',
__DIR__ . '/src/Spryker/Zed/AppKernel/Dependency/Service/AppKernelToUtilTextServiceBridge.php',
__DIR__ . '/src/Spryker/Glue/AppKernel/Dependency/Facade/AppKernelToAppKernelFacadeBridge.php',
__DIR__ . '/src/Spryker/Glue/AppKernel/Dependency/Service/AppKernelToUtilEncodingServiceBridge.php',
],
AddParamTypeFromPropertyTypeRector::class => [
__DIR__ . '/src/Spryker/Zed/AppKernel/Dependency/Client/AppKernelToSecretsManagerClientBridge.php',
__DIR__ . '/src/Spryker/Zed/AppKernel/Dependency/Facade/AppKernelToMessageBrokerFacadeBridge.php',
__DIR__ . '/src/Spryker/Zed/AppKernel/Dependency/Service/AppKernelToUtilEncodingServiceBridge.php',
__DIR__ . '/src/Spryker/Zed/AppKernel/Dependency/Service/AppKernelToUtilTextServiceBridge.php',
__DIR__ . '/src/Spryker/Glue/AppKernel/Dependency/Facade/AppKernelToAppKernelFacadeBridge.php',
__DIR__ . '/src/Spryker/Glue/AppKernel/Dependency/Service/AppKernelToUtilEncodingServiceBridge.php',
],
]);
};
21 changes: 0 additions & 21 deletions src/Orm/Propel/Schema/spy_app_kernel.schema.xml

This file was deleted.

48 changes: 0 additions & 48 deletions src/Orm/Propel/Schema/spy_locale.schema.xml

This file was deleted.

23 changes: 0 additions & 23 deletions src/Orm/Propel/Schema/spy_queue.schema.xml

This file was deleted.

15 changes: 0 additions & 15 deletions src/Orm/Propel/Schema/spy_store.schema.xml

This file was deleted.

Loading

0 comments on commit 7f6e791

Please sign in to comment.