Fix import paths in templates & generated go files

This commit is contained in:
Denis Arh
2022-11-17 17:33:24 +01:00
parent 83795183f2
commit c966780e00
157 changed files with 252 additions and 253 deletions
@@ -4,7 +4,7 @@ package {{ .package }}
import (
"context"
"github.com/cortezaproject/corteza-server/pkg/dal"
"github.com/cortezaproject/corteza/server/pkg/dal"
{{- range .imports }}
{{ . }}
{{- end }}
@@ -3,7 +3,7 @@ package {{ .package }}
{{ template "gocode/header-gentext.tpl" }}
import (
"github.com/cortezaproject/corteza-server/pkg/dal"
"github.com/cortezaproject/corteza/server/pkg/dal"
{{- range .imports }}
{{ . }}
{{- end }}
@@ -3,7 +3,7 @@ package {{ .package }}
{{ template "gocode/header-gentext.tpl" }}
import (
systemTypes "github.com/cortezaproject/corteza-server/system/types"
systemTypes "github.com/cortezaproject/corteza/server/system/types"
)
{{- range .resources }}
@@ -8,14 +8,14 @@ import (
{{- range .imports }}
{{ . }}
{{- end }}
"github.com/cortezaproject/corteza-server/pkg/actionlog"
intAuth "github.com/cortezaproject/corteza-server/pkg/auth"
"github.com/cortezaproject/corteza-server/pkg/errors"
"github.com/cortezaproject/corteza-server/pkg/filter"
"github.com/cortezaproject/corteza-server/pkg/locale"
"github.com/cortezaproject/corteza-server/pkg/options"
"github.com/cortezaproject/corteza-server/store"
systemTypes "github.com/cortezaproject/corteza-server/system/types"
"github.com/cortezaproject/corteza/server/pkg/actionlog"
intAuth "github.com/cortezaproject/corteza/server/pkg/auth"
"github.com/cortezaproject/corteza/server/pkg/errors"
"github.com/cortezaproject/corteza/server/pkg/filter"
"github.com/cortezaproject/corteza/server/pkg/locale"
"github.com/cortezaproject/corteza/server/pkg/options"
"github.com/cortezaproject/corteza/server/store"
systemTypes "github.com/cortezaproject/corteza/server/system/types"
"golang.org/x/text/language"
)
@@ -5,7 +5,7 @@ package {{ .package }}
import (
"fmt"
"strconv"
"github.com/cortezaproject/corteza-server/pkg/locale"
"github.com/cortezaproject/corteza/server/pkg/locale"
)
type (
@@ -7,11 +7,11 @@ import (
"github.com/spf13/cast"
"strings"
"context"
"github.com/cortezaproject/corteza-server/store"
"github.com/cortezaproject/corteza-server/pkg/rbac"
"github.com/cortezaproject/corteza-server/pkg/actionlog"
systemTypes "github.com/cortezaproject/corteza-server/system/types"
internalAuth "github.com/cortezaproject/corteza-server/pkg/auth"
"github.com/cortezaproject/corteza/server/store"
"github.com/cortezaproject/corteza/server/pkg/rbac"
"github.com/cortezaproject/corteza/server/pkg/actionlog"
systemTypes "github.com/cortezaproject/corteza/server/system/types"
internalAuth "github.com/cortezaproject/corteza/server/pkg/auth"
{{- range .imports }}
{{ . }}
{{- end }}
@@ -8,8 +8,8 @@ import (
{{- range $path, $alias := .imports }}
{{ $alias }} {{ printf "%q" $path }}
{{- end }}
"github.com/cortezaproject/corteza-server/pkg/dal"
"github.com/cortezaproject/corteza-server/pkg/locale"
"github.com/cortezaproject/corteza/server/pkg/dal"
"github.com/cortezaproject/corteza/server/pkg/locale"
"golang.org/x/text/language"
)
@@ -4,7 +4,7 @@ package rdbms
import (
"time"
"github.com/cortezaproject/corteza-server/pkg/expr"
"github.com/cortezaproject/corteza/server/pkg/expr"
{{- range $path, $alias := .imports }}
{{ $alias }} {{ printf "%q" $path }}
{{- end }}
@@ -10,10 +10,10 @@ import (
"github.com/doug-martin/goqu/v9"
"github.com/doug-martin/goqu/v9/exp"
"github.com/cortezaproject/corteza-server/pkg/errors"
"github.com/cortezaproject/corteza-server/pkg/filter"
"github.com/cortezaproject/corteza-server/store"
"github.com/cortezaproject/corteza-server/store"
"github.com/cortezaproject/corteza/server/pkg/errors"
"github.com/cortezaproject/corteza/server/pkg/filter"
"github.com/cortezaproject/corteza/server/store"
"github.com/cortezaproject/corteza/server/store"
{{- range $path, $alias := .imports }}
{{ $alias }} {{ printf "%q" $path }}
{{- end }}
@@ -5,7 +5,7 @@ package tests
import (
"testing"
"github.com/cortezaproject/corteza-server/store"
"github.com/cortezaproject/corteza/server/store"
)
func testAllGenerated(t *testing.T, s store.Storer) {
+2 -2
View File
@@ -1,8 +1,8 @@
package codegen
import (
"github.com/cortezaproject/corteza-server/app"
"github.com/cortezaproject/corteza-server/codegen/schema"
"github.com/cortezaproject/corteza/server/app"
"github.com/cortezaproject/corteza/server/codegen/schema"
)
[...schema.#codegen] &
+2 -2
View File
@@ -1,8 +1,8 @@
package codegen
import (
"github.com/cortezaproject/corteza-server/codegen/schema"
"github.com/cortezaproject/corteza-server/app"
"github.com/cortezaproject/corteza/server/codegen/schema"
"github.com/cortezaproject/corteza/server/app"
)
#_indexPayload: {
+3 -3
View File
@@ -1,8 +1,8 @@
package codegen
import (
"github.com/cortezaproject/corteza-server/app"
"github.com/cortezaproject/corteza-server/codegen/schema"
"github.com/cortezaproject/corteza/server/app"
"github.com/cortezaproject/corteza/server/codegen/schema"
)
@@ -127,7 +127,7 @@ _dalModelFn: {
package: "model"
imports: [
"\"github.com/cortezaproject/corteza-server/\(cmp.ident)/types\"",
"\"github.com/cortezaproject/corteza/server/\(cmp.ident)/types\"",
]
// Operation/resource validators, grouped by resource
+6 -6
View File
@@ -1,8 +1,8 @@
package codegen
import (
"github.com/cortezaproject/corteza-server/app"
"github.com/cortezaproject/corteza-server/codegen/schema"
"github.com/cortezaproject/corteza/server/app"
"github.com/cortezaproject/corteza/server/codegen/schema"
// "strings"
)
@@ -14,7 +14,7 @@ import (
payload: {
package: "resource"
imports: [
"\"github.com/cortezaproject/corteza-server/\(cmp.ident)/types\"",
"\"github.com/cortezaproject/corteza/server/\(cmp.ident)/types\"",
]
resources: [
@@ -37,7 +37,7 @@ import (
package: "resource"
imports: [
for cmp in app.corteza.components {
"\(cmp.ident)Types \"github.com/cortezaproject/corteza-server/\(cmp.ident)/types\""
"\(cmp.ident)Types \"github.com/cortezaproject/corteza/server/\(cmp.ident)/types\""
},
]
@@ -88,7 +88,7 @@ import (
package: "resource"
imports: [
for cmp in app.corteza.components for res in cmp.resources if res.locale != _|_ {
"\(cmp.ident)Types \"github.com/cortezaproject/corteza-server/\(cmp.ident)/types\""
"\(cmp.ident)Types \"github.com/cortezaproject/corteza/server/\(cmp.ident)/types\""
},
]
@@ -115,7 +115,7 @@ import (
payload: {
package: "resource"
imports: [
"\"github.com/cortezaproject/corteza-server/\(cmp.ident)/types\"",
"\"github.com/cortezaproject/corteza/server/\(cmp.ident)/types\"",
]
resources: [
+3 -3
View File
@@ -1,8 +1,8 @@
package codegen
import (
"github.com/cortezaproject/corteza-server/app"
"github.com/cortezaproject/corteza-server/codegen/schema"
"github.com/cortezaproject/corteza/server/app"
"github.com/cortezaproject/corteza/server/codegen/schema"
)
[...schema.#codegen] &
@@ -15,7 +15,7 @@ import (
payload: {
package: "service"
imports: [
"\"github.com/cortezaproject/corteza-server/\(cmp.ident)/types\"",
"\"github.com/cortezaproject/corteza/server/\(cmp.ident)/types\"",
]
resources: [
+2 -2
View File
@@ -1,8 +1,8 @@
package codegen
import (
"github.com/cortezaproject/corteza-server/app"
"github.com/cortezaproject/corteza-server/codegen/schema"
"github.com/cortezaproject/corteza/server/app"
"github.com/cortezaproject/corteza/server/codegen/schema"
"strings"
)
+2 -2
View File
@@ -2,8 +2,8 @@ package codegen
import (
"strings"
"github.com/cortezaproject/corteza-server/app"
"github.com/cortezaproject/corteza-server/codegen/schema"
"github.com/cortezaproject/corteza/server/app"
"github.com/cortezaproject/corteza/server/codegen/schema"
)
[...schema.#codegen] &
@@ -1,8 +1,8 @@
package codegen
import (
"github.com/cortezaproject/corteza-server/codegen/schema"
"github.com/cortezaproject/corteza-server/app"
"github.com/cortezaproject/corteza/server/codegen/schema"
"github.com/cortezaproject/corteza/server/app"
)
[...schema.#codegen] &
@@ -13,7 +13,7 @@ import (
payload: {
package: "service"
imports: [
"\"github.com/cortezaproject/corteza-server/\(cmp.ident)/types\"",
"\"github.com/cortezaproject/corteza/server/\(cmp.ident)/types\"",
]
// All known RBAC resources
+2 -2
View File
@@ -1,8 +1,8 @@
package codegen
import (
"github.com/cortezaproject/corteza-server/app"
"github.com/cortezaproject/corteza-server/codegen/schema"
"github.com/cortezaproject/corteza/server/app"
"github.com/cortezaproject/corteza/server/codegen/schema"
)
[...schema.#codegen] &
+3 -3
View File
@@ -3,8 +3,8 @@ package codegen
import (
"strings"
"list"
"github.com/cortezaproject/corteza-server/app"
"github.com/cortezaproject/corteza-server/codegen/schema"
"github.com/cortezaproject/corteza/server/app"
"github.com/cortezaproject/corteza/server/codegen/schema"
)
@@ -195,7 +195,7 @@ _payload: {
imports: {
// per-component type imports
for cmp in app.corteza.components for res in cmp.resources if res.store != _|_ {
"github.com/cortezaproject/corteza-server/\(cmp.ident)/types": "\(cmp.ident)Type"
"github.com/cortezaproject/corteza/server/\(cmp.ident)/types": "\(cmp.ident)Type"
}
for res in app.corteza.resources if res.store != _|_ {
+2 -2
View File
@@ -1,8 +1,8 @@
package codegen
import (
"github.com/cortezaproject/corteza-server/app"
"github.com/cortezaproject/corteza-server/codegen/schema"
"github.com/cortezaproject/corteza/server/app"
"github.com/cortezaproject/corteza/server/codegen/schema"
)
[...schema.#codegen] &