Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

init: remove pkgs that were moved to iam, gqlgen-plugin repos, update imports #3

Merged
merged 5 commits into from
Aug 27, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .buildkite/pipeline.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ steps:
TEST_DB_URL: "libsql://file::memory:?cache=shared"
plugins:
- docker#v5.11.0:
image: golang:1.22.6
image: golang:1.23.0
command: ["go", "test", "-coverprofile=coverage.out", "./..."]
environment:
- "TEST_DB_URL"
Expand All @@ -68,7 +68,7 @@ steps:
- "sqlite://file:ent?mode=memory&cache=shared"
plugins:
- docker#v5.11.0:
image: golang:1.22.6
image: golang:1.23.0
command: ["go", "test", "-coverprofile=coverage.out", "./..."]
environment:
- "TEST_DB_URL"
Expand Down Expand Up @@ -135,7 +135,7 @@ steps:
artifact_paths: "bin/${APP_NAME}"
plugins:
- docker#v5.11.0:
image: "golang:1.22.6"
image: "golang:1.23.0"
environment:
- CGO_ENABLED=0
- GOOS=linux
Expand All @@ -145,7 +145,7 @@ steps:
artifact_paths: "bin/${APP_NAME}-cli"
plugins:
- docker#v5.11.0:
image: "golang:1.22.6"
image: "golang:1.23.0"
environment:
- GOOS=darwin
- GOARCH=arm64
Expand Down
3 changes: 2 additions & 1 deletion cmd/cli/cmd/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,10 @@ import (
"github.com/99designs/keyring"
"golang.org/x/oauth2"

"github.com/theopenlane/iam/tokens"

"github.com/theopenlane/core/pkg/models"
"github.com/theopenlane/core/pkg/openlaneclient"
"github.com/theopenlane/core/pkg/tokens"
)

const (
Expand Down
16 changes: 14 additions & 2 deletions cmd/cli/cmd/version/root.go
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
package version

import (
"fmt"
"runtime"

"github.com/spf13/cobra"

"github.com/theopenlane/core/cmd/cli/cmd"
"github.com/theopenlane/core/internal/constants"
"github.com/theopenlane/core/pkg/utils/cli/useragent"
)

// VersionCmd is the version command
Expand All @@ -15,10 +17,20 @@ var command = &cobra.Command{
Long: `The version command prints the version of the CLI`,
Run: func(cmd *cobra.Command, _ []string) {
cmd.Println(constants.VerboseCLIVersion)
cmd.Printf("User Agent: %s\n", useragent.GetUserAgent())
cmd.Printf("User Agent: %s\n", getUserAgent())
},
}

func init() {
cmd.RootCmd.AddCommand(command)
}

func getUserAgent() string {
product := "openlane-cli"
productVersion := constants.CLIVersion

userAgent := fmt.Sprintf("%s/%s (%s) %s (%s)",
product, productVersion, runtime.GOOS, runtime.GOARCH, runtime.Version())

return userAgent
}
7 changes: 4 additions & 3 deletions config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,11 @@ import (
"github.com/theopenlane/entx"
"github.com/theopenlane/iam/fgax"

"github.com/theopenlane/iam/totp"
"github.com/theopenlane/utils/emails"
"github.com/theopenlane/utils/totp"

"github.com/theopenlane/iam/sessions"
"github.com/theopenlane/iam/tokens"

"github.com/theopenlane/core/internal/ent/entconfig"
"github.com/theopenlane/core/internal/httpserve/handlers"
Expand All @@ -29,8 +32,6 @@ import (
"github.com/theopenlane/core/pkg/middleware/redirect"
"github.com/theopenlane/core/pkg/middleware/secure"
"github.com/theopenlane/core/pkg/otelx"
"github.com/theopenlane/core/pkg/sessions"
"github.com/theopenlane/core/pkg/tokens"
)

var (
Expand Down
29 changes: 11 additions & 18 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -14,20 +14,14 @@ require (
github.com/alicebob/miniredis/v2 v2.33.0
github.com/alitto/pond v1.9.1
github.com/brianvoe/gofakeit/v7 v7.0.4
github.com/bytedance/sonic v1.12.2
github.com/cenkalti/backoff/v4 v4.3.0
github.com/coreos/go-oidc/v3 v3.11.0
github.com/dustinkirkland/golang-petname v0.0.0-20240428194347-eebcea082ee0
github.com/gertd/go-pluralize v0.2.1
github.com/getkin/kin-openapi v0.127.0
github.com/go-webauthn/webauthn v0.11.1
github.com/gocarina/gocsv v0.0.0-20240520201108-78e41c74b4b1
github.com/goccy/go-yaml v1.12.0
github.com/golang-jwt/jwt/v5 v5.2.1
github.com/google/go-github/v63 v63.0.0
github.com/google/go-querystring v1.1.0
github.com/google/uuid v1.6.0
github.com/gorilla/securecookie v1.1.2
github.com/gorilla/websocket v1.5.3
github.com/hashicorp/go-multierror v1.1.1
github.com/invopop/jsonschema v0.12.0
Expand Down Expand Up @@ -62,12 +56,12 @@ require (
github.com/theopenlane/echo-prometheus v0.1.0
github.com/theopenlane/echox v0.1.0
github.com/theopenlane/echozap v0.1.0
github.com/theopenlane/entx v0.1.3
github.com/theopenlane/entx v0.1.4
github.com/theopenlane/gqlgen-plugins v0.1.0
github.com/theopenlane/httpsling v0.1.0
github.com/theopenlane/iam v0.1.0
github.com/theopenlane/utils v0.1.1
github.com/theopenlane/iam v0.1.4
github.com/theopenlane/utils v0.1.2
github.com/tursodatabase/libsql-client-go v0.0.0-20240812094001-348a4e45b535
github.com/valyala/bytebufferpool v1.0.0
github.com/vektah/gqlparser/v2 v2.5.16
github.com/vmihailenco/msgpack/v5 v5.4.1
github.com/wundergraph/graphql-go-tools v1.67.4
Expand All @@ -80,12 +74,10 @@ require (
go.uber.org/zap v1.27.0
gocloud.dev v0.39.0
golang.org/x/crypto v0.26.0
golang.org/x/exp v0.0.0-20240823005443-9b4947da3948
golang.org/x/oauth2 v0.22.0
golang.org/x/term v0.23.0
golang.org/x/text v0.17.0
golang.org/x/tools v0.24.0
google.golang.org/api v0.194.0
modernc.org/sqlite v1.32.0
)

Expand All @@ -108,12 +100,9 @@ require (
github.com/beorn7/perks v1.0.1 // indirect
github.com/boombuler/barcode v1.0.2 // indirect
github.com/buger/jsonparser v1.1.1 // indirect
github.com/bytedance/sonic/loader v0.2.0 // indirect
github.com/cenkalti/backoff v2.2.1+incompatible // indirect
github.com/cespare/xxhash/v2 v2.3.0 // indirect
github.com/chzyer/readline v1.5.1 // indirect
github.com/cloudwego/base64x v0.1.4 // indirect
github.com/cloudwego/iasm v0.2.0 // indirect
github.com/coder/websocket v1.8.12 // indirect
github.com/containerd/continuity v0.4.3 // indirect
github.com/cpuguy83/go-md2man/v2 v2.0.4 // indirect
Expand All @@ -139,7 +128,6 @@ require (
github.com/go-faster/errors v0.7.1 // indirect
github.com/go-faster/jx v1.1.0 // indirect
github.com/go-faster/yaml v0.4.6 // indirect
github.com/go-jose/go-jose/v4 v4.0.4 // indirect
github.com/go-logr/logr v1.4.2 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/go-openapi/inflect v0.21.0 // indirect
Expand All @@ -149,15 +137,19 @@ require (
github.com/go-viper/mapstructure/v2 v2.1.0 // indirect
github.com/go-webauthn/x v0.1.14 // indirect
github.com/goccy/go-json v0.10.3 // indirect
github.com/goccy/go-yaml v1.12.0 // indirect
github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/snappy v0.0.4 // indirect
github.com/google/cel-go v0.21.0 // indirect
github.com/google/go-cmp v0.6.0 // indirect
github.com/google/go-github/v63 v63.0.0 // indirect
github.com/google/go-querystring v1.1.0 // indirect
github.com/google/go-tpm v0.9.1 // indirect
github.com/google/s2a-go v0.1.8 // indirect
github.com/googleapis/enterprise-certificate-proxy v0.3.3 // indirect
github.com/googleapis/gax-go/v2 v2.13.0 // indirect
github.com/gorilla/securecookie v1.1.2 // indirect
github.com/gotestyourself/gotestyourself v2.2.0+incompatible // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.22.0 // indirect
github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c // indirect
Expand All @@ -175,7 +167,6 @@ require (
github.com/josharian/intern v1.0.0 // indirect
github.com/karlseguin/ccache/v3 v3.0.5 // indirect
github.com/klauspost/compress v1.17.9 // indirect
github.com/klauspost/cpuid/v2 v2.2.8 // indirect
github.com/knadh/koanf/maps v0.1.1 // indirect
github.com/lestrrat-go/blackmagic v1.0.2 // indirect
github.com/lestrrat-go/httpcc v1.0.1 // indirect
Expand Down Expand Up @@ -233,8 +224,8 @@ require (
github.com/spf13/viper v1.19.0 // indirect
github.com/stretchr/objx v0.5.2 // indirect
github.com/subosito/gotenv v1.6.0 // indirect
github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
github.com/urfave/cli/v2 v2.27.4 // indirect
github.com/valyala/bytebufferpool v1.0.0 // indirect
github.com/valyala/fasttemplate v1.2.2 // indirect
github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect
github.com/wk8/go-ordered-map/v2 v2.1.8 // indirect
Expand All @@ -250,12 +241,14 @@ require (
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
go.uber.org/multierr v1.11.0 // indirect
golang.org/x/arch v0.9.0 // indirect
golang.org/x/exp v0.0.0-20240823005443-9b4947da3948 // indirect
golang.org/x/mod v0.20.0 // indirect
golang.org/x/net v0.28.0 // indirect
golang.org/x/sync v0.8.0 // indirect
golang.org/x/sys v0.24.0 // indirect
golang.org/x/time v0.6.0 // indirect
golang.org/x/xerrors v0.0.0-20240716161551-93cc26a95ae9 // indirect
google.golang.org/api v0.194.0 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20240826202546-f6391c0de4c7 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240826202546-f6391c0de4c7 // indirect
google.golang.org/grpc v1.65.0 // indirect
Expand Down
22 changes: 8 additions & 14 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,6 @@ github.com/buger/jsonparser v1.1.1 h1:2PnMjfWD7wBILjqQbt530v576A/cAbQvEW9gGIpYMU
github.com/buger/jsonparser v1.1.1/go.mod h1:6RYKKt7H4d4+iWqouImQ9R2FZql3VbhNgx27UK13J/0=
github.com/bytedance/sonic v1.12.2 h1:oaMFuRTpMHYLpCntGca65YWt5ny+wAceDERTkT2L9lg=
github.com/bytedance/sonic v1.12.2/go.mod h1:B8Gt/XvtZ3Fqj+iSKMypzymZxw/FVwgIGKzMzT9r/rk=
github.com/bytedance/sonic/loader v0.1.1/go.mod h1:ncP89zfokxS5LZrJxl5z0UJcsk4M4yY2JpfqGeCtNLU=
github.com/bytedance/sonic/loader v0.2.0 h1:zNprn+lsIP06C/IqCHs3gPQIvnvpKbbxyXQP1iU4kWM=
github.com/bytedance/sonic/loader v0.2.0/go.mod h1:ncP89zfokxS5LZrJxl5z0UJcsk4M4yY2JpfqGeCtNLU=
github.com/cenkalti/backoff v2.2.1+incompatible h1:tNowT99t7UNflLxfYYSlKYsBpXdEet03Pg2g16Swow4=
Expand Down Expand Up @@ -108,8 +107,6 @@ github.com/coder/websocket v1.8.12 h1:5bUXkEPPIbewrnkU8LTCLVaxi4N4J8ahufH2vlo4NA
github.com/coder/websocket v1.8.12/go.mod h1:LNVeNrXQZfe5qhS9ALED3uA+l5pPqvwXg3CKoDBB2gs=
github.com/containerd/continuity v0.4.3 h1:6HVkalIp+2u1ZLH1J/pYX2oBVXlJZvh1X1A7bEZ9Su8=
github.com/containerd/continuity v0.4.3/go.mod h1:F6PTNCKepoxEaXLQp3wDAjygEnImnZ/7o4JzpodfroQ=
github.com/coreos/go-oidc/v3 v3.11.0 h1:Ia3MxdwpSw702YW0xgfmP1GVCMA9aEFWu12XUZ3/OtI=
github.com/coreos/go-oidc/v3 v3.11.0/go.mod h1:gE3LgjOgFoHi9a4ce4/tJczr0Ai2/BoDhf0r5lltWI0=
github.com/cpuguy83/go-md2man/v2 v2.0.4 h1:wfIWP927BUkWJb2NmU/kNDYIBTh/ziUX91+lVfRxZq4=
github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
github.com/danieljoos/wincred v1.2.2 h1:774zMFJrqaeYCK2W57BgAem/MLi6mtSE47MB6BOJ0i0=
Expand Down Expand Up @@ -176,8 +173,6 @@ github.com/go-faster/jx v1.1.0 h1:ZsW3wD+snOdmTDy9eIVgQdjUpXRRV4rqW8NS3t+20bg=
github.com/go-faster/jx v1.1.0/go.mod h1:vKDNikrKoyUmpzaJ0OkIkRQClNHFX/nF3dnTJZb3skg=
github.com/go-faster/yaml v0.4.6 h1:lOK/EhI04gCpPgPhgt0bChS6bvw7G3WwI8xxVe0sw9I=
github.com/go-faster/yaml v0.4.6/go.mod h1:390dRIvV4zbnO7qC9FGo6YYutc+wyyUSHBgbXL52eXk=
github.com/go-jose/go-jose/v4 v4.0.4 h1:VsjPI33J0SB9vQM6PLmNjoHqMQNGPiZ0rHL7Ni7Q6/E=
github.com/go-jose/go-jose/v4 v4.0.4/go.mod h1:NKb5HO1EZccyMpiZNbdUw/14tiXNyUJh188dfnMCAfc=
github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY=
github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
Expand Down Expand Up @@ -327,7 +322,6 @@ github.com/karlseguin/ccache/v3 v3.0.5 h1:hFX25+fxzNjsRlREYsoGNa2LoVEw5mPF8wkWq/
github.com/karlseguin/ccache/v3 v3.0.5/go.mod h1:qxC372+Qn+IBj8Pe3KvGjHPj0sWwEF7AeZVhsNPZ6uY=
github.com/klauspost/compress v1.17.9 h1:6KIumPrER1LHsvBVuDa0r5xaG0Es51mhhB9BQB2qeMA=
github.com/klauspost/compress v1.17.9/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw=
github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=
github.com/klauspost/cpuid/v2 v2.2.8 h1:+StwCXwm9PdpiEkPyzBXIy+M9KUb4ODm0Zarf1kS5BM=
github.com/klauspost/cpuid/v2 v2.2.8/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws=
github.com/knadh/koanf/maps v0.1.1 h1:G5TjmUh2D7G2YWf5SQQqSiHRJEjaicvU0KpypqB3NIs=
Expand All @@ -342,7 +336,6 @@ github.com/knadh/koanf/providers/posflag v0.1.0 h1:mKJlLrKPcAP7Ootf4pBZWJ6J+4wHY
github.com/knadh/koanf/providers/posflag v0.1.0/go.mod h1:SYg03v/t8ISBNrMBRMlojH8OsKowbkXV7giIbBVgbz0=
github.com/knadh/koanf/v2 v2.1.1 h1:/R8eXqasSTsmDCsAyYj+81Wteg8AqrV9CP6gvsTsOmM=
github.com/knadh/koanf/v2 v2.1.1/go.mod h1:4mnTRbZCK+ALuBXHZMjDfG9y714L7TykVnZkXbMU3Es=
github.com/knz/go-libedit v1.10.1/go.mod h1:MZTVkCWyz0oBc7JOWP3wNAzd002ZbM/5hgShxwh4x8M=
github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
Expand Down Expand Up @@ -546,14 +539,16 @@ github.com/theopenlane/echox v0.1.0 h1:y4Z2shaODCLwXHsHBrY/EkH/2sIuo49xdIfxx7h+Z
github.com/theopenlane/echox v0.1.0/go.mod h1:RaynhPvY9qbLOVlcO7Js1NqZ66+CP9hVBa0c7ehNYA4=
github.com/theopenlane/echozap v0.1.0 h1:qoD1tEGQoTMPrzleOymk6auLHJcQmzPLprCEvoXNKDE=
github.com/theopenlane/echozap v0.1.0/go.mod h1:E3Fkzb6QvEsx9KxxpUv9dpxUvKjxAEUZSEtkYeCXLok=
github.com/theopenlane/entx v0.1.3 h1:nn8rZINR7HSIetYnuygdP19MuQ1rwtW/HJILjwIxfag=
github.com/theopenlane/entx v0.1.3/go.mod h1:zuivUo6xLwo/BfH/DeOpCY/byGxzMkcLOC7h6FqngNQ=
github.com/theopenlane/entx v0.1.4 h1:dxP/+LUdMXBhbMoFq3ITkJv6vINxii1306BSrxHckn4=
github.com/theopenlane/entx v0.1.4/go.mod h1:MxnlrB6Eid2BDwB5kKz7p9QP/Bm0/kpbr8z76CQvjw4=
github.com/theopenlane/gqlgen-plugins v0.1.0 h1:DL3knGQ+pcoXceSFvmgWzzlgIyPRgl71tYPTySP+vHk=
github.com/theopenlane/gqlgen-plugins v0.1.0/go.mod h1:sP0nCjrE3KoVT4qfYqMrSK1XZa3Bx2oTIRSdEF7F5l0=
github.com/theopenlane/httpsling v0.1.0 h1:IHWUSo213stJTmHOHjNIg5b3npgpchzMdPMY7jAkimI=
github.com/theopenlane/httpsling v0.1.0/go.mod h1:wOyNfO4moIbmP4stQc9Kasgp+Q4sODo3LOLwvjUe/PA=
github.com/theopenlane/iam v0.1.0 h1:mCppGnYXu9/4wlGq/wHfLKMjZmWrqD0ObGfPqEo3pAs=
github.com/theopenlane/iam v0.1.0/go.mod h1:kLevqysp3XiR/StZIjtUGLd+cDhPRxKKzusj/ZAgU7M=
github.com/theopenlane/utils v0.1.1 h1:GoPrIE8tmmC1VGlp+QmVTvrgBlHwe8e8FqLw2IPdgmY=
github.com/theopenlane/utils v0.1.1/go.mod h1:37sJeeuIsmMbMFE2nKglmEQUJenTccxh5WxkJtyuZUw=
github.com/theopenlane/iam v0.1.4 h1:02y9wWxfnP0K0iJxiADJNMAi/dB3v3zP3jG1G7KToGI=
github.com/theopenlane/iam v0.1.4/go.mod h1:KZd/k1nEHSzS9wQeQHLqRabJuH3XkF5g8aGqzRhjSmQ=
github.com/theopenlane/utils v0.1.2 h1:kFbzvGgz/7b2CNZ/ycAzMBTmCqBJUld/UJxsfXCOgbw=
github.com/theopenlane/utils v0.1.2/go.mod h1:37sJeeuIsmMbMFE2nKglmEQUJenTccxh5WxkJtyuZUw=
github.com/tursodatabase/libsql-client-go v0.0.0-20240812094001-348a4e45b535 h1:iLjJLq2A5J6L9zrhyNn+fpmxFvtEpYB4XLMr0rX3epI=
github.com/tursodatabase/libsql-client-go v0.0.0-20240812094001-348a4e45b535/go.mod h1:l8xTsYB90uaVdMHXMCxKKLSgw5wLYBwBKKefNIUnm9s=
github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI=
Expand Down Expand Up @@ -784,4 +779,3 @@ modernc.org/strutil v1.2.0 h1:agBi9dp1I+eOnxXeiZawM8F4LawKv4NzGWSaLfyeNZA=
modernc.org/strutil v1.2.0/go.mod h1:/mdcBmfOibveCTBxUl5B5l6W+TTH1FXPLHZE6bTosX0=
modernc.org/token v1.1.0 h1:Xl7Ap9dKaEs5kLoOQeQmPWevfnk/DM5qcLcYlA8ys6Y=
modernc.org/token v1.1.0/go.mod h1:UGzOrNV1mAFSEB63lOFHIpNRUVMvYTc6yu1SMY/XTDM=
nullprogram.com/x/optparse v1.0.0/go.mod h1:KdyPE+Igbe0jQUrVfMqDMeJQIJZEuyV7pjYmp6pbG50=
6 changes: 3 additions & 3 deletions internal/ent/entc.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,14 @@ import (
"github.com/theopenlane/entx"
"github.com/theopenlane/entx/genhooks"
"github.com/theopenlane/entx/history"
"github.com/theopenlane/iam/totp"
"github.com/theopenlane/utils/emails"
"github.com/theopenlane/utils/marionette"
"github.com/theopenlane/utils/totp"

"github.com/theopenlane/core/internal/ent/entconfig"
"github.com/theopenlane/core/pkg/analytics"
"github.com/theopenlane/core/pkg/sessions"
"github.com/theopenlane/core/pkg/tokens"
"github.com/theopenlane/iam/sessions"
"github.com/theopenlane/iam/tokens"
)

const (
Expand Down
6 changes: 3 additions & 3 deletions internal/ent/generated/client.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion internal/ent/hooks/apitoken.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,10 @@ import (

sliceutil "github.com/theopenlane/utils/slice"

"github.com/theopenlane/iam/auth"

"github.com/theopenlane/core/internal/ent/generated"
"github.com/theopenlane/core/internal/ent/generated/hook"
"github.com/theopenlane/core/pkg/auth"
)

// HookCreateAPIToken runs on api token mutations and sets the owner id
Expand Down
3 changes: 2 additions & 1 deletion internal/ent/hooks/group.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,10 @@ import (

"github.com/theopenlane/utils/gravatar"

"github.com/theopenlane/iam/auth"

"github.com/theopenlane/core/internal/ent/generated"
"github.com/theopenlane/core/internal/ent/generated/hook"
"github.com/theopenlane/core/pkg/auth"
"github.com/theopenlane/core/pkg/enums"
)

Expand Down
5 changes: 3 additions & 2 deletions internal/ent/hooks/invite.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,14 @@ import (
"github.com/theopenlane/utils/sendgrid"
"github.com/theopenlane/utils/ulids"

"github.com/theopenlane/iam/auth"
"github.com/theopenlane/iam/tokens"

"github.com/theopenlane/core/internal/ent/generated"
"github.com/theopenlane/core/internal/ent/generated/hook"
"github.com/theopenlane/core/internal/ent/generated/invite"
"github.com/theopenlane/core/internal/ent/generated/organization"
"github.com/theopenlane/core/pkg/auth"
"github.com/theopenlane/core/pkg/enums"
"github.com/theopenlane/core/pkg/tokens"
)

// HookInvite runs on invite create mutations
Expand Down
3 changes: 2 additions & 1 deletion internal/ent/hooks/invite_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,9 @@ import (

"github.com/theopenlane/utils/ulids"

"github.com/theopenlane/iam/auth"

"github.com/theopenlane/core/internal/ent/generated"
"github.com/theopenlane/core/pkg/auth"
"github.com/theopenlane/core/pkg/middleware/echocontext"
)

Expand Down
Loading
Loading