From 7e51911288f68ca7d26963d1fafc20ec0e957e00 Mon Sep 17 00:00:00 2001
From: Yordan Kinkov <yordan.kinkov@vereign.com>
Date: Fri, 10 Nov 2023 16:19:30 +0200
Subject: [PATCH] Add taskList template documentation for new policy parameter
---
.gitlab-ci.yml | 4 ++--
deployment/ci/Dockerfile | 2 +-
deployment/compose/Dockerfile | 2 +-
docs/task.md | 2 +-
internal/clients/policy/client.go | 4 ++--
5 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7ba775a..43645ab 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -14,7 +14,7 @@ linters:
- golangci-lint run
unit tests:
- image: golang:1.21.3
+ image: golang:1.21.4
stage: test
script:
- go version
@@ -23,7 +23,7 @@ unit tests:
coverage: '/total:\s+\(statements\)\s+(\d+.\d+\%)/'
govulncheck:
- image: golang:1.21.3
+ image: golang:1.21.4
stage: test
script:
- go version
diff --git a/deployment/ci/Dockerfile b/deployment/ci/Dockerfile
index 022f679..b15f77b 100644
--- a/deployment/ci/Dockerfile
+++ b/deployment/ci/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.21.3-alpine3.17 as builder
+FROM golang:1.21.4-alpine3.17 as builder
RUN apk add git
diff --git a/deployment/compose/Dockerfile b/deployment/compose/Dockerfile
index 0055fbf..39ce5b5 100644
--- a/deployment/compose/Dockerfile
+++ b/deployment/compose/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.21.3
+FROM golang:1.21.4
RUN go install github.com/ysmood/kit/cmd/guard@v0.25.11
diff --git a/docs/task.md b/docs/task.md
index e016cfe..aed81cb 100644
--- a/docs/task.md
+++ b/docs/task.md
@@ -13,7 +13,7 @@ an example of task template definition:
"name":"exampleTask",
"url":"https://jsonplaceholder.typicode.com/todos/1",
"method":"GET",
- "requestPolicy":"example/example/1.0",
+ "requestPolicy":"policies/example/example/1.0",
"responsePolicy":"",
"finalPolicy":"",
"cacheNamespace":"login",
diff --git a/internal/clients/policy/client.go b/internal/clients/policy/client.go
index 4270f3a..1b7c4a5 100644
--- a/internal/clients/policy/client.go
+++ b/internal/clients/policy/client.go
@@ -25,8 +25,8 @@ func New(addr string, httpClient *http.Client) *Client {
// Evaluate calls the policy service to execute the given policy.
// The policy is expected as a string path uniquely identifying the
-// policy that has to be evaluated. For example, with policy = `xfsc/didResolve/1.0`,
-// the client will do HTTP request to http://policyhost/policy/xfsc/didResolve/1.0/evaluation.
+// policy that has to be evaluated. For example, with policy = `policies/xfsc/didResolve/1.0`,
+// the client will do HTTP request to http://policyhost/policy/policies/xfsc/didResolve/1.0/evaluation.
func (c *Client) Evaluate(ctx context.Context, policy string, data []byte) ([]byte, error) {
uri := c.addr + "/policy/" + policy + "/evaluation"
policyURL, err := url.ParseRequestURI(uri)
--
GitLab