feat(ocis): move ast and kql pkg to ocis-pkg

Signed-off-by: jkoberg <jkoberg@owncloud.com>

ocis-pkg/ast/test/test.go

@@ -4,8 +4,7 @@ package test
 import (
 	"github.com/google/go-cmp/cmp"
 	"github.com/google/go-cmp/cmp/cmpopts"
-
-	"github.com/owncloud/ocis/v2/services/search/pkg/query/ast"
+	"github.com/owncloud/ocis/v2/ocis-pkg/ast"
 )
 
 // DiffAst returns a human-readable report of the differences between two values

ocis-pkg/kql/cast.go

@@ -5,9 +5,8 @@ import (
 	"time"
 
 	"github.com/jinzhu/now"
+	"github.com/owncloud/ocis/v2/ocis-pkg/ast"
 	"github.com/owncloud/ocis/v2/services/search/pkg/query"
-
-	"github.com/owncloud/ocis/v2/services/search/pkg/query/ast"
 )
 
 func toNode[T ast.Node](in interface{}) (T, error) {

ocis-pkg/kql/connect.go

@@ -3,7 +3,7 @@ package kql
 import (
 	"strings"
 
-	"github.com/owncloud/ocis/v2/services/search/pkg/query/ast"
+	"github.com/owncloud/ocis/v2/ocis-pkg/ast"
 )
 
 // connectNodes connects given nodes

ocis-pkg/kql/dictionary_test.go

@@ -6,12 +6,11 @@ import (
 	"time"
 
 	"github.com/jinzhu/now"
+	"github.com/owncloud/ocis/v2/ocis-pkg/ast"
+	"github.com/owncloud/ocis/v2/ocis-pkg/ast/test"
+	"github.com/owncloud/ocis/v2/ocis-pkg/kql"
 	"github.com/owncloud/ocis/v2/services/search/pkg/query"
 	tAssert "github.com/stretchr/testify/assert"
-
-	"github.com/owncloud/ocis/v2/services/search/pkg/query/ast"
-	"github.com/owncloud/ocis/v2/services/search/pkg/query/ast/test"
-	"github.com/owncloud/ocis/v2/services/search/pkg/query/kql"
 )
 
 func TestParse_Spec(t *testing.T) {

ocis-pkg/kql/factory.go

@@ -3,7 +3,7 @@ package kql
 import (
 	"strings"
 
-	"github.com/owncloud/ocis/v2/services/search/pkg/query/ast"
+	"github.com/owncloud/ocis/v2/ocis-pkg/ast"
 )
 
 func base(text []byte, pos position) (*ast.Base, error) {

ocis-pkg/kql/kql.go

@@ -5,7 +5,7 @@ import (
 	"errors"
 	"time"
 
-	"github.com/owncloud/ocis/v2/services/search/pkg/query/ast"
+	"github.com/owncloud/ocis/v2/ocis-pkg/ast"
 )
 
 // The operator node value definition

ocis-pkg/kql/kql_test.go

@@ -3,11 +3,10 @@ package kql_test
 import (
 	"testing"
 
+	"github.com/owncloud/ocis/v2/ocis-pkg/ast"
+	"github.com/owncloud/ocis/v2/ocis-pkg/kql"
 	"github.com/owncloud/ocis/v2/services/search/pkg/query"
 	tAssert "github.com/stretchr/testify/assert"
-
-	"github.com/owncloud/ocis/v2/services/search/pkg/query/ast"
-	"github.com/owncloud/ocis/v2/services/search/pkg/query/kql"
 )
 
 func TestNewAST(t *testing.T) {

ocis-pkg/kql/validate.go

@@ -1,8 +1,8 @@
 package kql
 
 import (
+	"github.com/owncloud/ocis/v2/ocis-pkg/ast"
 	"github.com/owncloud/ocis/v2/services/search/pkg/query"
-	"github.com/owncloud/ocis/v2/services/search/pkg/query/ast"
 )
 
 func validateAst(a *ast.Ast) error {

services/activitylog/Makefile

@@ -44,7 +44,7 @@ l10n-push:
 
 .PHONY: l10n-read
 l10n-read: $(GO_XGETTEXT)
-	go-xgettext -o $(OUTPUT_DIR)/userlog.pot --keyword=l10n.Template -s pkg/service/response.go
+	go-xgettext -o $(OUTPUT_DIR)/activitylog.pot --keyword=l10n.Template -s pkg/service/response.go
 
 .PHONY: l10n-write
 l10n-write:

services/activitylog/pkg/config/log.go

@@ -2,8 +2,8 @@ package config
 
 // Log defines the available log configuration.
 type Log struct {
-	Level  string `mapstructure:"level" env:"OCIS_LOG_LEVEL;ACTIVITYLOG_USERLOG_LOG_LEVEL" desc:"The log level. Valid values are: 'panic', 'fatal', 'error', 'warn', 'info', 'debug', 'trace'." introductionVersion:"5.0"`
-	Pretty bool   `mapstructure:"pretty" env:"OCIS_LOG_PRETTY;ACTIVITYLOG_USERLOG_LOG_PRETTY" desc:"Activates pretty log output." introductionVersion:"5.0"`
-	Color  bool   `mapstructure:"color" env:"OCIS_LOG_COLOR;ACTIVITYLOG_USERLOG_LOG_COLOR" desc:"Activates colorized log output." introductionVersion:"5.0"`
-	File   string `mapstructure:"file" env:"OCIS_LOG_FILE;ACTIVITYLOG_USERLOG_LOG_FILE" desc:"The path to the log file. Activates logging to this file if set." introductionVersion:"5.0"`
+	Level  string `mapstructure:"level" env:"OCIS_LOG_LEVEL;ACTIVITYLOG_LOG_LEVEL" desc:"The log level. Valid values are: 'panic', 'fatal', 'error', 'warn', 'info', 'debug', 'trace'." introductionVersion:"5.0"`
+	Pretty bool   `mapstructure:"pretty" env:"OCIS_LOG_PRETTY;ACTIVITYLOG_LOG_PRETTY" desc:"Activates pretty log output." introductionVersion:"5.0"`
+	Color  bool   `mapstructure:"color" env:"OCIS_LOG_COLOR;ACTIVITYLOG_LOG_COLOR" desc:"Activates colorized log output." introductionVersion:"5.0"`
+	File   string `mapstructure:"file" env:"OCIS_LOG_FILE;ACTIVITYLOG_LOG_FILE" desc:"The path to the log file. Activates logging to this file if set." introductionVersion:"5.0"`
 }

services/activitylog/pkg/service/http.go

@@ -15,11 +15,11 @@ import (
 	"github.com/cs3org/reva/v2/pkg/utils"
 	libregraph "github.com/owncloud/libre-graph-api-go"
 
+	"github.com/owncloud/ocis/v2/ocis-pkg/ast"
+	"github.com/owncloud/ocis/v2/ocis-pkg/kql"
 	"github.com/owncloud/ocis/v2/ocis-pkg/l10n"
 	ehmsg "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/eventhistory/v0"
 	ehsvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/eventhistory/v0"
-	"github.com/owncloud/ocis/v2/services/search/pkg/query/ast"
-	"github.com/owncloud/ocis/v2/services/search/pkg/query/kql"
 )
 
 var (

services/search/Makefile

@@ -26,7 +26,7 @@ include ../../.make/generate.mk
 .PHONY: ci-go-generate
 ci-go-generate: $(PIGEON) $(MOCKERY) # CI runs ci-node-generate automatically before this target
 	$(MOCKERY)
-	$(PIGEON) -optimize-grammar -optimize-parser -o pkg/query/kql/dictionary_gen.go pkg/query/kql/dictionary.peg
+	$(PIGEON) -optimize-grammar -optimize-parser -o ../../ocis-pkg/kql/dictionary_gen.go ../../ocis-pkg/kql/dictionary.peg
 
 .PHONY: ci-node-generate
 ci-node-generate:

services/search/pkg/query/bleve/bleve.go

@@ -4,8 +4,8 @@ package bleve
 import (
 	bQuery "github.com/blevesearch/bleve/v2/search/query"
 
+	"github.com/owncloud/ocis/v2/ocis-pkg/kql"
 	"github.com/owncloud/ocis/v2/services/search/pkg/query"
-	"github.com/owncloud/ocis/v2/services/search/pkg/query/kql"
 )
 
 // Creator is combines a Builder and a Compiler which is used to Create the query.

services/search/pkg/query/bleve/compiler.go

@@ -6,8 +6,8 @@ import (
 
 	"github.com/blevesearch/bleve/v2"
 	bleveQuery "github.com/blevesearch/bleve/v2/search/query"
-	"github.com/owncloud/ocis/v2/services/search/pkg/query/ast"
-	"github.com/owncloud/ocis/v2/services/search/pkg/query/kql"
+	"github.com/owncloud/ocis/v2/ocis-pkg/ast"
+	"github.com/owncloud/ocis/v2/ocis-pkg/kql"
 )
 
 var _fields = map[string]string{

services/search/pkg/query/bleve/compiler_test.go

@@ -5,9 +5,8 @@ import (
 	"time"
 
 	"github.com/blevesearch/bleve/v2/search/query"
+	"github.com/owncloud/ocis/v2/ocis-pkg/ast"
 	tAssert "github.com/stretchr/testify/assert"
-
-	"github.com/owncloud/ocis/v2/services/search/pkg/query/ast"
 )
 
 var timeMustParse = func(t *testing.T, ts string) time.Time {

services/search/pkg/query/error.go

@@ -3,7 +3,7 @@ package query
 import (
 	"fmt"
 
-	"github.com/owncloud/ocis/v2/services/search/pkg/query/ast"
+	"github.com/owncloud/ocis/v2/ocis-pkg/ast"
 )
 
 // StartsWithBinaryOperatorError records an error and the operation that caused it.

services/search/pkg/query/query.go

@@ -1,9 +1,7 @@
 // Package query provides functions to work with the different search query flavours.
 package query
 
-import (
-	"github.com/owncloud/ocis/v2/services/search/pkg/query/ast"
-)
+import "github.com/owncloud/ocis/v2/ocis-pkg/ast"
 
 // Builder is the interface that wraps the basic Build method.
 type Builder interface {