feat(hub-501): remove change to virtual network type and add ability …

…to skip apim arm template

src/armTemplates/resources/apim.ts

@@ -68,7 +68,7 @@ export class ApimResource implements ArmResourceTemplateGenerator {
             "publisherName": "[parameters('apimPublisherName')]",
             "notificationSenderEmail": "[email protected]",
             "hostnameConfigurations": [],
-            "virtualNetworkType": "External"
+            "virtualNetworkType": "None"
           }
         }
       ]

src/models/apiManagement.ts

@@ -24,6 +24,8 @@ export interface ApiManagementConfig {
   ipFilters?: ApiIpFilterPolicy[];
   /** The API's header policies */
   checkHeaders?: ApiCheckHeaderPolicy[];
+  /** Whether or not the APIM is included in the ARM template  */
+  skipArmTemplate?: boolean;
   /** The pricing SKU for the APIM instance */
   sku?: {
     /** The SKU name, (consumption | developer | basic | standard | premium) */

src/services/armService.ts

@@ -42,7 +42,9 @@ export class ArmService extends BaseService {
     const mergedTemplate = template.getTemplate(this.config);
     let parameters = template.getParameters(this.config);
 
-    if (this.config.provider.apim) {
+    const apimProvider = this.config.provider.apim;
+
+    if (apimProvider && !(apimProvider.skipArmTemplate && apimProvider.skipArmTemplate.toString() === "true")) {
       const apimTemplate = apimResource.getTemplate();
       const apimParameters = apimResource.getParameters(this.config);
 
@@ -61,6 +63,12 @@ export class ArmService extends BaseService {
       };
     }
 
+    // add tags to all resources
+    mergedTemplate.resources = mergedTemplate.resources.map(r => ({
+      ...r,
+      tags: this.config.provider.tags,
+    }));
+
     return {
       template: mergedTemplate,
       parameters,
@@ -102,7 +110,7 @@ export class ArmService extends BaseService {
     }
 
     deployment.parameters = deployment.parameters || {};
-    
+
     for (const key of Object.keys(deployment.parameters)) {
       if (!deployment.parameters[key].value) {
         delete deployment.parameters[key];
@@ -143,7 +151,7 @@ export class ArmService extends BaseService {
   }
 
   private areDeploymentsEqual(current: ArmDeployment, previous: ArmDeployment): boolean {
-    if (!current || !previous) {
+    if (!current || !previous || !previous.template || !previous.parameters) {
       return false;
     }
     const mergedDefaultParameters = this.mergeDefaultParams(current.parameters, current.template.parameters);