From fdc542bf715c51a286ac991c8605038cde82c72e Mon Sep 17 00:00:00 2001 From: Ryan Cahill Date: Thu, 5 Dec 2019 17:34:08 -0500 Subject: [PATCH] change on how we reference parameters, now using the service config --- src/adservice/architect.json | 6 +-- src/cartservice/architect.json | 23 +++++++--- src/checkoutservice/architect.json | 51 +++++++++++++++++---- src/currencyservice/architect.json | 6 +-- src/emailservice/architect.json | 6 +-- src/frontend/arc.env.json | 22 ---------- src/frontend/architect.json | 56 +++++++++++++++++++++--- src/paymentservice/architect.json | 6 +-- src/productcatalogservice/architect.json | 6 +-- src/recommendationservice/architect.json | 11 +++-- src/shippingservice/architect.json | 6 +-- 11 files changed, 120 insertions(+), 79 deletions(-) diff --git a/src/adservice/architect.json b/src/adservice/architect.json index 14fa7a3..153dd56 100644 --- a/src/adservice/architect.json +++ b/src/adservice/architect.json @@ -1,11 +1,7 @@ { "name": "architect/adservice", "dependencies": {}, - "parameters": { - "PORT": { - "description": "port to run the server" - } - }, + "parameters": {}, "datastores": {}, "api": { "type": "grpc", diff --git a/src/cartservice/architect.json b/src/cartservice/architect.json index 1028784..fc7542e 100644 --- a/src/cartservice/architect.json +++ b/src/cartservice/architect.json @@ -2,14 +2,23 @@ "name": "architect/cartservice", "dependencies": {}, "parameters": { - "REDIS_ADDR": { - "description": "location of redis cache" - }, - "PORT": { - "description": "port to run the service on" - }, "LISTEN_ADDR": { - "description": "listen address of the server" + "description": "listen address of the server", + "default": { + "valueFrom": { + "dependency": "architect/cartservice:latest", + "value": "$HOST" + } + } + }, + "REDIS_ADDR": { + "description": "location of redis cache", + "default": { + "valueFrom": { + "datastore": "primary", + "value": "$HOST:$PORT" + } + } } }, "datastores": { diff --git a/src/checkoutservice/architect.json b/src/checkoutservice/architect.json index c0f9528..a42dc50 100644 --- a/src/checkoutservice/architect.json +++ b/src/checkoutservice/architect.json @@ -9,26 +9,59 @@ "architect/cartservice": "latest" }, "parameters": { - "PORT": { - "description": "port to run the server on" - }, "PRODUCT_CATALOG_SERVICE_ADDR": { - "description": "host and port of the product catalog service" + "description": "host and port of the product catalog service", + "default": { + "valueFrom": { + "dependency": "architect/productcatalogservice:latest", + "value": "$HOST:$PORT" + } + } }, "SHIPPING_SERVICE_ADDR": { - "description": "host and port of the shipping service" + "description": "host and port of the shipping service", + "default": { + "valueFrom": { + "dependency": "architect/shippingservice:latest", + "value": "$HOST:$PORT" + } + } }, "PAYMENT_SERVICE_ADDR": { - "description": "host and port of the payment service" + "description": "host and port of the payment service", + "default": { + "valueFrom": { + "dependency": "architect/paymentservice:latest", + "value": "$HOST:$PORT" + } + } }, "EMAIL_SERVICE_ADDR": { - "description": "host and port of the email service" + "description": "host and port of the email service", + "default": { + "valueFrom": { + "dependency": "architect/emailservice:latest", + "value": "$HOST:$PORT" + } + } }, "CURRENCY_SERVICE_ADDR": { - "description": "host and port of the currency service" + "description": "host and port of the currency service", + "default": { + "valueFrom": { + "dependency": "architect/currencyservice:latest", + "value": "$HOST:$PORT" + } + } }, "CART_SERVICE_ADDR": { - "descrption": "host and port of the cart service" + "descrption": "host and port of the cart service", + "default": { + "valueFrom": { + "dependency": "architect/cartservice:latest", + "value": "$HOST:$PORT" + } + } } }, "datastores": {}, diff --git a/src/currencyservice/architect.json b/src/currencyservice/architect.json index cba73c4..059dbd8 100644 --- a/src/currencyservice/architect.json +++ b/src/currencyservice/architect.json @@ -1,11 +1,7 @@ { "name": "architect/currencyservice", "dependencies": {}, - "parameters": { - "PORT": { - "description": "port to run the service on" - } - }, + "parameters": {}, "datastores": {}, "api": { "type": "grpc", diff --git a/src/emailservice/architect.json b/src/emailservice/architect.json index 8439472..aa9cfd5 100644 --- a/src/emailservice/architect.json +++ b/src/emailservice/architect.json @@ -1,11 +1,7 @@ { "name": "architect/emailservice", "dependencies": {}, - "parameters": { - "PORT": { - "description": "port to run the service on" - } - }, + "parameters": {}, "datastores": {}, "api": { "type": "grpc", diff --git a/src/frontend/arc.env.json b/src/frontend/arc.env.json index a0b4bc6..baf709c 100644 --- a/src/frontend/arc.env.json +++ b/src/frontend/arc.env.json @@ -3,9 +3,6 @@ "architect/adservice:latest": { "debug": { "path": "../adservice" - }, - "parameters": { - "PORT": "$ARC_ARCHITECT_ADSERVICE_LATEST_PORT" } }, "architect/cartservice:latest": { @@ -14,7 +11,6 @@ }, "parameters": { "LISTEN_ADDR": "$ARC_ARCHITECT_CARTSERVICE_LATEST_HOST", - "PORT": "$ARC_ARCHITECT_CARTSERVICE_LATEST_PORT", "REDIS_ADDR": "$ARC_ARCHITECT_CARTSERVICE_PRIMARY_LATEST_HOST:$ARC_ARCHITECT_CARTSERVICE_PRIMARY_LATEST_PORT" }, "datastores": { @@ -26,7 +22,6 @@ "path": "../checkoutservice" }, "parameters": { - "PORT": "$ARC_ARCHITECT_CHECKOUTSERVICE_LATEST_PORT", "PRODUCT_CATALOG_SERVICE_ADDR": "$ARC_ARCHITECT_PRODUCTCATALOGSERVICE_LATEST_HOST:$ARC_ARCHITECT_PRODUCTCATALOGSERVICE_LATEST_PORT", "SHIPPING_SERVICE_ADDR": "$ARC_ARCHITECT_SHIPPINGSERVICE_LATEST_HOST:$ARC_ARCHITECT_SHIPPINGSERVICE_LATEST_PORT", "PAYMENT_SERVICE_ADDR": "$ARC_ARCHITECT_PAYMENTSERVICE_LATEST_HOST:$ARC_ARCHITECT_PAYMENTSERVICE_LATEST_PORT", @@ -38,17 +33,11 @@ "architect/currencyservice:latest": { "debug": { "path": "../currencyservice" - }, - "parameters": { - "PORT": "$ARC_ARCHITECT_CURRENCYSERVICE_LATEST_PORT" } }, "architect/emailservice:latest": { "debug": { "path": "../emailservice" - }, - "parameters": { - "PORT": "$ARC_ARCHITECT_EMAILSERVICE_LATEST_PORT" } }, "architect/frontend:latest": { @@ -56,7 +45,6 @@ "path": "../frontend" }, "parameters": { - "PORT": "$ARC_ARCHITECT_FRONTEND_LATEST_PORT", "PRODUCT_CATALOG_SERVICE_ADDR": "$ARC_ARCHITECT_PRODUCTCATALOGSERVICE_LATEST_HOST:$ARC_ARCHITECT_PRODUCTCATALOGSERVICE_LATEST_PORT", "CURRENCY_SERVICE_ADDR": "$ARC_ARCHITECT_CURRENCYSERVICE_LATEST_HOST:$ARC_ARCHITECT_CURRENCYSERVICE_LATEST_PORT", "CART_SERVICE_ADDR": "$ARC_ARCHITECT_CARTSERVICE_LATEST_HOST:$ARC_ARCHITECT_CARTSERVICE_LATEST_PORT", @@ -69,17 +57,11 @@ "architect/paymentservice:latest": { "debug": { "path": "../paymentservice" - }, - "parameters": { - "PORT": "$ARC_ARCHITECT_PAYMENTSERVICE_LATEST_PORT" } }, "architect/productcatalogservice:latest": { "debug": { "path": "../productcatalogservice" - }, - "parameters": { - "PORT": "$ARC_ARCHITECT_PRODUCTCATALOGSERVICE_LATEST_PORT" } }, "architect/recommendationservice:latest": { @@ -87,7 +69,6 @@ "path": "../recommendationservice" }, "parameters": { - "PORT": "$ARC_ARCHITECT_RECOMMENDATIONSERVICE_LATEST_PORT", "PRODUCT_CATALOG_SERVICE_ADDR": "$ARC_ARCHITECT_PRODUCTCATALOGSERVICE_LATEST_HOST:$ARC_ARCHITECT_PRODUCTCATALOGSERVICE_LATEST_PORT", "ENABLE_PROFILER": "0" } @@ -95,9 +76,6 @@ "architect/shippingservice:latest": { "debug": { "path": "../shippingservice" - }, - "parameters": { - "PORT": "$ARC_ARCHITECT_SHIPPINGSERVICE_LATEST_PORT" } } } diff --git a/src/frontend/architect.json b/src/frontend/architect.json index f89f195..1d4c3fc 100644 --- a/src/frontend/architect.json +++ b/src/frontend/architect.json @@ -11,25 +11,67 @@ }, "parameters": { "PRODUCT_CATALOG_SERVICE_ADDR": { - "description": "host and port of product catalog service" + "description": "host and port of product catalog service", + "default": { + "valueFrom": { + "dependency": "architect/productcatalogservice:latest", + "value": "$HOST:$PORT" + } + } }, "CURRENCY_SERVICE_ADDR": { - "description": "host and port of the currency service" + "description": "host and port of the currency service", + "default": { + "valueFrom": { + "dependency": "architect/currencyservice:latest", + "value": "$HOST:$PORT" + } + } }, "CART_SERVICE_ADDR": { - "description": "host and port of the cart service" + "description": "host and port of the cart service", + "default": { + "valueFrom": { + "dependency": "architect/cartservice:latest", + "value": "$HOST:$PORT" + } + } }, "RECOMMENDATION_SERVICE_ADDR": { - "desecription": "host and port of the recommendation service" + "description": "host and port of the recommendation service", + "default": { + "valueFrom": { + "dependency": "architect/recommendationservice:latest", + "value": "$HOST:$PORT" + } + } }, "SHIPPING_SERVICE_ADDR": { - "description": "host and port of the shipping service" + "description": "host and port of the shipping service", + "default": { + "valueFrom": { + "dependency": "architect/shippingservice:latest", + "value": "$HOST:$PORT" + } + } }, "CHECKOUT_SERVICE_ADDR": { - "description": "host and port of the checkout service" + "description": "host and port of the checkout service", + "default": { + "valueFrom": { + "dependency": "architect/checkoutservice:latest", + "value": "$HOST:$PORT" + } + } }, "AD_SERVICE_ADDR": { - "description": "host and port of the ad service" + "description": "host and port of the ad service", + "default": { + "valueFrom": { + "dependency": "architect/adservice:latest", + "value": "$HOST:$PORT" + } + } } }, "datastores": {}, diff --git a/src/paymentservice/architect.json b/src/paymentservice/architect.json index 284cb44..998edb2 100644 --- a/src/paymentservice/architect.json +++ b/src/paymentservice/architect.json @@ -1,11 +1,7 @@ { "name": "architect/paymentservice", "dependencies": {}, - "parameters": { - "PORT": { - "description": "port to run the service on" - } - }, + "parameters": {}, "datastores": {}, "api": { "type": "grpc", diff --git a/src/productcatalogservice/architect.json b/src/productcatalogservice/architect.json index 3584b0d..a5d4038 100644 --- a/src/productcatalogservice/architect.json +++ b/src/productcatalogservice/architect.json @@ -1,11 +1,7 @@ { "name": "architect/productcatalogservice", "dependencies": {}, - "parameters": { - "PORT": { - "description": "port to run the service on" - } - }, + "parameters": {}, "datastores": {}, "api": { "type": "grpc", diff --git a/src/recommendationservice/architect.json b/src/recommendationservice/architect.json index 5d8bdac..01ec7dd 100644 --- a/src/recommendationservice/architect.json +++ b/src/recommendationservice/architect.json @@ -4,11 +4,14 @@ "architect/productcatalogservice": "latest" }, "parameters": { - "PORT": { - "description": "port to run the service on" - }, "PRODUCT_CATALOG_SERVICE_ADDR": { - "description": "host and port of the product catalog service" + "description": "host and port of the product catalog service", + "default": { + "valueFrom": { + "dependency": "architect/productcatalogservice:latest", + "value": "$HOST:$PORT" + } + } }, "ENABLE_PROFILER": { "description": "whether or not to enable the profiler" diff --git a/src/shippingservice/architect.json b/src/shippingservice/architect.json index 5f57dea..e470611 100644 --- a/src/shippingservice/architect.json +++ b/src/shippingservice/architect.json @@ -1,11 +1,7 @@ { "name": "architect/shippingservice", "dependencies": {}, - "parameters": { - "PORT": { - "description": "port to run the service on" - } - }, + "parameters": {}, "datastores": {}, "api": { "type": "grpc",