From 62ffa63264d4599b90062b9131c4729ae1913506 Mon Sep 17 00:00:00 2001 From: Kevin Franklin Kim Date: Fri, 23 Aug 2024 08:41:06 +0200 Subject: [PATCH 1/2] fix(provider/emarsys): template permissions --- .../emarsysinitializationclientdata.go | 15 ----------- .../template/emarsyswebextendtagdata.go | 18 ------------- .../template/emarsysinitializationtagdata.go | 25 +++++++++++++------ .../server/template/googlegtagclientdata.go | 9 ------- 4 files changed, 17 insertions(+), 50 deletions(-) diff --git a/pkg/provider/emarsys/server/template/emarsysinitializationclientdata.go b/pkg/provider/emarsys/server/template/emarsysinitializationclientdata.go index ff76deb..1cb9b83 100644 --- a/pkg/provider/emarsys/server/template/emarsysinitializationclientdata.go +++ b/pkg/provider/emarsys/server/template/emarsysinitializationclientdata.go @@ -161,9 +161,6 @@ ___SERVER_PERMISSIONS___ } ] }, - "clientAnnotations": { - "isEditedByUser": true - }, "isRequired": true }, { @@ -200,9 +197,6 @@ ___SERVER_PERMISSIONS___ } ] }, - "clientAnnotations": { - "isEditedByUser": true - }, "isRequired": true }, { @@ -228,9 +222,6 @@ ___SERVER_PERMISSIONS___ } ] }, - "clientAnnotations": { - "isEditedByUser": true - }, "isRequired": true }, { @@ -354,9 +345,6 @@ ___SERVER_PERMISSIONS___ } ] }, - "clientAnnotations": { - "isEditedByUser": true - }, "isRequired": true }, { @@ -391,9 +379,6 @@ ___SERVER_PERMISSIONS___ } ] }, - "clientAnnotations": { - "isEditedByUser": true - }, "isRequired": true } ] diff --git a/pkg/provider/emarsys/server/template/emarsyswebextendtagdata.go b/pkg/provider/emarsys/server/template/emarsyswebextendtagdata.go index 9067a28..be0ff27 100644 --- a/pkg/provider/emarsys/server/template/emarsyswebextendtagdata.go +++ b/pkg/provider/emarsys/server/template/emarsyswebextendtagdata.go @@ -299,9 +299,6 @@ ___SERVER_PERMISSIONS___ } ] }, - "clientAnnotations": { - "isEditedByUser": true - }, "isRequired": true }, { @@ -320,9 +317,6 @@ ___SERVER_PERMISSIONS___ } ] }, - "clientAnnotations": { - "isEditedByUser": true - }, "isRequired": true }, { @@ -341,9 +335,6 @@ ___SERVER_PERMISSIONS___ } ] }, - "clientAnnotations": { - "isEditedByUser": true - }, "isRequired": true }, { @@ -369,9 +360,6 @@ ___SERVER_PERMISSIONS___ } ] }, - "clientAnnotations": { - "isEditedByUser": true - }, "isRequired": true }, { @@ -390,9 +378,6 @@ ___SERVER_PERMISSIONS___ } ] }, - "clientAnnotations": { - "isEditedByUser": true - }, "isRequired": true }, { @@ -411,9 +396,6 @@ ___SERVER_PERMISSIONS___ } ] }, - "clientAnnotations": { - "isEditedByUser": true - }, "isRequired": true } ] diff --git a/pkg/provider/emarsys/web/template/emarsysinitializationtagdata.go b/pkg/provider/emarsys/web/template/emarsysinitializationtagdata.go index 3ad1646..892b12a 100644 --- a/pkg/provider/emarsys/web/template/emarsysinitializationtagdata.go +++ b/pkg/provider/emarsys/web/template/emarsysinitializationtagdata.go @@ -114,9 +114,6 @@ ___WEB_PERMISSIONS___ } ] }, - "clientAnnotations": { - "isEditedByUser": true - }, "isRequired": true }, { @@ -135,8 +132,23 @@ ___WEB_PERMISSIONS___ } ] }, - "clientAnnotations": { - "isEditedByUser": true + "isRequired": true + }, + { + "instance": { + "key": { + "publicId": "get_cookies", + "versionId": "1" + }, + "param": [ + { + "key": "cookieAccess", + "value": { + "type": 1, + "string": "any" + } + } + ] }, "isRequired": true }, @@ -235,9 +247,6 @@ ___WEB_PERMISSIONS___ } ] }, - "clientAnnotations": { - "isEditedByUser": true - }, "isRequired": true } ] diff --git a/pkg/provider/googleanalytics/server/template/googlegtagclientdata.go b/pkg/provider/googleanalytics/server/template/googlegtagclientdata.go index 6737886..ad664d7 100644 --- a/pkg/provider/googleanalytics/server/template/googlegtagclientdata.go +++ b/pkg/provider/googleanalytics/server/template/googlegtagclientdata.go @@ -119,9 +119,6 @@ ___SERVER_PERMISSIONS___ } ] }, - "clientAnnotations": { - "isEditedByUser": true - }, "isRequired": true }, { @@ -175,9 +172,6 @@ ___SERVER_PERMISSIONS___ } ] }, - "clientAnnotations": { - "isEditedByUser": true - }, "isRequired": true }, { @@ -196,9 +190,6 @@ ___SERVER_PERMISSIONS___ } ] }, - "clientAnnotations": { - "isEditedByUser": true - }, "isRequired": true }, { From 246455038a65f5dc143a52f05f981ebc72ac0d31 Mon Sep 17 00:00:00 2001 From: Kevin Franklin Kim Date: Fri, 23 Aug 2024 08:49:46 +0200 Subject: [PATCH 2/2] feat: bump go --- .golangci.yml | 3 ++- go.mod | 4 +--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.golangci.yml b/.golangci.yml index 3326043..71acb46 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -115,7 +115,6 @@ linters: - errname # Checks that sentinel errors are prefixed with the `Err` and error types are suffixed with the `Error`. [fast: false, auto-fix: false] - errorlint # errorlint is a linter for that can be used to find code that will cause problems with the error wrapping scheme introduced in Go 1.13. [fast: false, auto-fix: false] - exhaustive # check exhaustiveness of enum switch statements [fast: false, auto-fix: false] - - exportloopref # checks for pointers to enclosing loop variables [fast: false, auto-fix: false] #- forbidigo # Forbids identifiers [fast: false, auto-fix: false] - forcetypeassert # finds forced type assertions [fast: true, auto-fix: false] - gocheckcompilerdirectives # Checks that go compiler directive comments (//go:) are valid. [fast: true, auto-fix: false] @@ -165,6 +164,8 @@ linters: - usestdlibvars # A linter that detect the possibility to use variables/constants from the Go standard library. [fast: true, auto-fix: false] - wastedassign # Finds wasted assignment statements [fast: false, auto-fix: false] - whitespace # Whitespace is a linter that checks for unnecessary newlines at the start and end of functions, if, for, etc. [fast: true, auto-fix: true] + - canonicalheader # Checks whether net/http.Header uses canonical header [fast: false, auto-fix: false] + - fatcontext #Detects nested contexts in loops [fast: false, auto-fix: false] ## Don't enable #- cyclop # checks function and package cyclomatic complexity [fast: false, auto-fix: false] diff --git a/go.mod b/go.mod index e2c42eb..6e288a1 100644 --- a/go.mod +++ b/go.mod @@ -1,8 +1,6 @@ module github.com/foomo/sesamy-cli -go 1.22.3 - -toolchain go1.22.5 +go 1.23 require ( github.com/fatih/structtag v1.2.0