0001-command-add-a-delete_tenant-command-15636.patch

Jean-Baptiste Jaillet, 31 mai 2017 16:31

Voir les différences: en ligne côte à côte

Subject: [PATCH] command: add a delete_tenant command (#15636)

 tests/test_ctl.py        | 105 ++++++++++++++++++++++++++++++++++++++++++++
 wcs/ctl/check_hobos.py   |   9 +++-
 wcs/ctl/delete_tenant.py | 111 +++++++++++++++++++++++++++++++++++++++++++++++
 wcs/sql.py               |  42 ++++++++++++------
 4 files changed, 252 insertions(+), 15 deletions(-)
 create mode 100644 wcs/ctl/delete_tenant.py

     import collections
     from email.mime.text import MIMEText
     from email.mime.multipart import MIMEMultipart
     import psycopg2
     from wcs.formdef import FormDef
     from wcs.workflows import Workflow
-...
     from wcs.ctl.process_bounce import CmdProcessBounce
     from wcs.ctl.wipe_data import CmdWipeData
     from wcs.ctl.trigger_jumps import select_and_jump_formdata
     from wcs.ctl.delete_tenant import CmdDeleteTenant
     from wcs.sql import get_connection_and_cursor, cleanup_connection
     from utilities import create_temporary_pub, clean_temporary_pub
-...
         assert f1.status == f2.status == 'wf-%s' % st1.id
         assert not f1.workflow_data
         assert not f2.workflow_data
     def test_delete_tenant():
         pub = create_temporary_pub(sql_mode=True)
         delete_cmd = CmdDeleteTenant()
         assert os.path.isdir(pub.app_dir)
         sub_options_class = collections.namedtuple('Options', ['force_drop'])
         sub_options = sub_options_class(False)
         delete_cmd.delete_tenant(pub, sub_options, [])
         assert not os.path.isdir(pub.app_dir)
         parent_dir = os.path.dirname(pub.app_dir)
         if not [filename for filename in os.listdir(parent_dir) if 'removed' in filename]:
             assert False
         conn, cur = get_connection_and_cursor()
         cur.execute("""SELECT schema_name
                     FROM information_schema.schemata
                     WHERE schema_name like '%removed%'""")
         assert len(cur.fetchall()) == 1
         clean_temporary_pub()
         pub = create_temporary_pub(sql_mode=True)
         sub_options = sub_options_class(True)
         delete_cmd.delete_tenant(pub, sub_options, [])
         conn, cur = get_connection_and_cursor(new=True)
         assert not os.path.isdir(pub.app_dir)
         cur.execute("""SELECT table_name
                     FROM information_schema.tables
                     WHERE table_schema = 'public' AND
                     table_type = 'BASE TABLE'""")
         assert not cur.fetchall()
         cur.execute("""SELECT datname
                     FROM pg_database
                     WHERE datname = '%s'""" % pub.cfg['postgresql']['database'])
         assert cur.fetchall()
         clean_temporary_pub()
         pub = create_temporary_pub(sql_mode=True)
         cleanup_connection()
         sub_options = sub_options_class(True)
         pub.cfg['postgresql']['createdb-connection-params'] = {
             'user': pub.cfg['postgresql']['user'],
             'database': 'postgres'
+        }
         delete_cmd.delete_tenant(pub, sub_options, [])
         pgconn = psycopg2.connect(**pub.cfg['postgresql']['createdb-connection-params'])
         cur = pgconn.cursor()
         cur.execute("""SELECT datname
                     FROM pg_database
                     WHERE datname = '%s'""" % pub.cfg['postgresql']['database'])
         assert not cur.fetchall()
         cur.close()
         pgconn.close()
         clean_temporary_pub()
         pub = create_temporary_pub(sql_mode=True)
         cleanup_connection()
         sub_options = sub_options_class(False)
         pub.cfg['postgresql']['createdb-connection-params'] = {
             'user': pub.cfg['postgresql']['user'],
             'database': 'postgres'
+        }
         delete_cmd.delete_tenant(pub, sub_options, [])
         pgconn = psycopg2.connect(**pub.cfg['postgresql']['createdb-connection-params'])
         pgconn.set_isolation_level(psycopg2.extensions.ISOLATION_LEVEL_AUTOCOMMIT)
         cur = pgconn.cursor()
         cur.execute("""SELECT datname
                     FROM pg_database
                     WHERE datname like '%removed%'""")
         result = cur.fetchall()
         assert len(result) == 1
         #clean this db after test
         cur.execute("""DROP DATABASE %s""" % result[0][0])
         cur.execute("""SELECT datname
                     FROM pg_database
                     WHERE datname = '%s'""" % pub.cfg['postgresql']['database'])
         assert not cur.fetchall()
         cur.close()
         conn.close()
         clean_temporary_pub()

                 cur.execute('''CREATE DATABASE %s''' % database_name)
             except psycopg2.Error as e:
                 if e.pgcode == psycopg2.errorcodes.DUPLICATE_DATABASE:
                     new_database = False
                     cur.execute("""SELECT table_name
                                    FROM information_schema.tables
                                    WHERE table_schema = 'public'
                                    AND table_type = 'BASE TABLE'
                                    AND table_name = 'wcs_meta'""")
                     if cur.fetchall():
                         new_database = False
                 else:
                     print >> sys.stderr, 'failed to create database (%s)' % \
                             psycopg2.errorcodes.lookup(e.pgcode)

     #w.c.s. -  web application for online forms
     # Copyright (C) 2005-2014  Entr'ouvert
+    #
     # This program is free software; you can redistribute it and/or modify
     # it under the terms of the GNU General Public License as published by
     # the Free Software Foundation; either version 2 of the License, or
     # (at your option) any later version.
+    #
     # This program is distributed in the hope that it will be useful,
     # but WITHOUT ANY WARRANTY; without even the implied warranty of
     # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     # GNU General Public License for more details.
+    #
     # You should have received a copy of the GNU General Public License
     # along with this program; if not, see <http://www.gnu.org/licenses/>.
     import os
     import sys
     import psycopg2
     import psycopg2.errorcodes
     from datetime import datetime
     from shutil import rmtree
     from qommon.ctl import Command, make_option
     class CmdDeleteTenant(Command):
         name = 'delete_tenant'
         def __init__(self):
             Command.__init__(self, [
                     make_option('--force-drop', action='store_true', default=False,
                                 dest='force_drop'),
                     ])
         def execute(self, base_options, sub_options, args):
             import publisher
             publisher.WcsPublisher.configure(self.config)
             pub = publisher.WcsPublisher.create_publisher(
                     register_cron=False, register_tld_names=False)
             hostname = args[0]
             pub.app_dir = os.path.join(pub.app_dir, hostname)
             pub.set_config()
             self.delete_tenant(pub, sub_options, args)
         def delete_tenant(self, pub, options, args):
             postgresql_cfg = {}
             for k, v in pub.cfg['postgresql'].items():
                 if v and isinstance(v, basestring):
                     postgresql_cfg[k] = v
             # if there's a createdb-connection-params, we can do a DROP DATABASE with
             # the option --force-drop, rename it if not
             createdb_cfg = pub.cfg['postgresql'].get('createdb-connection-params', {})
             createdb = True
             if not createdb_cfg:
                 createdb_cfg = postgresql_cfg
                 createdb = False
             try:
                 pgconn = psycopg2.connect(**createdb_cfg)
             except psycopg2.Error as e:
                 print >> sys.stderr, 'failed to connect to postgresql (%s)' % psycopg2.errorcodes.lookup(e.pgcode)
                 return
             pgconn.set_isolation_level(psycopg2.extensions.ISOLATION_LEVEL_AUTOCOMMIT)
             cur = pgconn.cursor()
             try:
                 dbname = pub.cfg['postgresql']['database']
                 if createdb:
                     if options.force_drop:
                         cur.execute('DROP DATABASE %s' % dbname)
                     else:
                         deletion_date = datetime.now().strftime('%Y%m%d_%H%M%S_%f')
                         cur.execute('ALTER DATABASE %s RENAME TO removed_%s_%s' % (dbname,
                                                                                    deletion_date,
                                                                                    dbname))
                 else:
                     cur.execute("""SELECT table_name
                                    FROM information_schema.tables
                                    WHERE table_schema = 'public'
                                    AND table_type = 'BASE TABLE'""")
                     tables_names = [x[0] for x in cur.fetchall()]
                     if options.force_drop:
                         for table_name in tables_names:
                             cur.execute('DROP TABLE %s CASCADE' % table_name)
                     else:
                         deletion_date = datetime.now().strftime('%Y%m%d_%H%M%S_%f')
                         schema_name = 'removed_%s_%s' % (deletion_date, dbname)
                         cur.execute("CREATE SCHEMA %s" % schema_name[:63])
                         for table_name in tables_names:
                             cur.execute('ALTER TABLE %s SET SCHEMA %s' %
                                         (table_name, schema_name[:63]))
                 if options.force_drop:
                     rmtree(pub.app_dir)
                 else:
                     os.rename(pub.app_dir, pub.app_dir + '_removed_%s.invalid' % deletion_date)
             except psycopg2.Error as e:
                 print >> sys.stderr, 'failed to alter database %s : (%s)' % (createdb_cfg['database'],
                                                                              psycopg2.errorcodes.lookup(e.pgcode))
                 return
             cur.close()
     CmdDeleteTenant.register()

         conn, cur = get_connection_and_cursor()
         while True:
             cur.execute('''SELECT COUNT(*) FROM information_schema.tables
                            WHERE table_name LIKE %s''', ('formdata\\_%s\\_%%' % new_id,))
                            WHERE table_schema = 'public'
                            AND table_name LIKE %s''', ('formdata\\_%s\\_%%' % new_id,))
             if cur.fetchone()[0] == 0:
                 break
             new_id += 1
-...
     def formdef_wipe():
         conn, cur = get_connection_and_cursor()
         cur.execute('''SELECT table_name FROM information_schema.tables
                        WHERE table_name LIKE %s''', ('formdata\\_%%\\_%%',))
                        WHERE table_schema = 'public'
                        AND table_name LIKE %s''', ('formdata\\_%%\\_%%',))
         for table_name in [x[0] for x in cur.fetchall()]:
             cur.execute('''DROP TABLE %s CASCADE''' % table_name)
         conn.commit()
-...
         table_name = get_formdef_table_name(formdef)
         cur.execute('''SELECT COUNT(*) FROM information_schema.tables
                        WHERE table_name = %s''', (table_name,))
                        WHERE table_schema = 'public'
                        AND table_name = %s''', (table_name,))
         if cur.fetchone()[0] == 0:
             cur.execute('''CREATE TABLE %s (id serial PRIMARY KEY,
                                         user_id varchar,
-...
                                         formdata_id integer REFERENCES %s (id) ON DELETE CASCADE)''' % (
                                         table_name, table_name))
         cur.execute('''SELECT column_name FROM information_schema.columns
                         WHERE table_name = %s''', (table_name,))
                        WHERE table_schema = 'public'
                        AND table_name = %s''', (table_name,))
         existing_fields = set([x[0] for x in cur.fetchall()])
         needed_fields = set(['id', 'user_id', 'receipt_time',
-...
         table_name = 'users'
         cur.execute('''SELECT COUNT(*) FROM information_schema.tables
                        WHERE table_name = %s''', (table_name,))
                        WHERE table_schema = 'public'
                        AND table_name = %s''', (table_name,))
         if cur.fetchone()[0] == 0:
             cur.execute('''CREATE TABLE %s (id serial PRIMARY KEY,
                                         name varchar,
-...
                                         lasso_dump text,
                                         last_seen timestamp)''' % table_name)
         cur.execute('''SELECT column_name FROM information_schema.columns
                         WHERE table_name = %s''', (table_name,))
                        WHERE table_schema = 'public'
                        AND table_name = %s''', (table_name,))
         existing_fields = set([x[0] for x in cur.fetchall()])
         needed_fields = set(['id', 'name', 'email', 'roles', 'is_admin',
-...
         table_name = 'tracking_codes'
         cur.execute('''SELECT COUNT(*) FROM information_schema.tables
                        WHERE table_name = %s''', (table_name,))
                        WHERE table_schema = 'public'
                        AND table_name = %s''', (table_name,))
         if cur.fetchone()[0] == 0:
             cur.execute('''CREATE TABLE %s (id varchar PRIMARY KEY,
                                         formdef_id varchar,
                                         formdata_id varchar)''' % table_name)
         cur.execute('''SELECT column_name FROM information_schema.columns
                         WHERE table_name = %s''', (table_name,))
                        WHERE table_schema = 'public'
                        AND table_name = %s''', (table_name,))
         existing_fields = set([x[0] for x in cur.fetchall()])
         needed_fields = set(['id', 'formdef_id', 'formdata_id'])
-...
             conn, cur = get_connection_and_cursor()
         cur.execute('''SELECT COUNT(*) FROM information_schema.tables
                        WHERE table_name = %s''', ('wcs_meta',))
                        WHERE table_schema = 'public'
                        AND table_name = %s''', ('wcs_meta',))
         if cur.fetchone()[0] == 0:
             cur.execute('''CREATE TABLE wcs_meta (id serial PRIMARY KEY,
                                         key varchar,
-...
         if formdef:
             # remove the form view itself
             cur.execute('''SELECT table_name FROM information_schema.views
                            WHERE table_name LIKE %s''', ('wcs\\_view\\_%s\\_%%' % formdef.id ,))
                            WHERE table_schema = 'public'
                            AND table_name LIKE %s''', ('wcs\\_view\\_%s\\_%%' % formdef.id ,))
         else:
             # if there's no formdef specified, remove all form views
             cur.execute('''SELECT table_name FROM information_schema.views
                            WHERE table_name LIKE %s''', ('wcs\\_view\\_%',))
                            WHERE table_schema = 'public'
                            AND table_name LIKE %s''', ('wcs\\_view\\_%',))
         view_names = []
         while True:
             row = cur.fetchone()
-...
     def drop_global_views(conn, cur):
         cur.execute('''SELECT table_name FROM information_schema.views
                        WHERE table_name LIKE %s''', ('wcs\\_category\\_%',))
                        WHERE table_schema = 'public'
                        AND table_name LIKE %s''', ('wcs\\_category\\_%',))
         view_names = []
         while True:
             row = cur.fetchone()
-...
         view_names = [get_formdef_view_name(x) for x in FormDef.select()]
         cur.execute('''SELECT table_name FROM information_schema.views
                        WHERE table_name LIKE %s''', ('wcs\\_view\\_%',))
                        WHERE table_schema = 'public'
                        AND table_name LIKE %s''', ('wcs\\_view\\_%',))
         existing_views = set()
         while True:
             row = cur.fetchone()
-...
     def migrate_global_views(conn, cur):
         cur.execute('''SELECT COUNT(*) FROM information_schema.tables
                        WHERE table_name = %s''', ('wcs_all_forms',))
                        WHERE table_schema = 'public'
                        AND table_name = %s''', ('wcs_all_forms',))
         existing_fields = set([x[0] for x in cur.fetchall()])
         if 'formdef_id' not in existing_fields:
             drop_global_views(conn, cur)
+    -

Projet

Général

Profil

Produits Entr'ouvert » w.c.s.

0001-command-add-a-delete_tenant-command-15636.patch