From cfcbb2013424d174d409b30b11146623aa241bfe Mon Sep 17 00:00:00 2001
From: Rucha Deshpande <deshruch@amazon.com>
Date: Thu, 13 Aug 2020 20:50:59 +0000
Subject: [PATCH] Ecs impl changes
commit a04a2f01
Author: Rucha deshpande <deshruch@amazon.com>
Date: Thu Aug 13 2020 12:18:24 GMT-0500 (Central Daylight Time)
Adding appropriate copyright statements
commit e17bcabb
Author: Rucha deshpande <deshruch@amazon.com>
Date: Sun Aug 09 2020 15:53:13 GMT-0500 (Central Daylight Time)
entitlements on ecs update
---
provider/legal-aws/build-aws/buildspec.yaml | 7 ++-
provider/legal-aws/maven/settings.xml | 52 ++++++++++++++++---
provider/legal-aws/pom.xml | 4 +-
.../src/main/resources/application.properties | 2 +-
testing/legal-test-aws/pom.xml | 4 +-
5 files changed, 54 insertions(+), 15 deletions(-)
diff --git a/provider/legal-aws/build-aws/buildspec.yaml b/provider/legal-aws/build-aws/buildspec.yaml
index a2d6a0d63..938d62753 100644
--- a/provider/legal-aws/build-aws/buildspec.yaml
+++ b/provider/legal-aws/build-aws/buildspec.yaml
@@ -1,4 +1,4 @@
-# Copyright © Amazon Web Services
+# Copyright © 2020 Amazon Web Services
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -20,7 +20,7 @@ version: 0.2
phases:
install:
runtime-versions:
- java: openjdk8
+ java: corretto8
commands:
- if [ $(echo $CODEBUILD_SOURCE_VERSION | grep -c ^refs/heads.*) -eq 1 ]; then echo "Branch name found"; else echo "This build only supports branch builds" && exit 1; fi
- apt-get update -y
@@ -30,9 +30,8 @@ phases:
# - mvn -B clean # .m2 is not created until the first Maven command
- echo $JAVA_HOME #WHY
- mkdir -p /root/.m2
- - aws s3 sync s3://$M2_REPO_S3_BUCKET /root/.m2 # copy previous state of the shared libraries' .m2 folder from S3 to local
- cp ./provider/legal-aws/maven/settings.xml /root/.m2/settings.xml # copy the AWS-specific settings.xml to the CodeBuild instance's .m2 folder
- - cat /root/.m2/settings.xml
+ - export AWS_OSDU_DEV_MAVEN_AUTH_TOKEN=`aws codeartifact get-authorization-token --domain osdu-dev --domain-owner 888733619319 --query authorizationToken --output text`
pre_build:
commands:
- echo "Logging in to Amazon ECR..."
diff --git a/provider/legal-aws/maven/settings.xml b/provider/legal-aws/maven/settings.xml
index ee1d40491..b8192246c 100644
--- a/provider/legal-aws/maven/settings.xml
+++ b/provider/legal-aws/maven/settings.xml
@@ -1,9 +1,41 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright © 2020 Amazon Web Services
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd">
<profiles>
+ <profile>
+ <id>aws-osdu-dev-maven</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <repositories>
+ <repository>
+ <id>aws-osdu-dev-maven</id>
+ <url>${env.AWS_OSDU_DEV_MAVEN_URL}</url>
+ </repository>
+ <repository>
+ <id>gitlab-os-core-common-maven</id>
+ <url>https://community.opengroup.org/api/v4/projects/67/packages/maven</url>
+ </repository>
+ </repositories>
+ </profile>
<profile>
<id>credentialsConfiguration</id>
<activation>
@@ -20,17 +52,25 @@
</profiles>
<servers>
- <!-- Azure DevOps Artifact Store -->
<server>
- <id>os-core</id>
- <username>${azure.devops.username}</username>
- <!-- The generated token was last updated on 01/13/2020 and expires on or before 01/12/2021 -->
- <password>${azure.devops.token}</password>
+ <id>aws-osdu-dev-maven</id>
+ <username>aws</username>
+ <password>${env.AWS_OSDU_DEV_MAVEN_AUTH_TOKEN}</password>
</server>
</servers>
+ <!-- CodeArtifact doesn't support external repos yet that aren't Maven Central. ETA Q4 2020. -->
+ <!-- <mirrors> -->
+ <!-- <mirror> -->
+ <!-- <id>aws-osdu-dev-maven</id> -->
+ <!-- <name>aws-osdu-dev-maven</name> -->
+ <!-- <url>https://osdu-dev-888733619319.d.codeartifact.us-east-1.amazonaws.com/maven/osdu-maven/</url> -->
+ <!-- <mirrorOf>*,!gitlab-os-core-common-maven</mirrorOf> -->
+ <!-- </mirror> -->
+ <!-- </mirrors> -->
+
<activeProfiles>
<activeProfile>credentialsConfiguration</activeProfile>
</activeProfiles>
-</settings>
+</settings>
\ No newline at end of file
diff --git a/provider/legal-aws/pom.xml b/provider/legal-aws/pom.xml
index f3edd2972..96b6c5525 100644
--- a/provider/legal-aws/pom.xml
+++ b/provider/legal-aws/pom.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright © Amazon Web Services
+ Copyright © 2020 Amazon Web Services
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -39,7 +39,7 @@
<dependency>
<groupId>org.opengroup.osdu.core.aws</groupId>
<artifactId>os-core-lib-aws</artifactId>
- <version>0.3.5</version>
+ <version>0.3.7</version>
</dependency>
<dependency>
<groupId>org.opengroup.osdu</groupId>
diff --git a/provider/legal-aws/src/main/resources/application.properties b/provider/legal-aws/src/main/resources/application.properties
index 173ca6ba1..1eb038d5e 100644
--- a/provider/legal-aws/src/main/resources/application.properties
+++ b/provider/legal-aws/src/main/resources/application.properties
@@ -8,7 +8,7 @@ server.port=${APPLICATION_PORT}
aws.lambda.get-groups-function-name=${ENVIRONMENT}-os-entitlements-GroupsFunction
REGION=${AWS_REGION}
-AUTHORIZE_API=notused
+AUTHORIZE_API=${ENTITLEMENTS_BASE_URL}/api/entitlements/v1
LEGAL_HOSTNAME=notused
CRON_JOB_IP=10.0.0.1
ACCEPT_HTTP=true
diff --git a/testing/legal-test-aws/pom.xml b/testing/legal-test-aws/pom.xml
index 72f929523..9fe713b0c 100644
--- a/testing/legal-test-aws/pom.xml
+++ b/testing/legal-test-aws/pom.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright © Amazon Web Services
+ Copyright © 2020 Amazon Web Services
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -40,7 +40,7 @@
<dependency>
<groupId>org.opengroup.osdu.core.aws</groupId>
<artifactId>os-core-lib-aws</artifactId>
- <version>0.3.5</version>
+ <version>0.3.7</version>
</dependency>
<!-- AWS managed packages -->
--
GitLab