Merge pull request kubernetes#11726 from caesarxuchao/fix-types-link

Auto commit by PR queue bot
satnam6502 · Jul 28, 2015 · a546a29 · a546a29
2 parents bfb6203 + 70a29c1
commit a546a29
Show file tree

Hide file tree

Showing 10 changed files with 796 additions and 648 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -19,6 +19,7 @@ script:
   - PATH=$GOPATH/bin:$PATH ./hack/verify-generated-deep-copies.sh
   - PATH=$GOPATH/bin:./third_party/etcd:$PATH ./hack/verify-gendocs.sh
   - PATH=$GOPATH/bin:./third_party/etcd:$PATH ./hack/verify-swagger-spec.sh
+  - PATH=$GOPATH/bin:./third_party/etcd:$PATH ./hack/verify-linkcheck.sh
   - godep go test ./cmd/mungedocs
 
 notifications:

diff --git a/api/swagger-spec/v1.json b/api/swagger-spec/v1.json
diff --git a/cmd/linkcheck/links.go b/cmd/linkcheck/links.go
@@ -0,0 +1,89 @@
+/*
+Copyright 2015 The Kubernetes Authors All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+//This command checks if the hyperlinks in files are valid. It checks the files
+//with 'fileSuffix' in 'rootDir' for URLs that match 'prefix'. It trims the
+//'prefix' from the URL, uses what's left as the relative path to repoRoot to
+//verify if the link is valid. For example:
+//$ linkcheck --root-dir=${TYPEROOT} --repo-root=${KUBE_ROOT} \
+//  --file-suffix=types.go --prefix=http://releases.k8s.io/HEAD
+
+package main
+
+import (
+	"fmt"
+	"io/ioutil"
+	"os"
+	"path"
+	"path/filepath"
+	"regexp"
+	"strings"
+
+	flag "github.com/spf13/pflag"
+)
+
+var (
+	httpRE *regexp.Regexp
+
+	rootDir    = flag.String("root-dir", "", "Root directory containing documents to be processed.")
+	repoRoot   = flag.String("repo-root", "", `Root directory of k8s repository.`)
+	fileSuffix = flag.String("file-suffix", "", "suffix of files to be checked")
+	prefix     = flag.String("prefix", "", "Longest common prefix of the link URL, e.g., http://release.k8s.io/HEAD/ for links in pkg/api/types.go")
+)
+
+func newWalkFunc(invalidLink *bool) filepath.WalkFunc {
+	return func(filePath string, info os.FileInfo, err error) error {
+		if !strings.HasSuffix(info.Name(), *fileSuffix) {
+			return nil
+		}
+		fileBytes, err := ioutil.ReadFile(filePath)
+		if err != nil {
+			return err
+		}
+		foundInvalid := false
+		matches := httpRE.FindAllSubmatch(fileBytes, -1)
+		for _, match := range matches {
+			//match[1] should look like docs/devel/api-conventions.md
+			if _, err := os.Stat(path.Join(*repoRoot, string(match[1]))); err != nil {
+				fmt.Fprintf(os.Stderr, "Link is not valid: %s\n", string(match[0]))
+				foundInvalid = true
+			}
+		}
+		if foundInvalid {
+			fmt.Fprintf(os.Stderr, "Found invalid links in %s\n", filePath)
+			*invalidLink = true
+		}
+		return nil
+	}
+}
+
+func main() {
+	flag.Parse()
+	httpRE = regexp.MustCompile(*prefix + `(.*\.md)`)
+
+	if *rootDir == "" || *repoRoot == "" || *prefix == "" {
+		flag.Usage()
+		os.Exit(2)
+	}
+	invalidLink := false
+	if err := filepath.Walk(*rootDir, newWalkFunc(&invalidLink)); err != nil {
+		fmt.Fprintf(os.Stderr, "Fail: %v.\n", err)
+		os.Exit(2)
+	}
+	if invalidLink {
+		os.Exit(1)
+	}
+}
diff --git a/docs/api-reference/definitions.html b/docs/api-reference/definitions.html
diff --git a/hack/lib/golang.sh b/hack/lib/golang.sh
@@ -34,6 +34,7 @@ kube::golang::server_targets() {
     cmd/kubelet
     cmd/hyperkube
     cmd/kubernetes
+    cmd/linkcheck
     plugin/cmd/kube-scheduler
   )
   if [ -n "${KUBERNETES_CONTRIB:-}" ]; then

diff --git a/hack/verify-linkcheck.sh b/hack/verify-linkcheck.sh
@@ -0,0 +1,46 @@
+#!/bin/bash
+
+# Copyright 2014 The Kubernetes Authors All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+set -o errexit
+set -o nounset
+set -o pipefail
+
+KUBE_ROOT=$(dirname "${BASH_SOURCE}")/..
+source "${KUBE_ROOT}/hack/lib/init.sh"
+
+kube::golang::setup_env
+linkcheck=$(kube::util::find-binary "linkcheck")
+
+if [[ ! -x "$linkcheck" ]]; then
+  {
+    echo "It looks as if you don't have a compiled linkcheck binary"
+    echo
+    echo "If you are running from a clone of the git repo, please run"
+    echo "'./hack/build-go.sh cmd/linkcheck'."
+  } >&2
+  exit 1
+fi
+
+TYPEROOT="${KUBE_ROOT}/pkg/api/"
+"${linkcheck}" "--root-dir=${TYPEROOT}" "--repo-root=${KUBE_ROOT}" "--file-suffix=types.go" "--prefix=http://releases.k8s.io/HEAD" && ret=0 || ret=$?
+if [[ $ret -eq 1 ]]; then
+  echo "links in ${TYPEROOT} is out of date."
+  exit 1
+fi
+if [[ $ret -gt 1 ]]; then
+  echo "Error running linkcheck"
+  exit 1
+fi
diff --git a/hooks/pre-commit b/hooks/pre-commit
@@ -97,6 +97,16 @@ else
 fi
 echo "${reset}"
 
+echo -ne "Checking for links in API descriptions... "
+if ! hack/verify-linkcheck.sh > /dev/null; then
+  echo "${red}ERROR!"
+  echo "Some links in pkg/api/.*types.go are outdated. They require a manual fix."
+  exit_code=1
+else
+  echo "${green}OK"
+fi
+echo "${reset}"
+
 echo -ne "Checking for docs that need updating... "
 if ! hack/verify-gendocs.sh > /dev/null; then
   echo "${red}ERROR!"

diff --git a/pkg/api/types.go b/pkg/api/types.go
@@ -1375,7 +1375,7 @@ type NodeAddress struct {
 }
 
 // NodeResources is an object for conveying resource information about a node.
-// see http://docs.k8s.io/resources.md for more details.
+// see http://docs.k8s.io/design/resources.md for more details.
 type NodeResources struct {
 	// Capacity represents the available resources of a node
 	Capacity ResourceList `json:"capacity,omitempty"`