fixed hub name env variable name

scale-tone · Jan 18, 2020 · 86bd727 · 86bd727
1 parent 5b7e527
commit 86bd727
Show file tree

Hide file tree

Showing 17 changed files with 21 additions and 20 deletions.
diff --git a/durablefunctionsmonitor-vscodeext/src/BackendProcess.ts b/durablefunctionsmonitor-vscodeext/src/BackendProcess.ts
@@ -203,7 +203,7 @@ export class BackendProcess {
 
         const env: any = {
             'AzureWebJobsStorage': connSettings.storageConnString,
-            'DfmHubName': connSettings.hubName
+            'DFM_HUB_NAME': connSettings.hubName
         };
 
         env[SharedConstants.NonceEnvironmentVariableName] = this._backendCommunicationNonce;

diff --git a/durablefunctionsmonitor.dotnetbackend/Common/Globals.cs b/durablefunctionsmonitor.dotnetbackend/Common/Globals.cs
@@ -11,11 +11,12 @@ namespace DurableFunctionsMonitor.DotNetBackend
 {
     public static class EnvVariableNames
     {
-        public const string DfmHubName = "DfmHubName";
         public const string AzureWebJobsStorage = "AzureWebJobsStorage";
         public const string WEBSITE_SITE_NAME = "WEBSITE_SITE_NAME";
         public const string WEBSITE_AUTH_CLIENT_ID = "WEBSITE_AUTH_CLIENT_ID";
         public const string WEBSITE_AUTH_OPENID_ISSUER = "WEBSITE_AUTH_OPENID_ISSUER";
+        public const string DFM_ALLOWED_USER_NAMES = "DFM_ALLOWED_USER_NAMES";
+        public const string DFM_HUB_NAME = "DFM_HUB_NAME";
     }
 
     public static class Globals
@@ -49,12 +50,12 @@ public static void ValidateIdentity(ClaimsPrincipal principal, IHeaderDictionary
                 throw new UnauthorizedAccessException("Looks like you are hosting the tool in Azure, but 'WEBSITE_SITE_NAME' environment variable is missing. Check your App Service configuration.");
             }
 
-            string allowedUserNames = Environment.GetEnvironmentVariable("DFM_ALLOWED_USER_NAMES");
+            string allowedUserNames = Environment.GetEnvironmentVariable(EnvVariableNames.DFM_ALLOWED_USER_NAMES);
             if(!string.IsNullOrEmpty(allowedUserNames))
             {
                 if(!allowedUserNames.Split(',').Contains(userNameClaim.Value))
                 {
-                    throw new UnauthorizedAccessException($"User {userNameClaim.Value} is not mentioned in DFM_ALLOWED_USER_NAMES config setting. Call is rejected");
+                    throw new UnauthorizedAccessException($"User {userNameClaim.Value} is not mentioned in {EnvVariableNames.DFM_ALLOWED_USER_NAMES} config setting. Call is rejected");
                 }
             }
         }

diff --git a/durablefunctionsmonitor.dotnetbackend/Functions/About.cs b/durablefunctionsmonitor.dotnetbackend/Functions/About.cs
@@ -16,7 +16,7 @@ public static class About
         [FunctionName("about")]
         public static IActionResult Run(
             [HttpTrigger(AuthorizationLevel.Anonymous, "get", Route = null)] HttpRequest req,
-            [DurableClient(TaskHub = "%DfmHubName%")] IDurableClient durableClient
+            [DurableClient(TaskHub = "%DFM_HUB_NAME%")] IDurableClient durableClient
         )
         {
             // Checking that the call is authenticated properly

diff --git a/durablefunctionsmonitor.dotnetbackend/Functions/EasyAuthConfig.cs b/durablefunctionsmonitor.dotnetbackend/Functions/EasyAuthConfig.cs
@@ -17,10 +17,10 @@ public static class EasyAuthConfig
         )
         {
             // Checking if hub name is specified
-            string hubName = Environment.GetEnvironmentVariable(EnvVariableNames.DfmHubName);
+            string hubName = Environment.GetEnvironmentVariable(EnvVariableNames.DFM_HUB_NAME);
             if(string.IsNullOrEmpty(hubName))
             {
-                return new ObjectResult($"You need to explicitly specify the hub name via '{EnvVariableNames.DfmHubName}' application setting.")
+                return new ObjectResult($"You need to explicitly specify the hub name via '{EnvVariableNames.DFM_HUB_NAME}' application setting.")
                 {
                     StatusCode = 500
                 };

diff --git a/durablefunctionsmonitor.dotnetbackend/Functions/ManageConnection.cs b/durablefunctionsmonitor.dotnetbackend/Functions/ManageConnection.cs
@@ -42,7 +42,7 @@ public static class ManageConnection
                 // No need for your accountKey to ever leave the server side
                 connectionString = AccountKeyRegex.Replace(connectionString, "AccountKey=*****");
 
-                string hubName = Environment.GetEnvironmentVariable(EnvVariableNames.DfmHubName);
+                string hubName = Environment.GetEnvironmentVariable(EnvVariableNames.DFM_HUB_NAME);
 
                 return new JsonResult(new { 
                     connectionString,
@@ -61,7 +61,7 @@ public static class ManageConnection
                 dynamic localSettings = JObject.Parse(await File.ReadAllTextAsync(localSettingsFileName));
 
                 localSettings.Merge(JObject.Parse("{Values: {}}"));
-                localSettings.Values.DfmHubName = hubName;
+                localSettings.Values.DFM_HUB_NAME = hubName;
                 if (!string.IsNullOrEmpty(connectionString))
                 {
                     localSettings.Values.AzureWebJobsStorage = connectionString;

diff --git a/durablefunctionsmonitor.dotnetbackend/Functions/Orchestration.cs b/durablefunctionsmonitor.dotnetbackend/Functions/Orchestration.cs
@@ -26,7 +26,7 @@ public static class Orchestration
             [HttpTrigger(AuthorizationLevel.Anonymous, "get", "post", Route = "orchestrations('{instanceId}')/{action?}")] HttpRequest req,
             string instanceId,
             string action,
-            [DurableClient(TaskHub = "%DfmHubName%")] IDurableClient durableClient)
+            [DurableClient(TaskHub = "%DFM_HUB_NAME%")] IDurableClient durableClient)
         {
             // Checking that the call is authenticated properly
             try

diff --git a/durablefunctionsmonitor.dotnetbackend/Functions/Orchestrations.cs b/durablefunctionsmonitor.dotnetbackend/Functions/Orchestrations.cs
@@ -22,7 +22,7 @@ public static class Orchestrations
         [FunctionName("orchestrations")]
         public static async Task<IActionResult> Run(
             [HttpTrigger(AuthorizationLevel.Anonymous, "get", Route = null)] HttpRequest req,
-            [DurableClient(TaskHub = "%DfmHubName%")] IDurableClient durableClient,
+            [DurableClient(TaskHub = "%DFM_HUB_NAME%")] IDurableClient durableClient,
             ILogger log)
         {
             // Checking that the call is authenticated properly

diff --git a/durablefunctionsmonitor.dotnetbackend/Functions/PurgeHistory.cs b/durablefunctionsmonitor.dotnetbackend/Functions/PurgeHistory.cs
@@ -25,7 +25,7 @@ class PurgeHistoryRequest
         [FunctionName("purge-history")]
         public static async Task<IActionResult> Run(
             [HttpTrigger(AuthorizationLevel.Anonymous, "post", Route = null)] HttpRequest req,
-            [DurableClient(TaskHub = "%DfmHubName%")] IDurableClient durableClient)
+            [DurableClient(TaskHub = "%DFM_HUB_NAME%")] IDurableClient durableClient)
         {
             // Checking that the call is authenticated properly
             try

diff --git a/durablefunctionsmonitor.dotnetbackend/host.json b/durablefunctionsmonitor.dotnetbackend/host.json
@@ -2,7 +2,7 @@
     "version": "2.0",
     "extensions": {
         "durableTask": {
-            "hubName": "%DfmHubName%"
+            "hubName": "%DFM_HUB_NAME%"
         }
     }
 }
diff --git a/durablefunctionsmonitor.dotnetbackend/setup-and-run.js b/durablefunctionsmonitor.dotnetbackend/setup-and-run.js
@@ -44,7 +44,7 @@ readline.question(`Your Azure Storage Connection String: `, (connectionString) =
             IsEncrypted: false,
             Values: {
                 AzureWebJobsStorage: connectionString,
-                DfmHubName: hubName,
+                DFM_HUB_NAME: hubName,
                 FUNCTIONS_WORKER_RUNTIME: "dotnet"
             },
             Host: {

diff --git a/durablefunctionsmonitor.dotnetbackend/wwwroot/index.html b/durablefunctionsmonitor.dotnetbackend/wwwroot/index.html
@@ -1 +1 @@
-<!doctype html><html lang="en"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no"><meta name="theme-color" content="#000000"><link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:300,400,500,700&display=swap"/><link rel="manifest" href="/api/monitor/manifest.json"><link rel="shortcut icon" href="/api/monitor/favicon.png"><title>Durable Functions Monitor</title><link href="/api/monitor/static/css/2.c6250e3a.chunk.css" rel="stylesheet"><link href="/api/monitor/static/css/main.8d90dfff.chunk.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><script>var OrchestrationIdFromVsCode=""</script><div id="root"></div><script>!function(l){function e(e){for(var r,t,n=e[0],o=e[1],u=e[2],i=0,a=[];i<n.length;i++)t=n[i],Object.prototype.hasOwnProperty.call(c,t)&&c[t]&&a.push(c[t][0]),c[t]=0;for(r in o)Object.prototype.hasOwnProperty.call(o,r)&&(l[r]=o[r]);for(s&&s(e);a.length;)a.shift()();return p.push.apply(p,u||[]),f()}function f(){for(var e,r=0;r<p.length;r++){for(var t=p[r],n=!0,o=1;o<t.length;o++){var u=t[o];0!==c[u]&&(n=!1)}n&&(p.splice(r--,1),e=i(i.s=t[0]))}return e}var t={},c={1:0},p=[];function i(e){if(t[e])return t[e].exports;var r=t[e]={i:e,l:!1,exports:{}};return l[e].call(r.exports,r,r.exports,i),r.l=!0,r.exports}i.m=l,i.c=t,i.d=function(e,r,t){i.o(e,r)||Object.defineProperty(e,r,{enumerable:!0,get:t})},i.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},i.t=function(r,e){if(1&e&&(r=i(r)),8&e)return r;if(4&e&&"object"==typeof r&&r&&r.__esModule)return r;var t=Object.create(null);if(i.r(t),Object.defineProperty(t,"default",{enumerable:!0,value:r}),2&e&&"string"!=typeof r)for(var n in r)i.d(t,n,function(e){return r[e]}.bind(null,n));return t},i.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return i.d(r,"a",r),r},i.o=function(e,r){return Object.prototype.hasOwnProperty.call(e,r)},i.p="/api/monitor/";var r=this["webpackJsonpdurablefunctionsmonitor.react"]=this["webpackJsonpdurablefunctionsmonitor.react"]||[],n=r.push.bind(r);r.push=e,r=r.slice();for(var o=0;o<r.length;o++)e(r[o]);var s=n;f()}([])</script><script src="/api/monitor/static/js/2.022eef16.chunk.js"></script><script src="/api/monitor/static/js/main.af7a0849.chunk.js"></script></body></html>
+<!doctype html><html lang="en"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no"><meta name="theme-color" content="#000000"><link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:300,400,500,700&display=swap"/><link rel="manifest" href="/api/monitor/manifest.json"><link rel="shortcut icon" href="/api/monitor/favicon.png"><title>Durable Functions Monitor</title><link href="/api/monitor/static/css/2.c6250e3a.chunk.css" rel="stylesheet"><link href="/api/monitor/static/css/main.8d90dfff.chunk.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><script>var OrchestrationIdFromVsCode=""</script><div id="root"></div><script>!function(l){function e(e){for(var r,t,n=e[0],o=e[1],u=e[2],i=0,a=[];i<n.length;i++)t=n[i],Object.prototype.hasOwnProperty.call(c,t)&&c[t]&&a.push(c[t][0]),c[t]=0;for(r in o)Object.prototype.hasOwnProperty.call(o,r)&&(l[r]=o[r]);for(s&&s(e);a.length;)a.shift()();return p.push.apply(p,u||[]),f()}function f(){for(var e,r=0;r<p.length;r++){for(var t=p[r],n=!0,o=1;o<t.length;o++){var u=t[o];0!==c[u]&&(n=!1)}n&&(p.splice(r--,1),e=i(i.s=t[0]))}return e}var t={},c={1:0},p=[];function i(e){if(t[e])return t[e].exports;var r=t[e]={i:e,l:!1,exports:{}};return l[e].call(r.exports,r,r.exports,i),r.l=!0,r.exports}i.m=l,i.c=t,i.d=function(e,r,t){i.o(e,r)||Object.defineProperty(e,r,{enumerable:!0,get:t})},i.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},i.t=function(r,e){if(1&e&&(r=i(r)),8&e)return r;if(4&e&&"object"==typeof r&&r&&r.__esModule)return r;var t=Object.create(null);if(i.r(t),Object.defineProperty(t,"default",{enumerable:!0,value:r}),2&e&&"string"!=typeof r)for(var n in r)i.d(t,n,function(e){return r[e]}.bind(null,n));return t},i.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return i.d(r,"a",r),r},i.o=function(e,r){return Object.prototype.hasOwnProperty.call(e,r)},i.p="/api/monitor/";var r=this["webpackJsonpdurablefunctionsmonitor.react"]=this["webpackJsonpdurablefunctionsmonitor.react"]||[],n=r.push.bind(r);r.push=e,r=r.slice();for(var o=0;o<r.length;o++)e(r[o]);var s=n;f()}([])</script><script src="/api/monitor/static/js/2.022eef16.chunk.js"></script><script src="/api/monitor/static/js/main.e4b641d1.chunk.js"></script></body></html>
diff --git a/durablefunctionsmonitor.dotnetbackend/wwwroot/service-worker.js b/durablefunctionsmonitor.dotnetbackend/wwwroot/service-worker.js
@@ -14,7 +14,7 @@
 importScripts("https://storage.googleapis.com/workbox-cdn/releases/4.3.1/workbox-sw.js");
 
 importScripts(
-  "/api/monitor/precache-manifest.ddd80915536dc762fd46d91d9f10bd44.js"
+  "/api/monitor/precache-manifest.bd6fa2fa783beb1ab05d493c125a1784.js"
 );
 
 self.addEventListener('message', (event) => {

diff --git a/durablefunctionsmonitor.dotnetbackend/wwwroot/static/js/main.af7a0849.chunk.js b/durablefunctionsmonitor.dotnetbackend/wwwroot/static/js/main.af7a0849.chunk.js
diff --git a/durablefunctionsmonitor.dotnetbackend/wwwroot/static/js/main.af7a0849.chunk.js.map b/durablefunctionsmonitor.dotnetbackend/wwwroot/static/js/main.af7a0849.chunk.js.map
diff --git a/durablefunctionsmonitor.dotnetbackend/wwwroot/static/js/main.e4b641d1.chunk.js b/durablefunctionsmonitor.dotnetbackend/wwwroot/static/js/main.e4b641d1.chunk.js
diff --git a/durablefunctionsmonitor.dotnetbackend/wwwroot/static/js/main.e4b641d1.chunk.js.map b/durablefunctionsmonitor.dotnetbackend/wwwroot/static/js/main.e4b641d1.chunk.js.map
diff --git a/durablefunctionsmonitor.react/src/components/MainMenu.tsx b/durablefunctionsmonitor.react/src/components/MainMenu.tsx
@@ -54,7 +54,7 @@ export class MainMenu extends React.Component<{ state: MainMenuState }> {
                         <DialogContentText>
                             {
                                 state.isReadonly ?
-                                    "Change the below values via your application settings ('DfmHubName' and 'AzureWebJobsStorage' respectively" :
+                                    "Change the below values via your application settings ('DFM_HUB_NAME' and 'AzureWebJobsStorage' respectively" :
                                     "The below values will be saved to local.settings.json file."
                             }
                         </DialogContentText>