Skip to content

v2 changes of pipeline and api#467

Merged
hari-kuriakose merged 2 commits into
mainfrom
feat/MultiTenancyV2-PipelineAndApi
Jul 18, 2024
Merged

v2 changes of pipeline and api#467
hari-kuriakose merged 2 commits into
mainfrom
feat/MultiTenancyV2-PipelineAndApi

Conversation

@muhammad-ali-e
Copy link
Copy Markdown
Contributor

NOTE

  • This PR is intended to make a copy of the existing applications to facilitate the transition to v2. It does not aim to change or optimize the existing code.
  • Review comments can be added as TODO items for future enhancements.

What

  • Introduced v2 changes for the pipeline and api applications.

Why

  • To align with the updated architecture and ensure compatibility with v2 applications.
  • To streamline the handling of organization contexts without relying on django_tenants.

How

  • Updated imports to reference v2 instead of v1 applications.
  • Revised the get_organization method to utilize the user context.
  • Renamed applications in apps.py.
  • Added new models with updated table names.
  • Updated models with DefaultOrganizationMixin class.
  • Added APIDeploymentModelManager with DefaultOrganizationManagerMixin to get the organization data in api.
  • Added PipelineModelManager with DefaultOrganizationManagerMixin to get the organization data in pipeline.

Can this PR break any existing features. If yes, please list possible items. If no, please explain why. (PS: Admins do not merge the PR without this section filled)

  • The new methods are self-contained ensuring no impact on current functionality.

Database Migrations

Env Config

Relevant Docs

Related Issues or PRs

  1. unstract-multi-tenantV2 feature-flag changes #422
  2. Feat/multi tenancy v2 context and organization #430
  3. Version 2 of User/Organization Account Module #431
  4. version 2 of user/organization tenant account module - UN-1424 #432
  5. v2 changes of platform settings #447
  6. v2 changes of connector and connector_auth #461
  7. v2 changes of workflow with endpoints #464
  8. Feat/multi tenancy v2 adapter and connector processor #465
  9. v2 changes of Filemanagement And Scheduler #466

Dependencies Versions

Notes on Testing

Screenshots

Checklist

I have read and understood the Contribution Guidelines.

Copy link
Copy Markdown
Contributor

@hari-kuriakose hari-kuriakose left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@muhammad-ali-e Models look good.

We will take care of duplication when we delete v1 eventually, and also migration files can be generated later together.

Copy link
Copy Markdown
Contributor

@athul-rs athul-rs left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM.

@muhammad-ali-e Hope you have tried triggering a pipeline execution since those also involve organisation checks during runs.

@muhammad-ali-e
Copy link
Copy Markdown
Contributor Author

LGTM.

@muhammad-ali-e Hope you have tried triggering a pipeline execution since those also involve organisation checks during runs.

@athul-rs We can check it once it merged. I think it handled by the DefaultOrganizationMixin in pipeline model

@github-actions
Copy link
Copy Markdown
Contributor

filepath function $$\textcolor{#23d18b}{\tt{passed}}$$ SUBTOTAL
$$\textcolor{#23d18b}{\tt{worker/src/unstract/worker/clients/test\_docker.py}}$$ $$\textcolor{#23d18b}{\tt{test\_logs}}$$ $$\textcolor{#23d18b}{\tt{1}}$$ $$\textcolor{#23d18b}{\tt{1}}$$
$$\textcolor{#23d18b}{\tt{worker/src/unstract/worker/clients/test\_docker.py}}$$ $$\textcolor{#23d18b}{\tt{test\_cleanup}}$$ $$\textcolor{#23d18b}{\tt{1}}$$ $$\textcolor{#23d18b}{\tt{1}}$$
$$\textcolor{#23d18b}{\tt{worker/src/unstract/worker/clients/test\_docker.py}}$$ $$\textcolor{#23d18b}{\tt{test\_cleanup\_skip}}$$ $$\textcolor{#23d18b}{\tt{1}}$$ $$\textcolor{#23d18b}{\tt{1}}$$
$$\textcolor{#23d18b}{\tt{worker/src/unstract/worker/clients/test\_docker.py}}$$ $$\textcolor{#23d18b}{\tt{test\_client\_init}}$$ $$\textcolor{#23d18b}{\tt{1}}$$ $$\textcolor{#23d18b}{\tt{1}}$$
$$\textcolor{#23d18b}{\tt{worker/src/unstract/worker/clients/test\_docker.py}}$$ $$\textcolor{#23d18b}{\tt{test\_get\_image\_exists}}$$ $$\textcolor{#23d18b}{\tt{1}}$$ $$\textcolor{#23d18b}{\tt{1}}$$
$$\textcolor{#23d18b}{\tt{worker/src/unstract/worker/clients/test\_docker.py}}$$ $$\textcolor{#23d18b}{\tt{test\_get\_image}}$$ $$\textcolor{#23d18b}{\tt{1}}$$ $$\textcolor{#23d18b}{\tt{1}}$$
$$\textcolor{#23d18b}{\tt{worker/src/unstract/worker/clients/test\_docker.py}}$$ $$\textcolor{#23d18b}{\tt{test\_get\_container\_run\_config}}$$ $$\textcolor{#23d18b}{\tt{1}}$$ $$\textcolor{#23d18b}{\tt{1}}$$
$$\textcolor{#23d18b}{\tt{worker/src/unstract/worker/clients/test\_docker.py}}$$ $$\textcolor{#23d18b}{\tt{test\_get\_container\_run\_config\_without\_mount}}$$ $$\textcolor{#23d18b}{\tt{1}}$$ $$\textcolor{#23d18b}{\tt{1}}$$
$$\textcolor{#23d18b}{\tt{worker/src/unstract/worker/clients/test\_docker.py}}$$ $$\textcolor{#23d18b}{\tt{test\_run\_container}}$$ $$\textcolor{#23d18b}{\tt{1}}$$ $$\textcolor{#23d18b}{\tt{1}}$$
$$\textcolor{#23d18b}{\tt{TOTAL}}$$ $$\textcolor{#23d18b}{\tt{9}}$$ $$\textcolor{#23d18b}{\tt{9}}$$

@sonarqubecloud
Copy link
Copy Markdown

Quality Gate Failed Quality Gate failed

Failed conditions
71.3% Duplication on New Code (required ≤ 3%)
C Reliability Rating on New Code (required ≥ A)

See analysis details on SonarCloud

Catch issues before they fail your Quality Gate with our IDE extension SonarLint

@hari-kuriakose hari-kuriakose merged commit f057d3b into main Jul 18, 2024
@hari-kuriakose hari-kuriakose deleted the feat/MultiTenancyV2-PipelineAndApi branch July 18, 2024 16:03
pk-zipstack pushed a commit that referenced this pull request Aug 20, 2025
Co-authored-by: Hari John Kuriakose <hari@zipstack.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants