Skip to content

Commit

Permalink
fix: update zitadel-go to v3
Browse files Browse the repository at this point in the history
  • Loading branch information
stebenz committed Aug 13, 2024
1 parent 80f68fb commit 975c92d
Show file tree
Hide file tree
Showing 191 changed files with 658 additions and 311 deletions.
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ export ZITADEL_DEV_UID="$(id -u)"
docker compose --file ./acceptance/docker-compose.yaml run setup
```

Run the accepance tests using the machine key generated by ZITADEL.
Run the acceptance tests using the machine key generated by ZITADEL.

```bash
TF_ACC=1 go test ./...
Expand All @@ -42,7 +42,7 @@ go run github.com/golangci/golangci-lint/cmd/[email protected] run --fix
# Generate Docs

1. Manually maintain files in /templates and /examples
1. Generate the docs
2. Generate the docs
```bash
go run github.com/hashicorp/terraform-plugin-docs/cmd/[email protected] generate
```
4 changes: 2 additions & 2 deletions acceptance/docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ version: '3.8'

services:
db:
image: 'cockroachdb/cockroach:v23.1.13'
image: 'cockroachdb/cockroach:v24.1.0'
command: 'start-single-node --insecure --http-addr :9090'
healthcheck:
test: ['CMD', 'curl', '-f', 'http://localhost:9090/health?ready=1']
Expand All @@ -15,7 +15,7 @@ services:

zitadel:
user: '${ZITADEL_DEV_UID}'
image: '${ZITADEL_IMAGE:-ghcr.io/zitadel/zitadel:v2.43.4}'
image: '${ZITADEL_IMAGE:-ghcr.io/zitadel/zitadel:v2.58.3}'
command: 'start-from-init --masterkey "MasterkeyNeedsToHave32Characters" --tlsMode disabled --config /zitadel.yaml --steps /zitadel.yaml'
ports:
- "8080:8080"
Expand Down
2 changes: 1 addition & 1 deletion gen.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@ protoc \
$(go env GOPATH)/src/github.com/zitadel/zitadel/proto/zitadel/text.proto

sed -i 's#_ "github.com/zitadel/zitadel/pkg/grpc/object"##g' gen/github.com/zitadel/zitadel/pkg/grpc/text/text_terraform.go
sed -i 's#textpb "textpb"#textpb "github.com/zitadel/zitadel-go/v2/pkg/client/zitadel/text"#g' gen/github.com/zitadel/zitadel/pkg/grpc/text/text_terraform.go
sed -i 's#textpb "textpb"#textpb "github.com/zitadel/zitadel-go/v3/pkg/client/zitadel/text"#g' gen/github.com/zitadel/zitadel/pkg/grpc/text/text_terraform.go
sed -i 's/U2f/U2F/g' gen/github.com/zitadel/zitadel/pkg/grpc/text/text_terraform.go

Loading

0 comments on commit 975c92d

Please sign in to comment.