From 5417102c37fa8b9b99b7bba6da6647e73fa319c7 Mon Sep 17 00:00:00 2001 From: Sauyon Lee Date: Fri, 7 Feb 2020 01:27:33 -0800 Subject: [PATCH 1/2] Rename the go module to github.com/github/codeql-go --- extractor/cli/go-autobuilder/go-autobuilder.go | 2 +- extractor/cli/go-autobuilder/go-autobuilder_test.go | 10 +++++----- extractor/cli/go-extractor/go-extractor.go | 4 ++-- extractor/dbscheme/dbscheme.go | 2 +- extractor/extractor.go | 6 +++--- extractor/trap/trapwriter.go | 2 +- go.mod | 2 +- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/extractor/cli/go-autobuilder/go-autobuilder.go b/extractor/cli/go-autobuilder/go-autobuilder.go index bb7a8c48004..f971f031fea 100644 --- a/extractor/cli/go-autobuilder/go-autobuilder.go +++ b/extractor/cli/go-autobuilder/go-autobuilder.go @@ -94,7 +94,7 @@ func getImportPath() (importpath string) { } func getImportPathFromRepoURL(repourl string) string { - // check for scp-like URL as in "git@github.com:Semmle/go.git" + // check for scp-like URL as in "git@github.com:github/codeql-go.git" shorturl := regexp.MustCompile("^([^@]+@)?([^:]+):([^/].*?)(\\.git)?$") m := shorturl.FindStringSubmatch(repourl) if m != nil { diff --git a/extractor/cli/go-autobuilder/go-autobuilder_test.go b/extractor/cli/go-autobuilder/go-autobuilder_test.go index 939cba8db4e..f246f23555b 100644 --- a/extractor/cli/go-autobuilder/go-autobuilder_test.go +++ b/extractor/cli/go-autobuilder/go-autobuilder_test.go @@ -4,11 +4,11 @@ import "testing" func TestGetImportPathFromRepoURL(t *testing.T) { tests := map[string]string{ - "git@github.com:Semmle/go.git": "github.com/Semmle/go", - "git@github.com:Semmle/go": "github.com/Semmle/go", - "https://github.com/Semmle/go.git": "github.com/Semmle/go", - "https://github.com:12345/Semmle/go": "github.com/Semmle/go", - "gitolite@some.url:some/repo": "some.url/some/repo", + "git@github.com:github/codeql-go.git": "github.com/github/codeql-go", + "git@github.com:github/codeql-go": "github.com/github/codeql-go", + "https://github.com/github/codeql-go.git": "github.com/github/codeql-go", + "https://github.com:12345/github/codeql-go": "github.com/github/codeql-go", + "gitolite@some.url:some/repo": "some.url/some/repo", } for input, expected := range tests { actual := getImportPathFromRepoURL(input) diff --git a/extractor/cli/go-extractor/go-extractor.go b/extractor/cli/go-extractor/go-extractor.go index 402e8a6fd64..bc0e7b86c15 100644 --- a/extractor/cli/go-extractor/go-extractor.go +++ b/extractor/cli/go-extractor/go-extractor.go @@ -6,9 +6,9 @@ import ( "os" "strings" - "github.com/Semmle/go/extractor/dbscheme" + "github.com/github/codeql-go/extractor/dbscheme" - "github.com/Semmle/go/extractor" + "github.com/github/codeql-go/extractor" ) func usage() { diff --git a/extractor/dbscheme/dbscheme.go b/extractor/dbscheme/dbscheme.go index 400d3535bd5..0eadc3efd9b 100644 --- a/extractor/dbscheme/dbscheme.go +++ b/extractor/dbscheme/dbscheme.go @@ -7,7 +7,7 @@ import ( "reflect" "strings" - "github.com/Semmle/go/extractor/trap" + "github.com/github/codeql-go/extractor/trap" ) // A Type represents a database type diff --git a/extractor/extractor.go b/extractor/extractor.go index aeb2ebe2b95..78cdbab67cf 100644 --- a/extractor/extractor.go +++ b/extractor/extractor.go @@ -17,9 +17,9 @@ import ( "sync" "time" - "github.com/Semmle/go/extractor/dbscheme" - "github.com/Semmle/go/extractor/srcarchive" - "github.com/Semmle/go/extractor/trap" + "github.com/github/codeql-go/extractor/dbscheme" + "github.com/github/codeql-go/extractor/srcarchive" + "github.com/github/codeql-go/extractor/trap" "golang.org/x/tools/go/packages" ) diff --git a/extractor/trap/trapwriter.go b/extractor/trap/trapwriter.go index fbf37f897ee..8b525f5c0eb 100644 --- a/extractor/trap/trapwriter.go +++ b/extractor/trap/trapwriter.go @@ -9,7 +9,7 @@ import ( "path/filepath" "unicode/utf8" - "github.com/Semmle/go/extractor/srcarchive" + "github.com/github/codeql-go/extractor/srcarchive" "golang.org/x/tools/go/packages" ) diff --git a/go.mod b/go.mod index 87954f47307..1e7a52ebaab 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/Semmle/go +module github.com/github/codeql-go go 1.13 From 677ed6ebf4530d039eb239971fb01475ef7e2cc9 Mon Sep 17 00:00:00 2001 From: Sauyon Lee Date: Mon, 10 Feb 2020 10:59:22 -0800 Subject: [PATCH 2/2] Fix tests to use codeql-go repository name --- .../go/Scopes/MethodImplementsName.expected | 12 ++++++------ .../semmle/go/Scopes/MethodImplementsName.ql | 2 +- .../semmle/go/Scopes/Methods.expected | 18 +++++++++--------- .../semmle/go/Scopes/TypeImplements.ql | 2 +- .../semmle/go/Types/QualifiedNames.expected | 16 ++++++++-------- 5 files changed, 25 insertions(+), 25 deletions(-) diff --git a/ql/test/library-tests/semmle/go/Scopes/MethodImplementsName.expected b/ql/test/library-tests/semmle/go/Scopes/MethodImplementsName.expected index e72234ddef0..713b22eedb9 100644 --- a/ql/test/library-tests/semmle/go/Scopes/MethodImplementsName.expected +++ b/ql/test/library-tests/semmle/go/Scopes/MethodImplementsName.expected @@ -1,6 +1,6 @@ -| iHaveAMethod | meth | github.com/Semmle/go/ql/test/library-tests/semmle/go/Scopes | iHaveAMethod | meth | -| pointer type | meth | github.com/Semmle/go/ql/test/library-tests/semmle/go/Scopes | iHaveAMethod | meth | -| pointer type | meth1 | github.com/Semmle/go/ql/test/library-tests/semmle/go/Scopes | twoMethods | meth1 | -| starImpl | meth2 | github.com/Semmle/go/ql/test/library-tests/semmle/go/Scopes | twoMethods | meth2 | -| twoMethods | meth1 | github.com/Semmle/go/ql/test/library-tests/semmle/go/Scopes | twoMethods | meth1 | -| twoMethods | meth2 | github.com/Semmle/go/ql/test/library-tests/semmle/go/Scopes | twoMethods | meth2 | +| iHaveAMethod | meth | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Scopes | iHaveAMethod | meth | +| pointer type | meth | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Scopes | iHaveAMethod | meth | +| pointer type | meth1 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Scopes | twoMethods | meth1 | +| starImpl | meth2 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Scopes | twoMethods | meth2 | +| twoMethods | meth1 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Scopes | twoMethods | meth1 | +| twoMethods | meth2 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Scopes | twoMethods | meth2 | diff --git a/ql/test/library-tests/semmle/go/Scopes/MethodImplementsName.ql b/ql/test/library-tests/semmle/go/Scopes/MethodImplementsName.ql index 89e6fb47b12..6b688522c2d 100644 --- a/ql/test/library-tests/semmle/go/Scopes/MethodImplementsName.ql +++ b/ql/test/library-tests/semmle/go/Scopes/MethodImplementsName.ql @@ -3,5 +3,5 @@ import go from Method m, string pkg, string tp, string name where m.implements(pkg, tp, name) and - m.hasQualifiedName("github.com/Semmle/go/ql/test/library-tests/semmle/go/Scopes", _, _) + m.hasQualifiedName("github.com/github/codeql-go/ql/test/library-tests/semmle/go/Scopes", _, _) select m.getReceiverType(), m.getName(), pkg, tp, name diff --git a/ql/test/library-tests/semmle/go/Scopes/Methods.expected b/ql/test/library-tests/semmle/go/Scopes/Methods.expected index 31ea91be1f6..20d8d5e3234 100644 --- a/ql/test/library-tests/semmle/go/Scopes/Methods.expected +++ b/ql/test/library-tests/semmle/go/Scopes/Methods.expected @@ -1,9 +1,9 @@ -| main.go:13:16:13:19 | meth | github.com/Semmle/go/ql/test/library-tests/semmle/go/Scopes.t.meth | main.go:13:7:13:10 | recv | * t | -| main.go:23:16:23:19 | bump | github.com/Semmle/go/ql/test/library-tests/semmle/go/Scopes.t.bump | main.go:23:7:23:10 | recv | * t | -| types.go:4:2:4:5 | meth | github.com/Semmle/go/ql/test/library-tests/semmle/go/Scopes.iHaveAMethod.meth | file://:0:0:0:0 | | iHaveAMethod | -| types.go:8:2:8:6 | meth1 | github.com/Semmle/go/ql/test/library-tests/semmle/go/Scopes.twoMethods.meth1 | file://:0:0:0:0 | | twoMethods | -| types.go:9:2:9:6 | meth2 | github.com/Semmle/go/ql/test/library-tests/semmle/go/Scopes.twoMethods.meth2 | file://:0:0:0:0 | | twoMethods | -| types.go:14:18:14:22 | meth1 | github.com/Semmle/go/ql/test/library-tests/semmle/go/Scopes.starImpl.meth1 | file://:0:0:0:0 | | * starImpl | -| types.go:18:17:18:21 | meth2 | github.com/Semmle/go/ql/test/library-tests/semmle/go/Scopes.starImpl.meth2 | file://:0:0:0:0 | | starImpl | -| types.go:24:16:24:20 | meth1 | github.com/Semmle/go/ql/test/library-tests/semmle/go/Scopes.notImpl.meth1 | file://:0:0:0:0 | | notImpl | -| types.go:28:16:28:20 | meth2 | github.com/Semmle/go/ql/test/library-tests/semmle/go/Scopes.notImpl.meth2 | file://:0:0:0:0 | | notImpl | +| main.go:13:16:13:19 | meth | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Scopes.t.meth | main.go:13:7:13:10 | recv | * t | +| main.go:23:16:23:19 | bump | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Scopes.t.bump | main.go:23:7:23:10 | recv | * t | +| types.go:4:2:4:5 | meth | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Scopes.iHaveAMethod.meth | file://:0:0:0:0 | | iHaveAMethod | +| types.go:8:2:8:6 | meth1 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Scopes.twoMethods.meth1 | file://:0:0:0:0 | | twoMethods | +| types.go:9:2:9:6 | meth2 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Scopes.twoMethods.meth2 | file://:0:0:0:0 | | twoMethods | +| types.go:14:18:14:22 | meth1 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Scopes.starImpl.meth1 | file://:0:0:0:0 | | * starImpl | +| types.go:18:17:18:21 | meth2 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Scopes.starImpl.meth2 | file://:0:0:0:0 | | starImpl | +| types.go:24:16:24:20 | meth1 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Scopes.notImpl.meth1 | file://:0:0:0:0 | | notImpl | +| types.go:28:16:28:20 | meth2 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Scopes.notImpl.meth2 | file://:0:0:0:0 | | notImpl | diff --git a/ql/test/library-tests/semmle/go/Scopes/TypeImplements.ql b/ql/test/library-tests/semmle/go/Scopes/TypeImplements.ql index f4827bef8ba..fb8b7a8e7e4 100644 --- a/ql/test/library-tests/semmle/go/Scopes/TypeImplements.ql +++ b/ql/test/library-tests/semmle/go/Scopes/TypeImplements.ql @@ -1,5 +1,5 @@ import go from Type t, string iface -where t.implements("github.com/Semmle/go/ql/test/library-tests/semmle/go/Scopes", iface) +where t.implements("github.com/github/codeql-go/ql/test/library-tests/semmle/go/Scopes", iface) select t.pp(), iface diff --git a/ql/test/library-tests/semmle/go/Types/QualifiedNames.expected b/ql/test/library-tests/semmle/go/Types/QualifiedNames.expected index 079df401cc9..581bf0ee2cd 100644 --- a/ql/test/library-tests/semmle/go/Types/QualifiedNames.expected +++ b/ql/test/library-tests/semmle/go/Types/QualifiedNames.expected @@ -1,8 +1,8 @@ -| Bar | github.com/Semmle/go/ql/test/library-tests/semmle/go/Types/pkg1.Bar | -| Foo | github.com/Semmle/go/ql/test/library-tests/semmle/go/Types/pkg1.Foo | -| G | github.com/Semmle/go/ql/test/library-tests/semmle/go/Types/pkg2.G | -| T | github.com/Semmle/go/ql/test/library-tests/semmle/go/Types/pkg1.T | -| T | github.com/Semmle/go/ql/test/library-tests/semmle/go/Types/pkg2.T | -| T2 | github.com/Semmle/go/ql/test/library-tests/semmle/go/Types/pkg1.T2 | -| T3 | github.com/Semmle/go/ql/test/library-tests/semmle/go/Types/pkg1.T3 | -| T4 | github.com/Semmle/go/ql/test/library-tests/semmle/go/Types/pkg1.T4 | +| Bar | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1.Bar | +| Foo | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1.Foo | +| G | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg2.G | +| T | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1.T | +| T | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg2.T | +| T2 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1.T2 | +| T3 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1.T3 | +| T4 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1.T4 |