From 24f7b4facce7550e5a479454b700fd6343be2899 Mon Sep 17 00:00:00 2001 From: Mathieu Benoit Date: Fri, 18 Oct 2024 21:44:10 -0400 Subject: [PATCH 1/2] score-* init --provisioners --- .github/workflows/ci.yaml | 2 -- .gitignore | 2 -- .score-compose/00-service.provisioners.yaml | 7 ------- .score-k8s/00-service.provisioners.yaml | 7 ------- Makefile | 6 ++++-- 5 files changed, 4 insertions(+), 20 deletions(-) delete mode 100644 .score-compose/00-service.provisioners.yaml delete mode 100644 .score-k8s/00-service.provisioners.yaml diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 188f5c3..ebbe4ef 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -22,8 +22,6 @@ jobs: - name: humctl score validate run: | humctl score validate apps/${{ matrix.apps }}/score.yaml \ - --token ${{ secrets.HUMANITEC_TOKEN }} \ - --org ${{ secrets.HUMANITEC_ORG }} \ --strict score-compose: runs-on: ubuntu-24.04 diff --git a/.gitignore b/.gitignore index 5659e25..ad22193 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,4 @@ .score-compose/* -!.score-compose/00-service.provisioners.yaml compose.yaml .score-k8s/* -!.score-k8s/00-service.provisioners.yaml manifests.yaml \ No newline at end of file diff --git a/.score-compose/00-service.provisioners.yaml b/.score-compose/00-service.provisioners.yaml deleted file mode 100644 index a8bc855..0000000 --- a/.score-compose/00-service.provisioners.yaml +++ /dev/null @@ -1,7 +0,0 @@ -- uri: template://service-provisioners/static-service - type: service - init: | - name: {{ splitList "." .Id | last }} - outputs: | - {{ $w := (index .WorkloadServices .Init.name) }} - name: {{ $w.ServiceName | quote }} \ No newline at end of file diff --git a/.score-k8s/00-service.provisioners.yaml b/.score-k8s/00-service.provisioners.yaml deleted file mode 100644 index a8bc855..0000000 --- a/.score-k8s/00-service.provisioners.yaml +++ /dev/null @@ -1,7 +0,0 @@ -- uri: template://service-provisioners/static-service - type: service - init: | - name: {{ splitList "." .Id | last }} - outputs: | - {{ $w := (index .WorkloadServices .Init.name) }} - name: {{ $w.ServiceName | quote }} \ No newline at end of file diff --git a/Makefile b/Makefile index cd20127..7422c8c 100644 --- a/Makefile +++ b/Makefile @@ -13,7 +13,8 @@ help: .score-compose/state.yaml: score-compose init \ - --no-sample + --no-sample \ + --provisioners https://raw.githubusercontent.com/score-spec/community-provisioners/refs/heads/main/score-compose/00-service.provisioners.yaml compose.yaml: apps/ad/score.yaml apps/cart/score.yaml apps/checkout/score.yaml apps/currency/score.yaml apps/email/score.yaml apps/frontend/score.yaml apps/loadgenerator/score.yaml apps/payment/score.yaml apps/productcatalog/score.yaml apps/recommendation/score.yaml apps/shipping/score.yaml .score-compose/state.yaml Makefile score-compose generate \ @@ -47,7 +48,8 @@ compose-down: .score-k8s/state.yaml: score-k8s init \ - --no-sample + --no-sample \ + --provisioners https://raw.githubusercontent.com/score-spec/community-provisioners/refs/heads/main/score-compose/00-service.provisioners.yaml manifests.yaml: apps/ad/score.yaml apps/cart/score.yaml apps/checkout/score.yaml apps/currency/score.yaml apps/email/score.yaml apps/frontend/score.yaml apps/loadgenerator/score.yaml apps/payment/score.yaml apps/productcatalog/score.yaml apps/recommendation/score.yaml apps/shipping/score.yaml .score-k8s/state.yaml Makefile score-k8s generate \ From f44455d72df1c8b34d447716deb02ed0f0607bb2 Mon Sep 17 00:00:00 2001 From: Mathieu Benoit Date: Fri, 18 Oct 2024 21:45:41 -0400 Subject: [PATCH 2/2] humctl score validate --local --- .github/workflows/ci.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index ebbe4ef..680f873 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -22,7 +22,8 @@ jobs: - name: humctl score validate run: | humctl score validate apps/${{ matrix.apps }}/score.yaml \ - --strict + --strict \ + --local score-compose: runs-on: ubuntu-24.04 env: