From 9fc612e013e0798adf0c5707e273b36285c77bb5 Mon Sep 17 00:00:00 2001 From: darth-coder00 <86726556+darth-coder00@users.noreply.github.com> Date: Thu, 19 May 2022 21:23:39 +0530 Subject: [PATCH] Optimising generation of typescripts from schema and as prebuild script (#5037) * Adding json2ts as prebuild script * Add generated TS to gitignore * Fixing CI errors * Fix Sonar CI * Bumping metadata version * Fixing sonar CI * Fix json2ts script * Revert gitignore * prettify * Fix CI build failures * Removing unnecessary changes * Add pre-script for coverage --- .gitignore | 2 +- .../resources/json/schema/entity/type.json | 53 ++++++--------- ingestion-core/src/metadata/_version.py | 2 +- openmetadata-ui/pom.xml | 14 ---- .../src/main/resources/ui/.prettierignore | 7 ++ .../src/main/resources/ui/json2ts.sh | 45 +++++++------ .../src/main/resources/ui/package.json | 8 ++- .../src/generated/api/data/createDatabase.ts | 4 ++ .../api/data/createDatabaseSchema.ts | 4 ++ .../generated/api/data/createGlossaryTerm.ts | 2 +- .../src/generated/api/data/createLocation.ts | 4 ++ .../{createMLModel.ts => createMlModel.ts} | 0 .../ui/src/generated/api/data/createTable.ts | 8 +++ .../ui/src/generated/api/data/createTopic.ts | 4 ++ .../src/generated/api/events/createWebhook.ts | 4 ++ .../api/services/createDashboardService.ts | 4 ++ .../api/services/createDatabaseService.ts | 4 ++ .../api/services/createMessagingService.ts | 5 ++ .../api/services/createPipelineService.ts | 4 ++ .../api/services/createStorageService.ts | 4 ++ .../createIngestionPipeline.ts | 2 +- .../ui/src/generated/api/tags/createTag.ts | 4 ++ .../generated/api/tags/createTagCategory.ts | 4 ++ .../ui/src/generated/entity/data/table.ts | 65 ++----------------- .../metadata/openMetadataConnection.ts | 4 ++ .../services/connections/serviceConnection.ts | 4 ++ .../ingestionPipelines/ingestionPipeline.ts | 8 +++ .../entity/services/metadataService.ts | 4 ++ .../generated/metadataIngestion/workflow.ts | 8 +++ 29 files changed, 148 insertions(+), 137 deletions(-) rename openmetadata-ui/src/main/resources/ui/src/generated/api/data/{createMLModel.ts => createMlModel.ts} (100%) diff --git a/.gitignore b/.gitignore index ee47ffa4289..25f30acd12c 100644 --- a/.gitignore +++ b/.gitignore @@ -97,4 +97,4 @@ mlruns/ /openmetadata-ui/src/main/resources/ui/src/antlr/generated/Fqn.interp /openmetadata-ui/src/main/resources/ui/src/antlr/generated/Fqn.tokens /openmetadata-ui/src/main/resources/ui/src/antlr/generated/FqnLexer.interp -/openmetadata-ui/src/main/resources/ui/src/antlr/generated/FqnLexer.tokens \ No newline at end of file +/openmetadata-ui/src/main/resources/ui/src/antlr/generated/FqnLexer.tokens diff --git a/catalog-rest-service/src/main/resources/json/schema/entity/type.json b/catalog-rest-service/src/main/resources/json/schema/entity/type.json index a96b7ab5eba..2f2b75fc5d4 100644 --- a/catalog-rest-service/src/main/resources/json/schema/entity/type.json +++ b/catalog-rest-service/src/main/resources/json/schema/entity/type.json @@ -7,14 +7,11 @@ "javaType": "org.openmetadata.catalog.entity.Type", "javaInterfaces": ["org.openmetadata.catalog.EntityInterface"], "definitions": { - "category" : { - "description" : "Metadata category to which a type belongs to.", + "category": { + "description": "Metadata category to which a type belongs to.", "type": "string", "javaType": "org.openmetadata.catalog.entity.type.Category", - "enum": [ - "field", - "entity" - ], + "enum": ["field", "entity"], "javaEnums": [ { "name": "Field" @@ -26,36 +23,32 @@ }, "fieldName": { "description": "Name of the entity field. Note a field name must be unique for an entity. Field name must follow camelCase naming adopted by openMetadata - must start with lower case with no space, underscore, or dots.", - "type" : "string", + "type": "string", "pattern": "^[a-z][a-zA-Z0-9]+$" }, "typeName": { "description": "Name of the field or entity types. Note a field name must be unique for an entity. Field name must follow camelCase naming adopted by openMetadata - must start with lower case with no space, underscore, or dots.", - "type" : "string", + "type": "string", "pattern": "^[a-z][a-zA-Z0-9]+$" }, - "customField" : { - "description" : "Type used for adding custom field to an entity to extend it.", - "type" : "object", + "customField": { + "description": "Type used for adding custom field to an entity to extend it.", + "type": "object", "javaType": "org.openmetadata.catalog.entity.type.CustomField", "properties": { "name": { "description": "Name of the entity field. Note a field name must be unique for an entity. Field name must follow camelCase naming adopted by openMetadata - must start with lower case with no space, underscore, or dots.", - "$ref" : "#/definitions/fieldName" + "$ref": "#/definitions/fieldName" }, "description": { - "$ref" : "../type/basic.json#/definitions/markdown" + "$ref": "../type/basic.json#/definitions/markdown" }, "fieldType": { "description": "Reference to a field type. Only field types are allows and entity types are not allowed as custom fields to extend an existing entity", "$ref": "../type/entityReference.json" } }, - "required": [ - "name", - "description", - "fieldType" - ], + "required": ["name", "description", "fieldType"], "additionalProperties": false } }, @@ -78,33 +71,25 @@ }, "description": { "description": "Optional description of entity.", - "$ref" : "../type/basic.json#/definitions/markdown" + "$ref": "../type/basic.json#/definitions/markdown" }, "nameSpace": { "description": "Namespace or group to which this type belongs to. For example, some of the field types commonly used can come from `basic` namespace. Some of the entities such as `table`, `database`, etc. come from `data` namespace.", "type": "string", - "default" : "custom" + "default": "custom" }, - "category" : { - "$ref" : "#/definitions/category" - }, - "nameSpace": { - "description": "Namespace or group to which this type belongs to. For example, some of the field types commonly used can come from `basic` namespace. Some of the entities such as `table`, `database`, etc. come from `data` namespace.", - "type": "string", - "default" : "custom" - }, - "category" : { - "$ref" : "#/definitions/category" + "category": { + "$ref": "#/definitions/category" }, "schema": { "description": "JSON schema encoded as string that defines the type. This will be used to validate the type values.", "$ref": "../type/basic.json#/definitions/jsonSchema" }, - "customFields" : { + "customFields": { "description": "Custom fields added to extend the entity. Only available for entity type", - "type" : "array", - "items" : { - "$ref" : "#/definitions/customField" + "type": "array", + "items": { + "$ref": "#/definitions/customField" } }, "version": { diff --git a/ingestion-core/src/metadata/_version.py b/ingestion-core/src/metadata/_version.py index 25c213a99ad..7e90f529f15 100644 --- a/ingestion-core/src/metadata/_version.py +++ b/ingestion-core/src/metadata/_version.py @@ -7,5 +7,5 @@ Provides metadata version information. from incremental import Version -__version__ = Version("metadata", 0, 11, 0, dev=7) +__version__ = Version("metadata", 0, 11, 0, dev=8) __all__ = ["__version__"] diff --git a/openmetadata-ui/pom.xml b/openmetadata-ui/pom.xml index 710605d926f..8b3159e8bbb 100644 --- a/openmetadata-ui/pom.xml +++ b/openmetadata-ui/pom.xml @@ -119,20 +119,6 @@ install --frozen-lockfile - - yarn run build-check - - yarn - - - prepare-package - - - run build-check - - - yarn run build-test diff --git a/openmetadata-ui/src/main/resources/ui/.prettierignore b/openmetadata-ui/src/main/resources/ui/.prettierignore index ef38b8f710f..b1348008a5e 100644 --- a/openmetadata-ui/src/main/resources/ui/.prettierignore +++ b/openmetadata-ui/src/main/resources/ui/.prettierignore @@ -40,3 +40,10 @@ swagger.html # antlr src/antlr/generated/ + +# Generated TS +src/generated/ + +# cypress +**/*.spec.js +cypress/ diff --git a/openmetadata-ui/src/main/resources/ui/json2ts.sh b/openmetadata-ui/src/main/resources/ui/json2ts.sh index 89778835fdf..b3c17cd6c2e 100755 --- a/openmetadata-ui/src/main/resources/ui/json2ts.sh +++ b/openmetadata-ui/src/main/resources/ui/json2ts.sh @@ -10,34 +10,37 @@ # See the License for the specific language governing permissions and # limitations under the License. +schema_directory='catalog-rest-service/src/main/resources/json/schema/' +om_ui_directory='openmetadata-ui/src/main/resources/ui/src/generated/' addLicensing(){ dir=$1 - txt=`cat types-licensing.txt; cat "$dir"` + txt=`cat openmetadata-ui/src/main/resources/ui/types-licensing.txt; cat "$dir"` echo "$txt" > "$dir" } - -getTypes(){ - dir=$1 - for f in $dir/* - do - filename=$f - if [[ -d $f ]]; +generateType(){ + ./node_modules/.bin/quicktype -s schema $PWD"/${schema_directory}$1" -o $PWD"/"$om_ui_directory$2 --just-types + if [ -s $om_ui_directory$2 ] then - getTypes "$f" "$2" "$3" + addLicensing "$om_ui_directory$2" else - fileTS=${f//.json/.ts} - fileTS=${fileTS//$2/$3} - mkdir -p "$(dirname "$fileTS")" && ../../../../../node_modules/.bin/quicktype -s schema "$f" -o "$fileTS" --just-types - if [[ -s $fileTS ]] - then - addLicensing "$fileTS" - else - rm -f $fileTS - fi + rm -f "$om_ui_directory$2" fi +} +getTypes(){ + if [ -d "$om_ui_directory" ] + then + rm -r $om_ui_directory + fi + + for file_with_dir in $(find $schema_directory -name "*.json" | sed -e 's/catalog-rest-service\/src\/main\/resources\/json\/schema\///g') + do + mkdir -p "$(dirname "$om_ui_directory$file_with_dir")" + fileTS=$(echo "$file_with_dir" | sed "s/.json/.ts/g") + generateType "$file_with_dir" "$fileTS" & done } -rm -r $2 -mkdir $2 -getTypes "$1" "$1" "$2" +# Checkout root directory to generate typescript from schema +cd ../../../../.. +getTypes +wait diff --git a/openmetadata-ui/src/main/resources/ui/package.json b/openmetadata-ui/src/main/resources/ui/package.json index c17fc7f6ca6..25e37bd63e4 100644 --- a/openmetadata-ui/src/main/resources/ui/package.json +++ b/openmetadata-ui/src/main/resources/ui/package.json @@ -97,7 +97,9 @@ "build": "NODE_ENV=production BABEL_ENV=production webpack --config ./webpack.config.prod.js --env production", "preinstall": "cd ../../../../.. && yarn install --frozen-lockfile", "mock-api": "node ./mock-api/app.js", + "prebuild": "yarn run build-check", "pretest": "yarn run build-check", + "pretest:coverage": "yarn run pretest", "test": "jest --passWithNoTests", "test:watch": "jest --passWithNoTests --watch", "test:coverage": "jest --passWithNoTests --coverage", @@ -105,10 +107,10 @@ "lint": "eslint \"./src/**/*.{js,jsx,ts,tsx}\"", "lint:fix": "eslint './src/**/*.{js,jsx,ts,tsx}' --fix", "pretty": "prettier . --config './.prettierrc' --write", - "build-check": "yarn run lint && yarn run parse-conn-schema", + "build-check": "yarn run json2ts && yarn run lint && yarn run parse-conn-schema", "build-test": "yarn run test", - "commit-check": "yarn run pretty && yarn run build-check && yarn run build", - "json2ts": "./json2ts.sh ../../../../../catalog-rest-service/src/main/resources/json/schema ./src/generated && yarn run lint:fix", + "commit-check": "yarn run pretty && yarn run build", + "json2ts": "sh json2ts.sh", "parse-conn-schema": "node parseConnectionSchema && rm -rf connTemp", "js-antlr": "PWD=$(echo $PWD) antlr -Dlanguage=JavaScript -o src/antlr/generated $PWD/../../../../../catalog-rest-service/src/main/antlr4/org/openmetadata/catalog/Fqn.g4", "cypress:open": "cypress open", diff --git a/openmetadata-ui/src/main/resources/ui/src/generated/api/data/createDatabase.ts b/openmetadata-ui/src/main/resources/ui/src/generated/api/data/createDatabase.ts index 755239393a7..7272c488c29 100644 --- a/openmetadata-ui/src/main/resources/ui/src/generated/api/data/createDatabase.ts +++ b/openmetadata-ui/src/main/resources/ui/src/generated/api/data/createDatabase.ts @@ -26,6 +26,10 @@ export interface CreateDatabase { * Description of the database instance. What it has and how to use it. */ description?: string; + /** + * Display Name that identifies this database. + */ + displayName?: string; /** * Name that identifies this database instance uniquely. */ diff --git a/openmetadata-ui/src/main/resources/ui/src/generated/api/data/createDatabaseSchema.ts b/openmetadata-ui/src/main/resources/ui/src/generated/api/data/createDatabaseSchema.ts index 6dbe60c914f..476348c589a 100644 --- a/openmetadata-ui/src/main/resources/ui/src/generated/api/data/createDatabaseSchema.ts +++ b/openmetadata-ui/src/main/resources/ui/src/generated/api/data/createDatabaseSchema.ts @@ -24,6 +24,10 @@ export interface CreateDatabaseSchema { * Description of the schema instance. What it has and how to use it. */ description?: string; + /** + * Display Name that identifies this database schema. + */ + displayName?: string; /** * Name that identifies this database schema instance uniquely. */ diff --git a/openmetadata-ui/src/main/resources/ui/src/generated/api/data/createGlossaryTerm.ts b/openmetadata-ui/src/main/resources/ui/src/generated/api/data/createGlossaryTerm.ts index 19ebe5df1e2..1b2bafec96e 100644 --- a/openmetadata-ui/src/main/resources/ui/src/generated/api/data/createGlossaryTerm.ts +++ b/openmetadata-ui/src/main/resources/ui/src/generated/api/data/createGlossaryTerm.ts @@ -21,7 +21,7 @@ export interface CreateGlossaryTerm { */ description: string; /** - * Display Name that identifies this glossary. + * Display Name that identifies this glossary term. */ displayName?: string; /** diff --git a/openmetadata-ui/src/main/resources/ui/src/generated/api/data/createLocation.ts b/openmetadata-ui/src/main/resources/ui/src/generated/api/data/createLocation.ts index 46915a574f6..e98b7348be3 100644 --- a/openmetadata-ui/src/main/resources/ui/src/generated/api/data/createLocation.ts +++ b/openmetadata-ui/src/main/resources/ui/src/generated/api/data/createLocation.ts @@ -20,6 +20,10 @@ export interface CreateLocation { * Description of the location instance. */ description?: string; + /** + * Display Name that identifies this location. + */ + displayName?: string; locationType?: LocationType; /** * Name that identifies this Location. diff --git a/openmetadata-ui/src/main/resources/ui/src/generated/api/data/createMLModel.ts b/openmetadata-ui/src/main/resources/ui/src/generated/api/data/createMlModel.ts similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/generated/api/data/createMLModel.ts rename to openmetadata-ui/src/main/resources/ui/src/generated/api/data/createMlModel.ts diff --git a/openmetadata-ui/src/main/resources/ui/src/generated/api/data/createTable.ts b/openmetadata-ui/src/main/resources/ui/src/generated/api/data/createTable.ts index a905d53a1cc..fa65729f8c5 100644 --- a/openmetadata-ui/src/main/resources/ui/src/generated/api/data/createTable.ts +++ b/openmetadata-ui/src/main/resources/ui/src/generated/api/data/createTable.ts @@ -28,6 +28,14 @@ export interface CreateTable { * Description of entity instance. */ description?: string; + /** + * Display Name that identifies this table. + */ + displayName?: string; + /** + * Entity extension data with custom attributes added to the entity. + */ + extension?: any; /** * Name that identifies the this entity instance uniquely. Same as id if when name is not * unique diff --git a/openmetadata-ui/src/main/resources/ui/src/generated/api/data/createTopic.ts b/openmetadata-ui/src/main/resources/ui/src/generated/api/data/createTopic.ts index 9fed7a1cf4c..8e0a5992366 100644 --- a/openmetadata-ui/src/main/resources/ui/src/generated/api/data/createTopic.ts +++ b/openmetadata-ui/src/main/resources/ui/src/generated/api/data/createTopic.ts @@ -24,6 +24,10 @@ export interface CreateTopic { * Description of the topic instance. What it has and how to use it. */ description?: string; + /** + * Display Name that identifies this topic. + */ + displayName?: string; /** * Maximum message size in bytes. For Kafka - `max.message.bytes` configuration. */ diff --git a/openmetadata-ui/src/main/resources/ui/src/generated/api/events/createWebhook.ts b/openmetadata-ui/src/main/resources/ui/src/generated/api/events/createWebhook.ts index 3c7ffacf1ba..c54a375c7f1 100644 --- a/openmetadata-ui/src/main/resources/ui/src/generated/api/events/createWebhook.ts +++ b/openmetadata-ui/src/main/resources/ui/src/generated/api/events/createWebhook.ts @@ -24,6 +24,10 @@ export interface CreateWebhook { * Description of the application */ description?: string; + /** + * Display Name that identifies this webhook. + */ + displayName?: string; /** * When set to `true`, the webhook event notification is enabled. Set it to `false` to * disable the subscription. (Default `true`) diff --git a/openmetadata-ui/src/main/resources/ui/src/generated/api/services/createDashboardService.ts b/openmetadata-ui/src/main/resources/ui/src/generated/api/services/createDashboardService.ts index 09658891a0a..c6d2942bc68 100644 --- a/openmetadata-ui/src/main/resources/ui/src/generated/api/services/createDashboardService.ts +++ b/openmetadata-ui/src/main/resources/ui/src/generated/api/services/createDashboardService.ts @@ -21,6 +21,10 @@ export interface CreateDashboardService { * Description of dashboard service entity. */ description?: string; + /** + * Display Name that identifies this dashboard service. + */ + displayName?: string; /** * Name that identifies the this entity instance uniquely */ diff --git a/openmetadata-ui/src/main/resources/ui/src/generated/api/services/createDatabaseService.ts b/openmetadata-ui/src/main/resources/ui/src/generated/api/services/createDatabaseService.ts index 179093f7ecf..0b9e527db3a 100644 --- a/openmetadata-ui/src/main/resources/ui/src/generated/api/services/createDatabaseService.ts +++ b/openmetadata-ui/src/main/resources/ui/src/generated/api/services/createDatabaseService.ts @@ -21,6 +21,10 @@ export interface CreateDatabaseService { * Description of Database entity. */ description?: string; + /** + * Display Name that identifies this database service. + */ + displayName?: string; /** * Name that identifies the this entity instance uniquely */ diff --git a/openmetadata-ui/src/main/resources/ui/src/generated/api/services/createMessagingService.ts b/openmetadata-ui/src/main/resources/ui/src/generated/api/services/createMessagingService.ts index 684a12bd99d..1742fdb5e61 100644 --- a/openmetadata-ui/src/main/resources/ui/src/generated/api/services/createMessagingService.ts +++ b/openmetadata-ui/src/main/resources/ui/src/generated/api/services/createMessagingService.ts @@ -21,6 +21,11 @@ export interface CreateMessagingService { * Description of messaging service entity. */ description?: string; + /** + * Display Name that identifies this messaging service. It could be title or label from the + * source services. + */ + displayName?: string; /** * Name that identifies the this entity instance uniquely */ diff --git a/openmetadata-ui/src/main/resources/ui/src/generated/api/services/createPipelineService.ts b/openmetadata-ui/src/main/resources/ui/src/generated/api/services/createPipelineService.ts index 30b819eebee..0fa13c4fdbf 100644 --- a/openmetadata-ui/src/main/resources/ui/src/generated/api/services/createPipelineService.ts +++ b/openmetadata-ui/src/main/resources/ui/src/generated/api/services/createPipelineService.ts @@ -20,6 +20,10 @@ export interface CreatePipelineService { * Description of pipeline service entity. */ description?: string; + /** + * Display Name that identifies this pipeline service. + */ + displayName?: string; /** * Schedule for running pipeline ingestion jobs */ diff --git a/openmetadata-ui/src/main/resources/ui/src/generated/api/services/createStorageService.ts b/openmetadata-ui/src/main/resources/ui/src/generated/api/services/createStorageService.ts index 4822ef63c78..83159d17547 100644 --- a/openmetadata-ui/src/main/resources/ui/src/generated/api/services/createStorageService.ts +++ b/openmetadata-ui/src/main/resources/ui/src/generated/api/services/createStorageService.ts @@ -20,6 +20,10 @@ export interface CreateStorageService { * Description of Storage entity. */ description?: string; + /** + * Display Name that identifies this storage service. + */ + displayName?: string; /** * Name that identifies the this entity instance uniquely */ diff --git a/openmetadata-ui/src/main/resources/ui/src/generated/api/services/ingestionPipelines/createIngestionPipeline.ts b/openmetadata-ui/src/main/resources/ui/src/generated/api/services/ingestionPipelines/createIngestionPipeline.ts index 08afd165fc7..95ba9287902 100644 --- a/openmetadata-ui/src/main/resources/ui/src/generated/api/services/ingestionPipelines/createIngestionPipeline.ts +++ b/openmetadata-ui/src/main/resources/ui/src/generated/api/services/ingestionPipelines/createIngestionPipeline.ts @@ -22,7 +22,7 @@ export interface CreateIngestionPipeline { */ description?: string; /** - * Display Name that identifies this pipeline. + * Display Name that identifies this ingeestion pipeline. */ displayName?: string; /** diff --git a/openmetadata-ui/src/main/resources/ui/src/generated/api/tags/createTag.ts b/openmetadata-ui/src/main/resources/ui/src/generated/api/tags/createTag.ts index e5de67bdc69..3b0bea97b02 100644 --- a/openmetadata-ui/src/main/resources/ui/src/generated/api/tags/createTag.ts +++ b/openmetadata-ui/src/main/resources/ui/src/generated/api/tags/createTag.ts @@ -24,5 +24,9 @@ export interface CreateTag { * Unique name of the tag category */ description: string; + /** + * Display Name that identifies this tag. + */ + displayName?: string; name: string; } diff --git a/openmetadata-ui/src/main/resources/ui/src/generated/api/tags/createTagCategory.ts b/openmetadata-ui/src/main/resources/ui/src/generated/api/tags/createTagCategory.ts index 983756e8034..b0102514b23 100644 --- a/openmetadata-ui/src/main/resources/ui/src/generated/api/tags/createTagCategory.ts +++ b/openmetadata-ui/src/main/resources/ui/src/generated/api/tags/createTagCategory.ts @@ -21,6 +21,10 @@ export interface CreateTagCategory { * Description of the tag category */ description: string; + /** + * Display Name that identifies this tag category. + */ + displayName?: string; name: string; } diff --git a/openmetadata-ui/src/main/resources/ui/src/generated/entity/data/table.ts b/openmetadata-ui/src/main/resources/ui/src/generated/entity/data/table.ts index 2c75d486e07..80100a8f00e 100644 --- a/openmetadata-ui/src/main/resources/ui/src/generated/entity/data/table.ts +++ b/openmetadata-ui/src/main/resources/ui/src/generated/entity/data/table.ts @@ -26,10 +26,6 @@ export interface Table { * Columns in this table. */ columns: Column[]; - /** - * Custom attributes added to the entity - */ - customAttributes?: Type[]; /** * Reference to Database that contains this table. */ @@ -51,12 +47,15 @@ export interface Table { * Description of a table. */ description?: string; - displayConfig?: any; /** * Display Name that identifies this table. It could be title or label from the source * services. */ displayName?: string; + /** + * Entity extension data with custom attributes added to the entity. + */ + extension?: any; /** * Followers of this table. */ @@ -662,62 +661,6 @@ export enum State { Suggested = 'Suggested', } -/** - * This schema defines a type entity used for extending an entity with custom attributes. - */ -export interface Type { - /** - * Change that lead to this version of the entity. - */ - changeDescription?: ChangeDescription; - /** - * Optional description of entity. - */ - description: string; - /** - * Display Name that identifies this type. - */ - displayName?: string; - /** - * FullyQualifiedName same as `name`. - */ - fullyQualifiedName?: string; - /** - * Link to this table resource. - */ - href?: string; - /** - * Unique identifier of the type instance. - */ - id?: string; - /** - * Unique name that identifies the type. - */ - name: string; - /** - * Namespace or group to which this type belongs to. - */ - nameSpace: string; - /** - * JSON schema encoded as string that defines the type. This will be used to validate the - * type values. - */ - schema?: string; - /** - * Last update time corresponding to the new version of the entity in Unix epoch time - * milliseconds. - */ - updatedAt?: number; - /** - * User who made the update. - */ - updatedBy?: string; - /** - * Metadata version of the entity. - */ - version?: number; -} - /** * This captures information about how the table is modeled. Currently only DBT model is * supported. diff --git a/openmetadata-ui/src/main/resources/ui/src/generated/entity/services/connections/metadata/openMetadataConnection.ts b/openmetadata-ui/src/main/resources/ui/src/generated/entity/services/connections/metadata/openMetadataConnection.ts index 9aed8172e4e..eb2a568505b 100644 --- a/openmetadata-ui/src/main/resources/ui/src/generated/entity/services/connections/metadata/openMetadataConnection.ts +++ b/openmetadata-ui/src/main/resources/ui/src/generated/entity/services/connections/metadata/openMetadataConnection.ts @@ -25,6 +25,10 @@ export interface OpenMetadataConnection { * the one configured on OpenMetadata server. */ authProvider?: AuthProvider; + /** + * Validate Openmetadata Server & Client Version. + */ + enableVersionValidation?: boolean; /** * OpenMetadata Server Config. Must include API end point ex: http://localhost:8585/api */ diff --git a/openmetadata-ui/src/main/resources/ui/src/generated/entity/services/connections/serviceConnection.ts b/openmetadata-ui/src/main/resources/ui/src/generated/entity/services/connections/serviceConnection.ts index 71aa5fee412..ff252cb0e0a 100644 --- a/openmetadata-ui/src/main/resources/ui/src/generated/entity/services/connections/serviceConnection.ts +++ b/openmetadata-ui/src/main/resources/ui/src/generated/entity/services/connections/serviceConnection.ts @@ -617,6 +617,10 @@ export interface Connection { * the one configured on OpenMetadata server. */ authProvider?: AuthProvider; + /** + * Validate Openmetadata Server & Client Version. + */ + enableVersionValidation?: boolean; /** * OpenMetadata Client security configuration. */ diff --git a/openmetadata-ui/src/main/resources/ui/src/generated/entity/services/ingestionPipelines/ingestionPipeline.ts b/openmetadata-ui/src/main/resources/ui/src/generated/entity/services/ingestionPipelines/ingestionPipeline.ts index 0efbdf8a86f..38d3a3a3e4f 100644 --- a/openmetadata-ui/src/main/resources/ui/src/generated/entity/services/ingestionPipelines/ingestionPipeline.ts +++ b/openmetadata-ui/src/main/resources/ui/src/generated/entity/services/ingestionPipelines/ingestionPipeline.ts @@ -220,6 +220,10 @@ export interface OpenMetadataConnection { * the one configured on OpenMetadata server. */ authProvider?: AuthProvider; + /** + * Validate Openmetadata Server & Client Version. + */ + enableVersionValidation?: boolean; /** * OpenMetadata Server Config. Must include API end point ex: http://localhost:8585/api */ @@ -1081,6 +1085,10 @@ export interface Connection { * the one configured on OpenMetadata server. */ authProvider?: AuthProvider; + /** + * Validate Openmetadata Server & Client Version. + */ + enableVersionValidation?: boolean; /** * OpenMetadata Client security configuration. */ diff --git a/openmetadata-ui/src/main/resources/ui/src/generated/entity/services/metadataService.ts b/openmetadata-ui/src/main/resources/ui/src/generated/entity/services/metadataService.ts index 5ede68ec0af..5d906a5adec 100644 --- a/openmetadata-ui/src/main/resources/ui/src/generated/entity/services/metadataService.ts +++ b/openmetadata-ui/src/main/resources/ui/src/generated/entity/services/metadataService.ts @@ -229,6 +229,10 @@ export interface Connection { * the one configured on OpenMetadata server. */ authProvider?: AuthProvider; + /** + * Validate Openmetadata Server & Client Version. + */ + enableVersionValidation?: boolean; /** * OpenMetadata Client security configuration. */ diff --git a/openmetadata-ui/src/main/resources/ui/src/generated/metadataIngestion/workflow.ts b/openmetadata-ui/src/main/resources/ui/src/generated/metadataIngestion/workflow.ts index 6ac5bfe77ab..5b776f31755 100644 --- a/openmetadata-ui/src/main/resources/ui/src/generated/metadataIngestion/workflow.ts +++ b/openmetadata-ui/src/main/resources/ui/src/generated/metadataIngestion/workflow.ts @@ -689,6 +689,10 @@ export interface Connection { * the one configured on OpenMetadata server. */ authProvider?: AuthProvider; + /** + * Validate Openmetadata Server & Client Version. + */ + enableVersionValidation?: boolean; /** * OpenMetadata Client security configuration. */ @@ -1217,6 +1221,10 @@ export interface OpenMetadataConnection { * the one configured on OpenMetadata server. */ authProvider?: AuthProvider; + /** + * Validate Openmetadata Server & Client Version. + */ + enableVersionValidation?: boolean; /** * OpenMetadata Server Config. Must include API end point ex: http://localhost:8585/api */