Skip to content
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
5 changes: 3 additions & 2 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ env:
GO_VERSION: "1.24"
GO_RELEASER_VERSION: "v2.8.2"
GO_LANGCI_LINT_VERSION: "v2.0.2"
GO_TESTSUM_VERSION: "1.11.0"
GO_TESTSUM_VERSION: "1.12.1"

jobs:
test:
Expand All @@ -37,6 +37,7 @@ jobs:
- "./plugins/fusionauth"
- "./plugins/google"
- "./plugins/jumpcloud"
- "./plugins/keycloak"
- "./plugins/ldap"
- "./plugins/okta"
- "./plugins/openapi"
Expand Down Expand Up @@ -126,7 +127,7 @@ jobs:
ssh-add $HOME/.ssh/id_rsa
-
name: Release
uses: goreleaser/goreleaser-action@v5
uses: goreleaser/goreleaser-action@v6
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
HOMEBREW_TAP: ${{ secrets.GITHUB_TOKEN }}
Expand Down
23 changes: 23 additions & 0 deletions .goreleaser.yml
Original file line number Diff line number Diff line change
Expand Up @@ -223,6 +223,29 @@ builds:
- -X github.com/{{ .Env.ORG }}/{{ .Env.REPO }}/sdk//version.date={{.Date}}
mod_timestamp: "{{ .CommitTimestamp }}"

- id: ds-load-keycloak
main: ./plugins/keycloak/cmd/ds-load-keycloak
binary: ds-load-keycloak
goos:
- darwin
- linux
- windows
goarch:
- amd64
- arm64
env:
- CGO_ENABLED=0
ignore:
- goos: windows
goarch: arm64
ldflags:
- -s
- -w
- -X github.com/{{ .Env.ORG }}/{{ .Env.REPO }}/sdk/common/version.ver={{.Version}}
- -X github.com/{{ .Env.ORG }}/{{ .Env.REPO }}/sdk/common/version.commit={{.ShortCommit}}
- -X github.com/{{ .Env.ORG }}/{{ .Env.REPO }}/sdk//version.date={{.Date}}
mod_timestamp: "{{ .CommitTimestamp }}"

- id: ds-load-ldap
main: ./plugins/ldap/cmd/ds-load-ldap
binary: ds-load-ldap
Expand Down
27 changes: 17 additions & 10 deletions cli/go.mod
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
module github.com/aserto-dev/ds-load/cli

go 1.23.7
go 1.23.8

toolchain go1.24.1
toolchain go1.24.3

replace github.com/aserto-dev/ds-load/sdk => ../sdk

Expand All @@ -15,8 +15,8 @@ require (
github.com/pkg/errors v0.9.1
github.com/rs/zerolog v1.34.0
github.com/stretchr/testify v1.10.0
golang.org/x/sync v0.13.0
google.golang.org/grpc v1.71.1
golang.org/x/sync v0.14.0
google.golang.org/grpc v1.72.0
)

require (
Expand All @@ -29,6 +29,7 @@ require (
github.com/envoyproxy/go-control-plane/envoy v1.32.4 // indirect
github.com/envoyproxy/protoc-gen-validate v1.2.1 // indirect
github.com/go-http-utils/headers v0.0.0-20181008091004-fed159eddc2a // indirect
github.com/go-jose/go-jose/v4 v4.0.4 // indirect
github.com/golang/protobuf v1.5.4 // indirect
github.com/google/uuid v1.6.0 // indirect
github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 // indirect
Expand All @@ -40,12 +41,18 @@ require (
github.com/mattn/go-isatty v0.0.20 // indirect
github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/samber/lo v1.49.1 // indirect
golang.org/x/net v0.39.0 // indirect
golang.org/x/sys v0.32.0 // indirect
golang.org/x/text v0.24.0 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20250409194420-de1ac958c67a // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20250409194420-de1ac958c67a // indirect
github.com/samber/lo v1.50.0 // indirect
github.com/spiffe/go-spiffe/v2 v2.5.0 // indirect
github.com/zeebo/errs v1.4.0 // indirect
go.opentelemetry.io/otel/metric v1.35.0 // indirect
go.opentelemetry.io/otel/sdk v1.35.0 // indirect
go.opentelemetry.io/otel/trace v1.35.0 // indirect
golang.org/x/crypto v0.38.0 // indirect
golang.org/x/net v0.40.0 // indirect
golang.org/x/sys v0.33.0 // indirect
golang.org/x/text v0.25.0 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20250505200425-f936aa4a68b2 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20250505200425-f936aa4a68b2 // indirect
google.golang.org/protobuf v1.36.6 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)
100 changes: 34 additions & 66 deletions cli/go.sum

Large diffs are not rendered by default.

5 changes: 4 additions & 1 deletion go.work
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
go 1.23.7
go 1.23.8

toolchain go1.24.3

use (
./cli
Expand All @@ -9,6 +11,7 @@ use (
./plugins/fusionauth
./plugins/google
./plugins/jumpcloud
./plugins/keycloak
./plugins/ldap
./plugins/okta
./plugins/openapi
Expand Down
20 changes: 4 additions & 16 deletions makefile
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ EXT_TMP_DIR := ${EXT_DIR}/tmp
GO_VER := 1.24
VAULT_VER := 1.8.12
SVU_VER := 3.1.0
GOTESTSUM_VER := 1.11.0
GOTESTSUM_VER := 1.12.1
GOLANGCI-LINT_VER := 2.0.2
GORELEASER_VER := 2.8.2
BUF_VER := 1.50.0
Expand Down Expand Up @@ -68,7 +68,7 @@ lint:
PHONY: go-mod-tidy
go-mod-tidy:
@echo -e "$(ATTN_COLOR)==> $@ $(NO_COLOR)"
@go work edit -json | jq -r '.Use[].DiskPath' | xargs -I{} bash -c 'cd {} && echo "${PWD}/go.mod" && go mod tidy -go 1.23.7 -v && cd -'
@go work edit -json | jq -r '.Use[].DiskPath' | xargs -I{} bash -c 'cd {} && echo "${PWD}/go.mod" && go mod tidy -go 1.23.8 -v && cd -'

.PHONY: test
test:
Expand Down Expand Up @@ -138,23 +138,11 @@ install-buf: ${EXT_BIN_DIR}
@${EXT_BIN_DIR}/buf --version

.PHONY: install-svu
install-svu: install-svu-${GOOS}
install-svu: ${EXT_BIN_DIR} ${EXT_TMP_DIR}
@echo -e "$(ATTN_COLOR)==> $@ $(NO_COLOR)"
@chmod +x ${EXT_BIN_DIR}/svu
@GOBIN=${EXT_BIN_DIR} go install github.com/caarlos0/svu/v3@v${SVU_VER}
@${EXT_BIN_DIR}/svu --version

.PHONY: install-svu-darwin
install-svu-darwin: ${EXT_TMP_DIR} ${EXT_BIN_DIR}
@echo -e "$(ATTN_COLOR)==> $@ $(NO_COLOR)"
@gh release download v${SVU_VER} --repo https://github.com/caarlos0/svu --pattern "*darwin_all.tar.gz" --output "${EXT_TMP_DIR}/svu.tar.gz" --clobber
@tar -xvf ${EXT_TMP_DIR}/svu.tar.gz --directory ${EXT_BIN_DIR} svu &> /dev/null

.PHONY: install-svu-linux
install-svu-linux: ${EXT_TMP_DIR} ${EXT_BIN_DIR}
@echo -e "$(ATTN_COLOR)==> $@ $(NO_COLOR)"
@gh release download v${SVU_VER} --repo https://github.com/caarlos0/svu --pattern "*linux_${GOARCH}.tar.gz" --output "${EXT_TMP_DIR}/svu.tar.gz" --clobber
@tar -xvf ${EXT_TMP_DIR}/svu.tar.gz --directory ${EXT_BIN_DIR} svu &> /dev/null

.PHONY: install-gotestsum
install-gotestsum: ${EXT_TMP_DIR} ${EXT_BIN_DIR}
@echo -e "$(ATTN_COLOR)==> $@ $(NO_COLOR)"
Expand Down
36 changes: 24 additions & 12 deletions plugins/auth0/go.mod
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
module github.com/aserto-dev/ds-load/plugins/auth0

go 1.23.7
go 1.23.8

toolchain go1.24.1
toolchain go1.24.3

replace github.com/aserto-dev/ds-load/sdk => ../../sdk

require (
github.com/alecthomas/kong v1.10.0
github.com/aserto-dev/ds-load/sdk v0.0.0-20250408143332-e8965667fcc0
github.com/auth0/go-auth0 v1.19.0
github.com/auth0/go-auth0 v1.20.0
github.com/pkg/errors v0.9.1
github.com/samber/lo v1.49.1
github.com/samber/lo v1.50.0
)

require (
Expand All @@ -22,26 +22,38 @@ require (
github.com/PuerkitoBio/rehttp v1.4.0 // indirect
github.com/aserto-dev/go-directory v0.33.10 // indirect
github.com/aserto-dev/logger v0.0.9 // indirect
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.4.0 // indirect
github.com/dongri/phonenumber v0.1.12 // indirect
github.com/goccy/go-json v0.10.5 // indirect
github.com/google/uuid v1.6.0 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.3 // indirect
github.com/huandu/xstrings v1.5.0 // indirect
github.com/lestrrat-go/blackmagic v1.0.3 // indirect
github.com/lestrrat-go/httpcc v1.0.1 // indirect
github.com/lestrrat-go/httprc v1.0.6 // indirect
github.com/lestrrat-go/iter v1.0.2 // indirect
github.com/lestrrat-go/jwx/v2 v2.1.6 // indirect
github.com/lestrrat-go/option v1.0.1 // indirect
github.com/mattn/go-colorable v0.1.14 // indirect
github.com/mattn/go-isatty v0.0.20 // indirect
github.com/mitchellh/copystructure v1.2.0 // indirect
github.com/mitchellh/reflectwalk v1.0.2 // indirect
github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 // indirect
github.com/rs/zerolog v1.34.0 // indirect
github.com/segmentio/asm v1.2.0 // indirect
github.com/shopspring/decimal v1.4.0 // indirect
github.com/spf13/cast v1.7.1 // indirect
golang.org/x/crypto v0.37.0 // indirect
golang.org/x/net v0.39.0 // indirect
golang.org/x/oauth2 v0.29.0 // indirect
golang.org/x/sys v0.32.0 // indirect
golang.org/x/text v0.24.0 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20250409194420-de1ac958c67a // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20250409194420-de1ac958c67a // indirect
google.golang.org/grpc v1.71.1 // indirect
go.opentelemetry.io/otel/metric v1.35.0 // indirect
go.opentelemetry.io/otel/sdk v1.35.0 // indirect
go.opentelemetry.io/otel/trace v1.35.0 // indirect
golang.org/x/crypto v0.38.0 // indirect
golang.org/x/net v0.40.0 // indirect
golang.org/x/oauth2 v0.30.0 // indirect
golang.org/x/sys v0.33.0 // indirect
golang.org/x/text v0.25.0 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20250505200425-f936aa4a68b2 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20250505200425-f936aa4a68b2 // indirect
google.golang.org/grpc v1.72.0 // indirect
google.golang.org/protobuf v1.36.6 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)
Loading
Loading