Commit f8197aea authored by Sailon Ransom's avatar Sailon Ransom
Browse files

Merge branch 'azure/m10-master' into msft/python-security-fix

parents c60bf07f 99059699
Pipeline #120214 failed with stages
in 9 seconds
This diff is collapsed.
......@@ -21,7 +21,7 @@ npm run start
npm run test
# run integral/unit tests and generate the code coverage
npm run code-coverage
npm run test-coverage
# run the regression/e2e test suite
./tests/e2e/run_e2e_tests.sh \
......
......@@ -5,7 +5,9 @@ sdms_compile-and-unit-test:
artifacts:
reports:
junit: app/$SDMS_SERVICE/test-results.xml
cobertura: app/$SDMS_SERVICE/coverage/cobertura-coverage.xml
coverage_report:
coverage_format: cobertura
path: app/$SDMS_SERVICE/coverage/cobertura-coverage.xml
paths:
- app/$SDMS_SERVICE/coverage/
expire_in: 15 days
......
......@@ -56,6 +56,25 @@ export class AzureDataEcosystemServices extends AbstractDataEcosystemCore {
}
public static async getPartitionConfiguration(dataPartitionID: string): Promise<any> {
const credentials = AzureCredentials.getCredential()
const aud = AzureConfig.SP_APP_RESOURCE_ID;
const accessToken = (await credentials.getToken(`${aud}/.default`)).token
const options = {
headers: {
'Accept': 'application/json',
'Authorization': `Bearer ${accessToken}`,
'Content-Type': 'application/json'
},
url: AzureConfig.DES_SERVICE_HOST_PARTITION + '/api/partition/v1/partitions/' + dataPartitionID
};
try {
return JSON.parse(await request.get(options));
} catch (error) {
throw (Error.makeForHTTPRequest(error));
}
}
public static async getPartitions(): Promise<string[]> {
const options = {
headers: {
'Accept': 'application/json',
......@@ -64,7 +83,7 @@ export class AzureDataEcosystemServices extends AbstractDataEcosystemCore {
AzureConfig.SP_TENANT_ID, AzureConfig.SP_APP_RESOURCE_ID)).access_token,
'Content-Type': 'application/json'
},
url: AzureConfig.DES_SERVICE_HOST_PARTITION + '/api/partition/v1/partitions/' + dataPartitionID
url: AzureConfig.DES_SERVICE_HOST_PARTITION + '/api/partition/v1/partitions'
};
try {
return JSON.parse(await request.get(options));
......@@ -73,6 +92,7 @@ export class AzureDataEcosystemServices extends AbstractDataEcosystemCore {
}
}
public static async getStorageResourceName(dataPartitionID: string): Promise<string> {
if (!this._storageConfigs) {
......
......@@ -3,7 +3,16 @@ azure_containerize:
script:
echo 'empty'
only:
- $DISABLED == 'true'
- $DISABLED == 'false'
container_scanning:
needs: []
script:
echo 'empty'
rules:
- if: $DISABLED == 'true'
when: never
azure_deploy:
needs: []
......
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