static ports

Author: EasterTheBunny

framework/components/dockercompose/billing_platform_service/billing_platform_service.go

@@ -111,8 +111,6 @@ func New(in *Input) (*Output, error) {
 	// set development defaults for necessary environment variables and allow them to be overridden by the host process
 	envVars := make(map[string]string)
 
-	envVars["BILLING_SERVER_PORT"] = DEFAULT_BILLING_PLATFORM_SERVICE_BILLING_GRPC_PORT
-	envVars["CREDIT_RESERVATION_SERVER_PORT"] = DEFAULT_BILLING_PLATFORM_SERVICE_CREDIT_GRPC_PORT
 	envVars["MAINNET_WORKFLOW_REGISTRY_CHAIN_SELECTOR"] = strconv.FormatUint(in.ChainSelector, 10)
 	envVars["MAINNET_WORKFLOW_REGISTRY_CONTRACT_ADDRESS"] = in.WorkflowRegistryAddress
 	envVars["MAINNET_WORKFLOW_REGISTRY_RPC_URL"] = in.RPCURL
@@ -159,8 +157,8 @@ func New(in *Input) (*Output, error) {
 	stack.WaitForService(DEFAULT_BILLING_PLATFORM_SERVICE_SERVICE_NAME,
 		wait.ForAll(
 			wait.ForLog("GRPC server is live").WithPollInterval(200*time.Millisecond),
-			wait.ForListeningPort(nat.Port(envVars["BILLING_SERVER_PORT"])),
-			wait.ForListeningPort(nat.Port(envVars["CREDIT_RESERVATION_SERVER_PORT"])),
+			wait.ForListeningPort(nat.Port(DEFAULT_BILLING_PLATFORM_SERVICE_BILLING_GRPC_PORT)),
+			wait.ForListeningPort(nat.Port(DEFAULT_BILLING_PLATFORM_SERVICE_CREDIT_GRPC_PORT)),
 		).WithDeadline(1*time.Minute),
 	)
 
@@ -247,8 +245,8 @@ func New(in *Input) (*Output, error) {
 
 func getExternalPorts(ctx context.Context, billingExternalHost string, envVars map[string]string, billingContainer *testcontainers.DockerContainer) (*BillingPlatformServiceOutput, error) {
 	ports := map[string]nat.Port{
-		"billing": nat.Port(envVars["BILLING_SERVER_PORT"]),
-		"credit":  nat.Port(envVars["CREDIT_RESERVATION_SERVER_PORT"]),
+		"billing": DEFAULT_BILLING_PLATFORM_SERVICE_BILLING_GRPC_PORT,
+		"credit":  DEFAULT_BILLING_PLATFORM_SERVICE_CREDIT_GRPC_PORT,
 	}
 
 	output := BillingPlatformServiceOutput{}

framework/components/dockercompose/billing_platform_service/docker-compose.yml

@@ -14,8 +14,8 @@ services:
     environment:
       DISABLE_AUTH: true
       PROMETHEUS_PORT: 2112
-      BILLING_SERVER_PORT: ${BILLING_SERVER_PORT:-2222}
-      CREDIT_RESERVATION_SERVER_PORT: ${CREDIT_RESERVATION_SERVER_PORT:-2223}
+      BILLING_SERVER_PORT: 2222
+      CREDIT_RESERVATION_SERVER_PORT: 2223
       WORKFLOW_OWNERSHIP_PROOF_SERVER_HOST: 0.0.0.0
       MAINNET_WORKFLOW_REGISTRY_CHAIN_SELECTOR: ${MAINNET_WORKFLOW_REGISTRY_CHAIN_SELECTOR:-}
       TESTNET_WORKFLOW_REGISTRY_CHAIN_SELECTOR: ${MAINNET_WORKFLOW_REGISTRY_CHAIN_SELECTOR:-}