Skip to content

Commit 183985c

Browse files
kkicheglovsprykerkkicheglovspryker
committed
Merge branch 'internal' of github.com:spryker-shop/b2c-demo-shop into internal-robot
2 parents 5ab27f8 + 42ebdf8 commit 183985c

26 files changed

+1290
-388
lines changed

‎composer.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,6 +186,7 @@
186186
"spryker/product-warehouse-allocation-example": "^0.2.0",
187187
"spryker/products-backend-api": "^0.3.0",
188188
"spryker/products-categories-resource-relationship": "^1.4.0",
189+
"spryker/products-product-image-sets-backend-resource-relationship": "^0.2.0",
189190
"spryker/products-rest-api": "^2.15.1",
190191
"spryker/push-notifications-backend-api": "^1.0.0",
191192
"spryker/related-products-rest-api": "^1.3.2",
@@ -208,7 +209,7 @@
208209
"spryker/stores-api": "^1.0.0",
209210
"spryker/stores-backend-api": "^1.0.0",
210211
"spryker/stores-rest-api": "^1.2.0",
211-
"spryker/tax-app": "^0.1.0",
212+
"spryker/tax-app": "^0.2.0",
212213
"spryker/tax-product-connector": "^4.7.1",
213214
"spryker/up-selling-products-rest-api": "^1.2.2",
214215
"spryker/urls-rest-api": "^1.0.2",

‎composer.lock

Lines changed: 111 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎config/Shared/config_default-ci.php

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
use Spryker\Shared\Kernel\Store;
1919
use Spryker\Shared\Log\LogConstants;
2020
use Spryker\Shared\MessageBroker\MessageBrokerConstants;
21-
use Spryker\Shared\MessageBrokerAws\MessageBrokerAwsConstants;
2221
use Spryker\Shared\Newsletter\NewsletterConstants;
2322
use Spryker\Shared\OauthClient\OauthClientConstants;
2423
use Spryker\Shared\Product\ProductConstants;
@@ -284,19 +283,6 @@
284283
// ----------------------------------------------------------------------------
285284
// ------------------------------ MessageBroker -----------------------------------------
286285
// ----------------------------------------------------------------------------
287-
$config[MessageBrokerConstants::CHANNEL_TO_TRANSPORT_MAP] =
288-
$config[MessageBrokerAwsConstants::CHANNEL_TO_SENDER_TRANSPORT_MAP] =
289-
$config[MessageBrokerAwsConstants::CHANNEL_TO_RECEIVER_TRANSPORT_MAP] = [
290-
'payment-events' => 'in-memory',
291-
'payment-method-commands' => 'in-memory',
292-
'asset-commands' => 'in-memory',
293-
'product-review-commands' => 'in-memory',
294-
'search-commands' => 'in-memory',
295-
'product-commands' => 'in-memory',
296-
'merchant-commands' => 'in-memory',
297-
'tax-commands' => 'in-memory',
298-
];
299-
300286
$config[MessageBrokerConstants::IS_ENABLED] = true;
301287

302288
// ----------------------------------------------------------------------------

‎config/Shared/config_default-docker.ci.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
use Monolog\Logger;
88
use Spryker\Shared\Event\EventConstants;
9+
use Spryker\Shared\GlueBackendApiApplication\GlueBackendApiApplicationConstants;
910
use Spryker\Shared\GlueJsonApiConvention\GlueJsonApiConventionConstants;
1011
use Spryker\Shared\GlueStorefrontApiApplication\GlueStorefrontApiApplicationConstants;
1112
use Spryker\Shared\Log\LogConstants;
@@ -39,8 +40,10 @@
3940
$config[MessageBrokerConstants::IS_ENABLED] = true;
4041

4142
$sprykerGlueStorefrontHost = getenv('SPRYKER_GLUE_STOREFRONT_HOST');
43+
$sprykerGlueBackendHost = getenv('SPRYKER_GLUE_BACKEND_HOST');
44+
$config[GlueBackendApiApplicationConstants::GLUE_BACKEND_API_HOST] = $sprykerGlueBackendHost;
4245
$config[GlueStorefrontApiApplicationConstants::GLUE_STOREFRONT_API_HOST] = $sprykerGlueStorefrontHost;
4346
$config[GlueJsonApiConventionConstants::GLUE_DOMAIN] = sprintf(
4447
'http://%s',
45-
$sprykerGlueStorefrontHost ?: 'localhost',
48+
$sprykerGlueStorefrontHost ?: $sprykerGlueBackendHost ?: 'localhost',
4649
);

‎config/Shared/config_default.php

Lines changed: 22 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,6 @@
103103
use Spryker\Shared\SessionRedis\SessionRedisConstants;
104104
use Spryker\Shared\Storage\StorageConstants;
105105
use Spryker\Shared\StorageRedis\StorageRedisConstants;
106-
use Spryker\Shared\Store\StoreConstants;
107106
use Spryker\Shared\SymfonyMailer\SymfonyMailerConstants;
108107
use Spryker\Shared\Synchronization\SynchronizationConstants;
109108
use Spryker\Shared\Tax\TaxConstants;
@@ -688,7 +687,6 @@
688687
$config[KernelConstants::DOMAIN_WHITELIST],
689688
$aopApplicationConfiguration['APP_DOMAINS'] ?? [],
690689
);
691-
$config[StoreConstants::STORE_NAME_REFERENCE_MAP] = $aopApplicationConfiguration['STORE_NAME_REFERENCE_MAP'] ?? [];
692690
$config[AppCatalogGuiConstants::APP_CATALOG_SCRIPT_URL] = $aopApplicationConfiguration['APP_CATALOG_SCRIPT_URL'] ?? '';
693691

694692
$aopAuthenticationConfiguration = json_decode(html_entity_decode((string)getenv('SPRYKER_AOP_AUTHENTICATION')), true);
@@ -705,7 +703,8 @@
705703
= $config[AppCatalogGuiConstants::TENANT_IDENTIFIER]
706704
= getenv('SPRYKER_TENANT_IDENTIFIER') ?: '';
707705

708-
$config[MessageBrokerConstants::MESSAGE_TO_CHANNEL_MAP] = [
706+
$config[MessageBrokerConstants::MESSAGE_TO_CHANNEL_MAP] =
707+
$config[MessageBrokerAwsConstants::MESSAGE_TO_CHANNEL_MAP] = [
709708
PaymentMethodAddedTransfer::class => 'payment-method-commands',
710709
PaymentMethodDeletedTransfer::class => 'payment-method-commands',
711710
PaymentCancelReservationRequestedTransfer::class => 'payment-commands',
@@ -727,58 +726,39 @@
727726
ProductUpdatedTransfer::class => 'product-events',
728727
ProductDeletedTransfer::class => 'product-events',
729728
InitializeProductExportTransfer::class => 'product-commands',
730-
AddReviewsTransfer::class => 'product-review-commands',
731-
OrderStatusChangedTransfer::class => 'order-events',
732729
SearchEndpointAvailableTransfer::class => 'search-commands',
733730
SearchEndpointRemovedTransfer::class => 'search-commands',
731+
AddReviewsTransfer::class => 'product-review-commands',
732+
OrderStatusChangedTransfer::class => 'order-events',
734733
ConfigureTaxAppTransfer::class => 'tax-commands',
735734
DeleteTaxAppTransfer::class => 'tax-commands',
736735
SubmitPaymentTaxInvoiceTransfer::class => 'payment-tax-invoice-commands',
737736
];
738737

739-
$config[MessageBrokerConstants::CHANNEL_TO_TRANSPORT_MAP] = [
740-
'payment-events' => MessageBrokerAwsConfig::SQS_TRANSPORT,
741-
'payment-method-commands' => MessageBrokerAwsConfig::SQS_TRANSPORT,
742-
'asset-commands' => MessageBrokerAwsConfig::SQS_TRANSPORT,
743-
'product-review-commands' => MessageBrokerAwsConfig::SQS_TRANSPORT,
744-
'search-commands' => MessageBrokerAwsConfig::SQS_TRANSPORT,
745-
'product-commands' => MessageBrokerAwsConfig::SQS_TRANSPORT,
746-
'merchant-commands' => MessageBrokerAwsConfig::SQS_TRANSPORT,
747-
'tax-commands' => MessageBrokerAwsConfig::SQS_TRANSPORT,
748-
'payment-commands' => MessageBrokerAwsConfig::HTTP_TRANSPORT,
749-
'product-events' => MessageBrokerAwsConfig::HTTP_TRANSPORT,
750-
'order-events' => MessageBrokerAwsConfig::HTTP_TRANSPORT,
751-
'merchant-events' => MessageBrokerAwsConfig::HTTP_TRANSPORT,
752-
'payment-tax-invoice-commands' => MessageBrokerAwsConfig::HTTP_TRANSPORT,
738+
$config[MessageBrokerConstants::CHANNEL_TO_RECEIVER_TRANSPORT_MAP] = [
739+
'payment-events' => MessageBrokerAwsConfig::HTTP_CHANNEL_TRANSPORT,
740+
'payment-method-commands' => MessageBrokerAwsConfig::HTTP_CHANNEL_TRANSPORT,
741+
'asset-commands' => MessageBrokerAwsConfig::HTTP_CHANNEL_TRANSPORT,
742+
'product-review-commands' => MessageBrokerAwsConfig::HTTP_CHANNEL_TRANSPORT,
743+
'product-commands' => MessageBrokerAwsConfig::HTTP_CHANNEL_TRANSPORT,
744+
'search-commands' => MessageBrokerAwsConfig::HTTP_CHANNEL_TRANSPORT,
745+
'tax-commands' => MessageBrokerAwsConfig::HTTP_CHANNEL_TRANSPORT,
753746
];
754747

755-
$config[MessageBrokerAwsConstants::CHANNEL_TO_RECEIVER_TRANSPORT_MAP] = [
756-
'payment-events' => MessageBrokerAwsConfig::SQS_TRANSPORT,
757-
'payment-method-commands' => MessageBrokerAwsConfig::SQS_TRANSPORT,
758-
'asset-commands' => MessageBrokerAwsConfig::SQS_TRANSPORT,
759-
'product-review-commands' => MessageBrokerAwsConfig::SQS_TRANSPORT,
760-
'search-commands' => MessageBrokerAwsConfig::SQS_TRANSPORT,
761-
'product-commands' => MessageBrokerAwsConfig::SQS_TRANSPORT,
762-
'merchant-commands' => MessageBrokerAwsConfig::SQS_TRANSPORT,
763-
'tax-commands' => MessageBrokerAwsConfig::SQS_TRANSPORT,
748+
$config[MessageBrokerConstants::CHANNEL_TO_SENDER_TRANSPORT_MAP] = [
749+
'payment-commands' => MessageBrokerAwsConfig::HTTP_CHANNEL_TRANSPORT,
750+
'product-events' => MessageBrokerAwsConfig::HTTP_CHANNEL_TRANSPORT,
751+
'order-events' => MessageBrokerAwsConfig::HTTP_CHANNEL_TRANSPORT,
752+
'payment-tax-invoice-commands' => MessageBrokerAwsConfig::HTTP_CHANNEL_TRANSPORT,
764753
];
765754

766-
$config[MessageBrokerAwsConstants::CHANNEL_TO_SENDER_TRANSPORT_MAP] = [
767-
'payment-commands' => MessageBrokerAwsConfig::HTTP_TRANSPORT,
768-
'product-events' => MessageBrokerAwsConfig::HTTP_TRANSPORT,
769-
'order-events' => MessageBrokerAwsConfig::HTTP_TRANSPORT,
770-
'merchant-events' => MessageBrokerAwsConfig::HTTP_TRANSPORT,
771-
'payment-tax-invoice-commands' => MessageBrokerAwsConfig::HTTP_TRANSPORT,
772-
];
773-
774-
$aopInfrastructureConfiguration = json_decode(html_entity_decode((string)getenv('SPRYKER_AOP_INFRASTRUCTURE')), true);
775-
776-
$config[MessageBrokerAwsConstants::SQS_RECEIVER_CONFIG] = json_encode($aopInfrastructureConfiguration['SPRYKER_MESSAGE_BROKER_SQS_RECEIVER_CONFIG'] ?? []);
777-
$config[MessageBrokerAwsConstants::HTTP_SENDER_CONFIG] = $aopInfrastructureConfiguration['SPRYKER_MESSAGE_BROKER_HTTP_SENDER_CONFIG'] ?? [];
755+
// -------------------------------- ACP AWS --------------------------------------
756+
$config[MessageBrokerAwsConstants::HTTP_CHANNEL_SENDER_BASE_URL] = getenv('SPRYKER_MESSAGE_BROKER_HTTP_CHANNEL_SENDER_BASE_URL') ?: '';
757+
$config[MessageBrokerAwsConstants::HTTP_CHANNEL_RECEIVER_BASE_URL] = getenv('SPRYKER_MESSAGE_BROKER_HTTP_CHANNEL_RECEIVER_BASE_URL') ?: '';
778758

779759
$config[MessageBrokerConstants::IS_ENABLED] = (
780-
!empty($aopInfrastructureConfiguration['SPRYKER_MESSAGE_BROKER_SQS_RECEIVER_CONFIG'])
781-
&& !empty($aopInfrastructureConfiguration['SPRYKER_MESSAGE_BROKER_HTTP_SENDER_CONFIG'])
760+
$config[MessageBrokerAwsConstants::HTTP_CHANNEL_SENDER_BASE_URL]
761+
&& $config[MessageBrokerAwsConstants::HTTP_CHANNEL_RECEIVER_BASE_URL]
782762
);
783763

784764
// ----------------------------------------------------------------------------

‎deploy.aop-b2c-testing.yml

Lines changed: 4 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -57,31 +57,15 @@ image:
5757
SPRYKER_PUSH_NOTIFICATION_WEB_PUSH_PHP_VAPID_SUBJECT: 'https://spryker.com'
5858

5959
#AOP
60-
SPRYKER_AOP_INFRASTRUCTURE: '{
61-
"SPRYKER_MESSAGE_BROKER_HTTP_SENDER_CONFIG": {
62-
"endpoint":"https:\/\/events.atrs-testing.demo-spryker.com\/events\/tenant"
63-
},
64-
"SPRYKER_MESSAGE_BROKER_SQS_RECEIVER_CONFIG": {
65-
"default": {
66-
"endpoint":"https:\/\/sqs.eu-central-1.amazonaws.com",
67-
"region":"eu-central-1",
68-
"auto_setup":false,
69-
"buffer_size":1
70-
},
71-
"DE": {
72-
"queue_name":"AOP_B2C_Testing-DE.fifo"
73-
},
74-
"AT": {
75-
"queue_name":"AOP_B2C_Testing-AT.fifo"
76-
}
77-
}
78-
}'
60+
SPRYKER_TENANT_IDENTIFIER: "AOP_B2C_Testing-DE"
61+
SPRYKER_MESSAGE_BROKER_HTTP_CHANNEL_SENDER_BASE_URL: "https://2j9o4qrhvg.execute-api.eu-central-1.amazonaws.com/dev/"
62+
SPRYKER_MESSAGE_BROKER_HTTP_CHANNEL_RECEIVER_BASE_URL: "https://gikmh9qisc.execute-api.eu-central-1.amazonaws.com/"
63+
7964
SPRYKER_AOP_APPLICATION: '{
8065
"APP_DOMAINS": [
8166
"os.apps-testing.aop.demo-spryker.com",
8267
"*.bazaarvoice.com"
8368
],
84-
"STORE_NAME_REFERENCE_MAP": {"DE":"AOP_B2C_Testing-DE","AT":"AOP_B2C_Testing-AT","US":"dummy-US"},
8569
"APP_CATALOG_SCRIPT_URL": "https://app-catalog.atrs-testing.demo-spryker.com/loader"
8670
}'
8771

0 commit comments

Comments
 (0)