Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CC-30016: Fulfillment app integration testing branch [DON'T MERGE]. #579

Open
wants to merge 21 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
a34503d
CC-30016: added deploy file for staging.
romanhavrylko Oct 3, 2023
eed27fd
CC-30016 Added old mailer.
kkicheglovspryker Oct 5, 2023
ab0f1bd
CC-30016 Removed old mailer.
kkicheglovspryker Oct 6, 2023
b2d7c27
Merge branch 'feature/cc-30016/dev-fulfillment-app-integration' of gi…
kkicheglovspryker Oct 6, 2023
a2a3a07
Merge branch 'feature/cc-30016/dev-fulfillment-app-integration' of gi…
kkicheglovspryker Oct 6, 2023
e68f1aa
CC-30016 Updated oauth identifiers.
kkicheglovspryker Oct 6, 2023
b05d95b
CC-30016 Updated oauth identifiers.
kkicheglovspryker Oct 6, 2023
68084b0
Updated env for FA.
dmiseev Oct 12, 2023
db2dcbb
Added missing plugins.
dmiseev Oct 12, 2023
7373b0e
Removed unused constants.
dmiseev Oct 13, 2023
fd44bed
Added propel classes.
dmiseev Oct 13, 2023
c4ca17f
Adjusted oauth package + adjusted oauth configurations.
dmiseev Oct 20, 2023
32abc96
Adjusted oauth package + adjusted oauth configurations.
dmiseev Oct 20, 2023
546a74c
Adjusted deploy configuration.
dmiseev Oct 24, 2023
b9fe09d
Merge branch 'internal' into feature/cc-30016/dev-fulfillment-app-int…
dmiseev Oct 25, 2023
24933f7
Merged latest fixes from internal branch [skip ci]
dmiseev Oct 25, 2023
786057a
Merge branch 'master' into feature/cc-30016/dev-fulfillment-app-integ…
dmiseev Sep 24, 2024
d1ae923
CC-33254 Add required user scopes config [skip ci]
dmiseev Sep 24, 2024
0a25614
Merge branch 'master' into feature/cc-30016/dev-fulfillment-app-integ…
dmiseev Oct 23, 2024
7507e59
Added eco module after merge [skip ci]
dmiseev Oct 23, 2024
963882f
Disabled cors for backend-api [skip ci]
dmiseev Oct 23, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
"ext-readline": "*",
"ext-redis": "*",
"galbar/jsonpath": "^1.3.1",
"spryker-eco/authorization-picking-app-backend-api": "^0.2.0",
"spryker-eco/loggly": "^0.1.1",
"spryker-feature/agent-assist": "dev-master as 202407.0",
"spryker-feature/alternative-products": "^202404.0",
Expand Down
117 changes: 116 additions & 1 deletion composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

22 changes: 21 additions & 1 deletion config/Shared/config_default.php
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,27 @@
getenv('SPRYKER_OAUTH_KEY_PUBLIC') ?: '',
) ?: null;
$config[OauthConstants::ENCRYPTION_KEY] = getenv('SPRYKER_OAUTH_ENCRYPTION_KEY') ?: null;
$config[OauthConstants::OAUTH_CLIENT_CONFIGURATION] = json_decode(getenv('SPRYKER_OAUTH_CLIENT_CONFIGURATION'), true) ?: [];
$config[OauthConstants::OAUTH_CLIENT_CONFIGURATION] = array_merge(
json_decode(getenv('SPRYKER_OAUTH_CLIENT_CONFIGURATION'), true) ?: [],
[
[
'identifier' => 'fulfillment-client-b2c-local',
'secret' => null,
'isConfidential' => false,
'name' => 'Fulfillment b2c local',
'redirectUri' => 'http://localhost:4200/oauth/cb/spryker',
'isDefault' => false,
],
[
'identifier' => 'fulfillment-client-b2c-dev',
'secret' => null,
'isConfidential' => false,
'name' => 'Fulfillment b2c dev',
'redirectUri' => 'https://dev-b2c-fulfillment.netlify.app/oauth/cb/spryker',
'isDefault' => false,
],
],
);

// >> ZED REQUEST

Expand Down
2 changes: 2 additions & 0 deletions deploy.dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,7 @@ groups:
endpoints:
glue-backend.eu.spryker.local:
region: EU
cors-allow-origin: '*'
backoffice_eu:
application: backoffice
endpoints:
Expand Down Expand Up @@ -157,6 +158,7 @@ groups:
endpoints:
glue-backend.us.spryker.local:
region: US
cors-allow-origin: '*'
backoffice_us:
application: backoffice
endpoints:
Expand Down
190 changes: 190 additions & 0 deletions deploy.spryker-b2cintt.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,190 @@
version: "0.1"

namespace: spryker-cloud
tag: '1.0'

environment: docker.production
image:
tag: spryker/php:8.1
environment:
SPRYKER_DEFAULT_STORE: "DE"
SPRYKER_ACTIVE_STORES: "DE,AT"
SPRYKER_HOOK_BEFORE_DEPLOY: "vendor/bin/install -r EU/pre-deploy -vvv "
SPRYKER_HOOK_AFTER_DEPLOY: "true"
SPRYKER_HOOK_INSTALL: "vendor/bin/install -r EU/production --no-ansi -vvv"
SPRYKER_HOOK_DESTRUCTIVE_INSTALL: "vendor/bin/install -r EU/destructive --no-ansi -vvv"
SPRYKER_PRODUCT_CONFIGURATOR_HOST: dtc.b2c.internal-testing.demo-spryker.com
SPRYKER_PRODUCT_CONFIGURATOR_PORT: 443
SPRYKER_YVES_HOST_DE: www.de.b2c.internal-testing.demo-spryker.com
SPRYKER_YVES_HOST_AT: www.at.b2c.internal-testing.demo-spryker.com
SPRYKER_PUSH_NOTIFICATION_WEB_PUSH_PHP_VAPID_PUBLIC_KEY: 'BGqNWbv0hWM5CQ1-KwAfSQBMC6TMVFyrnh3vQp37oGCNvQ6eG_HyMjxBFJRWeCPTbzDoxcjhxLJS8Ck8r1G2oFw'
SPRYKER_PUSH_NOTIFICATION_WEB_PUSH_PHP_VAPID_PRIVATE_KEY: 'UK6DywwjKITPpRHBSY9TLPIXm6BPrHX40sseIoXT9c8'
SPRYKER_PUSH_NOTIFICATION_WEB_PUSH_PHP_VAPID_SUBJECT: 'https://spryker.com'
node:
version: 18
npm: 9

composer:
mode: --no-dev
autoload: --classmap-authoritative

assets:
image: spryker/nginx-brotli:latest
mode: production
compression:
brotli:
static: on
level: 5

regions:
EU:
services:
mail:
sender:
name: Spryker No-Reply
email: [email protected]
database:
database: spryker_b2cintt #Example: environment_staging
username: spryker
password: secret

stores:
DE:
services:
broker:
namespace: de_queue
key_value_store:
namespace: 1
search:
namespace: de_search
session:
namespace: 2
AT:
services:
broker:
namespace: at_queue
key_value_store:
namespace: 1
search:
namespace: at_search
session:
namespace: 2

groups:
EU:
region: EU
applications:
yves:
application: yves
endpoints:
dtc.b2c.internal-testing.demo-spryker.com:
entry-point: Configurator
www.de.b2c.internal-testing.demo-spryker.com:
store: DE
www.at.b2c.internal-testing.demo-spryker.com:
store: AT

boffice:
application: backoffice
endpoints:
backoffice.de.b2c.internal-testing.demo-spryker.com:
store: DE
backoffice.at.b2c.internal-testing.demo-spryker.com:
store: AT
backgw:
application: backend-gateway
endpoints:
backend-gateway.de.b2c.internal-testing.demo-spryker.com:
store: DE
backend-gateway.at.b2c.internal-testing.demo-spryker.com:
store: AT
backapi:
application: zed
endpoints:
backend-api.de.b2c.internal-testing.demo-spryker.com:
store: DE
entry-point: BackendApi
backend-api.at.b2c.internal-testing.demo-spryker.com:
store: AT
entry-point: BackendApi
glue:
application: glue
endpoints:
glue.de.b2c.internal-testing.demo-spryker.com:
store: DE
glue.at.b2c.internal-testing.demo-spryker.com:
store: AT
gluestorefront:
application: glue-storefront
endpoints:
glue-storefront.de.b2c.internal-testing.demo-spryker.com:
store: DE
glue-storefront.at.b2c.internal-testing.demo-spryker.com:
store: AT
gluebackend:
application: glue-backend
endpoints:
glue-backend.de.b2c.internal-testing.demo-spryker.com:
store: DE
cors-allow-origin: '*'
glue-backend.at.b2c.internal-testing.demo-spryker.com:
store: AT
cors-allow-origin: '*'
services:
database:
engine: mysql
version: mariadb-10.4
root:
username: "root"
password: "secret"
endpoints:
localhost:3306:
protocol: tcp
broker:
engine: rabbitmq
version: '3.9'
api:
username: "spryker"
password: "secret"
endpoints:
queue.b2c.internal-testing.demo-spryker.com:
localhost:5672:
protocol: tcp
session:
engine: redis
key_value_store:
engine: redis
endpoints:
localhost:16379:
protocol: tcp
search:
engine: elastic
version: '7.10'
endpoints:
localhost:9200:
protocol: tcp
scheduler:
engine: jenkins
endpoints:
scheduler.internal-testing.demo-spryker.com:
mail_catcher:
engine: mailhog
endpoints:
mail.internal-testing.demo-spryker.com:

docker:

ssl:
enabled: true
redirect: true

debug:
enabled: false
xdebug:
enabled: false

testing:
store: DE

mount:
baked:
Loading