Browse Source

Post-merge cleanup

Leszek Wiesner 3 years ago
parent
commit
6024ae86d1

+ 0 - 13
distributor-node/src/services/validation/generateTypes.ts

@@ -1,13 +0,0 @@
-import fs from 'fs'
-import path from 'path'
-import { compile } from 'json-schema-to-typescript'
-import { schemas } from './schemas'
-
-// eslint-disable-next-line @typescript-eslint/no-var-requires
-const prettierConfig = require('@joystream/prettier-config')
-
-Object.entries(schemas).forEach(([schemaKey, schema]) => {
-  compile(schema, `${schemaKey}Json`, { style: prettierConfig }).then((output) =>
-    fs.writeFileSync(path.resolve(__dirname, `../../types/generated/${schemaKey}Json.d.ts`), output)
-  )
-})

+ 0 - 56
distributor-node/src/services/validation/schemas/configSchema.ts

@@ -1,56 +0,0 @@
-import { JSONSchema4 } from 'json-schema'
-import { strictObject } from './utils'
-import winston from 'winston'
-
-export const bytesizeUnits = ['B', 'K', 'M', 'G', 'T']
-export const bytesizeRegex = new RegExp(`^[0-9]+(${bytesizeUnits.join('|')})$`)
-
-export const configSchema: JSONSchema4 = {
-  type: 'object',
-  required: ['id', 'endpoints', 'directories', 'buckets', 'keys', 'port', 'workerId', 'limits'],
-  additionalProperties: false,
-  properties: {
-    id: { type: 'string' },
-    endpoints: {
-      type: 'object',
-      additionalProperties: false,
-      required: ['queryNode', 'substrateNode'],
-      properties: {
-        queryNode: { type: 'string' },
-        substrateNode: { type: 'string' },
-        elasticSearch: { type: 'string' },
-      },
-    },
-    directories: strictObject({
-      data: { type: 'string' },
-      cache: { type: 'string' },
-      logs: { type: 'string' },
-    }),
-    log: {
-      type: 'object',
-      additionalProperties: false,
-      properties: {
-        file: { type: 'string', enum: [...Object.keys(winston.config.npm.levels), 'off'] },
-        console: { type: 'string', enum: [...Object.keys(winston.config.npm.levels), 'off'] },
-        elastic: { type: 'string', enum: [...Object.keys(winston.config.npm.levels), 'off'] },
-      },
-    },
-    limits: strictObject({
-      storage: { type: 'string', pattern: bytesizeRegex.source },
-      maxConcurrentStorageNodeDownloads: { type: 'integer', minimum: 1 },
-      maxConcurrentOutboundConnections: { type: 'integer', minimum: 1 },
-      outboundRequestsTimeout: { type: 'integer', minimum: 1 },
-    }),
-    port: { type: 'integer', minimum: 0 },
-    keys: { type: 'array', items: { type: 'string' }, minItems: 1 },
-    buckets: {
-      oneOf: [
-        { type: 'array', items: { type: 'integer', minimum: 0 }, minItems: 1 },
-        { type: 'string', enum: ['all'] },
-      ],
-    },
-    workerId: { type: 'integer', minimum: 0 },
-  },
-}
-
-export default configSchema

+ 0 - 23
distributor-node/src/services/validation/schemas/familyMetadataSchema.ts

@@ -1,23 +0,0 @@
-import { JSONSchema4 } from 'json-schema'
-
-export const familyMetadataSchema: JSONSchema4 = {
-  type: 'object',
-  additionalProperties: false,
-  properties: {
-    region: { type: 'string' },
-    description: { type: 'string' },
-    boundary: {
-      type: 'array',
-      items: {
-        type: 'object',
-        additionalProperties: false,
-        properties: {
-          latitude: { type: 'number', minimum: -180, maximum: 180 },
-          longitude: { type: 'number', minimum: -180, maximum: 180 },
-        },
-      },
-    },
-  },
-}
-
-export default familyMetadataSchema

+ 0 - 24
distributor-node/src/services/validation/schemas/index.ts

@@ -1,24 +0,0 @@
-import { ConfigJson } from '../../../types/generated/ConfigJson'
-import { OperatorMetadataJson } from '../../../types/generated/OperatorMetadataJson'
-import { FamilyMetadataJson } from '../../../types/generated/FamilyMetadataJson'
-import { configSchema } from './configSchema'
-import { familyMetadataSchema } from './familyMetadataSchema'
-import { operatorMetadataSchema } from './operatorMetadataSchema'
-
-export const schemas = {
-  Config: configSchema,
-  OperatorMetadata: operatorMetadataSchema,
-  FamilyMetadata: familyMetadataSchema,
-} as const
-
-export type SchemaKey = keyof typeof schemas & string
-
-export type TypeBySchemaKey<T extends SchemaKey> = T extends 'Config'
-  ? ConfigJson
-  : T extends 'OperatorMetadata'
-  ? OperatorMetadataJson
-  : T extends 'FamilyMetadata'
-  ? FamilyMetadataJson
-  : never
-
-export default schemas

+ 0 - 28
distributor-node/src/services/validation/schemas/operatorMetadataSchema.ts

@@ -1,28 +0,0 @@
-import { JSONSchema4 } from 'json-schema'
-
-export const operatorMetadataSchema: JSONSchema4 = {
-  type: 'object',
-  additionalProperties: false,
-  properties: {
-    endpoint: { type: 'string' },
-    location: {
-      type: 'object',
-      additionalProperties: false,
-      properties: {
-        countryCode: { type: 'string' },
-        city: { type: 'string' },
-        coordinates: {
-          type: 'object',
-          additionalProperties: false,
-          properties: {
-            latitude: { type: 'number', minimum: -180, maximum: 180 },
-            longitude: { type: 'number', minimum: -180, maximum: 180 },
-          },
-        },
-      },
-    },
-    extra: { type: 'string' },
-  },
-}
-
-export default operatorMetadataSchema

+ 0 - 10
distributor-node/src/services/validation/schemas/utils.ts

@@ -1,10 +0,0 @@
-import { JSONSchema4 } from 'json-schema'
-
-export function strictObject(properties: Exclude<JSONSchema4['properties'], undefined>): JSONSchema4 {
-  return {
-    type: 'object',
-    additionalProperties: false,
-    required: Object.keys(properties),
-    properties,
-  }
-}