Remove IFRC_TRANSLATION_GET_API_KEY + a perl hack

Dockerfile

@@ -32,15 +32,6 @@ RUN pip install --upgrade --no-cache-dir pip poetry \
 RUN playwright install \
     && playwright install-deps
 
-
-# TODO: Refactor the whole Azure storage part. (Upgrade is not enough, was tested.)
-# Until then avoid some SyntaxWarnings ("is" with a literal):
-ENV AZUREROOT=/usr/local/lib/python3.11/site-packages/azure/storage/
-RUN perl -pi -e 's/ is 0 / == 0 /'      ${AZUREROOT}blob/_upload_chunking.py
-RUN perl -pi -e 's/ is not -1 / != 1 /' ${AZUREROOT}blob/baseblobservice.py
-RUN perl -pi -e "s/ is '' / == '' /"    ${AZUREROOT}common/_connection.py
-RUN perl -pi -e "s/ is '' / == '' /"    ${AZUREROOT}_connection.py
-
 COPY main/nginx.conf /etc/nginx/sites-available/
 RUN \
 	ln -s /etc/nginx/sites-available/nginx.conf /etc/nginx/sites-enabled; \

azure-pipelines.yml

@@ -100,7 +100,6 @@ jobs:
   #     DJANGO_READ_ONLY: $(STAGING_DJANGO_READ_ONLY)
   #     AUTO_TRANSLATION_TRANSLATOR: $(STAGING_AUTO_TRANSLATION_TRANSLATOR)
   #     IFRC_TRANSLATION_DOMAIN: $(STAGING_IFRC_TRANSLATION_DOMAIN)
-  #     IFRC_TRANSLATION_GET_API_KEY: $(STAGING_IFRC_TRANSLATION_GET_API_KEY)
   #     IFRC_TRANSLATION_HEADER_API_KEY: $(STAGING_IFRC_TRANSLATION_HEADER_API_KEY)
   #     DEBUG_EMAIL: ''
   #     DOCKER_HOST_IP: ''
@@ -181,7 +180,6 @@ jobs:
       DJANGO_READ_ONLY: $(PRODUCTION_DJANGO_READ_ONLY)
       AUTO_TRANSLATION_TRANSLATOR: $(PRODUCTION_AUTO_TRANSLATION_TRANSLATOR)
       IFRC_TRANSLATION_DOMAIN: $(PRODUCTION_IFRC_TRANSLATION_DOMAIN)
-      IFRC_TRANSLATION_GET_API_KEY: $(PRODUCTION_IFRC_TRANSLATION_GET_API_KEY)
       IFRC_TRANSLATION_HEADER_API_KEY: $(PRODUCTION_IFRC_TRANSLATION_HEADER_API_KEY)
       DEBUG_EMAIL: ''
       DOCKER_HOST_IP: ''

deploy/bin/deploy

@@ -159,7 +159,6 @@ if [ "${BASH_SOURCE[0]}" = "${0}" ]; then
         --set env.GO_DBPASS=${TF_VAR_GO_DBPASS} \
         --set env.APPEALS_USER=${TF_VAR_APPEALS_USER} \
         --set env.APPEALS_PASS=${TF_VAR_APPEALS_PASS} \
-        --set env.IFRC_TRANSLATION_GET_API_KEY=${TF_VAR_IFRC_TRANSLATION_GET_API_KEY} \
         --set env.IFRC_TRANSLATION_HEADER_API_KEY=${TF_VAR_IFRC_TRANSLATION_HEADER_API_KEY} \
         --set secrets.API_TLS_CRT=${TF_VAR_API_TLS_CRT} \
         --set secrets.API_TLS_KEY=${TF_VAR_API_TLS_KEY} \

deploy/docker-compose.yml

@@ -85,7 +85,6 @@ services:
         # IFRC dynamic translation
         - TF_VAR_AUTO_TRANSLATION_TRANSLATOR=${AUTO_TRANSLATION_TRANSLATOR}
         - TF_VAR_IFRC_TRANSLATION_DOMAIN=${IFRC_TRANSLATION_DOMAIN}
-        - TF_VAR_IFRC_TRANSLATION_GET_API_KEY=${IFRC_TRANSLATION_GET_API_KEY}
         - TF_VAR_IFRC_TRANSLATION_HEADER_API_KEY=${IFRC_TRANSLATION_HEADER_API_KEY}
         - ARM_SUBSCRIPTION_ID=${subscriptionId}
         - ARM_TENANT_ID=${tenantId}

deploy/helm/ifrcgo-helm/templates/config/secret.yaml

@@ -40,7 +40,6 @@ stringData:
   APPEALS_USER: "{{ .Values.env.APPEALS_USER }}"
   APPEALS_PASS: "{{ .Values.env.APPEALS_PASS }}"
   GO_DBPASS: "{{ .Values.env.GO_DBPASS }}"
-  IFRC_TRANSLATION_GET_API_KEY: "{{ .Values.env.IFRC_TRANSLATION_GET_API_KEY }}"
   IFRC_TRANSLATION_HEADER_API_KEY: "{{ .Values.env.IFRC_TRANSLATION_HEADER_API_KEY }}"
   FDRS_APIKEY : "{{ .Values.env.FDRS_APIKEY}}"
   NS_CONTACT_USERNAME: "{{ .Values.env.NS_CONTACT_USERNAME}}"

deploy/helm/ifrcgo-helm/values.yaml

@@ -47,7 +47,6 @@ env:
   DJANGO_READ_ONLY: ''
   AUTO_TRANSLATION_TRANSLATOR: ''
   IFRC_TRANSLATION_DOMAIN: ''
-  IFRC_TRANSLATION_GET_API_KEY: ''
   IFRC_TRANSLATION_HEADER_API_KEY: ''
   FDRS_APIKEY: ''
   NS_CONTACT_USERNAME: ''

deploy/terraform/main.tf

@@ -53,7 +53,6 @@ module "resources" {
   DJANGO_READ_ONLY = var.DJANGO_READ_ONLY
   AUTO_TRANSLATION_TRANSLATOR = var.AUTO_TRANSLATION_TRANSLATOR
   IFRC_TRANSLATION_DOMAIN = var.IFRC_TRANSLATION_DOMAIN
-  IFRC_TRANSLATION_GET_API_KEY = var.IFRC_TRANSLATION_GET_API_KEY
   IFRC_TRANSLATION_HEADER_API_KEY = var.IFRC_TRANSLATION_HEADER_API_KEY
   API_TLS_CRT = var.API_TLS_CRT
   API_TLS_KEY = var.API_TLS_KEY

deploy/terraform/resources/helm-ifrcgo.tf

@@ -176,11 +176,6 @@ resource "helm_release" "ifrcgo" {
     value = var.APPEALS_PASS
   }
 
-  set {
-    name = "env.IFRC_TRANSLATION_GET_API_KEY"
-    value = var.IFRC_TRANSLATION_GET_API_KEY
-  }
-
   set {
     name = "env.IFRC_TRANSLATION_HEADER_API_KEY"
     value = var.IFRC_TRANSLATION_HEADER_API_KEY

deploy/terraform/resources/variables.tf

@@ -226,11 +226,6 @@ variable "IFRC_TRANSLATION_DOMAIN" {
   default = ""
 }
 
-variable "IFRC_TRANSLATION_GET_API_KEY" {
-  type = string
-  default = ""
-}
-
 variable "IFRC_TRANSLATION_HEADER_API_KEY" {
   type = string
   default = ""

deploy/terraform/variables.tf

@@ -226,11 +226,6 @@ variable "IFRC_TRANSLATION_DOMAIN" {
   default = ""
 }
 
-variable "IFRC_TRANSLATION_GET_API_KEY" {
-  type = string
-  default = ""
-}
-
 variable "IFRC_TRANSLATION_HEADER_API_KEY" {
   type = string
   default = ""

docker-compose.yml

@@ -42,7 +42,6 @@ x-server: &base_server_setup
     # IFRC dynamic translation
     AUTO_TRANSLATION_TRANSLATOR: ${AUTO_TRANSLATION_TRANSLATOR:-}
     IFRC_TRANSLATION_DOMAIN: ${IFRC_TRANSLATION_DOMAIN:-}
-    IFRC_TRANSLATION_GET_API_KEY: ${IFRC_TRANSLATION_GET_API_KEY:-}
     IFRC_TRANSLATION_HEADER_API_KEY: ${IFRC_TRANSLATION_HEADER_API_KEY:-}
   extra_hosts:
       - "host.docker.internal:host-gateway"

lang/tests.py

@@ -238,7 +238,6 @@ def test_ifrc_translator(self, requests_mock):
         for settings_params in [
             dict(),
             dict(
-                IFRC_TRANSLATION_GET_API_KEY="dummy-api-param-key",
                 IFRC_TRANSLATION_HEADER_API_KEY="dummy-api-header-key",
             ),
             dict(IFRC_TRANSLATION_HEADER_API_KEY="dummy-api-header-key"),
@@ -254,7 +253,6 @@ def test_ifrc_translator(self, requests_mock):
         with override_settings(
             AUTO_TRANSLATION_TRANSLATOR="lang.translation.IfrcTranslator",
             IFRC_TRANSLATION_DOMAIN="http://example.org",
-            IFRC_TRANSLATION_GET_API_KEY="dummy-api-param-key",
             IFRC_TRANSLATION_HEADER_API_KEY="dummy-api-header-key",
         ):
             # with settings.TESTING True

lang/translation.py

@@ -66,18 +66,13 @@ class IfrcTranslator(BaseTranslator):
     params: dict
 
     def __init__(self):
-        if (
-            not settings.IFRC_TRANSLATION_DOMAIN
-            or not settings.IFRC_TRANSLATION_GET_API_KEY
-            or not settings.IFRC_TRANSLATION_HEADER_API_KEY
-        ):
+        if not settings.IFRC_TRANSLATION_DOMAIN or not settings.IFRC_TRANSLATION_HEADER_API_KEY:
             raise Exception("Translation configuration missing")
         self.domain = settings.IFRC_TRANSLATION_DOMAIN.strip("/")
         self.url = f"{self.domain}/api/translate"
         self.headers = {
             "X-API-KEY": settings.IFRC_TRANSLATION_HEADER_API_KEY,
         }
-        self.params = dict(apiKey=settings.IFRC_TRANSLATION_GET_API_KEY)
 
     @classmethod
     def is_text_html(cls, text):
@@ -99,7 +94,6 @@ def translate_text(self, text, dest_language, source_language=None):
         response = requests.post(
             self.url,
             headers=self.headers,
-            params=self.params,
             json=payload,
         )
         return response.json()[0]["translations"][0]["text"]

main/settings.py

@@ -60,7 +60,6 @@
     AWS_TRANSLATE_REGION=(str, None),
     # IFRC Translation
     IFRC_TRANSLATION_DOMAIN=(str, None),  # https://example.ifrc.org
-    IFRC_TRANSLATION_GET_API_KEY=(str, None),
     IFRC_TRANSLATION_HEADER_API_KEY=(str, None),
     # Celery NOTE: Not used right now
     CELERY_REDIS_URL=str,
@@ -397,7 +396,6 @@
 AUTO_TRANSLATION_TRANSLATOR = env("AUTO_TRANSLATION_TRANSLATOR")
 
 IFRC_TRANSLATION_DOMAIN = env("IFRC_TRANSLATION_DOMAIN")
-IFRC_TRANSLATION_GET_API_KEY = env("IFRC_TRANSLATION_GET_API_KEY")
 IFRC_TRANSLATION_HEADER_API_KEY = env("IFRC_TRANSLATION_HEADER_API_KEY")
 
 MEDIA_URL = env("DJANGO_MEDIA_URL")