Merge pull request #16 from IATI/fix/validator-services-name

update validator services backend and parameterise

service/apim-iati-dev-apis.template.json

@@ -942,7 +942,7 @@
     },
     {
       "properties": {
-        "description": "Import from \"dev-func-validator-services\" Function App",
+        "description": "Validator Services Routes",
         "authenticationSettings": {
           "subscriptionKeyRequired": false
         },

service/apim-iati-dev-backends.template.json

@@ -6,48 +6,52 @@
       "type": "string"
     },
     "Environment": {
-      "type": "string"    
+      "type": "string"
     },
     "SubscriptionId": {
-      "type": "string"    
+      "type": "string"
     }
   },
+  "variables": {
+    "ValidatorServicesNameWithEnv": "[concat('func-validator-services-', parameters('Environment'))]",
+    "ValidatorAPINameWithEnv": "[concat('func-iativalidator-', parameters('Environment'))]"
+  },
   "resources": [
     {
       "properties": {
-        "description": "[concat(parameters('Environment'), '-func-validator-services')]",
-        "resourceId": "[concat('https://management.azure.com/subscriptions/', parameters('SubscriptionId'), '/resourceGroups/rg-validator-services-', parameters('Environment'), '/providers/Microsoft.Web/sites/' , parameters('Environment'), '-func-validator-services')]",
+        "description": "[variables('ValidatorServicesNameWithEnv')]",
+        "resourceId": "[concat('https://management.azure.com/subscriptions/', parameters('SubscriptionId'), '/resourceGroups/rg-validator-services-', parameters('Environment'), '/providers/Microsoft.Web/sites/' , variables('ValidatorServicesNameWithEnv'))]",
         "credentials": {
           "header": {
             "x-functions-key": [
               "[concat('{{', parameters('Environment'), '-func-validator-services-key}}')]"
             ]
           }
         },
-        "url": "[concat( 'https://', parameters('Environment'), '-func-validator-services.azurewebsites.net/api')]",
+        "url": "[concat( 'https://', variables('ValidatorServicesNameWithEnv'), '.azurewebsites.net/api')]",
         "protocol": "http"
       },
-      "name": "[concat(parameters('ApimServiceName'), '/', parameters('Environment'), '-func-validator-services')]",
+      "name": "[concat(parameters('ApimServiceName'), '/', variables('ValidatorServicesNameWithEnv'))]",
       "type": "Microsoft.ApiManagement/service/backends",
       "apiVersion": "2020-12-01"
     },
     {
       "properties": {
-        "description": "[concat('func-iativalidator-', parameters('Environment'))]",
-        "resourceId": "[concat('https://management.azure.com/subscriptions/', parameters('SubscriptionId'), '/resourceGroups/rg-iativalidator-', parameters('Environment'),   '/providers/Microsoft.Web/sites/func-iativalidator-', parameters('Environment'))]",
+        "description": "[variables('ValidatorAPINameWithEnv')]",
+        "resourceId": "[concat('https://management.azure.com/subscriptions/', parameters('SubscriptionId'), '/resourceGroups/rg-iativalidator-', parameters('Environment'),   '/providers/Microsoft.Web/sites/', variables('ValidatorAPINameWithEnv'))]",
         "credentials": {
           "header": {
             "x-functions-key": [
-              "[concat('{{func-iativalidator-', parameters('Environment'), '-key}}')]"
+              "[concat('{{',variables('ValidatorAPINameWithEnv'),'-key}}')]"
             ]
           }
         },
-        "url": "[concat( 'https://func-iativalidator-', parameters('Environment'), '.azurewebsites.net/api')]",
+        "url": "[concat( 'https://', variables('ValidatorAPINameWithEnv'), '.azurewebsites.net/api')]",
         "protocol": "http"
       },
-      "name": "[concat(parameters('ApimServiceName'), '/func-iativalidator-', parameters('Environment'))]",
+      "name": "[concat(parameters('ApimServiceName'), '/', variables('ValidatorAPINameWithEnv'))]",
       "type": "Microsoft.ApiManagement/service/backends",
       "apiVersion": "2020-12-01"
     }
   ]
-}
+}

service/policies/dev-func-validator-services-get-pub-get-report-operationPolicy.xml

@@ -1,7 +1,7 @@
 <policies>
 	<inbound>
 		<base />
-		<set-backend-service id="apim-generated-policy" backend-id="{{Environment}}-func-validator-services" />
+		<set-backend-service id="apim-generated-policy" backend-id="func-validator-services-{{Environment}}" />
 	</inbound>
 	<backend>
 		<base />

service/policies/iati-validator-v2-get-pub-get-report-operationPolicy.xml

@@ -1,7 +1,7 @@
 <policies>
 	<inbound>
 		<base />
-		<set-backend-service id="apim-generated-policy" backend-id="{{Environment}}-func-validator-services" />
+		<set-backend-service id="apim-generated-policy" backend-id="func-validator-services-{{Environment}}" />
 		<rewrite-uri template="/pub/validation/existing" />
 	</inbound>
 	<backend>

service/policies/validator-services-private-610a46b0342160c523b5a90f-operationPolicy.xml

@@ -1,19 +1,19 @@
-<!--
-    IMPORTANT:
-    - Policy elements can appear only within the <inbound>, <outbound>, <backend> section elements.
-    - To apply a policy to the incoming request (before it is forwarded to the backend service), place a corresponding policy element within the <inbound> section element.
-    - To apply a policy to the outgoing response (before it is sent back to the caller), place a corresponding policy element within the <outbound> section element.
-    - To add a policy, place the cursor at the desired insertion point and select a policy from the sidebar.
-    - To remove a policy, delete the corresponding policy statement from the policy document.
-    - Position the <base> element within a section element to inherit all policies from the corresponding section element in the enclosing scope.
-    - Remove the <base> element to prevent inheriting policies from the corresponding section element in the enclosing scope.
-    - Policies are applied in the order of their appearance, from the top down.
-    - Comments within policy elements are not supported and may disappear. Place your comments between policy elements or at a higher level scope.
+<!--
+    IMPORTANT:
+    - Policy elements can appear only within the <inbound>, <outbound>, <backend> section elements.
+    - To apply a policy to the incoming request (before it is forwarded to the backend service), place a corresponding policy element within the <inbound> section element.
+    - To apply a policy to the outgoing response (before it is sent back to the caller), place a corresponding policy element within the <outbound> section element.
+    - To add a policy, place the cursor at the desired insertion point and select a policy from the sidebar.
+    - To remove a policy, delete the corresponding policy statement from the policy document.
+    - Position the <base> element within a section element to inherit all policies from the corresponding section element in the enclosing scope.
+    - Remove the <base> element to prevent inheriting policies from the corresponding section element in the enclosing scope.
+    - Policies are applied in the order of their appearance, from the top down.
+    - Comments within policy elements are not supported and may disappear. Place your comments between policy elements or at a higher level scope.
 -->
 <policies>
 	<inbound>
 		<base />
-		<set-backend-service id="apim-generated-policy" backend-id="{{Environment}}-func-validator-services" />
+		<set-backend-service id="apim-generated-policy" backend-id="func-validator-services-{{Environment}}" />
 	</inbound>
 	<backend>
 		<base />

service/policies/validator-services-private-6114e44dd2a66d17c80f78ce-operationPolicy.xml

@@ -1,19 +1,19 @@
-<!--
-    IMPORTANT:
-    - Policy elements can appear only within the <inbound>, <outbound>, <backend> section elements.
-    - To apply a policy to the incoming request (before it is forwarded to the backend service), place a corresponding policy element within the <inbound> section element.
-    - To apply a policy to the outgoing response (before it is sent back to the caller), place a corresponding policy element within the <outbound> section element.
-    - To add a policy, place the cursor at the desired insertion point and select a policy from the sidebar.
-    - To remove a policy, delete the corresponding policy statement from the policy document.
-    - Position the <base> element within a section element to inherit all policies from the corresponding section element in the enclosing scope.
-    - Remove the <base> element to prevent inheriting policies from the corresponding section element in the enclosing scope.
-    - Policies are applied in the order of their appearance, from the top down.
-    - Comments within policy elements are not supported and may disappear. Place your comments between policy elements or at a higher level scope.
+<!--
+    IMPORTANT:
+    - Policy elements can appear only within the <inbound>, <outbound>, <backend> section elements.
+    - To apply a policy to the incoming request (before it is forwarded to the backend service), place a corresponding policy element within the <inbound> section element.
+    - To apply a policy to the outgoing response (before it is sent back to the caller), place a corresponding policy element within the <outbound> section element.
+    - To add a policy, place the cursor at the desired insertion point and select a policy from the sidebar.
+    - To remove a policy, delete the corresponding policy statement from the policy document.
+    - Position the <base> element within a section element to inherit all policies from the corresponding section element in the enclosing scope.
+    - Remove the <base> element to prevent inheriting policies from the corresponding section element in the enclosing scope.
+    - Policies are applied in the order of their appearance, from the top down.
+    - Comments within policy elements are not supported and may disappear. Place your comments between policy elements or at a higher level scope.
 -->
 <policies>
 	<inbound>
 		<base />
-		<set-backend-service id="apim-generated-policy" backend-id="{{Environment}}-func-validator-services" />
+		<set-backend-service id="apim-generated-policy" backend-id="func-validator-services-{{Environment}}" />
 		<cors>
 			<allowed-origins>
 				<origin>*</origin>

service/policies/validator-services-private-get-pub-get-report-operationPolicy.xml

@@ -1,7 +1,7 @@
 <policies>
 	<inbound>
 		<base />
-		<set-backend-service id="apim-generated-policy" backend-id="{{Environment}}-func-validator-services" />
+		<set-backend-service id="apim-generated-policy" backend-id="func-validator-services-{{Environment}}" />
 	</inbound>
 	<backend>
 		<base />

service/policies/validator-services-private-get-pub-get-version-operationPolicy.xml

@@ -1,7 +1,7 @@
 <policies>
 	<inbound>
 		<base />
-		<set-backend-service id="apim-generated-policy" backend-id="{{Environment}}-func-validator-services" />
+		<set-backend-service id="apim-generated-policy" backend-id="func-validator-services-{{Environment}}" />
 	</inbound>
 	<backend>
 		<base />

service/policies/validator-services-private-get-pvt-get-guidance-links-operationPolicy.xml

@@ -1,7 +1,7 @@
 <policies>
 	<inbound>
 		<base />
-		<set-backend-service id="apim-generated-policy" backend-id="{{Environment}}-func-validator-services" />
+		<set-backend-service id="apim-generated-policy" backend-id="func-validator-services-{{Environment}}" />
 		<cache-lookup vary-by-developer="false" vary-by-developer-groups="false" downstream-caching-type="none" />
 	</inbound>
 	<backend>

service/policies/validator-services-private-get-pvt-get-publisher-documents-operationPolicy.xml

@@ -1,7 +1,7 @@
 <policies>
 	<inbound>
 		<base />
-		<set-backend-service id="apim-generated-policy" backend-id="{{Environment}}-func-validator-services" />
+		<set-backend-service id="apim-generated-policy" backend-id="func-validator-services-{{Environment}}" />
 	</inbound>
 	<backend>
 		<base />

service/policies/validator-services-private-get-pvt-get-publishers-operationPolicy.xml

@@ -1,7 +1,7 @@
 <policies>
 	<inbound>
 		<base />
-		<set-backend-service id="apim-generated-policy" backend-id="{{Environment}}-func-validator-services" />
+		<set-backend-service id="apim-generated-policy" backend-id="func-validator-services-{{Environment}}" />
 		<cache-lookup vary-by-developer="false" vary-by-developer-groups="false" downstream-caching-type="none" />
 	</inbound>
 	<backend>

service/policies/validator-services-private-get-pvt-get-single-document-operationPolicy.xml

@@ -1,19 +1,19 @@
-<!--
-    IMPORTANT:
-    - Policy elements can appear only within the <inbound>, <outbound>, <backend> section elements.
-    - To apply a policy to the incoming request (before it is forwarded to the backend service), place a corresponding policy element within the <inbound> section element.
-    - To apply a policy to the outgoing response (before it is sent back to the caller), place a corresponding policy element within the <outbound> section element.
-    - To add a policy, place the cursor at the desired insertion point and select a policy from the sidebar.
-    - To remove a policy, delete the corresponding policy statement from the policy document.
-    - Position the <base> element within a section element to inherit all policies from the corresponding section element in the enclosing scope.
-    - Remove the <base> element to prevent inheriting policies from the corresponding section element in the enclosing scope.
-    - Policies are applied in the order of their appearance, from the top down.
-    - Comments within policy elements are not supported and may disappear. Place your comments between policy elements or at a higher level scope.
+<!--
+    IMPORTANT:
+    - Policy elements can appear only within the <inbound>, <outbound>, <backend> section elements.
+    - To apply a policy to the incoming request (before it is forwarded to the backend service), place a corresponding policy element within the <inbound> section element.
+    - To apply a policy to the outgoing response (before it is sent back to the caller), place a corresponding policy element within the <outbound> section element.
+    - To add a policy, place the cursor at the desired insertion point and select a policy from the sidebar.
+    - To remove a policy, delete the corresponding policy statement from the policy document.
+    - Position the <base> element within a section element to inherit all policies from the corresponding section element in the enclosing scope.
+    - Remove the <base> element to prevent inheriting policies from the corresponding section element in the enclosing scope.
+    - Policies are applied in the order of their appearance, from the top down.
+    - Comments within policy elements are not supported and may disappear. Place your comments between policy elements or at a higher level scope.
 -->
 <policies>
 	<inbound>
 		<base />
-		<set-backend-service id="apim-generated-policy" backend-id="{{Environment}}-func-validator-services" />
+		<set-backend-service id="apim-generated-policy" backend-id="func-validator-services-{{Environment}}" />
 	</inbound>
 	<backend>
 		<base />

service/policies/validator-services-private-get-pvt-get-single-publisher-operationPolicy.xml

@@ -1,19 +1,19 @@
-<!--
-    IMPORTANT:
-    - Policy elements can appear only within the <inbound>, <outbound>, <backend> section elements.
-    - To apply a policy to the incoming request (before it is forwarded to the backend service), place a corresponding policy element within the <inbound> section element.
-    - To apply a policy to the outgoing response (before it is sent back to the caller), place a corresponding policy element within the <outbound> section element.
-    - To add a policy, place the cursor at the desired insertion point and select a policy from the sidebar.
-    - To remove a policy, delete the corresponding policy statement from the policy document.
-    - Position the <base> element within a section element to inherit all policies from the corresponding section element in the enclosing scope.
-    - Remove the <base> element to prevent inheriting policies from the corresponding section element in the enclosing scope.
-    - Policies are applied in the order of their appearance, from the top down.
-    - Comments within policy elements are not supported and may disappear. Place your comments between policy elements or at a higher level scope.
+<!--
+    IMPORTANT:
+    - Policy elements can appear only within the <inbound>, <outbound>, <backend> section elements.
+    - To apply a policy to the incoming request (before it is forwarded to the backend service), place a corresponding policy element within the <inbound> section element.
+    - To apply a policy to the outgoing response (before it is sent back to the caller), place a corresponding policy element within the <outbound> section element.
+    - To add a policy, place the cursor at the desired insertion point and select a policy from the sidebar.
+    - To remove a policy, delete the corresponding policy statement from the policy document.
+    - Position the <base> element within a section element to inherit all policies from the corresponding section element in the enclosing scope.
+    - Remove the <base> element to prevent inheriting policies from the corresponding section element in the enclosing scope.
+    - Policies are applied in the order of their appearance, from the top down.
+    - Comments within policy elements are not supported and may disappear. Place your comments between policy elements or at a higher level scope.
 -->
 <policies>
 	<inbound>
 		<base />
-		<set-backend-service id="apim-generated-policy" backend-id="{{Environment}}-func-validator-services" />
+		<set-backend-service id="apim-generated-policy" backend-id="func-validator-services-{{Environment}}" />
 	</inbound>
 	<backend>
 		<base />

service/policies/validator-services-private-pvt-post-adhoc-file-operationPolicy.xml

@@ -1,19 +1,19 @@
-<!--
-    IMPORTANT:
-    - Policy elements can appear only within the <inbound>, <outbound>, <backend> section elements.
-    - To apply a policy to the incoming request (before it is forwarded to the backend service), place a corresponding policy element within the <inbound> section element.
-    - To apply a policy to the outgoing response (before it is sent back to the caller), place a corresponding policy element within the <outbound> section element.
-    - To add a policy, place the cursor at the desired insertion point and select a policy from the sidebar.
-    - To remove a policy, delete the corresponding policy statement from the policy document.
-    - Position the <base> element within a section element to inherit all policies from the corresponding section element in the enclosing scope.
-    - Remove the <base> element to prevent inheriting policies from the corresponding section element in the enclosing scope.
-    - Policies are applied in the order of their appearance, from the top down.
-    - Comments within policy elements are not supported and may disappear. Place your comments between policy elements or at a higher level scope.
+<!--
+    IMPORTANT:
+    - Policy elements can appear only within the <inbound>, <outbound>, <backend> section elements.
+    - To apply a policy to the incoming request (before it is forwarded to the backend service), place a corresponding policy element within the <inbound> section element.
+    - To apply a policy to the outgoing response (before it is sent back to the caller), place a corresponding policy element within the <outbound> section element.
+    - To add a policy, place the cursor at the desired insertion point and select a policy from the sidebar.
+    - To remove a policy, delete the corresponding policy statement from the policy document.
+    - Position the <base> element within a section element to inherit all policies from the corresponding section element in the enclosing scope.
+    - Remove the <base> element to prevent inheriting policies from the corresponding section element in the enclosing scope.
+    - Policies are applied in the order of their appearance, from the top down.
+    - Comments within policy elements are not supported and may disappear. Place your comments between policy elements or at a higher level scope.
 -->
 <policies>
 	<inbound>
 		<base />
-		<set-backend-service id="apim-generated-policy" backend-id="{{Environment}}-func-validator-services" />
+		<set-backend-service id="apim-generated-policy" backend-id="func-validator-services-{{Environment}}" />
 		<cors>
 			<allowed-origins>
 				<origin>*</origin>