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.

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

Remove Fideslog #4109

Closed
wants to merge 9 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 8 additions & 1 deletion noxfiles/ci_nox.py
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,14 @@ def load_tests(session: nox.Session) -> None:
https://github.com/fcsonline/drill
"""
session.run(
"drill", "-b", "noxfiles/drill.yml", "--quiet", "--stats", external=True
"drill",
"-b",
"noxfiles/drill.yml",
"--quiet",
"--stats",
"--timeout",
"10", # Our server runs more slowly in CI
external=True,
)


Expand Down
2 changes: 1 addition & 1 deletion noxfiles/drill.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
concurrency: 5 # How many instances of the `plan` get run concurrently
base: 'http://localhost:8080'
iterations: 20 # How many times to run the plan
rampup: 1 # The number of seconds between starting concurrent runs
rampup: 2 # The number of seconds between starting concurrent runs

# This plan is run in its entirety, sequentially, for each iteration
plan:
Expand Down
1 change: 0 additions & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ expandvars==0.9.0
fastapi[all]==0.89.1
fastapi-pagination[sqlalchemy]==0.11.4
fideslang==2.2.0
fideslog==1.2.10
firebase-admin==5.3.0
GitPython==3.1.35
httpx==0.23.1
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
"""drop userregistration table

Revision ID: 4e9c4168bf18
Revises: ddec29f24945
Create Date: 2023-10-26 12:15:06.316303

"""
import sqlalchemy as sa
from alembic import op
from sqlalchemy.dialects import postgresql

# revision identifiers, used by Alembic.
revision = "4e9c4168bf18"
down_revision = "ddec29f24945"
branch_labels = None
depends_on = None


def upgrade():
# ### commands auto generated by Alembic - please adjust! ###
op.drop_index("ix_userregistration_id", table_name="userregistration")
op.drop_table("userregistration")
# ### end Alembic commands ###


def downgrade():
# ### commands auto generated by Alembic - please adjust! ###
op.create_table(
"userregistration",
sa.Column("id", sa.VARCHAR(length=255), autoincrement=False, nullable=False),
sa.Column(
"created_at",
postgresql.TIMESTAMP(timezone=True),
server_default=sa.text("now()"),
autoincrement=False,
nullable=True,
),
sa.Column(
"updated_at",
postgresql.TIMESTAMP(timezone=True),
server_default=sa.text("now()"),
autoincrement=False,
nullable=True,
),
sa.Column("user_email", sa.VARCHAR(), autoincrement=False, nullable=True),
sa.Column(
"user_organization", sa.VARCHAR(), autoincrement=False, nullable=True
),
sa.Column("analytics_id", sa.VARCHAR(), autoincrement=False, nullable=False),
sa.Column("opt_in", sa.BOOLEAN(), autoincrement=False, nullable=False),
sa.PrimaryKeyConstraint("id", name="userregistration_pkey"),
sa.UniqueConstraint("analytics_id", name="userregistration_analytics_id_key"),
)
op.create_index("ix_userregistration_id", "userregistration", ["id"], unique=False)
# ### end Alembic commands ###
58 changes: 0 additions & 58 deletions src/fides/api/analytics.py

This file was deleted.

2 changes: 0 additions & 2 deletions src/fides/api/api/v1/api.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
privacy_notice_endpoints,
privacy_preference_endpoints,
privacy_request_endpoints,
registration_endpoints,
saas_config_endpoints,
served_notice_endpoints,
storage_endpoints,
Expand Down Expand Up @@ -51,5 +50,4 @@
api_router.include_router(user_endpoints.router)
api_router.include_router(user_permission_endpoints.router)
api_router.include_router(manual_webhook_endpoints.router)
api_router.include_router(registration_endpoints.router)
api_router.include_router(served_notice_endpoints.router)
85 changes: 0 additions & 85 deletions src/fides/api/api/v1/endpoints/registration_endpoints.py

This file was deleted.

1 change: 0 additions & 1 deletion src/fides/api/db/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@
ServedNoticeHistory,
)
from fides.api.models.privacy_request import PrivacyRequest
from fides.api.models.registration import UserRegistration
from fides.api.models.storage import StorageConfig
from fides.api.models.system_history import SystemHistory
from fides.api.models.system_manager import SystemManager
106 changes: 0 additions & 106 deletions src/fides/api/graph/analytics_events.py

This file was deleted.

4 changes: 2 additions & 2 deletions src/fides/api/graph/graph_differences.py
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ def format_graph_for_caching(


class GraphDiff(FidesSchema):
"""A more detailed description about how two graphs differ. Do not send these details to FidesLog."""
"""A more detailed description about how two graphs differ."""

previous_collections: List[str] = []
current_collections: List[str] = []
Expand All @@ -71,7 +71,7 @@ class GraphDiff(FidesSchema):


class GraphDiffSummary(FidesSchema):
"""A summary about how two graphs have changed. This can be sent to FidesLog."""
"""A summary about how two graphs have changed."""

prev_collection_count: int = 0
curr_collection_count: int = 0
Expand Down
Loading
Loading