Move code into /pkg and create coverage report

.gitlab-ci.jsonnet

@@ -77,8 +77,8 @@ local jobs = {
     },
 
     'unit-tests': unittest_stage {
-        coverage: @"/^TOTAL.*\s+(\d+\%)\s*$/",
-        script: ["make vendor", "make test"],
+        coverage: @"/\d\d\.\d.$/",
+        script: ["make vendor", "make test", "make cover"],
     },
 
     // End2End tests

.gitlab-ci.yml

@@ -183,11 +183,12 @@ unit-tests:
   - mkdir -p $GOPATH/src/github.com/coreos-inc/alm
   - cp -a $CI_PROJECT_DIR/* $GOPATH/src/github.com/coreos-inc/alm
   - cd $GOPATH/src/github.com/coreos-inc/alm
-  coverage: /^TOTAL.*\s+(\d+\%)\s*$/
+  coverage: /\d\d\.\d.$/
   image: quay.io/coreos/alm-ci:${CI_COMMIT_REF_SLUG}
   script:
   - make vendor
   - make test
+  - make cover
   stage: tests
   tags:
   - kubernetes

Documentation/design/resources/schema_test.go

@@ -26,7 +26,7 @@ import (
 	"k8s.io/apimachinery/pkg/runtime"
 	utilfeature "k8s.io/apiserver/pkg/util/feature"
 
-	"github.com/coreos-inc/alm/apis/clusterserviceversion/v1alpha1"
+	"github.com/coreos-inc/alm/pkg/apis/clusterserviceversion/v1alpha1"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/apimachinery/pkg/util/validation/field"
 )

Makefile

@@ -5,26 +5,27 @@ CATALOG_PKG := github.com/coreos-inc/alm/cmd/catalog
 CATALOG_EXECUTABLE := ./bin/catalog
 IMAGE_REPO := quay.io/coreos/alm
 IMAGE_TAG ?= "dev"
-TOP_LEVEL := $(dir $(shell glide novendor))
-PACKAGES := $(shell find $(TOP_LEVEL) -type d -not -path '*/\.*')
 
 .PHONY: test run clean vendor vendor-update coverage
 
 all: test build
 
 test:
-	go vet `glide novendor`
-	go test -v -race `glide novendor`
+	go vet ./pkg/...
+	go test -v -race ./pkg/...
+	go test -v ./Documentation/...
 
-cover:
-	go test -cover -tags test `glide novendor`
+COVERUTIL := $(GOPATH)/bin/gocoverutil
 
-coverage-html:
-	echo "mode: count" > coverage-all.out
-	$(foreach pkg,$(PACKAGES),\
-		go test -coverprofile=coverage.out -covermode=count -tags test $(pkg);\
-		tail -n +2 coverage.out >> coverage-all.out;)
-	go tool cover -html=coverage-all.out
+$(COVERUTIL):
+	go get -u github.com/AlekSi/gocoverutil
+
+cover: $(COVERUTIL)
+	$(COVERUTIL) -coverprofile=cover.out test -covermode=count ./pkg/...
+	go tool cover -func=cover.out
+
+coverage-html: cover
+	go tool cover -html=cover.out
 
 build:
 	GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -i -o $(ALM_EXECUTABLE) $(ALM_PKG)
@@ -73,9 +74,9 @@ generate-mock-client: $(MOCKGEN)
 	mockgen -source=client/alphacatalogentry_client.go  -package=catalog > catalog/zz_generated.mock_alphacatalogentry_client_test.go
 	mockgen -source=client/deployment_install_client.go -package=install > install/zz_generated.mock_deployment_install_client_test.go
 	# can't use "source" mockgen, see: https://github.com/golang/mock/issues/11#issuecomment-294380653
-	mockgen -package=alm -imports client=github.com/coreos-inc/alm/vendor/github.com/coreos-inc/operator-client/pkg/client,v1=github.com/coreos-inc/alm/vendor/k8s.io/apimachinery/pkg/apis/meta/v1 github.com/coreos-inc/alm/install StrategyResolverInterface > operators/alm/zz_generated.mock_resolver_test.go
+	mockgen -package=alm -imports client=github.com/coreos-inc/alm/pkg/vendor/github.com/coreos-inc/operator-client/pkg/client,v1=github.com/coreos-inc/alm/pkg/vendor/k8s.io/apimachinery/pkg/apis/meta/v1 github.com/coreos-inc/alm/pkg/install StrategyResolverInterface > operators/alm/zz_generated.mock_resolver_test.go
 	# mockgen doesn't handle vendored dependencies well: https://github.com/golang/mock/issues/30
-	sed -i '' s,github.com/coreos-inc/alm/vendor/,, operators/alm/zz_generated.mock_resolver_test.go
+	sed -i '' s,github.com/coreos-inc/alm/pkg/vendor/,, operators/alm/zz_generated.mock_resolver_test.go
 	goimports -w operators/alm/zz_generated.mock_resolver_test.go
 
 make gen-all: gen-ci codegen generate-mock-client

cmd/alm/main.go

@@ -13,8 +13,8 @@ import (
 
 	"fmt"
 
-	"github.com/coreos-inc/alm/annotater"
-	"github.com/coreos-inc/alm/operators/alm"
+	"github.com/coreos-inc/alm/pkg/annotater"
+	"github.com/coreos-inc/alm/pkg/operators/alm"
 )
 
 const (

cmd/catalog/main.go

@@ -11,9 +11,9 @@ import (
 
 	log "github.com/sirupsen/logrus"
 
-	source "github.com/coreos-inc/alm/catalog"
-	"github.com/coreos-inc/alm/client"
-	"github.com/coreos-inc/alm/operators/catalog"
+	source "github.com/coreos-inc/alm/pkg/catalog"
+	"github.com/coreos-inc/alm/pkg/client"
+	"github.com/coreos-inc/alm/pkg/operators/catalog"
 )
 
 const (

hack/k8s/codegen/run_in_docker.sh

@@ -14,8 +14,8 @@ api_groups=("clusterserviceversion:v1alpha1" "installplan:v1alpha1"
 for group in ${api_groups[@]}; do
     echo -n "[$group] "
     codegen::generate-groups deepcopy \
-        github.com/coreos-inc/alm/generated \
-        github.com/coreos-inc/alm/apis \
+        github.com/coreos-inc/alm/pkg/generated \
+        github.com/coreos-inc/alm/pkg/apis \
         $group \
         --go-header-file "./hack/k8s/codegen/boilerplate.go.txt"
 done

apis/alphacatalogentry/v1alpha1/register.go → pkg/apis/alphacatalogentry/v1alpha1/register.go

@@ -5,7 +5,7 @@ import (
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 
-	"github.com/coreos-inc/alm/apis"
+	"github.com/coreos-inc/alm/pkg/apis"
 )
 
 var (

apis/installplan/v1alpha1/register_test.go → pkg/apis/alphacatalogentry/v1alpha1/register_test.go

@@ -3,7 +3,7 @@ package v1alpha1
 import (
 	"testing"
 
-	"github.com/coreos-inc/alm/apis"
+	"github.com/coreos-inc/alm/pkg/apis"
 	"github.com/stretchr/testify/require"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"

apis/alphacatalogentry/v1alpha1/types.go → pkg/apis/alphacatalogentry/v1alpha1/types.go

@@ -3,7 +3,7 @@ package v1alpha1
 import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
-	CSVv1alpha1 "github.com/coreos-inc/alm/apis/clusterserviceversion/v1alpha1"
+	CSVv1alpha1 "github.com/coreos-inc/alm/pkg/apis/clusterserviceversion/v1alpha1"
 )
 
 const (

apis/alphacatalogentry/v1alpha1/types_test.go → pkg/apis/alphacatalogentry/v1alpha1/types_test.go

@@ -3,7 +3,7 @@ package v1alpha1
 import (
 	"testing"
 
-	"github.com/coreos-inc/alm/apis/clusterserviceversion/v1alpha1"
+	"github.com/coreos-inc/alm/pkg/apis/clusterserviceversion/v1alpha1"
 	"github.com/coreos/go-semver/semver"
 	"github.com/stretchr/testify/require"
 )

apis/alphacatalogentry/v1alpha1/zz_deepcopy_test.go → pkg/apis/alphacatalogentry/v1alpha1/zz_deepcopy_test.go

@@ -3,7 +3,7 @@ package v1alpha1
 import (
 	"testing"
 
-	"github.com/coreos-inc/alm/apis/clusterserviceversion/v1alpha1"
+	"github.com/coreos-inc/alm/pkg/apis/clusterserviceversion/v1alpha1"
 	"github.com/coreos/go-semver/semver"
 	"github.com/stretchr/testify/require"
 )

apis/clusterserviceversion/v1alpha1/register.go → pkg/apis/clusterserviceversion/v1alpha1/register.go

@@ -5,7 +5,7 @@ import (
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 
-	"github.com/coreos-inc/alm/apis"
+	"github.com/coreos-inc/alm/pkg/apis"
 )
 
 var (

apis/alphacatalogentry/v1alpha1/register_test.go → pkg/apis/clusterserviceversion/v1alpha1/register_test.go

@@ -3,7 +3,7 @@ package v1alpha1
 import (
 	"testing"
 
-	"github.com/coreos-inc/alm/apis"
+	"github.com/coreos-inc/alm/pkg/apis"
 	"github.com/stretchr/testify/require"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"

apis/installplan/v1alpha1/register.go → pkg/apis/installplan/v1alpha1/register.go

@@ -5,7 +5,7 @@ import (
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 
-	"github.com/coreos-inc/alm/apis"
+	"github.com/coreos-inc/alm/pkg/apis"
 )
 
 var (

apis/clusterserviceversion/v1alpha1/register_test.go → pkg/apis/installplan/v1alpha1/register_test.go

@@ -3,7 +3,7 @@ package v1alpha1
 import (
 	"testing"
 
-	"github.com/coreos-inc/alm/apis"
+	"github.com/coreos-inc/alm/pkg/apis"
 	"github.com/stretchr/testify/require"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"

apis/installplan/v1alpha1/types.go → pkg/apis/installplan/v1alpha1/types.go

@@ -11,7 +11,7 @@ import (
 	"k8s.io/apimachinery/pkg/runtime/serializer/json"
 	k8sjson "k8s.io/apimachinery/pkg/runtime/serializer/json"
 
-	csvv1alpha1 "github.com/coreos-inc/alm/apis/clusterserviceversion/v1alpha1"
+	csvv1alpha1 "github.com/coreos-inc/alm/pkg/apis/clusterserviceversion/v1alpha1"
 )
 
 const (

apis/installplan/v1alpha1/types_test.go → pkg/apis/installplan/v1alpha1/types_test.go

@@ -12,7 +12,7 @@ import (
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/apimachinery/pkg/runtime/serializer/json"
 
-	csvv1alpha1 "github.com/coreos-inc/alm/apis/clusterserviceversion/v1alpha1"
+	csvv1alpha1 "github.com/coreos-inc/alm/pkg/apis/clusterserviceversion/v1alpha1"
 )
 
 func stepCRD(name, kind, group, version string) v1beta1.CustomResourceDefinition {

catalog/alphacatalogentries.go → pkg/catalog/alphacatalogentries.go

@@ -6,9 +6,9 @@ import (
 	log "github.com/sirupsen/logrus"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
-	"github.com/coreos-inc/alm/apis/alphacatalogentry/v1alpha1"
-	csvv1alpha1 "github.com/coreos-inc/alm/apis/clusterserviceversion/v1alpha1"
-	"github.com/coreos-inc/alm/client"
+	"github.com/coreos-inc/alm/pkg/apis/alphacatalogentry/v1alpha1"
+	csvv1alpha1 "github.com/coreos-inc/alm/pkg/apis/clusterserviceversion/v1alpha1"
+	"github.com/coreos-inc/alm/pkg/client"
 )
 
 // CatalogSync tracks information about the last time the catalog was synced to the cluster

catalog/alphacatalogentries_test.go → pkg/catalog/alphacatalogentries_test.go

@@ -11,8 +11,8 @@ import (
 
 	"reflect"
 
-	"github.com/coreos-inc/alm/apis/alphacatalogentry/v1alpha1"
-	csvv1alpha1 "github.com/coreos-inc/alm/apis/clusterserviceversion/v1alpha1"
+	"github.com/coreos-inc/alm/pkg/apis/alphacatalogentry/v1alpha1"
+	csvv1alpha1 "github.com/coreos-inc/alm/pkg/apis/clusterserviceversion/v1alpha1"
 )
 
 type EntryMatcher struct{ entry v1alpha1.AlphaCatalogEntry }

catalog/manifest.go → pkg/catalog/manifest.go

@@ -7,7 +7,7 @@ import (
 	"k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1"
 	"k8s.io/client-go/kubernetes/scheme"
 
-	"github.com/coreos-inc/alm/apis/clusterserviceversion/v1alpha1"
+	"github.com/coreos-inc/alm/pkg/apis/clusterserviceversion/v1alpha1"
 )
 
 // LoadCRDFromFile is a utility function for loading the CRD schemas.

catalog/mem.go → pkg/catalog/mem.go

@@ -8,7 +8,7 @@ import (
 	log "github.com/sirupsen/logrus"
 	"k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1"
 
-	"github.com/coreos-inc/alm/apis/clusterserviceversion/v1alpha1"
+	"github.com/coreos-inc/alm/pkg/apis/clusterserviceversion/v1alpha1"
 )
 
 // InMem - catalog source implementation that stores the data in memory in golang maps

catalog/mem_test.go → pkg/catalog/mem_test.go

@@ -10,7 +10,7 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/util/diff"
 
-	"github.com/coreos-inc/alm/apis/clusterserviceversion/v1alpha1"
+	"github.com/coreos-inc/alm/pkg/apis/clusterserviceversion/v1alpha1"
 )
 
 // compareResources compares resource equality then prints a diff for easier debugging

catalog/types.go → pkg/catalog/types.go

@@ -3,7 +3,7 @@ package catalog
 import (
 	"k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1"
 
-	"github.com/coreos-inc/alm/apis/clusterserviceversion/v1alpha1"
+	"github.com/coreos-inc/alm/pkg/apis/clusterserviceversion/v1alpha1"
 )
 
 // Catalog Source

catalog/zz_generated.mock_alphacatalogentry_client_test.go → pkg/catalog/zz_generated.mock_alphacatalogentry_client_test.go

@@ -4,7 +4,7 @@
 package catalog
 
 import (
-	v1alpha1 "github.com/coreos-inc/alm/apis/alphacatalogentry/v1alpha1"
+	v1alpha1 "github.com/coreos-inc/alm/pkg/apis/alphacatalogentry/v1alpha1"
 	gomock "github.com/golang/mock/gomock"
 )
 

client/alphacatalogentry_client.go → pkg/client/alphacatalogentry_client.go

@@ -11,7 +11,7 @@ import (
 	"k8s.io/apimachinery/pkg/runtime/serializer"
 	"k8s.io/client-go/rest"
 
-	"github.com/coreos-inc/alm/apis/alphacatalogentry/v1alpha1"
+	"github.com/coreos-inc/alm/pkg/apis/alphacatalogentry/v1alpha1"
 )
 
 type AlphaCatalogEntryInterface interface {

client/alphacatalogentry_client_test.go → pkg/client/alphacatalogentry_client_test.go

@@ -17,9 +17,9 @@ import (
 	"k8s.io/apimachinery/pkg/util/diff"
 	"k8s.io/client-go/rest"
 
-	"github.com/coreos-inc/alm/apis"
-	"github.com/coreos-inc/alm/apis/alphacatalogentry/v1alpha1"
-	csvv1alpha1 "github.com/coreos-inc/alm/apis/clusterserviceversion/v1alpha1"
+	"github.com/coreos-inc/alm/pkg/apis"
+	"github.com/coreos-inc/alm/pkg/apis/alphacatalogentry/v1alpha1"
+	csvv1alpha1 "github.com/coreos-inc/alm/pkg/apis/clusterserviceversion/v1alpha1"
 )
 
 func mockClient(t *testing.T, ts *httptest.Server) *AlphaCatalogEntryClient {

client/clusterserviceversion_client.go → pkg/client/clusterserviceversion_client.go

@@ -8,7 +8,7 @@ import (
 	"k8s.io/apimachinery/pkg/runtime/serializer"
 	"k8s.io/client-go/rest"
 
-	"github.com/coreos-inc/alm/apis/clusterserviceversion/v1alpha1"
+	"github.com/coreos-inc/alm/pkg/apis/clusterserviceversion/v1alpha1"
 )
 
 type ClusterServiceVersionInterface interface {

client/installplan_client.go → pkg/client/installplan_client.go

@@ -8,7 +8,7 @@ import (
 	"k8s.io/apimachinery/pkg/runtime/serializer"
 	"k8s.io/client-go/rest"
 
-	"github.com/coreos-inc/alm/apis/installplan/v1alpha1"
+	"github.com/coreos-inc/alm/pkg/apis/installplan/v1alpha1"
 )
 
 type InstallPlanInterface interface {

client/zz_generated.mock_installplan_client_test.go → pkg/client/zz_generated.mock_installplan_client_test.go

@@ -4,7 +4,7 @@
 package client
 
 import (
-	v1alpha1 "github.com/coreos-inc/alm/apis/installplan/v1alpha1"
+	v1alpha1 "github.com/coreos-inc/alm/pkg/apis/installplan/v1alpha1"
 	gomock "github.com/golang/mock/gomock"
 )
 

install/deployment.go → pkg/install/deployment.go

@@ -10,9 +10,9 @@ import (
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
-	"github.com/coreos-inc/alm/apis"
-	"github.com/coreos-inc/alm/apis/clusterserviceversion/v1alpha1"
-	"github.com/coreos-inc/alm/client"
+	"github.com/coreos-inc/alm/pkg/apis"
+	"github.com/coreos-inc/alm/pkg/apis/clusterserviceversion/v1alpha1"
+	"github.com/coreos-inc/alm/pkg/client"
 )
 
 const (
@@ -110,6 +110,10 @@ func (i *StrategyDeploymentInstaller) Install(s Strategy) error {
 		}
 	}
 
+	//existingDeployments, err := i.strategyClient.GetOwnedDeployments(i.ownerMeta)
+	//if err != nil {
+	//	return fmt.Errorf("query for existing deployments failed: %s", err)
+	//}
 	for _, spec := range strategy.DeploymentSpecs {
 		dep := v1beta1.Deployment{Spec: spec}
 		dep.SetNamespace(i.ownerMeta.Namespace)

install/deployment_test.go → pkg/install/deployment_test.go

@@ -13,8 +13,8 @@ import (
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
-	"github.com/coreos-inc/alm/apis"
-	"github.com/coreos-inc/alm/apis/clusterserviceversion/v1alpha1"
+	"github.com/coreos-inc/alm/pkg/apis"
+	"github.com/coreos-inc/alm/pkg/apis/clusterserviceversion/v1alpha1"
 	"github.com/stretchr/testify/require"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 )

install/resolver.go → pkg/install/resolver.go

@@ -7,8 +7,8 @@ import (
 	opClient "github.com/coreos-inc/operator-client/pkg/client"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
-	"github.com/coreos-inc/alm/apis/clusterserviceversion/v1alpha1"
-	"github.com/coreos-inc/alm/client"
+	"github.com/coreos-inc/alm/pkg/apis/clusterserviceversion/v1alpha1"
+	"github.com/coreos-inc/alm/pkg/client"
 )
 
 type Strategy interface {

operators/alm/operator.go → pkg/operators/alm/operator.go

@@ -9,10 +9,10 @@ import (
 	"k8s.io/apimachinery/pkg/fields"
 	"k8s.io/client-go/tools/cache"
 
-	"github.com/coreos-inc/alm/apis/clusterserviceversion/v1alpha1"
-	"github.com/coreos-inc/alm/client"
-	"github.com/coreos-inc/alm/install"
-	"github.com/coreos-inc/alm/queueinformer"
+	"github.com/coreos-inc/alm/pkg/apis/clusterserviceversion/v1alpha1"
+	"github.com/coreos-inc/alm/pkg/client"
+	"github.com/coreos-inc/alm/pkg/install"
+	"github.com/coreos-inc/alm/pkg/queueinformer"
 )
 
 var ErrRequirementsNotMet = errors.New("requirements were not met")