[COST-2231] Upgrade to Django 4

Pipfile

@@ -20,15 +20,14 @@ celery = ">=5.2.2"
 ciso8601 = ">=2.1"
 confluent-kafka = ">=2.1.0"
 croniter = "*"
-Django = "<4.0"
+Django = "~=4.2.0"
 django-cors-headers = ">=3.1"
 django-environ = ">=0.4"
 django-extensions = ">=2.2"
 django-filter = ">=2.2"
 django-prometheus = ">=1.1"
-django-redis = ">=4.10"
 django-tenants = ">=3.4"
-djangorestframework = ">=3.11,!=3.14.0"
+djangorestframework = ">=3.14.0"
 djangorestframework-csv = ">=2.1"
 google-api-python-client = ">=1.12.4"
 google-auth = ">=1.22.1"
@@ -50,6 +49,7 @@ psycopg2 = ">=2.9"
 pyarrow = ">=0.17.1"
 python-dateutil = ">=2.8"
 querystring-parser = ">=1.2"
+redis = ">=5.0.1"
 requests = ">=2.20"
 sentry-sdk = ">=0.13"
 statsmodels = ">=0.12"

db_functions/clone_schema.sql

@@ -11,7 +11,6 @@ CREATE OR REPLACE FUNCTION public.clone_schema(
     _verbose boolean DEFAULT false
 ) RETURNS boolean AS $$
 DECLARE
-    sequence_objects jsonb[];
     sequence_owner_info jsonb[];
     table_objects jsonb[];
     fk_objects jsonb[];
@@ -55,32 +54,6 @@ BEGIN
     /*
      * Gather data for copy
      */
-    /* Sequence objects */
-    IF _verbose THEN
-        RAISE INFO 'Gathering sequence object data from %...', source_schema;
-    END IF;
-
-    SELECT coalesce(array_agg(
-              jsonb_build_object(
-                  'sequence_name', c.relname,
-                  'sequence_type', s.seqtypid::regtype::text,
-                  'sequence_start', s.seqstart,
-                  'sequence_inc', s.seqincrement,
-                  'sequence_max', s.seqmax,
-                  'sequence_min', s.seqmin,
-                  'sequence_cache', s.seqcache,
-                  'sequence_cycle', CASE WHEN s.seqcycle THEN ' CYCLE' ELSE ' NO CYCLE' END::text
-              )
-           ), '{}'::jsonb[])
-      INTO sequence_objects
-      FROM pg_sequence s
-      JOIN pg_class c
-        ON c.oid = s.seqrelid
-     WHERE c.relnamespace = source_schema::regnamespace;
-
-    IF _verbose THEN
-        RAISE INFO '    Got %s schema objects...', cardinality(sequence_objects);
-    END IF;
 
     /* Sequence owner info */
     IF _verbose THEN
@@ -388,48 +361,6 @@ BEGIN
     END IF;
     EXECUTE 'CREATE SCHEMA ' || dst_schema || ' ;';
 
-    /*
-     * Create sequences
-     */
-    IF cardinality(sequence_objects) > 0
-    THEN
-        IF _verbose
-        THEN
-            RAISE INFO 'Creating sequences for %', dst_schema;
-        END IF;
-        FOREACH jobject IN ARRAY sequence_objects
-        LOOP
-            IF _verbose
-            THEN
-                RAISE INFO '    %.%', dst_schema, quote_ident(jobject->>'sequence_name'::text);
-            END IF;
-            EXECUTE FORMAT('CREATE SEQUENCE IF NOT EXISTS %s.%I AS %s START WITH %s INCREMENT BY %s MINVALUE %s MAXVALUE %s CACHE %s %s ;',
-                        dst_schema,
-                        jobject->>'sequence_name'::text,
-                        jobject->>'sequence_type'::text,
-                        jobject->>'sequence_start'::text,
-                        jobject->>'sequence_inc'::text,
-                        jobject->>'sequence_min'::text,
-                        jobject->>'sequence_max'::text,
-                        jobject->>'sequence_cache'::text,
-                        jobject->>'sequence_cycle');
-
-            IF copy_data OR
-            (jobject->>'sequence_name' ~ 'partitioned_tables'::text) OR
-            (jobject->>'sequence_name' ~ 'django_migrations'::text)
-            THEN
-                EXECUTE 'SELECT setval(''' || dst_schema || '.' || quote_ident(jobject->>'sequence_name') || '''::regclass, '::text ||
-                        '(SELECT last_value + 1 FROM ' ||
-                        src_schema || '.' || quote_ident(jobject->>'sequence_name') || ') );'::text;
-            END IF;
-        END LOOP;
-    ELSE
-        IF _verbose
-        THEN
-            RAISE INFO 'No sequences for %', dst_schema;
-        END IF;
-    END IF;
-
     /*
      * Create tables
      */
@@ -509,37 +440,27 @@ BEGIN
     END IF;
 
     /*
-     * Create sequence owner links
+     * Set sequence value
      */
     IF cardinality(sequence_owner_info) > 0
     THEN
         IF _verbose
         THEN
-            RAISE INFO 'Setting sequence ownership for objects in %', dst_schema;
+            RAISE INFO 'Set current value for sequence objects in %', dst_schema;
         END IF;
         FOREACH jobject IN ARRAY sequence_owner_info
         LOOP
             IF _verbose
             THEN
-                RAISE INFO '    Update primary key default for %.%', dst_schema, quote_ident(jobject->>'owner_object'::text);
+                RAISE INFO '    Update sequence value for %.%', dst_schema, quote_ident(jobject->>'owner_object'::text);
             END IF;
-            EXECUTE FORMAT('ALTER TABLE %s.%I ALTER COLUMN %I SET DEFAULT nextval( ''%s.%I''::regclass );',
-                        dst_schema,
-                        jobject->>'owner_object'::text,
-                        jobject->>'owner_column'::text,
-                        dst_schema,
-                        jobject->>'sequence_name'::text);
 
-            IF _verbose
-            THEN
-                RAISE INFO '    Update sequence owned-by table column to %."%"', dest_obj, jobject->>'owner_column'::text;
-            END IF;
-            EXECUTE FORMAT('ALTER SEQUENCE %s.%I OWNED BY %s.%I.%I ;',
+            EXECUTE FORMAT('SELECT setval(''%s.%I'', (SELECT max(%I) FROM %s.%I));',
                         dst_schema,
                         jobject->>'sequence_name'::text,
-                        dest_schema,
-                        jobject->>'owner_object'::text,
-                        jobject->>'owner_column'::text);
+                        jobject->>'owner_column'::text,
+                        dst_schema,
+                        jobject->>'owner_object'::text);
         END LOOP;
     ELSE
         IF _verbose

koku/api/common/__init__.py

@@ -1,7 +1,7 @@
 # noqa
 from uuid import UUID
 
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext
 
 RH_IDENTITY_HEADER = "HTTP_X_RH_IDENTITY"
 
@@ -11,7 +11,7 @@
 
 def error_obj(key, message):
     """Create an error object."""
-    return {key: [_(message)]}
+    return {key: [gettext(message)]}
 
 
 def log_json(tracing_id="", *, msg, context=None, **kwargs):

koku/api/dataexport/syncer/__init__.py

@@ -11,7 +11,7 @@
 from dateutil.rrule import MONTHLY
 from dateutil.rrule import rrule
 from django.conf import settings
-from django.utils.translation import gettext as _
+from django.utils.translation import gettext
 
 from api.provider.models import Provider
 
@@ -85,15 +85,15 @@ def _copy_object(self, s3_destination_bucket, source_object):
             if source_object.storage_class == "GLACIER" and e.response["Error"]["Code"] == "InvalidObjectState":
                 request = {"Days": 2, "GlacierJobParameters": {"Tier": "Standard"}}
                 source_object.restore_object(RestoreRequest=request)
-                LOG.info(_("Glacier Storage restore for %s is in progress."), source_object.key)
+                LOG.info(gettext("Glacier Storage restore for %s is in progress."), source_object.key)
                 raise SyncedFileInColdStorageError(
                     f"Requested file {source_object.key} is currently in AWS Glacier Storage, "
                     f"an request has been made to restore the file."
                 )
             # if object cannot be copied because restore is already in progress raise
             # SyncedFileInColdStorageError and wait a while longer
             elif e.response["Error"]["Code"] == "RestoreAlreadyInProgress":
-                LOG.info(_("Glacier Storage restore for %s is in progress."), source_object.key)
+                LOG.info(gettext("Glacier Storage restore for %s is in progress."), source_object.key)
                 raise SyncedFileInColdStorageError(
                     f"Requested file {source_object.key} has not yet been restored from AWS Glacier Storage."
                 )