Skip to content

Commit

Permalink
chore(internal/apidiff): fix incompat check retry (#4094)
Browse files Browse the repository at this point in the history
* add -gapic flag to diff just one package
  • Loading branch information
noahdietz authored May 12, 2021
1 parent 7fd2ccd commit 2ec1912
Showing 1 changed file with 7 additions and 1 deletion.
8 changes: 7 additions & 1 deletion internal/apidiff/apidiff.go
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}

Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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)
}
Expand Down

0 comments on commit 2ec1912

Please sign in to comment.