Fix service account helm chart

app/config/storage.js

@@ -17,7 +17,7 @@ const storage = convict({
     format: String,
     nullable: !isProd(),
     default: null,
-    env: 'MANAGED_IDENTITY_CLIENT_ID'
+    env: 'AZURE_CLIENT_ID'
   },
   clean: {
     accountName: {

app/utils/storage.js

@@ -1,5 +1,5 @@
 import { StorageSharedKeyCredential } from '@azure/storage-blob'
-import { WorkloadIdentityCredential } from '@azure/identity'
+import { DefaultAzureCredential } from '@azure/identity'
 
 import { storageConfig } from '../config/index.js'
 
@@ -19,7 +19,7 @@ const getStorageCredential = (accountName, accessKey) => {
 
   console.log('Using Azure Identity Credential for account:', accountName)
 
-  return new WorkloadIdentityCredential({ clientId: storageConfig.get('managedIdentityClientId') })
+  return new DefaultAzureCredential({ managedIdentityClientId: storageConfig.get('managedIdentityClientId') })
 }
 
 export {

helm/fcp-fd-file-retriever/templates/config-map.yaml

@@ -7,5 +7,4 @@ data:
   CLN_STORAGE_ACCOUNT_NAME: {{ quote .Values.container.clnStorageAccountName }}
   AV_SCAN_POLLING_INTERVAL: {{ quote .Values.container.avScanPollingInterval }}
   AV_SCAN_MAX_ATTEMPTS: {{ quote .Values.container.avScanMaxAttempts }}
-  MANAGED_IDENTITY_CLIENT_ID: {{ quote .Values.azureIdentity.clientID }}
 {{- end -}}

helm/fcp-fd-file-retriever/templates/service-account.yaml

@@ -1,3 +1,3 @@
-{{- include "ffc-helm-library.service-account" (list . "fcp-fd-file-processor.service-account") -}}
-{{- define "fcp-fd-file-processor.service-account" -}}
+{{- include "ffc-helm-library.service-account" (list . "fcp-fd-file-retriever.service-account") -}}
+{{- define "fcp-fd-file-retriever.service-account" -}}
 {{- end -}}

package.json

@@ -1,6 +1,6 @@
 {
   "name": "fcp-fd-file-retriever",
-  "version": "0.3.2",
+  "version": "0.3.3",
   "description": "File retrieval service for Single Front Door",
   "homepage": "https://github.com/DEFRA/fcp-fd-file-retriever",
   "main": "app/index.js",

test/unit/storage/blob/clean.test.js

@@ -1,7 +1,7 @@
 import { beforeEach, describe, expect, jest, test } from '@jest/globals'
 
 const mockSharedKeyCredential = jest.fn()
-const mockWorkloadIdentityCredential = jest.fn()
+const mockDefaultAzureCredential = jest.fn()
 
 const mockCreateIfNotExists = jest.fn()
 
@@ -17,7 +17,7 @@ jest.unstable_mockModule('@azure/storage-blob', () => ({
 }))
 
 jest.unstable_mockModule('@azure/identity', () => ({
-  WorkloadIdentityCredential: mockWorkloadIdentityCredential
+  DefaultAzureCredential: mockDefaultAzureCredential
 }))
 
 describe('Clean Blob Storage Client', () => {
@@ -53,7 +53,7 @@ describe('Clean Blob Storage Client', () => {
 
       expect(client).toBeDefined()
       expect(mockSharedKeyCredential).toHaveBeenCalled()
-      expect(mockWorkloadIdentityCredential).not.toHaveBeenCalled()
+      expect(mockDefaultAzureCredential).not.toHaveBeenCalled()
 
       process.env = orginalEnv
     })
@@ -70,7 +70,7 @@ describe('Clean Blob Storage Client', () => {
       const { client } = await import('../../../../app/storage/blob/clean')
 
       expect(client).toBeDefined()
-      expect(mockWorkloadIdentityCredential).toHaveBeenCalled()
+      expect(mockDefaultAzureCredential).toHaveBeenCalled()
       expect(mockSharedKeyCredential).not.toHaveBeenCalled()
 
       process.env = orginalEnv