From 02c330f4d60c617cd9a07446a6e3981732eed07b Mon Sep 17 00:00:00 2001 From: Mikhail Ustyantsev Date: Mon, 22 Aug 2022 12:15:50 +0300 Subject: [PATCH 01/18] =?UTF-8?q?PLAT-1964=20Opentdf/tests:=20=E2=80=9Cxte?= =?UTF-8?q?st=E2=80=9D=20job=20fails=20with=20the=20=E2=80=9Cunknown=20?= =?UTF-8?q?=E2=80=9Copentdf-kas=E2=80=9D=20resource=E2=80=9D=20error.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- xtest/Tiltfile | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/xtest/Tiltfile b/xtest/Tiltfile index bd7f1a92..6859510a 100644 --- a/xtest/Tiltfile +++ b/xtest/Tiltfile @@ -1,10 +1,7 @@ include('../projects/backend/Tiltfile') -k8s_resource("opentdf-kas", resource_deps=["opentdf-attributes"], port_forwards="8000:8000") -k8s_resource("keycloak", port_forwards="8080:8080") - local_resource( "test", "npm run test", - resource_deps=["keycloak", "opentdf-kas"] + resource_deps=["backend"] ) \ No newline at end of file From c680e59baf28b7d3040a3e52af7677cf20a62f10 Mon Sep 17 00:00:00 2001 From: Mikhail Ustyantsev Date: Mon, 22 Aug 2022 13:35:19 +0300 Subject: [PATCH 02/18] run xtest.Tiltfile --- .github/workflows/xtest.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/xtest.yml b/.github/workflows/xtest.yml index 4b6291c9..80f0e469 100644 --- a/.github/workflows/xtest.yml +++ b/.github/workflows/xtest.yml @@ -55,4 +55,4 @@ jobs: run: |- kubectl version cd xtest - tilt ci integration-test -- --to-edit opentdf-abacus + tilt ci -f ../projects/backend/xtest.Tiltfile From 9ccd0765e5a1859857dba2e8bbb0a57c5614c541 Mon Sep 17 00:00:00 2001 From: Mikhail Ustyantsev Date: Mon, 22 Aug 2022 13:43:50 +0300 Subject: [PATCH 03/18] run xtest.Tiltfile --- .github/workflows/xtest.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/xtest.yml b/.github/workflows/xtest.yml index 80f0e469..abb51674 100644 --- a/.github/workflows/xtest.yml +++ b/.github/workflows/xtest.yml @@ -55,4 +55,6 @@ jobs: run: |- kubectl version cd xtest + ls ../projects + ls ../projects/backend tilt ci -f ../projects/backend/xtest.Tiltfile From d5222a4fae012b214df4b0236af0f23d20e733a1 Mon Sep 17 00:00:00 2001 From: Mikhail Ustyantsev Date: Mon, 22 Aug 2022 13:51:29 +0300 Subject: [PATCH 04/18] run xtest.Tiltfile --- .github/workflows/xtest.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/xtest.yml b/.github/workflows/xtest.yml index abb51674..35bbb60b 100644 --- a/.github/workflows/xtest.yml +++ b/.github/workflows/xtest.yml @@ -57,4 +57,4 @@ jobs: cd xtest ls ../projects ls ../projects/backend - tilt ci -f ../projects/backend/xtest.Tiltfile + tilt ci -f ../projects/backend/Tiltfile.xtest From 3967f04217a59e67101752ed1370efee5e335fe4 Mon Sep 17 00:00:00 2001 From: Mikhail Ustyantsev Date: Mon, 22 Aug 2022 15:40:47 +0300 Subject: [PATCH 05/18] run xtest.Tiltfile --- .github/workflows/xtest.yml | 3 +-- xtest/Tiltfile | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/xtest.yml b/.github/workflows/xtest.yml index 35bbb60b..4eca0fe9 100644 --- a/.github/workflows/xtest.yml +++ b/.github/workflows/xtest.yml @@ -55,6 +55,5 @@ jobs: run: |- kubectl version cd xtest - ls ../projects ls ../projects/backend - tilt ci -f ../projects/backend/Tiltfile.xtest + tilt ci diff --git a/xtest/Tiltfile b/xtest/Tiltfile index 6859510a..42b82640 100644 --- a/xtest/Tiltfile +++ b/xtest/Tiltfile @@ -1,4 +1,4 @@ -include('../projects/backend/Tiltfile') +include('../projects/backend/xtest.Tiltfile') local_resource( "test", From bc3491582898d83bac66f5b65c9abaf13a7fcd25 Mon Sep 17 00:00:00 2001 From: Mikhail Ustyantsev Date: Mon, 22 Aug 2022 15:46:07 +0300 Subject: [PATCH 06/18] run xtest.Tiltfile --- xtest/Tiltfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xtest/Tiltfile b/xtest/Tiltfile index 42b82640..dc069f8f 100644 --- a/xtest/Tiltfile +++ b/xtest/Tiltfile @@ -1,4 +1,4 @@ -include('../projects/backend/xtest.Tiltfile') +include('../projects/backend/Tiltfile.xtest') local_resource( "test", From e3b09c883bc56003a171c9313c3dfced4ca448c8 Mon Sep 17 00:00:00 2001 From: Mikhail Ustyantsev Date: Mon, 22 Aug 2022 16:00:31 +0300 Subject: [PATCH 07/18] run xtest.Tiltfile --- client-web-test/Tiltfile | 8 ++++---- vulnerability/Tiltfile | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/client-web-test/Tiltfile b/client-web-test/Tiltfile index 769d6550..5b27949d 100644 --- a/client-web-test/Tiltfile +++ b/client-web-test/Tiltfile @@ -1,10 +1,10 @@ -include('../projects/backend/Tiltfile') +include('../projects/backend/Tiltfile.xtest') k8s_resource("opentdf-kas", resource_deps=["opentdf-attributes"], port_forwards="8000:8000") k8s_resource("keycloak", port_forwards="8080:8080") k8s_resource( "opentdf-xtest", - resource_deps=["keycloak-bootstrap", "keycloak", "opentdf-kas"], + resource_deps=["backend"], auto_init=False, trigger_mode=TRIGGER_MODE_MANUAL ) @@ -12,12 +12,12 @@ k8s_resource( local_resource( "test-client-web", "npm run test", - resource_deps=["keycloak", "keycloak-bootstrap", "opentdf-kas"] + resource_deps=["backend"] ) local_resource( "frontend-test", "CI=true npm run test:playwright", dir="../projects/frontend", - resource_deps=["keycloak", "keycloak-bootstrap", "opentdf-kas"] + resource_deps=["backend"] ) diff --git a/vulnerability/Tiltfile b/vulnerability/Tiltfile index aac1f902..b962ec7a 100644 --- a/vulnerability/Tiltfile +++ b/vulnerability/Tiltfile @@ -1,10 +1,10 @@ -include('../projects/backend/Tiltfile') +include('../projects/backend/Tiltfile.xtest') k8s_resource("opentdf-kas", resource_deps=["opentdf-attributes"], port_forwards="8000:8000") k8s_resource("keycloak", port_forwards="8080:8080") k8s_resource( "opentdf-xtest", - resource_deps=["bootstrap-keycloak", "keycloak", "opentdf-kas"], + resource_deps=["backend"], auto_init=False, trigger_mode=TRIGGER_MODE_MANUAL ) @@ -12,5 +12,5 @@ k8s_resource( local_resource( "test", "npm run test", - resource_deps=["keycloak", "bootstrap-keycloak"] + resource_deps=["backend"] ) \ No newline at end of file From 688f8f96958e3a2069e1c087e3822467e464da0c Mon Sep 17 00:00:00 2001 From: Mikhail Ustyantsev Date: Mon, 22 Aug 2022 16:39:46 +0300 Subject: [PATCH 08/18] run xtest.Tiltfile --- client-web-test/Tiltfile | 2 -- vulnerability/Tiltfile | 2 -- 2 files changed, 4 deletions(-) diff --git a/client-web-test/Tiltfile b/client-web-test/Tiltfile index 5b27949d..fe2b8140 100644 --- a/client-web-test/Tiltfile +++ b/client-web-test/Tiltfile @@ -1,7 +1,5 @@ include('../projects/backend/Tiltfile.xtest') -k8s_resource("opentdf-kas", resource_deps=["opentdf-attributes"], port_forwards="8000:8000") -k8s_resource("keycloak", port_forwards="8080:8080") k8s_resource( "opentdf-xtest", resource_deps=["backend"], diff --git a/vulnerability/Tiltfile b/vulnerability/Tiltfile index b962ec7a..301164c6 100644 --- a/vulnerability/Tiltfile +++ b/vulnerability/Tiltfile @@ -1,7 +1,5 @@ include('../projects/backend/Tiltfile.xtest') -k8s_resource("opentdf-kas", resource_deps=["opentdf-attributes"], port_forwards="8000:8000") -k8s_resource("keycloak", port_forwards="8080:8080") k8s_resource( "opentdf-xtest", resource_deps=["backend"], From 408dd2d2aa61484dda67a32566ef2cd98791e9a4 Mon Sep 17 00:00:00 2001 From: Mikhail Ustyantsev Date: Mon, 22 Aug 2022 17:16:01 +0300 Subject: [PATCH 09/18] run xtest.Tiltfile --- .github/workflows/xtest.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/xtest.yml b/.github/workflows/xtest.yml index 4eca0fe9..926ac97b 100644 --- a/.github/workflows/xtest.yml +++ b/.github/workflows/xtest.yml @@ -56,4 +56,5 @@ jobs: kubectl version cd xtest ls ../projects/backend + cat ../projects/backend/Tiltfile.xtest tilt ci From 23e5b35e0c9d45682244afa86e836a1cd49695aa Mon Sep 17 00:00:00 2001 From: Mikhail Ustyantsev Date: Mon, 22 Aug 2022 18:07:25 +0300 Subject: [PATCH 10/18] run xtest.Tiltfile --- .github/workflows/client-web-test.yml | 2 +- .github/workflows/vulnerability.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/client-web-test.yml b/.github/workflows/client-web-test.yml index b2fb37d8..0159fe46 100644 --- a/.github/workflows/client-web-test.yml +++ b/.github/workflows/client-web-test.yml @@ -62,4 +62,4 @@ jobs: run: |- kubectl version cd client-web-test - tilt ci integration-test test-client-web frontend-test -- --to-edit opentdf-abacus-client-web + tilt ci diff --git a/.github/workflows/vulnerability.yml b/.github/workflows/vulnerability.yml index 65a4e20f..fcfd690a 100644 --- a/.github/workflows/vulnerability.yml +++ b/.github/workflows/vulnerability.yml @@ -44,4 +44,4 @@ jobs: run: |- kubectl version cd vulnerability - tilt ci integration-test -- --to-edit opentdf-abacus + tilt ci From f1fc31f98d2585a974a4fd8260119b6e1e9f32f4 Mon Sep 17 00:00:00 2001 From: Mikhail Ustyantsev Date: Mon, 22 Aug 2022 18:13:52 +0300 Subject: [PATCH 11/18] run xtest.Tiltfile --- .github/workflows/client-web-test.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/client-web-test.yml b/.github/workflows/client-web-test.yml index 0159fe46..84c8a832 100644 --- a/.github/workflows/client-web-test.yml +++ b/.github/workflows/client-web-test.yml @@ -62,4 +62,5 @@ jobs: run: |- kubectl version cd client-web-test + cat file.xtest tilt ci From 4c353b35b9e5098b5583738522a5419e3224ee82 Mon Sep 17 00:00:00 2001 From: Mikhail Ustyantsev Date: Mon, 22 Aug 2022 18:14:14 +0300 Subject: [PATCH 12/18] run xtest.Tiltfile --- .github/workflows/client-web-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/client-web-test.yml b/.github/workflows/client-web-test.yml index 84c8a832..23815805 100644 --- a/.github/workflows/client-web-test.yml +++ b/.github/workflows/client-web-test.yml @@ -62,5 +62,5 @@ jobs: run: |- kubectl version cd client-web-test - cat file.xtest + cat ../projects/backend/Tiltfile.xtest tilt ci From db8692e9027ffaf681c319a33e125dedbf1946e5 Mon Sep 17 00:00:00 2001 From: Mikhail Ustyantsev Date: Tue, 23 Aug 2022 11:39:52 +0300 Subject: [PATCH 13/18] new --- projects/backend | 2 +- projects/client-web | 2 +- projects/frontend | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/projects/backend b/projects/backend index 2c4ff423..7926684e 160000 --- a/projects/backend +++ b/projects/backend @@ -1 +1 @@ -Subproject commit 2c4ff4237afa6ff8185f9700b2f5560207f79e52 +Subproject commit 7926684e082ed4d141d76f37021038750d921c47 diff --git a/projects/client-web b/projects/client-web index 8c8be6eb..7f189f0d 160000 --- a/projects/client-web +++ b/projects/client-web @@ -1 +1 @@ -Subproject commit 8c8be6eb0832ad7517f406a1aaf80a9dd63e7680 +Subproject commit 7f189f0d3c5122b054a053f14db98b36ee273b0b diff --git a/projects/frontend b/projects/frontend index 2887de2f..3e6ac9e3 160000 --- a/projects/frontend +++ b/projects/frontend @@ -1 +1 @@ -Subproject commit 2887de2f3a41810838c12ca0ea5334377b6aded4 +Subproject commit 3e6ac9e364194688a0a45f753f7f6ee658172258 From 5b45471161bf438dc44d6e5a96abf1407ef5afc1 Mon Sep 17 00:00:00 2001 From: Mikhail Ustyantsev Date: Tue, 23 Aug 2022 11:46:28 +0300 Subject: [PATCH 14/18] run xtest.Tiltfile --- client-web-test/Tiltfile | 2 +- vulnerability/Tiltfile | 2 +- xtest/Tiltfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/client-web-test/Tiltfile b/client-web-test/Tiltfile index fe2b8140..991dba94 100644 --- a/client-web-test/Tiltfile +++ b/client-web-test/Tiltfile @@ -1,4 +1,4 @@ -include('../projects/backend/Tiltfile.xtest') +include('../projects/backend/xtest.Tiltfile') k8s_resource( "opentdf-xtest", diff --git a/vulnerability/Tiltfile b/vulnerability/Tiltfile index 301164c6..477dee61 100644 --- a/vulnerability/Tiltfile +++ b/vulnerability/Tiltfile @@ -1,4 +1,4 @@ -include('../projects/backend/Tiltfile.xtest') +include('../projects/backend/xtest.Tiltfile') k8s_resource( "opentdf-xtest", diff --git a/xtest/Tiltfile b/xtest/Tiltfile index dc069f8f..42b82640 100644 --- a/xtest/Tiltfile +++ b/xtest/Tiltfile @@ -1,4 +1,4 @@ -include('../projects/backend/Tiltfile.xtest') +include('../projects/backend/xtest.Tiltfile') local_resource( "test", From 29e3632bece6afc38a057410aa2ad0d776edbcb7 Mon Sep 17 00:00:00 2001 From: Mikhail Ustyantsev Date: Tue, 23 Aug 2022 13:35:56 +0300 Subject: [PATCH 15/18] revert back and remove opentdf prefix --- client-web-test/Tiltfile | 10 ++++++---- vulnerability/Tiltfile | 8 +++++--- xtest/Tiltfile | 5 ++++- 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/client-web-test/Tiltfile b/client-web-test/Tiltfile index 991dba94..a4bbc5fb 100644 --- a/client-web-test/Tiltfile +++ b/client-web-test/Tiltfile @@ -1,8 +1,10 @@ -include('../projects/backend/xtest.Tiltfile') +include('../projects/backend/Tiltfile.xtest') +k8s_resource("kas", resource_deps=["attributes"], port_forwards="8000:8000") +k8s_resource("keycloak", port_forwards="8080:8080") k8s_resource( "opentdf-xtest", - resource_deps=["backend"], + resource_deps=["keycloak-bootstrap", "keycloak", "kas"], auto_init=False, trigger_mode=TRIGGER_MODE_MANUAL ) @@ -10,12 +12,12 @@ k8s_resource( local_resource( "test-client-web", "npm run test", - resource_deps=["backend"] + resource_deps=["keycloak", "keycloak-bootstrap", "kas"] ) local_resource( "frontend-test", "CI=true npm run test:playwright", dir="../projects/frontend", - resource_deps=["backend"] + resource_deps=["keycloak", "keycloak-bootstrap", "kas"] ) diff --git a/vulnerability/Tiltfile b/vulnerability/Tiltfile index 477dee61..3459fcc9 100644 --- a/vulnerability/Tiltfile +++ b/vulnerability/Tiltfile @@ -1,8 +1,10 @@ -include('../projects/backend/xtest.Tiltfile') +include('../projects/backend/Tiltfile.xtest') +k8s_resource("kas", resource_deps=["attributes"], port_forwards="8000:8000") +k8s_resource("keycloak", port_forwards="8080:8080") k8s_resource( "opentdf-xtest", - resource_deps=["backend"], + resource_deps=["bootstrap-keycloak", "keycloak", "kas"], auto_init=False, trigger_mode=TRIGGER_MODE_MANUAL ) @@ -10,5 +12,5 @@ k8s_resource( local_resource( "test", "npm run test", - resource_deps=["backend"] + resource_deps=["keycloak", "bootstrap-keycloak"] ) \ No newline at end of file diff --git a/xtest/Tiltfile b/xtest/Tiltfile index 42b82640..fd910c46 100644 --- a/xtest/Tiltfile +++ b/xtest/Tiltfile @@ -1,7 +1,10 @@ include('../projects/backend/xtest.Tiltfile') +k8s_resource("kas", resource_deps=["attributes"], port_forwards="8000:8000") +k8s_resource("keycloak", port_forwards="8080:8080") + local_resource( "test", "npm run test", - resource_deps=["backend"] + resource_deps=["keycloak", "kas"] ) \ No newline at end of file From 49ebf79841ef14a8bec5ee29e74ba6509e4299ff Mon Sep 17 00:00:00 2001 From: Mikhail Ustyantsev Date: Tue, 23 Aug 2022 13:41:32 +0300 Subject: [PATCH 16/18] revert back and remove opentdf prefix --- .github/workflows/client-web-test.yml | 1 - .github/workflows/xtest.yml | 2 -- 2 files changed, 3 deletions(-) diff --git a/.github/workflows/client-web-test.yml b/.github/workflows/client-web-test.yml index 23815805..0159fe46 100644 --- a/.github/workflows/client-web-test.yml +++ b/.github/workflows/client-web-test.yml @@ -62,5 +62,4 @@ jobs: run: |- kubectl version cd client-web-test - cat ../projects/backend/Tiltfile.xtest tilt ci diff --git a/.github/workflows/xtest.yml b/.github/workflows/xtest.yml index 926ac97b..97206887 100644 --- a/.github/workflows/xtest.yml +++ b/.github/workflows/xtest.yml @@ -55,6 +55,4 @@ jobs: run: |- kubectl version cd xtest - ls ../projects/backend - cat ../projects/backend/Tiltfile.xtest tilt ci From 73602d4545b4b52d2d827365eb9ea5722e2ad3aa Mon Sep 17 00:00:00 2001 From: Mikhail Ustyantsev Date: Tue, 23 Aug 2022 13:48:07 +0300 Subject: [PATCH 17/18] revert back and remove opentdf prefix --- client-web-test/Tiltfile | 2 +- vulnerability/Tiltfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/client-web-test/Tiltfile b/client-web-test/Tiltfile index a4bbc5fb..6011dc25 100644 --- a/client-web-test/Tiltfile +++ b/client-web-test/Tiltfile @@ -1,4 +1,4 @@ -include('../projects/backend/Tiltfile.xtest') +include('../projects/backend/xtest.Tiltfile') k8s_resource("kas", resource_deps=["attributes"], port_forwards="8000:8000") k8s_resource("keycloak", port_forwards="8080:8080") diff --git a/vulnerability/Tiltfile b/vulnerability/Tiltfile index 3459fcc9..59ccff26 100644 --- a/vulnerability/Tiltfile +++ b/vulnerability/Tiltfile @@ -1,4 +1,4 @@ -include('../projects/backend/Tiltfile.xtest') +include('../projects/backend/xtest.Tiltfile') k8s_resource("kas", resource_deps=["attributes"], port_forwards="8000:8000") k8s_resource("keycloak", port_forwards="8080:8080") From 37f0323e531d532cd947cd7cabd7bd27e419d624 Mon Sep 17 00:00:00 2001 From: Mikhail Ustyantsev Date: Tue, 23 Aug 2022 14:30:29 +0300 Subject: [PATCH 18/18] run tilt --- xtest/Tiltfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/xtest/Tiltfile b/xtest/Tiltfile index fd910c46..926b76b9 100644 --- a/xtest/Tiltfile +++ b/xtest/Tiltfile @@ -1,10 +1,10 @@ include('../projects/backend/xtest.Tiltfile') -k8s_resource("kas", resource_deps=["attributes"], port_forwards="8000:8000") -k8s_resource("keycloak", port_forwards="8080:8080") +#k8s_resource("kas", resource_deps=["attributes"], port_forwards="8000:8000") +#k8s_resource("keycloak", port_forwards="8080:8080") local_resource( "test", "npm run test", - resource_deps=["keycloak", "kas"] + resource_deps=["backend", "keycloak-bootstrap"] ) \ No newline at end of file