quick fixes

Azure · May 29, 2024 · fd80521 · fd80521
1 parent 6f56a99
commit fd80521
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/lib/appservice-rest/Kudu/azure-app-kudu-service.js b/lib/appservice-rest/Kudu/azure-app-kudu-service.js
@@ -25,7 +25,7 @@ exports.KUDU_DEPLOYMENT_CONSTANTS = {
 class Kudu {
     constructor(scmUri, username, password, accessToken) {
         if (accessToken === undefined) {
-            var base64EncodedCredential = (new Buffer(username + ':' + password).toString('base64'));
+            var base64EncodedCredential = (Buffer.from(username + ':' + password).toString('base64'));
             this._client = new KuduServiceClient_1.KuduServiceClient(scmUri, "Basic " + base64EncodedCredential);
         }
         else {

diff --git a/lib/publishers/websiteRunFromPackageDeploy.js b/lib/publishers/websiteRunFromPackageDeploy.js
@@ -56,7 +56,7 @@ class WebsiteRunFromPackageDeploy {
     }
     static createBlobName() {
         const now = new Date();
-        const time = `${now.getUTCFullYear()}${now.getUTCMonth() + 1}${now.getUTCDate()}${now.getUTCHours()}${now.getUTCMinutes()}${now.getUTCSeconds()}`;
+        const time = `${now.getUTCFullYear()}${now.getUTCMonth() + 1}${now.getUTCDate()}${now.getUTCHours()}${now.getUTCMinutes()}${now.getUTCSeconds()}${now.getUTCMilliseconds()}`;
         return `${configuration_1.ConfigurationConstant.BlobNamePrefix}_${time}.zip`;
     }
     static getBlobSasUrl(client) {

diff --git a/lib/utils/funcignore.js b/lib/utils/funcignore.js
@@ -7,6 +7,7 @@ const glob = require("glob");
 const rimraf = require("rimraf");
 const ignore = require("ignore");
 const logger_1 = require("./logger");
+const path = require("path");
 class FuncIgnore {
     static doesFuncignoreExist(working_dir) {
         const funcignorePath = (0, path_1.resolve)(working_dir, '.funcignore');
@@ -31,7 +32,7 @@ class FuncIgnore {
         const sanitizedWorkingDir = FuncIgnore.sanitizeWorkingDir(working_dir);
         const allFiles = glob.sync(`${sanitizedWorkingDir}/**/*`, { dot: true });
         allFiles.forEach(name => {
-            const filename = name.replace(`${working_dir}/`, '');
+            const filename = path.relative(working_dir, name);
             if (ignoreParser.ignores(filename)) {
                 try {
                     rimraf.sync(name);