summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormo khan <mo@mokhan.ca>2025-07-23 11:03:07 -0600
committermo khan <mo@mokhan.ca>2025-07-23 11:03:07 -0600
commit8a1b03afb949a5a3be6a78e9b2c88d2e48643f46 (patch)
tree14c2ce237c390460a91b5348bd7e056078128c0f
parente402cb0283d26fdf33866f5cbbe75bcf47942661 (diff)
refactor: move LoadSchema into authz package
-rw-r--r--cmd/authzd/main.go14
-rw-r--r--pkg/authz/grpc.go12
2 files changed, 13 insertions, 13 deletions
diff --git a/cmd/authzd/main.go b/cmd/authzd/main.go
index 2de44d3..f79814c 100644
--- a/cmd/authzd/main.go
+++ b/cmd/authzd/main.go
@@ -7,8 +7,6 @@ import (
"os/signal"
"syscall"
- v1 "github.com/authzed/authzed-go/proto/authzed/api/v1"
- "github.com/authzed/authzed-go/v1"
"github.com/xlgmokha/x/pkg/env"
"github.com/xlgmokha/x/pkg/log"
"github.com/xlgmokha/x/pkg/x"
@@ -29,7 +27,7 @@ func main() {
env.Fetch("ZED_TOKEN", "secret"),
)
defer client.Close()
- err := loadSpiceSchema(ctx, client)
+ err := authz.LoadSpiceSchema(ctx, client, "./etc/authzd/schema.zed")
if err != nil {
pls.LogErrorNow(ctx, err)
}
@@ -51,13 +49,3 @@ func main() {
socket := x.Must(net.Listen("tcp", ":10003"))
pls.LogErrorNow(ctx, server.Serve(socket))
}
-
-func loadSpiceSchema(ctx context.Context, client *authzed.Client) error {
- content, err := os.ReadFile("./etc/authzd/schema.zed")
- _, err = client.WriteSchema(ctx, &v1.WriteSchemaRequest{Schema: string(content)})
- if err != nil {
- return err
- }
-
- return nil
-}
diff --git a/pkg/authz/grpc.go b/pkg/authz/grpc.go
index 234208c..9851db4 100644
--- a/pkg/authz/grpc.go
+++ b/pkg/authz/grpc.go
@@ -4,7 +4,9 @@ import (
"context"
"crypto/x509"
"net"
+ "os"
+ v1 "github.com/authzed/authzed-go/proto/authzed/api/v1"
"github.com/authzed/authzed-go/v1"
"gitlab.com/gitlab-org/software-supply-chain-security/authorization/sparkled/pkg/pls"
"google.golang.org/grpc"
@@ -58,3 +60,13 @@ func credentialsFor(ctx context.Context, host string) credentials.TransportCrede
return credentials.NewClientTLSFromCert(pool, "")
}
+
+func LoadSpiceSchema(ctx context.Context, client *authzed.Client, path string) error {
+ content, err := os.ReadFile(path)
+ _, err = client.WriteSchema(ctx, &v1.WriteSchemaRequest{Schema: string(content)})
+ if err != nil {
+ return err
+ }
+
+ return nil
+}