Merge pull request #57 from topcoder-platform/develop

Sync master with develop

Author: callmekatootie

.gitignore

@@ -6,3 +6,4 @@ scripts/generate
 .nyc_output
 .env
 coverage
+.vscode

README.md

@@ -5,7 +5,7 @@
 - node 12.x
 - npm 6.x
 - docker
-- elasticsearch 6.x
+- elasticsearch 7.7
 
 ## Configuration
 
@@ -35,12 +35,24 @@ Configuration for the application is at config/default.js and config/production.
 - UBAHN_UPDATE_TOPIC: Kafka topic for update message
 - UBAHN_DELETE_TOPIC: Kafka topic for delete message
 - UBAHN_AGGREGATE_TOPIC: Kafka topic that is used to combine all create, update and delete message(s)
-- ES.HOST: Elasticsearch host
-- ES.API_VERSION: Elasticsearch API version
+- ES_HOST: Elasticsearch host
 - ES.DOCUMENTS: Elasticsearch index, type and id mapping for resources.
+- ATTRIBUTE_GROUP_PIPELINE_ID: The pipeline id for enrichment with attribute group. Default is `attributegroup-pipeline`
+- SKILL_PROVIDER_PIPELINE_ID: The pipeline id for enrichment with skill provider. Default is `skillprovider-pipeline`
+- USER_PIPELINE_ID: The pipeline id for enrichment of user details. Default is `user-pipeline`
+- ATTRIBUTE_GROUP_ENRICH_POLICYNAME: The enrich policy for attribute group. Default is `attributegroup-policy`
+- SKILL_PROVIDER_ENRICH_POLICYNAME: The enrich policy for skill provider. Default is `skillprovider-policy`
+- ROLE_ENRICH_POLICYNAME: The enrich policy for role. Default is `role-policy`
+- ACHIEVEMENT_PROVIDER_ENRICH_POLICYNAME: The enrich policy for achievement provider. Default is `achievementprovider-policy`
+- SKILL_ENRICH_POLICYNAME: The enrich policy for skill. Default is `skill-policy`
+- ATTRIBUTE_ENRICH_POLICYNAME: The enrich policy for skill. Default is `attribute-policy`
+- ELASTICCLOUD_ID: The elastic cloud id, if your elasticsearch instance is hosted on elastic cloud. DO NOT provide a value for ES_HOST if you are using this
+- ELASTICCLOUD_USERNAME: The elastic cloud username for basic authentication. Provide this only if your elasticsearch instance is hosted on elastic cloud
+- ELASTICCLOUD_PASSWORD: The elastic cloud password for basic authentication. Provide this only if your elasticsearch instance is hosted on elastic cloud
 
 For `ES.DOCUMENTS` configuration, you will find multiple other configurations below it. Each has default values that you can override using the environment variables
 
+
 ## Local deployment
 
 Setup your Elasticsearch instance and ensure that it is up and running.

config/default.js

@@ -50,41 +50,57 @@ module.exports = {
 
   // ElasticSearch
   ES: {
-    HOST: process.env.ES_HOST || 'localhost:9200',
-    API_VERSION: process.env.ES_API_VERSION || '7.4',
+    HOST: process.env.ES_HOST || 'http://localhost:9200',
+
+    ELASTICCLOUD: {
+      id: process.env.ELASTICCLOUD_ID,
+      username: process.env.ELASTICCLOUD_USERNAME,
+      password: process.env.ELASTICCLOUD_PASSWORD
+    },
+
     // es mapping: _index, _type, _id
     DOCUMENTS: {
       achievementprovider: {
         index: process.env.ACHIEVEMENT_PROVIDER_INDEX || 'achievement_provider',
-        type: '_doc'
+        type: '_doc',
+        enrichPolicyName: process.env.ACHIEVEMENT_PROVIDER_ENRICH_POLICYNAME || 'achievementprovider-policy'
       },
       attribute: {
         index: process.env.ATTRIBUTE_INDEX || 'attribute',
-        type: '_doc'
+        type: '_doc',
+        enrichPolicyName: process.env.ATTRIBUTE_ENRICH_POLICYNAME || 'attribute-policy'
       },
       attributegroup: {
         index: process.env.ATTRIBUTE_GROUP_INDEX || 'attribute_group',
-        type: '_doc'
+        type: '_doc',
+        pipelineId: process.env.ATTRIBUTE_GROUP_PIPELINE_ID || 'attributegroup-pipeline',
+        enrichPolicyName: process.env.ATTRIBUTE_GROUP_ENRICH_POLICYNAME || 'attributegroup-policy'
       },
       organization: {
         index: process.env.ORGANIZATION_INDEX || 'organization',
-        type: '_doc'
+        type: '_doc',
+        enrichPolicyName: process.env.ORGANIZATION_ENRICH_POLICYNAME || 'organization-policy'
       },
       role: {
         index: process.env.ROLE_INDEX || 'role',
-        type: '_doc'
+        type: '_doc',
+        enrichPolicyName: process.env.ROLE_ENRICH_POLICYNAME || 'role-policy'
       },
       skill: {
         index: process.env.SKILL_INDEX || 'skill',
-        type: '_doc'
+        type: '_doc',
+        enrichPolicyName: process.env.SKILL_ENRICH_POLICYNAME || 'skill-policy'
       },
       skillprovider: {
         index: process.env.SKILL_PROVIDER_INDEX || 'skill_provider',
-        type: '_doc'
+        type: '_doc',
+        pipelineId: process.env.SKILL_PROVIDER_PIPELINE_ID || 'skillprovider-pipeline',
+        enrichPolicyName: process.env.SKILL_PROVIDER_ENRICH_POLICYNAME || 'skillprovider-policy'
       },
       user: {
         index: process.env.USER_INDEX || 'user',
-        type: '_doc'
+        type: '_doc',
+        pipelineId: process.env.USER_PIPELINE_ID || 'user-pipeline'
       },
       // sub resources under user
       achievement: {