Merge pull request #1 from 345paul/bug/templatefixes

Fixed numerous template issues
2020-10-21 09:49:45 -07:00 · 2020-10-21 09:49:45 -07:00 · a5bee6bdfd
--- a/src/messagebus/routingstore/routingstore.appcfg.json
+++ b/src/messagebus/routingstore/routingstore.appcfg.json
@ -26,7 +26,7 @@
        {
            "name": "[parameters('appConfigName')]",
            "type": "Microsoft.AppConfiguration/configurationStores",
-            "apiVersion": "2019-11-01-preview",
+            "apiVersion": "2020-06-01",
            "location": "[parameters('appConfigLocation')]",
            "tags": "[parameters('tags')]",
            "identity": {
--- a/src/messagebus/routingstore/routingstore.appcfg.prod.parameters.json
+++ b/src/messagebus/routingstore/routingstore.appcfg.prod.parameters.json
@ -15,7 +15,7 @@
            }
        },
        "sku": {
-            "value": "Free"
+            "value": "Standard"
        }
    }
 }
--- a/templates/application/workflows/messagesuspendprocessor/messagesuspendprocessor.logicapp.prod.parameters.json.liquid
+++ b/templates/application/workflows/messagesuspendprocessor/messagesuspendprocessor.logicapp.prod.parameters.json.liquid
@ -3,27 +3,29 @@
    "contentVersion": "1.0.0.0",
    "parameters": {
        "logicAppName": {
-            "value": "logic-aimmessagesuspendprocessor-prod-xxxxx"
+            "value": "{{ resource_template.resource_name }}"
        },
        "logicAppLocation": {
-            "value": "UK South"
+            "value": "{{ resource_template.parameters.azure_primary_region }}"
        },
        "messageBusResourceGroupName": {
-            "value": "rg-aimmsgbus-prod-uksouth-xxxxx"
+            "value": "{{ resource_template.parameters.azure_message_bus_resource_group_name }}"
        },
        "apimServiceName": {
-            "value": "apim-aimmsgbussvc-prod-xxxxx"
-        },
-        "apimSubscriptionKey": {
-            "value": ""
+            "value": "{{ resource_template.parameters.apim_service_name }}"
        },
        "serviceBusTopicPublishApiConnectionName": {
            "value": "{{ resource_template.parameters.service_bus_api_connector_name }}"
        },
        "tags": {
            "value": {
-                "ApplicationName": "AIM-System",
-                "Env": "prod"
+{%- for tag in resource_template.tags -%}
+    {%- if forloop.last == false %}
+                "{{ tag.key }}" : "{{ tag.value }}",
+    {%- else %}
+                "{{ tag.key }}" : "{{ tag.value }}"
+    {%- endif -%}
+{%- endfor %}
            }
        }
    }
--- a/templates/endpoints/file/datagateway/Deploy-30-DataGateway.ps1.liquid
+++ b/templates/endpoints/file/datagateway/Deploy-30-DataGateway.ps1.liquid
@ -10,5 +10,5 @@ Prior to running this script ensure you are authenticated against Azure and have
 .\Deploy-30-DataGateway.ps1
 #>

-$params = Get-Content -Path $PSScriptRoot\datagateway.onpremisedatagateway.dev.psparameters.json -Raw | ConvertFrom-Json
-& $PSScriptRoot\New-DataGateway.ps1 -resourceGroupName $params.resourceGroupName -subscriptionId "{{ resource_template.parameters.azure_subscription_id }}" -connectionGatewayInstallationDisplayName $params.connectionGatewayInstallationDisplayName -connectionGatewayInstallationLocation $params.connectionGatewayInstallationLocation -templateFile "$PSScriptRoot\datagateway.onpremisedatagateway.json" -templateParameterFile "$PSScriptRoot\datagateway.onpremisedatagateway.dev.parameters.json" -deploymentName "datagateway.{{ formatted_azure_primary_region }}.{{ model.migration_target.unique_deployment_id | downcase }}"
+$params = Get-Content -Path $PSScriptRoot\datagateway.onpremisedatagateway.{{ model.migration_target.deployment_environment | downcase }}.psparameters.json -Raw | ConvertFrom-Json
+& $PSScriptRoot\New-DataGateway.ps1 -resourceGroupName $params.resourceGroupName -subscriptionId "{{ resource_template.parameters.azure_subscription_id }}" -connectionGatewayInstallationDisplayName $params.connectionGatewayInstallationDisplayName -connectionGatewayInstallationLocation $params.connectionGatewayInstallationLocation -templateFile "$PSScriptRoot\datagateway.onpremisedatagateway.json" -templateParameterFile "$PSScriptRoot\datagateway.onpremisedatagateway.{{ model.migration_target.deployment_environment | downcase }}.parameters.json" -deploymentName "datagateway.{{ formatted_azure_primary_region }}.{{ model.migration_target.unique_deployment_id | downcase }}"
--- a/templates/endpoints/file/datagateway/TearDown-30-DataGateway.ps1.liquid
+++ b/templates/endpoints/file/datagateway/TearDown-30-DataGateway.ps1.liquid
@ -9,5 +9,5 @@ Prior to running this script ensure you are authenticated against Azure and have
 .\TearDown-30-DataGateway.ps1
 #>

-$params = Get-Content -Path $PSScriptRoot\datagateway.onpremisedatagateway.dev.psparameters.json -Raw | ConvertFrom-Json
+$params = Get-Content -Path $PSScriptRoot\datagateway.onpremisedatagateway.{{ model.migration_target.deployment_environment | downcase }}.psparameters.json -Raw | ConvertFrom-Json
 & $PSScriptRoot\Remove-DataGateway.ps1 -resourceGroupName $params.resourceGroupName -dataGatewayName "{{ resource_template.resource_name }}"
--- a/templates/intermediaries/processmanager/snippets/activatable/processmanager.activitycontainer.workflow.snippet.json.liquid
+++ b/templates/intermediaries/processmanager/snippets/activatable/processmanager.activitycontainer.workflow.snippet.json.liquid
@ -1,4 +1,4 @@
-{%- capture workflow_object_name -%}{{ workflow_object.name | replace: " ", "_" | replace: ".", "_" }}_({{ workflow_object.properties.UniqueId }}){%- endcapture -%}
+{%- capture workflow_object_name -%}{{ workflow_object.name | replace: " ", "_" | replace: ".", "_" | replace: "'", "_" }}_({{ workflow_object.properties.UniqueId }}){%- endcapture -%}
 {
    "workflowDefinitionAction": {
        "{{ workflow_object.type }}:_{{ workflow_object_name }}": {
--- a/templates/intermediaries/processmanager/snippets/common/processmanager.activity.codeexpression.snippet.json.liquid
+++ b/templates/intermediaries/processmanager/snippets/common/processmanager.activity.codeexpression.snippet.json.liquid
@ -1,4 +1,4 @@
-{%- capture workflow_object_name -%}{{ workflow_object.name | replace: " ", "_" | replace: ".", "_" }}_({{ workflow_object.properties.UniqueId }}){%- endcapture -%}
+{%- capture workflow_object_name -%}{{ workflow_object.name | replace: " ", "_" | replace: ".", "_" | replace: "'", "_" }}_({{ workflow_object.properties.UniqueId }}){%- endcapture -%}
 {
    "workflowDefinitionAction": {
        "{{ workflow_object.type }}:_{{ workflow_object_name }}": {
--- a/templates/intermediaries/processmanager/snippets/common/processmanager.activity.invokeworkflow.snippet.json.liquid
+++ b/templates/intermediaries/processmanager/snippets/common/processmanager.activity.invokeworkflow.snippet.json.liquid
@ -1,4 +1,4 @@
-{%- capture workflow_object_name -%}{{ workflow_object.name | replace: " ", "_" | replace: ".", "_" }}_({{ workflow_object.properties.UniqueId }}){%- endcapture -%}
+{%- capture workflow_object_name -%}{{ workflow_object.name | replace: " ", "_" | replace: ".", "_" | replace: "'", "_" }}_({{ workflow_object.properties.UniqueId }}){%- endcapture -%}
 {
    "workflowDefinitionAction": {
        "{{ workflow_object.type }}:_{{ workflow_object_name }}": {
--- a/templates/intermediaries/processmanager/snippets/common/processmanager.activity.messageconstruction.snippet.json.liquid
+++ b/templates/intermediaries/processmanager/snippets/common/processmanager.activity.messageconstruction.snippet.json.liquid
@ -1,14 +1,4 @@
-{%- capture workflow_object_name -%}{{ workflow_object.name | replace: " ", "_" | replace: ".", "_" }}_({{ workflow_object.properties.UniqueId }}){%- endcapture -%}
-{%- assign counter = 0 -%}
-{%- assign expression = "" -%}
-{%- for property in workflow_object.properties -%}
-    {%- capture expression_name -%}Expression{{ counter }}{%- endcapture -%}
-    {%- if property.key == expression_name -%}
-        {%- assign expression_value = property.value -%}
-        {%- assign expression = expression | append: expression_value | append: "\r\n\r\n" -%}
-        {%- assign counter = counter | plus: 1 -%}
-    {%- endif -%}
-{%- endfor -%}
+{%- capture workflow_object_name -%}{{ workflow_object.name | replace: " ", "_" | replace: ".", "_" | replace: "'", "_" }}_({{ workflow_object.properties.UniqueId }}){%- endcapture -%}
 {
    "workflowDefinitionAction": {
        "{{ workflow_object.type }}:_{{ workflow_object_name }}": {
@ -16,7 +6,7 @@
            "type": "JavaScriptCode",
            "description": "{{ workflow_object.properties.ConstructedMessage }}",
            "inputs": {
-                "code": "/*\r\n{{ expression | to_json_string }}\r\n*/\r\nvar activity = \"{{ workflow_object.name }}\";\r\nreturn activity;"
+                "code": "/*\r\n{{ workflow_object.properties.Expression | to_json_string }}\r\n*/\r\nvar activity = \"{{ workflow_object.name }}\";\r\nreturn activity;"
            }
        }
    }
--- a/templates/intermediaries/processmanager/snippets/common/processmanager.activity.messagetransform.snippet.json.liquid
+++ b/templates/intermediaries/processmanager/snippets/common/processmanager.activity.messagetransform.snippet.json.liquid
@ -1,4 +1,4 @@
-{%- capture workflow_object_name -%}{{ workflow_object.name | replace: " ", "_" | replace: ".", "_" }}_({{ workflow_object.properties.UniqueId }}){%- endcapture -%}
+{%- capture workflow_object_name -%}{{ workflow_object.name | replace: " ", "_" | replace: ".", "_" | replace: "'", "_" }}_({{ workflow_object.properties.UniqueId }}){%- endcapture -%}
 {%- capture source_message -%}{{ workflow_object.properties.SourceMessageReferences | first | split: '.' | first }}{%- endcapture -%}
 {%- capture target_message -%}{{ workflow_object.properties.TargetMessageReferences | first | split: '.' | first }}{%- endcapture -%}
 {%- if workflow_object.properties.IsMultiSource == false and workflow_object.properties.IsMultiTarget == false -%}
@ -9,7 +9,7 @@
            "type": "Scope",
            "description": "{{ workflow_object.type }}",
            "actions": {
-                "{{ workflow_object_name }}:Call_GetBodyContent": {
+                "{{ workflow_object_name }}:_Call_GetBodyContent": {
                    "runAfter": {},
                    "type": "ApiManagement",
                    "inputs": {
@ -34,15 +34,15 @@
                        "subscriptionKey": "@{parameters('apimSubscriptionKey')}"
                    }
                },
-                "{{ workflow_object_name }}:Transform": {
+                "{{ workflow_object_name }}:_Transform": {
                    "runAfter": {
-                        "{{ workflow_object_name }}:Call_GetBodyContent": [
+                        "{{ workflow_object_name }}:_Call_GetBodyContent": [
                            "Succeeded"
                        ]
                    },
                    "type": "Xslt",
                    "inputs": {
-                        "content": "@{xml(decodeBase64(body('{{ workflow_object_name }}:Call_GetBodyContent')?['$content']))}",
+                        "content": "@{xml(decodeBase64(body('{{ workflow_object_name }}:_Call_GetBodyContent')?['$content']))}",
                        "integrationAccount": {
                            "map": {
                                "name": "{{ workflow_object.properties.Map }}"
@ -51,9 +51,9 @@
                        "transformOptions": "ApplyXsltOutputAttributes"
                    }
                },
-                "{{ workflow_object_name }}:Call_BuildEnvelope": {
+                "{{ workflow_object_name }}:_Call_BuildEnvelope": {
                    "runAfter": {
-                        "{{ workflow_object_name }}:Transform": [
+                        "{{ workflow_object_name }}:_Transform": [
                            "Succeeded"
                        ]
                    },
@ -62,7 +62,7 @@
                        "api": {
                            "id": "[variables('messagingManagerApiResourceId')]"
                        },
-                        "body": "@body('{{ workflow_object_name }}:Transform')",
+                        "body": "@body('{{ workflow_object_name }}:_Transform')",
                        "headers": {
                            "Aim-Tracking-Id": "@{variables('{{ source_message }}')?['header']?['properties']?['trackingId']}",
                            "Content-Type": "application/xml"
@ -83,28 +83,28 @@
                        "subscriptionKey": "@{parameters('apimSubscriptionKey')}"
                    }
                },
-                "{{ workflow_object_name }}:Set_MessageType": {
+                "{{ workflow_object_name }}:_Set_MessageType": {
                    "runAfter": {
-                        "{{ workflow_object_name }}:Call_BuildEnvelope": [
+                        "{{ workflow_object_name }}:_Call_BuildEnvelope": [
                            "Succeeded"
                        ]
                    },
                    "type": "SetVariable",
                    "inputs": {
                        "name": "MessageType",
-                        "value": "@{coalesce(xpath(xml(body('{{ workflow_object_name }}:Transform')), 'namespace-uri(/*)'), '')}#@{coalesce(xpath(xml(body('{{ workflow_object_name }}:Transform')), 'local-name(/*)'), '')}"
+                        "value": "@{coalesce(xpath(xml(body('{{ workflow_object_name }}:_Transform')), 'namespace-uri(/*)'), '')}#@{coalesce(xpath(xml(body('{{ workflow_object_name }}:_Transform')), 'local-name(/*)'), '')}"
                    }
                },
-                "{{ workflow_object_name }}:Set_{{ target_message }}": {
+                "{{ workflow_object_name }}:_Set_Message": {
                    "runAfter": {
-                        "{{ workflow_object_name }}:Set_MessageType": [
+                        "{{ workflow_object_name }}:_Set_MessageType": [
                            "Succeeded"
                        ]
                    },
                    "type": "SetVariable",
                    "inputs": {
                        "name": "{{ target_message }}",
-                        "value": "@setProperty(body('{{ workflow_object_name }}:Call_BuildEnvelope'), 'header', setProperty(body('{{ workflow_object_name }}:Call_BuildEnvelope')?['header'], 'properties', setProperty(body('{{ workflow_object_name }}:Call_BuildEnvelope')?['header']?['properties'], 'btsMessageType', variables('MessageType'))))"
+                        "value": "@setProperty(body('{{ workflow_object_name }}:_Call_BuildEnvelope'), 'header', setProperty(body('{{ workflow_object_name }}:_Call_BuildEnvelope')?['header'], 'properties', setProperty(body('{{ workflow_object_name }}:_Call_BuildEnvelope')?['header']?['properties'], 'btsMessageType', variables('MessageType'))))"
                    }
                }
            }
@ -117,7 +117,7 @@
        "{{ workflow_object.type }}:_{{ workflow_object_name }}": {
            "runAfter": {},
            "type": "JavaScriptCode",
-            "description": "{{ workflow_object.type }}",
+            "description": "{{ workflow_object.type }} - Unsupported Multimap Transform",
            "inputs": {
                "code": "var activity = \"{{ workflow_object.name }}\";\r\nreturn activity;"
            }
--- a/templates/intermediaries/processmanager/snippets/common/processmanager.activity.placeholder.snippet.json.liquid
+++ b/templates/intermediaries/processmanager/snippets/common/processmanager.activity.placeholder.snippet.json.liquid
@ -1,4 +1,4 @@
-{%- capture workflow_object_name -%}{{ workflow_object.name | replace: " ", "_" | replace: ".", "_" }}_({{ workflow_object.properties.UniqueId }}){%- endcapture -%}
+{%- capture workflow_object_name -%}{{ workflow_object.name | replace: " ", "_" | replace: ".", "_" | replace: "'", "_" }}_({{ workflow_object.properties.UniqueId }}){%- endcapture -%}
 {
    "workflowDefinitionAction": {
        "{{ workflow_object.type }}:_{{ workflow_object_name }}": {
--- a/templates/intermediaries/processmanager/snippets/common/processmanager.activitycontainer.decision.snippet.json.liquid
+++ b/templates/intermediaries/processmanager/snippets/common/processmanager.activitycontainer.decision.snippet.json.liquid
@ -1,4 +1,4 @@
-{%- capture workflow_object_name -%}{{ workflow_object.name | replace: " ", "_" | replace: ".", "_" }}_({{ workflow_object.properties.UniqueId }}){%- endcapture -%}
+{%- capture workflow_object_name -%}{{ workflow_object.name | replace: " ", "_" | replace: ".", "_" | replace: "'", "_" }}_({{ workflow_object.properties.UniqueId }}){%- endcapture -%}
 {%- capture switch_expression_action_name -%}{{ workflow_object_name }}:Run_Switch_Expression{%- endcapture -%}
 {
    "workflowDefinitionAction": {
--- a/templates/intermediaries/processmanager/snippets/common/processmanager.activitycontainer.decisionbranch.snippet.json.liquid
+++ b/templates/intermediaries/processmanager/snippets/common/processmanager.activitycontainer.decisionbranch.snippet.json.liquid
@ -1,4 +1,4 @@
-{%- capture workflow_object_name -%}{{ workflow_object.name | replace: " ", "_" | replace: ".", "_" }}_({{ workflow_object.properties.UniqueId }}){%- endcapture -%}
+{%- capture workflow_object_name -%}{{ workflow_object.name | replace: " ", "_" | replace: ".", "_" | replace: "'", "_" }}_({{ workflow_object.properties.UniqueId }}){%- endcapture -%}
 {
    "workflowDefinitionAction": {
        "{{ workflow_object.type }}:_{{ workflow_object_name }}": {
--- a/templates/intermediaries/processmanager/snippets/common/processmanager.activitycontainer.placeholder.snippet.json.liquid
+++ b/templates/intermediaries/processmanager/snippets/common/processmanager.activitycontainer.placeholder.snippet.json.liquid
@ -1,4 +1,4 @@
-{%- capture workflow_object_name -%}{{ workflow_object.name | replace: " ", "_" | replace: ".", "_" }}_({{ workflow_object.properties.UniqueId }}){%- endcapture -%}
+{%- capture workflow_object_name -%}{{ workflow_object.name | replace: " ", "_" | replace: ".", "_" | replace: "'", "_" }}_({{ workflow_object.properties.UniqueId }}){%- endcapture -%}
 {
    "workflowDefinitionAction": {
        "{{ workflow_object.type }}:_{{ workflow_object_name }}": {
--- a/templates/intermediaries/processmanager/snippets/common/processmanager.activitycontainer.task.snippet.json.liquid
+++ b/templates/intermediaries/processmanager/snippets/common/processmanager.activitycontainer.task.snippet.json.liquid
@ -1,4 +1,4 @@
-{%- capture workflow_object_name -%}{{ workflow_object.name | replace: " ", "_" | replace: ".", "_" }}_({{ workflow_object.properties.UniqueId }}){%- endcapture -%}
+{%- capture workflow_object_name -%}{{ workflow_object.name | replace: " ", "_" | replace: ".", "_" | replace: "'", "_" }}_({{ workflow_object.properties.UniqueId }}){%- endcapture -%}
 {
    "workflowDefinitionAction": {
        "Step:_{{ workflow_object_name }}": {
--- a/templates/intermediaries/processmanager/snippets/common/processmanager.channel.receive.servicebustopic.snippet.json.liquid
+++ b/templates/intermediaries/processmanager/snippets/common/processmanager.channel.receive.servicebustopic.snippet.json.liquid
@ -1,4 +1,4 @@
-{%- capture workflow_object_name -%}{{ workflow_object.name | replace: " ", "_" | replace: ".", "_" }}_({{ workflow_object.properties.UniqueId }}){%- endcapture -%}
+{%- capture workflow_object_name -%}{{ workflow_object.name | replace: " ", "_" | replace: ".", "_" | replace: "'", "_" }}_({{ workflow_object.properties.UniqueId }}){%- endcapture -%}
 {%- if workflow_object.properties.Activate == "True" -%}
 {
    "workflowDefinitionAction": {
--- a/templates/intermediaries/processmanager/snippets/common/processmanager.channel.send.servicebustopic.snippet.json.liquid
+++ b/templates/intermediaries/processmanager/snippets/common/processmanager.channel.send.servicebustopic.snippet.json.liquid
@ -1,4 +1,4 @@
-{%- capture workflow_object_name -%}{{ workflow_object.name | replace: " ", "_" | replace: ".", "_" }}_({{ workflow_object.properties.UniqueId }}){%- endcapture -%}
+{%- capture workflow_object_name -%}{{ workflow_object.name | replace: " ", "_" | replace: ".", "_" | replace: "'", "_" }}_({{ workflow_object.properties.UniqueId }}){%- endcapture -%}
 {%- assign message_properties = workflow_object.properties.messageProperties -%}
 {%- assign message_properties_size = message_properties | size -%}
 {%- assign request_message_properties = workflow_object.properties.requestMessageProperties -%}
@ -32,7 +32,7 @@
                        "{{ workflow_object_name }}:Compose_Header_{{ property.key }}": {
                            "runAfter": {},
                            "type": "Compose",
-                            "inputs": "@setProperty(variables('{{ workflow_object.properties.MessageName }}'), 'header', setProperty(variables('{{ workflow_object.properties.MessageName }}')?['header'], 'properties', setProperty(variables('{{ workflow_object.properties.MessageName }}')?['header']?['properties'], '{{ property.key }}', '{{ property.value }}')))"
+                            "inputs": "@setProperty(variables('{{ workflow_object.properties.MessageName }}'), 'header', setProperty(variables('{{ workflow_object.properties.MessageName }}')?['header'], 'properties', setProperty(variables('{{ workflow_object.properties.MessageName }}')?['header']?['properties'], '{{ property.key }}', '{{ property.value | to_json_string }}')))"
                        },
                        "{{ workflow_object_name }}:Set_Header_{{ property.key }}": {
                            "runAfter": {},
@ -56,7 +56,7 @@
                        "{{ workflow_object_name }}:Get_Header_{{ property.value }}": {
                            "runAfter": {},
                            "type": "Compose",
-                            "inputs": "@setProperty(variables('{{ workflow_object.properties.MessageName }}'), 'header', setProperty(variables('{{ workflow_object.properties.MessageName }}')?['header'], 'properties', setProperty(variables('{{ workflow_object.properties.MessageName }}')?['header']?['properties'], '{{ property.key }}', variables('{{ request_message.name }}')?['header']?['properties']?['{{ property.value }}'])))"
+                            "inputs": "@setProperty(variables('{{ workflow_object.properties.MessageName }}'), 'header', setProperty(variables('{{ workflow_object.properties.MessageName }}')?['header'], 'properties', setProperty(variables('{{ workflow_object.properties.MessageName }}')?['header']?['properties'], '{{ property.key }}', variables('{{ request_message.name }}')?['header']?['properties']?['{{ property.value | to_json_string }}'])))"
                        },
                        "{{ workflow_object_name }}:Copy_Header_{{ property.value }}": {
                            "runAfter": {},
@ -80,7 +80,7 @@
                        "{{ workflow_object_name }}:Compose_Routing_{{ property.key }}": {
                            "runAfter": {},
                            "type": "Compose",
-                            "inputs": "@setProperty(variables('{{ workflow_object.properties.MessageName }}'), 'header', setProperty(variables('{{ workflow_object.properties.MessageName }}')?['header'], 'routing', setProperty(variables('{{ workflow_object.properties.MessageName }}')?['header']?['routing'], '{{ property.key }}', variables('{{ workflow_object.properties.MessageName }}')?['header']?['properties']?['{{ property.value }}'])))"
+                            "inputs": "@setProperty(variables('{{ workflow_object.properties.MessageName }}'), 'header', setProperty(variables('{{ workflow_object.properties.MessageName }}')?['header'], 'routing', setProperty(variables('{{ workflow_object.properties.MessageName }}')?['header']?['routing'], '{{ property.key }}', variables('{{ workflow_object.properties.MessageName }}')?['header']?['properties']?['{{ property.value | to_json_string }}'])))"
                        },
                        "{{ workflow_object_name }}:Set_Routing_{{ property.key }}": {
                            "runAfter": {},
--- a/templates/intermediaries/processmanager/snippets/common/processmanager.message.placeholder.snippet.json.liquid
+++ b/templates/intermediaries/processmanager/snippets/common/processmanager.message.placeholder.snippet.json.liquid
@ -1,4 +1,4 @@
-{%- capture workflow_object_name -%}{{ workflow_object.name | replace: " ", "_" | replace: ".", "_" }}_({{ workflow_object.properties.UniqueId }}){%- endcapture -%}
+{%- capture workflow_object_name -%}{{ workflow_object.name | replace: " ", "_" | replace: ".", "_" | replace: "'", "_" }}_({{ workflow_object.properties.UniqueId }}){%- endcapture -%}
 {
    "workflowDefinitionMessage": {
        "Message:_{{ workflow_object_name }}": {
--- a/templates/intermediaries/processmanager/snippets/common/processmanager.variable.placeholder.snippet.json.liquid
+++ b/templates/intermediaries/processmanager/snippets/common/processmanager.variable.placeholder.snippet.json.liquid
@ -1,4 +1,4 @@
-{%- capture workflow_object_name -%}{{ workflow_object.name | replace: " ", "_" | replace: ".", "_" }}_({{ workflow_object.properties.UniqueId }}){%- endcapture -%}
+{%- capture workflow_object_name -%}{{ workflow_object.name | replace: " ", "_" | replace: ".", "_" | replace: "'", "_" }}_({{ workflow_object.properties.UniqueId }}){%- endcapture -%}
 {
    "workflowDefinitionVariable": {
        "Variable:_{{ workflow_object_name }}": {
--- a/templates/intermediaries/topicsubscriber/topicsubscriber.logicapp.prod.parameters.json.liquid
+++ b/templates/intermediaries/topicsubscriber/topicsubscriber.logicapp.prod.parameters.json.liquid
@ -42,7 +42,7 @@
            "value": "{{ resource_template.parameters.apim_service_name }}"
        },
        "scenario": {
-            "value": "{{ resource_template.parameters.scenario }}"
+            "value": "{{ resource_template.parameters.scenario_name }}"
        },
        "scenarioStep": {
            "value": "{{ resource_template.parameters.scenario_step_name }}"
--- a/templates/messagebus/messagebusops/Deploy-20-MessageBusOps-AppInsights.ps1.liquid
+++ b/templates/messagebus/messagebusops/Deploy-20-MessageBusOps-AppInsights.ps1.liquid
@ -9,5 +9,5 @@ Prior to running this script ensure you are authenticated against Azure and have
 ./Deploy-30-MessageBusOps-AppInsights.ps1
 #>

-$params = Get-Content -Path $PSScriptRoot\messagebusops.appi.dev.psparameters.json -Raw | ConvertFrom-Json
+$params = Get-Content -Path $PSScriptRoot\messagebusops.appi.{{ model.migration_target.deployment_environment | downcase }}.psparameters.json -Raw | ConvertFrom-Json
 & $PSScriptRoot\New-MessageBusOps-AppInsights.ps1 -resourceGroupName $params.resourceGroupName -name $params.name -location $params.location -tags $params.tags
--- a/templates/messagebus/messagebusservice/Deploy-20-MessageBusService-StorageAccount.ps1.liquid
+++ b/templates/messagebus/messagebusservice/Deploy-20-MessageBusService-StorageAccount.ps1.liquid
@ -9,5 +9,5 @@ Prior to running this script ensure you are authenticated against Azure and have
 ./Deploy-20-MessageBusService-StorageAccount.ps1
 #>

-$params = Get-Content -Path $PSScriptRoot\messagebusservice.st.dev.psparameters.json -Raw | ConvertFrom-Json
+$params = Get-Content -Path $PSScriptRoot\messagebusservice.st.{{ model.migration_target.deployment_environment | downcase }}.psparameters.json -Raw | ConvertFrom-Json
 & $PSScriptRoot\New-MessageBusService-StorageAccount.ps1 -resourceGroupName $params.resourceGroupName -name $params.name -location $params.location -kind $params.kind -sku $params.sku -tags $params.tags
--- a/templates/messagebus/routingstore/routingstore.appcfg.dev.parameters.json.liquid
+++ b/templates/messagebus/routingstore/routingstore.appcfg.dev.parameters.json.liquid
@ -20,7 +20,7 @@
            }
        },
        "sku": {
-            "value": "{{ resource_template.parameters.azure_sku }}"
+            "value": "Free"
        }
    }
 }
--- a/templates/messagebus/routingstore/routingstore.appcfg.json
+++ b/templates/messagebus/routingstore/routingstore.appcfg.json
@ -26,7 +26,7 @@
        {
            "name": "[parameters('appConfigName')]",
            "type": "Microsoft.AppConfiguration/configurationStores",
-            "apiVersion": "2019-11-01-preview",
+            "apiVersion": "2020-06-01",
            "location": "[parameters('appConfigLocation')]",
            "tags": "[parameters('tags')]",
            "identity": {
--- a/templates/messagebus/routingstore/routingstore.appcfg.prod.parameters.json.liquid
+++ b/templates/messagebus/routingstore/routingstore.appcfg.prod.parameters.json.liquid
@ -20,7 +20,7 @@
            }
        },
        "sku": {
-            "value": "{{ resource_template.parameters.azure_sku }}"
+            "value": "Standard"
        }
    }
 }
--- a/templates/messages/schemas/Deploy-100-Schema.ps1.liquid
+++ b/templates/messages/schemas/Deploy-100-Schema.ps1.liquid
@ -9,4 +9,4 @@ Prior to running this script ensure you are authenticated against Azure and have
 Deploy-100-Schema.ps1
 #>

-& $PSScriptRoot\New-Schema.ps1 -requestBodyFile "\\?\$PSScriptRoot\requestbody.dev.json" -schemaFile "\\?\$PSScriptRoot\{{ resource_template.parameters.azure_message_schema_name }}.xsd" -resourceGroupName "{{ resource_template.parameters.azure_resource_group_name }}" -integrationAccountName "{{ resource_template.parameters.azure_integration_account_name }}"
+& $PSScriptRoot\New-Schema.ps1 -requestBodyFile "\\?\$PSScriptRoot\requestbody.{{ model.migration_target.deployment_environment | downcase }}.json" -schemaFile "\\?\$PSScriptRoot\{{ resource_template.parameters.azure_message_schema_name }}.xsd" -resourceGroupName "{{ resource_template.parameters.azure_resource_group_name }}" -integrationAccountName "{{ resource_template.parameters.azure_integration_account_name }}"
--- a/templates/messages/transforms/Deploy-120-Map.ps1.liquid
+++ b/templates/messages/transforms/Deploy-120-Map.ps1.liquid
@ -9,4 +9,4 @@ Prior to running this script ensure you are authenticated against Azure and have
 Deploy-120-Map.ps1
 #>

-& $PSScriptRoot\New-Map.ps1 -requestBodyFile "\\?\$PSScriptRoot\requestbody.dev.json" -mapFile "\\?\$PSScriptRoot\{{ resource_template.parameters.azure_message_map_name }}.xslt" -resourceGroupName "{{ resource_template.parameters.azure_resource_group_name }}" -integrationAccountName "{{ resource_template.parameters.azure_integration_account_name }}"
+& $PSScriptRoot\New-Map.ps1 -requestBodyFile "\\?\$PSScriptRoot\requestbody.{{ model.migration_target.deployment_environment | downcase }}.json" -mapFile "\\?\$PSScriptRoot\{{ resource_template.parameters.azure_message_map_name }}.xslt" -resourceGroupName "{{ resource_template.parameters.azure_resource_group_name }}" -integrationAccountName "{{ resource_template.parameters.azure_integration_account_name }}"