From b93407de1b9add1d16d10e9310e6a3f26db04819 Mon Sep 17 00:00:00 2001 From: Steven Masley Date: Tue, 17 Dec 2024 15:06:56 -0600 Subject: [PATCH 1/2] chore: ensure go file is valid during generation --- Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 163d1ba16c991..e785455d29dec 100644 --- a/Makefile +++ b/Makefile @@ -659,7 +659,8 @@ examples/examples.gen.json: scripts/examplegen/main.go examples/examples.go $(sh go run ./scripts/examplegen/main.go > examples/examples.gen.json coderd/rbac/object_gen.go: scripts/typegen/rbacobject.gotmpl scripts/typegen/main.go coderd/rbac/object.go coderd/rbac/policy/policy.go - go run scripts/typegen/main.go rbac object > coderd/rbac/object_gen.go + go run scripts/typegen/main.go rbac object > /tmp/object_gen.go + mv /tmp/object_gen.go coderd/rbac/object_gen.go codersdk/rbacresources_gen.go: scripts/typegen/codersdk.gotmpl scripts/typegen/main.go coderd/rbac/object.go coderd/rbac/policy/policy.go # Do no overwrite codersdk/rbacresources_gen.go directly, as it would make the file empty, breaking From a2309c2edb63f9267669f46a7d74de798269d805 Mon Sep 17 00:00:00 2001 From: Steven Masley Date: Tue, 17 Dec 2024 15:30:15 -0600 Subject: [PATCH 2/2] Update Makefile Co-authored-by: Cian Johnston --- Makefile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index e785455d29dec..211e6b6211cc2 100644 --- a/Makefile +++ b/Makefile @@ -659,8 +659,10 @@ examples/examples.gen.json: scripts/examplegen/main.go examples/examples.go $(sh go run ./scripts/examplegen/main.go > examples/examples.gen.json coderd/rbac/object_gen.go: scripts/typegen/rbacobject.gotmpl scripts/typegen/main.go coderd/rbac/object.go coderd/rbac/policy/policy.go - go run scripts/typegen/main.go rbac object > /tmp/object_gen.go - mv /tmp/object_gen.go coderd/rbac/object_gen.go + tempdir=$(shell mktemp -d /tmp/typegen_rbac_object.XXXXXX) + go run ./scripts/typegen/main.go rbac object > "$$tempdir/object_gen.go" + mv -v "$$tempdir/object_gen.go" coderd/rbac/object_gen.go + rmdir -v "$$tempdir" codersdk/rbacresources_gen.go: scripts/typegen/codersdk.gotmpl scripts/typegen/main.go coderd/rbac/object.go coderd/rbac/policy/policy.go # Do no overwrite codersdk/rbacresources_gen.go directly, as it would make the file empty, breaking pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy