copy referenceSchema.json

Financial-Times · Sep 6, 2018 · 48d448a · 48d448a
1 parent 3f32e49
commit 48d448a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -29,5 +29,6 @@ FROM scratch
 WORKDIR /
 COPY --from=0 /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
 COPY --from=0 /artifacts/* /
+COPY ./runtime/referenceSchema.json /
 
 CMD [ "/content-rw-elasticsearch" ]
diff --git a/es/service.go b/es/service.go
@@ -52,7 +52,7 @@ func (service *Service) GetSchemaHealth() (string, error) {
 	if referenceIndex == nil {
 		referenceIndex = new(elasticIndex)
 
-		referenceJSON, err := ioutil.ReadFile("runtime/referenceSchema.json")
+		referenceJSON, err := ioutil.ReadFile("referenceSchema.json")
 		if err != nil {
 			return "", err
 		}
@@ -61,6 +61,9 @@ func (service *Service) GetSchemaHealth() (string, error) {
 		if err != nil {
 			return "", err
 		}
+		if referenceIndex.index[service.IndexName] == nil || referenceIndex.index[service.IndexName].Settings == nil || referenceIndex.index[service.IndexName].Mappings == nil {
+			return "not ok, wrong referenceIndex", nil
+		}
 	}
 
 	if service.ElasticClient == nil {
@@ -80,13 +83,6 @@ func (service *Service) GetSchemaHealth() (string, error) {
 		delete(settings, "created")
 	}
 
-	if liveIndex[service.IndexName] == nil || liveIndex[service.IndexName].Settings == nil {
-		return "not ok, wrong response from ES", nil
-	}
-	if referenceIndex.index[service.IndexName] == nil || referenceIndex.index[service.IndexName].Settings == nil {
-		return "not ok, wrong referenceIndex", nil
-	}
-
 	if !reflect.DeepEqual(liveIndex[service.IndexName].Settings, referenceIndex.index[service.IndexName].Settings) {
 		return "not ok, wrong settings", nil
 	}