Merge pull request #6 from sandwichcloud/serviceaccountdb

Add service accounts and builtin auth
sandwichcloud · Dec 3, 2017 · ea75d1e · ea75d1e
2 parents d258a25 + 6447bd7
commit ea75d1e
Show file tree

Hide file tree

Showing 16 changed files with 571 additions and 149 deletions.
diff --git a/ingredients_db/alembic/versions/1fdbfd6b0eea_create_instance.py b/ingredients_db/alembic/versions/1fdbfd6b0eea_create_instance.py
@@ -29,6 +29,8 @@ def upgrade():
         sa.Column('network_port_id', sau.UUIDType, sa.ForeignKey('network_ports.id', ondelete='RESTRICT')),
         sa.Column('region_id', sau.UUIDType, sa.ForeignKey('regions.id', ondelete='RESTRICT'), nullable=False),
         sa.Column('zone_id', sau.UUIDType, sa.ForeignKey('zones.id', ondelete='RESTRICT')),
+        sa.Column('service_account_id', sau.UUIDType, sa.ForeignKey('authn_service_accounts.id', ondelete='RESTRICT'),
+                  nullable=False),
 
         sa.Column('project_id', sau.UUIDType, sa.ForeignKey('projects.id', ondelete='RESTRICT'), nullable=False),
         sa.Column('current_task_id', sau.UUIDType, sa.ForeignKey('tasks.id')),
@@ -38,7 +40,6 @@ def upgrade():
         sa.Column('updated_at', sau.ArrowType(timezone=True), server_default=sa.text('clock_timestamp()'),
                   onupdate=sa.text('clock_timestamp()'),
                   nullable=False),
-
     )
 
 

diff --git a/ingredients_db/alembic/versions/3ce1572cbc6b_create_tasks.py b/ingredients_db/alembic/versions/3ce1572cbc6b_create_tasks.py
@@ -27,7 +27,7 @@ def upgrade():
         sa.Column('error_message', sa.Text),
 
         sa.Column('created_at', sau.ArrowType(timezone=True), server_default=sa.text('clock_timestamp()'),
-                  nullable=False),
+                  nullable=False, index=True),
         sa.Column('updated_at', sau.ArrowType(timezone=True), server_default=sa.text('clock_timestamp()'),
                   onupdate=sa.text('clock_timestamp()'),
                   nullable=False),

diff --git a/ingredients_db/alembic/versions/458762cd0419_create_authn_user.py b/ingredients_db/alembic/versions/458762cd0419_create_authn_user.py
@@ -23,7 +23,7 @@ def upgrade():
         sa.Column('username', sa.String, nullable=False),
         sa.Column('driver', sa.String, nullable=False),
         sa.Column('created_at', sau.ArrowType(timezone=True), server_default=sa.text('clock_timestamp()'),
-                  nullable=False),
+                  nullable=False, index=True),
         sa.Column('updated_at', sau.ArrowType(timezone=True), server_default=sa.text('clock_timestamp()'),
                   onupdate=sa.text('clock_timestamp()'),
                   nullable=False)

diff --git a/ingredients_db/alembic/versions/ba0652dfa1be_create_public_keys.py b/ingredients_db/alembic/versions/ba0652dfa1be_create_public_keys.py
@@ -26,7 +26,7 @@ def upgrade():
         sa.Column('project_id', sau.UUIDType, sa.ForeignKey('projects.id', ondelete='CASCADE'), nullable=False),
 
         sa.Column('created_at', sau.ArrowType(timezone=True), server_default=sa.text('clock_timestamp()'),
-                  nullable=False),
+                  nullable=False, index=True),
         sa.Column('updated_at', sau.ArrowType(timezone=True), server_default=sa.text('clock_timestamp()'),
                   onupdate=sa.text('clock_timestamp()'),
                   nullable=False)
@@ -40,7 +40,7 @@ def upgrade():
         sa.Column('instance_id', sau.UUIDType, sa.ForeignKey('instances.id', ondelete='CASCADE')),
 
         sa.Column('created_at', sau.ArrowType(timezone=True), server_default=sa.text('clock_timestamp()'),
-                  nullable=False),
+                  nullable=False, index=True),
         sa.Column('updated_at', sau.ArrowType(timezone=True), server_default=sa.text('clock_timestamp()'),
                   onupdate=sa.text('clock_timestamp()'),
                   nullable=False)