Merge branch 'master' into upgrade-api-server-dependencies

ITISFoundation · Dec 10, 2024 · a3be13e · a3be13e
2 parents 92dc0b0 + e9bc718
commit a3be13e
Show file tree

Hide file tree

Showing 7 changed files with 35 additions and 4 deletions.
diff --git a/packages/models-library/src/models_library/resource_tracker.py b/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):

diff --git a/...ore_postgres_database/migration/versions/4d007819e61a_add_license_type_to_pricing_plan.py b/...ore_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 ###
diff --git a/.../postgres-database/src/simcore_postgres_database/models/resource_tracker_pricing_plans.py b/.../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(

diff --git a/services/api-server/openapi.json b/services/api-server/openapi.json
@@ -6469,7 +6469,8 @@
       "PricingPlanClassification": {
         "type": "string",
         "enum": [
-          "TIER"
+          "TIER",
+          "LICENSE"
         ],
         "title": "PricingPlanClassification"
       },

diff --git a/services/resource-usage-tracker/openapi.json b/services/resource-usage-tracker/openapi.json
@@ -378,7 +378,8 @@
       "PricingPlanClassification": {
         "type": "string",
         "enum": [
-          "TIER"
+          "TIER",
+          "LICENSE"
         ],
         "title": "PricingPlanClassification"
       },

diff --git a/services/web/server/src/simcore_service_webserver/api/v0/openapi.yaml b/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:

diff --git a/services/web/server/tests/unit/isolated/test_tracing.py b/services/web/server/tests/unit/isolated/test_tracing.py
@@ -17,14 +17,15 @@
 def mock_webserver_service_environment(
     monkeypatch: pytest.MonkeyPatch, mock_webserver_service_environment: EnvVarsDict
 ) -> EnvVarsDict:
-
-    return mock_webserver_service_environment | setenvs_from_dict(
+    monkeypatch.delenv("WEBSERVER_TRACING")
+    envs = mock_webserver_service_environment | setenvs_from_dict(
         monkeypatch,
         {
             "TRACING_OPENTELEMETRY_COLLECTOR_ENDPOINT": "http://opentelemetry-collector",
             "TRACING_OPENTELEMETRY_COLLECTOR_PORT": "4318",
         },
     )
+    return envs
 
 
 def test_middleware_restrictions_opentelemetry_is_second_middleware(
-Original file line number
+Diff line change
@@ Expand Up / @@ -18,6 +18,7 @@ class PricingPlanClassification(str, enum.Enum): @@
         """
         TIER = "TIER"
+        LICENSE = "LICENSE"
     resource_tracker_pricing_plans = sa.Table(
@@ Expand Down @@