Skip to content

Commit 664e1fc

Browse files
committed
fix: fix undefined toLowerCase() for string service
1 parent faea32d commit 664e1fc

File tree

2 files changed

+15
-15
lines changed

2 files changed

+15
-15
lines changed

.suite-cli/cli/scripts/assets/dockerComposeContent.asset.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
module.exports = ({ services, webserver, krakend_port, env }) => {
22
const servicesConfig = services.map(service => `
3-
${service.name.toLowerCase().replace(/\s+/g, '-')}:
3+
${service.toLowerCase().replace(/\s+/g, '-')}:
44
build:
55
dockerfile: Dockerfile.dev
6-
context: ../../../microservices/${service.name}
6+
context: ../../../microservices/${service}
77
ports:
8-
- "${service.port}:${service.port}"
8+
- "${krakend_port}:${krakend_port}"
99
volumes:
1010
- /app/node_modules
11-
- ../../../microservices/${service.name}:/app
11+
- ../../../microservices/${service}:/app
1212
depends_on:
1313
rabbitmq:
1414
condition: service_healthy
1515
`).join('');
1616

1717
// Collect all service names for the 'depends_on' section of the web server
18-
const serviceNames = services.map(service => service.name.toLowerCase().replace(/\s+/g, '-'));
18+
const serviceNames = services.map(service => service.toLowerCase().replace(/\s+/g, '-'));
1919

2020
return `
2121
version: '3.8'

.suite-cli/cli/scripts/assets/krakendConfigContent.asset.js

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,30 +9,30 @@ module.exports = ({
99
// Health check for all services
1010
const suiteStatusCheckBackends = services.map((service) => `
1111
{
12-
"host": ["http://${service.name.toLowerCase()}:${service.port}"],
12+
"host": ["http://${service.toLowerCase()}:${service.port}"],
1313
"url_pattern": "/",
1414
"mapping": {
15-
"message": "${service.name.toLowerCase()}"
15+
"message": "${service.toLowerCase()}"
1616
}
1717
}`).join(',\n');
1818

1919
// List all services
2020
const allServicesListBackends = services.map((service) => `
2121
{
22-
"host": ["http://${service.name.toLowerCase()}:${service.port}"],
23-
"url_pattern": "/api/${api_version}/${service.name.toLowerCase()}s",
22+
"host": ["http://${service.toLowerCase()}:${service.port}"],
23+
"url_pattern": "/api/${api_version}/${service.toLowerCase()}s",
2424
"mapping": {
25-
"data": "${service.name.toLowerCase()}s"
25+
"data": "${service.toLowerCase()}s"
2626
}
2727
}`).join(',\n');
2828

2929
// Each service backend
3030
const eachServiceListBackends = [services[0]].map((service) => `
3131
{
32-
"host": ["http://${service.name.toLowerCase()}:${service.port}"],
33-
"url_pattern": "/api/${api_version}/${service.name.toLowerCase()}s",
32+
"host": ["http://${service.toLowerCase()}:${service.port}"],
33+
"url_pattern": "/api/${api_version}/${service.toLowerCase()}s",
3434
"mapping": {
35-
"data": "${service.name.toLowerCase()}s"
35+
"data": "${service.toLowerCase()}s"
3636
}
3737
}`).join(',\n');
3838

@@ -59,8 +59,8 @@ module.exports = ({
5959
"backend": [${allServicesListBackends}]
6060
},
6161
{
62-
"@comment": "Fetch all data from the ${services[0].name.toLowerCase()} service",
63-
"endpoint": "/api/${api_version}/${services[0].name.toLowerCase()}s",
62+
"@comment": "Fetch all data from the ${services[0].toLowerCase()} service",
63+
"endpoint": "/api/${api_version}/${services[0].toLowerCase()}s",
6464
"method": "GET",
6565
"backend": [${eachServiceListBackends}]
6666
}

0 commit comments

Comments
 (0)