markusthoemmes commented on a change in pull request #3421: Add ElasticSearch Log Store URL: https://github.com/apache/incubator-openwhisk/pull/3421#discussion_r177029998
########## File path: tests/src/test/scala/whisk/core/containerpool/logging/ElasticSearchLogStoreTests.scala ########## @@ -0,0 +1,237 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package whisk.core.containerpool.logging + +import java.time.ZonedDateTime + +import akka.NotUsed +import akka.actor.ActorSystem +import akka.http.scaladsl.model._ +import akka.http.scaladsl.model.HttpMethods.GET +import akka.http.scaladsl.unmarshalling.Unmarshal +import akka.http.scaladsl.model.headers.{Accept, RawHeader} +import akka.http.scaladsl.marshallers.sprayjson.SprayJsonSupport._ +import akka.stream.scaladsl.Flow +import akka.stream.{ActorMaterializer, StreamTcpException} +import akka.testkit.TestKit + +import common.StreamLogging + +import org.junit.runner.RunWith +import org.scalatest.{FlatSpecLike, Matchers} +import org.scalatest.concurrent.ScalaFutures +import org.scalatest.junit.JUnitRunner +import org.scalatest.BeforeAndAfterEach + +import pureconfig.error.ConfigReaderException + +import spray.json._ + +import whisk.core.entity._ +import whisk.core.entity.size._ + +import scala.concurrent.duration._ +import scala.concurrent.{Await, ExecutionContext, Future, Promise} +import scala.util.{Failure, Success, Try} + +@RunWith(classOf[JUnitRunner]) +class ElasticSearchLogStoreTests + extends TestKit(ActorSystem("ElasticSearchLogStore")) + with FlatSpecLike + with Matchers + with ScalaFutures + with StreamLogging + with BeforeAndAfterEach { + + implicit val ec: ExecutionContext = system.dispatcher + implicit val materializer: ActorMaterializer = ActorMaterializer() + + private val user = Identity(Subject(), EntityName("testSpace"), AuthKey(), Set()) + private val activationId = ActivationId.generate() + + private val defaultConfig = + ElasticSearchLogStoreConfig( + "https", + "host", + 443, + "/whisk_user_logs/_search", + "user_logs", + "activationId_str", + "stream_str", + "action_str") + private val defaultConfigRequiredHeaders = + ElasticSearchLogStoreConfig( + "https", + "host", + 443, + "/whisk_user_logs/_search", + "user_logs", + "activationId_str", + "stream_str", + "action_str", + "x-auth-token,x-auth-project-id") + private val defaultHeaders: List[HttpHeader] = List(Accept(MediaTypes.`application/json`)) + private val defaultHttpResponse = HttpResponse( + StatusCodes.OK, + entity = HttpEntity( + ContentTypes.`application/json`, + s"""{"took":799,"timed_out":false,"_shards":{"total":204,"successful":204,"failed":0},"hits":{"total":2,"max_score":null,"hits":[{"_index":"logstash-2018.03.05.02","_type":"user_logs","_id":"1c00007f-ecb9-4083-8d2e-4d5e2849621f","_score":null,"_source":{"time_date":"2018-03-05T02:10:38.196689522Z","accountId":null,"message":"some log stuff\\n","type":"user_logs","event_uuid":"1c00007f-ecb9-4083-8d2e-4d5e2849621f","activationId_str":"$activationId","action_str":"[email protected]/logs","tenantId":"tenantId","logmet_cluster":"topic1-elasticsearch_1","@timestamp":"2018-03-05T02:11:37.687Z","@version":"1","stream_str":"stdout","timestamp":"2018-03-05T02:10:39.131Z"},"sort":[1520215897687]},{"_index":"logstash-2018.03.05.02","_type":"user_logs","_id":"14c2a5b7-8cad-4ec0-992e-70fab1996465","_score":null,"_source":{"time_date":"2018-03-05T02:10:38.196754258Z","accountId":null,"message":"more logs\\n","type":"user_logs","event_uuid":"14c2a5b7-8cad-4ec0-992e-70fab1996465","activationId_str":"$activationId","action_str":"[email protected]/logs","tenantId":"tenant","logmet_cluster":"topic1-elasticsearch_1","@timestamp":"2018-03-05T02:11:37.701Z","@version":"1","stream_str":"stdout","timestamp":"2018-03-05T02:10:39.131Z"},"sort":[1520215897701]}]}}""")) + private val defaultHttpRequest = HttpRequest(method = GET, uri = "https://some.url";, entity = HttpEntity.Empty) + private val defaultPayload = JsObject( + "query" -> JsObject( + "query_string" -> JsObject("query" -> JsString( + s"_type: ${defaultConfig.logMessageField} AND ${defaultConfig.activationIdField}: $activationId"))), + "sort" -> JsArray(JsObject("time_date" -> JsObject("order" -> JsString("asc"))))).compactPrint + private val defaultUri = Uri(s"/whisk_user_logs/_search") + + private var expectedHeaders: List[HttpHeader] = defaultHeaders + private var expectedHttpResponse = defaultHttpResponse + private val expectedLogs = ActivationLogs( + Vector("2018-03-05T02:10:38.196689522Z stdout: some log stuff", "2018-03-05T02:10:38.196754258Z stdout: more logs")) + private var expectedPayload = defaultPayload + private var expectedUri = defaultUri + + private val activation = WhiskActivation( + namespace = EntityPath("namespace"), + name = EntityName("name"), + Subject(), + activationId = activationId, + start = ZonedDateTime.now.toInstant, + end = ZonedDateTime.now.toInstant, + response = ActivationResponse.success(Some(JsObject("res" -> JsNumber(1)))), + logs = expectedLogs, + annotations = Parameters("limits", ActionLimits(TimeLimit(1.second), MemoryLimit(128.MB), LogLimit(1.MB)).toJson)) + + private val testFlow + : Flow[(HttpRequest, Promise[HttpResponse]), (Try[HttpResponse], Promise[HttpResponse]), NotUsed] = + Flow[(HttpRequest, Promise[HttpResponse])] + .mapAsyncUnordered(1) { + case (request, userContext) => + request.headers shouldBe expectedHeaders + request.uri shouldBe expectedUri + + Unmarshal(request.entity) + .to[String] + .map { payload => + payload shouldBe expectedPayload + + (Success(expectedHttpResponse), userContext) + } + .recover { + case e => + (Failure(e), userContext) + } + } + + override def beforeEach = { + expectedHeaders = defaultHeaders + expectedHttpResponse = defaultHttpResponse + expectedPayload = defaultPayload + expectedUri = defaultUri + } Review comment: Have you checked my comments in #3416 towards possible alternatives here? (and the relevant tests) ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: [email protected] With regards, Apache Git Services
