Commit a12cb5d5 authored by Rucha Deshpande's avatar Rucha Deshpande
Browse files

Update domain to example.com

commit 51750c0e 
Author: Rucha Deshpande <deshruch@amazon.com> 
Date: Tue May 04 2021 14:27:51 GMT-0500 (Central Daylight Time) 

    change the domain


commit a580e0d3 
Author: Rucha Deshpande <deshruch@amazon.com> 
Date: Tue May 04 2021 12:11:17 GMT-0500 (Central Daylight Time) 

    Merge branch 'dev' into deshruch


commit f2c1024f 
Author: Rucha Deshpande <deshruch@amazon.com> 
Date: Mon May 03 2021 17:25:51 GMT-0500 (Central Daylight Time) 

    fix groups


commit 8318bd4e 
Author: Rucha Deshpande <deshruch@amazon.com> 
Date: Mon May 03 2021 17:05:58 GMT-0500 (Central Daylight Time) 

    update groups for integration tests


commit ab991127 
Author: Rucha Deshpande <deshruch@amazon.com> 
Date: Mon May 03 2021 15:30:39 GMT-0500 (Central Daylight Time) 

    bug fix get groups api


commit 88fac5ef 
Author: Rucha Deshpande <deshruch@amazon.com> 
Date: Mon May 03 2021 12:12:45 GMT-0500 (Central Daylight Time) 

    merge with dev


commit cd1a0dcb 
Author: Rucha Deshpande <deshruch@amazon.com> 
Date: Mon May 03 2021 12:09:07 GMT-0500 (Central Daylight Time) 

    revert to dev version


commit 879c9bb7 
Author: Rucha Deshpande <deshruch@amazon.com> 
Date: Thu Apr 29 2021 13:13:10 GMT-0500 (Central Daylight Time) 

    Fix groups for limited access user


commit 83d3a4e0 
Author: Rucha Deshpande <deshruch@amazon.com> 
Date: Thu Apr 29 2021 11:40:34 GMT-0500 (Central Daylight Time) 

    Fix groups for SP and integration test user


commit 353d8087 
Author: Rucha Deshpande <deshruch@amazon.com> 
Date: Wed Apr 28 2021 18:01:53 GMT-0500 (Central Daylight Time) 

    Add sp groups with common tenant


commit 38022d40 
Author: Rucha Deshpande <deshruch@amazon.com> 
Date: Wed Apr 28 2021 17:52:03 GMT-0500 (Central Daylight Time) 

    Add additional groups to Service Principal json


commit 0a020901 
Author: Rucha Deshpande <deshruch@amazon.com> 
Date: Wed Apr 28 2021 16:42:49 GMT-0500 (Central Daylight Time) 

    Add all required groups


commit 2df34660 
Author: Rucha Deshpande <deshruch@amazon.com> 
Date: Wed Apr 28 2021 16:12:45 GMT-0500 (Central Daylight Time) 

    Add all required groups


commit c7e27c35 
Author: Rucha Deshpande <deshruch@amazon.com> 
Date: Wed Apr 28 2021 14:38:37 GMT-0500 (Central Daylight Time) 

    add noaccess user groups


commit c75be322 
Author: Rucha Deshpande <deshruch@amazon.com> 
Date: Wed Apr 28 2021 14:32:01 GMT-0500 (Central Daylight Time) 

    add groups


commit 3f507ca7 
Author: Rucha Deshpande <deshruch@amazon.com> 
Date: Wed Apr 28 2021 14:01:10 GMT-0500 (Central Daylight Time) 

    Add groups required for Storage integration tests


commit 2ca46a3a 
Author: Rucha Deshpande <deshruch@amazon.com> 
Date: Wed Apr 28 2021 12:02:46 GMT-0500 (Central Daylight Time) 

    Bug fix: response code could be 409


commit 8fd2c9e0 
Author: Rucha Deshpande <deshruch@amazon.com> 
Date: Wed Apr 28 2021 12:02:27 GMT-0500 (Central Daylight Time) 

    Bug fix: response code could be 409


commit 63a3addf 
Author: Rucha Deshpande <deshruch@amazon.com> 
Date: Wed Apr 28 2021 10:18:06 GMT-0500 (Central Daylight Time) 

    bug fix init tenant script


commit ad632356 
Author: Rucha Deshpande <deshruch@amazon.com> 
Date: Mon Apr 26 2021 14:45:50 GMT-0500 (Central Daylight Time) 

    update os-core-lib-aws version


commit b1a35edf 
Author: Rucha Deshpande <deshruch@amazon.com> 
Date: Mon Apr 26 2021 14:01:12 GMT-0500 (Central Daylight Time) 

    update os-core-lib-aws version


commit 8789e934 
Author: Rucha Deshpande <deshruch@amazon.com> 
Date: Mon Apr 26 2021 13:39:53 GMT-0500 (Central Daylight Time) 

    update os-core-lib-aws and add integration test user bootstrapping


commit e99f9a5a 
Author: Rucha Deshpande <deshruch@amazon.com> 
Date: Mon Apr 26 2021 13:39:28 GMT-0500 (Central Daylight Time) 

    update os-core-lib-aws and add integration test user bootstrapping


commit b0047a2b 
Author: Rucha Deshpande <deshruch@amazon.com> 
Date: Thu Apr 22 2021 12:34:32 GMT-0500 (Central Daylight Time) 

    add test


commit c4ebdd53 
Author: Rucha Deshpande <deshruch@amazon.com> 
Date: Wed Apr 21 2021 13:00:28 GMT-0500 (Central Daylight Time) 

    Merge branch 'dev' into deshruch

# Conflicts:
#	provider/entitlements-v2-aws/src/main/resources/application.properties


commit c01052bb 
Author: Rucha Deshpande <deshruch@amazon.com> 
Date: Wed Apr 21 2021 12:56:09 GMT-0500 (Central Daylight Time) 

    add ssl properties


commit 2ec6c775 
Author: Rucha Deshpande <deshruch@amazon.com> 
Date: Wed Apr 21 2021 11:38:54 GMT-0500 (Central Daylight Time) 

    AWS API implementation, integration tests and bootstrap script

commit 8db9e8fd 
Author: Rucha Deshpande <deshruch@amazon.com> 
Date: Wed Apr 21 2021 11:23:58 GMT-0500 (Central Daylight Time) 

    Added a comment


commit a163cc86 
Author: Rucha Deshpande <deshruch@amazon.com> 
Date: Wed Apr 21 2021 11:20:17 GMT-0500 (Central Daylight Time) 

    Added a comment


commit 31c23b5e 
Author: Rucha Deshpande <deshruch@amazon.com> 
Date: Wed Apr 21 2021 09:00:18 GMT-0500 (Central Daylight Time) 

    remove comment from script


commit 89fdd8d3 
Author: Rucha Deshpande <deshruch@amazon.com> 
Date: Wed Apr 21 2021 08:58:01 GMT-0500 (Central Daylight Time) 

    Add copyright


commit c88ea34e 
Author: Rucha Deshpande <deshruch@amazon.com> 
Date: Tue Apr 20 2021 17:06:20 GMT-0500 (Central Daylight Time) 

    add getProtectedMembers


commit e227c574 
Author: Rucha Deshpande <deshruch@amazon.com> 
Date: Tue Apr 20 2021 16:55:33 GMT-0500 (Central Daylight Time) 

    update springfox version


commit 37a59a59 
Author: Rucha Deshpande <deshruch@amazon.com> 
Date: Tue Apr 20 2021 10:02:16 GMT-0500 (Central Daylight Time) 

    remove comments


commit cd09da0c 
Author: Rucha Deshpande <deshruch@amazon.com> 
Date: Tue Apr 20 2021 09:56:47 GMT-0500 (Central Daylight Time) 

    Add copyright stmt


commit 67ac467d 
Author: Rucha Deshpande <deshruch@amazon.com> 
Date: Tue Apr 20 2021 09:31:19 GMT-0500 (Central Daylight Time) 

    remove unwanted properties


commit f619fd4d 
Author: Rucha Deshpande <deshruch@amazon.com> 
Date: Mon Apr 19 2021 11:10:20 GMT-0500 (Central Daylight Time) 

    Add bootstrap scripts


commit c7ba3273 
Author: Rucha Deshpande <deshruch@amazon.com> 
Date: Fri Apr 16 2021 13:41:20 GMT-0500 (Central Daylight Time) 

    Add chmod to sh files


commit 64c85c51 
Author: Rucha Deshpande <deshruch@amazon.com> 
Date: Fri Apr 16 2021 13:33:53 GMT-0500 (Central Daylight Time) 

    delete unit test for now


commit 62fa1a54 
Author: Rucha Deshpande <deshruch@amazon.com> 
Date: Fri Apr 16 2021 13:27:52 GMT-0500 (Central Daylight Time) 

    Add prepare-dist to build


commit 31205a13 
Author: Rucha Deshpande <deshruch@amazon.com> 
Date: Fri Apr 16 2021 12:25:03 GMT-0500 (Central Daylight Time) 

    Add AWS impl


commit 5185fa58 
Author: Rucha Deshpande <deshruch@amazon.com> 
Date: Mon Apr 12 2021 11:26:40 GMT-0500 (Central Daylight Time) 

    Add authorizer to interceptor


commit 52f5804a 
Author: Rucha Deshpande <deshruch@amazon.com> 
Date: Mon Apr 12 2021 10:27:50 GMT-0500 (Central Daylight Time) 

    add qq to buildspec


commit 77477c68 
Author: Rucha Deshpande <deshruch@amazon.com> 
Date: Mon Apr 12 2021 09:53:32 GMT-0500 (Central Daylight Time) 

    Add interceptor


commit c64ff655 
Author: Rucha Deshpande <deshruch@amazon.com> 
Date: Wed Mar 31 2021 10:17:53 GMT-0500 (Central Daylight Time) 

    merge with dev


commit fd4979f7 
Author: Rucha Deshpande <deshruch@amazon.com> 
Date: Wed Mar 31 2021 10:16:14 GMT-0500 (Central Daylight Time) 

    delete unwanted files


commit 6d0da95b 
Author: Rucha Deshpande <deshruch@amazon.com> 
Date: Wed Mar 31 2021 09:51:05 GMT-0500 (Central Daylight Time) 

    aws specific changes



commit 8db9e8fd 
Author: Rucha Deshpande <deshruch@amazon.com> 
Date: Wed Apr 21 2021 11:23:58 GMT-0500 (Central Daylight Time) 

    Added a comment


commit 4ff9291f 
Author: Rucha Deshpande <deshruch@amazon.com> 
Date: Wed Mar 31 2021 10:27:43 GMT-0500 (Central Daylight Time) 

    Entitlements V2 build and implementation stubs



commit 80a20ce6 
Author: Rucha Deshpande <deshruch@amazon.com> 
Date: Wed Mar 31 2021 10:17:53 GMT-0500 (Central Daylight Time) 

    merge with dev


commit 5716e57f 
Author: Rucha Deshpande <deshruch@amazon.com> 
Date: Wed Mar 31 2021 10:16:29 GMT-0500 (Central Daylight Time) 

    Merge remote-tracking branch 'remotes/origin/dev' into deshruch

# Conflicts:
#	entitlements-v2-core/src/main/java/org/opengroup/osdu/entitlements/v2/auth/JwtClaimExtractor.java


commit 4cfc8429 
Author: Rucha Deshpande <deshruch@amazon.com> 
Date: Wed Mar 31 2021 10:16:14 GMT-0500 (Central Daylight Time) 

    delete unwanted files


commit 6fd37ed1 
Author: Rucha Deshpande <deshruch@amazon.com> 
Date: Wed Mar 31 2021 09:51:05 GMT-0500 (Central Daylight Time) 

    aws specific changes


commit c0bff91c 
Author: Rucha Deshpande <deshruch@amazon.com> 
Date: Thu Mar 25 2021 14:04:56 GMT-0500 (Central Daylight Time) 

    Add chmod perms to ssl for Windows


commit 5dc5e9cb 
Author: Rucha Deshpande <deshruch@amazon.com> 
Date: Thu Mar 25 2021 10:03:05 GMT-0500 (Central Daylight Time) 

    Add default for service domain


commit 445e5aa4 
Author: Rucha Deshpande <deshruch@amazon.com> 
Date: Thu Mar 25 2021 09:43:31 GMT-0500 (Central Daylight Time) 

    Add AWS builspec



commit a163cc86 
Author: Rucha Deshpande <deshruch@amazon.com> 
Date: Wed Apr 21 2021 11:20:17 GMT-0500 (Central Daylight Time) 

    Added a comment


commit 31c23b5e 
Author: Rucha Deshpande <deshruch@amazon.com> 
Date: Wed Apr 21 2021 09:00:18 GMT-0500 (Central Daylight Time) 

    remove comment from script


commit 89fdd8d3 
Author: Rucha Deshpande <deshruch@amazon.com> 
Date: Wed Apr 21 2021 08:58:01 GMT-0500 (Central Daylight Time) 

    Add copyright


commit c88ea34e 
Author: Rucha Deshpande <deshruch@amazon.com> 
Date: Tue Apr 20 2021 17:06:20 GMT-0500 (Central Daylight Time) 

    add getProtectedMembers


commit e227c574 
Author: Rucha Deshpande <deshruch@amazon.com> 
Date: Tue Apr 20 2021 16:55:33 GMT-0500 (Central Daylight Time) 

    update springfox version


commit 37a59a59 
Author: Rucha Deshpande <deshruch@amazon.com> 
Date: Tue Apr 20 2021 10:02:16 GMT-0500 (Central Daylight Time) 

    remove comments


commit cd09da0c 
Author: Rucha Deshpande <deshruch@amazon.com> 
Date: Tue Apr 20 2021 09:56:47 GMT-0500 (Central Daylight Time) 

    Add copyright stmt


commit 67ac467d 
Author: Rucha Deshpande <deshruch@amazon.com> 
Date: Tue Apr 20 2021 09:31:19 GMT-0500 (Central Daylight Time) 

    remove unwanted properties


commit f619fd4d 
Author: Rucha Deshpande <deshruch@amazon.com> 
Date: Mon Apr 19 2021 11:10:20 GMT-0500 (Central Daylight Time) 

    Add bootstrap scripts


commit c7ba3273 
Author: Rucha Deshpande <deshruch@amazon.com> 
Date: Fri Apr 16 2021 13:41:20 GMT-0500 (Central Daylight Time) 

    Add chmod to sh files


commit 64c85c51 
Author: Rucha Deshpande <deshruch@amazon.com> 
Date: Fri Apr 16 2021 13:33:53 GMT-0500 (Central Daylight Time) 

    delete unit test for now


commit 62fa1a54 
Author: Rucha Deshpande <deshruch@amazon.com> 
Date: Fri Apr 16 2021 13:27:52 GMT-0500 (Central Daylight Time) 

    Add prepare-dist to build


commit 31205a13 
Author: Rucha Deshpande <deshruch@amazon.com> 
Date: Fri Apr 16 2021 12:25:03 GMT-0500 (Central Daylight Time) 

    Add AWS impl


commit 5185fa58 
Author: Rucha Deshpande <deshruch@amazon.com> 
Date: Mon Apr 12 2021 11:26:40 GMT-0500 (Central Daylight Time) 

    Add authorizer to interceptor


commit 52f5804a 
Author: Rucha Deshpande <deshruch@amazon.com> 
Date: Mon Apr 12 2021 10:27:50 GMT-0500 (Central Daylight Time) 

    add qq to buildspec


commit 77477c68 
Author: Rucha Deshpande <deshruch@amazon.com> 
Date: Mon Apr 12 2021 09:53:32 GMT-0500 (Central Daylight Time) 

    Add interceptor


commit c64ff655 
Author: Rucha Deshpande <deshruch@amazon.com> 
Date: Wed Mar 31 2021 10:17:53 GMT-0500 (Central Daylight Time) 

    merge with dev


commit fd4979f7 
Author: Rucha Deshpande <deshruch@amazon.com> 
Date: Wed Mar 31 2021 10:16:14 GMT-0500 (Central Daylight Time) 

    delete unwanted files


commit 6d0da95b 
Author: Rucha Deshpande <deshruch@amazon.com> 
Date: Wed Mar 31 2021 09:51:05 GMT-0500 (Central Daylight Time) 

    aws specific changes
parent 92bcc989
......@@ -10,7 +10,7 @@ server.servlet.contextPath=/api/entitlements/v2
aws.region=${AWS_REGION}
aws.environment=${ENVIRONMENT}
app.projectId=evd-ddl-us-services
app.domain=${SERVICE_DOMAIN_NAME:contoso.com}
app.domain=${SERVICE_DOMAIN_NAME:example.com}
aws.parameter.prefix=/osdu/${ENVIRONMENT}
......
......@@ -24,6 +24,6 @@ partition.parent.ref=2
partition.children.ref=3
partition.appid=4
app.projectId=evd-ddl-us-services
app.domain=contoso.com
app.domain=example.com
......@@ -43,7 +43,7 @@ public class AwsConfigurationService implements ConfigurationService {
public String getDomain() {
String domain = System.getProperty("DOMAIN", System.getenv("DOMAIN"));
if (Strings.isNullOrEmpty(domain)) {
domain = "contoso.com";
domain = "example.com";
}
return domain;
}
......
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