Make ec2 test compatible with prometheus (#144)

* added environment variables to EC2 AOC deployment

* make env vars only on amazon linux

* remove unneeded changes

* made env vars command modular and added windows env vars

* remove cortex instance endpoint var for backwards compatibility

* ec2 working with windows

Author: Aman Brar

terraform/ec2/amis.tf

@@ -22,6 +22,7 @@ variable "ami_family" {
       otconfig_destination = "/tmp/ot-default.yml"
       download_command_pattern = "wget %s"
       install_command = "sudo dpkg -i aws-otel-collector.deb"
+      set_env_var_command = "echo \"no env vars to assign values %s and %s to\""
       start_command = "sudo /opt/aws/aws-otel-collector/bin/aws-otel-collector-ctl -c /tmp/ot-default.yml -a start"
       connection_type = "ssh"
       user_data = ""
@@ -33,6 +34,7 @@ variable "ami_family" {
       otconfig_destination = "/tmp/ot-default.yml"
       download_command_pattern = "wget %s"
       install_command = "sudo rpm -Uvh aws-otel-collector.rpm"
+      set_env_var_command = "sudo chmod 777 /opt/aws/aws-otel-collector/etc/.env && sudo echo 'SAMPLE_APP_HOST=%s' >> /opt/aws/aws-otel-collector/etc/.env && sudo echo 'SAMPLE_APP_PORT=%s' >> /opt/aws/aws-otel-collector/etc/.env"
       start_command = "sudo /opt/aws/aws-otel-collector/bin/aws-otel-collector-ctl -c /tmp/ot-default.yml -a start"
       connection_type = "ssh"
       user_data = ""
@@ -44,6 +46,7 @@ variable "ami_family" {
       otconfig_destination = "C:\\ot-default.yml"
       download_command_pattern = "powershell -command \"Invoke-WebRequest -Uri %s -OutFile C:\\aws-otel-collector.msi\""
       install_command = "msiexec /i C:\\aws-otel-collector.msi"
+      set_env_var_command = "powershell \"[System.Environment]::SetEnvironmentVariable('SAMPLE_APP_HOST', '%s', [System.EnvironmentVariableTarget]::Machine); [System.Environment]::SetEnvironmentVariable('SAMPLE_APP_PORT', '%s', [System.EnvironmentVariableTarget]::Machine)\""
       start_command = "powershell \"& 'C:\\Program Files\\Amazon\\AwsOtelCollector\\aws-otel-collector-ctl.ps1' -ConfigLocation C:\\ot-default.yml -Action start\""
       connection_type = "winrm"
       user_data = <<EOF

terraform/ec2/main.tf

@@ -224,6 +224,7 @@ resource "null_resource" "start_collector" {
   provisioner "remote-exec" {
     inline = [
       local.ami_family["install_command"],
+      format(local.ami_family["set_env_var_command"], aws_instance.sidecar.public_ip, module.common.sample_app_lb_port),
       local.ami_family["start_command"],
     ]
 
@@ -361,10 +362,12 @@ module "validator" {
   canary = var.canary
   testcase = split("/", var.testcase)[2]
 
+  cortex_instance_endpoint = var.cortex_instance_endpoint
+
   aws_access_key_id = var.aws_access_key_id
   aws_secret_access_key = var.aws_secret_access_key
 
-  depends_on = [null_resource.setup_sample_app_and_mock_server]
+  depends_on = [null_resource.setup_sample_app_and_mock_server, null_resource.start_collector]
 }
 
 output "public_ip" {

terraform/ec2/outputs.tf

@@ -21,5 +21,3 @@ output "sample_app_instance_id" {
 output "testing_id" {
   value = module.common.testing_id
 }
-
-

terraform/ec2/variables.tf

@@ -100,6 +100,5 @@ variable "canary" {
 }
 
 variable "cortex_instance_endpoint" {
-  # change to your cortex endpoint
   default = ""
 }

terraform/testcases/prometheus_static/parameters.tfvars

@@ -3,7 +3,4 @@ validation_config="prometheus-metric-validation.yml"
 
 sample_app="prometheus"
 
-# change to your cortex endpoint
-cortex_instance_endpoint=""
-
-sample_app_mode="pull"
+sample_app_mode="pull"