@squiz/dx-common-lib 1.69.0 → 1.70.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +14 -0
- package/jest.config.ts +16 -1
- package/lib/api-key-validation/CloudflareApiKeyService.js.map +1 -1
- package/lib/api-key-validation/DevelopmentApiKeyService.d.ts +0 -1
- package/lib/api-key-validation/getApiKeyService.js +1 -2
- package/lib/api-key-validation/getApiKeyService.js.map +1 -1
- package/lib/assertions/assertAssign.js +1 -2
- package/lib/assertions/assertAssign.js.map +1 -1
- package/lib/assertions/assertAssignWithDefaultUndefinedValue.js +1 -2
- package/lib/assertions/assertAssignWithDefaultUndefinedValue.js.map +1 -1
- package/lib/assertions/assertIsArray.js +1 -2
- package/lib/assertions/assertIsArray.js.map +1 -1
- package/lib/assertions/assertIsBoolean.js +1 -2
- package/lib/assertions/assertIsBoolean.js.map +1 -1
- package/lib/assertions/assertIsDefined.js +1 -2
- package/lib/assertions/assertIsDefined.js.map +1 -1
- package/lib/assertions/assertIsEnumValue.js +1 -2
- package/lib/assertions/assertIsEnumValue.js.map +1 -1
- package/lib/assertions/assertIsMapOfStringAny.js +1 -2
- package/lib/assertions/assertIsMapOfStringAny.js.map +1 -1
- package/lib/assertions/assertIsMapOfStringString.js +1 -2
- package/lib/assertions/assertIsMapOfStringString.js.map +1 -1
- package/lib/assertions/assertIsNotAnEmptyString.js +1 -2
- package/lib/assertions/assertIsNotAnEmptyString.js.map +1 -1
- package/lib/assertions/assertIsObject.js +1 -2
- package/lib/assertions/assertIsObject.js.map +1 -1
- package/lib/assertions/assertIsString.js +1 -2
- package/lib/assertions/assertIsString.js.map +1 -1
- package/lib/cache/applyDefaultRulesToCacheControlObject.d.ts +15 -15
- package/lib/cache/applyDefaultRulesToCacheControlObject.js +1 -2
- package/lib/cache/applyDefaultRulesToCacheControlObject.js.map +1 -1
- package/lib/cache/cacheControlToString.js +1 -2
- package/lib/cache/cacheControlToString.js.map +1 -1
- package/lib/cache/parseAndSanitiseCacheControlHeader.js +3 -3
- package/lib/cache/parseAndSanitiseCacheControlHeader.js.map +1 -1
- package/lib/cache/parseCacheControl.js +1 -2
- package/lib/cache/parseCacheControl.js.map +1 -1
- package/lib/edge-components-secret-key-service/DevelopmentEdgeComponentsSecretKeyService.d.ts +7 -0
- package/lib/edge-components-secret-key-service/DevelopmentEdgeComponentsSecretKeyService.js +16 -0
- package/lib/edge-components-secret-key-service/DevelopmentEdgeComponentsSecretKeyService.js.map +1 -0
- package/lib/edge-components-secret-key-service/DevelopmentEdgeComponentsSecretKeyService.spec.d.ts +1 -0
- package/lib/edge-components-secret-key-service/DevelopmentEdgeComponentsSecretKeyService.spec.js +13 -0
- package/lib/edge-components-secret-key-service/DevelopmentEdgeComponentsSecretKeyService.spec.js.map +1 -0
- package/lib/edge-components-secret-key-service/EdgeComponentsSecretKeyService.d.ts +4 -0
- package/lib/edge-components-secret-key-service/EdgeComponentsSecretKeyService.js +3 -0
- package/lib/edge-components-secret-key-service/EdgeComponentsSecretKeyService.js.map +1 -0
- package/lib/edge-components-secret-key-service/ProductionEdgeComponentsSecretKeyService.d.ts +16 -0
- package/lib/edge-components-secret-key-service/ProductionEdgeComponentsSecretKeyService.js +49 -0
- package/lib/edge-components-secret-key-service/ProductionEdgeComponentsSecretKeyService.js.map +1 -0
- package/lib/edge-components-secret-key-service/ProductionEdgeComponentsSecretKeyService.spec.d.ts +1 -0
- package/lib/edge-components-secret-key-service/ProductionEdgeComponentsSecretKeyService.spec.js +34 -0
- package/lib/edge-components-secret-key-service/ProductionEdgeComponentsSecretKeyService.spec.js.map +1 -0
- package/lib/edge-components-secret-key-service/getEdgeComponentsSecretService.d.ts +5 -0
- package/lib/edge-components-secret-key-service/getEdgeComponentsSecretService.js +20 -0
- package/lib/edge-components-secret-key-service/getEdgeComponentsSecretService.js.map +1 -0
- package/lib/edge-components-secret-key-service/getEdgeComponentsSecretService.spec.d.ts +1 -0
- package/lib/edge-components-secret-key-service/getEdgeComponentsSecretService.spec.js +28 -0
- package/lib/edge-components-secret-key-service/getEdgeComponentsSecretService.spec.js.map +1 -0
- package/lib/index.d.ts +4 -0
- package/lib/index.js +4 -0
- package/lib/index.js.map +1 -1
- package/lib/json-order/index.d.ts +2 -2
- package/lib/json-order/key.js.map +1 -1
- package/lib/json-order/order.js.map +1 -1
- package/lib/json-order/parse.js.map +1 -1
- package/lib/server-utils/errorMiddleware.js +1 -2
- package/lib/server-utils/errorMiddleware.js.map +1 -1
- package/lib/server-utils/requestLogger.js +2 -3
- package/lib/server-utils/requestLogger.js.map +1 -1
- package/lib/util/getNodeEnv.js +1 -2
- package/lib/util/getNodeEnv.js.map +1 -1
- package/lib/util/getPageInfo.js +1 -2
- package/lib/util/getPageInfo.js.map +1 -1
- package/lib/util/isPathTryingToAccessOutsideOfRoot.js +1 -2
- package/lib/util/isPathTryingToAccessOutsideOfRoot.js.map +1 -1
- package/lib/util/isReadable.js +1 -2
- package/lib/util/isReadable.js.map +1 -1
- package/lib/util/joinAbsoluteUrlPath.js +1 -2
- package/lib/util/joinAbsoluteUrlPath.js.map +1 -1
- package/lib/util/never.js +1 -2
- package/lib/util/never.js.map +1 -1
- package/lib/util/parseEnvVarForVar.js +1 -2
- package/lib/util/parseEnvVarForVar.js.map +1 -1
- package/lib/zip/zipDirectory.js +1 -2
- package/lib/zip/zipDirectory.js.map +1 -1
- package/package.json +4 -5
- package/src/edge-components-secret-key-service/DevelopmentEdgeComponentsSecretKeyService.spec.ts +11 -0
- package/src/edge-components-secret-key-service/DevelopmentEdgeComponentsSecretKeyService.ts +13 -0
- package/src/edge-components-secret-key-service/EdgeComponentsSecretKeyService.ts +4 -0
- package/src/edge-components-secret-key-service/ProductionEdgeComponentsSecretKeyService.spec.ts +47 -0
- package/src/edge-components-secret-key-service/ProductionEdgeComponentsSecretKeyService.ts +63 -0
- package/src/edge-components-secret-key-service/getEdgeComponentsSecretService.spec.ts +39 -0
- package/src/edge-components-secret-key-service/getEdgeComponentsSecretService.ts +21 -0
- package/src/index.ts +4 -0
- package/tsconfig.tsbuildinfo +1 -1
@@ -0,0 +1,39 @@
|
|
1
|
+
import { ProductionEdgeComponentsSecretKeyService } from './ProductionEdgeComponentsSecretKeyService';
|
2
|
+
import { DevelopmentEdgeComponentsSecretKeyService } from './DevelopmentEdgeComponentsSecretKeyService';
|
3
|
+
import { getEdgeComponentsSecretService } from './getEdgeComponentsSecretService';
|
4
|
+
|
5
|
+
describe('getEdgeComponentsSecretService', () => {
|
6
|
+
it('should return an instance of DevelopmentEdgeComponentsSecretKeyService when NODE_ENV is development', () => {
|
7
|
+
process.env.NODE_ENV = 'development';
|
8
|
+
expect(getEdgeComponentsSecretService({})).toBeInstanceOf(DevelopmentEdgeComponentsSecretKeyService);
|
9
|
+
});
|
10
|
+
|
11
|
+
it('should return an instance of DevelopmentEdgeComponentsSecretKeyService when NODE_ENV is development - secret supplied', () => {
|
12
|
+
process.env.NODE_ENV = 'development';
|
13
|
+
expect(getEdgeComponentsSecretService({ secretValue: 'some-val' })).toBeInstanceOf(
|
14
|
+
DevelopmentEdgeComponentsSecretKeyService,
|
15
|
+
);
|
16
|
+
});
|
17
|
+
|
18
|
+
it('should return an instance of ProductionEdgeComponentsSecretKeyService when NODE_ENV is production', () => {
|
19
|
+
process.env.NODE_ENV = 'production';
|
20
|
+
expect(getEdgeComponentsSecretService({ secretName: 'foo' })).toBeInstanceOf(
|
21
|
+
ProductionEdgeComponentsSecretKeyService,
|
22
|
+
);
|
23
|
+
});
|
24
|
+
|
25
|
+
it('should throw an error if no prodEnv values available', () => {
|
26
|
+
process.env.NODE_ENV = 'production';
|
27
|
+
expect(() => getEdgeComponentsSecretService({})).toThrow(
|
28
|
+
new Error(`Need to specify 'secretName' for production env`),
|
29
|
+
);
|
30
|
+
});
|
31
|
+
|
32
|
+
it('should throw an error if NODE_ENV is anything other than development or production', () => {
|
33
|
+
process.env.NODE_ENV = 'something invalid';
|
34
|
+
|
35
|
+
expect(() => getEdgeComponentsSecretService({})).toThrow(
|
36
|
+
new Error(`NODE_ENV env var can only be values "production" or "development"`),
|
37
|
+
);
|
38
|
+
});
|
39
|
+
});
|
@@ -0,0 +1,21 @@
|
|
1
|
+
import { getNodeEnv } from '../util';
|
2
|
+
import { DevelopmentEdgeComponentsSecretKeyService } from './DevelopmentEdgeComponentsSecretKeyService';
|
3
|
+
import { ProductionEdgeComponentsSecretKeyService } from './ProductionEdgeComponentsSecretKeyService';
|
4
|
+
import { EdgeComponentsSecretKeyService } from './EdgeComponentsSecretKeyService';
|
5
|
+
|
6
|
+
export function getEdgeComponentsSecretService(config: {
|
7
|
+
secretName?: string;
|
8
|
+
secretValue?: string;
|
9
|
+
}): EdgeComponentsSecretKeyService {
|
10
|
+
const env = getNodeEnv();
|
11
|
+
|
12
|
+
switch (env) {
|
13
|
+
case 'development':
|
14
|
+
return new DevelopmentEdgeComponentsSecretKeyService(config.secretValue ?? '');
|
15
|
+
case 'production':
|
16
|
+
if (config.secretName === undefined) {
|
17
|
+
throw new Error(`Need to specify 'secretName' for production env`);
|
18
|
+
}
|
19
|
+
return new ProductionEdgeComponentsSecretKeyService(config.secretName);
|
20
|
+
}
|
21
|
+
}
|
package/src/index.ts
CHANGED
@@ -10,3 +10,7 @@ export * from './api-key-validation/DevelopmentApiKeyService';
|
|
10
10
|
export * from './api-key-validation/getApiKeyService';
|
11
11
|
export * from './cache';
|
12
12
|
export * from './json-order';
|
13
|
+
export * from './edge-components-secret-key-service/DevelopmentEdgeComponentsSecretKeyService';
|
14
|
+
export * from './edge-components-secret-key-service/ProductionEdgeComponentsSecretKeyService';
|
15
|
+
export * from './edge-components-secret-key-service/EdgeComponentsSecretKeyService';
|
16
|
+
export * from './edge-components-secret-key-service/getEdgeComponentsSecretService';
|