knative
/
client
mirror of https://github.com/knative/client.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Adds step to simplify code along with goimports (#239) 

(and gofmt if goimports isn't available)

 - Runs goimports on all packages except vendor dir and filter on only *.go files

 - Runs gofmt on all dirs except vendor and filters on *.go files, also writes the results instead of printing diff

 - Fixes typo s/insteat/insead

 - Adds the changes after adding simply code step in hack/build.sh

 - Uses source_dir var specifying the dirs to work on

 - Combines gofmt commands into single command
This commit is contained in:
Navid Shaikh 2019-07-08 15:47:33 +05:30 committed by Knative Prow Robot
parent 314be82e0a
commit 389a7592bc
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
hack/build.sh
View File

@ -16,6 +16,8 @@
set -o pipefail set -o pipefail
source_dirs="cmd pkg test"
# Store for later # Store for later
if [ -z "$1" ]; then if [ -z "$1" ]; then
ARGS=("") ARGS=("")
@ -81,7 +83,7 @@ run() {
go_fmt() { go_fmt() {
echo "🧹 ${S}Format" echo "🧹 ${S}Format"
go fmt ./cmd/... ./pkg/... find $(echo $source_dirs) -name "*.go" -print0 | xargs -0 gofmt -s -w
} }
source_format() { source_format() {
@ -92,11 +94,12 @@ source_format() {
echo "✋ go get golang.org/x/tools/cmd/goimports" echo "✋ go get golang.org/x/tools/cmd/goimports"
echo "✋ to enable import cleanup. Import cleanup skipped." echo "✋ to enable import cleanup. Import cleanup skipped."
# Run go fmt insteat # Run go fmt instead
go_fmt go_fmt
else else
echo "🧽 ${S}Format" echo "🧽 ${S}Format"
goimports -w cmd pkg goimports -w $(echo $source_dirs)
find $(echo $source_dirs) -name "*.go" -print0 | xargs -0 gofmt -s -w
fi fi
set -e set -e
} }

2
pkg/serving/config_changes.go
View File

@ -146,7 +146,7 @@ func extractContainer(template *servingv1alpha1.RevisionTemplateSpec) (*corev1.C
func updateEnvVarsFromMap(env []corev1.EnvVar, vars map[string]string) []corev1.EnvVar { func updateEnvVarsFromMap(env []corev1.EnvVar, vars map[string]string) []corev1.EnvVar {
set := make(map[string]bool) set := make(map[string]bool)
for i, _ := range env { for i := range env {
envVar := &env[i] envVar := &env[i]
value, present := vars[envVar.Name] value, present := vars[envVar.Name]
if present { if present {

6
pkg/serving/config_changes_test.go
View File

@ -118,7 +118,7 @@ func TestUpdateEnvVarsModify(t *testing.T) {
func testUpdateEnvVarsModify(t *testing.T, revision *servingv1alpha1.RevisionTemplateSpec, container *corev1.Container) { func testUpdateEnvVarsModify(t *testing.T, revision *servingv1alpha1.RevisionTemplateSpec, container *corev1.Container) {
container.Env = []corev1.EnvVar{ container.Env = []corev1.EnvVar{
corev1.EnvVar{Name: "a", Value: "foo"}} {Name: "a", Value: "foo"}}
env := map[string]string{ env := map[string]string{
"a": "fancy", "a": "fancy",
} }
@ -176,8 +176,8 @@ func TestUpdateEnvVarsBoth(t *testing.T) {
func testUpdateEnvVarsBoth(t *testing.T, template *servingv1alpha1.RevisionTemplateSpec, container *corev1.Container) { func testUpdateEnvVarsBoth(t *testing.T, template *servingv1alpha1.RevisionTemplateSpec, container *corev1.Container) {
container.Env = []corev1.EnvVar{ container.Env = []corev1.EnvVar{
corev1.EnvVar{Name: "a", Value: "foo"}, {Name: "a", Value: "foo"},
corev1.EnvVar{Name: "c", Value: "caroline"}} {Name: "c", Value: "caroline"}}
env := map[string]string{ env := map[string]string{
"a": "fancy", "a": "fancy",
"b": "boo", "b": "boo",