Merge pull request #133 from appirio-tech/dev

"New Auth Flow" - upgrading java build version for TLS1.2 support

Author: sachin-maheshwari

.circleci/config.yml

@@ -20,6 +20,7 @@ build_steps: &build_steps
       - run:
           name: Installation of build dependencies.
           command: |
+            sudo apt update
             sudo apt install jq
             sudo apt install awscli 
       - setup_remote_docker          
@@ -55,22 +56,25 @@ build_steps: &build_steps
             #chmod +x /home/circleci/project/service/build/deploy.sh
             #/home/circleci/project/service/build/deploy.sh /home/circleci/project /home/circleci/project/service/build ap-review $DEPLOY_APP_ENV
             source awsenvconf
-            ./buildenv.sh -e $DEPLOY_ENV -b ${DEPLOY_ENV}-ap-review-microservice-deployvar
+            ./buildenv.sh -e $DEPLOY_ENV -b ${DEPLOY_ENV}-ap-review-microservice-ecs-deployvar
             source buildenvvar
-            ./master_deploy.sh -d EBS -e $DEPLOY_ENV -t "${DEPLOY_ENV}.${CIRCLE_BUILD_NUM}"
+            #./master_deploy.sh -d EBS -e $DEPLOY_ENV -t "${DEPLOY_ENV}.${CIRCLE_BUILD_NUM}"
+            ./master_deploy.sh -d ECS -e $DEPLOY_ENV -t latest -s ${DEPLOY_ENV}-${APPNAME}-appvar -i ${APPNAME}
 
 jobs:
   "build-dev":
     <<: *java_env
     environment:
       DEPLOY_APP_ENV: "dev"
-      DEPLOY_ENV: "DEV"      
+      DEPLOY_ENV: "DEV"   
+      APPNAME: "ap-review-microservice"   
     steps: *build_steps    
   "build-prod":           
     <<: *java_env
     environment:
       DEPLOY_APP_ENV: "prod"
       DEPLOY_ENV: "PROD" 
+      APPNAME: "ap-review-microservice"
     steps: *build_steps
 
 workflows:
@@ -85,8 +89,11 @@ workflows:
               only: 
                 - dev
                 - dev-msinteg
+                - dev-ecs
       - "build-prod":
           context : org-global
           filters:
             branches:
-              only: master
+              only: 
+                - master
+                - master-ecs

service/build/Dockerfile.template

@@ -1,4 +1,4 @@
-FROM appiriodevops/ap-microservice-base:0.0.1
+FROM appiriodevops/ap-microservice-base:0.0.2
 
 MAINTAINER [email protected]
 

service/build/buildimage.sh

@@ -44,4 +44,5 @@ aws s3 cp "s3://appirio-platform-$ENV/services/common/dockercfg" ~/.dockercfg
 
 echo "Building docker image $DOCKER_REPO/$IMAGE"
 docker build -t $DOCKER_REPO/$IMAGE $DEPLOY_DIR
-
+APPNAME="$SERVICE-microservice"
+docker tag $DOCKER_REPO/$IMAGE $APPNAME:latest

service/src/main/java/com/appirio/service/review/resources/ReviewResource.java

@@ -311,6 +311,16 @@ public ApiResponse deleteReview(@Auth AuthUser user, @PathParam("reviewId") Long
         }
     }
 
+    /**
+     * Health check issue integration
+     */
+    @GET
+	@Path("/health")
+    @Timed
+	public ApiResponse healthcheck() throws Exception {
+    	return ApiResponseFactory.createResponse("health is fine");
+	}
+
     /**
      * This private method checks whether the user has administrator permissions and if the given review exists.
      *