From 0e0d6db602e62a497dde688932f53a3c8b3a3453 Mon Sep 17 00:00:00 2001
From: Chandni Patel <chandnipatel@microsoft.com>
Date: Wed, 29 May 2024 11:10:17 -0500
Subject: [PATCH] quick fixes

---
 src/appservice-rest/Kudu/azure-app-kudu-service.ts |  2 +-
 src/publishers/websiteRunFromPackageDeploy.ts      |  2 +-
 src/utils/funcignore.ts                            |  3 ++-
 tests/e2e/node20/package-lock.json                 | 13 -------------
 tsconfig.base.json                                 |  2 --
 5 files changed, 4 insertions(+), 18 deletions(-)
 delete mode 100644 tests/e2e/node20/package-lock.json

diff --git a/src/appservice-rest/Kudu/azure-app-kudu-service.ts b/src/appservice-rest/Kudu/azure-app-kudu-service.ts
index cf01afe5c..9aa5c9e0c 100644
--- a/src/appservice-rest/Kudu/azure-app-kudu-service.ts
+++ b/src/appservice-rest/Kudu/azure-app-kudu-service.ts
@@ -20,7 +20,7 @@ export class Kudu {
 
     constructor(scmUri: string, username: string, password: string, accessToken?: string) {
         if (accessToken === undefined) {
-            var base64EncodedCredential = (new Buffer(username + ':' + password).toString('base64'));
+            var base64EncodedCredential = (Buffer.from(username + ':' + password).toString('base64'));
             this._client = new KuduServiceClient(scmUri, "Basic " + base64EncodedCredential);
         } else {
             this._client = new KuduServiceClient(scmUri, "Bearer " + accessToken);
diff --git a/src/publishers/websiteRunFromPackageDeploy.ts b/src/publishers/websiteRunFromPackageDeploy.ts
index ec9b98271..e02b4e507 100644
--- a/src/publishers/websiteRunFromPackageDeploy.ts
+++ b/src/publishers/websiteRunFromPackageDeploy.ts
@@ -50,7 +50,7 @@ export class WebsiteRunFromPackageDeploy {
 
     private static createBlobName(): string {
         const now: Date = new Date();
-        const time: string = `${now.getUTCFullYear()}${now.getUTCMonth() + 1}${now.getUTCDate()}${now.getUTCHours()}${now.getUTCMinutes()}${now.getUTCSeconds()}`;
+        const time: string = `${now.getUTCFullYear()}${now.getUTCMonth() + 1}${now.getUTCDate()}${now.getUTCHours()}${now.getUTCMinutes()}${now.getUTCSeconds()}${now.getUTCMilliseconds()}`;
         return `${ConfigurationConstant.BlobNamePrefix}_${time}.zip`;
     }
 
diff --git a/src/utils/funcignore.ts b/src/utils/funcignore.ts
index d1a8ea48f..4fdb33a4c 100644
--- a/src/utils/funcignore.ts
+++ b/src/utils/funcignore.ts
@@ -4,6 +4,7 @@ import * as glob from 'glob';
 import * as rimraf from 'rimraf';
 import * as ignore from 'ignore';
 import { Logger } from './logger';
+import path = require('path');
 
 export class FuncIgnore {
     public static doesFuncignoreExist(working_dir: string): boolean {
@@ -32,7 +33,7 @@ export class FuncIgnore {
         const sanitizedWorkingDir: string = FuncIgnore.sanitizeWorkingDir(working_dir);
         const allFiles: string[] = 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);
diff --git a/tests/e2e/node20/package-lock.json b/tests/e2e/node20/package-lock.json
deleted file mode 100644
index 4e102cf89..000000000
--- a/tests/e2e/node20/package-lock.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "name": "node16",
-  "version": "1.0.0",
-  "lockfileVersion": 1,
-  "requires": true,
-  "dependencies": {
-    "lodash": {
-      "version": "4.17.21",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
-      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
-    }
-  }
-}
diff --git a/tsconfig.base.json b/tsconfig.base.json
index 6097543aa..8e1bcb820 100644
--- a/tsconfig.base.json
+++ b/tsconfig.base.json
@@ -5,8 +5,6 @@
         "rootDir": "./src",
         "outDir": "./lib",
         "strict": false,
-        "strictNullChecks": false,
-        "strictPropertyInitialization": false,
         "strictFunctionTypes": true,
         "noImplicitAny" : true,
         "noUnusedParameters": true,