Skip to content

Guidance table update #854

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.

Sign up for GitHub

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

Merged
Ethanljf merged 2 commits into from
Sep 25, 2020
Merged

Guidance table update #854

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6daac59
Update guidance table
Ethanljf Sep 24, 2020
4a7514c
Revised version file
Ethanljf Sep 24, 2020
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
13 changes: 8 additions & 5 deletions scripts/insert_csv.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,19 +210,22 @@
"guidance",
metadata,
sqlalchemy.Column("id", sqlalchemy.Integer, primary_key=True),
sqlalchemy.Column("tag_id", sqlalchemy.String),
sqlalchemy.Column("tag_name", sqlalchemy.String),
sqlalchemy.Column("guidance", sqlalchemy.String),
sqlalchemy.Column("ref_links", sqlalchemy.String),
sqlalchemy.Column("ref_links", ARRAY(sqlalchemy.String)),
)

Classification = sqlalchemy.Table(
"classification",
Summaries = sqlalchemy.Table(
"summaries",
metadata,
sqlalchemy.Column("id", sqlalchemy.Integer, primary_key=True),
sqlalchemy.Column("UNCLASSIFIED", sqlalchemy.String),
sqlalchemy.Column("name", sqlalchemy.String),
sqlalchemy.Column("count", sqlalchemy.Integer),
sqlalchemy.Column("percentage", sqlalchemy.Float),
sqlalchemy.Column("type", sqlalchemy.String),
)


async def insert():

# Establish DB connection
Expand Down
13 changes: 12 additions & 1 deletion services/auto-scan/autoscan.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,9 +214,20 @@
"guidance",
metadata,
sqlalchemy.Column("id", sqlalchemy.Integer, primary_key=True),
sqlalchemy.Column("tag_id", sqlalchemy.String),
sqlalchemy.Column("tag_name", sqlalchemy.String),
sqlalchemy.Column("guidance", sqlalchemy.String),
sqlalchemy.Column("ref_links", sqlalchemy.String),
sqlalchemy.Column("ref_links", ARRAY(sqlalchemy.String)),
)

Summaries = sqlalchemy.Table(
"summaries",
metadata,
sqlalchemy.Column("id", sqlalchemy.Integer, primary_key=True),
sqlalchemy.Column("name", sqlalchemy.String),
sqlalchemy.Column("count", sqlalchemy.Integer),
sqlalchemy.Column("percentage", sqlalchemy.Float),
sqlalchemy.Column("type", sqlalchemy.String),
)


Expand Down
35 changes: 35 additions & 0 deletions services/db-migration/migrations/versions/dc6adc4d8944_update_guidance_table.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
"""Update guidance table

Revision ID: dc6adc4d8944
Revises: 5f8c3a21331b
Create Date: 2020-09-24 12:04:03.960057

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


# revision identifiers, used by Alembic.
revision = 'dc6adc4d8944'
down_revision = '5f8c3a21331b'
branch_labels = None
depends_on = None


def upgrade():
op.drop_table("classification")
op.add_column(
"guidance", sa.Column("tag_id", sa.String()),
)
op.alter_column("guidance", "ref_links", type_=ARRAY(sa.String()), postgresql_using='ref_links::character varying[]')


def downgrade():
op.create_table(
"classification",
sa.Column("id", sa.Integer(), primary_key=True),
sa.Column("UNCLASSIFIED", sa.String()),
)
op.drop_column("guidance", "tag_id")
op.alter_column("guidance", "ref_links", type_=sa.String())
10 changes: 2 additions & 8 deletions services/db-migration/models/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,16 +181,10 @@
"guidance",
metadata,
sqlalchemy.Column("id", sqlalchemy.Integer, primary_key=True),
sqlalchemy.Column("tag_id", sqlalchemy.String),
sqlalchemy.Column("tag_name", sqlalchemy.String),
sqlalchemy.Column("guidance", sqlalchemy.String),
sqlalchemy.Column("ref_links", sqlalchemy.String),
)

Classification = sqlalchemy.Table(
"classification",
metadata,
sqlalchemy.Column("id", sqlalchemy.Integer, primary_key=True),
sqlalchemy.Column("UNCLASSIFIED", sqlalchemy.String),
sqlalchemy.Column("ref_links", ARRAY(sqlalchemy.String)),
)

Summaries = sqlalchemy.Table(
Expand Down
13 changes: 12 additions & 1 deletion services/scanners/results/result_processor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,9 +226,20 @@
"guidance",
metadata,
sqlalchemy.Column("id", sqlalchemy.Integer, primary_key=True),
sqlalchemy.Column("tag_id", sqlalchemy.String),
sqlalchemy.Column("tag_name", sqlalchemy.String),
sqlalchemy.Column("guidance", sqlalchemy.String),
sqlalchemy.Column("ref_links", sqlalchemy.String),
sqlalchemy.Column("ref_links", ARRAY(sqlalchemy.String)),
)

Summaries = sqlalchemy.Table(
"summaries",
metadata,
sqlalchemy.Column("id", sqlalchemy.Integer, primary_key=True),
sqlalchemy.Column("name", sqlalchemy.String),
sqlalchemy.Column("count", sqlalchemy.Integer),
sqlalchemy.Column("percentage", sqlalchemy.Float),
sqlalchemy.Column("type", sqlalchemy.String),
)

logging.basicConfig(stream=sys.stdout, level=logging.INFO)
Expand Down