Skip to content

Commit 5e437de

Browse files
mcduffiemcduffie
authored
Merge pull request #170 from unity-sds/mcp-clone
Mcp clone
2 parents 472c896 + 78bc4b9 commit 5e437de

File tree

6 files changed

+271
-113
lines changed

6 files changed

+271
-113
lines changed

‎ci_cd/Dev/main.tf‎

Lines changed: 51 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,24 @@ locals {
7575

7676
# VARIABLES
7777

78+
# Some software versions installed in EC2 instance: These version
79+
# control variables are currently ignored, but we may want to use
80+
# them in the future.
81+
82+
variable "app_pack_gen_version" {
83+
description = "The version (tag) of app-pack-generator to install"
84+
type = string
85+
default = "0.4.1"
86+
}
87+
88+
variable "unity_app_gen_version" {
89+
description = "The version (tag) of unity-app-generator to install"
90+
type = string
91+
default = "0.3.0"
92+
}
93+
94+
95+
7896
# System info: os, hardware
7997

8098
variable "gl_runner_machine_name" {
@@ -334,7 +352,11 @@ resource "aws_instance" "gl_runner_instance" {
334352
# Download and install gitlab runner
335353
#
336354
user_data = templatefile("../install_group_runner_${var.gl_runner_architecture}_${each.key}.tftpl",
337-
{ token = "${var.gl_runner_registration_token}", name = lower("${var.gl_runner_base_name}-${local.unity_venue}-${each.key}") })
355+
{ token = var.gl_runner_registration_token,
356+
name = lower("${var.gl_runner_base_name}-${local.unity_venue}-${each.key}"),
357+
app_gen_v = var.app_pack_gen_version,
358+
uapp_gen_v = var.unity_app_gen_version,
359+
unity_venue = lower(local.unity_venue) })
338360

339361
tags = {
340362
Name = "${var.gl_runner_instance_base_name}-${each.key}"
@@ -348,7 +370,8 @@ resource "aws_instance" "gl_runner_instance" {
348370
# aws secretsmanager delete-secret --secret-id MCP-GLU-Clone --force-delete-without-recovery --region us-west-2
349371
#
350372
resource "aws_secretsmanager_secret" "mcp_glu_clone" {
351-
name = "MCP-GLU-Clone"
373+
name = "MCP-GLU-Clone"
374+
recovery_window_in_days = 0
352375
}
353376
#
354377
resource "aws_secretsmanager_secret_version" "mcp_glu_clone" {
@@ -487,24 +510,32 @@ resource "aws_api_gateway_method_response" "response_200" {
487510
status_code = "200"
488511
}
489512
#
490-
resource "aws_api_gateway_deployment" "mcp_clone" {
491-
rest_api_id = data.aws_api_gateway_rest_api.unity_rest_api.id
492-
stage_name = lower(local.unity_venue)
493-
494-
triggers = {
495-
redeployment = sha1(jsonencode([
496-
aws_api_gateway_resource.ads_acb.id,
497-
aws_api_gateway_resource.mcp_clone.id,
498-
aws_api_gateway_method.mcp_clone.id,
499-
aws_api_gateway_integration.integration.id,
500-
aws_api_gateway_method_response.response_200.id,
501-
]))
502-
}
503-
504-
lifecycle {
505-
create_before_destroy = true
506-
}
507-
}
513+
# Currently, automated gateway deployment is disabled (commented out).
514+
# Unity API Gateway should be deployed manually at AWS console for now.
515+
#
516+
#resource "aws_api_gateway_deployment" "mcp_clone" {
517+
# rest_api_id = data.aws_api_gateway_rest_api.unity_rest_api.id
518+
#
519+
# triggers = {
520+
# redeployment = sha1(jsonencode([
521+
# aws_api_gateway_resource.ads_acb.id,
522+
# aws_api_gateway_resource.mcp_clone.id,
523+
# aws_api_gateway_method.mcp_clone.id,
524+
# aws_api_gateway_integration.integration.id,
525+
# aws_api_gateway_method_response.response_200.id,
526+
# ]))
527+
# }
528+
#
529+
# lifecycle {
530+
# create_before_destroy = true
531+
# }
532+
#}
533+
#
534+
#resource "aws_api_gateway_stage" "venue" {
535+
# deployment_id = aws_api_gateway_deployment.mcp_clone.id
536+
# rest_api_id = data.aws_api_gateway_rest_api.unity_rest_api.id
537+
# stage_name = lower(local.unity_venue)
538+
#}
508539

509540

510541

‎ci_cd/Prod/main.tf‎

Lines changed: 51 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,24 @@ locals {
7575

7676
# VARIABLES
7777

78+
# Some software versions installed in EC2 instance: These version
79+
# control variables are currently ignored, but we may want to use
80+
# them in the future.
81+
82+
variable "app_pack_gen_version" {
83+
description = "The version (tag) of app-pack-generator to install"
84+
type = string
85+
default = "0.4.1"
86+
}
87+
88+
variable "unity_app_gen_version" {
89+
description = "The version (tag) of unity-app-generator to install"
90+
type = string
91+
default = "0.3.0"
92+
}
93+
94+
95+
7896
# System info: os, hardware
7997

8098
variable "gl_runner_machine_name" {
@@ -334,7 +352,11 @@ resource "aws_instance" "gl_runner_instance" {
334352
# Download and install gitlab runner
335353
#
336354
user_data = templatefile("../install_group_runner_${var.gl_runner_architecture}_${each.key}.tftpl",
337-
{ token = "${var.gl_runner_registration_token}", name = lower("${var.gl_runner_base_name}-${local.unity_venue}-${each.key}") })
355+
{ token = var.gl_runner_registration_token,
356+
name = lower("${var.gl_runner_base_name}-${local.unity_venue}-${each.key}"),
357+
app_gen_v = var.app_pack_gen_version,
358+
uapp_gen_v = var.unity_app_gen_version,
359+
unity_venue = lower(local.unity_venue) })
338360

339361
tags = {
340362
Name = "${var.gl_runner_instance_base_name}-${each.key}"
@@ -348,7 +370,8 @@ resource "aws_instance" "gl_runner_instance" {
348370
# aws secretsmanager delete-secret --secret-id MCP-GLU-Clone --force-delete-without-recovery --region us-west-2
349371
#
350372
resource "aws_secretsmanager_secret" "mcp_glu_clone" {
351-
name = "MCP-GLU-Clone"
373+
name = "MCP-GLU-Clone"
374+
recovery_window_in_days = 0
352375
}
353376
#
354377
resource "aws_secretsmanager_secret_version" "mcp_glu_clone" {
@@ -487,24 +510,32 @@ resource "aws_api_gateway_method_response" "response_200" {
487510
status_code = "200"
488511
}
489512
#
490-
resource "aws_api_gateway_deployment" "mcp_clone" {
491-
rest_api_id = data.aws_api_gateway_rest_api.unity_rest_api.id
492-
stage_name = lower(local.unity_venue)
493-
494-
triggers = {
495-
redeployment = sha1(jsonencode([
496-
aws_api_gateway_resource.ads_acb.id,
497-
aws_api_gateway_resource.mcp_clone.id,
498-
aws_api_gateway_method.mcp_clone.id,
499-
aws_api_gateway_integration.integration.id,
500-
aws_api_gateway_method_response.response_200.id,
501-
]))
502-
}
503-
504-
lifecycle {
505-
create_before_destroy = true
506-
}
507-
}
513+
# Currently, automated gateway deployment is disabled (commented out).
514+
# Unity API Gateway should be deployed manually at AWS console for now.
515+
#
516+
#resource "aws_api_gateway_deployment" "mcp_clone" {
517+
# rest_api_id = data.aws_api_gateway_rest_api.unity_rest_api.id
518+
#
519+
# triggers = {
520+
# redeployment = sha1(jsonencode([
521+
# aws_api_gateway_resource.ads_acb.id,
522+
# aws_api_gateway_resource.mcp_clone.id,
523+
# aws_api_gateway_method.mcp_clone.id,
524+
# aws_api_gateway_integration.integration.id,
525+
# aws_api_gateway_method_response.response_200.id,
526+
# ]))
527+
# }
528+
#
529+
# lifecycle {
530+
# create_before_destroy = true
531+
# }
532+
#}
533+
#
534+
#resource "aws_api_gateway_stage" "venue" {
535+
# deployment_id = aws_api_gateway_deployment.mcp_clone.id
536+
# rest_api_id = data.aws_api_gateway_rest_api.unity_rest_api.id
537+
# stage_name = lower(local.unity_venue)
538+
#}
508539

509540

510541

‎ci_cd/Test/main.tf‎

Lines changed: 51 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,24 @@ locals {
7575

7676
# VARIABLES
7777

78+
# Some software versions installed in EC2 instance: These version
79+
# control variables are currently ignored, but we may want to use
80+
# them in the future.
81+
82+
variable "app_pack_gen_version" {
83+
description = "The version (tag) of app-pack-generator to install"
84+
type = string
85+
default = "0.4.1"
86+
}
87+
88+
variable "unity_app_gen_version" {
89+
description = "The version (tag) of unity-app-generator to install"
90+
type = string
91+
default = "0.3.0"
92+
}
93+
94+
95+
7896
# System info: os, hardware
7997

8098
variable "gl_runner_machine_name" {
@@ -334,7 +352,11 @@ resource "aws_instance" "gl_runner_instance" {
334352
# Download and install gitlab runner
335353
#
336354
user_data = templatefile("../install_group_runner_${var.gl_runner_architecture}_${each.key}.tftpl",
337-
{ token = "${var.gl_runner_registration_token}", name = lower("${var.gl_runner_base_name}-${local.unity_venue}-${each.key}") })
355+
{ token = var.gl_runner_registration_token,
356+
name = lower("${var.gl_runner_base_name}-${local.unity_venue}-${each.key}"),
357+
app_gen_v = var.app_pack_gen_version,
358+
uapp_gen_v = var.unity_app_gen_version,
359+
unity_venue = lower(local.unity_venue) })
338360

339361
tags = {
340362
Name = "${var.gl_runner_instance_base_name}-${each.key}"
@@ -348,7 +370,8 @@ resource "aws_instance" "gl_runner_instance" {
348370
# aws secretsmanager delete-secret --secret-id MCP-GLU-Clone --force-delete-without-recovery --region us-west-2
349371
#
350372
resource "aws_secretsmanager_secret" "mcp_glu_clone" {
351-
name = "MCP-GLU-Clone"
373+
name = "MCP-GLU-Clone"
374+
recovery_window_in_days = 0
352375
}
353376
#
354377
resource "aws_secretsmanager_secret_version" "mcp_glu_clone" {
@@ -487,24 +510,32 @@ resource "aws_api_gateway_method_response" "response_200" {
487510
status_code = "200"
488511
}
489512
#
490-
resource "aws_api_gateway_deployment" "mcp_clone" {
491-
rest_api_id = data.aws_api_gateway_rest_api.unity_rest_api.id
492-
stage_name = lower(local.unity_venue)
493-
494-
triggers = {
495-
redeployment = sha1(jsonencode([
496-
aws_api_gateway_resource.ads_acb.id,
497-
aws_api_gateway_resource.mcp_clone.id,
498-
aws_api_gateway_method.mcp_clone.id,
499-
aws_api_gateway_integration.integration.id,
500-
aws_api_gateway_method_response.response_200.id,
501-
]))
502-
}
503-
504-
lifecycle {
505-
create_before_destroy = true
506-
}
507-
}
513+
# Currently, automated gateway deployment is disabled (commented out).
514+
# Unity API Gateway should be deployed manually at AWS console for now.
515+
#
516+
#resource "aws_api_gateway_deployment" "mcp_clone" {
517+
# rest_api_id = data.aws_api_gateway_rest_api.unity_rest_api.id
518+
#
519+
# triggers = {
520+
# redeployment = sha1(jsonencode([
521+
# aws_api_gateway_resource.ads_acb.id,
522+
# aws_api_gateway_resource.mcp_clone.id,
523+
# aws_api_gateway_method.mcp_clone.id,
524+
# aws_api_gateway_integration.integration.id,
525+
# aws_api_gateway_method_response.response_200.id,
526+
# ]))
527+
# }
528+
#
529+
# lifecycle {
530+
# create_before_destroy = true
531+
# }
532+
#}
533+
#
534+
#resource "aws_api_gateway_stage" "venue" {
535+
# deployment_id = aws_api_gateway_deployment.mcp_clone.id
536+
# rest_api_id = data.aws_api_gateway_rest_api.unity_rest_api.id
537+
# stage_name = lower(local.unity_venue)
538+
#}
508539

509540

510541

0 commit comments

Comments
 (0)