Commit 4b83c7b9 authored by Vivek Ojha's avatar Vivek Ojha
Browse files

release fixes

parent 2007a0ed
Pipeline #65061 passed with stages
in 2 minutes and 22 seconds
...@@ -11,7 +11,7 @@ UNIQUE="<your_osdu_unique>" # ie: demo ...@@ -11,7 +11,7 @@ UNIQUE="<your_osdu_unique>" # ie: demo
AZURE_DNS_NAME="<your_osdu_fqdn>" # ie: osdu-$UNIQUE.contoso.com AZURE_DNS_NAME="<your_osdu_fqdn>" # ie: osdu-$UNIQUE.contoso.com
DATA_PARTITION="<your_partition>" # ie:opendes DATA_PARTITION="<your_partition>" # ie:opendes
ACR_REGISTRY="<repository>" # ie: msosdu.azurecr.io 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. # 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 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 ...@@ -42,7 +42,7 @@ UNIQUE="<your_osdu_unique>" # ie: demo
AZURE_DNS_NAME="<your_osdu_fqdn>" # ie: osdu-$UNIQUE.contoso.com AZURE_DNS_NAME="<your_osdu_fqdn>" # ie: osdu-$UNIQUE.contoso.com
DATA_PARTITION="<your_partition>" # ie:opendes DATA_PARTITION="<your_partition>" # ie:opendes
ACR_REGISTRY="<repository>" # ie: msosdu.azurecr.io 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. # 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 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 ...@@ -74,7 +74,7 @@ UNIQUE="<your_osdu_unique>" # ie: demo
DNS_HOST="<your_osdu_fqdn>" # ie: osdu-$UNIQUE.contoso.com DNS_HOST="<your_osdu_fqdn>" # ie: osdu-$UNIQUE.contoso.com
DATA_PARTITION="<your_partition>" # ie:opendes DATA_PARTITION="<your_partition>" # ie:opendes
ACR_REGISTRY="<repository>" # ie: msosdu.azurecr.io 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. # 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 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 ...@@ -107,7 +107,7 @@ UNIQUE="<your_osdu_unique>" # ie: demo
AZURE_DNS_NAME="<your_osdu_fqdn>" # ie: osdu-$UNIQUE.contoso.com AZURE_DNS_NAME="<your_osdu_fqdn>" # ie: osdu-$UNIQUE.contoso.com
DATA_PARTITION="<your_partition>" # ie:opendes DATA_PARTITION="<your_partition>" # ie:opendes
ACR_REGISTRY="<your_acr_fqdn>" # ie: myacr.azurecr.io 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 DAG_TASK_IMAGE="segy-to-zgy-conversion-dag" # i.e. name for the image in ACR
AZURE_TENANT_ID="<azure tenant>" AZURE_TENANT_ID="<azure tenant>"
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
// limitations under the License. // limitations under the License.
data "azuread_service_principal" "main" { 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] display_name = local.api_names[count.index]
} }
......
...@@ -120,7 +120,7 @@ locals { ...@@ -120,7 +120,7 @@ locals {
} }
} }
required_resource_access = [ required_resource_access = var.aad_client_id != "" ? [] : [
for a in local.api_permissions : { for a in local.api_permissions : {
resource_app_id = local.service_principals[a.name].application_id resource_app_id = local.service_principals[a.name].application_id
resource_access = concat( resource_access = concat(
......
...@@ -28,7 +28,6 @@ resource "azurerm_key_vault" "keyvault" { ...@@ -28,7 +28,6 @@ resource "azurerm_key_vault" "keyvault" {
resource_group_name = data.azurerm_resource_group.kv.name resource_group_name = data.azurerm_resource_group.kv.name
tenant_id = data.azurerm_client_config.current.tenant_id tenant_id = data.azurerm_client_config.current.tenant_id
soft_delete_enabled = true
soft_delete_retention_days = 90 soft_delete_retention_days = 90
purge_protection_enabled = false purge_protection_enabled = false
......
...@@ -43,7 +43,11 @@ resource_tags = { ...@@ -43,7 +43,11 @@ resource_tags = {
} }
# Storage Settings # Storage Settings
storage_shares = [ "airflowdags" ] storage_shares = [
"airflowdags",
"unit",
"crs",
"crs-conversion"]
storage_queues = [ "airflowlogqueue" ] storage_queues = [ "airflowlogqueue" ]
``` ```
......
...@@ -18,6 +18,10 @@ Login to Azure CLI using the OSDU Environment Service Principal. ...@@ -18,6 +18,10 @@ Login to Azure CLI using the OSDU Environment Service Principal.
```bash ```bash
# This logs your local Azure CLI in using the configured service principal. # 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 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__ ...@@ -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`. 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 ```bash
UNIQUE="<your_osdu_unique>"
GROUP=$(az group list --query "[?contains(name, 'cr${UNIQUE}')].name" -otsv) GROUP=$(az group list --query "[?contains(name, 'cr${UNIQUE}')].name" -otsv)
ENV_VAULT=$(az keyvault list --resource-group $GROUP --query [].name -otsv) ENV_VAULT=$(az keyvault list --resource-group $GROUP --query [].name -otsv)
PARTITION_NAME=opendes PARTITION_NAME=opendes
...@@ -65,6 +70,7 @@ These files need to be uploaded into the proper Cosmos Collections with the requ ...@@ -65,6 +70,7 @@ These files need to be uploaded into the proper Cosmos Collections with the requ
```bash ```bash
# Retrieve Values from Common Key Vault # 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) 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 # Retrieve Values from Environment Key Vault
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment