Restructure to focus on lib rather than cli

gcmurphy · gcmurphy · commit cacf21f3c0f9 · 2017-04-26T08:08:46.000-07:00
diff --git a/analyzer.go b/analyzer.go
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 // Package core holds the central scanning logic used by GAS
-package core
+package gas
 
 import (
 	"go/ast"
diff --git a/call_list.go b/call_list.go
@@ -11,7 +11,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package core
+package gas
 
 import (
 	"go/ast"
diff --git a/call_list_test.go b/call_list_test.go
@@ -1,4 +1,4 @@
-package core
+package gas
 
 import (
 	"go/ast"
diff --git a/cmd/filelist.go b/cmd/filelist.go
diff --git a/cmd/filelist_test.go b/cmd/filelist_test.go
diff --git a/cmd/main.go b/cmd/main.go
@@ -27,7 +27,7 @@ import (
 	"sort"
 	"strings"
 
-	gas "github.com/GoASTScanner/gas/core"
+	"github.com/GoASTScanner/gas"
 	"github.com/GoASTScanner/gas/output"
 	"golang.org/x/tools/go/loader"
 )
diff --git a/cmd/main_test.go b/cmd/main_test.go
diff --git a/cmd/rulelist.go b/cmd/rulelist.go
@@ -17,7 +17,7 @@ package main
 import (
 	"go/ast"
 
-	gas "github.com/GoASTScanner/gas/core"
+	"github.com/GoASTScanner/gas"
 	"github.com/GoASTScanner/gas/rules"
 )
 
diff --git a/cmd/tools.go b/cmd/tools.go
diff --git a/helpers.go b/helpers.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package core
+package gas
 
 import (
 	"fmt"
diff --git a/helpers_test.go b/helpers_test.go
@@ -1,4 +1,4 @@
-package core
+package gas
 
 import (
 	"go/ast"
diff --git a/issue.go b/issue.go
@@ -11,7 +11,7 @@
 // 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 core
+package gas
 
 import (
 	"encoding/json"
diff --git a/output/formatter.go b/output/formatter.go
@@ -22,7 +22,7 @@ import (
 	"strconv"
 	plainTemplate "text/template"
 
-	gas "github.com/GoASTScanner/gas/core"
+	"github.com/GoASTScanner/gas"
 )
 
 // The output format for reported issues
diff --git a/resolve.go b/resolve.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package core
+package gas
 
 import "go/ast"
 
diff --git a/rules/big.go b/rules/big.go
@@ -15,7 +15,7 @@
 package rules
 
 import (
-	gas "github.com/GoASTScanner/gas/core"
+	"github.com/GoASTScanner/gas"
 	"go/ast"
 )
 
diff --git a/rules/big_test.go b/rules/big_test.go
@@ -17,7 +17,7 @@ package rules
 import (
 	"testing"
 
-	gas "github.com/GoASTScanner/gas/core"
+	"github.com/GoASTScanner/gas"
 )
 
 func TestBigExp(t *testing.T) {
diff --git a/rules/bind.go b/rules/bind.go
@@ -18,7 +18,7 @@ import (
 	"go/ast"
 	"regexp"
 
-	gas "github.com/GoASTScanner/gas/core"
+	"github.com/GoASTScanner/gas"
 )
 
 // Looks for net.Listen("0.0.0.0") or net.Listen(":8080")
diff --git a/rules/bind_test.go b/rules/bind_test.go
@@ -17,7 +17,7 @@ package rules
 import (
 	"testing"
 
-	gas "github.com/GoASTScanner/gas/core"
+	"github.com/GoASTScanner/gas"
 )
 
 func TestBind0000(t *testing.T) {
diff --git a/rules/blacklist.go b/rules/blacklist.go
@@ -17,7 +17,7 @@ package rules
 import (
 	"go/ast"
 
-	gas "github.com/GoASTScanner/gas/core"
+	"github.com/GoASTScanner/gas"
 )
 
 type BlacklistImport struct {
diff --git a/rules/blacklist_test.go b/rules/blacklist_test.go
@@ -13,8 +13,9 @@
 package rules
 
 import (
-	gas "github.com/GoASTScanner/gas/core"
 	"testing"
+
+	"github.com/GoASTScanner/gas"
 )
 
 const initOnlyImportSrc = `
diff --git a/rules/errors.go b/rules/errors.go
@@ -15,9 +15,10 @@
 package rules
 
 import (
-	gas "github.com/GoASTScanner/gas/core"
 	"go/ast"
 	"go/types"
+
+	"github.com/GoASTScanner/gas"
 )
 
 type NoErrorCheck struct {
diff --git a/rules/errors_test.go b/rules/errors_test.go
@@ -17,7 +17,7 @@ package rules
 import (
 	"testing"
 
-	gas "github.com/GoASTScanner/gas/core"
+	"github.com/GoASTScanner/gas"
 )
 
 func TestErrorsMulti(t *testing.T) {
diff --git a/rules/fileperms.go b/rules/fileperms.go
@@ -19,7 +19,7 @@ import (
 	"go/ast"
 	"strconv"
 
-	gas "github.com/GoASTScanner/gas/core"
+	"github.com/GoASTScanner/gas"
 )
 
 type FilePermissions struct {
diff --git a/rules/fileperms_test.go b/rules/fileperms_test.go
@@ -17,7 +17,7 @@ package rules
 import (
 	"testing"
 
-	gas "github.com/GoASTScanner/gas/core"
+	"github.com/GoASTScanner/gas"
 )
 
 func TestChmod(t *testing.T) {
diff --git a/rules/hardcoded_credentials.go b/rules/hardcoded_credentials.go
@@ -15,13 +15,13 @@
 package rules
 
 import (
-	gas "github.com/GoASTScanner/gas/core"
 	"go/ast"
 	"go/token"
 	"regexp"
+	"strconv"
 
+	"github.com/GoASTScanner/gas"
 	"github.com/nbutton23/zxcvbn-go"
-	"strconv"
 )
 
 type Credentials struct {
diff --git a/rules/hardcoded_credentials_test.go b/rules/hardcoded_credentials_test.go
@@ -17,7 +17,7 @@ package rules
 import (
 	"testing"
 
-	gas "github.com/GoASTScanner/gas/core"
+	"github.com/GoASTScanner/gas"
 )
 
 func TestHardcoded(t *testing.T) {
diff --git a/rules/httpoxy_test.go b/rules/httpoxy_test.go
@@ -17,7 +17,7 @@ package rules
 import (
 	"testing"
 
-	gas "github.com/GoASTScanner/gas/core"
+	"github.com/GoASTScanner/gas"
 )
 
 func TestHttpoxy(t *testing.T) {
diff --git a/rules/nosec_test.go b/rules/nosec_test.go
@@ -17,7 +17,7 @@ package rules
 import (
 	"testing"
 
-	gas "github.com/GoASTScanner/gas/core"
+	"github.com/GoASTScanner/gas"
 )
 
 func TestNosec(t *testing.T) {
@@ -48,7 +48,7 @@ func TestNosecBlock(t *testing.T) {
 	issues := gasTestRunner(
 		`package main
 		import (
-		"os" 
+		"os"
 		"os/exec"
 	)
 
diff --git a/rules/rand.go b/rules/rand.go
@@ -17,7 +17,7 @@ package rules
 import (
 	"go/ast"
 
-	gas "github.com/GoASTScanner/gas/core"
+	"github.com/GoASTScanner/gas"
 )
 
 type WeakRand struct {
diff --git a/rules/rand_test.go b/rules/rand_test.go
@@ -17,7 +17,7 @@ package rules
 import (
 	"testing"
 
-	gas "github.com/GoASTScanner/gas/core"
+	"github.com/GoASTScanner/gas"
 )
 
 func TestRandOk(t *testing.T) {
@@ -27,7 +27,7 @@ func TestRandOk(t *testing.T) {
 
 	issues := gasTestRunner(
 		`
-		package main 
+		package main
 
 		import "crypto/rand"
 
@@ -66,7 +66,7 @@ func TestRandRenamed(t *testing.T) {
 
 	issues := gasTestRunner(
 		`
-		package main 
+		package main
 
 		import (
 			"crypto/rand"
diff --git a/rules/rsa.go b/rules/rsa.go
@@ -19,7 +19,7 @@ import (
 	"go/ast"
 	"regexp"
 
-	gas "github.com/GoASTScanner/gas/core"
+	"github.com/GoASTScanner/gas"
 )
 
 type WeakKeyStrength struct {
diff --git a/rules/rsa_test.go b/rules/rsa_test.go
@@ -17,7 +17,7 @@ package rules
 import (
 	"testing"
 
-	gas "github.com/GoASTScanner/gas/core"
+	"github.com/GoASTScanner/gas"
 )
 
 func TestRSAKeys(t *testing.T) {
diff --git a/rules/sql.go b/rules/sql.go
@@ -18,7 +18,7 @@ import (
 	"go/ast"
 	"regexp"
 
-	gas "github.com/GoASTScanner/gas/core"
+	"github.com/GoASTScanner/gas"
 )
 
 type SqlStatement struct {
diff --git a/rules/sql_test.go b/rules/sql_test.go
@@ -17,7 +17,7 @@ package rules
 import (
 	"testing"
 
-	gas "github.com/GoASTScanner/gas/core"
+	"github.com/GoASTScanner/gas"
 )
 
 func TestSQLInjectionViaConcatenation(t *testing.T) {
diff --git a/rules/subproc.go b/rules/subproc.go
@@ -19,7 +19,7 @@ import (
 	"regexp"
 	"strings"
 
-	gas "github.com/GoASTScanner/gas/core"
+	"github.com/GoASTScanner/gas"
 )
 
 type Subprocess struct {
diff --git a/rules/subproc_test.go b/rules/subproc_test.go
@@ -17,7 +17,7 @@ package rules
 import (
 	"testing"
 
-	gas "github.com/GoASTScanner/gas/core"
+	"github.com/GoASTScanner/gas"
 )
 
 func TestSubprocess(t *testing.T) {
diff --git a/rules/tempfiles.go b/rules/tempfiles.go
@@ -18,7 +18,7 @@ import (
 	"go/ast"
 	"regexp"
 
-	gas "github.com/GoASTScanner/gas/core"
+	"github.com/GoASTScanner/gas"
 )
 
 type BadTempFile struct {
diff --git a/rules/tempfiles_test.go b/rules/tempfiles_test.go
@@ -17,7 +17,7 @@ package rules
 import (
 	"testing"
 
-	gas "github.com/GoASTScanner/gas/core"
+	"github.com/GoASTScanner/gas"
 )
 
 func TestTempfiles(t *testing.T) {
diff --git a/rules/templates.go b/rules/templates.go
@@ -18,7 +18,7 @@ import (
 	"go/ast"
 	"regexp"
 
-	gas "github.com/GoASTScanner/gas/core"
+	"github.com/GoASTScanner/gas"
 )
 
 type TemplateCheck struct {
diff --git a/rules/templates_test.go b/rules/templates_test.go
@@ -17,7 +17,7 @@ package rules
 import (
 	"testing"
 
-	gas "github.com/GoASTScanner/gas/core"
+	"github.com/GoASTScanner/gas"
 )
 
 func TestTemplateCheckSafe(t *testing.T) {
diff --git a/rules/tls.go b/rules/tls.go
@@ -20,7 +20,7 @@ import (
 	"reflect"
 	"regexp"
 
-	gas "github.com/GoASTScanner/gas/core"
+	"github.com/GoASTScanner/gas"
 )
 
 type InsecureConfigTLS struct {
diff --git a/rules/tls_test.go b/rules/tls_test.go
@@ -17,7 +17,7 @@ package rules
 import (
 	"testing"
 
-	gas "github.com/GoASTScanner/gas/core"
+	"github.com/GoASTScanner/gas"
 )
 
 func TestInsecureSkipVerify(t *testing.T) {
diff --git a/rules/unsafe.go b/rules/unsafe.go
@@ -15,8 +15,9 @@
 package rules
 
 import (
-	gas "github.com/GoASTScanner/gas/core"
 	"go/ast"
+
+	"github.com/GoASTScanner/gas"
 )
 
 type UsingUnsafe struct {
diff --git a/rules/unsafe_test.go b/rules/unsafe_test.go
@@ -17,7 +17,7 @@ package rules
 import (
 	"testing"
 
-	gas "github.com/GoASTScanner/gas/core"
+	"github.com/GoASTScanner/gas"
 )
 
 func TestUnsafe(t *testing.T) {
diff --git a/rules/utils_test.go b/rules/utils_test.go
diff --git a/rules/weakcrypto.go b/rules/weakcrypto.go
diff --git a/rules/weakcrypto_test.go b/rules/weakcrypto_test.go
diff --git a/select.go b/select.go

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package core`
	`1`	`+package gas`
`2`	`2`
`3`	`3`	`import (`
`4`	`4`	`"go/ast"`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ import (`
`27`	`27`	`"sort"`
`28`	`28`	`"strings"`
`29`	`29`
`30`		`- gas "github.com/GoASTScanner/gas/core"`
	`30`	`+ "github.com/GoASTScanner/gas"`
`31`	`31`	`"github.com/GoASTScanner/gas/output"`
`32`	`32`	`"golang.org/x/tools/go/loader"`
`33`	`33`	`)`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ package main`
`17`	`17`	`import (`
`18`	`18`	`"go/ast"`
`19`	`19`
`20`		`- gas "github.com/GoASTScanner/gas/core"`
	`20`	`+ "github.com/GoASTScanner/gas"`
`21`	`21`	`"github.com/GoASTScanner/gas/rules"`
`22`	`22`	`)`
`23`	`23`