Merge pull request #20 from appirio-tech/dev

Merge to master (mainstreaming postgres to master)

Author: nkumar-topcoder

.circleci/config.yml

@@ -14,7 +14,7 @@ install_dependency: &install_dependency
 install_deploysuite_latest: &install_deploysuite_latest
           name: Installation of install_deploysuite.
           command: |
-            git clone --branch v1.4.1 https://github.com/topcoder-platform/tc-deploy-scripts ../buildscript
+            git clone --branch master https://github.com/topcoder-platform/tc-deploy-scripts ../buildscript
             cp ./../buildscript/master_deploy.sh .
             cp ./../buildscript/buildenv.sh .
             cp ./../buildscript/awsconfiguration.sh .
@@ -97,15 +97,15 @@ build_deploy_steps: &build_deploy_steps
           name: Build Image
           command: |
             echo "Building image"
-            ./build/build-image.sh /home/circleci/project $LOGICAL_ENV
+            ./build/build-image.sh /home/circleci/project $PLATFORM_ENV
       - run:
           name: Deploying Application.
           command: |
             pwd
             source awsenvconf
             source buildenvvar
-            # ./master_deploy.sh -d EBS -e $DEPLOY_ENV -t "${LOGICAL_ENV}.${VER}"
-            ./master_deploy.sh -d ECS -e $DEPLOY_ENV -t "${LOGICAL_ENV}.${VER}" -s ${LOGICAL_ENV}_identity_ecs_appvar -i ap-identity-microservice
+            # ./master_deploy.sh -d EBS -e $DEPLOY_ENV -t "${PLATFORM_ENV}.${VER}"
+            ./master_deploy.sh -d ECS -e $DEPLOY_ENV -t "${PLATFORM_ENV}.${VER}" -s ${LOGICAL_ENV}_identity_ecs_appvar -i ap-identity-microservice
 
 
 jobs:
@@ -114,15 +114,25 @@ jobs:
     <<: *defaults
     environment:
       DEPLOY_ENV: "DEV"
-      LOGICAL_ENV: "dev"
+      LOGICAL_ENV: "dev-pg"
+      PLATFORM_ENV: "dev"
     steps: *build_deploy_steps
+    
+  "build-dev-pg":
+    <<: *defaults
+    environment:
+      DEPLOY_ENV: "DEV"
+      LOGICAL_ENV: "test-pg"
+      TEMP_ENV: "dev"
+    steps: *build_deploy_steps  
 
   # Build & Deploy against development backend
   "build-prod":
     <<: *defaults
     environment:
       DEPLOY_ENV: "PROD"
-      LOGICAL_ENV: "prod"
+      LOGICAL_ENV: "prod_pg"
+      PLATFORM_ENV: "prod"
     steps: *build_deploy_steps
 
 
@@ -135,8 +145,7 @@ workflows:
           context : org-global
           filters:
             branches:
-              only: [dev, test]
-
+              only: [dev, test,dev-pg]              
       # Production build is executed on "master" branch only.
       - "build-prod":
           context : org-global

.gitignore

@@ -1 +1,40 @@
+node_modules
+*.log
+env_producer.sh
+env_consumer.sh
+*.env
+*.sh
+*.list
+service/build/*.jar
+service/build/*.yaml
+service/build/*.json
+service/build/*.conf
+.classpath
+.settings
+.project
+.env
+service/target/*
+.settings
+service/dependency-reduced-pom.xml
+service/*.iml
+*.keystore
+*.ipr
+*.iws
+*.project
+*.classpath
+*.prefs
+*.component
+*.settings/
+target/
+ap-core-service-tests.log
 .idea
+*.keystore
+token.properties
+*.iml
+*.jar
+src/main/resources/config-james.yml
+src/main/resources/shiro-james.ini
+.DS_Store
+.idea
+docker/dump.rdb
+src/main/resources/config.yml.tt

build/config/newrelic-template.yml

@@ -13,7 +13,7 @@ common: &default_settings
   # account. For example, if your license key is 12345 use this:
   # license_key: '12345'
   # The key binds your Agent's data to your account in the New Relic service.
-  license_key: '12c8fadc3bfc2c3c67d08b397f020e512f0ba3fc'
+  license_key: '12345'
 
   # Agent Enabled
   # Use this setting to disable the agent instead of removing it from the startup command.
@@ -284,4 +284,4 @@ qa:
 
 prod:
   <<: *default_settings
-  app_name: Identity Service (Prod)
+  app_name: Identity Service (Prod)

docker/README.md

@@ -98,7 +98,8 @@ Run Identity service with the following comamnd-line.
 Configure your IDE with the following information if you want to run/debug on it.
 
 - Main class: com.appirio.tech.core.service.identity.IdentityApplication
-- Arguments: server target/classes/config.yml
+-
+Arguments: server target/classes/config.yml
 - Environment variables:
     - DOCKER_IP=[YOUR DOCKER'S IP ADRESS]
     - ZOOKEEPER_HOSTS_LIST=[YOUR DOCKER'S IP ADRESS]:2181

pom.xml

@@ -168,9 +168,9 @@
       <version>3.2.1</version>
     </dependency>
     <dependency>
-        <groupId>com.informix.jdbc</groupId>
-        <artifactId>com.springsource.com.informix.jdbc</artifactId>
-        <version>3.0.0.JC3</version>
+      <groupId>org.postgresql</groupId>
+      <artifactId>postgresql</artifactId>
+      <version>42.2.8</version>
     </dependency>
     <dependency>
         <groupId>redis.clients</groupId>

src/main/docker/Dockerfile

@@ -19,8 +19,8 @@ COPY TC.prod.ldap.keystore ./TC.prod.ldap.keystore
 
 COPY run-service.sh ./run-service.sh
 
-RUN yum install wget -y; \
-wget -O dd-java-agent.jar 'https://search.maven.org/classic/remote_content?g=com.datadoghq&a=dd-java-agent&v=LATEST'
+#RUN yum install wget -y; \
+#wget -O dd-java-agent.jar 'https://search.maven.org/classic/remote_content?g=com.datadoghq&a=dd-java-agent&v=LATEST'
 
 CMD ["/bin/bash", "/data/run-service.sh"]
 

src/main/docker/run-service.sh

@@ -5,7 +5,8 @@ if [ "$AP_ENV" = "prod" ]
 then
 	java -Dnewrelic.environment=$AP_ENV -javaagent:/data/dd-java-agent.jar -Ddd.agent.host=$DD_TRACE_AGENT_HOSTNAME -Ddd.agent.port=8126 -Ddd.service.name=$DD_SERVICE_NAME -javaagent:$NEWRELIC_JAR -Djavax.net.ssl.trustStore=/data/TC.prod.ldap.keystore -DZOOKEEPER_HOSTS_LIST=$ZOOKEEPER_HOSTS_LIST -jar /data/tech.core.service.identity.jar server /data/config.yml
 else
-	java -javaagent:/data/dd-java-agent.jar -Ddd.agent.host=$DD_TRACE_AGENT_HOSTNAME -Ddd.agent.port=8126 -Ddd.service.name=$DD_SERVICE_NAME -Djavax.net.ssl.trustStore=/data/TC.prod.ldap.keystore -DZOOKEEPER_HOSTS_LIST=$ZOOKEEPER_HOSTS_LIST -jar /data/tech.core.service.identity.jar server /data/config.yml
+	#java -javaagent:/data/dd-java-agent.jar -Ddd.agent.host=$DD_TRACE_AGENT_HOSTNAME -Ddd.agent.port=8126 -Ddd.service.name=$DD_SERVICE_NAME -Djavax.net.ssl.trustStore=/data/TC.prod.ldap.keystore -DZOOKEEPER_HOSTS_LIST=$ZOOKEEPER_HOSTS_LIST -jar /data/tech.core.service.identity.jar server /data/config.yml
+	java -Djavax.net.ssl.trustStore=/data/TC.prod.ldap.keystore -DZOOKEEPER_HOSTS_LIST=$ZOOKEEPER_HOSTS_LIST -jar /data/tech.core.service.identity.jar server /data/config.yml
 fi
 
 

src/main/java/com/appirio/tech/core/service/identity/IdentityApplication.java

@@ -176,7 +176,7 @@ public void run(IdentityConfiguration configuration, Environment environment) th
 
 		// JDBI based DAOs
 		final DBIFactory factory = new DBIFactory();
-		final DBI jdbi = factory.build(environment, configuration.getDataSourceFactory(), "common_oltp");
+		final DBI jdbi = factory.build(environment, configuration.getDataSourceFactory(), "postgresql");
 		jdbi.registerArgumentFactory(new TCIDArgumentFactory());
 		final UserDAO userDao = jdbi.onDemand(UserDAO.class);
 		final IdentityProviderDAO identityProviderDAO = jdbi.onDemand(IdentityProviderDAO.class);

src/main/java/com/appirio/tech/core/service/identity/dao/EmailDAO.java

@@ -21,30 +21,30 @@ public abstract class EmailDAO implements Transactional<EmailDAO> {
 
 	@RegisterMapperFactory(TCBeanMapperFactory.class)
 	@SqlQuery(
-		"SELECT " + EMAIL_COLUMNS + " FROM email e WHERE user_id = :userId and email_type_id = :typeId"
+		"SELECT " + EMAIL_COLUMNS + " FROM common_oltp.email e WHERE user_id = :userId and email_type_id = :typeId"
 	)
 	protected abstract Email findEmail(@Bind("userId") long userId, @Bind("typeId") int typeId);
 
 	@SqlQuery(
-		"SELECT COUNT(user_id) FROM email WHERE LOWER(address)=LOWER(:email)"
+		"SELECT COUNT(user_id) FROM common_oltp.email WHERE LOWER(address)=LOWER(:email)"
 	)
 	protected abstract int countEmail(@Bind("email") String email);
 
 	@SqlUpdate(
-		"INSERT INTO email " +
+		"INSERT INTO common_oltp.email " +
 		"(user_id, email_id, email_type_id, address, primary_ind, status_id) VALUES " +
 		"(:userId, :emailId, 1, :email, 1, :statusId)")
 	protected abstract int createEmail(@Bind("userId") long userId, @Bind("emailId") long emailId, @Bind("email") String email, @Bind("statusId") int statusId);
 
 	@SqlUpdate(
-		"UPDATE email SET " +
-		"email_type_id = :e.typeId, address = :e.address, primary_ind = DECODE(:e.typeId, 1, 1, 0) " +
+		"UPDATE common_oltp.email SET " +
+		"email_type_id = :e.typeId, address = :e.address, primary_ind = (CASE WHEN :e.typeId = 1 THEN 1 ELSE 0 END) " +
 		"WHERE email_id = :e.id"
 	)
 	protected abstract int updateEmail(@BindBean("e") Email email); 
 
 	@SqlUpdate(
-		"UPDATE email SET status_id = 1 WHERE user_id = :userId AND email_type_id = 1"
+		"UPDATE common_oltp.email SET status_id = 1 WHERE user_id = :userId AND email_type_id = 1"
 	)
 	protected abstract int activateEmail(@Bind("userId") long userId);
 

src/main/java/com/appirio/tech/core/service/identity/dao/GroupInformixDAO.java

@@ -28,7 +28,7 @@ public abstract class GroupInformixDAO implements Transactional<GroupInformixDAO
      * @return the int value
      */
     @RegisterMapperFactory(TCBeanMapperFactory.class)
-    @SqlUpdate("INSERT INTO security_groups ("
+    @SqlUpdate("INSERT INTO common_oltp.security_groups ("
             + "group_id, description, create_user_id"
             + ") VALUES ("
             + ":g.id, :g.name, :g.createUserId)")
@@ -44,7 +44,7 @@ public abstract class GroupInformixDAO implements Transactional<GroupInformixDAO
     @RegisterMapperFactory(TCBeanMapperFactory.class)
     @SqlQuery(
             "SELECT group_id as id, description as name, create_user_id as createUserId " +
-            "FROM security_groups WHERE description = :name"
+            "FROM common_oltp.security_groups WHERE description = :name"
     )
     public abstract SecurityGroup findGroupByName(@Bind("name") String name);
 
@@ -57,7 +57,7 @@ public abstract class GroupInformixDAO implements Transactional<GroupInformixDAO
     @RegisterMapperFactory(TCBeanMapperFactory.class)
     @SqlQuery(
             "SELECT group_id as id, description as name, create_user_id as createUserId " +
-            "FROM security_groups WHERE group_id = :id"
+            "FROM common_oltp.security_groups WHERE group_id = :id"
     )
     public abstract SecurityGroup findGroupById(@Bind("id") long id);
 }