diff --git a/deployment/scripts/azure/BootstrapBundles.py b/deployment/scripts/azure/BootstrapBundles.py index 3db1ddea6c51471bab453dd06f780f76395a8420..a15f593f1ed3a986e57fb711e6156302c7e5a1d6 100644 --- a/deployment/scripts/azure/BootstrapBundles.py +++ b/deployment/scripts/azure/BootstrapBundles.py @@ -20,7 +20,7 @@ class BootstrapBundles: with tarfile.open(tar_name, "w:gz") as tar_handle: for root, dirs, files in os.walk(path): for file in files: - if file.endswith(".rego"): + if file == "legal.rego" or file == "entitlements.rego" or file == "dataauthz.rego": tar_handle.add(os.path.join(root, file)) def upload_bundles(self): diff --git a/deployment/scripts/azure/bootstrap.sh b/deployment/scripts/azure/bootstrap.sh index f59cce36d03c1de31ad839203990d998290281e0..eb4274b4ff97c29f40bf63356db437ebc20caedf 100644 --- a/deployment/scripts/azure/bootstrap.sh +++ b/deployment/scripts/azure/bootstrap.sh @@ -1,8 +1,6 @@ +#!/bin/bash if [ -z "$DEPLOYMENTS_BASE_DIR" ]; then export DEPLOYMENTS_BASE_DIR=deployment; fi -BEARER_TOKEN=`python $AZURE_DEPLOYMENTS_SUBDIR/Token.py` -export BEARER_TOKEN=$BEARER_TOKEN - -python3 $DEPLOYMENTS_BASE_DIR/scripts/azure/BootstrapBundles.py \ No newline at end of file +python3 $DEPLOYMENTS_BASE_DIR/scripts/azure/BootstrapBundles.py diff --git a/tests/azure/azure_jwt_client.py b/tests/azure/azure_jwt_client.py index 18a9bbeda393afbc9f3f96c4e800c03f32a84316..ca28ae93bcbb42d2297243ecadc1d17348b1761a 100644 --- a/tests/azure/azure_jwt_client.py +++ b/tests/azure/azure_jwt_client.py @@ -3,7 +3,7 @@ import msal; def get_azure_id_token(): tenant_id = os.getenv('AZURE_TENANT_ID') - resource_id = os.getenv('AZURE_AD_APP_RESOURCE_ID') + resource_id = os.getenv('AZURE_APP_ID') client_id = os.getenv('AZURE_CLIENT_ID') client_secret = os.getenv('AZURE_CLIENT_SECRET') if tenant_id is None: diff --git a/tests/integration/test_api.py b/tests/integration/test_api.py index b11917ad618089ff1f298c6e0024a2e23d20fc38..618eeb8ee15206c3e6d5fb3042d2389dce6c9266 100644 --- a/tests/integration/test_api.py +++ b/tests/integration/test_api.py @@ -17,6 +17,7 @@ def test_fetch_policies(client, token, service_url, data_partition): response = requests.get(service_url, headers={'Authorization': 'Bearer ' + token, 'data-partition-id': data_partition}) + assert response.status_code == 200 # need to standardize the namespaces for bundles and then enable the test