From 5ee484fb9b9f47608422a14205347a841d93dee6 Mon Sep 17 00:00:00 2001 From: Tarashish Mishra Date: Thu, 7 Dec 2023 16:50:50 +0530 Subject: [PATCH 1/9] define staging values --- deploy/helm/ifrcgo-helm/values-staging.yaml | 37 +++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/deploy/helm/ifrcgo-helm/values-staging.yaml b/deploy/helm/ifrcgo-helm/values-staging.yaml index ed762095f..a9569e722 100644 --- a/deploy/helm/ifrcgo-helm/values-staging.yaml +++ b/deploy/helm/ifrcgo-helm/values-staging.yaml @@ -1,4 +1,41 @@ +environment: staging + +env: + API_FQDN: goadmin-stage.ifrc.org + AUTO_TRANSLATION_TRANSLATOR: lang.translation.IfrcTranslator + AWS_TRANSLATE_ACCESS_KEY: + AWS_TRANSLATE_REGION: + AZURE_STORAGE_ACCOUNT: + CACHE_MIDDLEWARE_SECONDS: "0" + CELERY_REDIS_URL: redis://ifrcgo-helm-redis:6379/0 + DEBUG_EMAIL: "" + DJANGO_DB_HOST: + DJANGO_DB_NAME: postgres + DJANGO_DB_NAME: + DJANGO_DB_USER: + DJANGO_DB_PORT: + DJANGO_DEBUG: "" + DOCKER_HOST_IP: "" + DJANGO_READ_ONLY: "false" + DJANGO_ADDITIONAL_ALLOWED_HOSTS: "" + ELASTIC_SEARCH_HOST: elasticsearch://ifrcgo-helm-elasticsearch:9200 + EMAIL_HOST: + EMAIL_PORT: + EMAIL_USER: + ERP_API_ENDPOINT: + FRONTEND_URL: go-stage.ifrc.org + GO_ENVIRONMENT: staging + GO_FTPHOST: + IFRC_TRANSLATION_DOMAIN: https://microservices-staging.ifrc.org + MOLNIX_API_BASE: + MOLNIX_USERNAME: + SENTRY_DSN: https://342632f67ea942c9bde214c0bb7e91be@sentry.northeurope.cloudapp.azure.com/2 + SENTRY_SAMPLE_RATE: "0.9" + TEST_EMAILS: + api: + domain: + additionalDomain: replicaCount: 1 resources: requests: From ecd2166f252211fa526a92488379885bde559982 Mon Sep 17 00:00:00 2001 From: Sanjay Bhangar Date: Thu, 7 Dec 2023 17:15:55 +0530 Subject: [PATCH 2/9] add public env values for production, fix duplication of DB_NAME in staging values --- .../helm/ifrcgo-helm/values-production.yaml | 32 +++++++++++++++++++ deploy/helm/ifrcgo-helm/values-staging.yaml | 1 - 2 files changed, 32 insertions(+), 1 deletion(-) diff --git a/deploy/helm/ifrcgo-helm/values-production.yaml b/deploy/helm/ifrcgo-helm/values-production.yaml index 968e95450..e68b17006 100644 --- a/deploy/helm/ifrcgo-helm/values-production.yaml +++ b/deploy/helm/ifrcgo-helm/values-production.yaml @@ -1,3 +1,35 @@ +env: + API_FQDN: goadmin.ifrc.org + AUTO_TRANSLATION_TRANSLATOR: lang.translation.IfrcTranslator + AWS_TRANSLATE_ACCESS_KEY: + AWS_TRANSLATE_REGION: + AZURE_STORAGE_ACCOUNT: + CACHE_MIDDLEWARE_SECONDS: "0" + CELERY_REDIS_URL: redis://ifrcgo-helm-redis:6379/1 + DEBUG_EMAIL: "" + DJANGO_DB_HOST: + DJANGO_DB_NAME: postgres + DJANGO_DB_USER: + DJANGO_DB_PORT: + DJANGO_DEBUG: "" + DOCKER_HOST_IP: "" + DJANGO_READ_ONLY: "false" + DJANGO_ADDITIONAL_ALLOWED_HOSTS: "" + ELASTIC_SEARCH_HOST: elasticsearch://ifrcgo-helm-elasticsearch:9200 + EMAIL_HOST: + EMAIL_PORT: + EMAIL_USER: + ERP_API_ENDPOINT: + FRONTEND_URL: go.ifrc.org + GO_ENVIRONMENT: production + GO_FTPHOST: + IFRC_TRANSLATION_DOMAIN: https://microservices-staging.ifrc.org + MOLNIX_API_BASE: + MOLNIX_USERNAME: + SENTRY_DSN: https://342632f67ea942c9bde214c0bb7e91be@sentry.northeurope.cloudapp.azure.com/2 + SENTRY_SAMPLE_RATE: "0.2" + TEST_EMAILS: + api: replicaCount: 2 resources: diff --git a/deploy/helm/ifrcgo-helm/values-staging.yaml b/deploy/helm/ifrcgo-helm/values-staging.yaml index a9569e722..858564aa5 100644 --- a/deploy/helm/ifrcgo-helm/values-staging.yaml +++ b/deploy/helm/ifrcgo-helm/values-staging.yaml @@ -11,7 +11,6 @@ env: DEBUG_EMAIL: "" DJANGO_DB_HOST: DJANGO_DB_NAME: postgres - DJANGO_DB_NAME: DJANGO_DB_USER: DJANGO_DB_PORT: DJANGO_DEBUG: "" From b541ea5043bd47002b25208259da95666a7cc843 Mon Sep 17 00:00:00 2001 From: Tarashish Mishra Date: Tue, 12 Dec 2023 16:09:45 +0530 Subject: [PATCH 3/9] don't set helm values defined in the values files individually --- .../helm/ifrcgo-helm/values-production.yaml | 18 +--- deploy/helm/ifrcgo-helm/values-staging.yaml | 14 --- deploy/terraform/resources/helm-ifrcgo.tf | 97 ------------------- 3 files changed, 4 insertions(+), 125 deletions(-) diff --git a/deploy/helm/ifrcgo-helm/values-production.yaml b/deploy/helm/ifrcgo-helm/values-production.yaml index e68b17006..77a49aad7 100644 --- a/deploy/helm/ifrcgo-helm/values-production.yaml +++ b/deploy/helm/ifrcgo-helm/values-production.yaml @@ -1,36 +1,26 @@ +environment: production + env: API_FQDN: goadmin.ifrc.org AUTO_TRANSLATION_TRANSLATOR: lang.translation.IfrcTranslator - AWS_TRANSLATE_ACCESS_KEY: - AWS_TRANSLATE_REGION: - AZURE_STORAGE_ACCOUNT: CACHE_MIDDLEWARE_SECONDS: "0" CELERY_REDIS_URL: redis://ifrcgo-helm-redis:6379/1 DEBUG_EMAIL: "" - DJANGO_DB_HOST: DJANGO_DB_NAME: postgres - DJANGO_DB_USER: - DJANGO_DB_PORT: DJANGO_DEBUG: "" DOCKER_HOST_IP: "" DJANGO_READ_ONLY: "false" DJANGO_ADDITIONAL_ALLOWED_HOSTS: "" ELASTIC_SEARCH_HOST: elasticsearch://ifrcgo-helm-elasticsearch:9200 - EMAIL_HOST: - EMAIL_PORT: - EMAIL_USER: - ERP_API_ENDPOINT: FRONTEND_URL: go.ifrc.org GO_ENVIRONMENT: production - GO_FTPHOST: IFRC_TRANSLATION_DOMAIN: https://microservices-staging.ifrc.org - MOLNIX_API_BASE: - MOLNIX_USERNAME: SENTRY_DSN: https://342632f67ea942c9bde214c0bb7e91be@sentry.northeurope.cloudapp.azure.com/2 SENTRY_SAMPLE_RATE: "0.2" - TEST_EMAILS: api: + domain: + additionalDomain: replicaCount: 2 resources: requests: diff --git a/deploy/helm/ifrcgo-helm/values-staging.yaml b/deploy/helm/ifrcgo-helm/values-staging.yaml index 858564aa5..80af4c473 100644 --- a/deploy/helm/ifrcgo-helm/values-staging.yaml +++ b/deploy/helm/ifrcgo-helm/values-staging.yaml @@ -3,34 +3,20 @@ environment: staging env: API_FQDN: goadmin-stage.ifrc.org AUTO_TRANSLATION_TRANSLATOR: lang.translation.IfrcTranslator - AWS_TRANSLATE_ACCESS_KEY: - AWS_TRANSLATE_REGION: - AZURE_STORAGE_ACCOUNT: CACHE_MIDDLEWARE_SECONDS: "0" CELERY_REDIS_URL: redis://ifrcgo-helm-redis:6379/0 DEBUG_EMAIL: "" - DJANGO_DB_HOST: DJANGO_DB_NAME: postgres - DJANGO_DB_USER: - DJANGO_DB_PORT: DJANGO_DEBUG: "" DOCKER_HOST_IP: "" DJANGO_READ_ONLY: "false" DJANGO_ADDITIONAL_ALLOWED_HOSTS: "" ELASTIC_SEARCH_HOST: elasticsearch://ifrcgo-helm-elasticsearch:9200 - EMAIL_HOST: - EMAIL_PORT: - EMAIL_USER: - ERP_API_ENDPOINT: FRONTEND_URL: go-stage.ifrc.org GO_ENVIRONMENT: staging - GO_FTPHOST: IFRC_TRANSLATION_DOMAIN: https://microservices-staging.ifrc.org - MOLNIX_API_BASE: - MOLNIX_USERNAME: SENTRY_DSN: https://342632f67ea942c9bde214c0bb7e91be@sentry.northeurope.cloudapp.azure.com/2 SENTRY_SAMPLE_RATE: "0.9" - TEST_EMAILS: api: domain: diff --git a/deploy/terraform/resources/helm-ifrcgo.tf b/deploy/terraform/resources/helm-ifrcgo.tf index 964638d2c..60a03d9fb 100644 --- a/deploy/terraform/resources/helm-ifrcgo.tf +++ b/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 From 4cf3f334d68aa128046b4b3f6da404eebc2fa7c2 Mon Sep 17 00:00:00 2001 From: Tarashish Mishra Date: Wed, 13 Dec 2023 11:41:09 +0530 Subject: [PATCH 4/9] add domain config for staging api --- deploy/helm/ifrcgo-helm/values-staging.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/deploy/helm/ifrcgo-helm/values-staging.yaml b/deploy/helm/ifrcgo-helm/values-staging.yaml index 80af4c473..a156462a8 100644 --- a/deploy/helm/ifrcgo-helm/values-staging.yaml +++ b/deploy/helm/ifrcgo-helm/values-staging.yaml @@ -19,8 +19,8 @@ env: SENTRY_SAMPLE_RATE: "0.9" api: - domain: - additionalDomain: + domain: goadmin-stage.ifrc.org + additionalDomain: "" replicaCount: 1 resources: requests: From a1959305f8ea6812e216893c0cb11a10a822cb87 Mon Sep 17 00:00:00 2001 From: k9845 Date: Wed, 20 Dec 2023 12:29:27 +0545 Subject: [PATCH 5/9] Add default image for dref static url --- dref/models.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dref/models.py b/dref/models.py index 9d3912131..3f00a9808 100644 --- a/dref/models.py +++ 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() From 70c4edd50f4713ed97e5aa67c6d64309207a52e7 Mon Sep 17 00:00:00 2001 From: Sanjay Bhangar Date: Wed, 3 Jan 2024 11:36:00 +0530 Subject: [PATCH 6/9] add prod values for domain and additionalDomain --- deploy/helm/ifrcgo-helm/values-production.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/deploy/helm/ifrcgo-helm/values-production.yaml b/deploy/helm/ifrcgo-helm/values-production.yaml index 77a49aad7..0b3aedd6f 100644 --- a/deploy/helm/ifrcgo-helm/values-production.yaml +++ b/deploy/helm/ifrcgo-helm/values-production.yaml @@ -19,8 +19,8 @@ env: SENTRY_SAMPLE_RATE: "0.2" api: - domain: - additionalDomain: + domain: goadmin.ifrc.org + additionalDomain: api.go.ifrc.org replicaCount: 2 resources: requests: From b5e9363930ae856e8d01baede378083848bff1c1 Mon Sep 17 00:00:00 2001 From: "Szabo, Zoltan" Date: Fri, 5 Jan 2024 11:25:59 +0100 Subject: [PATCH 7/9] Fix snapshot test morphing --- deployments/snapshots/snap_tests.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deployments/snapshots/snap_tests.py b/deployments/snapshots/snap_tests.py index 42d7b2636..403e2e131 100644 --- a/deployments/snapshots/snap_tests.py +++ b/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'' From 34e040e861925f31de44015bac6d25e087c021ba Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 5 Jan 2024 17:56:49 +0000 Subject: [PATCH 8/9] Bump pycryptodome from 3.18.0 to 3.19.1 Bumps [pycryptodome](https://github.com/Legrandin/pycryptodome) from 3.18.0 to 3.19.1. - [Release notes](https://github.com/Legrandin/pycryptodome/releases) - [Changelog](https://github.com/Legrandin/pycryptodome/blob/master/Changelog.rst) - [Commits](https://github.com/Legrandin/pycryptodome/compare/v3.18.0...v3.19.1) --- updated-dependencies: - dependency-name: pycryptodome dependency-type: indirect ... Signed-off-by: dependabot[bot] --- poetry.lock | 76 ++++++++++++++++++++++++++++++----------------------- 1 file changed, 43 insertions(+), 33 deletions(-) diff --git a/poetry.lock b/poetry.lock index ab23dc37e..4546f8ce8 100644 --- a/poetry.lock +++ b/poetry.lock @@ -1905,6 +1905,16 @@ files = [ {file = "MarkupSafe-2.1.3-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:5bbe06f8eeafd38e5d0a4894ffec89378b6c6a625ff57e3028921f8ff59318ac"}, {file = "MarkupSafe-2.1.3-cp311-cp311-win32.whl", hash = "sha256:dd15ff04ffd7e05ffcb7fe79f1b98041b8ea30ae9234aed2a9168b5797c3effb"}, {file = "MarkupSafe-2.1.3-cp311-cp311-win_amd64.whl", hash = "sha256:134da1eca9ec0ae528110ccc9e48041e0828d79f24121a1a146161103c76e686"}, + {file = "MarkupSafe-2.1.3-cp312-cp312-macosx_10_9_universal2.whl", hash = "sha256:f698de3fd0c4e6972b92290a45bd9b1536bffe8c6759c62471efaa8acb4c37bc"}, + {file = "MarkupSafe-2.1.3-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:aa57bd9cf8ae831a362185ee444e15a93ecb2e344c8e52e4d721ea3ab6ef1823"}, + {file = "MarkupSafe-2.1.3-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ffcc3f7c66b5f5b7931a5aa68fc9cecc51e685ef90282f4a82f0f5e9b704ad11"}, + {file = "MarkupSafe-2.1.3-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:47d4f1c5f80fc62fdd7777d0d40a2e9dda0a05883ab11374334f6c4de38adffd"}, + {file = "MarkupSafe-2.1.3-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:1f67c7038d560d92149c060157d623c542173016c4babc0c1913cca0564b9939"}, + {file = "MarkupSafe-2.1.3-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:9aad3c1755095ce347e26488214ef77e0485a3c34a50c5a5e2471dff60b9dd9c"}, + {file = "MarkupSafe-2.1.3-cp312-cp312-musllinux_1_1_i686.whl", hash = "sha256:14ff806850827afd6b07a5f32bd917fb7f45b046ba40c57abdb636674a8b559c"}, + {file = "MarkupSafe-2.1.3-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:8f9293864fe09b8149f0cc42ce56e3f0e54de883a9de90cd427f191c346eb2e1"}, + {file = "MarkupSafe-2.1.3-cp312-cp312-win32.whl", hash = "sha256:715d3562f79d540f251b99ebd6d8baa547118974341db04f5ad06d5ea3eb8007"}, + {file = "MarkupSafe-2.1.3-cp312-cp312-win_amd64.whl", hash = "sha256:1b8dd8c3fd14349433c79fa8abeb573a55fc0fdd769133baac1f5e07abf54aeb"}, {file = "MarkupSafe-2.1.3-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:8e254ae696c88d98da6555f5ace2279cf7cd5b3f52be2b5cf97feafe883b58d2"}, {file = "MarkupSafe-2.1.3-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:cb0932dc158471523c9637e807d9bfb93e06a95cbf010f1a38b98623b929ef2b"}, {file = "MarkupSafe-2.1.3-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9402b03f1a1b4dc4c19845e5c749e3ab82d5078d16a2a4c2cd2df62d57bb0707"}, @@ -2544,43 +2554,43 @@ files = [ [[package]] name = "pycryptodome" -version = "3.18.0" +version = "3.19.1" description = "Cryptographic library for Python" optional = false python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" files = [ - {file = "pycryptodome-3.18.0-cp27-cp27m-macosx_10_9_x86_64.whl", hash = "sha256:d1497a8cd4728db0e0da3c304856cb37c0c4e3d0b36fcbabcc1600f18504fc54"}, - {file = "pycryptodome-3.18.0-cp27-cp27m-manylinux2010_i686.whl", hash = "sha256:928078c530da78ff08e10eb6cada6e0dff386bf3d9fa9871b4bbc9fbc1efe024"}, - {file = "pycryptodome-3.18.0-cp27-cp27m-manylinux2010_x86_64.whl", hash = "sha256:157c9b5ba5e21b375f052ca78152dd309a09ed04703fd3721dce3ff8ecced148"}, - {file = "pycryptodome-3.18.0-cp27-cp27m-manylinux2014_aarch64.whl", hash = "sha256:d20082bdac9218649f6abe0b885927be25a917e29ae0502eaf2b53f1233ce0c2"}, - {file = "pycryptodome-3.18.0-cp27-cp27m-musllinux_1_1_aarch64.whl", hash = "sha256:e8ad74044e5f5d2456c11ed4cfd3e34b8d4898c0cb201c4038fe41458a82ea27"}, - {file = "pycryptodome-3.18.0-cp27-cp27m-win32.whl", hash = "sha256:62a1e8847fabb5213ccde38915563140a5b338f0d0a0d363f996b51e4a6165cf"}, - {file = "pycryptodome-3.18.0-cp27-cp27m-win_amd64.whl", hash = "sha256:16bfd98dbe472c263ed2821284118d899c76968db1a6665ade0c46805e6b29a4"}, - {file = "pycryptodome-3.18.0-cp27-cp27mu-manylinux2010_i686.whl", hash = "sha256:7a3d22c8ee63de22336679e021c7f2386f7fc465477d59675caa0e5706387944"}, - {file = "pycryptodome-3.18.0-cp27-cp27mu-manylinux2010_x86_64.whl", hash = "sha256:78d863476e6bad2a592645072cc489bb90320972115d8995bcfbee2f8b209918"}, - {file = "pycryptodome-3.18.0-cp27-cp27mu-manylinux2014_aarch64.whl", hash = "sha256:b6a610f8bfe67eab980d6236fdc73bfcdae23c9ed5548192bb2d530e8a92780e"}, - {file = "pycryptodome-3.18.0-cp27-cp27mu-musllinux_1_1_aarch64.whl", hash = "sha256:422c89fd8df8a3bee09fb8d52aaa1e996120eafa565437392b781abec2a56e14"}, - {file = "pycryptodome-3.18.0-cp35-abi3-macosx_10_9_universal2.whl", hash = "sha256:9ad6f09f670c466aac94a40798e0e8d1ef2aa04589c29faa5b9b97566611d1d1"}, - {file = "pycryptodome-3.18.0-cp35-abi3-macosx_10_9_x86_64.whl", hash = "sha256:53aee6be8b9b6da25ccd9028caf17dcdce3604f2c7862f5167777b707fbfb6cb"}, - {file = "pycryptodome-3.18.0-cp35-abi3-manylinux2014_aarch64.whl", hash = "sha256:10da29526a2a927c7d64b8f34592f461d92ae55fc97981aab5bbcde8cb465bb6"}, - {file = "pycryptodome-3.18.0-cp35-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f21efb8438971aa16924790e1c3dba3a33164eb4000106a55baaed522c261acf"}, - {file = "pycryptodome-3.18.0-cp35-abi3-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:4944defabe2ace4803f99543445c27dd1edbe86d7d4edb87b256476a91e9ffa4"}, - {file = "pycryptodome-3.18.0-cp35-abi3-musllinux_1_1_aarch64.whl", hash = "sha256:51eae079ddb9c5f10376b4131be9589a6554f6fd84f7f655180937f611cd99a2"}, - {file = "pycryptodome-3.18.0-cp35-abi3-musllinux_1_1_i686.whl", hash = "sha256:83c75952dcf4a4cebaa850fa257d7a860644c70a7cd54262c237c9f2be26f76e"}, - {file = "pycryptodome-3.18.0-cp35-abi3-musllinux_1_1_x86_64.whl", hash = "sha256:957b221d062d5752716923d14e0926f47670e95fead9d240fa4d4862214b9b2f"}, - {file = "pycryptodome-3.18.0-cp35-abi3-win32.whl", hash = "sha256:795bd1e4258a2c689c0b1f13ce9684fa0dd4c0e08680dcf597cf9516ed6bc0f3"}, - {file = "pycryptodome-3.18.0-cp35-abi3-win_amd64.whl", hash = "sha256:b1d9701d10303eec8d0bd33fa54d44e67b8be74ab449052a8372f12a66f93fb9"}, - {file = "pycryptodome-3.18.0-pp27-pypy_73-manylinux2010_x86_64.whl", hash = "sha256:cb1be4d5af7f355e7d41d36d8eec156ef1382a88638e8032215c215b82a4b8ec"}, - {file = "pycryptodome-3.18.0-pp27-pypy_73-win32.whl", hash = "sha256:fc0a73f4db1e31d4a6d71b672a48f3af458f548059aa05e83022d5f61aac9c08"}, - {file = "pycryptodome-3.18.0-pp38-pypy38_pp73-macosx_10_9_x86_64.whl", hash = "sha256:f022a4fd2a5263a5c483a2bb165f9cb27f2be06f2f477113783efe3fe2ad887b"}, - {file = "pycryptodome-3.18.0-pp38-pypy38_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:363dd6f21f848301c2dcdeb3c8ae5f0dee2286a5e952a0f04954b82076f23825"}, - {file = "pycryptodome-3.18.0-pp38-pypy38_pp73-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:12600268763e6fec3cefe4c2dcdf79bde08d0b6dc1813887e789e495cb9f3403"}, - {file = "pycryptodome-3.18.0-pp38-pypy38_pp73-win_amd64.whl", hash = "sha256:4604816adebd4faf8810782f137f8426bf45fee97d8427fa8e1e49ea78a52e2c"}, - {file = "pycryptodome-3.18.0-pp39-pypy39_pp73-macosx_10_9_x86_64.whl", hash = "sha256:01489bbdf709d993f3058e2996f8f40fee3f0ea4d995002e5968965fa2fe89fb"}, - {file = "pycryptodome-3.18.0-pp39-pypy39_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3811e31e1ac3069988f7a1c9ee7331b942e605dfc0f27330a9ea5997e965efb2"}, - {file = "pycryptodome-3.18.0-pp39-pypy39_pp73-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:6f4b967bb11baea9128ec88c3d02f55a3e338361f5e4934f5240afcb667fdaec"}, - {file = "pycryptodome-3.18.0-pp39-pypy39_pp73-win_amd64.whl", hash = "sha256:9c8eda4f260072f7dbe42f473906c659dcbadd5ae6159dfb49af4da1293ae380"}, - {file = "pycryptodome-3.18.0.tar.gz", hash = "sha256:c9adee653fc882d98956e33ca2c1fb582e23a8af7ac82fee75bd6113c55a0413"}, + {file = "pycryptodome-3.19.1-cp27-cp27m-macosx_10_9_x86_64.whl", hash = "sha256:694020d2ff985cd714381b9da949a21028c24b86f562526186f6af7c7547e986"}, + {file = "pycryptodome-3.19.1-cp27-cp27m-manylinux2010_i686.whl", hash = "sha256:4464b0e8fd5508bff9baf18e6fd4c6548b1ac2ce9862d6965ff6a84ec9cb302a"}, + {file = "pycryptodome-3.19.1-cp27-cp27m-manylinux2010_x86_64.whl", hash = "sha256:420972f9c62978e852c74055d81c354079ce3c3a2213a92c9d7e37bbc63a26e2"}, + {file = "pycryptodome-3.19.1-cp27-cp27m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c1bc0c49d986a1491d66d2a56570f12e960b12508b7e71f2423f532e28857f36"}, + {file = "pycryptodome-3.19.1-cp27-cp27m-musllinux_1_1_aarch64.whl", hash = "sha256:e038ab77fec0956d7aa989a3c647652937fc142ef41c9382c2ebd13c127d5b4a"}, + {file = "pycryptodome-3.19.1-cp27-cp27m-win32.whl", hash = "sha256:a991f8ffe8dfe708f86690948ae46442eebdd0fff07dc1b605987939a34ec979"}, + {file = "pycryptodome-3.19.1-cp27-cp27m-win_amd64.whl", hash = "sha256:2c16426ef49d9cba018be2340ea986837e1dfa25c2ea181787971654dd49aadd"}, + {file = "pycryptodome-3.19.1-cp27-cp27mu-manylinux2010_i686.whl", hash = "sha256:6d0d2b97758ebf2f36c39060520447c26455acb3bcff309c28b1c816173a6ff5"}, + {file = "pycryptodome-3.19.1-cp27-cp27mu-manylinux2010_x86_64.whl", hash = "sha256:b8b80ff92049fd042177282917d994d344365ab7e8ec2bc03e853d93d2401786"}, + {file = "pycryptodome-3.19.1-cp27-cp27mu-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:cd4e7e8bf0fc1ada854688b9b309ee607e2aa85a8b44180f91021a4dd330a928"}, + {file = "pycryptodome-3.19.1-cp27-cp27mu-musllinux_1_1_aarch64.whl", hash = "sha256:8cf5d3d6cf921fa81acd1f632f6cedcc03f5f68fc50c364cd39490ba01d17c49"}, + {file = "pycryptodome-3.19.1-cp35-abi3-macosx_10_9_universal2.whl", hash = "sha256:67939a3adbe637281c611596e44500ff309d547e932c449337649921b17b6297"}, + {file = "pycryptodome-3.19.1-cp35-abi3-macosx_10_9_x86_64.whl", hash = "sha256:11ddf6c9b52116b62223b6a9f4741bc4f62bb265392a4463282f7f34bb287180"}, + {file = "pycryptodome-3.19.1-cp35-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e3e6f89480616781d2a7f981472d0cdb09b9da9e8196f43c1234eff45c915766"}, + {file = "pycryptodome-3.19.1-cp35-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:27e1efcb68993b7ce5d1d047a46a601d41281bba9f1971e6be4aa27c69ab8065"}, + {file = "pycryptodome-3.19.1-cp35-abi3-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:1c6273ca5a03b672e504995529b8bae56da0ebb691d8ef141c4aa68f60765700"}, + {file = "pycryptodome-3.19.1-cp35-abi3-musllinux_1_1_aarch64.whl", hash = "sha256:b0bfe61506795877ff974f994397f0c862d037f6f1c0bfc3572195fc00833b96"}, + {file = "pycryptodome-3.19.1-cp35-abi3-musllinux_1_1_i686.whl", hash = "sha256:f34976c5c8eb79e14c7d970fb097482835be8d410a4220f86260695ede4c3e17"}, + {file = "pycryptodome-3.19.1-cp35-abi3-musllinux_1_1_x86_64.whl", hash = "sha256:7c9e222d0976f68d0cf6409cfea896676ddc1d98485d601e9508f90f60e2b0a2"}, + {file = "pycryptodome-3.19.1-cp35-abi3-win32.whl", hash = "sha256:4805e053571140cb37cf153b5c72cd324bb1e3e837cbe590a19f69b6cf85fd03"}, + {file = "pycryptodome-3.19.1-cp35-abi3-win_amd64.whl", hash = "sha256:a470237ee71a1efd63f9becebc0ad84b88ec28e6784a2047684b693f458f41b7"}, + {file = "pycryptodome-3.19.1-pp27-pypy_73-manylinux2010_x86_64.whl", hash = "sha256:ed932eb6c2b1c4391e166e1a562c9d2f020bfff44a0e1b108f67af38b390ea89"}, + {file = "pycryptodome-3.19.1-pp27-pypy_73-win32.whl", hash = "sha256:81e9d23c0316fc1b45d984a44881b220062336bbdc340aa9218e8d0656587934"}, + {file = "pycryptodome-3.19.1-pp310-pypy310_pp73-macosx_10_9_x86_64.whl", hash = "sha256:37e531bf896b70fe302f003d3be5a0a8697737a8d177967da7e23eff60d6483c"}, + {file = "pycryptodome-3.19.1-pp310-pypy310_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:cd4e95b0eb4b28251c825fe7aa941fe077f993e5ca9b855665935b86fbb1cc08"}, + {file = "pycryptodome-3.19.1-pp310-pypy310_pp73-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:c22c80246c3c880c6950d2a8addf156cee74ec0dc5757d01e8e7067a3c7da015"}, + {file = "pycryptodome-3.19.1-pp310-pypy310_pp73-win_amd64.whl", hash = "sha256:e70f5c839c7798743a948efa2a65d1fe96bb397fe6d7f2bde93d869fe4f0ad69"}, + {file = "pycryptodome-3.19.1-pp39-pypy39_pp73-macosx_10_9_x86_64.whl", hash = "sha256:6c3df3613592ea6afaec900fd7189d23c8c28b75b550254f4bd33fe94acb84b9"}, + {file = "pycryptodome-3.19.1-pp39-pypy39_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:08b445799d571041765e7d5c9ca09c5d3866c2f22eeb0dd4394a4169285184f4"}, + {file = "pycryptodome-3.19.1-pp39-pypy39_pp73-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:954d156cd50130afd53f8d77f830fe6d5801bd23e97a69d358fed068f433fbfe"}, + {file = "pycryptodome-3.19.1-pp39-pypy39_pp73-win_amd64.whl", hash = "sha256:b7efd46b0b4ac869046e814d83244aeab14ef787f4850644119b1c8b0ec2d637"}, + {file = "pycryptodome-3.19.1.tar.gz", hash = "sha256:8ae0dd1bcfada451c35f9e29a3e5db385caabc190f98e4a80ad02a61098fb776"}, ] [[package]] From 6a97c5200fc25dc2521bd3d39b91012ae6e8f159 Mon Sep 17 00:00:00 2001 From: Tarashish Mishra Date: Tue, 9 Jan 2024 13:26:12 +0530 Subject: [PATCH 9/9] Rename ConfigMap that stores references to ES disk ... to make the name represent the ConfigMap's more generic purpose. We will use this ConfigMap to store all references to terraform created resources referenced by the application's Helm chart. --- deploy/terraform/resources/aks.tf | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/deploy/terraform/resources/aks.tf b/deploy/terraform/resources/aks.tf index c870d6c09..ef7d1aab3 100644 --- a/deploy/terraform/resources/aks.tf +++ b/deploy/terraform/resources/aks.tf @@ -51,9 +51,13 @@ 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 = [ @@ -61,7 +65,7 @@ resource "kubernetes_config_map" "ifrcgo_elasticsearch_disk_config" { ] 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 } }