Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

E2e Tests: allow to pass google json sa #496

Merged
merged 3 commits into from
Sep 28, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,9 @@ public void testProcessor() throws Exception {
deleteAppAndAwaitCleanup(tenant, applicationId);

final List<String> topics = getAllTopics();
Assertions.assertEquals(List.of("ls-test-topic0"), topics);
log.info("all topics: {}", topics);
Assertions.assertTrue(topics.contains("ls-test-topic0"));
Assertions.assertFalse(topics.contains("ls-test-topic1"));
}

@Test
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ public static Map<String, String> getAppEnvForAIServiceProvider() {
return getAppEnvMapFromSystem(
List.of(
"VERTEX_AI_URL",
"VERTEX_AI_TOKEN",
"VERTEX_AI_SERVICE_ACCOUNT_JSON",
"VERTEX_AI_REGION",
"VERTEX_AI_PROJECT"));
}
Expand All @@ -69,7 +69,7 @@ public void test() throws Exception {
final String sessionId = UUID.randomUUID().toString();

executeCommandOnClient(
"bin/langstream gateway produce %s produce-input -v 'Translate \"Good morning\" to French.' -p sessionId=%s"
"bin/langstream gateway produce %s produce-input -v 'Translate \"Apple\" to French, lowercase.' -p sessionId=%s"
.formatted(applicationId, sessionId)
.split(" "));

Expand All @@ -81,6 +81,6 @@ public void test() throws Exception {
.formatted(sessionId)
.split(" "));
log.info("Output: {}", message);
Assertions.assertTrue(message.getAnswerFromChatCompletionsValue().contains("Bonjour"));
Assertions.assertTrue(message.getAnswerFromChatCompletionsValue().contains("pomme"));
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,15 @@ public static void checkCredentials() {

@Test
public void test() throws Exception {
if (!codeStorageConfig.type().equals("s3")) {
throw new IllegalStateException(
"This test can only run with S3 code storage, but got: "
+ codeStorageConfig.type());
}

appEnv.put("S3_ENDPOINT", codeStorageConfig.configuration().get("endpoint"));
appEnv.put("S3_ACCESS_KEY", codeStorageConfig.configuration().get("access-key"));
appEnv.put("S3_SECRET_KEY", codeStorageConfig.configuration().get("secret-key"));
installLangStreamCluster(true);
final String tenant = "ten-" + System.currentTimeMillis();
setupTenant(tenant);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -526,8 +526,7 @@ private static KubeCluster getKubeCluster() {
public void setupSingleTest() {
// cleanup previous runs
cleanupAllEndToEndTestsNamespaces();
codeStorageProvider.cleanup();
streamingClusterProvider.cleanup();
cleanupEnv();

namespace = "ls-test-" + UUID.randomUUID().toString().substring(0, 8);

Expand All @@ -541,18 +540,29 @@ public void setupSingleTest() {
.serverSideApply();
}

private void cleanupEnv() {
if (codeStorageProvider != null) {
codeStorageProvider.cleanup();
}
if (streamingClusterProvider != null) {
streamingClusterProvider.cleanup();
}
}

@AfterEach
public void cleanupAfterEach() {
cleanupAllEndToEndTestsNamespaces();
streamingClusterProvider.cleanup();
cleanupEnv();
}

private static void cleanupAllEndToEndTestsNamespaces() {
client.namespaces().withLabel("app", "ls-test").delete();
client.namespaces().list().getItems().stream()
.map(ns -> ns.getMetadata().getName())
.filter(ns -> ns.startsWith(TENANT_NAMESPACE_PREFIX))
.forEach(ns -> deleteTenantNamespace(ns));
if (client != null) {
client.namespaces().withLabel("app", "ls-test").delete();
client.namespaces().list().getItems().stream()
.map(ns -> ns.getMetadata().getName())
.filter(ns -> ns.startsWith(TENANT_NAMESPACE_PREFIX))
.forEach(ns -> deleteTenantNamespace(ns));
}
}

private static void deleteTenantNamespace(String ns) {
Expand Down Expand Up @@ -1095,7 +1105,12 @@ private static void deployLocalApplicationAndAwaitReady(
if (env != null && !env.isEmpty()) {
beforeCmd =
env.entrySet().stream()
.map(e -> "export \"%s\"=\"%s\"".formatted(e.getKey(), e.getValue()))
.map(
e ->
"export '%s'='%s'"
.formatted(
e.getKey(),
e.getValue().replace("'", "''")))
.collect(Collectors.joining(" && "));
beforeCmd += " && ";
}
Expand All @@ -1122,11 +1137,10 @@ private static void deployLocalApplicationAndAwaitReady(
} else {
podUids = "";
}
executeCommandOnClient(
(beforeCmd
+ "bin/langstream apps %s %s -app /tmp/app -i /tmp/instance.yaml -s /tmp/secrets.yaml")
.formatted(isUpdate ? "update" : "deploy", applicationId)
.split(" "));
final String command =
"bin/langstream apps %s %s -app /tmp/app -i /tmp/instance.yaml -s /tmp/secrets.yaml"
.formatted(isUpdate ? "update" : "deploy", applicationId);
executeCommandOnClient((beforeCmd + command).split(" "));

awaitApplicationReady(applicationId, expectedNumExecutors);
Awaitility.await()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,6 @@ configuration:
id: "vertex"
configuration:
url: "{{ secrets.vertex-ai.url }}"
token: "{{ secrets.vertex-ai.token }}"
serviceAccountJson: "{{ secrets.vertex-ai.service-json }}"
region: "{{ secrets.vertex-ai.region }}"
project: "{{ secrets.vertex-ai.project }}"
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,6 @@ configuration:
id: "vertex"
configuration:
url: "{{ secrets.vertex-ai.url }}"
token: "{{ secrets.vertex-ai.token }}"
serviceAccountJson: "{{ secrets.vertex-ai.service-json }}"
region: "{{ secrets.vertex-ai.region }}"
project: "{{ secrets.vertex-ai.project }}"
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,8 @@ pipeline:
- name: "compute-embeddings"
type: "compute-ai-embeddings"
configuration:
model: "{{{secrets.open-ai.embeddings-model}}}"
ai-service: "{{{secrets.embeddings.service}}}"
model: "{{{secrets.embeddings.model}}}"
embeddings-field: "value.question_embeddings"
text: "{{% value.question }}"
flush-interval: 0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,6 @@ configuration:
id: "vertex"
configuration:
url: "{{ secrets.vertex-ai.url }}"
token: "{{ secrets.vertex-ai.token }}"
serviceAccountJson: "{{ secrets.vertex-ai.service-json }}"
region: "{{ secrets.vertex-ai.region }}"
project: "{{ secrets.vertex-ai.project }}"
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,9 @@ pipeline:
handle-cookies: true
max-unflushed-pages: 100
bucketName: "langstream-test-crawler-to-vector"
endpoint: http://minio.minio-dev.svc.cluster.local:9000
access-key: minioadmin
secret-key: minioadmin
endpoint: "{{{secrets.s3.endpoint}}}"
access-key: "{{{secrets.s3.access-key}}}"
secret-key: "{{{secrets.s3.secret-key}}}"
- name: "Extract text"
type: "text-extractor"
- name: "Normalise text"
Expand Down
10 changes: 8 additions & 2 deletions langstream-e2e-tests/src/test/resources/secrets/secret1.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ secrets:
- id: vertex-ai
data:
url: "${VERTEX_AI_URL:-}"
token: "${VERTEX_AI_TOKEN:-}"
service-json: "${VERTEX_AI_SERVICE_ACCOUNT_JSON:-}"
region: "${VERTEX_AI_REGION:-}"
project: "${VERTEX_AI_PROJECT:-}"
- id: astra
Expand All @@ -64,4 +64,10 @@ secrets:
environment: "${ASTRA_ENVIRONMENT}"
- id: kafka
data:
bootstrap-servers: "${KAFKA_BOOTSTRAP_SERVERS}"
bootstrap-servers: "${KAFKA_BOOTSTRAP_SERVERS}"

- id: s3
data:
endpoint: "${S3_ENDPOINT}"
access-key: "${S3_ACCESS_KEY}"
secret-key: "${S3_SECRET_KEY}"
Loading