[ENVOY] feat: Envoy to set Service ID header from subdomain

Makefile

@@ -235,33 +235,13 @@ init_envoy: copy_envoy_config copy_gateway_endpoints ## Runs copy_envoy_config a
 
 .PHONY: copy_envoy_config
 copy_envoy_config: ## Substitutes the sensitive 0Auth environment variables in the template envoy configuration yaml file and outputs the result to .envoy.yaml
-	@if [ ! -f ./local/path/envoy/envoy.yaml ]; then \
-		mkdir -p local/path/envoy; \
-		./envoy/scripts/copy_envoy_config.sh; \
-		echo "###########################################################"; \
-		echo "### Created ./local/path/envoy/envoy.yaml               ###"; \
-		echo "### README: Please ensure the configuration is correct. ###"; \
-		echo "###########################################################"; \
-	else \
-		echo "######################################################################"; \
-		echo "### ./local/path/envoy/envoy.yaml already exists, not overwriting. ###"; \
-		echo "######################################################################"; \
-	fi
+	@mkdir -p local/path/envoy;
+	@./envoy/scripts/copy_envoy_config.sh;
 
 .PHONY: copy_gateway_endpoints
 copy_gateway_endpoints: ## Copies the example gateway endpoints YAML file from the PADS repo to ./local/path/envoy/.gateway-endpoints.yaml
-	@if [ ! -f ./local/path/envoy/gateway-endpoints.yaml ]; then \
-		mkdir -p local/path/envoy; \
-		./envoy/scripts/copy_gateway_endpoints_yaml.sh; \
-		echo "###########################################################"; \
-		echo "### Created ./local/path/envoy/gateway-endpoints.yaml   ###"; \
-		echo "### README: Please update this file with your own data. ###"; \
-		echo "###########################################################"; \
-	else \
-		echo "##################################################################################"; \
-		echo "### ./local/path/envoy/gateway-endpoints.yaml already exists, not overwriting. ###"; \
-		echo "##################################################################################"; \
-	fi
+	@mkdir -p local/path/envoy;
+	@./envoy/scripts/copy_gateway_endpoints_yaml.sh;
 
 ###############################
 ### Generation Make Targets ###

Tiltfile

@@ -119,15 +119,24 @@ if MODE == "path_with_auth":
 
     # Import Envoy Auth configuration file into Kubernetes ConfigMaps
     configmap_create(
-        "envoy-config", from_file="./local/path/envoy/.envoy.yaml", watch=True
+        "envoy-config",
+        from_file="./local/path/envoy/.envoy.yaml",
+        watch=True,
+    )
+    configmap_create(
+        "allowed-services",
+        from_file="./local/path/envoy/.allowed-services.lua",
+        watch=True,
     )
     configmap_create(
         "gateway-endpoints",
         from_file="./local/path/envoy/.gateway-endpoints.yaml",
         watch=True,
     )
     configmap_create(
-        "ratelimit-config", from_file="./local/path/envoy/.ratelimit.yaml", watch=True
+        "ratelimit-config",
+        from_file="./local/path/envoy/.ratelimit.yaml",
+        watch=True,
     )
 
     # 1. Build the External Authorization Server image from envoy/auth_server/Dockerfile

config/config.go

@@ -27,7 +27,6 @@ type (
 		MessagingConfig MessagingConfig        `yaml:"messaging_config"`
 	}
 	ServiceConfig struct {
-		Alias          string        `yaml:"alias"`
 		RequestTimeout time.Duration `yaml:"request_timeout"`
 	}
 )

config/config_test.go

@@ -162,8 +162,6 @@ func Test_LoadGatewayConfigFromYAML(t *testing.T) {
 			    http_config:
 			      retries: 3
 			      timeout: 5000
-			    request_config:
-			      retries: 3
 			    relay_signing_key: "gateway-private-key"
 			  signed_aats:
 			    f9076ec39b2a495883eb59740d566d5fa2e2b222:
@@ -185,17 +183,6 @@ func Test_LoadGatewayConfigFromYAML(t *testing.T) {
 			yamlData: "invalid_yaml: [",
 			wantErr:  true,
 		},
-		{
-			name:     "should return error for duplicate service alias",
-			filePath: "duplicate_service_alias.yaml",
-			yamlData: `
-			morse_config:
-			  serviceAliases:
-			    eth: "0021"
-			    eth: "0022"
-			`,
-			wantErr: true,
-		},
 	}
 
 	for _, test := range tests {

config/examples/config.shannon_example.yaml

@@ -42,4 +42,3 @@ shannon_config:
 # hydrator_config:
 #   service_ids:
 #     - "anvil"
-#     - "F00C"