Skip to content

Commit 2f7deae

Browse files
authored
[skip ci] Metadata: Remove leading underscore (#29024)
* DNC * Add test models * Add model test * Remove underscore from metadata files * Regenerate models * Add test to check for key transformation * Allow additional fields on metadata * Delete transform
1 parent 72f2a5f commit 2f7deae

File tree

376 files changed

+1671
-1545
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

376 files changed

+1671
-1545
lines changed

airbyte-ci/connectors/metadata_service/lib/metadata_service/gcs_upload.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
from metadata_service.constants import METADATA_FILE_NAME, METADATA_FOLDER, ICON_FILE_NAME
1818
from metadata_service.validators.metadata_validator import POST_UPLOAD_VALIDATORS, validate_and_load
19-
from metadata_service.utils import to_json_sanitized_dict
19+
from metadata_service.models.transform import to_json_sanitized_dict
2020
from metadata_service.models.generated.ConnectorMetadataDefinitionV0 import ConnectorMetadataDefinitionV0
2121

2222
from dataclasses import dataclass

airbyte-ci/connectors/metadata_service/lib/metadata_service/models/generated/AirbyteInternal.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@
55

66
from typing import Optional
77

8-
from pydantic import BaseModel, Extra, Field
8+
from pydantic import BaseModel, Extra
99
from typing_extensions import Literal
1010

1111

1212
class AirbyteInternal(BaseModel):
1313
class Config:
1414
extra = Extra.allow
1515

16-
field_sl: Optional[Literal[100, 200, 300]] = Field(None, alias="_sl")
17-
field_ql: Optional[Literal[100, 200, 300, 400, 500, 600]] = Field(None, alias="_ql")
16+
sl: Optional[Literal[100, 200, 300]] = None
17+
ql: Optional[Literal[100, 200, 300, 400, 500, 600]] = None

airbyte-ci/connectors/metadata_service/lib/metadata_service/models/generated/ConnectorMetadataDefinitionV0.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -112,8 +112,8 @@ class AirbyteInternal(BaseModel):
112112
class Config:
113113
extra = Extra.allow
114114

115-
field_sl: Optional[Literal[100, 200, 300]] = Field(None, alias="_sl")
116-
field_ql: Optional[Literal[100, 200, 300, 400, 500, 600]] = Field(None, alias="_ql")
115+
sl: Optional[Literal[100, 200, 300]] = None
116+
ql: Optional[Literal[100, 200, 300, 400, 500, 600]] = None
117117

118118

119119
class JobTypeResourceLimit(BaseModel):
@@ -185,7 +185,7 @@ class Config:
185185

186186
class Data(BaseModel):
187187
class Config:
188-
extra = Extra.forbid
188+
extra = Extra.allow
189189

190190
name: str
191191
icon: Optional[str] = None
@@ -224,7 +224,7 @@ class Config:
224224
normalizationConfig: Optional[NormalizationDestinationDefinitionConfig] = None
225225
suggestedStreams: Optional[SuggestedStreams] = None
226226
resourceRequirements: Optional[ActorDefinitionResourceRequirements] = None
227-
field_ab_internal: Optional[AirbyteInternal] = Field(None, alias="_ab_internal")
227+
ab_internal: Optional[AirbyteInternal] = None
228228

229229

230230
class ConnectorMetadataDefinitionV0(BaseModel):

airbyte-ci/connectors/metadata_service/lib/metadata_service/models/generated/ConnectorRegistryDestinationDefinition.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -102,8 +102,8 @@ class AirbyteInternal(BaseModel):
102102
class Config:
103103
extra = Extra.allow
104104

105-
field_sl: Optional[Literal[100, 200, 300]] = Field(None, alias="_sl")
106-
field_ql: Optional[Literal[100, 200, 300, 400, 500, 600]] = Field(None, alias="_ql")
105+
sl: Optional[Literal[100, 200, 300]] = None
106+
ql: Optional[Literal[100, 200, 300, 400, 500, 600]] = None
107107

108108

109109
class JobTypeResourceLimit(BaseModel):
@@ -190,4 +190,4 @@ class Config:
190190
)
191191
allowedHosts: Optional[AllowedHosts] = None
192192
releases: Optional[ConnectorReleases] = None
193-
field_ab_internal: Optional[AirbyteInternal] = Field(None, alias="_ab_internal")
193+
ab_internal: Optional[AirbyteInternal] = None

airbyte-ci/connectors/metadata_service/lib/metadata_service/models/generated/ConnectorRegistrySourceDefinition.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,8 @@ class AirbyteInternal(BaseModel):
9494
class Config:
9595
extra = Extra.allow
9696

97-
field_sl: Optional[Literal[100, 200, 300]] = Field(None, alias="_sl")
98-
field_ql: Optional[Literal[100, 200, 300, 400, 500, 600]] = Field(None, alias="_ql")
97+
sl: Optional[Literal[100, 200, 300]] = None
98+
ql: Optional[Literal[100, 200, 300, 400, 500, 600]] = None
9999

100100

101101
class JobTypeResourceLimit(BaseModel):
@@ -179,4 +179,4 @@ class Config:
179179
description="Number of seconds allowed between 2 airbyte protocol messages. The source will timeout if this delay is reach",
180180
)
181181
releases: Optional[ConnectorReleases] = None
182-
field_ab_internal: Optional[AirbyteInternal] = Field(None, alias="_ab_internal")
182+
ab_internal: Optional[AirbyteInternal] = None

airbyte-ci/connectors/metadata_service/lib/metadata_service/models/generated/ConnectorRegistryV0.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -102,8 +102,8 @@ class AirbyteInternal(BaseModel):
102102
class Config:
103103
extra = Extra.allow
104104

105-
field_sl: Optional[Literal[100, 200, 300]] = Field(None, alias="_sl")
106-
field_ql: Optional[Literal[100, 200, 300, 400, 500, 600]] = Field(None, alias="_ql")
105+
sl: Optional[Literal[100, 200, 300]] = None
106+
ql: Optional[Literal[100, 200, 300, 400, 500, 600]] = None
107107

108108

109109
class SuggestedStreams(BaseModel):
@@ -197,7 +197,7 @@ class Config:
197197
description="Number of seconds allowed between 2 airbyte protocol messages. The source will timeout if this delay is reach",
198198
)
199199
releases: Optional[ConnectorReleases] = None
200-
field_ab_internal: Optional[AirbyteInternal] = Field(None, alias="_ab_internal")
200+
ab_internal: Optional[AirbyteInternal] = None
201201

202202

203203
class ConnectorRegistryDestinationDefinition(BaseModel):
@@ -244,7 +244,7 @@ class Config:
244244
)
245245
allowedHosts: Optional[AllowedHosts] = None
246246
releases: Optional[ConnectorReleases] = None
247-
field_ab_internal: Optional[AirbyteInternal] = Field(None, alias="_ab_internal")
247+
ab_internal: Optional[AirbyteInternal] = None
248248

249249

250250
class ConnectorRegistryV0(BaseModel):

airbyte-ci/connectors/metadata_service/lib/metadata_service/models/src/AirbyteInternal.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ description: Fields for internal use only
66
type: object
77
additionalProperties: true
88
properties:
9-
_sl:
9+
sl:
1010
type: integer
1111
enum:
1212
- 100
1313
- 200
1414
- 300
15-
_ql:
15+
ql:
1616
type: integer
1717
enum:
1818
- 100

airbyte-ci/connectors/metadata_service/lib/metadata_service/models/src/ConnectorMetadataDefinitionV0.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ properties:
2525
- githubIssueLabel
2626
- connectorSubtype
2727
- releaseStage
28-
additionalProperties: false
28+
additionalProperties: true
2929
properties:
3030
name:
3131
type: string
@@ -105,5 +105,5 @@ properties:
105105
"$ref": SuggestedStreams.yaml
106106
resourceRequirements:
107107
"$ref": ActorDefinitionResourceRequirements.yaml
108-
_ab_internal:
108+
ab_internal:
109109
"$ref": AirbyteInternal.yaml

airbyte-ci/connectors/metadata_service/lib/metadata_service/models/src/ConnectorRegistryDestinationDefinition.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,5 +70,5 @@ properties:
7070
"$ref": AllowedHosts.yaml
7171
releases:
7272
"$ref": ConnectorReleases.yaml
73-
_ab_internal:
73+
ab_internal:
7474
"$ref": AirbyteInternal.yaml

airbyte-ci/connectors/metadata_service/lib/metadata_service/models/src/ConnectorRegistrySourceDefinition.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,5 +72,5 @@ properties:
7272
type: integer
7373
releases:
7474
"$ref": ConnectorReleases.yaml
75-
_ab_internal:
75+
ab_internal:
7676
"$ref": AirbyteInternal.yaml

0 commit comments

Comments
 (0)