Skip to content
This repository was archived by the owner on Aug 18, 2021. It is now read-only.

Elasticsearch mapping and settings refactor #263

Merged
froi merged 7 commits into from
Sep 19, 2018
Merged

Elasticsearch mapping and settings refactor #263

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
51473a3
Remove old Elasticsearch mapping files
Sep 18, 2018
152ab57
Elasticsearch mappings and filter refactor
Sep 18, 2018
049e50f
Change default Elasticsearch URL to the default URL expected by Ealst…
Sep 18, 2018
c217d5d
Update status index mapping and settings to Elasticsearch 5.x anf abo…
Sep 19, 2018
a19d9da
Updated Elasticsearch mappings and settings for terms index to be com…
Sep 19, 2018
fbbb898
Updated Elasticsearch docker image for integration tests
Sep 19, 2018
6c7948a
Added sleep before running index command as a test to wait for elasti…
Sep 19, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ jobs:
working_directory: ~/code-gov-api
docker:
- image: circleci/node:8.9.3-stretch
- image: elasticsearch:2.4
- image: docker.elastic.co/elasticsearch/elasticsearch:5.6.12
environment:
NODE_ENV: "testing"
steps:
Expand All @@ -95,7 +95,10 @@ jobs:
- ./node_modules
- run:
name: get-data
command: npm run index
command: |
set -x
sleep 45
npm run index
- run:
name: run-test
command: npm run integration-test
Expand Down
4 changes: 2 additions & 2 deletions config/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ function getElasticsearchUri(cloudFoundryEnv) {

return elasticSearchCredentials.uri
? elasticSearchCredentials.uri
: 'http://localhost:9200';
: 'http://elastic:changeme@localhost:9200';
}
return process.env.ES_URI ? process.env.ES_URI : 'http://localhost:9200';
return process.env.ES_URI ? process.env.ES_URI : 'http://elastic:changeme@localhost:9200';
}

/**
Expand Down
340 changes: 340 additions & 0 deletions indexes/repo/mapping.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,340 @@
{
"repo": {
"properties": {
"repoID": {
"type": "keyword",
"normalizer": "lowercase"
},
"agency": {
"type": "object",
"properties": {
"name": {
"type": "text",
"analyzer": "englishfulltext",
"fields": {
"keyword": {
"type": "keyword",
"normalizer": "lowercase"
}
}
},
"acronym": {
"type": "keyword",
"fields": {
"keyword": {
"type": "keyword",
"normalizer": "lowercase"
}
}
},
"website": {
"type": "keyword",
"normalizer": "lowercase"
},
"codeUrl": {
"type": "keyword",
"normalizer": "lowercase"
},
"requirements": {
"type": "nested",
"properties": {
"agencyWidePolicy": {
"type": "float"
},
"openSourceRequirement": {
"type": "float"
},
"inventoryRequirement": {
"type": "float"
},
"schemaFormat": {
"type": "float"
},
"overallCompliance": {
"type": "float"
}
}
}
}
},
"measurementType": {
"type": "object",
"properties": {
"method": {
"type": "keyword"
},
"ifOther": {
"type": "text",
"analyzer": "englishfulltext",
"fields": {
"keyword": {
"type": "keyword",
"normalizer": "lowercase"
}
}
}
}
},
"status": {
"type": "keyword",
"normalizer": "lowercase"
},
"vcs": {
"type": "keyword",
"normalizer": "lowercase"
},
"repositoryURL": {
"type": "keyword"
},
"targetOperatingSystems": {
"type": "keyword",
"normalizer": "lowercase"
},
"name": {
"type": "text",
"analyzer": "englishfulltext",
"fields": {
"keyword": {
"type": "keyword",
"normalizer": "lowercase"
}
}
},
"version": {
"type": "keyword",
"normalizer": "lowercase"
},
"organization": {
"type": "text",
"analyzer": "englishfulltext",
"fields": {
"keyword": {
"type": "keyword",
"normalizer": "lowercase"
}
}
},
"homepageURL": {
"type": "keyword",
"normalizer": "lowercase"
},
"downloadURL": {
"type": "keyword",
"normalizer": "lowercase"
},
"description": {
"type": "text",
"analyzer": "englishfulltext"
},
"events": {
"type": "text",
"analyzer": "englishfulltext",
"fields": {
"keyword": {
"type": "keyword",
"normalizer": "lowercase"
}
}
},
"tags": {
"type": "text",
"analyzer": "englishfulltext",
"fields": {
"keyword": {
"type": "keyword",
"normalizer": "lowercase"
}
}
},
"languages": {
"type": "text",
"analyzer": "englishfulltext",
"fields": {
"_fulltext": {
"type": "keyword",
"normalizer": "lowercase"
}
}
},
"contact": {
"type": "object",
"include_in_root": true,
"properties": {
"name": {
"type": "text",
"analyzer": "englishfulltext",
"fields": {
"keyword": {
"type": "keyword",
"normalizer": "lowercase"
}
}
},
"email": {
"type": "text",
"analyzer": "englishfulltext",
"fields": {
"keyword": {
"type": "keyword",
"normalizer": "lowercase"
}
}
},
"twitter": {
"type": "text",
"analyzer": "englishfulltext",
"fields": {
"keyword": {
"type": "keyword",
"normalizer": "lowercase"
}
}
},
"phone": {
"type": "text",
"analyzer": "englishfulltext",
"fields": {
"keyword": {
"type": "keyword",
"normalizer": "lowercase"
}
}
}
}
},
"partners": {
"type": "nested",
"include_in_root": true,
"properties": {
"name": {
"type": "text",
"analyzer": "englishfulltext",
"fields": {
"keyword": {
"type": "keyword"
}
}
},
"email": {
"type": "text",
"analyzer": "englishfulltext",
"fields": {
"keyword": {
"type": "keyword"
}
}
}
}
},
"permissions": {
"type": "object",
"properties": {
"licenses": {
"type": "nested",
"properties": {
"name": {
"type": "text",
"analyzer": "englishfulltext",
"fields": {
"keyword": {
"type": "keyword",
"normalizer": "lowercase"
}
}
},
"URL": {
"type": "keyword",
"normalizer": "lowercase"
}
}
},
"usageType": {
"type": "text",
"analyzer": "englishfulltext",
"fields": {
"keyword": {
"type": "keyword",
"normalizer": "lowercase"
}
}
},
"exemptionText": {
"type": "text",
"analyzer": "englishfulltext"
}
}
},
"laborHours": {
"type": "integer"
},
"relatedCode": {
"type": "nested",
"properties": {
"name": {
"type": "text",
"analyzer": "englishfulltext",
"fields": {
"keyword": {
"type": "keyword",
"normalizer": "lowercase"
}
}
},
"URL": {
"type": "keyword",
"normalizer": "lowercase"
}
}
},
"reusedCode": {
"type": "nested",
"properties": {
"name": {
"type": "text",
"analyzer": "englishfulltext",
"fields": {
"keyword": {
"type": "keyword",
"normalizer": "lowercase"
}
}
},
"URL": {
"type": "keyword",
"normalizer": "lowercase"
}
}
},
"disclaimerURL": {
"type": "keyword",
"normalizer": "lowercase"
},
"disclaimerText": {
"type": "text",
"analyzer": "englishfulltext"
},
"additionalInformation": {
"type": "object",
"dynamic": true
},
"date": {
"type": "nested",
"include_in_root": true,
"properties": {
"created": {
"type": "date",
"ignore_malformed": true
},
"lastModified": {
"type": "date",
"ignore_malformed": true
},
"metadataLastUpdated": {
"type": "date",
"ignore_malformed": true
}
}
}
}
}
}
Loading