fix: modify documents storage access (#98)

giulia-tremolada · web-flow · commit b85b8f2a8dcb · 2025-07-11T18:39:09.000+02:00
diff --git a/apps/institution-ms/app/src/main/resources/config/azure-storage-config.properties b/apps/institution-ms/app/src/main/resources/config/azure-storage-config.properties
@@ -1,4 +1,3 @@
-blob-storage.account-key=${STORAGE_CREDENTIAL_SECRET}
 blob-storage.container=${STORAGE_CONTAINER}
 blob-storage.checkout-template-container=${STORAGE_TEMPLATE_URL}/resources/templates/email/
 blob-storage.endpoint-suffix = ${STORAGE_ENDPOINT}
diff --git a/apps/institution-ms/connector-api/src/main/java/it/pagopa/selfcare/mscore/config/AzureStorageConfig.java b/apps/institution-ms/connector-api/src/main/java/it/pagopa/selfcare/mscore/config/AzureStorageConfig.java
@@ -16,7 +16,6 @@ public class AzureStorageConfig {
     private String connectionString;
     private String accountName;
     private String endpointSuffix;
-    private String accountKey;
 
     private String container;
     private String contractPath;
diff --git a/apps/institution-ms/connector/azure-storage/src/main/java/it/pagopa/selfcare/mscore/connector/azure_storage/AzureBlobClient.java b/apps/institution-ms/connector/azure-storage/src/main/java/it/pagopa/selfcare/mscore/connector/azure_storage/AzureBlobClient.java
@@ -2,7 +2,6 @@
 
 import com.microsoft.azure.storage.CloudStorageAccount;
 import com.microsoft.azure.storage.StorageCredentials;
-import com.microsoft.azure.storage.StorageCredentialsAccountAndKey;
 import com.microsoft.azure.storage.StorageException;
 import com.microsoft.azure.storage.blob.*;
 import it.pagopa.selfcare.mscore.api.FileStorageConnector;
@@ -22,6 +21,7 @@
 import java.io.IOException;
 import java.net.URISyntaxException;
 import java.nio.file.Paths;
+import java.security.InvalidKeyException;
 
 import static it.pagopa.selfcare.mscore.constant.GenericError.*;
 
@@ -34,15 +34,15 @@ class AzureBlobClient implements FileStorageConnector {
     private final CloudBlobClient blobClient;
     private final AzureStorageConfig azureStorageConfig;
 
-    AzureBlobClient(AzureStorageConfig azureStorageConfig) throws URISyntaxException {
+    AzureBlobClient(AzureStorageConfig azureStorageConfig) throws URISyntaxException, InvalidKeyException, StorageException {
         log.trace("AzureBlobClient.AzureBlobClient");
         this.azureStorageConfig = azureStorageConfig;
         final CloudStorageAccount storageAccount = buildStorageAccount();
         this.blobClient = storageAccount.createCloudBlobClient();
     }
 
-    private CloudStorageAccount buildStorageAccount() throws URISyntaxException {
-        StorageCredentials storageCredentials = new StorageCredentialsAccountAndKey(azureStorageConfig.getAccountName(), azureStorageConfig.getAccountKey());
+    private CloudStorageAccount buildStorageAccount() throws URISyntaxException, InvalidKeyException, StorageException {
+        StorageCredentials storageCredentials = StorageCredentials.tryParseCredentials(azureStorageConfig.getConnectionString());
         return new CloudStorageAccount(storageCredentials,
                 true,
                 azureStorageConfig.getEndpointSuffix(),
diff --git a/apps/institution-ms/connector/azure-storage/src/test/java/it/pagopa/selfcare/mscore/connector/azure_storage/config/AzureStorageConfigTest.java b/apps/institution-ms/connector/azure-storage/src/test/java/it/pagopa/selfcare/mscore/connector/azure_storage/config/AzureStorageConfigTest.java
@@ -41,7 +41,7 @@ void testGetContractsTemplateContainer4() {
         azureStorageConfig.setContainer("42");
         azureStorageConfig.setContractPath("42");
 
-        assertEquals("AzureStorageConfig(connectionString=42, accountName=null, endpointSuffix=null, accountKey=null, container=42, contractPath=42, checkoutTemplateContainer=null)", azureStorageConfig.toString());
+        assertEquals("AzureStorageConfig(connectionString=42, accountName=null, endpointSuffix=null, container=42, contractPath=42, checkoutTemplateContainer=null)", azureStorageConfig.toString());
     }
 }
 
diff --git a/infra/container_apps/institution-ms/env/dev-pnpg/terraform.tfvars b/infra/container_apps/institution-ms/env/dev-pnpg/terraform.tfvars
@@ -129,11 +129,9 @@ app_settings = [
 ]
 
 secrets_names = {
-  "STORAGE_APPLICATION_SECRET"               = "contracts-storage-access-key"
   "APPLICATIONINSIGHTS_CONNECTION_STRING"    = "appinsights-connection-string"
   "MONGODB_CONNECTION_URI"                   = "mongodb-connection-string"
   "BLOB_STORAGE_CONN_STRING"                 = "blob-storage-contract-connection-string"
-  "STORAGE_CREDENTIAL_SECRET"                = "contracts-storage-access-key"
   "SMTP_USR"                                 = "smtp-usr"
   "SMTP_PSW"                                 = "smtp-psw"
   "ONBOARDING_INSTITUTION_ALTERNATIVE_EMAIL" = "party-test-institution-email"
diff --git a/infra/container_apps/institution-ms/env/dev/terraform.tfvars b/infra/container_apps/institution-ms/env/dev/terraform.tfvars
@@ -74,7 +74,7 @@ app_settings = [
 
   {
     name  = "STORAGE_CREDENTIAL_ID"
-    value = "selcdcontractsstorage"
+    value = "scdweuardocumentsst01"
   },
   {
     name  = "STORAGE_TEMPLATE_URL"
@@ -137,11 +137,9 @@ app_settings = [
 ]
 
 secrets_names = {
-  "STORAGE_APPLICATION_SECRET"               = "contracts-storage-access-key"
   "APPLICATIONINSIGHTS_CONNECTION_STRING"    = "appinsights-connection-string"
   "MONGODB_CONNECTION_URI"                   = "mongodb-connection-string"
   "BLOB_STORAGE_CONN_STRING"                 = "documents-storage-connection-string"
-  "STORAGE_CREDENTIAL_SECRET"                = "contracts-storage-access-key"
   "SMTP_USR"                                 = "smtp-usr"
   "SMTP_PSW"                                 = "smtp-psw"
   "ONBOARDING_INSTITUTION_ALTERNATIVE_EMAIL" = "party-test-institution-email"
diff --git a/infra/container_apps/institution-ms/env/prod-pnpg/terraform.tfvars b/infra/container_apps/institution-ms/env/prod-pnpg/terraform.tfvars
@@ -129,11 +129,9 @@ app_settings = [
 
 
 secrets_names = {
-  "STORAGE_APPLICATION_SECRET"               = "contracts-storage-access-key"
   "APPLICATIONINSIGHTS_CONNECTION_STRING"    = "appinsights-connection-string"
   "MONGODB_CONNECTION_URI"                   = "mongodb-connection-string"
   "BLOB_STORAGE_CONN_STRING"                 = "blob-storage-contract-connection-string"
-  "STORAGE_CREDENTIAL_SECRET"                = "contracts-storage-access-key"
   "SMTP_USR"                                 = "smtp-usr"
   "SMTP_PSW"                                 = "smtp-psw"
   "ONBOARDING_INSTITUTION_ALTERNATIVE_EMAIL" = "party-test-institution-email"
diff --git a/infra/container_apps/institution-ms/env/prod/terraform.tfvars b/infra/container_apps/institution-ms/env/prod/terraform.tfvars
@@ -69,7 +69,7 @@ app_settings = [
 
   {
     name  = "STORAGE_CREDENTIAL_ID"
-    value = "selcpcontractsstorage"
+    value = "scpweuardocumentsst01"
   },
   {
     name  = "STORAGE_TEMPLATE_URL"
@@ -135,11 +135,9 @@ app_settings = [
 ]
 
 secrets_names = {
-  "STORAGE_APPLICATION_SECRET"               = "contracts-storage-access-key"
   "APPLICATIONINSIGHTS_CONNECTION_STRING"    = "appinsights-connection-string"
   "MONGODB_CONNECTION_URI"                   = "mongodb-connection-string"
   "BLOB_STORAGE_CONN_STRING"                 = "documents-storage-connection-string"
-  "STORAGE_CREDENTIAL_SECRET"                = "contracts-storage-access-key"
   "SMTP_USR"                                 = "smtp-usr"
   "SMTP_PSW"                                 = "smtp-psw"
   "ONBOARDING_INSTITUTION_ALTERNATIVE_EMAIL" = "party-test-institution-email"
diff --git a/infra/container_apps/institution-ms/env/uat-pnpg/terraform.tfvars b/infra/container_apps/institution-ms/env/uat-pnpg/terraform.tfvars
@@ -134,11 +134,9 @@ app_settings = [
 ]
 
 secrets_names = {
-  "STORAGE_APPLICATION_SECRET"               = "contracts-storage-access-key"
   "APPLICATIONINSIGHTS_CONNECTION_STRING"    = "appinsights-connection-string"
   "MONGODB_CONNECTION_URI"                   = "mongodb-connection-string"
   "BLOB_STORAGE_CONN_STRING"                 = "blob-storage-contract-connection-string"
-  "STORAGE_CREDENTIAL_SECRET"                = "contracts-storage-access-key"
   "SMTP_USR"                                 = "smtp-usr"
   "SMTP_PSW"                                 = "smtp-psw"
   "ONBOARDING_INSTITUTION_ALTERNATIVE_EMAIL" = "party-test-institution-email"
diff --git a/infra/container_apps/institution-ms/env/uat/terraform.tfvars b/infra/container_apps/institution-ms/env/uat/terraform.tfvars
@@ -70,7 +70,7 @@ app_settings = [
 
   {
     name  = "STORAGE_CREDENTIAL_ID"
-    value = "selcucontractsstorage"
+    value = "scuweuardocumentsst01"
   },
   {
     name  = "STORAGE_TEMPLATE_URL"
@@ -137,11 +137,9 @@ app_settings = [
 ]
 
 secrets_names = {
-  "STORAGE_APPLICATION_SECRET"               = "contracts-storage-access-key"
   "APPLICATIONINSIGHTS_CONNECTION_STRING"    = "appinsights-connection-string"
   "MONGODB_CONNECTION_URI"                   = "mongodb-connection-string"
   "BLOB_STORAGE_CONN_STRING"                 = "documents-storage-connection-string"
-  "STORAGE_CREDENTIAL_SECRET"                = "contracts-storage-access-key"
   "SMTP_USR"                                 = "smtp-usr"
   "SMTP_PSW"                                 = "smtp-psw"
   "ONBOARDING_INSTITUTION_ALTERNATIVE_EMAIL" = "party-test-institution-email"

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-blob-storage.account-key=${STORAGE_CREDENTIAL_SECRET}`
`2`	`1`	`blob-storage.container=${STORAGE_CONTAINER}`
`3`	`2`	`blob-storage.checkout-template-container=${STORAGE_TEMPLATE_URL}/resources/templates/email/`
`4`	`3`	`blob-storage.endpoint-suffix = ${STORAGE_ENDPOINT}`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ void testGetContractsTemplateContainer4() {`
`41`	`41`	`azureStorageConfig.setContainer("42");`
`42`	`42`	`azureStorageConfig.setContractPath("42");`
`43`	`43`
`44`		`- assertEquals("AzureStorageConfig(connectionString=42, accountName=null, endpointSuffix=null, accountKey=null, container=42, contractPath=42, checkoutTemplateContainer=null)", azureStorageConfig.toString());`
	`44`	`+ assertEquals("AzureStorageConfig(connectionString=42, accountName=null, endpointSuffix=null, container=42, contractPath=42, checkoutTemplateContainer=null)", azureStorageConfig.toString());`
`45`	`45`	`}`
`46`	`46`	`}`
`47`	`47`
Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ app_settings = [`
`74`	`74`
`75`	`75`	`{`
`76`	`76`	`name = "STORAGE_CREDENTIAL_ID"`
`77`		`- value = "selcdcontractsstorage"`
	`77`	`+ value = "scdweuardocumentsst01"`
`78`	`78`	`},`
`79`	`79`	`{`
`80`	`80`	`name = "STORAGE_TEMPLATE_URL"`
`@@ -137,11 +137,9 @@ app_settings = [`
`137`	`137`	`]`
`138`	`138`
`139`	`139`	`secrets_names = {`
`140`		`- "STORAGE_APPLICATION_SECRET" = "contracts-storage-access-key"`
`141`	`140`	`"APPLICATIONINSIGHTS_CONNECTION_STRING" = "appinsights-connection-string"`
`142`	`141`	`"MONGODB_CONNECTION_URI" = "mongodb-connection-string"`
`143`	`142`	`"BLOB_STORAGE_CONN_STRING" = "documents-storage-connection-string"`
`144`		`- "STORAGE_CREDENTIAL_SECRET" = "contracts-storage-access-key"`
`145`	`143`	`"SMTP_USR" = "smtp-usr"`
`146`	`144`	`"SMTP_PSW" = "smtp-psw"`
`147`	`145`	`"ONBOARDING_INSTITUTION_ALTERNATIVE_EMAIL" = "party-test-institution-email"`
Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ app_settings = [`
`69`	`69`
`70`	`70`	`{`
`71`	`71`	`name = "STORAGE_CREDENTIAL_ID"`
`72`		`- value = "selcpcontractsstorage"`
	`72`	`+ value = "scpweuardocumentsst01"`
`73`	`73`	`},`
`74`	`74`	`{`
`75`	`75`	`name = "STORAGE_TEMPLATE_URL"`
`@@ -135,11 +135,9 @@ app_settings = [`
`135`	`135`	`]`
`136`	`136`
`137`	`137`	`secrets_names = {`
`138`		`- "STORAGE_APPLICATION_SECRET" = "contracts-storage-access-key"`
`139`	`138`	`"APPLICATIONINSIGHTS_CONNECTION_STRING" = "appinsights-connection-string"`
`140`	`139`	`"MONGODB_CONNECTION_URI" = "mongodb-connection-string"`
`141`	`140`	`"BLOB_STORAGE_CONN_STRING" = "documents-storage-connection-string"`
`142`		`- "STORAGE_CREDENTIAL_SECRET" = "contracts-storage-access-key"`
`143`	`141`	`"SMTP_USR" = "smtp-usr"`
`144`	`142`	`"SMTP_PSW" = "smtp-psw"`
`145`	`143`	`"ONBOARDING_INSTITUTION_ALTERNATIVE_EMAIL" = "party-test-institution-email"`
Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ app_settings = [`
`70`	`70`
`71`	`71`	`{`
`72`	`72`	`name = "STORAGE_CREDENTIAL_ID"`
`73`		`- value = "selcucontractsstorage"`
	`73`	`+ value = "scuweuardocumentsst01"`
`74`	`74`	`},`
`75`	`75`	`{`
`76`	`76`	`name = "STORAGE_TEMPLATE_URL"`
`@@ -137,11 +137,9 @@ app_settings = [`
`137`	`137`	`]`
`138`	`138`
`139`	`139`	`secrets_names = {`
`140`		`- "STORAGE_APPLICATION_SECRET" = "contracts-storage-access-key"`
`141`	`140`	`"APPLICATIONINSIGHTS_CONNECTION_STRING" = "appinsights-connection-string"`
`142`	`141`	`"MONGODB_CONNECTION_URI" = "mongodb-connection-string"`
`143`	`142`	`"BLOB_STORAGE_CONN_STRING" = "documents-storage-connection-string"`
`144`		`- "STORAGE_CREDENTIAL_SECRET" = "contracts-storage-access-key"`
`145`	`143`	`"SMTP_USR" = "smtp-usr"`
`146`	`144`	`"SMTP_PSW" = "smtp-psw"`
`147`	`145`	`"ONBOARDING_INSTITUTION_ALTERNATIVE_EMAIL" = "party-test-institution-email"`