Get lint clean

This commit is contained in:
joeduffy 2018-06-09 17:23:12 -07:00
parent 20af051caf
commit cf1cb2d61f
2 changed files with 6 additions and 6 deletions

View file

@ -17,8 +17,8 @@ install::
GOBIN=$(PULUMI_BIN) go install -ldflags "-X github.com/pulumi/pulumi/pkg/version.Version=${VERSION}" ${LANGHOST_PKG}
lint::
$(GOMETALINTER) ./pulumi/... | sort ; exit $$(($${PIPESTATUS[1]}-1))
$(GOMETALINTER) ./pulumi-language-go/... | sort ; exit $$(($${PIPESTATUS[1]}-1))
$(GOMETALINTER) ./pulumi/... | sort
$(GOMETALINTER) ./pulumi-language-go/... | sort
test_fast::
go test -cover -parallel ${TESTPARALLELISM} ${PROJECT_PKGS}

View file

@ -112,17 +112,17 @@ func marshalInput(v interface{}) (interface{}, []Resource, error) {
return nil, nil, err
}
// If the value is known, marshal it.
if known {
// If the value is known, marshal it.
e, d, merr := marshalInput(ov)
if merr != nil {
return nil, nil, merr
}
return e, append(t.Deps(), d...), nil
} else {
// Otherwise, simply return the unknown value sentinel.
return rpcTokenUnknownValue, t.Deps(), nil
}
// Otherwise, simply return the unknown value sentinel.
return rpcTokenUnknownValue, t.Deps(), nil
case CustomResource:
// Resources aren't serializable; instead, serialize a reference to ID, tracking as a dependency.a
e, d, err := marshalInput(t.ID())