From ddda0b5ece29bcd3b4f8a3b6f2e0f471b88ff229 Mon Sep 17 00:00:00 2001 From: Nicola Murino Date: Sun, 25 Sep 2022 20:29:43 +0200 Subject: [PATCH] SQLite provider: remove code only used for shared providers Signed-off-by: Nicola Murino --- go.mod | 8 ++++---- go.sum | 8 ++++---- internal/dataprovider/sqlite.go | 32 +++++++++++++------------------- 3 files changed, 21 insertions(+), 27 deletions(-) diff --git a/go.mod b/go.mod index 426944d1..b6a5f799 100644 --- a/go.mod +++ b/go.mod @@ -65,8 +65,8 @@ require ( go.etcd.io/bbolt v1.3.6 go.uber.org/automaxprocs v1.5.1 gocloud.dev v0.26.0 - golang.org/x/crypto v0.0.0-20220829220503-c86fa9a7ed90 - golang.org/x/net v0.0.0-20220909164309-bea034e7d591 + golang.org/x/crypto v0.0.0-20220924013350-4ba4fb4dd9e7 + golang.org/x/net v0.0.0-20220923203811-8be639271d50 golang.org/x/oauth2 v0.0.0-20220909003341-f21342109be1 golang.org/x/sys v0.0.0-20220919091848-fb04ddd9f9c8 golang.org/x/time v0.0.0-20220922220347-f3bd1da661af @@ -167,6 +167,6 @@ require ( replace ( github.com/jlaffaye/ftp => github.com/drakkan/ftp v0.0.0-20201114075148-9b9adce499a9 - golang.org/x/crypto => github.com/drakkan/crypto v0.0.0-20220831070132-e3c36f2ab82b - golang.org/x/net => github.com/drakkan/net v0.0.0-20220913160159-a08dc61b7895 + golang.org/x/crypto => github.com/drakkan/crypto v0.0.0-20220925175854-fd2128ac8ea8 + golang.org/x/net => github.com/drakkan/net v0.0.0-20220925175748-018cd5f6a745 ) diff --git a/go.sum b/go.sum index c8ec7527..6aa70696 100644 --- a/go.sum +++ b/go.sum @@ -264,12 +264,12 @@ github.com/dimchansky/utfbom v1.1.0/go.mod h1:rO41eb7gLfo8SF1jd9F8HplJm1Fewwi4mQ github.com/dimchansky/utfbom v1.1.1/go.mod h1:SxdoEBH5qIqFocHMyGOXVAybYJdr71b1Q/j0mACtrfE= github.com/dnaeon/go-vcr v1.2.0 h1:zHCHvJYTMh1N7xnV7zf1m1GPBF9Ad0Jk/whtQ1663qI= github.com/dnaeon/go-vcr v1.2.0/go.mod h1:R4UdLID7HZT3taECzJs4YgbbH6PIGXB6W/sc5OLb6RQ= -github.com/drakkan/crypto v0.0.0-20220831070132-e3c36f2ab82b h1:kCNBtUFKfhiUaE1ZMgh83pXFVP2ZIHktwV15lmgD0Ok= -github.com/drakkan/crypto v0.0.0-20220831070132-e3c36f2ab82b/go.mod h1:SiM6ypd8Xu1xldObYtbDztuUU7xUzMnUULfphXFZmro= +github.com/drakkan/crypto v0.0.0-20220925175854-fd2128ac8ea8 h1:3VrLY3sbiilkjtMAWeYbM+KyGJiJi18UP2Rif4ZLU1Q= +github.com/drakkan/crypto v0.0.0-20220925175854-fd2128ac8ea8/go.mod h1:SiM6ypd8Xu1xldObYtbDztuUU7xUzMnUULfphXFZmro= github.com/drakkan/ftp v0.0.0-20201114075148-9b9adce499a9 h1:LPH1dEblAOO/LoG7yHPMtBLXhQmjaga91/DDjWk9jWA= github.com/drakkan/ftp v0.0.0-20201114075148-9b9adce499a9/go.mod h1:2lmrmq866uF2tnje75wQHzmPXhmSWUt7Gyx2vgK1RCU= -github.com/drakkan/net v0.0.0-20220913160159-a08dc61b7895 h1:YZkDIISo8YO7PAOX85GYxGCayjBqAutIAjL+XsdEgkc= -github.com/drakkan/net v0.0.0-20220913160159-a08dc61b7895/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= +github.com/drakkan/net v0.0.0-20220925175748-018cd5f6a745 h1:Lgtp3izEEJFPxMLJfLWxc1htWNMZhK7EkBo0/dmEX4E= +github.com/drakkan/net v0.0.0-20220925175748-018cd5f6a745/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= github.com/eikenb/pipeat v0.0.0-20210730190139-06b3e6902001 h1:/ZshrfQzayqRSBDodmp3rhNCHJCff+utvgBuWRbiqu4= github.com/eikenb/pipeat v0.0.0-20210730190139-06b3e6902001/go.mod h1:kltMsfRMTHSFdMbK66XdS8mfMW77+FZA1fGY1xYMF84= github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= diff --git a/internal/dataprovider/sqlite.go b/internal/dataprovider/sqlite.go index 539033ce..47628ca3 100644 --- a/internal/dataprovider/sqlite.go +++ b/internal/dataprovider/sqlite.go @@ -56,7 +56,6 @@ DROP TABLE IF EXISTS "{{rules_actions_mapping}}"; DROP TABLE IF EXISTS "{{events_rules}}"; DROP TABLE IF EXISTS "{{events_actions}}"; DROP TABLE IF EXISTS "{{tasks}}"; -DROP TABLE IF EXISTS "{{nodes}}"; DROP TABLE IF EXISTS "{{schema_version}}"; ` sqliteInitialSQL = `CREATE TABLE "{{schema_version}}" ("id" integer NOT NULL PRIMARY KEY AUTOINCREMENT, "version" integer NOT NULL); @@ -178,10 +177,6 @@ CREATE INDEX "{{prefix}}admins_groups_mapping_admin_id_idx" ON "{{admins_groups_ CREATE INDEX "{{prefix}}admins_groups_mapping_group_id_idx" ON "{{admins_groups_mapping}}" ("group_id"); ` sqliteV22DownSQL = `DROP TABLE "{{admins_groups_mapping}}";` - sqliteV23SQL = `CREATE TABLE "{{nodes}}" ("id" integer NOT NULL PRIMARY KEY AUTOINCREMENT, -"name" varchar(255) NOT NULL UNIQUE, "data" text NOT NULL, "created_at" bigint NOT NULL, -"updated_at" bigint NOT NULL);` - sqliteV23DownSQL = `DROP TABLE "{{nodes}}";` ) // SQLiteProvider defines the auth provider for SQLite database @@ -583,24 +578,24 @@ func (p *SQLiteProvider) updateTaskTimestamp(name string) error { return sqlCommonUpdateTaskTimestamp(name, p.dbHandle) } -func (p *SQLiteProvider) addNode() error { - return sqlCommonAddNode(p.dbHandle) +func (*SQLiteProvider) addNode() error { + return ErrNotImplemented } -func (p *SQLiteProvider) getNodeByName(name string) (Node, error) { - return sqlCommonGetNodeByName(name, p.dbHandle) +func (*SQLiteProvider) getNodeByName(name string) (Node, error) { + return Node{}, ErrNotImplemented } -func (p *SQLiteProvider) getNodes() ([]Node, error) { - return sqlCommonGetNodes(p.dbHandle) +func (*SQLiteProvider) getNodes() ([]Node, error) { + return nil, ErrNotImplemented } -func (p *SQLiteProvider) updateNodeTimestamp() error { - return sqlCommonUpdateNodeTimestamp(p.dbHandle) +func (*SQLiteProvider) updateNodeTimestamp() error { + return ErrNotImplemented } -func (p *SQLiteProvider) cleanupNodes() error { - return sqlCommonCleanupNodes(p.dbHandle) +func (*SQLiteProvider) cleanupNodes() error { + return ErrNotImplemented } func (p *SQLiteProvider) setFirstDownloadTimestamp(username string) error { @@ -780,8 +775,8 @@ func updateSQLiteDatabaseFrom21To22(dbHandle *sql.DB) error { func updateSQLiteDatabaseFrom22To23(dbHandle *sql.DB) error { logger.InfoToConsole("updating database schema version: 22 -> 23") providerLog(logger.LevelInfo, "updating database schema version: 22 -> 23") - sql := strings.ReplaceAll(sqliteV23SQL, "{{nodes}}", sqlTableNodes) - return sqlCommonExecSQLAndUpdateDBVersion(dbHandle, []string{sql}, 23, true) + + return sqlCommonExecSQLAndUpdateDBVersion(dbHandle, []string{`SELECT 1`}, 23, true) } func downgradeSQLiteDatabaseFrom20To19(dbHandle *sql.DB) error { @@ -813,8 +808,7 @@ func downgradeSQLiteDatabaseFrom22To21(dbHandle *sql.DB) error { func downgradeSQLiteDatabaseFrom23To22(dbHandle *sql.DB) error { logger.InfoToConsole("downgrading database schema version: 23 -> 22") providerLog(logger.LevelInfo, "downgrading database schema version: 23 -> 22") - sql := strings.ReplaceAll(sqliteV23DownSQL, "{{nodes}}", sqlTableNodes) - return sqlCommonExecSQLAndUpdateDBVersion(dbHandle, []string{sql}, 22, false) + return sqlCommonExecSQLAndUpdateDBVersion(dbHandle, []string{`SELECT 1`}, 22, false) } /*func setPragmaFK(dbHandle *sql.DB, value string) error {