release fixes

docs/service-data.md

@@ -11,7 +11,7 @@ UNIQUE="<your_osdu_unique>"         # ie: demo
 AZURE_DNS_NAME="<your_osdu_fqdn>"   # ie: osdu-$UNIQUE.contoso.com
 DATA_PARTITION="<your_partition>"   # ie:opendes
 ACR_REGISTRY="<repository>"         # ie: msosdu.azurecr.io
-TAG="<app_version>"                 # ie: 0.10.0
+TAG="<app_version>"                 # ie: 0.11.0
 
 # This logs your local Azure CLI in using the configured service principal.
 az login --service-principal -u $ARM_CLIENT_ID -p $ARM_CLIENT_SECRET --tenant $ARM_TENANT_ID
@@ -42,7 +42,7 @@ UNIQUE="<your_osdu_unique>"         # ie: demo
 AZURE_DNS_NAME="<your_osdu_fqdn>"   # ie: osdu-$UNIQUE.contoso.com
 DATA_PARTITION="<your_partition>"   # ie:opendes
 ACR_REGISTRY="<repository>"         # ie: msosdu.azurecr.io
-TAG="<app_version>"                 # ie: 0.10.0
+TAG="<app_version>"                 # ie: 0.11.0
 
 # This logs your local Azure CLI in using the configured service principal.
 az login --service-principal -u $ARM_CLIENT_ID -p $ARM_CLIENT_SECRET --tenant $ARM_TENANT_ID
@@ -74,7 +74,7 @@ UNIQUE="<your_osdu_unique>"         # ie: demo
 DNS_HOST="<your_osdu_fqdn>"         # ie: osdu-$UNIQUE.contoso.com
 DATA_PARTITION="<your_partition>"   # ie:opendes
 ACR_REGISTRY="<repository>"         # ie: msosdu.azurecr.io
-TAG="<app_version>"                 # ie: 0.10.0
+TAG="<app_version>"                 # ie: 0.11.0
 
 # This logs your local Azure CLI in using the configured service principal.
 az login --service-principal -u $ARM_CLIENT_ID -p $ARM_CLIENT_SECRET --tenant $ARM_TENANT_ID
@@ -107,7 +107,7 @@ UNIQUE="<your_osdu_unique>"                    # ie: demo
 AZURE_DNS_NAME="<your_osdu_fqdn>"              # ie: osdu-$UNIQUE.contoso.com
 DATA_PARTITION="<your_partition>"              # ie:opendes
 ACR_REGISTRY="<your_acr_fqdn>"                 # ie: myacr.azurecr.io
-TAG="<app_version>"                            # ie: 0.10.0
+TAG="<app_version>"                            # ie: 0.11.0
 DAG_TASK_IMAGE="segy-to-zgy-conversion-dag"    # i.e. name for the image in ACR
 AZURE_TENANT_ID="<azure tenant>"
 

infra/modules/providers/azure/ad-application/main.tf

@@ -13,7 +13,7 @@
 //  limitations under the License.
 
 data "azuread_service_principal" "main" {
-  count        = length(local.api_names)
+  count        = var.aad_client_id != "" ? 0 : length(local.api_names)
   display_name = local.api_names[count.index]
 }
 

infra/modules/providers/azure/ad-application/variables.tf

@@ -120,7 +120,7 @@ locals {
     }
   }
 
-  required_resource_access = [
+  required_resource_access = var.aad_client_id != "" ? [] : [
     for a in local.api_permissions : {
       resource_app_id = local.service_principals[a.name].application_id
       resource_access = concat(

infra/modules/providers/azure/keyvault/main.tf

@@ -28,7 +28,6 @@ resource "azurerm_key_vault" "keyvault" {
   resource_group_name = data.azurerm_resource_group.kv.name
   tenant_id           = data.azurerm_client_config.current.tenant_id
 
-  soft_delete_enabled        = true
   soft_delete_retention_days = 90
   purge_protection_enabled   = false
 

infra/templates/osdu-r3-mvp/service_resources/README.md

@@ -43,7 +43,11 @@ resource_tags = {
 }
 
 # Storage Settings
-storage_shares = [ "airflowdags" ]
+storage_shares = [
+  "airflowdags",
+  "unit",
+  "crs",
+  "crs-conversion"]
 storage_queues = [ "airflowlogqueue" ]
 ```
 

tools/test_data/README.md

@@ -18,6 +18,10 @@ Login to Azure CLI using the OSDU Environment Service Principal.
 
 ```bash
 # This logs your local Azure CLI in using the configured service principal.
+ARM_CLIENT_ID="<arm client id>"
+ARM_CLIENT_SECRET="<arm client secret>"
+ARM_TENANT_ID="<tenant id>"
+
 az login --service-principal -u $ARM_CLIENT_ID -p $ARM_CLIENT_SECRET --tenant $ARM_TENANT_ID
 ```
 
@@ -26,6 +30,7 @@ __Upload Storage Blob Test Data__
 This [file](../tools/test_data/Legal_COO.json) needs to be loaded into the Data Partition Storage Account in the container  `legal-service-azure-configuration`.
 
 ```bash
+UNIQUE="<your_osdu_unique>" 
 GROUP=$(az group list --query "[?contains(name, 'cr${UNIQUE}')].name" -otsv)
 ENV_VAULT=$(az keyvault list --resource-group $GROUP --query [].name -otsv)
 PARTITION_NAME=opendes
@@ -65,6 +70,7 @@ These files need to be uploaded into the proper Cosmos Collections with the requ
 
 ```bash
 # Retrieve Values from Common Key Vault
+COMMON_VAULT="<common keyvault created in common prepare phase>"
 export NO_DATA_ACCESS_TESTER=$(az keyvault secret show --id https://$COMMON_VAULT.vault.azure.net/secrets/osdu-mvp-${UNIQUE}-noaccess-clientid --query value -otsv)
 
 # Retrieve Values from Environment Key Vault