Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #89393 from Jefftree/bdd-linkage
Add CLI script for listing untested conformance behaviors
- Loading branch information
Showing
10 changed files
with
222 additions
and
61 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,64 @@ | ||
| /* | ||
| Copyright 2020 The Kubernetes Authors. | ||
| 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. | ||
| */ | ||
|
|
||
| package main | ||
|
|
||
| import ( | ||
| "flag" | ||
| "fmt" | ||
| ) | ||
|
|
||
| type options struct { | ||
| // Flags only used for generating behaviors | ||
| schemaPath string | ||
| resource string | ||
| area string | ||
|
|
||
| // Flags only used for linking behaviors | ||
| testdata string | ||
| listMissing bool | ||
|
|
||
| // Flags shared between CLI tools | ||
| behaviorsDir string | ||
| } | ||
|
|
||
| func parseFlags() *options { | ||
| o := &options{} | ||
|
|
||
| flag.StringVar(&o.schemaPath, "schema", "", "Path to the OpenAPI schema") | ||
| flag.StringVar(&o.resource, "resource", ".*", "Resource name") | ||
| flag.StringVar(&o.area, "area", "default", "Area name to use") | ||
|
|
||
| flag.StringVar(&o.testdata, "testdata", "../testdata/conformance.yaml", "YAML file containing test linkage data") | ||
| flag.BoolVar(&o.listMissing, "missing", true, "Only list behaviors missing tests") | ||
|
|
||
| flag.StringVar(&o.behaviorsDir, "dir", "../behaviors", "Path to the behaviors directory") | ||
|
|
||
| flag.Parse() | ||
| return o | ||
| } | ||
|
|
||
| func main() { | ||
| o := parseFlags() | ||
| action := flag.Arg(0) | ||
| if action == "gen" { | ||
| gen(o) | ||
| } else if action == "link" { | ||
| link(o) | ||
| } else { | ||
| fmt.Printf("Unknown argument %s\n", action) | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,106 @@ | ||
| /* | ||
| Copyright 2020 The Kubernetes Authors. | ||
| 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. | ||
| */ | ||
|
|
||
| package main | ||
|
|
||
| import ( | ||
| "fmt" | ||
| "io/ioutil" | ||
| "os" | ||
| "path/filepath" | ||
| "regexp" | ||
|
|
||
| "gopkg.in/yaml.v2" | ||
|
|
||
| "k8s.io/kubernetes/test/conformance/behaviors" | ||
| ) | ||
|
|
||
| func link(o *options) { | ||
| var behaviorFiles []string | ||
| behaviorsMapping := make(map[string][]string) | ||
| var conformanceDataList []behaviors.ConformanceData | ||
|
|
||
| err := filepath.Walk(o.behaviorsDir, | ||
| func(path string, info os.FileInfo, err error) error { | ||
| if err != nil { | ||
| fmt.Printf("%v", err) | ||
| } | ||
| r, _ := regexp.Compile(".+.yaml$") | ||
| if r.MatchString(path) { | ||
| behaviorFiles = append(behaviorFiles, path) | ||
| } | ||
| return nil | ||
| }) | ||
| if err != nil { | ||
| fmt.Printf("%v", err) | ||
| return | ||
| } | ||
| fmt.Printf("%v", behaviorFiles) | ||
|
|
||
| for _, behaviorFile := range behaviorFiles { | ||
| var suite behaviors.Suite | ||
|
|
||
| yamlFile, err := ioutil.ReadFile(behaviorFile) | ||
| if err != nil { | ||
| fmt.Printf("%v", err) | ||
| return | ||
| } | ||
| err = yaml.UnmarshalStrict(yamlFile, &suite) | ||
| if err != nil { | ||
| fmt.Printf("%v", err) | ||
| return | ||
| } | ||
|
|
||
| for _, behavior := range suite.Behaviors { | ||
| behaviorsMapping[behavior.ID] = nil | ||
| } | ||
| } | ||
|
|
||
| conformanceYaml, err := ioutil.ReadFile(o.testdata) | ||
| if err != nil { | ||
| fmt.Printf("%v", err) | ||
| return | ||
| } | ||
|
|
||
| err = yaml.Unmarshal(conformanceYaml, &conformanceDataList) | ||
| if err != nil { | ||
| fmt.Printf("%v", err) | ||
| return | ||
| } | ||
|
|
||
| for _, data := range conformanceDataList { | ||
| for _, behaviorID := range data.Behaviors { | ||
| if _, ok := behaviorsMapping[behaviorID]; !ok { | ||
| fmt.Printf("Error, cannot find behavior \"%s\"", behaviorID) | ||
| return | ||
| } | ||
| behaviorsMapping[behaviorID] = append(behaviorsMapping[behaviorID], data.CodeName) | ||
| } | ||
| } | ||
| printBehaviorsMapping(behaviorsMapping, o) | ||
| } | ||
|
|
||
| func printBehaviorsMapping(behaviorsMapping map[string][]string, o *options) { | ||
| for behaviorID, tests := range behaviorsMapping { | ||
| if o.listMissing { | ||
| if tests == nil { | ||
| fmt.Println(behaviorID) | ||
| } else { | ||
| fmt.Println(behaviorID) | ||
| } | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.