Fixed issues with User ID variable in scripts

AUPropertyAutomation/ewlabtf/property-snippets/Add_testheader.json

@@ -16,7 +16,7 @@
         "options": {
           "matchOperator": "IS_ONE_OF",
           "values": [
-            "<UserID>tflab-test.akaudevops.com" 
+            "${env.UserID}tflab-test.akaudevops.com" 
           ]
         }
       }

AUPropertyAutomation/ewlabtf/property-snippets/Offload_origin.json

@@ -388,7 +388,7 @@
             "options": {
               "matchOperator": "IS_ONE_OF",
               "values": [
-                "<User ID>tflab-test.akaudevops.com"
+                "${env.UserID}tflab-test.akaudevops.com"
               ]
             }
           }

AUPropertyAutomation/terraformlabtf/configuration.tf

@@ -15,6 +15,11 @@ data "akamai_property_rules_template" "rules-template" {
       value = "${var.cp_code_id}"
       type  = "number"
   }
+  variables {
+      name  = "user_id"
+      value = "${var.UserID}"
+      type  = "bool"
+  }
 }
 
 resource "akamai_property" "lab_property" {

AUPropertyAutomation/terraformlabtf/property-snippets/Add_testheader.json

@@ -16,7 +16,7 @@
         "options": {
           "matchOperator": "IS_ONE_OF",
           "values": [
-            "<UserID>tflab-test.akaudevops.com" 
+            "${env.UserID}tflab-test.akaudevops.com" 
           ]
         }
       }

AUPropertyAutomation/terraformlabtf/property-snippets/Offload_origin.json

@@ -388,7 +388,7 @@
             "options": {
               "matchOperator": "IS_ONE_OF",
               "values": [
-                "<User ID>tflab-test.akaudevops.com"
+                "${env.UserID}tflab-test.akaudevops.com"
               ]
             }
           }

tf-lab-master/modules/property/property-snippets/Add_testheader

@@ -0,0 +1,27 @@
+{
+    "behaviors": [
+      {
+        "name": "modifyOutgoingResponseHeader",
+        "options": {
+          "action": "ADD",
+          "customHeaderName": "X-Test-Environment",
+          "headerValue": "true",
+          "standardAddHeaderName": "OTHER"
+        }
+      }
+    ],
+    "criteria": [
+      {
+        "name": "hostname",
+        "options": {
+          "matchOperator": "IS_ONE_OF",
+          "values": [
+            "${env.user_id}tflab-test.akaudevops.com" 
+          ]
+        }
+      }
+    ],
+    "name": "Add testheader",
+    "options": {},
+    "criteriaMustSatisfy": "all"
+  }

tf-lab-master/modules/property/property-snippets/Offload_origin.json

@@ -382,11 +382,20 @@
             "matchOperator": "IS_NOT",
             "value": "CACHEABLE"
           }
+        },
+        {
+          "name": "hostname",
+          "options": {
+            "matchOperator": "IS_ONE_OF",
+            "values": [
+              "${env.user_id}tflab-test.akaudevops.com"
+            ]
+          }
         }
       ],
       "name": "Uncacheable objects",
       "options": {},
-      "criteriaMustSatisfy": "all"
+      "criteriaMustSatisfy": "any"
     }
   ],
   "comments": "Control the settings related to caching content at the edge and in the browser. As a result, fewer requests go to your origin, fewer bytes leave your data centers, and your assets are closer to your users.",

tf-lab-master/modules/property/property-snippets/main.json

@@ -23,6 +23,7 @@
       }
     ],
     "children": [
+      "#include:Add_testheader.json",
       "#include:Augment_insights.json",
       "#include:Accelerate_delivery.json",
       "#include:Offload_origin.json",

tf-lab-master/modules/property/property.tf

@@ -41,6 +41,12 @@ resource "akamai_property" "lab_property" {
       cname_to =  var.edge_hostname
       cert_provisioning_type = "CPS_MANAGED"
     }
+    hostnames{                                     
+      cname_from =  "${var.user_id}tflab-test.akaudevops.com"
+      cname_to =  var.edge_hostname
+      cert_provisioning_type = "CPS_MANAGED"
+    }
+
     rule_format = var.rule_format
     rules = data.akamai_property_rules_template.rules-template.json
 }