diff options
| author | mo khan <mo@mokhan.ca> | 2025-09-12 16:47:57 -0600 |
|---|---|---|
| committer | mo khan <mo@mokhan.ca> | 2025-09-12 16:47:57 -0600 |
| commit | b62e1e0db61d067783d792724e7053ad78958d25 (patch) | |
| tree | 8c96c16c9548425d156df0990e808ae69c490b68 | |
| parent | 22b31dc21dc3e5fa1b2f2655f6db6bc480860477 (diff) | |
| -rw-r--r-- | .env | 4 | ||||
| -rw-r--r-- | .runway/env-production.yml | 4 | ||||
| -rw-r--r-- | .runway/env-staging.yml | 4 | ||||
| -rw-r--r-- | Procfile.development | 2 | ||||
| -rw-r--r-- | Procfile.production | 2 | ||||
| -rw-r--r-- | Procfile.test | 2 | ||||
| -rw-r--r-- | app/init.go | 4 | ||||
| -rw-r--r-- | cmd/authzd/main.go | 4 | ||||
| -rw-r--r-- | test/integration/container_test.go | 4 |
9 files changed, 15 insertions, 15 deletions
@@ -7,5 +7,5 @@ OAUTH_CLIENT_ID=client_id OAUTH_CLIENT_SECRET=client_secret OIDC_ISSUER=https://gitlab.com RUNWAY_PG_USER_POSTGRES_PASSWORD_SPARKLE= -ZED_ENDPOINT=localhost:50051 -ZED_TOKEN=secret +SPICEDB_ENDPOINT=localhost:50051 +SPICEDB_TOKEN=secret diff --git a/.runway/env-production.yml b/.runway/env-production.yml index 2f1f50c..741116e 100644 --- a/.runway/env-production.yml +++ b/.runway/env-production.yml @@ -3,5 +3,5 @@ AUTHZD_HOST: "authzd.staging.runway.gitlab.net:443" LOG_LEVEL: "warn" OAUTH_CLIENT_ID: "75656280b7ca60223b060b57c4eb98a8a324878531efeccafc1d25709dbee5c9" OIDC_ISSUER: "https://gitlab.com" -ZED_ENDPOINT: "localhost:50051" -ZED_TOKEN: "secret" +SPICEDB_ENDPOINT: "localhost:50051" +SPICEDB_TOKEN: "secret" diff --git a/.runway/env-staging.yml b/.runway/env-staging.yml index f7914c6..4e48a6b 100644 --- a/.runway/env-staging.yml +++ b/.runway/env-staging.yml @@ -3,5 +3,5 @@ AUTHZD_HOST: "authzd.staging.runway.gitlab.net:443" LOG_LEVEL: "trace" OAUTH_CLIENT_ID: "786e37c8d2207d200f735379ad52579c452948222f9affc7a45e74bd7074ad3c" OIDC_ISSUER: "https://staging.gitlab.com" -ZED_ENDPOINT: "localhost:50051" -ZED_TOKEN: "secret" +SPICEDB_ENDPOINT: "localhost:50051" +SPICEDB_TOKEN: "secret" diff --git a/Procfile.development b/Procfile.development index 9481a58..436b403 100644 --- a/Procfile.development +++ b/Procfile.development @@ -1,5 +1,5 @@ postgres: ./bin/postgres -D tmp/postgres -c config_file=etc/postgres/postgresql.conf -spicedb: ./bin/spicedb serve --grpc-preshared-key $ZED_TOKEN --http-addr :8081 --grpc-addr :50051 --datastore-engine postgres --datastore-conn-uri $DATABASE_URL --log-level $LOG_LEVEL --log-format json --telemetry-endpoint "" --skip-release-check +spicedb: ./bin/spicedb serve --grpc-preshared-key $SPICEDB_TOKEN --http-addr :8081 --grpc-addr :50051 --datastore-engine postgres --datastore-conn-uri $DATABASE_URL --log-level $LOG_LEVEL --log-format json --telemetry-endpoint "" --skip-release-check authzd: ./bin/authzd envoy: ./bin/envoy-shim sparkled: ./bin/sparkled diff --git a/Procfile.production b/Procfile.production index 41fc5e1..23c4bf3 100644 --- a/Procfile.production +++ b/Procfile.production @@ -1,4 +1,4 @@ -spicedb: ./bin/spicedb serve --grpc-preshared-key $ZED_TOKEN --http-addr :8081 --grpc-addr :50051 --datastore-engine memory --log-level $LOG_LEVEL --log-format json --telemetry-endpoint "" --skip-release-check +spicedb: ./bin/spicedb serve --grpc-preshared-key $SPICEDB_TOKEN --http-addr :8081 --grpc-addr :50051 --datastore-engine memory --log-level $LOG_LEVEL --log-format json --telemetry-endpoint "" --skip-release-check authzd: ./bin/authzd envoy: ./bin/envoy-shim sparkled: ./bin/sparkled diff --git a/Procfile.test b/Procfile.test index 35e7285..1a06ad3 100644 --- a/Procfile.test +++ b/Procfile.test @@ -1,5 +1,5 @@ spicedb-migrate: ./bin/spicedb datastore migrate head --datastore-engine postgres --datastore-conn-uri $DATABASE_URL --log-level trace --skip-release-check -spicedb: ./bin/spicedb serve --grpc-preshared-key $ZED_TOKEN --http-addr :8081 --grpc-addr :50051 --datastore-engine postgres --datastore-conn-uri $DATABASE_URL --log-level $LOG_LEVEL --log-format json --telemetry-endpoint "" --skip-release-check +spicedb: ./bin/spicedb serve --grpc-preshared-key $SPICEDB_TOKEN --http-addr :8081 --grpc-addr :50051 --datastore-engine postgres --datastore-conn-uri $DATABASE_URL --log-level $LOG_LEVEL --log-format json --telemetry-endpoint "" --skip-release-check authzd: ./bin/authzd envoy: ./bin/envoy-shim sparkled: ./bin/sparkled diff --git a/app/init.go b/app/init.go index ab1d6f8..b2ec3f3 100644 --- a/app/init.go +++ b/app/init.go @@ -40,8 +40,8 @@ func init() { ioc.RegisterSingleton[*authzed.Client](c, func() *authzed.Client { return authz.NewSpiceDBClient( context.Background(), - env.Fetch("ZED_ENDPOINT", ":50051"), - env.Fetch("ZED_TOKEN", "secret"), + env.Fetch("SPICEDB_ENDPOINT", ":50051"), + env.Fetch("SPICEDB_TOKEN", "secret"), ) }) ioc.Register[authz.CheckPermissionService](c, func() authz.CheckPermissionService { diff --git a/cmd/authzd/main.go b/cmd/authzd/main.go index d18aab6..96501f4 100644 --- a/cmd/authzd/main.go +++ b/cmd/authzd/main.go @@ -38,8 +38,8 @@ func init() { ctx := ioc.MustResolve[context.Context](ioc.Default) return authz.NewSpiceDBClient( ctx, - env.Fetch("ZED_ENDPOINT", ":50051"), - env.Fetch("ZED_TOKEN", "secret"), + env.Fetch("SPICEDB_ENDPOINT", ":50051"), + env.Fetch("SPICEDB_TOKEN", "secret"), ) }) } diff --git a/test/integration/container_test.go b/test/integration/container_test.go index 51b19a5..3d8f6bc 100644 --- a/test/integration/container_test.go +++ b/test/integration/container_test.go @@ -28,8 +28,8 @@ func environmentVariables(srv *web.OIDCServer, databaseURL string) map[string]st "OAUTH_CLIENT_SECRET": srv.MockOIDC.ClientSecret, "OIDC_ISSUER": srv.Issuer(), "RUNWAY_PG_USER_POSTGRES_PASSWORD_SPARKLE": "secret", - "ZED_ENDPOINT": ":50051", - "ZED_TOKEN": "secret", + "SPICEDB_ENDPOINT": ":50051", + "SPICEDB_TOKEN": "secret", } } |
