Merge branch 'master' into refactor-gh-workflow-file

Author: bisgaard-itis

packages/models-library/src/models_library/resource_tracker.py

@@ -52,6 +52,7 @@ class CreditClassification(StrAutoEnum):
 
 class PricingPlanClassification(StrAutoEnum):
     TIER = auto()
+    LICENSE = auto()
 
 
 class PricingInfo(BaseModel):

packages/postgres-database/src/simcore_postgres_database/migration/versions/4d007819e61a_add_license_type_to_pricing_plan.py

@@ -0,0 +1,25 @@
+"""add LICENSE type to pricing plan
+
+Revision ID: 4d007819e61a
+Revises: 38c9ac332c58
+Create Date: 2024-12-09 14:25:45.024814+00:00
+
+"""
+import sqlalchemy as sa
+from alembic import op
+
+# revision identifiers, used by Alembic.
+revision = "4d007819e61a"
+down_revision = "38c9ac332c58"
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    op.execute(sa.DDL("ALTER TYPE pricingplanclassification ADD VALUE 'LICENSE'"))
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###

packages/postgres-database/src/simcore_postgres_database/models/resource_tracker_pricing_plans.py

@@ -18,6 +18,7 @@ class PricingPlanClassification(str, enum.Enum):
     """
 
     TIER = "TIER"
+    LICENSE = "LICENSE"
 
 
 resource_tracker_pricing_plans = sa.Table(

services/api-server/openapi.json

@@ -6469,7 +6469,8 @@
       "PricingPlanClassification": {
         "type": "string",
         "enum": [
-          "TIER"
+          "TIER",
+          "LICENSE"
         ],
         "title": "PricingPlanClassification"
       },

services/resource-usage-tracker/openapi.json

@@ -378,7 +378,8 @@
       "PricingPlanClassification": {
         "type": "string",
         "enum": [
-          "TIER"
+          "TIER",
+          "LICENSE"
         ],
         "title": "PricingPlanClassification"
       },

services/web/server/src/simcore_service_webserver/api/v0/openapi.yaml

@@ -11432,6 +11432,7 @@ components:
       type: string
       enum:
       - TIER
+      - LICENSE
       title: PricingPlanClassification
     PricingPlanToServiceAdminGet:
       properties: