Skip to content

Commit

Permalink
moving cacheutil to a non-internal location
Browse files Browse the repository at this point in the history
  • Loading branch information
@bryanl
bryanl committed Apr 4, 2019
1 parent b6ef46b commit 4d16621
Show file tree
Hide file tree
Showing 37 changed files with 37 additions and 37 deletions.
2 changes: 1 addition & 1 deletion internal/cache/cache.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package cache
import (
"context"

cacheutil "github.com/heptio/developer-dash/internal/cache/util"
"github.com/heptio/developer-dash/pkg/cacheutil"
"github.com/pkg/errors"
"k8s.io/apimachinery/pkg/api/meta"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand Down
2 changes: 1 addition & 1 deletion internal/cache/dynamic_cache.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"sync"
"time"

cacheutil "github.com/heptio/developer-dash/internal/cache/util"
"github.com/heptio/developer-dash/pkg/cacheutil"
"github.com/heptio/developer-dash/internal/cluster"
"github.com/heptio/developer-dash/internal/util/retry"
"github.com/pkg/errors"
Expand Down
2 changes: 1 addition & 1 deletion internal/cache/dynamic_cache_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"testing"

"github.com/golang/mock/gomock"
cacheutil "github.com/heptio/developer-dash/internal/cache/util"
"github.com/heptio/developer-dash/pkg/cacheutil"
"github.com/heptio/developer-dash/internal/cluster"
clusterfake "github.com/heptio/developer-dash/internal/cluster/fake"
"github.com/heptio/developer-dash/internal/testutil"
Expand Down
2 changes: 1 addition & 1 deletion internal/cache/watch.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (

"k8s.io/apimachinery/pkg/labels"

cacheutil "github.com/heptio/developer-dash/internal/cache/util"
"github.com/heptio/developer-dash/pkg/cacheutil"
"github.com/heptio/developer-dash/internal/cluster"
"github.com/pkg/errors"
"go.opencensus.io/trace"
Expand Down
2 changes: 1 addition & 1 deletion internal/cache/watch_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (

"github.com/golang/mock/gomock"
cachefake "github.com/heptio/developer-dash/internal/cache/fake"
cacheutil "github.com/heptio/developer-dash/internal/cache/util"
"github.com/heptio/developer-dash/pkg/cacheutil"
"github.com/heptio/developer-dash/internal/cluster"
clusterfake "github.com/heptio/developer-dash/internal/cluster/fake"
"github.com/heptio/developer-dash/internal/testutil"
Expand Down
2 changes: 1 addition & 1 deletion internal/overview/content_handlers.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"sort"

"github.com/heptio/developer-dash/internal/cache"
cacheutil "github.com/heptio/developer-dash/internal/cache/util"
"github.com/heptio/developer-dash/pkg/cacheutil"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"k8s.io/apimachinery/pkg/util/clock"
Expand Down
2 changes: 1 addition & 1 deletion internal/overview/content_handlers_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (

"github.com/golang/mock/gomock"
cachefake "github.com/heptio/developer-dash/internal/cache/fake"
cacheutil "github.com/heptio/developer-dash/internal/cache/util"
"github.com/heptio/developer-dash/pkg/cacheutil"
"github.com/pkg/errors"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
Expand Down
2 changes: 1 addition & 1 deletion internal/overview/customresource.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"sync"

"github.com/heptio/developer-dash/internal/cache"
cacheutil "github.com/heptio/developer-dash/internal/cache/util"
"github.com/heptio/developer-dash/pkg/cacheutil"
"github.com/heptio/developer-dash/internal/cluster"
"github.com/heptio/developer-dash/internal/log"
"github.com/heptio/developer-dash/internal/overview/link"
Expand Down
2 changes: 1 addition & 1 deletion internal/overview/customresource_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"github.com/golang/mock/gomock"
"github.com/heptio/developer-dash/internal/cache"
cachefake "github.com/heptio/developer-dash/internal/cache/fake"
cacheutil "github.com/heptio/developer-dash/internal/cache/util"
"github.com/heptio/developer-dash/pkg/cacheutil"
"github.com/heptio/developer-dash/internal/overview/printer"
printerfake "github.com/heptio/developer-dash/internal/overview/printer/fake"
"github.com/heptio/developer-dash/internal/queryer"
Expand Down
2 changes: 1 addition & 1 deletion internal/overview/describer.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"reflect"

"github.com/heptio/developer-dash/internal/cache"
cacheutil "github.com/heptio/developer-dash/internal/cache/util"
"github.com/heptio/developer-dash/pkg/cacheutil"
"github.com/heptio/developer-dash/internal/cluster"
"github.com/heptio/developer-dash/internal/log"
"github.com/heptio/developer-dash/internal/overview/logviewer"
Expand Down
2 changes: 1 addition & 1 deletion internal/overview/describer_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (

"github.com/golang/mock/gomock"
cachefake "github.com/heptio/developer-dash/internal/cache/fake"
cacheutil "github.com/heptio/developer-dash/internal/cache/util"
"github.com/heptio/developer-dash/pkg/cacheutil"
clusterfake "github.com/heptio/developer-dash/internal/cluster/fake"
"github.com/heptio/developer-dash/internal/overview/printer"
printerfake "github.com/heptio/developer-dash/internal/overview/printer/fake"
Expand Down
2 changes: 1 addition & 1 deletion internal/overview/navigation_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (

"github.com/golang/mock/gomock"
fakecache "github.com/heptio/developer-dash/internal/cache/fake"
cacheutil "github.com/heptio/developer-dash/internal/cache/util"
"github.com/heptio/developer-dash/pkg/cacheutil"
"github.com/heptio/developer-dash/internal/overview"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
Expand Down
2 changes: 1 addition & 1 deletion internal/overview/objects.go
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package overview

import (
cacheutil "github.com/heptio/developer-dash/internal/cache/util"
"github.com/heptio/developer-dash/pkg/cacheutil"
appsv1 "k8s.io/api/apps/v1"
batchv1 "k8s.io/api/batch/v1"
batchv1beta1 "k8s.io/api/batch/v1beta1"
Expand Down
2 changes: 1 addition & 1 deletion internal/overview/objectstatus/ingress.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"strconv"

"github.com/heptio/developer-dash/internal/cache"
cacheutil "github.com/heptio/developer-dash/internal/cache/util"
"github.com/heptio/developer-dash/pkg/cacheutil"
"github.com/pkg/errors"
corev1 "k8s.io/api/core/v1"
extv1beta1 "k8s.io/api/extensions/v1beta1"
Expand Down
2 changes: 1 addition & 1 deletion internal/overview/objectstatus/ingress_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (

"github.com/golang/mock/gomock"
cachefake "github.com/heptio/developer-dash/internal/cache/fake"
cacheutil "github.com/heptio/developer-dash/internal/cache/util"
"github.com/heptio/developer-dash/pkg/cacheutil"
"github.com/heptio/developer-dash/internal/testutil"
"github.com/heptio/developer-dash/pkg/view/component"
"github.com/stretchr/testify/assert"
Expand Down
2 changes: 1 addition & 1 deletion internal/overview/objectstatus/service.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"context"

"github.com/heptio/developer-dash/internal/cache"
cacheutil "github.com/heptio/developer-dash/internal/cache/util"
"github.com/heptio/developer-dash/pkg/cacheutil"
"github.com/heptio/developer-dash/pkg/view/component"
"github.com/pkg/errors"
corev1 "k8s.io/api/core/v1"
Expand Down
2 changes: 1 addition & 1 deletion internal/overview/objectstatus/service_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (

"github.com/golang/mock/gomock"
cachefake "github.com/heptio/developer-dash/internal/cache/fake"
cacheutil "github.com/heptio/developer-dash/internal/cache/util"
"github.com/heptio/developer-dash/pkg/cacheutil"
"github.com/heptio/developer-dash/internal/testutil"
"github.com/heptio/developer-dash/pkg/view/component"
"github.com/stretchr/testify/assert"
Expand Down
2 changes: 1 addition & 1 deletion internal/overview/printer/event.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"strings"

"github.com/heptio/developer-dash/internal/cache"
cacheutil "github.com/heptio/developer-dash/internal/cache/util"
"github.com/heptio/developer-dash/pkg/cacheutil"
"github.com/heptio/developer-dash/internal/overview/link"
"github.com/heptio/developer-dash/pkg/view/component"
"github.com/heptio/developer-dash/pkg/view/flexlayout"
Expand Down
2 changes: 1 addition & 1 deletion internal/overview/printer/event_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (

"github.com/golang/mock/gomock"
cachefake "github.com/heptio/developer-dash/internal/cache/fake"
cacheutil "github.com/heptio/developer-dash/internal/cache/util"
"github.com/heptio/developer-dash/pkg/cacheutil"
"github.com/heptio/developer-dash/pkg/view/component"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
Expand Down
2 changes: 1 addition & 1 deletion internal/overview/printer/job.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"context"
"fmt"

cacheutil "github.com/heptio/developer-dash/internal/cache/util"
"github.com/heptio/developer-dash/pkg/cacheutil"
"github.com/heptio/developer-dash/internal/conversion"
"github.com/heptio/developer-dash/internal/overview/link"
"github.com/heptio/developer-dash/pkg/view/component"
Expand Down
2 changes: 1 addition & 1 deletion internal/overview/printer/pod.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"fmt"

"github.com/heptio/developer-dash/internal/cache"
cacheutil "github.com/heptio/developer-dash/internal/cache/util"
"github.com/heptio/developer-dash/pkg/cacheutil"
"github.com/heptio/developer-dash/internal/overview/link"
"github.com/heptio/developer-dash/pkg/view/component"
"github.com/pkg/errors"
Expand Down
2 changes: 1 addition & 1 deletion internal/overview/printer/replicaset_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (

"github.com/golang/mock/gomock"
cachefake "github.com/heptio/developer-dash/internal/cache/fake"
cacheutil "github.com/heptio/developer-dash/internal/cache/util"
"github.com/heptio/developer-dash/pkg/cacheutil"
"github.com/heptio/developer-dash/internal/testutil"
"github.com/heptio/developer-dash/pkg/view/component"
"github.com/stretchr/testify/assert"
Expand Down
2 changes: 1 addition & 1 deletion internal/overview/printer/replicationcontroller_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (

"github.com/golang/mock/gomock"
cachefake "github.com/heptio/developer-dash/internal/cache/fake"
cacheutil "github.com/heptio/developer-dash/internal/cache/util"
"github.com/heptio/developer-dash/pkg/cacheutil"
"github.com/heptio/developer-dash/internal/testutil"
"github.com/heptio/developer-dash/pkg/view/component"
"github.com/stretchr/testify/assert"
Expand Down
2 changes: 1 addition & 1 deletion internal/overview/printer/service.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"strings"

"github.com/heptio/developer-dash/internal/cache"
cacheutil "github.com/heptio/developer-dash/internal/cache/util"
"github.com/heptio/developer-dash/pkg/cacheutil"
"github.com/heptio/developer-dash/internal/overview/link"
"github.com/heptio/developer-dash/pkg/view/component"
"github.com/pkg/errors"
Expand Down
2 changes: 1 addition & 1 deletion internal/overview/printer/service_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (

"github.com/golang/mock/gomock"
cachefake "github.com/heptio/developer-dash/internal/cache/fake"
cacheutil "github.com/heptio/developer-dash/internal/cache/util"
"github.com/heptio/developer-dash/pkg/cacheutil"
"github.com/heptio/developer-dash/pkg/view/component"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
Expand Down
2 changes: 1 addition & 1 deletion internal/overview/printer/serviceaccount.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"fmt"

"github.com/heptio/developer-dash/internal/cache"
cacheutil "github.com/heptio/developer-dash/internal/cache/util"
"github.com/heptio/developer-dash/pkg/cacheutil"
"github.com/heptio/developer-dash/internal/overview/link"
"github.com/heptio/developer-dash/pkg/view/component"
"github.com/pkg/errors"
Expand Down
2 changes: 1 addition & 1 deletion internal/overview/printer/serviceaccount_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (

cachefake "github.com/heptio/developer-dash/internal/cache/fake"
fakecache "github.com/heptio/developer-dash/internal/cache/fake"
cacheutil "github.com/heptio/developer-dash/internal/cache/util"
"github.com/heptio/developer-dash/pkg/cacheutil"
"github.com/heptio/developer-dash/internal/overview/link"
"github.com/heptio/developer-dash/internal/testutil"
"github.com/heptio/developer-dash/pkg/view/component"
Expand Down
2 changes: 1 addition & 1 deletion internal/overview/printer/statefulset_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (

"github.com/golang/mock/gomock"
cachefake "github.com/heptio/developer-dash/internal/cache/fake"
cacheutil "github.com/heptio/developer-dash/internal/cache/util"
"github.com/heptio/developer-dash/pkg/cacheutil"
"github.com/heptio/developer-dash/internal/conversion"
"github.com/heptio/developer-dash/internal/testutil"
"github.com/heptio/developer-dash/pkg/view/component"
Expand Down
2 changes: 1 addition & 1 deletion internal/overview/resource.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"path"
"reflect"

cacheutil "github.com/heptio/developer-dash/internal/cache/util"
"github.com/heptio/developer-dash/pkg/cacheutil"
"github.com/heptio/developer-dash/pkg/view/component"

"github.com/heptio/developer-dash/internal/cluster"
Expand Down
2 changes: 1 addition & 1 deletion internal/portforward/service.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (

"github.com/google/uuid"
"github.com/heptio/developer-dash/internal/cache"
cacheutil "github.com/heptio/developer-dash/internal/cache/util"
"github.com/heptio/developer-dash/pkg/cacheutil"
"github.com/heptio/developer-dash/internal/log"
"github.com/pkg/errors"
corev1 "k8s.io/api/core/v1"
Expand Down
2 changes: 1 addition & 1 deletion internal/queryer/queryer.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"sync"

"github.com/heptio/developer-dash/internal/cache"
cacheutil "github.com/heptio/developer-dash/internal/cache/util"
"github.com/heptio/developer-dash/pkg/cacheutil"
dashstrings "github.com/heptio/developer-dash/internal/util/strings"
"github.com/pkg/errors"
"go.opencensus.io/trace"
Expand Down
2 changes: 1 addition & 1 deletion internal/queryer/queryer_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (

"github.com/golang/mock/gomock"
fakecache "github.com/heptio/developer-dash/internal/cache/fake"
cacheutil "github.com/heptio/developer-dash/internal/cache/util"
"github.com/heptio/developer-dash/pkg/cacheutil"
fakequeryer "github.com/heptio/developer-dash/internal/queryer/fake"
"github.com/pkg/errors"
"github.com/stretchr/testify/assert"
Expand Down
2 changes: 1 addition & 1 deletion internal/cache/util/key.go → pkg/cacheutil/key.go
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package util
package cacheutil

import (
"fmt"
Expand Down
2 changes: 1 addition & 1 deletion pkg/plugin/api/api_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (

"github.com/golang/mock/gomock"
cachefake "github.com/heptio/developer-dash/internal/cache/fake"
cacheutil "github.com/heptio/developer-dash/internal/cache/util"
"github.com/heptio/developer-dash/pkg/cacheutil"
"github.com/heptio/developer-dash/internal/gvk"
"github.com/heptio/developer-dash/internal/portforward"
pffake "github.com/heptio/developer-dash/internal/portforward/fake"
Expand Down
2 changes: 1 addition & 1 deletion pkg/plugin/api/client.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package api
import (
"context"

cacheutil "github.com/heptio/developer-dash/internal/cache/util"
"github.com/heptio/developer-dash/pkg/cacheutil"
"github.com/heptio/developer-dash/internal/log"
"github.com/heptio/developer-dash/pkg/plugin/api/proto"
"google.golang.org/grpc"
Expand Down
2 changes: 1 addition & 1 deletion pkg/plugin/api/conversion.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package api
import (
"encoding/json"

cacheutil "github.com/heptio/developer-dash/internal/cache/util"
"github.com/heptio/developer-dash/pkg/cacheutil"
"github.com/heptio/developer-dash/pkg/plugin/api/proto"
"github.com/pkg/errors"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
Expand Down
2 changes: 1 addition & 1 deletion pkg/plugin/api/server.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"context"

"github.com/heptio/developer-dash/internal/cache"
cacheutil "github.com/heptio/developer-dash/internal/cache/util"
"github.com/heptio/developer-dash/pkg/cacheutil"
"github.com/heptio/developer-dash/internal/gvk"
"github.com/heptio/developer-dash/internal/portforward"
"github.com/heptio/developer-dash/pkg/plugin/api/proto"
Expand Down

0 comments on commit 4d16621

Please sign in to comment.