Merge branch 'master' into slb/dm3/reason-423

.gitlab-ci.yml

@@ -53,7 +53,7 @@ include:
     
   # aws
   - project: "osdu/platform/ci-cd-pipelines"
-    file: "cloud-providers/aws.yml"
+    file: "cloud-providers/aws-global.yml"
 
   - local: "/devops/aws/awstest.yml"
 

src/cloud/providers/aws/dataecosystem.ts

@@ -21,7 +21,7 @@ import { AWSCredentials } from './credentials';
 @DataEcosystemCoreFactory.register('aws')
 export class AWSDataEcosystemServices extends AbstractDataEcosystemCore {
     public getDataPartitionIDRestHeaderName(): string { return 'data-partition-id'; }
-    public getEntitlementBaseUrlPath(): string { return '/api/entitlements/v1'; };
+    public getEntitlementBaseUrlPath(): string { return '/api/entitlements/v2'; };
     public getComplianceBaseUrlPath(): string { return '/api/legal/v1'; };
     public getStorageBaseUrlPath(): string { return '/api/storage/v2'; };
 
@@ -41,4 +41,4 @@ export class AWSDataEcosystemServices extends AbstractDataEcosystemCore {
         return false;
     }
 
-}
\ No newline at end of file
+}