Merge branch 'staging' into environment-role-creation

alembic/versions/0039308c6351_remove_root_user_info_from_environment.py

@@ -0,0 +1,28 @@
+"""Remove root_user_info from Environment
+
+Revision ID: 0039308c6351
+Revises: 17da2a475429
+Create Date: 2020-02-04 14:37:06.814645
+
+"""
+from alembic import op
+import sqlalchemy as sa
+from sqlalchemy.dialects import postgresql
+
+# revision identifiers, used by Alembic.
+revision = '0039308c6351' # pragma: allowlist secret
+down_revision = '17da2a475429' # pragma: allowlist secret
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_column('environments', 'root_user_info')
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column('environments', sa.Column('root_user_info', postgresql.JSONB(astext_type=sa.Text()), autoincrement=False, nullable=True))
+    # ### end Alembic commands ###

alembic/versions/418b52c1cedf_change_to_environment_roles_cloud_id.py

@@ -1,7 +1,7 @@
 """change to environment_roles.cloud_Id
 
 Revision ID: 418b52c1cedf
-Revises: 17da2a475429
+Revises: 0039308c6351
 Create Date: 2020-02-05 13:40:37.870183
 
 """
@@ -11,7 +11,7 @@ import sqlalchemy as sa
 
 # revision identifiers, used by Alembic.
 revision = '418b52c1cedf' # pragma: allowlist secret
-down_revision = '17da2a475429' # pragma: allowlist secret
+down_revision = '0039308c6351' # pragma: allowlist secret
 branch_labels = None
 depends_on = None