fix: disable private subnet custommization based on IaC tool

finos · Oct 9, 2023 · 9383ce4 · 9383ce4
1 parent 8ec93dc
commit 9383ce4
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 10 deletions.
diff --git a/examples/configurations/Makefile b/examples/configurations/Makefile
@@ -13,17 +13,17 @@ BUCKET_NAME=$(shell aws cloudformation describe-stacks --stack-name $(TAG) --reg
 
 
 generated-c++: grid_config.json.tpl
-	mkdir -p $(GENERATED) && cat grid_config.json.tpl | sed "s/{{region}}/$(REGION)/;s/{{workload_bucket_name}}/$(BUCKET_NAME)/;s/{{image_tag}}/$(TAG)/;s/{{account_id}}/${ACCOUNT_ID}/;s/{{enable_private_subnet}}/${ENABLE_PRIVATE_SUBNET}/" > $(GENERATED)/grid_config.json
-	mkdir -p $(GENERATED) && cat full_run_grid_config.json.tpl | sed "s/{{region}}/$(REGION)/;s/{{workload_bucket_name}}/$(BUCKET_NAME)/;s/{{image_tag}}/$(TAG)/;s/{{account_id}}/${ACCOUNT_ID}/;s/{{enable_private_subnet}}/${ENABLE_PRIVATE_SUBNET}/" > $(GENERATED)/full_run_grid_config.json
+	mkdir -p $(GENERATED) && cat grid_config.json.tpl | sed "s/{{region}}/$(REGION)/;s/{{workload_bucket_name}}/$(BUCKET_NAME)/;s/{{image_tag}}/$(TAG)/;s/{{account_id}}/${ACCOUNT_ID}/" > $(GENERATED)/grid_config.json
+	mkdir -p $(GENERATED) && cat full_run_grid_config.json.tpl | sed "s/{{region}}/$(REGION)/;s/{{workload_bucket_name}}/$(BUCKET_NAME)/;s/{{image_tag}}/$(TAG)/;s/{{account_id}}/${ACCOUNT_ID}/" > $(GENERATED)/full_run_grid_config.json
 
 generated-s3-c++: custom_runtime_s3_grid_config.json.tpl
-	mkdir -p $(GENERATED) && cat custom_runtime_s3_grid_config.json.tpl | sed "s/{{region}}/$(REGION)/;s/{{workload_bucket_name}}/$(BUCKET_NAME)/;s/{{image_tag}}/$(TAG)/;s/{{account_id}}/${ACCOUNT_ID}/;s/{{enable_private_subnet}}/${ENABLE_PRIVATE_SUBNET}/" > $(GENERATED)/custom_runtime_s3_grid_config.json
+	mkdir -p $(GENERATED) && cat custom_runtime_s3_grid_config.json.tpl | sed "s/{{region}}/$(REGION)/;s/{{workload_bucket_name}}/$(BUCKET_NAME)/;s/{{image_tag}}/$(TAG)/;s/{{account_id}}/${ACCOUNT_ID}/" > $(GENERATED)/custom_runtime_s3_grid_config.json
 
 generated-python: python_runtime_grid_config.json.tpl
-	mkdir -p $(GENERATED) && cat python_runtime_grid_config.json.tpl | sed "s/{{python_file_handler}}/$(FILE_HANDLER)/;s/{{python_function_handler}}/$(FUNCTION_HANDLER)/;s/{{region}}/$(REGION)/;s/{{workload_bucket_name}}/$(BUCKET_NAME)/;s/{{image_tag}}/$(TAG)/;s/{{account_id}}/${ACCOUNT_ID}/;s/{{enable_private_subnet}}/${ENABLE_PRIVATE_SUBNET}/" > $(GENERATED)/python_runtime_grid_config.json
+	mkdir -p $(GENERATED) && cat python_runtime_grid_config.json.tpl | sed "s/{{python_file_handler}}/$(FILE_HANDLER)/;s/{{python_function_handler}}/$(FUNCTION_HANDLER)/;s/{{region}}/$(REGION)/;s/{{workload_bucket_name}}/$(BUCKET_NAME)/;s/{{image_tag}}/$(TAG)/;s/{{account_id}}/${ACCOUNT_ID}/" > $(GENERATED)/python_runtime_grid_config.json
 
 generated-java: java_runtime_grid_config.json.tpl
-	mkdir -p $(GENERATED) && cat java_runtime_grid_config.json.tpl | sed "s/{{java_file_handler}}/$(FILE_HANDLER)/;s/{{java_function_handler}}/$(FUNCTION_HANDLER)/;s/{{region}}/$(REGION)/;s/{{workload_bucket_name}}/$(BUCKET_NAME)/;s/{{image_tag}}/$(TAG)/;s/{{account_id}}/${ACCOUNT_ID}/;s/{{enable_private_subnet}}/${ENABLE_PRIVATE_SUBNET}/" > $(GENERATED)/java_runtime_grid_config.json
+	mkdir -p $(GENERATED) && cat java_runtime_grid_config.json.tpl | sed "s/{{java_file_handler}}/$(FILE_HANDLER)/;s/{{java_function_handler}}/$(FUNCTION_HANDLER)/;s/{{region}}/$(REGION)/;s/{{workload_bucket_name}}/$(BUCKET_NAME)/;s/{{image_tag}}/$(TAG)/;s/{{account_id}}/${ACCOUNT_ID}/" > $(GENERATED)/java_runtime_grid_config.json
 
 clean:
 	rm -rf $(GENERATED)
diff --git a/examples/configurations/custom_runtime_s3_grid_config.json.tpl b/examples/configurations/custom_runtime_s3_grid_config.json.tpl
@@ -42,7 +42,7 @@
       "runtime"  : "provided"
     }
   },
-  "enable_private_subnet" : {{enable_private_subnet}},
+  "enable_private_subnet" : true,
   "vpc_cidr_block_public" : 24,
   "vpc_cidr_block_private": 18,
   "input_role": [

diff --git a/examples/configurations/full_run_grid_config.json.tpl b/examples/configurations/full_run_grid_config.json.tpl
@@ -42,7 +42,7 @@
       "runtime"  : "provided"
     }
   },
-  "enable_private_subnet" : {{enable_private_subnet}},
+  "enable_private_subnet" : true,
   "vpc_cidr_block_public" : 24,
   "vpc_cidr_block_private": 18,
   "input_role": [

diff --git a/examples/configurations/grid_config.json.tpl b/examples/configurations/grid_config.json.tpl
@@ -42,7 +42,7 @@
       "runtime"  : "provided"
     }
   },
-  "enable_private_subnet" : {{enable_private_subnet}},
+  "enable_private_subnet" : true,
   "vpc_cidr_block_public" : 24,
   "vpc_cidr_block_private": 18,
   "input_role": [

diff --git a/examples/configurations/java_runtime_grid_config.json.tpl b/examples/configurations/java_runtime_grid_config.json.tpl
@@ -44,7 +44,7 @@
       "lambda_handler_function_name": "{{java_function_handler}}"
     }
   },
-  "enable_private_subnet" : {{enable_private_subnet}},
+  "enable_private_subnet" : true,
   "vpc_cidr_block_public" : 24,
   "vpc_cidr_block_private": 18,
   "input_role": [

diff --git a/examples/configurations/python_runtime_grid_config.json.tpl b/examples/configurations/python_runtime_grid_config.json.tpl
@@ -44,7 +44,7 @@
       "lambda_handler_function_name": "{{python_function_handler}}"
     }
   },
-  "enable_private_subnet" : {{enable_private_subnet}},
+  "enable_private_subnet" : true,
   "vpc_cidr_block_public" : 24,
   "vpc_cidr_block_private": 18,
   "input_role": [