Merge branch 'feature/repair-gitlab'

Author: jckuester

.gitlab-ci.yml

@@ -1,10 +1,10 @@
-image: golang:latest
+image: golang:1.12
 
 before_script:
+- go version
 - make setup
 - make modules
 - make generate
-- go version
 
 stages:
 - test

Makefile

@@ -8,7 +8,7 @@ setup:
 
 .PHONY: modules
 modules:
-	go mod tidy
+	go mod download
 
 .PHONY: generate
 generate:
@@ -19,7 +19,7 @@ generate:
 build:
 	go build
 
-.PHONY: generate
+.PHONY: test
 test: generate
 	go clean -testcache ${PKG_LIST}
 	go test --race -cover ${PKG_LIST}

go.mod

@@ -46,11 +46,12 @@ require (
 	golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297 // indirect
 	golang.org/x/sys v0.0.0-20190904154756-749cb33beabd // indirect
 	golang.org/x/text v0.3.2 // indirect
-	golang.org/x/tools v0.0.0-20190906181117-04840ef8f354 // indirect
 	gopkg.in/airbrake/gobrake.v2 v2.0.9 // indirect
 	gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 // indirect
 	gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2 // indirect
 	gopkg.in/yaml.v2 v2.2.1
 )
 
 replace git.apache.org/thrift.git => github.com/apache/thrift v0.0.0-20180902110319-2566ecd5d999
+
+go 1.13

go.sum

@@ -219,7 +219,6 @@ golang.org/x/net v0.0.0-20181106065722-10aee1819953/go.mod h1:mL1N/T3taQHkDXs73r
 golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297 h1:k7pJ2yAPLPgbskkFdhRCsA77k2fySZ1zf2zCjvQCiIM=
 golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
@@ -252,9 +251,6 @@ golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod h1:n7NCudcB/nEzxVGm
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20181030000716-a0a13e073c7b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
-golang.org/x/tools v0.0.0-20190906181117-04840ef8f354 h1:UrBkUDEHREtPIsvVNBiEok8dCKjYiQAQYMKYxuvCElY=
-golang.org/x/tools v0.0.0-20190906181117-04840ef8f354/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 google.golang.org/api v0.0.0-20180910000450-7ca32eb868bf/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0=
 google.golang.org/api v0.0.0-20181030000543-1d582fd0359e/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0=
 google.golang.org/api v0.1.0 h1:K6z2u68e86TPdSdefXdzvXgR1zEMa+459vBSfWYAZkI=

resource/filter.go

@@ -26,8 +26,8 @@ type Config map[TerraformResourceType][]TypeFilter
 
 // TypeFilter represents an entry in Config and selects the resources of a particular resource type.
 type TypeFilter struct {
-	ID     *StringFilter            `yaml:",omitempty"`
-	Tags   map[string]*StringFilter `yaml:",omitempty"`
+	ID   *StringFilter            `yaml:",omitempty"`
+	Tags map[string]*StringFilter `yaml:",omitempty"`
 	// select resources by creation time
 	Created *Created `yaml:",omitempty"`
 }
@@ -38,10 +38,10 @@ type StringMatcher interface {
 
 type StringFilter struct {
 	Pattern string `yaml:",omitempty"`
-	Negate bool
+	Negate  bool
 }
 
-type CreatedTime struct{
+type CreatedTime struct {
 	time.Time `yaml:",omitempty"`
 }
 
@@ -187,11 +187,11 @@ func (f Filter) matches(r *Resource) bool {
 func (f *StringFilter) matches(s string) (bool, error) {
 	ok, err := regexp.MatchString(f.Pattern, s)
 	if err != nil {
-	  return false, err
+		return false, err
 	}
-	
+
 	if f.Negate {
-	  return !ok, nil
+		return !ok, nil
 	}
 
 	return ok, err
@@ -223,11 +223,11 @@ func (c *CreatedTime) UnmarshalYAML(unmarshal func(interface{}) error) error {
 	case string:
 		d, err := time.ParseDuration(value)
 		if err == nil {
-			*c = CreatedTime{time.Now().UTC().Add(- d)}
+			*c = CreatedTime{time.Now().UTC().Add(-d)}
 			return nil
 		}
 		var t time.Time
-		err = yaml.Unmarshal([]byte("!!timestamp " + value), &t)
+		err = yaml.Unmarshal([]byte("!!timestamp "+value), &t)
 		if err == nil {
 			*c = CreatedTime{t}
 			return nil
@@ -262,4 +262,4 @@ func (c *CreatedTime) UnmarshalYAML(unmarshal func(interface{}) error) error {
 		}
 	}
 	return errors.New("invalid created time")
-}
+}

test/instance_test.go

@@ -188,6 +188,7 @@ resource "aws_vpc" "foo" {
 resource "aws_subnet" "foo" {
 	vpc_id = "${aws_vpc.foo.id}"
 	cidr_block = "10.1.0.1/24"
+	availability_zone = "us-west-2a"
 
 	tags {
 		Name = "awsweeper-testacc"