move application insights loader file name to build constants

microsoft · May 1, 2019 · 912a268 · 912a268
1 parent aad2b92
commit 912a268
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 4 deletions.
diff --git a/build/build-constants.yaml b/build/build-constants.yaml
@@ -73,6 +73,15 @@
       namespace: Microsoft.Oryx.Common
     - type: go
       directory: src/startupscriptgenerator/common/consts
+- name: node-app-insights-loader
+  constants:
+    node-app-insights-loader-file-name: oryx-appinsightsloader.js
+  outputs:
+    - type: csharp
+      directory: src/BuildScriptGenerator/Node
+      namespace: Microsoft.Oryx.BuildScriptGenerator.Node
+    - type: go
+      directory: src/startupscriptgenerator/common/consts
 - name: node-versions
   constants:
     yarn-version: 1.13.0

diff --git a/src/BuildScriptGenerator/Node/NodeAppInsightsLoader.cs b/src/BuildScriptGenerator/Node/NodeAppInsightsLoader.cs
@@ -0,0 +1,9 @@
+// This file was auto-generated from 'build-constants.yaml'. Changes may be overridden.
+
+namespace Microsoft.Oryx.BuildScriptGenerator.Node
+{
+    public static class NodeAppInsightsLoader
+    {
+        public const string NodeAppInsightsLoaderFileName = "oryx-appinsightsloader.js";
+    }
+}
diff --git a/src/BuildScriptGenerator/Node/NodeConstants.cs b/src/BuildScriptGenerator/Node/NodeConstants.cs
@@ -28,7 +28,6 @@ internal static class NodeConstants
         internal const string NodeModulesTarGzFileName = "node_modules.tar.gz";
         internal const string NodeModulesFileBuildProperty = "compressedNodeModulesFile";
         internal const string NodeAppInsightsPackageName = "applicationinsights";
-        internal const string NodeAppInsightsLoaderFileName = "oryx-appinsightsloader.js";
         internal const string InjectedAppInsights = "injectedAppInsights";
     }
 }
diff --git a/src/BuildScriptGenerator/Node/NodePlatform.cs b/src/BuildScriptGenerator/Node/NodePlatform.cs
@@ -157,7 +157,7 @@ public BuildScriptSnippet GenerateBashBuildScriptSnippet(BuildScriptGeneratorCon
                 pruneDevDependencies: pruneDevDependencies,
                 appInsightsInjectCommand: appInsightsInjectCommand,
                 appInsightsPackageName: NodeConstants.NodeAppInsightsPackageName,
-                appInsightsLoaderFileName: NodeConstants.NodeAppInsightsLoaderFileName);
+                appInsightsLoaderFileName: NodeAppInsightsLoader.NodeAppInsightsLoaderFileName);
 
             string script = TemplateHelpers.Render(
                 TemplateHelpers.TemplateResource.NodeBuildSnippet,

diff --git a/src/startupscriptgenerator/common/consts/node_app_insights_loader.go b/src/startupscriptgenerator/common/consts/node_app_insights_loader.go
@@ -0,0 +1,5 @@
+// This file was auto-generated from 'build-constants.yaml'. Changes may be overridden.
+
+package consts
+
+const NodeAppInsightsLoaderFileName string = "oryx-appinsightsloader.js"
diff --git a/src/startupscriptgenerator/node/scriptgenerator.go b/src/startupscriptgenerator/node/scriptgenerator.go
@@ -11,6 +11,7 @@ import (
 	"os"
 	"path/filepath"
 	"startupscriptgenerator/common"
+	"startupscriptgenerator/common/consts"
 	"strings"
 )
 
@@ -168,10 +169,12 @@ func (gen *NodeStartupScriptGenerator) GenerateEntrypointScript() string {
 		startupCommand = common.ExtendPathForCommand(startupCommand, gen.SourcePath)
 	}
 
-	logger.LogInformation("Looking for App-Insights loader injected by Oryx and export that to NODE_OPTIONS if needed")
+	logger.LogInformation("Looking for App-Insights loader injected by Oryx and export to NODE_OPTIONS if needed")
 	scriptBuilder.WriteString("if [ -n $injectedAppInsights ]; then\n")
 	scriptBuilder.WriteString("    if [ -f ./oryx-appinsightsloader.js ]; then\n")
-	scriptBuilder.WriteString("        export NODE_OPTIONS='--require ./oryx-appinsightsloader.js '$NODE_OPTIONS\n")
+	var nodeOptions = "'--require ./" + consts.NodeAppInsightsLoaderFileName + " '$NODE_OPTIONS"
+	scriptBuilder.WriteString("        export NODE_OPTIONS=" + nodeOptions + "\n")
+	scriptBuilder.WriteString("")
 	scriptBuilder.WriteString("    fi\n")
 	scriptBuilder.WriteString("fi\n")
 	scriptBuilder.WriteString(startupCommand + "\n")