Skip to content

Minor nits in update-codegen.sh #2028

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.

Sign up for GitHub

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

Merged
knative-prow-robot merged 2 commits into from
Sep 16, 2018
Merged

Minor nits in update-codegen.sh #2028

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f2dda60
don't require GOPATH env var for update-codegen
dprotaso Sep 16, 2018
7940b6d
Use -i flag in hack/update-codegen for readability
dprotaso Sep 16, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions hack/update-codegen.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,15 @@ set -o errexit
set -o nounset
set -o pipefail

if [ -z "${GOPATH:-}" ]; then
Copy link
Copy Markdown
Contributor

@adrcunha adrcunha Sep 16, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is nice. We should move this to library.sh, so all scripts will benefit from it.

export GOPATH=$(go env GOPATH)
fi

source $(dirname $0)/../vendor/github.com/knative/test-infra/scripts/library.sh

CODEGEN_PKG=${CODEGEN_PKG:-$(cd ${REPO_ROOT_DIR}; ls -d -1 ./vendor/k8s.io/code-generator 2>/dev/null || echo ../code-generator)}


# generate the code with:
# --output-base because this script should also be able to run inside the vendor dir of
# k8s.io/kubernetes. The output-base is needed for the generators to output into the vendor dir
Expand All @@ -32,10 +37,12 @@ ${CODEGEN_PKG}/generate-groups.sh "deepcopy,client,informer,lister" \
--go-header-file ${REPO_ROOT_DIR}/hack/boilerplate/boilerplate.go.txt

# Depends on generate-groups.sh to install bin/deepcopy-gen
${GOPATH}/bin/deepcopy-gen --input-dirs \
Copy link
Copy Markdown
Contributor

@adrcunha adrcunha Sep 16, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wonder if update-codegen.sh and verify-codegen.sh should be helper scripts in test-infra, so all repos can benefit from updates like this.

Copy link
Copy Markdown
Member Author

@dprotaso dprotaso Sep 17, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would test-infra repo vendor the dependencies?

Copy link
Copy Markdown
Contributor

@adrcunha adrcunha Sep 17, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, I was thinking in something simpler, just the logic in this script.

github.com/knative/serving/pkg/reconciler/v1alpha1/revision/config,github.com/knative/serving/pkg/autoscaler,github.com/knative/serving/pkg/logging \
${GOPATH}/bin/deepcopy-gen \
-O zz_generated.deepcopy \
--go-header-file ${REPO_ROOT_DIR}/hack/boilerplate/boilerplate.go.txt
--go-header-file ${REPO_ROOT_DIR}/hack/boilerplate/boilerplate.go.txt \
-i github.com/knative/serving/pkg/reconciler/v1alpha1/revision/config \
-i github.com/knative/serving/pkg/autoscaler \
-i github.com/knative/serving/pkg/logging

# Make sure our dependencies are up-to-date
${REPO_ROOT_DIR}/hack/update-deps.sh