From 7db60c58fd23333e94594a9f1a4d9ce0d96eb1a7 Mon Sep 17 00:00:00 2001 From: Mark90 Date: Mon, 29 Jul 2024 15:04:52 +0200 Subject: [PATCH 1/2] Resolve differences between DB models and alembic autogenerate Signed-off-by: Mark90 --- orchestrator/db/models.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/orchestrator/db/models.py b/orchestrator/db/models.py index 8f516dea2..fefbc754b 100644 --- a/orchestrator/db/models.py +++ b/orchestrator/db/models.py @@ -85,9 +85,7 @@ class ProcessTable(BaseModel): __tablename__ = "processes" process_id = mapped_column("pid", UUIDType, server_default=text("uuid_generate_v4()"), primary_key=True, index=True) - workflow_id = mapped_column( - "workflow_id", UUIDType, ForeignKey("workflows.workflow_id", ondelete="CASCADE"), nullable=False - ) + workflow_id = mapped_column("workflow_id", UUIDType, ForeignKey("workflows.workflow_id"), nullable=False) assignee = mapped_column(String(50), server_default=Assignee.SYSTEM, nullable=False) last_status = mapped_column(String(50), nullable=False) last_step = mapped_column(String(255), nullable=True) @@ -521,6 +519,7 @@ class SubscriptionInstanceValueTable(BaseModel): UUIDType, ForeignKey("subscription_instances.subscription_instance_id", ondelete="CASCADE"), index=True, + nullable=False, ) resource_type_id = mapped_column( UUIDType, ForeignKey("resource_types.resource_type_id"), nullable=False, index=True @@ -569,7 +568,7 @@ class SubscriptionTable(BaseModel): status = mapped_column(String(STATUS_LENGTH), nullable=False, index=True) product_id = mapped_column(UUIDType, ForeignKey("products.product_id"), nullable=False, index=True) customer_id = mapped_column(String, index=True, nullable=False) - insync = mapped_column(Boolean()) + insync = mapped_column(Boolean(), nullable=False) start_date = mapped_column(UtcTimestamp, nullable=True) end_date = mapped_column(UtcTimestamp) note = mapped_column(Text()) @@ -622,6 +621,7 @@ class SubscriptionMetadataTable(BaseModel): UUIDType, ForeignKey("subscriptions.subscription_id", ondelete="CASCADE"), primary_key=True, + index=True, ) metadata_ = mapped_column("metadata", pg.JSONB(), nullable=False) # type: ignore From d44e6d4275aad48da3ae197b1c2d8e6fa73c6e80 Mon Sep 17 00:00:00 2001 From: Mark90 Date: Mon, 29 Jul 2024 15:05:35 +0200 Subject: [PATCH 2/2] Bump version to 2.7.0rc2 --- .bumpversion.cfg | 2 +- orchestrator/__init__.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 6ee794ca5..0cacc6255 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 2.7.0rc1 +current_version = 2.7.0rc2 commit = False tag = False parse = (?P\d+)\.(?P\d+)\.(?P\d+)(rc(?P\d+))? diff --git a/orchestrator/__init__.py b/orchestrator/__init__.py index 07f99158c..5f849c77f 100644 --- a/orchestrator/__init__.py +++ b/orchestrator/__init__.py @@ -13,7 +13,7 @@ """This is the orchestrator workflow engine.""" -__version__ = "2.7.0rc1" +__version__ = "2.7.0rc2" from orchestrator.app import OrchestratorCore from orchestrator.settings import app_settings