Merge branch 'issue_5' into 'master'

Added a Secret group called config-storage with the specific key names

See merge request osdu/platform/deployment-and-operations/infra-azure-provisioning!15

charts/osdu-common/templates/kv-secrets.yaml

@@ -72,19 +72,18 @@ spec:
       key: storage-account
     - objectName: airflow-storage-key
       key: storage-key
+    - objectName: airflow-storage-connection
+      key: storage-connection
     - objectName: airflow-remote-log-connection
       key: remote-log-connection
     - objectName: airflow-admin-password
       key: admin-password
     - objectName: airflow-fernet-key
       key: fernet-key
-  - secretName: fileshare
-    type: Opaque
-    data:
-    - objectName: azurestorageaccountname
-      key: storage-account
-    - objectName: azurestorageaccountkey
-      key: storage-key
+    - objectName: airflow-storage
+      key: azurestorageaccountname
+    - objectName: airflow-storage-key
+      key: azurestorageaccountkey
   - secretName: elastic
     type: Opaque
     data:
@@ -192,9 +191,3 @@ spec:
         - |
           objectName: redis-password
           objectType: secret
-        - |
-          objectName: azurestorageaccountname
-          objectType: secret
-        - |
-          objectName: azurestorageaccountkey
-          objectType: secret
\ No newline at end of file

infra/templates/osdu-r3-mvp/service_resources/secrets.tf

@@ -53,7 +53,7 @@ resource "azurerm_key_vault_secret" "storage_key" {
 
 resource "azurerm_key_vault_secret" "storage_connection" {
   name         = local.storage_connection_name
-  value        = format("DefaultEndpointsProtocol=https;AccountName=%s;AccountKey=%s;EndpointSuffix=core.windows.net", local.storage_account_name, module.storage_account.primary_access_key)
+  value        = format("DefaultEndpointsProtocol=https;AccountName=%s;AccountKey=%s;EndpointSuffix=core.windows.net", module.storage_account.name, module.storage_account.primary_access_key)
   key_vault_id = data.terraform_remote_state.central_resources.outputs.keyvault_id
 }