Merge branch 'main' into UDKContainerBlobUploadFix

ChangeLog.md

@@ -14,6 +14,7 @@ General:
 Blob:
 
 - Fixed issue for user delegation key when uploading a blob from a container SAS
+- Upgraded swagger spec to API version 2021-10-04.
 
 Table:
 

README.md

@@ -466,6 +466,9 @@ Azurite will refresh customized account name and key from environment variable e
 
 > Note. Use `export` keyword to set environment variable in Linux like environment, `set` in Windows.
 
+> Note. When changing storage account name, keep these rules in mind as same as [Azure Storage Account](https://learn.microsoft.com/en-us/azure/storage/common/storage-account-overview#storage-account-name):
+>  - Storage account names must be between 3 and 24 characters in length and may contain numbers and lowercase letters only.
+
 ### Customized Metadata Storage by External Database (Preview)
 
 By default, Azurite leverages [loki](https://github.com/techfort/LokiJS) as metadata database.

package.json

@@ -27,7 +27,7 @@
     "express": "^4.16.4",
     "fs-extra": "^11.1.1",
     "glob-to-regexp": "^0.4.1",
-    "jsonwebtoken": "^8.5.1",
+    "jsonwebtoken": "^9.0.0",
     "lokijs": "^1.5.6",
     "morgan": "^1.9.1",
     "multistream": "^2.1.1",
@@ -56,7 +56,7 @@
     "@types/express": "^4.16.0",
     "@types/fs-extra": "^11.0.1",
     "@types/glob-to-regexp": "^0.4.1",
-    "@types/jsonwebtoken": "^8.3.9",
+    "@types/jsonwebtoken": "^9.0.1",
     "@types/lokijs": "^1.5.2",
     "@types/mocha": "^9.0.0",
     "@types/morgan": "^1.7.35",
@@ -273,7 +273,7 @@
     "docker:publish-manifest-latest": "cross-var docker manifest push xstoreazurite.azurecr.io/public/azure-storage/azurite:latest",
     "prepare": "npm run build",
     "build": "tsc",
-    "build:autorest:debug": "autorest ./swagger/blob.md --typescript --typescript.debugger --use=E:/GitHub/XiaoningLiu/autorest.typescript.server",
+    "build:autorest:debug": "autorest ./swagger/blob.md --typescript --typescript.debugger --use=S:/GitHub/XiaoningLiu/autorest.typescript.server",
     "build:autorest:blob": "autorest ./swagger/blob.md --typescript  --use=S:/GitHub/XiaoningLiu/autorest.typescript.server",
     "build:autorest:queue": "autorest ./swagger/queue.md --typescript  --use=S:/GitHub/XiaoningLiu/autorest.typescript.server",
     "build:autorest:table": "autorest ./swagger/table.md --typescript  --use=S:/GitHub/XiaoningLiu/autorest.typescript.server",
@@ -320,4 +320,4 @@
     "url": "https://github.com/azure/azurite/issues"
   },
   "homepage": "https://github.com/azure/azurite#readme"
-}
+}

src/blob/BlobRequestListenerFactory.ts

@@ -113,8 +113,7 @@ export default class BlobRequestListenerFactory
         this.extentStore,
         logger,
         loose
-      ),
-      directoryHandler: {} as any
+      )
     };
 
     // CORS request handling, preflight request and the corresponding actual request

src/blob/generated/Context.ts

@@ -1,6 +1,6 @@
-import Operation from "./artifacts/operation";
-import IRequest from "./IRequest";
-import IResponse from "./IResponse";
+import Operation from './artifacts/operation';
+import IRequest from './IRequest';
+import IResponse from './IResponse';
 
 export interface IHandlerParameters {
   [key: string]: any;

src/blob/generated/ExpressMiddlewareFactory.ts

@@ -1,17 +1,17 @@
-import { ErrorRequestHandler, NextFunction, Request, RequestHandler, Response } from "express";
+import { ErrorRequestHandler, NextFunction, Request, RequestHandler, Response } from 'express';
 
-import Context from "./Context";
-import ExpressRequestAdapter from "./ExpressRequestAdapter";
-import ExpressResponseAdapter from "./ExpressResponseAdapter";
-import IHandlers from "./handlers/IHandlers";
-import deserializerMiddleware from "./middleware/deserializer.middleware";
-import dispatchMiddleware from "./middleware/dispatch.middleware";
-import endMiddleware from "./middleware/end.middleware";
-import errorMiddleware from "./middleware/error.middleware";
-import HandlerMiddlewareFactory from "./middleware/HandlerMiddlewareFactory";
-import serializerMiddleware from "./middleware/serializer.middleware";
-import MiddlewareFactory from "./MiddlewareFactory";
-import ILogger from "./utils/ILogger";
+import Context from './Context';
+import ExpressRequestAdapter from './ExpressRequestAdapter';
+import ExpressResponseAdapter from './ExpressResponseAdapter';
+import IHandlers from './handlers/IHandlers';
+import deserializerMiddleware from './middleware/deserializer.middleware';
+import dispatchMiddleware from './middleware/dispatch.middleware';
+import endMiddleware from './middleware/end.middleware';
+import errorMiddleware from './middleware/error.middleware';
+import HandlerMiddlewareFactory from './middleware/HandlerMiddlewareFactory';
+import serializerMiddleware from './middleware/serializer.middleware';
+import MiddlewareFactory from './MiddlewareFactory';
+import ILogger from './utils/ILogger';
 
 /**
  * ExpressMiddlewareFactory will generate Express compatible middleware according to swagger definitions.

src/blob/generated/ExpressRequestAdapter.ts

@@ -1,6 +1,6 @@
-import { Request } from "express";
+import { Request } from 'express';
 
-import IRequest, { HttpMethod } from "./IRequest";
+import IRequest, { HttpMethod } from './IRequest';
 
 export default class ExpressRequestAdapter implements IRequest {
   public constructor(private readonly req: Request) {}

src/blob/generated/ExpressResponseAdapter.ts

@@ -1,7 +1,7 @@
-import { Response } from "express";
-import { OutgoingHttpHeaders } from "http";
+import { Response } from 'express';
+import { OutgoingHttpHeaders } from 'http';
 
-import IResponse from "./IResponse";
+import IResponse from './IResponse';
 
 export default class ExpressResponseAdapter implements IResponse {
   public constructor(private readonly res: Response) {}

src/blob/generated/IResponse.ts

@@ -1,4 +1,4 @@
-import { OutgoingHttpHeaders } from "http";
+import { OutgoingHttpHeaders } from 'http';
 
 export default interface IResponse {
   setStatusCode(code: number): IResponse;

src/blob/generated/MiddlewareFactory.ts

@@ -1,5 +1,5 @@
-import IHandlers from "./handlers/IHandlers";
-import ILogger from "./utils/ILogger";
+import IHandlers from './handlers/IHandlers';
+import ILogger from './utils/ILogger';
 
 export type Callback = (...args: any[]) => any;
 export type MiddlewareTypes = Callback;