From 2ec191233cccccbc0e36fdfa7c7f528141c1e133 Mon Sep 17 00:00:00 2001 From: Noah Dietz Date: Wed, 12 May 2021 14:45:59 -0700 Subject: [PATCH] chore(internal/apidiff): fix incompat check retry (#4094) * add -gapic flag to diff just one package --- internal/apidiff/apidiff.go | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/internal/apidiff/apidiff.go b/internal/apidiff/apidiff.go index 72a5585c8079..f97d1c72689f 100644 --- a/internal/apidiff/apidiff.go +++ b/internal/apidiff/apidiff.go @@ -35,9 +35,11 @@ const rootMod = "cloud.google.com/go" var repoMetadataPath string var verbose bool +var gapic string func init() { flag.StringVar(&repoMetadataPath, "repo-metadata", "", "path to a repo-metadata-full JSON file [required]") + flag.StringVar(&gapic, "gapic", "", "import path of a specific GAPIC to diff") flag.BoolVar(&verbose, "verbose", false, "enable verbose command logging") } @@ -126,6 +128,10 @@ func diffModules(root, baseDir string, m manifest) (map[string]string, map[strin issues := map[string]error{} for imp, entry := range m { + if gapic != "" && imp != gapic { + continue + } + // Prepare module directory paths relative to the repo root. pkg := strings.TrimPrefix(imp, rootMod+"/") baseModDir := baseDir @@ -205,7 +211,7 @@ func diff(m manifest, modDir, imp, pkg, base string) (string, error) { if err := cd(parent); err != nil { return "", err } - out, err = exec("apidiff", "-w", base, imp) + out, err = exec("apidiff", "-incompatible", base, imp) if err != nil { return "", fmt.Errorf("%s: %s", err, out) }