Skip to content

Commit

Permalink
chore: fix up codegen privileges (#6309)
Browse files Browse the repository at this point in the history
Signed-off-by: Nick Santos <nick.santos@docker.com>
  • Loading branch information
nicks committed Feb 15, 2024
1 parent 9d294cc commit 8032a16
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 5 deletions.
28 changes: 24 additions & 4 deletions scripts/update-codegen-helper.sh
Expand Up @@ -23,10 +23,6 @@ if [ "${BASH_VERSINFO:-0}" -lt 5 ]; then
exit 2
fi

if [[ -n "${CODEGEN_USER-}" ]]; then
useradd "$CODEGEN_USER"
fi

GOPATH=$(go env GOPATH)
export GOPATH

Expand Down Expand Up @@ -79,3 +75,27 @@ if [[ "$VIOLATIONS" != "ok" ]]; then
exit 1
fi

FIXUPS=(
./pkg/openapi
./pkg/openapi/zz_generated.openapi.go
./pkg/apis/core/v1alpha1/zz_generated.conversion.go
./pkg/apis/core/v1alpha1/generated.proto
./pkg/apis/core/v1alpha1/zz_generated.defaults.go
./pkg/apis/core/v1alpha1/generated.pb.go
./pkg/apis/core/v1alpha1/zz_generated.deepcopy.go
./pkg/apis/core/zz_generated.deepcopy.go
)

if [[ "$CODEGEN_UID" != "$(id -u)" ]]; then
groupadd --gid "$CODEGEN_GID" codegen-user
useradd --uid "$CODEGEN_UID" -g codegen-user codegen-user

for f in "${FIXUPS[@]}"; do
if [ -d "$f" ]; then
chmod 775 "$f"
else
chmod 664 "$f"
fi
chown codegen-user:codegen-user "$f"
done
fi
5 changes: 4 additions & 1 deletion scripts/update-codegen.sh
Expand Up @@ -10,6 +10,9 @@ cd "$DIR/.."
if [[ $CI == true ]]; then
# TODO - get this working in CI
# scripts/update-protobuf-helper.sh

export CODEGEN_UID=$(id -u)
export CODEGEN_GID=$(id -g)
scripts/update-codegen-helper.sh
exit 0
fi
Expand All @@ -19,7 +22,7 @@ docker run --rm -v "$(pwd)":/go/src/github.com/tilt-dev/tilt \
--entrypoint /go/src/github.com/tilt-dev/tilt/scripts/update-protobuf-helper.sh \
tilt-protobuf-helper

docker run --rm -e "CODEGEN_USER=$USER" -v "$(pwd)":/go/src/github.com/tilt-dev/tilt \
docker run --rm -e "CODEGEN_UID=$(id -u)" -e "CODEGEN_GID=$(id -g)" -v "$(pwd)":/go/src/github.com/tilt-dev/tilt \
--workdir /go/src/github.com/tilt-dev/tilt \
--entrypoint ./scripts/update-codegen-helper.sh \
golang:1.21

0 comments on commit 8032a16

Please sign in to comment.