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

Initial upgrade process support #4954

Merged
merged 6 commits into from
Aug 9, 2024
Merged

Initial upgrade process support #4954

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
24b45ea
Initial upgrade process support
carlesarnal Jul 31, 2024
d702c96
Improve test assertions
carlesarnal Aug 1, 2024
61d3090
Fix labels and properties management
carlesarnal Aug 5, 2024
9fdf469
Move the data upgrade process to the v2 endpoint and improve referenc…
carlesarnal Aug 6, 2024
aae7b85
Improve test assertions
carlesarnal Aug 7, 2024
5e024eb
Add back migration tests
carlesarnal Aug 8, 2024
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
2 changes: 1 addition & 1 deletion app/src/main/java/io/apicurio/registry/ImportLifecycleBean.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
import io.apicurio.registry.storage.impexp.EntityInputStream;
import io.apicurio.registry.types.Current;
import io.apicurio.registry.utils.impexp.Entity;
import io.apicurio.registry.utils.impexp.EntityReader;
import io.apicurio.registry.utils.impexp.v3.EntityReader;
import jakarta.enterprise.context.ApplicationScoped;
import jakarta.enterprise.event.ObservesAsync;
import jakarta.inject.Inject;
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/io/apicurio/registry/rest/v2/AdminResourceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
import io.apicurio.registry.types.RuleType;
import io.apicurio.registry.types.provider.ArtifactTypeUtilProviderFactory;
import io.apicurio.registry.utils.impexp.Entity;
import io.apicurio.registry.utils.impexp.EntityReader;
import io.apicurio.registry.utils.impexp.v2.EntityReader;
import jakarta.enterprise.context.ApplicationScoped;
import jakarta.inject.Inject;
import jakarta.interceptor.Interceptors;
Expand Down Expand Up @@ -264,7 +264,7 @@ public void close() throws IOException {
zip.close();
}
};
this.storage.importData(stream, isNullOrTrue(xRegistryPreserveGlobalId),
this.storage.upgradeData(stream, isNullOrTrue(xRegistryPreserveGlobalId),
isNullOrTrue(xRegistryPreserveContentId));
}

Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/io/apicurio/registry/rest/v2/shared/DataExporter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import io.apicurio.registry.storage.RegistryStorage;
import io.apicurio.registry.types.Current;
import io.apicurio.registry.utils.impexp.EntityWriter;
import io.apicurio.registry.utils.impexp.v3.EntityWriter;
import jakarta.enterprise.context.ApplicationScoped;
import jakarta.inject.Inject;
import jakarta.ws.rs.core.Response;
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/io/apicurio/registry/rest/v3/AdminResourceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
import io.apicurio.registry.types.RuleType;
import io.apicurio.registry.types.provider.ArtifactTypeUtilProviderFactory;
import io.apicurio.registry.utils.impexp.Entity;
import io.apicurio.registry.utils.impexp.EntityReader;
import io.apicurio.registry.utils.impexp.v3.EntityReader;
import jakarta.enterprise.context.ApplicationScoped;
import jakarta.inject.Inject;
import jakarta.interceptor.Interceptors;
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/io/apicurio/registry/rest/v3/shared/DataExporter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import io.apicurio.registry.storage.RegistryStorage;
import io.apicurio.registry.types.Current;
import io.apicurio.registry.utils.impexp.EntityWriter;
import io.apicurio.registry.utils.impexp.v3.EntityWriter;
import jakarta.enterprise.context.ApplicationScoped;
import jakarta.inject.Inject;
import jakarta.ws.rs.core.Response;
Expand Down
43 changes: 28 additions & 15 deletions app/src/main/java/io/apicurio/registry/storage/RegistryStorage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,16 +42,16 @@
import io.apicurio.registry.storage.error.VersionNotFoundException;
import io.apicurio.registry.storage.impexp.EntityInputStream;
import io.apicurio.registry.types.RuleType;
import io.apicurio.registry.utils.impexp.ArtifactEntity;
import io.apicurio.registry.utils.impexp.ArtifactRuleEntity;
import io.apicurio.registry.utils.impexp.ArtifactVersionEntity;
import io.apicurio.registry.utils.impexp.BranchEntity;
import io.apicurio.registry.utils.impexp.CommentEntity;
import io.apicurio.registry.utils.impexp.ContentEntity;
import io.apicurio.registry.utils.impexp.Entity;
import io.apicurio.registry.utils.impexp.GlobalRuleEntity;
import io.apicurio.registry.utils.impexp.GroupEntity;
import io.apicurio.registry.utils.impexp.GroupRuleEntity;
import io.apicurio.registry.utils.impexp.v3.ArtifactEntity;
import io.apicurio.registry.utils.impexp.v3.ArtifactRuleEntity;
import io.apicurio.registry.utils.impexp.v3.ArtifactVersionEntity;
import io.apicurio.registry.utils.impexp.v3.BranchEntity;
import io.apicurio.registry.utils.impexp.v3.CommentEntity;
import io.apicurio.registry.utils.impexp.v3.ContentEntity;
import io.apicurio.registry.utils.impexp.v3.GlobalRuleEntity;
import io.apicurio.registry.utils.impexp.v3.GroupEntity;
import io.apicurio.registry.utils.impexp.v3.GroupRuleEntity;
import org.apache.commons.lang3.tuple.Pair;

import java.time.Instant;
Expand Down Expand Up @@ -248,7 +248,7 @@ void updateArtifactMetaData(String groupId, String artifactId, EditableArtifactM

/**
* Get all rules configured for a group.
*
*
* @param groupId
* @throws GroupNotFoundException
* @throws RegistryStorageException
Expand All @@ -257,7 +257,7 @@ void updateArtifactMetaData(String groupId, String artifactId, EditableArtifactM

/**
* Create/configure a rule for a group.
*
*
* @param groupId
* @param rule
* @param config
Expand All @@ -270,7 +270,7 @@ void createGroupRule(String groupId, RuleType rule, RuleConfigurationDto config)

/**
* Delete all rules configured for a group.
*
*
* @param groupId
* @throws GroupNotFoundException
* @throws RegistryStorageException
Expand All @@ -279,7 +279,7 @@ void createGroupRule(String groupId, RuleType rule, RuleConfigurationDto config)

/**
* Update the configuration for a specific rule in a group.
*
*
* @param groupId
* @param rule
* @param config
Expand All @@ -292,7 +292,7 @@ void updateGroupRule(String groupId, RuleType rule, RuleConfigurationDto config)

/**
* Delete (unconfigure) a single rule for a group.
*
*
* @param groupId
* @param rule
* @throws GroupNotFoundException
Expand All @@ -304,7 +304,7 @@ void deleteGroupRule(String groupId, RuleType rule)

/**
* Gets the current configuration of a single rule in the group.
*
*
* @param groupId
* @param rule
* @throws GroupNotFoundException
Expand Down Expand Up @@ -625,6 +625,19 @@ void updateGlobalRule(RuleType rule, RuleConfigurationDto config)
void importData(EntityInputStream entities, boolean preserveGlobalId, boolean preserveContentId)
throws RegistryStorageException;

/**
* Called to upgrade and import previously exported data into the registry. It upgrades the data structure
* from v2 to v3 and imports the data into Registry.
*
* @param entities
* @param preserveGlobalId Preserve global ids. If false, global ids will be set to next id in global id
* sequence.
* @param preserveContentId Preserve content id. If false, content ids will be set to the next ids in the
* content id sequence. Content-Version mapping will be preserved.
* @throws RegistryStorageException
*/
void upgradeData(EntityInputStream entities, boolean preserveGlobalId, boolean preserveContentId);

/**
* Counts the total number of artifacts in the registry.
*
Expand Down
25 changes: 16 additions & 9 deletions ...rc/main/java/io/apicurio/registry/storage/decorator/ReadOnlyRegistryStorageDecorator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,15 +28,15 @@
import io.apicurio.registry.storage.error.RuleNotFoundException;
import io.apicurio.registry.storage.impexp.EntityInputStream;
import io.apicurio.registry.types.RuleType;
import io.apicurio.registry.utils.impexp.ArtifactEntity;
import io.apicurio.registry.utils.impexp.ArtifactRuleEntity;
import io.apicurio.registry.utils.impexp.ArtifactVersionEntity;
import io.apicurio.registry.utils.impexp.BranchEntity;
import io.apicurio.registry.utils.impexp.CommentEntity;
import io.apicurio.registry.utils.impexp.ContentEntity;
import io.apicurio.registry.utils.impexp.GlobalRuleEntity;
import io.apicurio.registry.utils.impexp.GroupEntity;
import io.apicurio.registry.utils.impexp.GroupRuleEntity;
import io.apicurio.registry.utils.impexp.v3.ArtifactEntity;
import io.apicurio.registry.utils.impexp.v3.ArtifactRuleEntity;
import io.apicurio.registry.utils.impexp.v3.ArtifactVersionEntity;
import io.apicurio.registry.utils.impexp.v3.BranchEntity;
import io.apicurio.registry.utils.impexp.v3.CommentEntity;
import io.apicurio.registry.utils.impexp.v3.ContentEntity;
import io.apicurio.registry.utils.impexp.v3.GlobalRuleEntity;
import io.apicurio.registry.utils.impexp.v3.GroupEntity;
import io.apicurio.registry.utils.impexp.v3.GroupRuleEntity;
import jakarta.enterprise.context.ApplicationScoped;
import org.apache.commons.lang3.tuple.Pair;
import org.eclipse.microprofile.config.inject.ConfigProperty;
Expand Down Expand Up @@ -244,6 +244,13 @@ public void importData(EntityInputStream entities, boolean preserveGlobalId, boo
delegate.importData(entities, preserveGlobalId, preserveContentId);
}

@Override
public void upgradeData(EntityInputStream entities, boolean preserveGlobalId, boolean preserveContentId)
throws RegistryStorageException {
checkReadOnly();
delegate.upgradeData(entities, preserveGlobalId, preserveContentId);
}

@Override
public void createRoleMapping(String principalId, String role, String principalName)
throws RegistryStorageException {
Expand Down
24 changes: 15 additions & 9 deletions app/src/main/java/io/apicurio/registry/storage/decorator/RegistryStorageDecoratorBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,15 @@
import io.apicurio.registry.storage.error.VersionNotFoundException;
import io.apicurio.registry.storage.impexp.EntityInputStream;
import io.apicurio.registry.types.RuleType;
import io.apicurio.registry.utils.impexp.ArtifactEntity;
import io.apicurio.registry.utils.impexp.ArtifactRuleEntity;
import io.apicurio.registry.utils.impexp.ArtifactVersionEntity;
import io.apicurio.registry.utils.impexp.BranchEntity;
import io.apicurio.registry.utils.impexp.CommentEntity;
import io.apicurio.registry.utils.impexp.ContentEntity;
import io.apicurio.registry.utils.impexp.GlobalRuleEntity;
import io.apicurio.registry.utils.impexp.GroupEntity;
import io.apicurio.registry.utils.impexp.GroupRuleEntity;
import io.apicurio.registry.utils.impexp.v3.ArtifactEntity;
import io.apicurio.registry.utils.impexp.v3.ArtifactRuleEntity;
import io.apicurio.registry.utils.impexp.v3.ArtifactVersionEntity;
import io.apicurio.registry.utils.impexp.v3.BranchEntity;
import io.apicurio.registry.utils.impexp.v3.CommentEntity;
import io.apicurio.registry.utils.impexp.v3.ContentEntity;
import io.apicurio.registry.utils.impexp.v3.GlobalRuleEntity;
import io.apicurio.registry.utils.impexp.v3.GroupEntity;
import io.apicurio.registry.utils.impexp.v3.GroupRuleEntity;
import org.apache.commons.lang3.tuple.Pair;

import java.util.List;
Expand Down Expand Up @@ -187,6 +187,12 @@ public void importData(EntityInputStream entities, boolean preserveGlobalId, boo
delegate.importData(entities, preserveGlobalId, preserveContentId);
}

@Override
public void upgradeData(EntityInputStream entities, boolean preserveGlobalId, boolean preserveContentId)
throws RegistryStorageException {
delegate.upgradeData(entities, preserveGlobalId, preserveContentId);
}

@Override
public void createRoleMapping(String principalId, String role, String principalName)
throws RegistryStorageException {
Expand Down
24 changes: 15 additions & 9 deletions ...c/main/java/io/apicurio/registry/storage/impl/gitops/AbstractReadOnlyRegistryStorage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,15 @@
import io.apicurio.registry.storage.error.RegistryStorageException;
import io.apicurio.registry.storage.impexp.EntityInputStream;
import io.apicurio.registry.types.RuleType;
import io.apicurio.registry.utils.impexp.ArtifactEntity;
import io.apicurio.registry.utils.impexp.ArtifactRuleEntity;
import io.apicurio.registry.utils.impexp.ArtifactVersionEntity;
import io.apicurio.registry.utils.impexp.BranchEntity;
import io.apicurio.registry.utils.impexp.CommentEntity;
import io.apicurio.registry.utils.impexp.ContentEntity;
import io.apicurio.registry.utils.impexp.GlobalRuleEntity;
import io.apicurio.registry.utils.impexp.GroupEntity;
import io.apicurio.registry.utils.impexp.GroupRuleEntity;
import io.apicurio.registry.utils.impexp.v3.ArtifactEntity;
import io.apicurio.registry.utils.impexp.v3.ArtifactRuleEntity;
import io.apicurio.registry.utils.impexp.v3.ArtifactVersionEntity;
import io.apicurio.registry.utils.impexp.v3.BranchEntity;
import io.apicurio.registry.utils.impexp.v3.CommentEntity;
import io.apicurio.registry.utils.impexp.v3.ContentEntity;
import io.apicurio.registry.utils.impexp.v3.GlobalRuleEntity;
import io.apicurio.registry.utils.impexp.v3.GroupEntity;
import io.apicurio.registry.utils.impexp.v3.GroupRuleEntity;
import org.apache.commons.lang3.tuple.Pair;

import java.util.List;
Expand Down Expand Up @@ -179,6 +179,12 @@ public void importData(EntityInputStream entities, boolean preserveGlobalId, boo
readOnlyViolation();
}

@Override
public void upgradeData(EntityInputStream entities, boolean preserveGlobalId, boolean preserveContentId)
throws RegistryStorageException {
readOnlyViolation();
}

@Override
public void createRoleMapping(String principalId, String role, String principalName)
throws RegistryStorageException {
Expand Down
12 changes: 6 additions & 6 deletions app/src/main/java/io/apicurio/registry/storage/impl/gitops/GitManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@
import io.apicurio.registry.types.ContentTypes;
import io.apicurio.registry.types.RuleType;
import io.apicurio.registry.types.VersionState;
import io.apicurio.registry.utils.impexp.ArtifactEntity;
import io.apicurio.registry.utils.impexp.ArtifactRuleEntity;
import io.apicurio.registry.utils.impexp.ArtifactVersionEntity;
import io.apicurio.registry.utils.impexp.ContentEntity;
import io.apicurio.registry.utils.impexp.GlobalRuleEntity;
import io.apicurio.registry.utils.impexp.GroupEntity;
import io.apicurio.registry.utils.impexp.v3.ArtifactEntity;
import io.apicurio.registry.utils.impexp.v3.ArtifactRuleEntity;
import io.apicurio.registry.utils.impexp.v3.ArtifactVersionEntity;
import io.apicurio.registry.utils.impexp.v3.ContentEntity;
import io.apicurio.registry.utils.impexp.v3.GlobalRuleEntity;
import io.apicurio.registry.utils.impexp.v3.GroupEntity;
import jakarta.annotation.PreDestroy;
import jakarta.enterprise.context.ApplicationScoped;
import jakarta.inject.Inject;
Expand Down
Loading
Loading