Release to deploy infrastructure config changes

deploy/helm/ifrcgo-helm/values-production.yaml

@@ -1,4 +1,26 @@
+environment: production
+
+env:
+  API_FQDN: goadmin.ifrc.org
+  AUTO_TRANSLATION_TRANSLATOR: lang.translation.IfrcTranslator
+  CACHE_MIDDLEWARE_SECONDS: "0"
+  CELERY_REDIS_URL: redis://ifrcgo-helm-redis:6379/1
+  DEBUG_EMAIL: ""
+  DJANGO_DB_NAME: postgres
+  DJANGO_DEBUG: ""
+  DOCKER_HOST_IP: ""
+  DJANGO_READ_ONLY: "false"
+  DJANGO_ADDITIONAL_ALLOWED_HOSTS: ""
+  ELASTIC_SEARCH_HOST: elasticsearch://ifrcgo-helm-elasticsearch:9200
+  FRONTEND_URL: go.ifrc.org
+  GO_ENVIRONMENT: production
+  IFRC_TRANSLATION_DOMAIN: https://microservices-staging.ifrc.org
+  SENTRY_DSN: https://342632f67ea942c9bde214c0bb7e91be@sentry.northeurope.cloudapp.azure.com/2
+  SENTRY_SAMPLE_RATE: "0.2"
+
 api:
+  domain: goadmin.ifrc.org
+  additionalDomain: api.go.ifrc.org
   replicaCount: 2
   resources:
     requests:

deploy/helm/ifrcgo-helm/values-staging.yaml

@@ -1,4 +1,26 @@
+environment: staging
+
+env:
+  API_FQDN: goadmin-stage.ifrc.org
+  AUTO_TRANSLATION_TRANSLATOR: lang.translation.IfrcTranslator
+  CACHE_MIDDLEWARE_SECONDS: "0"
+  CELERY_REDIS_URL: redis://ifrcgo-helm-redis:6379/0
+  DEBUG_EMAIL: ""
+  DJANGO_DB_NAME: postgres
+  DJANGO_DEBUG: ""
+  DOCKER_HOST_IP: ""
+  DJANGO_READ_ONLY: "false"
+  DJANGO_ADDITIONAL_ALLOWED_HOSTS: ""
+  ELASTIC_SEARCH_HOST: elasticsearch://ifrcgo-helm-elasticsearch:9200
+  FRONTEND_URL: go-stage.ifrc.org
+  GO_ENVIRONMENT: staging
+  IFRC_TRANSLATION_DOMAIN: https://microservices-staging.ifrc.org
+  SENTRY_DSN: https://342632f67ea942c9bde214c0bb7e91be@sentry.northeurope.cloudapp.azure.com/2
+  SENTRY_SAMPLE_RATE: "0.9"
+
 api:
+  domain: goadmin-stage.ifrc.org
+  additionalDomain: ""
   replicaCount: 1
   resources:
     requests:

deploy/terraform/resources/aks.tf

@@ -51,17 +51,21 @@ provider "kubernetes" {
   cluster_ca_certificate = base64decode(azurerm_kubernetes_cluster.ifrcgo.kube_config.0.cluster_ca_certificate)
 }
 
-resource "kubernetes_config_map" "ifrcgo_elasticsearch_disk_config" {
+# This ConfigMap stores configurations for resources created by Terraform which 
+# are later referenced in the go-api Helm chart. Values from this ConfigMap
+# are either directly utilized in Kubernetes resource definitions or provided
+# as parameters to the Helm chart.
+resource "kubernetes_config_map" "ifrcgo_terraform_managed_resources" {
   metadata {
-    name = "ifrcgo-elasticsearch-disk-config"
+    name = "ifrcgo-terraform-managed-resources"
   }
 
   depends_on = [
     azurerm_managed_disk.ifrcgo
   ]
 
   data = {
-    "name" = "${local.prefix}-disk"
-    "uri"  = azurerm_managed_disk.ifrcgo.id
+    "elasticsearch_disk_name" = "${local.prefix}-disk"
+    "elasticsearch_disk_uri"  = azurerm_managed_disk.ifrcgo.id
   }
 }

deploy/terraform/resources/helm-ifrcgo.tf

@@ -12,31 +12,11 @@ resource "helm_release" "ifrcgo" {
     file("${path.root}/../helm/ifrcgo-helm/values-${var.environment}.yaml"),
   ]
 
-  set {
-    name  = "environment"
-    value = var.environment
-  }
-
-  set {
-    name  = "api.domain"
-    value = var.domain
-  }
-
-  set {
-    name  = "api.additionalDomain"
-    value = var.additionalDomain
-  }
-
   set {
     name = "env.DJANGO_SECRET_KEY"
     value = var.DJANGO_SECRET_KEY
   }
 
-  set {
-    name = "env.DJANGO_DB_NAME"
-    value = var.DJANGO_DB_NAME
-  }
-
   set {
     name = "env.DJANGO_DB_USER"
     value = var.DJANGO_DB_USER
@@ -122,16 +102,6 @@ resource "helm_release" "ifrcgo" {
     value = var.AWS_TRANSLATE_REGION
   }
 
-  set {
-    name = "env.CELERY_REDIS_URL"
-    value = var.CELERY_REDIS_URL
-  }
-
-  set {
-    name = "env.CACHE_MIDDLEWARE_SECONDS"
-    value = var.CACHE_MIDDLEWARE_SECONDS
-  }
-
   set {
     name = "env.MOLNIX_API_BASE"
     value = var.MOLNIX_API_BASE
@@ -177,11 +147,6 @@ resource "helm_release" "ifrcgo" {
     value = var.APPLICATION_INSIGHTS_INSTRUMENTATION_KEY
   }
 
-  set {
-    name = "env.ELASTIC_SEARCH_HOST"
-    value = var.ELASTIC_SEARCH_HOST
-  }
-
   set {
     name = "env.GO_FTPHOST"
     value = var.GO_FTPHOST
@@ -212,68 +177,6 @@ resource "helm_release" "ifrcgo" {
     value = var.APPEALS_PASS
   }
 
-  set {
-    name = "env.DJANGO_DEBUG"
-    value = var.DJANGO_DEBUG
-  }
-
-  set {
-    name = "env.DOCKER_HOST_IP"
-    value = var.DOCKER_HOST_IP
-  }
-
-  set {
-    name = "env.DJANGO_ADDITIONAL_ALLOWED_HOSTS"
-    value = var.DJANGO_ADDITIONAL_ALLOWED_HOSTS
-  }
-
-  set {
-    name = "env.GO_ENVIRONMENT"
-    value = var.GO_ENVIRONMENT
-  }
-
-  set {
-    name = "env.API_FQDN"
-    value = var.API_FQDN
-  }
-
-  set {
-    name = "env.FRONTEND_URL"
-    value = var.FRONTEND_URL
-  }
-
-  set {
-    name = "env.DEBUG_EMAIL"
-    value = var.DEBUG_EMAIL
-  }
-
-  set {
-    name = "env.SENTRY_DSN"
-    value = var.SENTRY_DSN
-  }
-
-  set {
-    name = "env.SENTRY_SAMPLE_RATE"
-    value = var.SENTRY_SAMPLE_RATE
-  }
-
-  set {
-    name = "env.DJANGO_READ_ONLY"
-    value = var.DJANGO_READ_ONLY
-  }
-
-  set {
-    name = "env.AUTO_TRANSLATION_TRANSLATOR"
-    value = var.AUTO_TRANSLATION_TRANSLATOR
-  }
-
-
-  set {
-    name = "env.IFRC_TRANSLATION_DOMAIN"
-    value = var.IFRC_TRANSLATION_DOMAIN
-  }
-
-
   set {
     name = "env.IFRC_TRANSLATION_GET_API_KEY"
     value = var.IFRC_TRANSLATION_GET_API_KEY

deployments/snapshots/snap_tests.py

@@ -500,7 +500,7 @@
 0,6670000,,,21,21,disaster-type-XvlEjHDVybUpjaGECJorCfVaAlQIoorOOwWWOTxEpvBlmPiZCF,PTXcdqvnvHwTLEndiXDoVOQikJwZCbtTkYqcWUjvvvsAHMUYSRoLYCDPcsggAEJIexYLAOYszPDoHzYvyMatrGQqVQBFVonlTlNeSksIMvwIDSCbaQBkpRNquLLRrkArcFAbOJMundfiTdopKGbShpUGFfWyjIopwBJNduJXecIRbhxnnDrZmuzDbiOPCFkGXDeuyxMBQNxDSLQswFvKvNKxxbvuPpSOyiKTOfChtGxseJoNwkSuiVQxjZdDQXHPGkXWezPugeNOTlftxFsTsujdZncYZQiEOyWNqDmbGUXJjtdmUxRplUfYkVssaVSlLmXBosPYYbKqflZTfJcxTQkwEKuLKdTbsEMqfiZPpjutAafJMfYhnZtVUoqZGTxEemnMXRNBSlDBIAflFpsihXhjbXkNfSTnGfocfsLtJckNHMdJIPHTeLyRAtZxkmhKgRKLcGjeQnmuzJUSngCjoWBOzFdtTSeEfaPnSJKfNhGYWEscubhp,en,2008-01-01,14,19,,14,event-sMJnADfqyEqKcByHGUACxeJvWFgfBtwBcwQMYxzntpWfGdOPCn,13,ljbuciwhwbvwynpxeteeypbrmgyfsjeglykagxsjerjagjqqdi,,en,7,2008-01-01T00:00:00.123456Z,,,project-UnYkbWprZqLxBbFeqHEXzwdTFDwWTjwTPDjoeyWVnhzbmQFPGU,0,Programme,1,sect-uVAlmiYIxHGrkqEZsVvZhDejWoRURzZJxfYzaqIhDxRVRqLyOx,0,Bilateral,15,15,qQ,Hpm,country-ehHgZXSIQWSvfnyCmGbRvjdnJPPIgSLnCUBGtXgIXrFfqyQikb,society-name-purdghlCkInyamaGEXzsDEcUKaAQQEBgIpXDyjVMxaEAPESeOA,"CefuMjeirN, QWBUdsMtwg","1, 2","False, True","False, True","district-hQbiawYYpLublqdiVAHhVeECXxGLgCGoNcUYQHtDPbdEzBRgFT, district-gYShPPXJUnBCoAvDzAUguBuQqxjREefffBgVVxZiJdLJJvQhAw",0,0,0,0,7,2008-01-01T00:00:00.123456Z,7,2008-01-01T00:00:00.123456Z,regional-project-DbawMMrzMzzRMpTiXpnSDdbFgVRuHaYbLFerPdJAmplntnbZWz,en,False,14,,,,14,Ri,ABc,country-mtfeuWEXnPXndNLdYcPTcKrVcYAxzwUGjpVsUqvpHZvPQBxpvl,society-name-ORQWacqDbKVfedVptLWQxAefMSWMGKLVzuffJgRuGnVCYrzBet,"1, 2","sect-tag-RoEbNJuNoPeODStPAhicctFhgpIiyDxQVSIALVUjAPgFNArcSx, sect-tag-CCpxgRxIPwdzrmhDfQnPOMbdYvpiYKneWJnLnovXjYMarjiIqZ",2008-01-01,1,Ongoing,0,0,0,0,en,False,11,public,Public\r
 0,9480000,,,24,24,disaster-type-QGfLROCZnxqYYsiwlrTSEFFEqsXrKyqYLpctBsZddBayKIGiyt,IBiVQDxZxZnFDLoYJwPsPZybLgihbqbDkxqZwUmMBcfWBdKNojOVqDbCKjzixQYgTEsmhRzXdnixdPoVRSXLtpROMGHqrjDJKwjRpBfYFLqKAUqvZtMSVwTNwDUGhlCUmUgFTsRUQZjCUgHoijRrbknMnzQiEygDArTbXQrcrUyvQxgfkJyoGfhbwaiTZiITMkcEXPsROvLwkYHTiCXAFEYrlnNnuSqnWoODmUYiTCHnMAXVLlfwhcaiyaFCWkeqmOOqSHyKQYyYvnFexwEphbwlaJKJmeJDobQZKxdENnoDCogiNEmrfVtHvdXkRSDQxMOSbHjAITbaMdEjlbJPOEfkWhHLWrwlpMPSuKAXcipneuZNXNHUDwhDxCYNbmkmaJHIdYBaMseDvakYUrhobdCGOIBFPwHSYFuvRIvaLvKWgtvcsNClpzANsRziClGBvgIhsXSictYoPJrWQucRSqzjgFyqQmsMmKsgBYTWyCqcCJRJRSAK,en,2008-01-01,16,22,,16,event-VjrTvORupHgxfIkFjRmWGiBriLwgGvlxxPDRAXHYHQUfvvLcpd,15,ghkbuunvtqvgdygrzvatwsgjslvhtuvbgkipqsatscpvbcamxw,,en,8,2008-01-01T00:00:00.123456Z,,,project-GVSxIuCrNeWfdzPZBDPjBsfGCNpPLCINunDEdekrKnhBVrwRQM,0,Programme,1,sect-uVAlmiYIxHGrkqEZsVvZhDejWoRURzZJxfYzaqIhDxRVRqLyOx,2,Domestic,17,17,Wd,nYB,country-mdluwLVGXFLUidBYjohYsQvMBJQSGSMgbLTyOgKWzJdswbwkfe,society-name-aHhzYrXgSJXaqqVYZAcISeSNFgqcZXJprBKuqrKwbzaLRZVvGc,"CefuMjeirN, QWBUdsMtwg","1, 2","False, True","False, True","district-hQbiawYYpLublqdiVAHhVeECXxGLgCGoNcUYQHtDPbdEzBRgFT, district-gYShPPXJUnBCoAvDzAUguBuQqxjREefffBgVVxZiJdLJJvQhAw",0,0,0,0,8,2008-01-01T00:00:00.123456Z,8,2008-01-01T00:00:00.123456Z,regional-project-OLmyweZGCxzYLlBSLiWdXXoQUkEnvXFhjxyElejpabJXvDQGKw,en,False,16,,,,16,IJ,nJT,country-sSISHJmNPkpDvMUaKFljHuISjRxJvVrwuhnNXhKAYbntHkXWpB,society-name-FmzKOmjpIbcqSpAqCxHtAAZrHBVETrgzoFXficzogDvwkKCEzc,"1, 2","sect-tag-RoEbNJuNoPeODStPAhicctFhgpIiyDxQVSIALVUjAPgFNArcSx, sect-tag-CCpxgRxIPwdzrmhDfQnPOMbdYvpiYKneWJnLnovXjYMarjiIqZ",2008-01-01,1,Ongoing,0,0,0,0,en,False,12,public,Public\r
 0,9380000,,,27,27,disaster-type-xTjxuICUVyFnuUaEJWfVdQFlHSoPMtZDyrUAVRelRyfqNSOYMn,QzQpgXKzlCvzStqoLWcLueOMvzznbdPzmyjThYdwReyqdCGDVZTPdtGgfnVPxWWmSUEVOQOpMAxkEOkWZMuLVIzCDESdvxtHLLTXcEflSLMyMWMgusTJlEadQiKpnXSgnizGKmEqAbkepBWIIsexFEfSiVMeHrlSOPxeULwYAWfEBQxvJMkjoSxxiSIuJFQbBmaYQjXjJXTlMoZpwjICHNFgxUmwZMPAtFkAHQtVFrArRxucDRjHpgWahJwURdHIdIEuzVtwWbVRvIhPauHagaJPJRAFMFZqqFBfLnCIZXUJBymyYOsyWvpootCCrVKAomEKjjYSBkGhNewalnFsnJOFpsudukhMsauOaqEiWAbNEPKBkMerwLFCpAybKIWVuLhMJfCWtFUoyBxnNCPHHwHCZtGVMRRwPxChphZONIqqqYUMyeBpKulvEqEEErpCOkfjoGrGDCxyeYNfJWKHEvxFLQIoiUlMcOXbduLauswVhCoyuJxs,en,2008-01-01,18,25,,18,event-dDYeiSXzvjsNsYIMeGwkZUMGpGGkaTeuhrLDCFArKfpzUfAwCA,17,wigkitzwygkpuqrtkqbiktjqlxsmqvqvudezazeupiibvovbxv,,en,9,2008-01-01T00:00:00.123456Z,,,project-cuUKeKortlsAiQVEgimNopdXWAvpmxYmTxNEuLQIbKzZkGlUTh,1,Emergency Operation,1,sect-uVAlmiYIxHGrkqEZsVvZhDejWoRURzZJxfYzaqIhDxRVRqLyOx,2,Domestic,19,19,Ot,IRf,country-NMcxbltczueeREOTrEZeUfDdQzrIwZCKBGJzmOQfkYYqdCVQMb,society-name-pIQHhKdhgWrvSAFYSzDCAeLvirKzVbgEcKjYgCBtveEDWZcijQ,"CefuMjeirN, QWBUdsMtwg","1, 2","False, True","False, True","district-hQbiawYYpLublqdiVAHhVeECXxGLgCGoNcUYQHtDPbdEzBRgFT, district-gYShPPXJUnBCoAvDzAUguBuQqxjREefffBgVVxZiJdLJJvQhAw",0,0,0,0,9,2008-01-01T00:00:00.123456Z,9,2008-01-01T00:00:00.123456Z,regional-project-BpdLEDoLPGUpByAbKFQKFGZuvaYWdRPsrxQcCTiMzkNUXVbRfb,en,False,18,,,,18,VF,ZcB,country-TtlvXyybaLIYUavFZInAPMcSnbmrepOzvPmiLGuBUIrNRMCUZC,society-name-cbFrygrYppCcdYrULfUQFtsmyJCfQUOypGSDBlfwETFZtaVuqx,"1, 2","sect-tag-RoEbNJuNoPeODStPAhicctFhgpIiyDxQVSIALVUjAPgFNArcSx, sect-tag-CCpxgRxIPwdzrmhDfQnPOMbdYvpiYKneWJnLnovXjYMarjiIqZ",2008-01-01,1,Ongoing,0,0,0,0,en,False,13,public,Public\r
-0,4750000,,,30,30,disaster-type-ywNSCtyandiRngieFHhCYWbtlTpiFuHIJffIuNZkbAnbqhywiD,kzfJKgaKwogcbeDMQlWueozOkjmIPbenQCclbKPJfMtaeWryNyfTpzcDFjFkcOVsxdSTKJaBVnSRwopnxbhzTlAiuectKryhFpcxQeZUvgnoQibLzCmdLYjsaEtfOmvKORAAvppKdoYyoQHxErmoMgLuGbSabYJtgzjRyFxcfTtBHpPhrzxaYboKqXOxxGTRUTsyVsPkdgGgWPMbinkagywgMHJMazVbMhFXwcDvhVLkyDEOwZbrzgzPkQjROGOsmUMRBwBIVOJWOFYkajaqJFfboyYRvosFyWsfqsYjUTVEhRLCsvnesxLxwaJddjONbBULwtEmuBqiZCSiLqnAOfcYNbKHkqudPHhqTBQtCcjmAaCshFdYBaklxkvumQQfmqVfCAllIbKwteFxrRcgypCNcwXJrJkJhCmNnnWNVzNOgbWWIkZLBPQwBgiZdYysyrUAEyqDJwykvdJqwdVRePtpYKLKjwDaLLkGBhajHwOvWgqpHRju,en,2008-01-01,20,28,,20,event-JTbYctvdfuVpeThKuNOAdjEzMXmZSrYWFFMBAduqGvyjuEwark,19,ltzqwdylqqvsgawhxuwfvqgvhkfxfgyhtjjygydxjbekfqyvwf,,en,10,2008-01-01T00:00:00.123456Z,,,project-RvjaplRUIWAvKhIWhKYHcXwlHnZMXcvmaBFoaUQIoZdoJHsbgV,1,Emergency Operation,1,sect-uVAlmiYIxHGrkqEZsVvZhDejWoRURzZJxfYzaqIhDxRVRqLyOx,1,Multilateral,21,21,Ge,HrC,country-XxjxpeQZSEZudqaYKnEbfVhHuNzJKSCrPbVNwkKbuUYQwcMwEK,society-name-UjyzGdznVMMOlseBOgfMwrcZSUUOYylVFGPNbGIVVPdzGZmfWh,"CefuMjeirN, QWBUdsMtwg","1, 2","False, True","False, True","district-hQbiawYYpLublqdiVAHhVeECXxGLgCGoNcUYQHtDPbdEzBRgFT, district-gYShPPXJUnBCoAvDzAUguBuQqxjREefffBgVVxZiJdLJJvQhAw",0,0,0,0,10,2008-01-01T00:00:00.123456Z,10,2008-01-01T00:00:00.123456Z,regional-project-LDcMwFsWtwTrbBLhtpGDZBEnJPtphXSOuVZxAFBMuMDNkKylVA,en,False,20,,,,20,ta,FvT,country-SjzwjCHkwsypbvNtQfVwBFheDCunLJXUYCkrZOuJfTLYJDQcGQ,society-name-uWmSJZaxmVzvNOEjBHnNxcXDVSbwfZmcAMACleXiIguyJpJCYb,"1, 2","sect-tag-RoEbNJuNoPeODStPAhicctFhgpIiyDxQVSIALVUjAPgFNArcSx, sect-tag-CCpxgRxIPwdzrmhDfQnPOMbdYvpiYKneWJnLnovXjYMarjiIqZ",2008-01-01,1,Ongoing,0,0,0,0,en,False,14,public,Public\r
+0,6520000,,,30,30,disaster-type-hkywNSCtyandiRngieFHhCYWbtlTpiFuHIJffIuNZkbAnbqhyw,iDkzfJKgaKwogcbeDMQlWueozOkjmIPbenQCclbKPJfMtaeWryNyfTpzcDFjFkcOVsxdSTKJaBVnSRwopnxbhzTlAiuectKryhFpcxQeZUvgnoQibLzCmdLYjsaEtfOmvKORAAvppKdoYyoQHxErmoMgLuGbSabYJtgzjRyFxcfTtBHpPhrzxaYboKqXOxxGTRUTsyVsPkdgGgWPMbinkagywgMHJMazVbMhFXwcDvhVLkyDEOwZbrzgzPkQjROGOsmUMRBwBIVOJWOFYkajaqJFfboyYRvosFyWsfqsYjUTVEhRLCsvnesxLxwaJddjONbBULwtEmuBqiZCSiLqnAOfcYNbKHkqudPHhqTBQtCcjmAaCshFdYBaklxkvumQQfmqVfCAllIbKwteFxrRcgypCNcwXJrJkJhCmNnnWNVzNOgbWWIkZLBPQwBgiZdYysyrUAEyqDJwykvdJqwdVRePtpYKLKjwDaLLkGBhajHwOvWgqpHR,en,2008-01-01,20,28,,20,event-JTbYctvdfuVpeThKuNOAdjEzMXmZSrYWFFMBAduqGvyjuEwark,19,ltzqwdylqqvsgawhxuwfvqgvhkfxfgyhtjjygydxjbekfqyvwf,,en,10,2008-01-01T00:00:00.123456Z,,,project-juRvjaplRUIWAvKhIWhKYHcXwlHnZMXcvmaBFoaUQIoZdoJHsb,1,Emergency Operation,1,sect-uVAlmiYIxHGrkqEZsVvZhDejWoRURzZJxfYzaqIhDxRVRqLyOx,0,Bilateral,21,21,Ge,HrC,country-XxjxpeQZSEZudqaYKnEbfVhHuNzJKSCrPbVNwkKbuUYQwcMwEK,society-name-UjyzGdznVMMOlseBOgfMwrcZSUUOYylVFGPNbGIVVPdzGZmfWh,"CefuMjeirN, QWBUdsMtwg","1, 2","False, True","False, True","district-hQbiawYYpLublqdiVAHhVeECXxGLgCGoNcUYQHtDPbdEzBRgFT, district-gYShPPXJUnBCoAvDzAUguBuQqxjREefffBgVVxZiJdLJJvQhAw",0,0,0,0,10,2008-01-01T00:00:00.123456Z,10,2008-01-01T00:00:00.123456Z,regional-project-gLDcMwFsWtwTrbBLhtpGDZBEnJPtphXSOuVZxAFBMuMDNkKylV,en,False,20,,,,20,ta,FvT,country-SjzwjCHkwsypbvNtQfVwBFheDCunLJXUYCkrZOuJfTLYJDQcGQ,society-name-uWmSJZaxmVzvNOEjBHnNxcXDVSbwfZmcAMACleXiIguyJpJCYb,"1, 2","sect-tag-RoEbNJuNoPeODStPAhicctFhgpIiyDxQVSIALVUjAPgFNArcSx, sect-tag-CCpxgRxIPwdzrmhDfQnPOMbdYvpiYKneWJnLnovXjYMarjiIqZ",2008-01-01,1,Ongoing,0,0,0,0,en,False,14,public,Public\r
 '''
 
 snapshots['TestProjectAPI::test_project_delete 1'] = b''

dref/models.py

@@ -70,7 +70,7 @@ def get_image_map(title, request):
             NationalSocietyAction.Title.MULTI_PURPOSE_CASH: "cash.png",
             NationalSocietyAction.Title.OTHER: "favicon.png",
         }
-        return request.build_absolute_uri(static(os.path.join("images/dref", title_static_map[title])))
+        return request.build_absolute_uri(static(os.path.join("images/dref", title_static_map.get(title, "favicon.png"))))
 
 
 @reversion.register()
@@ -114,7 +114,7 @@ def get_image_map(title, request):
             IdentifiedNeed.Title.ENVIRONMENT_SUSTAINABILITY: "environment.png",
             IdentifiedNeed.Title.COMMUNITY_ENGAGEMENT_AND_ACCOUNTABILITY: "participation_team.png",
         }
-        return request.build_absolute_uri(static(os.path.join("images/dref", title_static_map[title])))
+        return request.build_absolute_uri(static(os.path.join("images/dref", title_static_map.get(title, "favicon.png"))))
 
 
 @reversion.register()
@@ -193,7 +193,7 @@ def get_image_map(title, request):
             PlannedIntervention.Title.COMMUNITY_ENGAGEMENT_AND_ACCOUNTABILITY: "participation_team.png",
             PlannedIntervention.Title.COORDINATION_AND_PARTNERSHIPS: "coordination.png"
         }
-        return request.build_absolute_uri(static(os.path.join("images/dref", title_static_map[title])))
+        return request.build_absolute_uri(static(os.path.join("images/dref", title_static_map.get(title, "favicon.png"))))
 
 
 @reversion.register()