Merge pull request #10 from hypertrace/remove_entity_service_configurationCommands

Entity serivce changes to move configs to config-bootstrapper docker …

Author: samarth-gupta-traceable

entity-service/src/main/resources/configs/common/application.conf

@@ -11,8 +11,58 @@ entity.service.config = {
     }
   }
 }
-# This should be completely driven based on config given in app packaging.
-entity.service.attributeMap = []
+entity.service.attributeMap = [
+  {
+    "scope": "API",
+    "name": "API.id",
+    "subDocPath": "entityId"
+  },
+  {
+    "scope": "API",
+    "name": "API.name",
+    "subDocPath": "entityName"
+  },
+  {
+    "scope": "API",
+    "name": "API.apiType",
+    "subDocPath": "attributes.API_TYPE"
+  },
+  {
+    "scope": "API",
+    "name": "API.httpMethod",
+    "subDocPath": "attributes.http_method"
+  },
+  {
+    "scope": "API",
+    "name": "API.httpUrl",
+    "subDocPath": "attributes.API_NAME"
+  },
+  {
+    "scope": "API",
+    "name": "API.serviceId",
+    "subDocPath": "attributes.SERVICE_ID"
+  },
+  {
+    "scope": "API",
+    "name": "API.createdTime",
+    "subDocPath": "createdTime"
+  },
+  {
+    "scope": "API",
+    "name": "API.apiDiscoveryState",
+    "subDocPath": "attributes.api_discovery_state"
+  },
+  {
+    "scope": "SERVICE",
+    "name": "SERVICE.id",
+    "subDocPath": "entityId"
+  },
+  {
+    "scope": "SERVICE",
+    "name": "SERVICE.name",
+    "subDocPath": "entityName"
+  }
+]
 
 metrics.reporter {
   prefix = org.hypertrace.entity.service.EntityService

helm/Chart.yaml

@@ -24,4 +24,4 @@ version: 0.1.0
 dependencies:
   - name: config-bootstrapper
     repository: "https://storage.googleapis.com/hypertrace-helm-charts"
-    version: 0.1.0
+    version: 0.1.7

helm/configs/1_entityrelationshiptypes.conf

@@ -1,17 +1,13 @@
+{{- if ( index .Values "config-bootstrapper" "configurationCommands" ) }}
 apiVersion: v1
 kind: ConfigMap
 metadata:
   name: {{ index .Values "config-bootstrapper" "job" "prefix" }}-bootstrap-configs
   labels:
     release: {{ .Release.Name }}
 data:
-{{- range $path, $bytes := .Files.Glob "configs/**" }}
-{{- $name := base ($path) }}
-{{ tpl ($.Files.Glob (printf "configs/%s" $name)).AsConfig $ | indent 2 }}
-{{- end }}
-{{- if .Values.configurationCommands }}
-  {{ uuidv4 }}: |
-{{- range $key, $value := .Values.configurationCommands }}
+{{- range $key, $value := ( index .Values "config-bootstrapper" "configurationCommands" ) }}
+  {{ $key }}: |
 {{ $value | indent 4 }}
 {{- end }}
 {{- end }}

helm/configs/1_entitytypes.conf

@@ -80,38 +80,7 @@ entityServiceConfig:
     mongoHost: mongo
     mongoUrl: ""
 
-attributes:
-  - scope: API
-    name: API.id
-    subDocPath: entityId
-  - scope: API
-    name: API.name
-    subDocPath: entityName
-  - scope: API
-    name: API.apiType
-    subDocPath: attributes.API_TYPE
-  - scope: API
-    name: API.httpMethod
-    subDocPath: attributes.http_method
-  - scope: API
-    name: API.httpUrl
-    subDocPath: attributes.API_NAME
-  - scope: API
-    name: API.serviceId
-    subDocPath: attributes.SERVICE_ID
-  - scope: API
-    name: API.createdTime
-    subDocPath: createdTime
-  - scope: API
-    name: API.apiDiscoveryState
-    subDocPath: attributes.api_discovery_state
-  - scope: SERVICE
-    name: SERVICE.id
-    subDocPath: entityId
-  - scope: SERVICE
-    name: SERVICE.name
-    subDocPath: entityName
-
+attributes: []
 extraAttributes: []
 
 logConfig:
@@ -126,5 +95,4 @@ logConfig:
 config-bootstrapper:
   job:
     prefix: entity
-
-configurationCommands: {}
+  configurationCommands: {}