From dd383150bf984db4bce6f622cddc91999dc6e6de Mon Sep 17 00:00:00 2001 From: Georges Chaudy Date: Wed, 10 Jul 2024 10:45:56 +0200 Subject: [PATCH] lint --- pkg/storage/unified/sql/backend.go | 3 ++- pkg/storage/unified/sql/data/resource_history_poll.sql | 2 +- pkg/storage/unified/sql/data/resource_history_read.sql | 2 +- pkg/storage/unified/sql/data/resource_history_update_rv.sql | 2 +- pkg/storage/unified/sql/data/resource_update_rv.sql | 2 +- pkg/storage/unified/sql/data/resource_version_inc.sql | 2 +- .../sql/testdata/resource_history_list_mysql_sqlite.sql | 3 ++- .../sql/testdata/resource_history_max_rv_mysql_sqlite.sql | 1 - .../sql/testdata/resource_history_update_rv_mysql_sqlite.sql | 3 ++- .../unified/sql/testdata/resource_insert_mysql_sqlite.sql | 3 ++- .../unified/sql/testdata/resource_read_mysql_sqlite.sql | 3 ++- .../unified/sql/testdata/resource_update_mysql_sqlite.sql | 4 +++- .../unified/sql/testdata/resource_update_rv_mysql_sqlite.sql | 4 +++- .../sql/testdata/resource_version_get_mysql_sqlite.sql | 3 ++- .../sql/testdata/resource_version_inc_mysql_sqlite.sql | 2 +- 15 files changed, 24 insertions(+), 15 deletions(-) delete mode 100644 pkg/storage/unified/sql/testdata/resource_history_max_rv_mysql_sqlite.sql diff --git a/pkg/storage/unified/sql/backend.go b/pkg/storage/unified/sql/backend.go index 38a52567fbd..9de22cc140a 100644 --- a/pkg/storage/unified/sql/backend.go +++ b/pkg/storage/unified/sql/backend.go @@ -136,8 +136,9 @@ func (b *backend) WriteEvent(ctx context.Context, event resource.WriteEvent) (in return b.update(ctx, event) case resource.WatchEvent_DELETED: return b.delete(ctx, event) + default: + return 0, fmt.Errorf("unsupported event type") } - return 0, fmt.Errorf("unsupported event type") } func (b *backend) create(ctx context.Context, event resource.WriteEvent) (int64, error) { diff --git a/pkg/storage/unified/sql/data/resource_history_poll.sql b/pkg/storage/unified/sql/data/resource_history_poll.sql index 8c6b0391800..d2b6dca8e2b 100644 --- a/pkg/storage/unified/sql/data/resource_history_poll.sql +++ b/pkg/storage/unified/sql/data/resource_history_poll.sql @@ -9,4 +9,4 @@ SELECT FROM {{ .Ident "resource_history" }} WHERE {{ .Ident "resource_version" }} > {{ .Arg .SinceResourceVersion }} -; \ No newline at end of file +; diff --git a/pkg/storage/unified/sql/data/resource_history_read.sql b/pkg/storage/unified/sql/data/resource_history_read.sql index 1c5a96fdcb8..b063ba4a6d8 100644 --- a/pkg/storage/unified/sql/data/resource_history_read.sql +++ b/pkg/storage/unified/sql/data/resource_history_read.sql @@ -29,4 +29,4 @@ SELECT ORDER BY {{ .Ident "resource_version" }} DESC LIMIT 1 {{ end }} -; \ No newline at end of file +; diff --git a/pkg/storage/unified/sql/data/resource_history_update_rv.sql b/pkg/storage/unified/sql/data/resource_history_update_rv.sql index a108eb3eff1..c37ed2fbe8f 100644 --- a/pkg/storage/unified/sql/data/resource_history_update_rv.sql +++ b/pkg/storage/unified/sql/data/resource_history_update_rv.sql @@ -1,4 +1,4 @@ UPDATE {{ .Ident "resource_history" }} SET {{ .Ident "resource_version" }} = {{ .Arg .ResourceVersion }} WHERE {{ .Ident "guid" }} = {{ .Arg .GUID }} -; \ No newline at end of file +; diff --git a/pkg/storage/unified/sql/data/resource_update_rv.sql b/pkg/storage/unified/sql/data/resource_update_rv.sql index 62a044dfdd2..33c97a9e17a 100644 --- a/pkg/storage/unified/sql/data/resource_update_rv.sql +++ b/pkg/storage/unified/sql/data/resource_update_rv.sql @@ -1,4 +1,4 @@ UPDATE {{ .Ident "resource" }} SET {{ .Ident "resource_version" }} = {{ .Arg .ResourceVersion }} WHERE {{ .Ident "guid" }} = {{ .Arg .GUID }} -; \ No newline at end of file +; diff --git a/pkg/storage/unified/sql/data/resource_version_inc.sql b/pkg/storage/unified/sql/data/resource_version_inc.sql index c8478eb984f..b4ea3bfa1b0 100644 --- a/pkg/storage/unified/sql/data/resource_version_inc.sql +++ b/pkg/storage/unified/sql/data/resource_version_inc.sql @@ -4,4 +4,4 @@ SET WHERE 1 = 1 AND {{ .Ident "group" }} = {{ .Arg .Group }} AND {{ .Ident "resource" }} = {{ .Arg .Resource }} -; \ No newline at end of file +; diff --git a/pkg/storage/unified/sql/testdata/resource_history_list_mysql_sqlite.sql b/pkg/storage/unified/sql/testdata/resource_history_list_mysql_sqlite.sql index 1e7b7c144b9..f8fcb9535b4 100644 --- a/pkg/storage/unified/sql/testdata/resource_history_list_mysql_sqlite.sql +++ b/pkg/storage/unified/sql/testdata/resource_history_list_mysql_sqlite.sql @@ -8,4 +8,5 @@ JOIN ( ) AS maxkv ON maxkv."guid" = kv."guid" WHERE kv."action" != 3 ORDER BY kv."resource_version" ASC -LIMIT ?, ?; \ No newline at end of file +LIMIT ?, ? +; diff --git a/pkg/storage/unified/sql/testdata/resource_history_max_rv_mysql_sqlite.sql b/pkg/storage/unified/sql/testdata/resource_history_max_rv_mysql_sqlite.sql deleted file mode 100644 index 2c92350e005..00000000000 --- a/pkg/storage/unified/sql/testdata/resource_history_max_rv_mysql_sqlite.sql +++ /dev/null @@ -1 +0,0 @@ -SELECT max("resource_version") FROM "resource_history"; diff --git a/pkg/storage/unified/sql/testdata/resource_history_update_rv_mysql_sqlite.sql b/pkg/storage/unified/sql/testdata/resource_history_update_rv_mysql_sqlite.sql index 9d60d78fbbb..e11a0b5f092 100644 --- a/pkg/storage/unified/sql/testdata/resource_history_update_rv_mysql_sqlite.sql +++ b/pkg/storage/unified/sql/testdata/resource_history_update_rv_mysql_sqlite.sql @@ -1,2 +1,3 @@ UPDATE "resource_history" SET "resource_version" = ? -WHERE "guid" = ?; \ No newline at end of file +WHERE "guid" = ? +; diff --git a/pkg/storage/unified/sql/testdata/resource_insert_mysql_sqlite.sql b/pkg/storage/unified/sql/testdata/resource_insert_mysql_sqlite.sql index e2268ff0d2f..b61dff00552 100644 --- a/pkg/storage/unified/sql/testdata/resource_insert_mysql_sqlite.sql +++ b/pkg/storage/unified/sql/testdata/resource_insert_mysql_sqlite.sql @@ -1,3 +1,4 @@ INSERT INTO "resource" ("guid", "group", "resource", "namespace", "name", "value", "action") - VALUES (?, ?, ?, ?, ?, ?, ?); + VALUES (?, ?, ?, ?, ?, ?, ?) +; diff --git a/pkg/storage/unified/sql/testdata/resource_read_mysql_sqlite.sql b/pkg/storage/unified/sql/testdata/resource_read_mysql_sqlite.sql index 1ff90dacebc..80d06fca4d5 100644 --- a/pkg/storage/unified/sql/testdata/resource_read_mysql_sqlite.sql +++ b/pkg/storage/unified/sql/testdata/resource_read_mysql_sqlite.sql @@ -1,3 +1,4 @@ SELECT "resource_version", "value" FROM "resource" - WHERE 1 = 1 AND "namespace" = ? AND "group" = ? AND "resource" = ? AND "name" = ?; + WHERE 1 = 1 AND "namespace" = ? AND "group" = ? AND "resource" = ? AND "name" = ? +; diff --git a/pkg/storage/unified/sql/testdata/resource_update_mysql_sqlite.sql b/pkg/storage/unified/sql/testdata/resource_update_mysql_sqlite.sql index 59eaf391fc2..79cb0546a0f 100644 --- a/pkg/storage/unified/sql/testdata/resource_update_mysql_sqlite.sql +++ b/pkg/storage/unified/sql/testdata/resource_update_mysql_sqlite.sql @@ -1,2 +1,4 @@ UPDATE "resource" SET "guid" = ?, "value" = ?, "action" = ? -WHERE 1 =1 AND "group" = ? AND "resource" = ? AND "namespace" = ? AND "name" = ? ; \ No newline at end of file +WHERE 1 =1 AND "group" = ? AND "resource" = ? AND "namespace" = ? AND "name" = ? +; + \ No newline at end of file diff --git a/pkg/storage/unified/sql/testdata/resource_update_rv_mysql_sqlite.sql b/pkg/storage/unified/sql/testdata/resource_update_rv_mysql_sqlite.sql index b3c2edff4c2..71a1128c233 100644 --- a/pkg/storage/unified/sql/testdata/resource_update_rv_mysql_sqlite.sql +++ b/pkg/storage/unified/sql/testdata/resource_update_rv_mysql_sqlite.sql @@ -1,2 +1,4 @@ UPDATE "resource" SET "resource_version" = ? -WHERE "guid" = ?; \ No newline at end of file +WHERE "guid" = ? +; + \ No newline at end of file diff --git a/pkg/storage/unified/sql/testdata/resource_version_get_mysql_sqlite.sql b/pkg/storage/unified/sql/testdata/resource_version_get_mysql_sqlite.sql index bba08c73eb1..329fc0f6d04 100644 --- a/pkg/storage/unified/sql/testdata/resource_version_get_mysql_sqlite.sql +++ b/pkg/storage/unified/sql/testdata/resource_version_get_mysql_sqlite.sql @@ -1,3 +1,4 @@ SELECT "resource_version" FROM "resource_version" - WHERE 1 = 1 AND "group" = ? AND "resource" = ?; + WHERE 1 = 1 AND "group" = ? AND "resource" = ? +; diff --git a/pkg/storage/unified/sql/testdata/resource_version_inc_mysql_sqlite.sql b/pkg/storage/unified/sql/testdata/resource_version_inc_mysql_sqlite.sql index e8a94df9d78..b2d4ceccf3e 100644 --- a/pkg/storage/unified/sql/testdata/resource_version_inc_mysql_sqlite.sql +++ b/pkg/storage/unified/sql/testdata/resource_version_inc_mysql_sqlite.sql @@ -1,4 +1,4 @@ UPDATE "resource_version" SET "resource_version" = resource_version + 1 WHERE 1 = 1 AND "group" = ? AND "resource" = ? -; \ No newline at end of file +;