BI-4163: feat: add collate to greenplum form_config

docker_build/target_base_ci/scripts/500-docker.sh

@@ -9,7 +9,15 @@ curl -fsSL https://download.docker.com/linux/ubuntu/gpg | gpg --dearmor -o /etc/
 #chmod 755 /etc/apt/keyrings
 #chmod a+r /etc/apt/keyrings/docker.gpg
 
-echo "deb [arch=amd64 signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/ubuntu jammy stable" > /etc/apt/sources.list.d/docker.list
+case $(arch) in
+"aarch64"|"arm64")
+    arch="arm64"
+    ;;
+*)
+    arch="amd64"
+    ;;
+esac
+echo "deb [arch=${arch} signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/ubuntu jammy stable" > /etc/apt/sources.list.d/docker.list
 
 apt-get update
 # apt-get install --yes  docker-ce-cli docker-compose-plugin

docker_build/target_dl_base_linux_w_db_bin_dependencies/scripts/201-taskfile.sh

@@ -7,9 +7,26 @@ echo 'Installing taskfile tool...'
 
 TMP_DIR="$(mktemp -d)"
 
-cd $TMP_DIR
-wget https://github.com/go-task/task/releases/download/v3.29.1/task_linux_amd64.deb
-echo "e411770abf73d5e094100ab7a1c8278f35b591ecadbfd778200b6b2ad1ee340b task_linux_amd64.deb" | sha256sum -c -
-dpkg -i task_linux_amd64.deb
+base_url="https://github.com/go-task/task/releases/download"
+version="v3.29.1"
+case $(arch) in
+"aarch64"|"arm64")
+    arch="arm64"
+    checksum="a7688f188e2f21218a27c383e82ebc24d61677c9609c890ebed68a1fb21e3551"
+    ;;
+*)
+    arch="amd64"
+    checksum="e411770abf73d5e094100ab7a1c8278f35b591ecadbfd778200b6b2ad1ee340b"
+    ;;
+esac
 
-rm -r "$TMP_DIR"
+download_url="${base_url}/${version}/task_linux_${arch}.deb"
+filename="task.deb"
+
+cd "$TMP_DIR"
+wget ${download_url} -O ${filename}
+sha256sum ${filename}
+echo "${checksum} ${filename}" | sha256sum -c -
+dpkg -i ${filename}
+
+rm -r "${TMP_DIR}"

lib/dl_connector_greenplum/dl_connector_greenplum/api/connection_form/form_config.py

@@ -23,6 +23,10 @@
 from dl_configs.connectors_settings import ConnectorSettingsBase
 
 from dl_connector_greenplum.api.connection_info import GreenplumConnectionInfoProvider
+from dl_connector_postgresql.api.connection_form.form_config import (
+    PostgreSQLFieldName,
+    PostgresRowConstructor,
+)
 
 
 class GreenplumConnectionFormFactory(ConnectionFormFactory):
@@ -39,6 +43,7 @@ def _get_base_edit_api_schema(self) -> FormActionApiSchema:
                 ),
                 FormFieldApiSchema(name=CommonFieldName.cache_ttl_sec, nullable=True),
                 FormFieldApiSchema(name=CommonFieldName.raw_sql_level),
+                FormFieldApiSchema(name=PostgreSQLFieldName.enforce_collate),
                 FormFieldApiSchema(name=CommonFieldName.data_export_forbidden),
             ],
         )
@@ -76,6 +81,7 @@ def _get_base_form_config(
         edit_api_schema: FormActionApiSchema,
         check_api_schema: FormActionApiSchema,
         rc: RowConstructor,
+        postgres_rc: PostgresRowConstructor,
     ) -> ConnectionForm:
         return ConnectionForm(
             title=GreenplumConnectionInfoProvider.get_title(self._localizer),
@@ -89,6 +95,7 @@ def _get_base_form_config(
                     C.CacheTTLRow(name=CommonFieldName.cache_ttl_sec),
                     rc.raw_sql_level_row(),
                     rc.collapse_advanced_settings_row(),
+                    postgres_rc.enforce_collate_row(),
                     rc.data_export_forbidden_row(),
                 ]
             ),
@@ -105,6 +112,7 @@ def get_form_config(
         tenant: Optional[TenantDef],
     ) -> ConnectionForm:
         rc = RowConstructor(localizer=self._localizer)
+        postgres_rc = PostgresRowConstructor(localizer=self._localizer)
 
         host_section: list[FormRow] = [rc.host_row()]
         username_section: list[FormRow] = [rc.username_row()]
@@ -122,4 +130,5 @@ def get_form_config(
             edit_api_schema=edit_api_schema,
             check_api_schema=check_api_schema,
             rc=rc,
+            postgres_rc=postgres_rc,
         )

lib/dl_connector_greenplum/dl_connector_greenplum/api/connector.py

@@ -22,6 +22,7 @@
     GreenplumTableCoreSourceDefinition,
 )
 from dl_connector_postgresql.api.connector import PostgreSQLApiBackendDefinition
+from dl_connector_postgresql.api.i18n.localizer import CONFIGS as BI_CONNECTOR_POSTGRESQL_CONFIGS
 
 
 class GreenplumApiTableSourceDefinition(ApiSourceDefinition):
@@ -54,4 +55,4 @@ class GreenplumApiConnector(ApiConnector):
         GreenplumApiTableSourceDefinition,
         GreenplumApiSubselectSourceDefinition,
     )
-    translation_configs = frozenset(CONFIGS)
+    translation_configs = frozenset(CONFIGS) | frozenset(BI_CONNECTOR_POSTGRESQL_CONFIGS)

lib/dl_connector_greenplum/dl_connector_greenplum_tests/unit/test_connection_form.py

@@ -3,8 +3,9 @@
 
 from dl_connector_greenplum.api.connection_form.form_config import GreenplumConnectionFormFactory
 from dl_connector_greenplum.api.i18n.localizer import CONFIGS as BI_CONNECTOR_GREENPLUM_CONFIGS
+from dl_connector_postgresql.api.i18n.localizer import CONFIGS as BI_CONNECTOR_POSTGRESQL_CONFIGS
 
 
 class TestGreenplumConnectionForm(ConnectionFormTestBase):
     CONN_FORM_FACTORY_CLS = GreenplumConnectionFormFactory
-    TRANSLATION_CONFIGS = BI_API_CONNECTOR_CONFIGS + BI_CONNECTOR_GREENPLUM_CONFIGS
+    TRANSLATION_CONFIGS = BI_API_CONNECTOR_CONFIGS + BI_CONNECTOR_GREENPLUM_CONFIGS + BI_CONNECTOR_POSTGRESQL_CONFIGS

lib/dl_connector_postgresql/dl_connector_postgresql/api/connection_form/form_config.py

@@ -6,7 +6,10 @@
     Sequence,
 )
 
+import attr
+
 from dl_api_commons.base_models import TenantDef
+from dl_api_connector.form_config.models import rows as C
 from dl_api_connector.form_config.models.api_schema import (
     FormActionApiSchema,
     FormApiSchema,
@@ -21,10 +24,11 @@
     CommonFieldName,
     FormFieldName,
 )
-import dl_api_connector.form_config.models.rows as C
 from dl_api_connector.form_config.models.rows.base import FormRow
 from dl_api_connector.form_config.models.shortcuts.rows import RowConstructor
+from dl_api_connector.i18n.localizer import Translatable
 from dl_configs.connectors_settings import ConnectorSettingsBase
+from dl_i18n.localizer_base import Localizer
 
 from dl_connector_postgresql.api.connection_info import PostgreSQLConnectionInfoProvider
 from dl_connector_postgresql.api.i18n.localizer import Translatable
@@ -36,6 +40,40 @@ class PostgreSQLFieldName(FormFieldName):
     enforce_collate = "enforce_collate"
 
 
+@attr.s
+class PostgresRowConstructor:
+    _localizer: Localizer = attr.ib()
+
+    def enforce_collate_row(self) -> C.CustomizableRow:
+        return C.CustomizableRow(
+            items=[
+                C.LabelRowItem(
+                    text=self._localizer.translate(Translatable("field_enforce-collate")),
+                    display_conditions={CommonFieldName.advanced_settings: "opened"},
+                ),
+                C.RadioButtonRowItem(
+                    name=PostgreSQLFieldName.enforce_collate,
+                    options=[
+                        C.SelectableOption(
+                            text=self._localizer.translate(Translatable("value_enforce-collate-auto")),
+                            value=PGEnforceCollateMode.auto.value,
+                        ),
+                        C.SelectableOption(
+                            text=self._localizer.translate(Translatable("value_enforce-collate-off")),
+                            value=PGEnforceCollateMode.off.value,
+                        ),
+                        C.SelectableOption(
+                            text=self._localizer.translate(Translatable("value_enforce-collate-on")),
+                            value=PGEnforceCollateMode.on.value,
+                        ),
+                    ],
+                    default_value=PGEnforceCollateMode.auto.value,
+                    display_conditions={CommonFieldName.advanced_settings: "opened"},
+                ),
+            ]
+        )
+
+
 class PostgreSQLConnectionFormFactory(ConnectionFormFactory):
     def _get_base_edit_api_schema(self) -> FormActionApiSchema:
         return FormActionApiSchema(
@@ -86,6 +124,7 @@ def _get_base_form_config(
         edit_api_schema: FormActionApiSchema,
         check_api_schema: FormActionApiSchema,
         rc: RowConstructor,
+        postgres_rc: PostgresRowConstructor,
     ) -> ConnectionForm:
         return ConnectionForm(
             title=PostgreSQLConnectionInfoProvider.get_title(self._localizer),
@@ -99,33 +138,7 @@ def _get_base_form_config(
                     C.CacheTTLRow(name=CommonFieldName.cache_ttl_sec),
                     rc.raw_sql_level_row(),
                     rc.collapse_advanced_settings_row(),
-                    C.CustomizableRow(
-                        items=[
-                            C.LabelRowItem(
-                                text=self._localizer.translate(Translatable("field_enforce-collate")),
-                                display_conditions={CommonFieldName.advanced_settings: "opened"},
-                            ),
-                            C.RadioButtonRowItem(
-                                name=PostgreSQLFieldName.enforce_collate,
-                                options=[
-                                    C.SelectableOption(
-                                        text=self._localizer.translate(Translatable("value_enforce-collate-auto")),
-                                        value=PGEnforceCollateMode.auto.value,
-                                    ),
-                                    C.SelectableOption(
-                                        text=self._localizer.translate(Translatable("value_enforce-collate-off")),
-                                        value=PGEnforceCollateMode.off.value,
-                                    ),
-                                    C.SelectableOption(
-                                        text=self._localizer.translate(Translatable("value_enforce-collate-on")),
-                                        value=PGEnforceCollateMode.on.value,
-                                    ),
-                                ],
-                                default_value=PGEnforceCollateMode.auto.value,
-                                display_conditions={CommonFieldName.advanced_settings: "opened"},
-                            ),
-                        ]
-                    ),
+                    postgres_rc.enforce_collate_row(),
                     *rc.ssl_rows(
                         enabled_name=CommonFieldName.ssl_enable,
                         enabled_help_text=self._localizer.translate(Translatable("label_postgres-ssl-enabled-tooltip")),
@@ -147,6 +160,7 @@ def get_form_config(
         tenant: Optional[TenantDef],
     ) -> ConnectionForm:
         rc = RowConstructor(localizer=self._localizer)
+        postgres_rc = PostgresRowConstructor(localizer=self._localizer)
 
         host_section = [rc.host_row()]
         username_section = [rc.username_row()]
@@ -164,4 +178,5 @@ def get_form_config(
             edit_api_schema=edit_api_schema,
             check_api_schema=check_api_schema,
             rc=rc,
+            postgres_rc=postgres_rc,
         )