Fix snapshots test

Author: k9845

.circleci/config.yml

@@ -5,7 +5,7 @@ jobs:
   build:
     machine:
       # Check https://circleci.com/developer/machine/image/ubuntu-2004 for details:
-      image: ubuntu-2004:202201-02
+      image: default
       docker_layer_caching: true
     steps:
       - checkout

api/management/commands/ingest_ns_document.py

@@ -17,7 +17,7 @@ def handle(self, *args, **kwargs):
 
         # Fetch country codes
         country_code_url = "https://go-api.ifrc.org/api/NationalSocietiesContacts/"
-        headers = {'Authorization': 'Basic Z290ZXN0dXNlcjoxMjM0NTY='}
+        headers = {'Authorization': f'Basic {settings.NS_DOCUMENT_API_TOKEN}'}
         country_code_response = requests.get(url=country_code_url, headers=headers)
 
         if country_code_response.status_code != 200:

capacity.xlsx

@@ -171,4 +171,5 @@ if [ "${BASH_SOURCE[0]}" = "${0}" ]; then
         --set env.ACAPS_API_TOKEN=${TF_VAR_ACAPS_API_TOKEN} \
         --set env.NS_DOCUMENT_API_KEY=${TF_VAR_NS_DOCUMENT_API_KEY} \
         --set env.NS_INITIATIVES_API_KEY=${TF_VAR_NS_INITIATIVES_API_KEY}
+        --set env.NS_INITIATIVES_API_KEY=${NS_DOCUMENT_API_TOKEN}\
 fi

deploy/bin/deploy

@@ -75,6 +75,7 @@ services:
         - TF_VAR_ACAPS_API_TOKEN=${ACAPS_API_TOKEN}
         - TF_VAR_NS_DOCUMENT_API_KEY=${NS_DOCUMENT_API_KEY}
         - TF_VAR_NS_INITIATIVES_API_KEY=${NS_INITIATIVES_API_KEY}
+        - TF_VAR_NS_INITIATIVES_API_TOKEN=${NS_INITIATIVES_API_TOKEN}
         # Maintenance mode
         - TF_VAR_DJANGO_READ_ONLY=${DJANGO_READ_ONLY}
         # IFRC dynamic translation

deploy/docker-compose.yml

@@ -48,3 +48,4 @@ stringData:
   ACAPS_API_TOKEN: "{{ .Values.env.ACAPS_API_TOKEN}}"
   NS_DOCUMENT_API_KEY: "{{ .Values.env.NS_DOCUMENT_API_KEY}}"
   NS_INITIATIVES_API_KEY: "{{ .Values.env.NS_INITIATIVES_API_KEY}}"
+  NS_INITIATIVES_API_TOKEN: "{{ .Values.env.NS_INITIATIVES_API_TOKEN}}"

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

@@ -55,6 +55,7 @@ env:
   ACAPS_API_TOKEN: ''
   NS_DOCUMENT_API_KEY: ''
   NS_INITIATIVES_API_KEY: ''
+  NS_DOCUMENT_API_TOKEN: ''
 
 secrets:
   API_TLS_CRT: ''

deploy/helm/ifrcgo-helm/values.yaml

@@ -65,6 +65,7 @@ module "resources" {
   ACAPS_API_TOKEN= var.ACAPS_API_TOKEN
   NS_DOCUMENT_API_KEY= var.NS_DOCUMENT_API_KEY
   NS_INITIATIVES_API_KEY= var.NS_INITIATIVES_API_KEY
+  NS_INITIATIVES_API_TOKEN = var.NS_INITIATIVES_API_TOKEN
 
 terraform {
   backend "azurerm" {

deploy/terraform/main.tf

@@ -240,4 +240,9 @@ resource "helm_release" "ifrcgo" {
     name = "env.NS_INITIATIVES_API_KEY"
     value = var.NS_INITIATIVES_API_KEY
   }
+
+  set {
+    name = "env.NS_INITIATIVES_API_TOKEN"
+    value = var.NS_INITIATIVES_API_TOKEN
+  }
 }

deploy/terraform/resources/helm-ifrcgo.tf

@@ -281,6 +281,11 @@ variable "NS_INITIATIVES_API_KEY" {
   default = ""
 }
 
+variable "NS_DOCUMENT_API_TOKEN" {
+  type = string
+  default = ""
+}
+
 # -----------------
 # Attach ACR
 # Defaults to common resources