Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix tools/ bootstrap make target #3601

Merged
merged 1 commit into from
Jun 13, 2024
Merged

Conversation

puerco
Copy link
Contributor

@puerco puerco commented Jun 13, 2024

Summary

This fixes the bootsrap target to run go generate in the submodule directory
Fixes the error we're seeing in #3574

[puerco@babieco minder] 🦆❯ make bootstrap 
cd tools && go generate -tags tools ./tools.go
# N.B. each line runs in a different subshell, so we don't need to undo the 'cd' here
cd tools && go mod tidy && go install \
	github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-grpc-gateway \
	github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2 \
		google.golang.org/protobuf/cmd/protoc-gen-go google.golang.org/grpc/cmd/protoc-gen-go-grpc \
		github.com/pseudomuto/protoc-gen-doc/cmd/protoc-gen-doc \
		github.com/sqlc-dev/sqlc \
		github.com/norwoodj/helm-docs/cmd/helm-docs \
		github.com/openfga/cli/cmd/fga \
		go.uber.org/mock/mockgen \
		github.com/mikefarah/yq/v4
# Create a config.yaml and server-config.yaml if they don't exist
# TODO: remove this when all config is handled in internal/config
cp -n config/config.yaml.example ./config.yaml || echo "config.yaml already exists, not overwriting"
cp: not replacing './config.yaml'
config.yaml already exists, not overwriting
cp -n config/server-config.yaml.example ./server-config.yaml || echo "server-config.yaml already exists, not overwriting"
cp: not replacing './server-config.yaml'
server-config.yaml already exists, not overwriting
# Create keys:
mkdir -p .ssh
Generating token key passphrase
openssl rand -base64 32 > .ssh/token_key_passphrase
# Make sure the keys are readable by the docker user
chmod 644 .ssh/*

Change Type

Mark the type of change your PR introduces:

  • Bug fix (resolves an issue without affecting existing features)
  • Feature (adds new functionality without breaking changes)
  • Breaking change (may impact existing functionalities or require documentation updates)
  • Documentation (updates or additions to documentation)
  • Refactoring or test improvements (no bug fixes or new functionality)

Testing

Outline how the changes were tested, including steps to reproduce and any relevant configurations.
Attach screenshots if helpful.

Review Checklist:

  • Reviewed my own code for quality and clarity.
  • Added comments to complex or tricky code sections.
  • Updated any affected documentation.
  • Included tests that validate the fix or feature.
  • Checked that related changes are merged.

This fixes the bootsrap target to run go generate in the  submodule directory

Signed-off-by: Adolfo García Veytia (Puerco) <[email protected]>
@puerco puerco requested a review from a team as a code owner June 13, 2024 18:24
@coveralls
Copy link

Coverage Status

coverage: 53.357% (-0.01%) from 53.367%
when pulling 1411c81 on puerco:tools-bootstrap
into 5d1bd36 on stacklok:main.

@blkt
Copy link
Contributor

blkt commented Jun 13, 2024

❤️

@puerco puerco merged commit b0dfee1 into mindersec:main Jun 13, 2024
22 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants