Pg_query integration (#691)

Integrate pg_query parser

Author: Zhaars

.circleci/config.yml

@@ -564,7 +564,7 @@ jobs:
       - checkout
       # https://circleci.com/docs/2.0/building-docker-images/#docker-version
       - setup_remote_docker:
-          version: 18.09.3
+          version: docker24
       - run:
           name: Install Docker client
           command: |

acrablock/dataEncryptor.go

@@ -2,10 +2,11 @@ package acrablock
 
 import (
 	"context"
+
 	"github.com/cossacklabs/acra/acrastruct"
 	"github.com/cossacklabs/acra/decryptor/base"
-	"github.com/cossacklabs/acra/encryptor"
-	"github.com/cossacklabs/acra/encryptor/config"
+	encryptor "github.com/cossacklabs/acra/encryptor/base"
+	"github.com/cossacklabs/acra/encryptor/base/config"
 	"github.com/cossacklabs/acra/keystore"
 )
 

acrablock/dataEncryptor_test.go

@@ -3,12 +3,14 @@ package acrablock
 import (
 	"bytes"
 	"errors"
+	"testing"
+
+	"github.com/cossacklabs/themis/gothemis/keys"
+
 	"github.com/cossacklabs/acra/acrastruct"
-	"github.com/cossacklabs/acra/encryptor/config"
+	"github.com/cossacklabs/acra/encryptor/base/config"
 	"github.com/cossacklabs/acra/keystore"
 	"github.com/cossacklabs/acra/keystore/mocks"
-	"github.com/cossacklabs/themis/gothemis/keys"
-	"testing"
 )
 
 func TestSuccessDataEncryptionWithClientID(t *testing.T) {

cmd/acra-keys/keys/generate.go

@@ -79,7 +79,7 @@ type GenerateKeySubcommand struct {
 	poisonRecord    bool
 }
 
-// GetParamsExtractor return service params extractor
+// GetExtractor return service params extractor
 func (g *GenerateKeySubcommand) GetExtractor() *args.ServiceExtractor {
 	return g.extractor
 }

cmd/acra-server/acra-server.go

@@ -55,7 +55,7 @@ import (
 	"github.com/cossacklabs/acra/decryptor/base"
 	"github.com/cossacklabs/acra/decryptor/mysql"
 	"github.com/cossacklabs/acra/decryptor/postgresql"
-	"github.com/cossacklabs/acra/encryptor/config_loader"
+	"github.com/cossacklabs/acra/encryptor/base/config_loader"
 	"github.com/cossacklabs/acra/keystore"
 	"github.com/cossacklabs/acra/keystore/filesystem"
 	"github.com/cossacklabs/acra/keystore/keyloader"

cmd/acra-server/common/client_session.go

@@ -22,10 +22,11 @@ import (
 	"sync"
 	"sync/atomic"
 
+	log "github.com/sirupsen/logrus"
+
 	"github.com/cossacklabs/acra/decryptor/base"
 	"github.com/cossacklabs/acra/logging"
 	"github.com/cossacklabs/acra/network"
-	log "github.com/sirupsen/logrus"
 )
 
 // ClientSession handles connection between database and AcraServer.
@@ -35,7 +36,6 @@ type ClientSession struct {
 	connectionToDb net.Conn
 	ctx            context.Context
 	logger         *log.Entry
-	statements     base.PreparedStatementRegistry
 	protocolState  interface{}
 	mutex          sync.RWMutex
 	data           map[string]interface{}
@@ -114,17 +114,6 @@ func (clientSession *ClientSession) DatabaseConnection() net.Conn {
 	return clientSession.connectionToDb
 }
 
-// PreparedStatementRegistry returns prepared statement registry of this session.
-// The session does not have a registry by default, it must be set with SetPreparedStatementRegistry.
-func (clientSession *ClientSession) PreparedStatementRegistry() base.PreparedStatementRegistry {
-	return clientSession.statements
-}
-
-// SetPreparedStatementRegistry sets prepared statement registry for this session.
-func (clientSession *ClientSession) SetPreparedStatementRegistry(registry base.PreparedStatementRegistry) {
-	clientSession.statements = registry
-}
-
 // ProtocolState returns private protocol state of this session.
 // The session does not have any state by default, it must be set with SetProtocolState.
 func (clientSession *ClientSession) ProtocolState() interface{} {

cmd/acra-server/common/config.go

@@ -24,9 +24,9 @@ import (
 	"go.opencensus.io/trace"
 
 	acracensor "github.com/cossacklabs/acra/acra-censor"
-	"github.com/cossacklabs/acra/encryptor"
-	encryptorConfig "github.com/cossacklabs/acra/encryptor/config"
-	"github.com/cossacklabs/acra/encryptor/config_loader"
+	"github.com/cossacklabs/acra/encryptor/base"
+	encryptorConfig "github.com/cossacklabs/acra/encryptor/base/config"
+	"github.com/cossacklabs/acra/encryptor/base/config_loader"
 	"github.com/cossacklabs/acra/keystore"
 	"github.com/cossacklabs/acra/logging"
 	"github.com/cossacklabs/acra/network"
@@ -56,7 +56,7 @@ type Config struct {
 	censor                     acracensor.AcraCensorInterface
 	TraceToLog                 bool
 	tableSchema                encryptorConfig.TableSchemaStore
-	dataEncryptor              encryptor.DataEncryptor
+	dataEncryptor              base.DataEncryptor
 	keystore                   keystore.ServerKeyStore
 	traceOptions               []trace.StartOption
 	serviceName                string

cmd/acra-translator/grpc_api/api.pb.go

@@ -2,13 +2,15 @@ package crypto
 
 import (
 	"fmt"
+
+	"github.com/sirupsen/logrus"
+
 	"github.com/cossacklabs/acra/acrablock"
 	"github.com/cossacklabs/acra/decryptor/base"
-	"github.com/cossacklabs/acra/encryptor"
-	"github.com/cossacklabs/acra/encryptor/config"
+	encryptor "github.com/cossacklabs/acra/encryptor/base"
+	"github.com/cossacklabs/acra/encryptor/base/config"
 	"github.com/cossacklabs/acra/logging"
 	"github.com/cossacklabs/acra/utils"
-	"github.com/sirupsen/logrus"
 )
 
 // AcraBlockEnvelopeID represent AcraBlock EnvelopeID will be serialized inside CryptoContainer

crypto/acrablock.go

@@ -7,8 +7,8 @@ import (
 
 	"github.com/cossacklabs/acra/acrastruct"
 	"github.com/cossacklabs/acra/decryptor/base"
-	"github.com/cossacklabs/acra/encryptor"
-	"github.com/cossacklabs/acra/encryptor/config"
+	encryptor "github.com/cossacklabs/acra/encryptor/base"
+	"github.com/cossacklabs/acra/encryptor/base/config"
 	"github.com/cossacklabs/acra/logging"
 	"github.com/cossacklabs/acra/utils"
 )