Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

models/apis: adding validation to ensure collision of api defintions do not occur #112

Merged
merged 1 commit into from
Jan 26, 2018
Merged

models/apis: adding validation to ensure collision of api defintions do not occur #112

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Adding validation to ensure collision of api defintions do not occur
  • Loading branch information
@xibz
xibz committed Jan 26, 2018
commit 98ad9afe76287ddc2649c6eca10caee34b58fb72
35 changes: 35 additions & 0 deletions models/apis/check_collisions_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
// +build awsinclude

package apis

import (
"os/exec"
"strings"
"testing"
)

func TestCollidingFolders(t *testing.T) {
m := map[string]struct{}{}
folders, err := getFolderNames()
if err != nil {
t.Error(err)
}

for _, folder := range folders {
lcName := strings.ToLower(folder)
if _, ok := m[lcName]; ok {
t.Errorf("folder %q collision detected", folder)
}
m[lcName] = struct{}{}
}
}

func getFolderNames() ([]string, error) {
cmd := exec.Command("git", "ls-tree", "-d", "--name-only", "HEAD")
output, err := cmd.Output()
if err != nil {
return nil, err
}

return strings.Split(string(output), "\n"), nil
}
3 changes: 3 additions & 0 deletions models/apis/stub.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
// +build awsinclude

package apis
13 changes: 12 additions & 1 deletion private/model/cli/gen-api/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ func main() {

for svcName := range excludeServices {
if strings.Contains(os.Getenv("SERVICES"), svcName) {
fmt.Printf("Service %s is not supported\n", svcName)
fmt.Fprintf(os.Stderr, "Service %s is not supported\n", svcName)
os.Exit(1)
}
}
Expand All @@ -140,6 +140,10 @@ func main() {

// Remove old API versions from list
m := map[string]bool{}
// caches paths to ensure we are not overriding previously generated
// code.
servicePaths := map[string]struct{}{}

for i := range files {
idx := len(files) - 1 - i
parts := strings.Split(files[idx], string(filepath.Separator))
Expand Down Expand Up @@ -167,6 +171,13 @@ func main() {
continue
}

if _, ok := servicePaths[genInfo.PackageDir]; ok {
fmt.Fprintf(os.Stderr, "Path %q has already been generated", genInfo.PackageDir)
os.Exit(1)
}

servicePaths[genInfo.PackageDir] = struct{}{}

wg.Add(1)
go func(g *generateInfo, filename string) {
defer wg.Done()
Expand Down