Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ensure we have protocol version on actor def reads #18206

Merged
merged 3 commits into from
Oct 20, 2022
Merged

Ensure we have protocol version on actor def reads #18206

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7e38b68
Ensure we have protocol version on actor def reads
gosusnp Oct 20, 2022
da34eb3
Merge branch 'master' into gosusnp/add-version-default-on-read
gosusnp Oct 20, 2022
5167c50
Fix null ref
gosusnp Oct 20, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 16 additions & 3 deletions ...nfig/config-persistence/src/main/java/io/airbyte/config/persistence/ConfigRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,10 +190,16 @@ public void setFeedback(final UUID workflowId) throws JsonValidationException, C
public StandardSourceDefinition getStandardSourceDefinition(final UUID sourceDefinitionId)
throws JsonValidationException, IOException, ConfigNotFoundException {

return persistence.getConfig(
final StandardSourceDefinition sourceDef = persistence.getConfig(
ConfigSchema.STANDARD_SOURCE_DEFINITION,
sourceDefinitionId.toString(),
StandardSourceDefinition.class);
// Make sure we have a default version of the Protocol.
// This corner case may happen for connectors that haven't been upgraded since we added versioning.
if (sourceDef != null) {
return sourceDef.withProtocolVersion(AirbyteProtocolVersion.getWithDefault(sourceDef.getProtocolVersion()).serialize());
}
return null;
}

public StandardSourceDefinition getSourceDefinitionFromSource(final UUID sourceId) {
Expand Down Expand Up @@ -302,8 +308,15 @@ public void deleteSourceDefinitionAndAssociations(final UUID sourceDefinitionId)

public StandardDestinationDefinition getStandardDestinationDefinition(final UUID destinationDefinitionId)
throws JsonValidationException, IOException, ConfigNotFoundException {
return persistence.getConfig(ConfigSchema.STANDARD_DESTINATION_DEFINITION, destinationDefinitionId.toString(),
StandardDestinationDefinition.class);
final StandardDestinationDefinition destDef =
persistence.getConfig(ConfigSchema.STANDARD_DESTINATION_DEFINITION, destinationDefinitionId.toString(),
StandardDestinationDefinition.class);
// Make sure we have a default version of the Protocol.
// This corner case may happen for connectors that haven't been upgraded since we added versioning.
if (destDef != null) {
return destDef.withProtocolVersion(AirbyteProtocolVersion.getWithDefault(destDef.getProtocolVersion()).serialize());
}
return null;
}

public StandardDestinationDefinition getDestinationDefinitionFromDestination(final UUID destinationId) {
Expand Down