diff --git a/provider/indexer-aws/CloudFormation/Automated/ecs-indexer-queue.yml b/provider/indexer-aws/CloudFormation/Automated/ecs-indexer-queue.yml
index 93560af86f5700d21da34b943b08072e63764a70..fc1775f8334d381ac1157b5c2c6717e8d60ed75a 100644
--- a/provider/indexer-aws/CloudFormation/Automated/ecs-indexer-queue.yml
+++ b/provider/indexer-aws/CloudFormation/Automated/ecs-indexer-queue.yml
@@ -199,85 +199,6 @@ Resources:
- "ecr:UploadLayerPart"
- "ecr:CompleteLayerUpload"
- ApplicationECSCluster:
- Type: AWS::ECS::Cluster
- Properties:
- ClusterName: !Sub ${Environment}-${ApplicationName}-cluster
- Tags:
- - Key: Environment
- Value: !Ref Environment
-
- ECSSecurityGroup:
- Type: AWS::EC2::SecurityGroup
- Properties:
- GroupDescription: Indexer Service ECS Security Group
- VpcId:
- Fn::ImportValue:
- !Sub "${Environment}-OSDU-VPC"
-
- # Public access to port 80
- ECSSecurityGroupHTTPInbound:
- Type: AWS::EC2::SecurityGroupIngress
- Properties:
- GroupId: !Ref 'ECSSecurityGroup'
- IpProtocol: tcp
- FromPort: '80'
- ToPort: '80'
- CidrIp: 0.0.0.0/0
-
- # Public access to port 443
- ECSSecurityGroupHTTPSInbound:
- Type: AWS::EC2::SecurityGroupIngress
- Properties:
- GroupId: !Ref 'ECSSecurityGroup'
- IpProtocol: tcp
- FromPort: '443'
- ToPort: '443'
- CidrIp: 0.0.0.0/0
-
- # Public access to port 8080
- ECSSecurityGroupHTTPAltInbound:
- Type: AWS::EC2::SecurityGroupIngress
- Properties:
- GroupId: !Ref 'ECSSecurityGroup'
- IpProtocol: tcp
- FromPort: '8080'
- ToPort: '8080'
- CidrIp: 0.0.0.0/0
-
- # Public access to port 8443
- ECSSecurityGroupHTTPSAltInbound:
- Type: AWS::EC2::SecurityGroupIngress
- Properties:
- GroupId: !Ref 'ECSSecurityGroup'
- IpProtocol: tcp
- FromPort: '8443'
- ToPort: '8443'
- CidrIp: 0.0.0.0/0
-
- # SSH access for instances in our VPC's jump box subnet group (coming soon – will be part of the Util CFN)
- # TODO: Make security group in Util and enable it
- # ECSSecurityGroupSSHInbound:
- # Type: AWS::EC2::SecurityGroupIngress
- # Properties:
- # GroupId: !Ref 'ECSSecurityGroup'
- # IpProtocol: tcp
- # FromPort: '443'
- # ToPort: '443'
- # SourceSecurityGroupId:
- # Fn::ImportValue:
- # !Sub "${Environment}-OSDU-JumpBoxSecurityGroup"
-
- # Open Application Load Balancer port range to itself
- ECSSecurityGroupALBports:
- Type: AWS::EC2::SecurityGroupIngress
- Properties:
- GroupId: !Ref 'ECSSecurityGroup'
- IpProtocol: tcp
- FromPort: '31000'
- ToPort: '61000'
- SourceSecurityGroupId: !Ref 'ECSSecurityGroup'
-
CloudWatchLogsGroup:
Type: AWS::Logs::LogGroup
Properties:
@@ -305,86 +226,9 @@ Resources:
SourceVolume: docker-volume
PortMappings:
- ContainerPort: 80
- # - Name: busybox
- # Cpu: 10
- # Command: ['/bin/sh -c "while true; do echo ''<html> <head> <title>Amazon ECS
- # Sample App</title> <style>body {margin-top: 40px; background-color: #333;}
- # </style> </head><body> <div style=color:white;text-align:center> <h1>Amazon
- # ECS Sample App</h1> <h2>Congratulations!</h2> <p>The application is now
- # running on a container in Amazon ECS.</p>'' > top; /bin/date > date ;
- # echo ''</div></body></html>'' > bottom; cat top date bottom > /usr/local/apache2/htdocs/index.html
- # ; sleep 1; done"']
- # EntryPoint: [sh, -c]
- # Essential: false
- # Image: busybox
- # Memory: 200
- # LogConfiguration:
- # LogDriver: awslogs
- # Options:
- # awslogs-group: !Ref 'CloudWatchLogsGroup'
- # awslogs-region: !Ref 'AWS::Region'
- # awslogs-stream-prefix: !Ref 'ApplicationName'
- # VolumesFrom:
- # - SourceContainer: !Ref 'ApplicationName'
Volumes:
- Name: docker-volume
- ECSALB:
- Type: AWS::ElasticLoadBalancingV2::LoadBalancer
- Properties:
- Name: !Sub ECSALB-${ApplicationName}
- Scheme: internet-facing
- LoadBalancerAttributes:
- - Key: idle_timeout.timeout_seconds
- Value: '30'
- Subnets:
- - Fn::ImportValue:
- !Sub "${Environment}-OSDU-PublicSubnet-AZ1"
- - Fn::ImportValue:
- !Sub "${Environment}-OSDU-PublicSubnet-AZ2"
- SecurityGroups: [!Ref 'ECSSecurityGroup']
-
- ALBListener:
- Type: AWS::ElasticLoadBalancingV2::Listener
- DependsOn: ECSServiceRole
- Properties:
- DefaultActions:
- - Type: forward
- TargetGroupArn: !Ref 'ECSTG'
- LoadBalancerArn: !Ref 'ECSALB'
- Port: '80'
- Protocol: HTTP
-
- ECSALBListenerRule:
- Type: AWS::ElasticLoadBalancingV2::ListenerRule
- DependsOn: ALBListener
- Properties:
- Actions:
- - Type: forward
- TargetGroupArn: !Ref 'ECSTG'
- Conditions:
- - Field: path-pattern
- Values: [/]
- ListenerArn: !Ref 'ALBListener'
- Priority: 1
-
- ECSTG:
- Type: AWS::ElasticLoadBalancingV2::TargetGroup
- DependsOn: ECSALB
- Properties:
- HealthCheckIntervalSeconds: 10
- HealthCheckPath: /
- HealthCheckProtocol: HTTP
- HealthCheckTimeoutSeconds: 5
- HealthyThresholdCount: 2
- Name: ECSTG
- Port: 80
- Protocol: HTTP
- UnhealthyThresholdCount: 2
- VpcId:
- Fn::ImportValue:
- !Sub "${Environment}-OSDU-VPC"
-
ECSAutoScalingGroup:
Type: AWS::AutoScaling::AutoScalingGroup
Properties:
@@ -408,7 +252,9 @@ Resources:
Type: AWS::AutoScaling::LaunchConfiguration
Properties:
ImageId: !FindInMap [AWSRegionToAMI, !Ref 'AWS::Region', AMIID]
- SecurityGroups: [!Ref 'ECSSecurityGroup']
+ SecurityGroups:
+ - Fn::ImportValue:
+ !Sub "${Environment}-${ApplicationName}-EcsSecurityGroupId"
InstanceType: !Ref 'InstanceType'
IamInstanceProfile: !Ref 'EC2InstanceProfile'
KeyName: !Ref 'KeyName'
@@ -419,81 +265,6 @@ Resources:
yum install -y aws-cfn-bootstrap
/opt/aws/bin/cfn-signal -e $? --stack ${AWS::StackName} --resource ECSAutoScalingGroup --region ${AWS::Region}
- Service:
- Type: AWS::ECS::Service
- DependsOn: ALBListener
- Properties:
- Cluster: !Ref 'ApplicationECSCluster'
- DesiredCount: '1'
- LoadBalancers:
- - ContainerName: !Ref 'ApplicationName'
- ContainerPort: '80'
- TargetGroupArn: !Ref 'ECSTG'
- Role: !Ref 'ECSServiceRole'
- TaskDefinition: !Ref 'TaskDefinition'
-
- ECSServiceRole:
- Type: AWS::IAM::Role
- Properties:
- AssumeRolePolicyDocument:
- Statement:
- - Effect: Allow
- Principal:
- Service: [ecs.amazonaws.com]
- Action: ['sts:AssumeRole']
- Path: /
- Policies:
- - PolicyName: !Sub ${Environment}-${ApplicationName}-ecs-service
- PolicyDocument:
- Statement:
- - Effect: Allow
- Action: ['elasticloadbalancing:DeregisterInstancesFromLoadBalancer', 'elasticloadbalancing:DeregisterTargets',
- 'elasticloadbalancing:Describe*', 'elasticloadbalancing:RegisterInstancesWithLoadBalancer',
- 'elasticloadbalancing:RegisterTargets', 'ec2:Describe*', 'ec2:AuthorizeSecurityGroupIngress']
- Resource: '*'
-
- ServiceScalingTarget:
- Type: AWS::ApplicationAutoScaling::ScalableTarget
- DependsOn: Service
- Properties:
- MaxCapacity: 2
- MinCapacity: 1
- ResourceId: !Join ['', [service/, !Ref 'ApplicationECSCluster', /, !GetAtt [Service, Name]]]
- RoleARN: !GetAtt [AutoscalingRole, Arn]
- ScalableDimension: ecs:service:DesiredCount
- ServiceNamespace: ecs
-
- ServiceScalingPolicy:
- Type: AWS::ApplicationAutoScaling::ScalingPolicy
- Properties:
- PolicyName: AStepPolicy
- PolicyType: StepScaling
- ScalingTargetId: !Ref 'ServiceScalingTarget'
- StepScalingPolicyConfiguration:
- AdjustmentType: PercentChangeInCapacity
- Cooldown: 60
- MetricAggregationType: Average
- StepAdjustments:
- - MetricIntervalLowerBound: 0
- ScalingAdjustment: 200
-
- ALB500sAlarmScaleUp:
- Type: AWS::CloudWatch::Alarm
- Properties:
- EvaluationPeriods: '1'
- Statistic: Average
- Threshold: '10'
- AlarmDescription: Alarm triggering ECS to scale up if our ALB generates too many HTTP 500 errors.
- Period: '60'
- AlarmActions: [!Ref 'ServiceScalingPolicy']
- Namespace: AWS/ApplicationELB
- Dimensions:
- - Name: LoadBalancer
- Value: !GetAtt
- - ECSALB
- - LoadBalancerFullName
- ComparisonOperator: GreaterThanThreshold
- MetricName: HTTPCode_ELB_5XX_Count
EC2Role:
Type: AWS::IAM::Role
@@ -549,6 +320,10 @@ Resources:
-
Arn: !GetAtt ApplicationECSCluster.Arn
Id: !Sub ${Environment}-${ApplicationName}-target
+ EcsParemeters:
+ TaskCount: 1
+ TaskDefinitionArn: !Ref 'TaskDefinition'
+
Outputs:
ApplicationECSClusterArn:
Description: The ARN of the application's ECS cluster.
diff --git a/provider/indexer-aws/CloudFormation/Automated/ecs.yml b/provider/indexer-aws/CloudFormation/Automated/ecs.yml
index 077839d0b80edc446dfe72068a22859cdbef07e3..b56aaf157775eeca7681479ae3c9a16ff3f8a4d2 100644
--- a/provider/indexer-aws/CloudFormation/Automated/ecs.yml
+++ b/provider/indexer-aws/CloudFormation/Automated/ecs.yml
@@ -1,3 +1,17 @@
+# Copyright © 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.
+
AWSTemplateFormatVersion: 2010-09-09
Description: >-
CloudFormation template for creating the resources used for the ECS cluster the application will
@@ -30,22 +44,33 @@ Parameters:
ConstraintDescription: Must start with a letter. Only numbers, letters, -, and _ accepted. Max. length 64 characters.
Default: os-indexer
+ QueueApplicationName:
+ Description: >
+ The name of the application, which will be used to generate the ECS cluster name.
+ It will be prefixed with the environment name.
+ Type: String
+ MinLength: '1'
+ MaxLength: '64'
+ AllowedPattern: "^[a-zA-Z]+[0-9a-zA-Z_-]*$"
+ ConstraintDescription: Must start with a letter. Only numbers, letters, -, and _ accepted. Max. length 64 characters.
+ Default: os-indexer-queue
+
KeyName:
Description: >
Name of an existing EC2 KeyPair to enable SSH access to the ECS instances. Note that key pairs cannot
be created through CloudFormation, but instead must be uploaded through the AWS Console.
Type: AWS::EC2::KeyPair::KeyName
- Default: ecs_indexer_key
+ Default: indexer-ecs-keypair
DesiredCapacity:
Description: The default number of instances to launch in the ECS cluster.
Type: Number
- Default: '0'
+ Default: '1'
MinSize:
- Description: Maximum number of instances that can be launched in the ECS cluster.
+ Description: Minimum number of instances that can be launched in the ECS cluster.
Type: Number
- Default: '1'
+ Default: '0'
MaxSize:
Description: Maximum number of instances that can be launched in the ECS cluster.
@@ -197,7 +222,7 @@ Resources:
Type: AWS::EC2::SecurityGroup
Properties:
GroupName: !Sub "${Environment}-${ApplicationName}-sg"
- GroupDescription: Storage Service ECS Security Group
+ GroupDescription: Indexer Service ECS Security Group
VpcId:
Fn::ImportValue:
!Sub "${Environment}-OSDU-VPC"
@@ -301,6 +326,51 @@ Resources:
Volumes:
- Name: docker-volume
+ QueueTaskDefinition:
+ Type: AWS::ECS::TaskDefinition
+ Properties:
+ Family: !Join ['', [!Ref 'AWS::StackName', -, !Ref 'QueueApplicationName']]
+ ContainerDefinitions:
+ - Name: !Ref 'QueueApplicationName'
+ Cpu: '10'
+ Essential: 'true'
+ Image: !Sub ${AWS::AccountId}.dkr.ecr.${AWS::Region}.amazonaws.com/${Environment}-${QueueApplicationName}-queue-repository:latest
+ Memory: '300'
+ LogConfiguration:
+ LogDriver: awslogs
+ Options:
+ awslogs-group: !Ref 'CloudWatchLogsGroup'
+ awslogs-region: !Ref 'AWS::Region'
+ awslogs-stream-prefix: !Ref 'QueueApplicationName'
+ MountPoints:
+ - ContainerPath: /root/.m2
+ SourceVolume: docker-volume
+ PortMappings:
+ - ContainerPort: 80
+ Environment: # TODO: secure the sources of these values
+ - Name: AWS_ACCESS_KEY_ID
+ Value: AKIA453FG2R3UKGYA252
+ - Name: AWS_SECRET_KEY
+ Value: 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
+ - Name: ENVIRONMENT
+ Value: dev
+ - Name: VSTS_FEED_TOKEN
+ Value: 4t46p4pkk2kinwhjet3ucjb5prhexcme5cbmt4txpuoqn4jns22q
+ Volumes:
+ - Name: docker-volume
+
+ SchedulingRule:
+ Type: AWS::Events::Rule
+ Properties:
+ ScheduleExpression: rate(5 minutes)
+ State: ENABLED
+ Targets:
+ - Arn: !GetAtt ApplicationECSCluster.Arn
+ Id: !Sub ${Environment}-${QueueApplicationName}-target
+ EcsParemeters:
+ TaskCount: 1
+ TaskDefinitionArn: !Ref 'QueueTaskDefinition'
+
ECSALB:
Type: AWS::ElasticLoadBalancingV2::LoadBalancer
Properties:
@@ -345,7 +415,7 @@ Resources:
DependsOn: ECSALB
Properties:
HealthCheckIntervalSeconds: 120
- HealthCheckPath: /api/storage/v2/
+ HealthCheckPath: /api/indexer/v2/
HealthCheckProtocol: HTTP
HealthCheckTimeoutSeconds: 5
HealthyThresholdCount: 2
@@ -526,25 +596,25 @@ Outputs:
Name: !Sub ${Environment}-${ApplicationName}-EcsClusterName
ECSServiceArn:
- Description: The ARN of the Storage Service service in the ECS cluster.
+ Description: The ARN of the Indexer Service service in the ECS cluster.
Value: !Ref 'Service'
Export:
Name: !Sub ${Environment}-${ApplicationName}-EcsServiceArn
ECSALBUrl:
- Description: The Storage Service ALB DNS URL.
+ Description: The Indexer Service ALB DNS URL.
Value: !Join ['', [!GetAtt [ECSALB, DNSName]]]
Export:
Name: !Sub ${Environment}-${ApplicationName}-EcsAlbUrl
TaskDefinitionArn:
- Description: The ARN of the Storage Service ECS task definition.
+ Description: The ARN of the Indexer Service ECS task definition.
Value: !Ref 'TaskDefinition'
Export:
Name: !Sub ${Environment}-${ApplicationName}-EcsTaskDefinitionArn
ECSSecurityGroupId:
- Description: The ID of the Storage Service ECS EC2 security group.
+ Description: The ID of the Indexer Service ECS EC2 security group.
Value: !Ref 'ECSSecurityGroup'
Export:
- Name: !Sub ${Environment}-${ApplicationName}-EcsSecurityGroupId
+ Name: !Sub ${Environment}-${ApplicationName}-EcsSecurityGroupId
\ No newline at end of file
diff --git a/provider/indexer-aws/CloudFormation/Manual/01-CreateCodePipeline.yml b/provider/indexer-aws/CloudFormation/Manual/01-CreateCodePipeline.yml
index 0f3848656eadb314fe869a2a1d91777f22e0548c..1de60881047c37f66d4413ea809dc6a1fbb3a818 100644
--- a/provider/indexer-aws/CloudFormation/Manual/01-CreateCodePipeline.yml
+++ b/provider/indexer-aws/CloudFormation/Manual/01-CreateCodePipeline.yml
@@ -331,6 +331,9 @@ Resources:
- Name: IMAGE_REPO_NAME
Type: PLAINTEXT
Value: !Sub ${Environment}-${CodeCommitRepositoryName}-repository
+ - Name: QUEUE_IMAGE_REPO_NAME
+ Type: PLAINTEXT
+ Value: !Sub ${Environment}-${CodeCommitRepositoryName}-queue-repository
PrivilegedMode: true
Source:
BuildSpec: ./provider/storage-aws/buildspec-post-deploy.yml
diff --git a/provider/indexer-aws/CloudFormation/Master/os-indexer-master.yml b/provider/indexer-aws/CloudFormation/Master/os-indexer-master.yml
index a31923786f8859dc5ecb043e15f33bfccdccefb7..2900901947659c5aa7bfae0eefd67707018e56e1 100644
--- a/provider/indexer-aws/CloudFormation/Master/os-indexer-master.yml
+++ b/provider/indexer-aws/CloudFormation/Master/os-indexer-master.yml
@@ -48,6 +48,17 @@ Parameters:
ConstraintDescription: Must start with a letter. Only numbers, letters, -, and _ accepted. Max. length 64 characters.
Default: os-indexer
+ QueueApplicationName:
+ Description: >
+ The name of the application, which will be used to generate the ECS cluster name.
+ It will be prefixed with the environment name.
+ Type: String
+ MinLength: '1'
+ MaxLength: '64'
+ AllowedPattern: "^[a-zA-Z]+[0-9a-zA-Z_-]*$"
+ ConstraintDescription: Must start with a letter. Only numbers, letters, -, and _ accepted. Max. length 64 characters.
+ Default: os-indexer-queue
+
KeyName:
Description: >
Name of an existing EC2 KeyPair to enable SSH access to the ECS instances. Note that key pairs cannot
@@ -447,6 +458,7 @@ Resources:
Environment: !Ref Environment
Region: !Ref DeploymentRegion
ApplicationName: !Ref ApplicationName
+ QueueApplicationName: !Ref QueueApplicationName
KeyName: !Ref KeyName
DesiredCapacity: !Ref DesiredCapacity
MinSize: !Ref MinSize
diff --git a/provider/indexer-aws/CloudFormation/Params/dev.template_configuration.json b/provider/indexer-aws/CloudFormation/Params/dev.template_configuration.json
index e328cf8d380df765786c27a3eafc6bae77eeabb6..2625a8b409ca811ecddc326ab0733601610cc1b3 100644
--- a/provider/indexer-aws/CloudFormation/Params/dev.template_configuration.json
+++ b/provider/indexer-aws/CloudFormation/Params/dev.template_configuration.json
@@ -4,6 +4,7 @@
"DeploymentRegion" : "us-east-1",
"ChildTemplateBasePath" : "https://s3.amazonaws.com/dev-os-indexer-cloudformation-scripts/Automated/",
"ApplicationName" : "os-indexer",
+ "QueueApplicationName" : "os-indexer-queue",
"KeyName": "indexer-ecs-keypair",
"DesiredCapacity": "1",
"MinSize": "0",
diff --git a/provider/indexer-aws/CloudFormation/Params/prod.template_configuration.json b/provider/indexer-aws/CloudFormation/Params/prod.template_configuration.json
index ba07ff41e64880df5dfcf652bef92d8c552d144a..09d4e6b7592f5f08d75d1ca61ada84913bbf6b24 100644
--- a/provider/indexer-aws/CloudFormation/Params/prod.template_configuration.json
+++ b/provider/indexer-aws/CloudFormation/Params/prod.template_configuration.json
@@ -4,6 +4,7 @@
"DeploymentRegion" : "us-east-1",
"ChildTemplateBasePath" : "https://s3.amazonaws.com/prod-os-indexer-cloudformation-scripts/Automated/",
"ApplicationName" : "os-indexer",
+ "QueueApplicationName" : "os-indexer-queue",
"KeyName": "indexer-ecs-keypair",
"DesiredCapacity": "1",
"MinSize": "0",
diff --git a/provider/indexer-aws/CloudFormation/Params/uat.template_configuration.json b/provider/indexer-aws/CloudFormation/Params/uat.template_configuration.json
index 26fd295983725e67ff62da3cc148314aea497383..13a053f5dbd7eea06ad2d359cb1d8225ae2dc7a9 100644
--- a/provider/indexer-aws/CloudFormation/Params/uat.template_configuration.json
+++ b/provider/indexer-aws/CloudFormation/Params/uat.template_configuration.json
@@ -4,6 +4,7 @@
"DeploymentRegion" : "us-east-1",
"ChildTemplateBasePath" : "https://s3.amazonaws.com/uat-os-indexer-cloudformation-scripts/Automated/",
"ApplicationName" : "os-indexer",
+ "QueueApplicationName" : "os-indexer-queue",
"KeyName": "indexer-ecs-keypair",
"DesiredCapacity": "1",
"MinSize": "0",
diff --git a/provider/indexer-aws/buildspec-post-deploy.yml b/provider/indexer-aws/buildspec-post-deploy.yml
index 53fdb3685493518f464dd6783c8354d1bd86e99f..de22144ec171565023bfe7067e8179d639bf66c7 100644
--- a/provider/indexer-aws/buildspec-post-deploy.yml
+++ b/provider/indexer-aws/buildspec-post-deploy.yml
@@ -47,8 +47,6 @@ phases:
build:
commands:
- echo Indexer-core Java build started on `date`...
- # - mvn clean test -pl Indexer-core
- # - mvn clean deploy -pl Indexer-core
- echo os-indexer Java build started on `date`...
- java -version
- export JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64
@@ -65,6 +63,16 @@ phases:
- echo ...os-indexer Docker image build completed on `date`.
- echo Pushing the Docker image to ECR...
- docker push $AWS_ACCOUNT_NUMBER.dkr.ecr.$DEPLOYMENT_REGION.amazonaws.com/$IMAGE_REPO_NAME:$IMAGE_TAG
+ - mvn clean test -U -f provider/indexer-aws/indexer-queue-aws/pom.xml -Ddeployment.environment=$ENVIRONMENT -Ddeployment.repositorybucket=$S3_MAVEN_REPOSITORY -Daws.accessKeyId=$AWS_ACCESS_KEY_ID_MAVEN -Daws.secretKey=$AWS_SECRET_ACCESS_KEY_MAVEN -Dazure.devops.token=$VSTS_FEED_TOKEN -DaltSnapshotDeploymentRepository=snapshot::default::file:../../local-snapshots-dir -DaltReleaseDeploymentRepository=release::default::file:../../local-release-dir -DaltDeploymentRepository=release::default::file:../../local-release-dir
+ - echo ...os-indexer Java build completed on `date`.
+ - echo os-indexer beginning packaging to jar...
+ - mvn clean deploy -f provider/indexer-aws/indexer-queue-aws/pom.xml -Ddeployment.environment=$ENVIRONMENT -Ddeployment.repositorybucket=$S3_MAVEN_REPOSITORY -Daws.accessKeyId=$AWS_ACCESS_KEY_ID_MAVEN -Daws.secretKey=$AWS_SECRET_ACCESS_KEY_MAVEN -Dazure.devops.token=$VSTS_FEED_TOKEN -DaltSnapshotDeploymentRepository=snapshot::default::file:../../local-snapshots-dir -DaltReleaseDeploymentRepository=release::default::file:../../local-release-dir -DaltDeploymentRepository=release::default::file:../../local-release-dir
+ - echo os-indexer Docker image build started on `date`...
+ - docker build -f provider/indexer-aws/indexer-queue-aws/Dockerfile -t $QUEUE_IMAGE_REPO_NAME:$IMAGE_TAG .
+ - docker tag $IMAGE_REPO_NAME:$IMAGE_TAG $AWS_ACCOUNT_NUMBER.dkr.ecr.$DEPLOYMENT_REGION.amazonaws.com/$QUEUE_IMAGE_REPO_NAME:$IMAGE_TAG
+ - echo ...os-indexer Docker image build completed on `date`.
+ - echo Pushing the Docker image to ECR...
+ - docker push $AWS_ACCOUNT_NUMBER.dkr.ecr.$DEPLOYMENT_REGION.amazonaws.com/$QUEUE_IMAGE_REPO_NAME:$IMAGE_TAG
- echo Docker image pushed to ECR successfully!
cache:
diff --git a/provider/indexer-aws/indexer-queue-aws/Dockerfile b/provider/indexer-aws/indexer-queue-aws/Dockerfile
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..35f86e0b5e2885e8902ab61f32d82a6d32841f59 100644
--- a/provider/indexer-aws/indexer-queue-aws/Dockerfile
+++ b/provider/indexer-aws/indexer-queue-aws/Dockerfile
@@ -0,0 +1,7 @@
+FROM amazoncorretto:8
+
+WORKDIR /
+COPY provider/storage-aws/target/indexer-queue-aws-0.0.1-SNAPSHOT-spring-boot.jar indexer-queue-aws-0.0.1-SNAPSHOT-spring-boot.jar
+EXPOSE 8080
+
+CMD ["java","-jar", "indexer-aws-0.0.1-SNAPSHOT-spring-boot.jar"]
\ No newline at end of file
diff --git a/provider/indexer-aws/indexer-queue-aws/pom.xml b/provider/indexer-aws/indexer-queue-aws/pom.xml
index 7661120291e4b289343575603a7ead9888e07b7a..352ed4286d55b2b48fb612cd4d03a7eb1b7565bc 100644
--- a/provider/indexer-aws/indexer-queue-aws/pom.xml
+++ b/provider/indexer-aws/indexer-queue-aws/pom.xml
@@ -35,9 +35,29 @@
<name>indexer-queue-aws</name>
<packaging>jar</packaging>
-
+ <!-- Internal packages -->
<dependencies>
- <dependency>
+ <dependency>
+ <groupId>org.opengroup.osdu.core.aws</groupId>
+ <artifactId>aws-osdu-util</artifactId>
+ <version>0.0.1</version>
+ </dependency>
+
+ <!-- AWS managed packages -->
+ <dependency>
+ <groupId>com.amazonaws</groupId>
+ <artifactId>aws-java-sdk-core</artifactId>
+ <version>1.11.651</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.amazonaws</groupId>
+ <artifactId>aws-java-sdk</artifactId>
+ <version>1.11.327</version>
+ </dependency>
+
+ <!-- Third party Apache 2.0 license packages -->
+ <dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
<version>2.12.1</version>
@@ -47,22 +67,6 @@
<artifactId>log4j-core</artifactId>
<version>2.12.1</version>
</dependency>
- <dependency>
- <groupId>com.amazonaws</groupId>
- <artifactId>aws-java-sdk-core</artifactId>
- <version>1.11.651</version>
- </dependency>
- <dependency>
- <groupId>org.opengroup.osdu.core.aws</groupId>
- <artifactId>aws-osdu-util</artifactId>
- <version>0.0.1</version>
- </dependency>
- <dependency>
- <groupId>com.amazonaws</groupId>
- <artifactId>aws-java-sdk</artifactId>
- <version>1.11.327</version>
- </dependency>
-
<dependency>
<groupId>org.apache.lucene</groupId>
<artifactId>lucene-core</artifactId>
@@ -85,7 +89,9 @@
<artifactId>commons-collections4</artifactId>
<version>4.1</version>
</dependency>
- <dependency>
+
+ <!-- Testing packages -->
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
@@ -103,4 +109,29 @@
<version>2.0.2</version>
</dependency>
</dependencies>
+
+ <repositories>
+ <repository>
+ <id>maven-s3-release-repo</id>
+ <name>S3 Maven Release Repository</name>
+ <url>s3://${deployment.repositorybucket}/release</url>
+ </repository>
+
+ <repository>
+ <id>maven-s3-snapshot-repo</id>
+ <name>S3 Maven Snapshot Repository</name>
+ <url>s3://${deployment.repositorybucket}/snapshot</url>
+ </repository>
+
+ <repository>
+ <id>local.release</id>
+ <url>file:../../local-release-dir</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
</project>