Skip to content

Commit 2a8d6c4

Browse files
rowanseymourrowanseymour
authored
Merge pull request nyaruka#35 from nyaruka/cleanup
🧹 Cleanup
2 parents d002366 + db35672 commit 2a8d6c4

File tree

6 files changed

+201
-256
lines changed

6 files changed

+201
-256
lines changed

‎.github/workflows/ci.yml

+6-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
name: CI
22
on: [push, pull_request]
3+
env:
4+
go-version: '1.16.x'
5+
es-version: '7.10.1'
36
jobs:
47
test:
58
name: Test
@@ -14,7 +17,7 @@ jobs:
1417
- name: Install ElasticSearch
1518
uses: nyaruka/elasticsearch-action@master
1619
with:
17-
elastic version: '7.10.1'
20+
elastic version: ${{ env.es-version }}
1821

1922
- name: Install PostgreSQL
2023
uses: harmon758/postgresql-action@v1
@@ -27,7 +30,7 @@ jobs:
2730
- name: Install Go
2831
uses: actions/setup-go@v1
2932
with:
30-
go-version: 1.15.x
33+
go-version: ${{ env.go-version }}
3134

3235
- name: Run tests
3336
run: go test -p=1 -coverprofile=coverage.text -covermode=atomic ./...
@@ -50,7 +53,7 @@ jobs:
5053
- name: Install Go
5154
uses: actions/setup-go@v1
5255
with:
53-
go-version: 1.15.x
56+
go-version: ${{ env.go-version }}
5457

5558
- name: Publish release
5659
uses: goreleaser/goreleaser-action@v1

‎contacts/index_settings.json

+183
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,183 @@
1+
{
2+
"settings": {
3+
"index": {
4+
"number_of_shards": 2,
5+
"number_of_replicas": 1,
6+
"routing_partition_size": 1
7+
},
8+
"analysis": {
9+
"analyzer": {
10+
"trigrams": {
11+
"type": "custom",
12+
"tokenizer": "trigram",
13+
"filter": [
14+
"lowercase"
15+
]
16+
},
17+
"locations": {
18+
"tokenizer": "location_tokenizer",
19+
"filter": [
20+
"lowercase",
21+
"word_delimiter"
22+
]
23+
},
24+
"prefix": {
25+
"type": "custom",
26+
"tokenizer": "standard",
27+
"filter": [
28+
"lowercase",
29+
"prefix_filter"
30+
]
31+
},
32+
"name_search": {
33+
"type": "custom",
34+
"tokenizer": "standard",
35+
"filter": [
36+
"lowercase",
37+
"max_length"
38+
]
39+
}
40+
},
41+
"tokenizer": {
42+
"location_tokenizer": {
43+
"type": "pattern",
44+
"pattern": "(.* > )?([^>]+)",
45+
"group": 2
46+
},
47+
"trigram": {
48+
"type": "ngram",
49+
"min_gram": 3,
50+
"max_gram": 3
51+
}
52+
},
53+
"normalizer": {
54+
"lowercase": {
55+
"type": "custom",
56+
"char_filter": [],
57+
"filter": [
58+
"lowercase",
59+
"trim"
60+
]
61+
}
62+
},
63+
"filter": {
64+
"prefix_filter": {
65+
"type": "edge_ngram",
66+
"min_gram": 2,
67+
"max_gram": 8
68+
},
69+
"max_length": {
70+
"type": "truncate",
71+
"length": 8
72+
}
73+
}
74+
}
75+
},
76+
"mappings": {
77+
"_doc": {
78+
"_routing": {
79+
"required": true
80+
},
81+
"properties": {
82+
"fields": {
83+
"type": "nested",
84+
"properties": {
85+
"field": {
86+
"type": "keyword"
87+
},
88+
"text": {
89+
"type": "keyword",
90+
"normalizer": "lowercase"
91+
},
92+
"number": {
93+
"type": "scaled_float",
94+
"scaling_factor": 10000
95+
},
96+
"datetime": {
97+
"type": "date"
98+
},
99+
"state": {
100+
"type": "text",
101+
"analyzer": "locations"
102+
},
103+
"state_keyword": {
104+
"type": "keyword",
105+
"normalizer": "lowercase"
106+
},
107+
"district": {
108+
"type": "text",
109+
"analyzer": "locations"
110+
},
111+
"district_keyword": {
112+
"type": "keyword",
113+
"normalizer": "lowercase"
114+
},
115+
"ward": {
116+
"type": "text",
117+
"analyzer": "locations"
118+
},
119+
"ward_keyword": {
120+
"type": "keyword",
121+
"normalizer": "lowercase"
122+
}
123+
}
124+
},
125+
"urns": {
126+
"type": "nested",
127+
"properties": {
128+
"path": {
129+
"type": "text",
130+
"analyzer": "trigrams",
131+
"fields": {
132+
"keyword": {
133+
"type": "keyword",
134+
"normalizer": "lowercase"
135+
}
136+
}
137+
},
138+
"scheme": {
139+
"type": "keyword",
140+
"normalizer": "lowercase"
141+
}
142+
}
143+
},
144+
"groups": {
145+
"type": "keyword"
146+
},
147+
"uuid": {
148+
"type": "keyword"
149+
},
150+
"status": {
151+
"type": "keyword"
152+
},
153+
"language": {
154+
"type": "keyword",
155+
"normalizer": "lowercase"
156+
},
157+
"modified_on": {
158+
"type": "date"
159+
},
160+
"created_on": {
161+
"type": "date"
162+
},
163+
"modified_on_mu": {
164+
"type": "long"
165+
},
166+
"last_seen_on": {
167+
"type": "date"
168+
},
169+
"name": {
170+
"type": "text",
171+
"analyzer": "prefix",
172+
"search_analyzer": "name_search",
173+
"fields": {
174+
"keyword": {
175+
"type": "keyword",
176+
"normalizer": "lowercase"
177+
}
178+
}
179+
}
180+
}
181+
}
182+
}
183+
}

‎go.mod

+2-5
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,8 @@ require (
99
github.com/nyaruka/ezconf v0.2.1
1010
github.com/nyaruka/gocommon v1.3.0
1111
github.com/olivere/elastic/v7 v7.0.22
12-
github.com/onsi/ginkgo v1.14.0 // indirect
13-
github.com/sirupsen/logrus v1.0.5
12+
github.com/sirupsen/logrus v1.8.1
1413
github.com/stretchr/testify v1.5.1
15-
gopkg.in/airbrake/gobrake.v2 v2.0.9 // indirect
16-
gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2 // indirect
1714
)
1815

19-
go 1.13
16+
go 1.16

0 commit comments

Comments
 (0)