Skip to content

Commit f480c37

Browse files
committed
fix for sanity (#49)
Signed-off-by: Sameer Shaikh <[email protected]>
1 parent 2f28e15 commit f480c37

File tree

4 files changed

+134
-4
lines changed

4 files changed

+134
-4
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
GOPACKAGES=$(shell go list ./... | grep -v /vendor/ | grep -v /samples | grep -v /common/registry/fakes | grep -v common/vpcclient/client/fakes | grep -v /common/vpcclient/riaas/fakes | grep -v /common/vpcclient/vpcfilevolume/fakes | grep -v /common/vpcclient/riaas/test | grep -v /common/vpcclient/models | grep -v /file/vpcconfig | grep -v /e2e)
2+
GOPACKAGES=$(shell go list ./... | grep -v /vendor/ | grep -v /samples | grep -v /common/registry/fakes | grep -v pkg/metadata/fake | grep -v common/vpcclient/client/fakes | grep -v /common/vpcclient/riaas/fakes | grep -v /common/vpcclient/vpcfilevolume/fakes | grep -v /common/vpcclient/riaas/test | grep -v /common/vpcclient/models | grep -v /file/vpcconfig | grep -v /e2e)
33
GOFILES=$(shell find . -type f -name '*.go' -not -path "./vendor/*")
44
ARCH = $(shell uname -m)
55
LINT_VERSION="1.60.1"

pkg/metadata/fake/fake_node_info.go

Lines changed: 117 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/metadata/metadata.go

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,10 +63,22 @@ type nodeMetadataManager struct {
6363
workerID string
6464
}
6565

66+
// NodeInfo ...
67+
//
68+
//go:generate counterfeiter -o fake/fake_node_info.go --fake-name FakeNodeInfo . NodeInfo
69+
type NodeInfo interface {
70+
NewNodeMetadata(logger *zap.Logger) (NodeMetadata, error)
71+
}
72+
73+
// NodeInfoManager ...
74+
type NodeInfoManager struct {
75+
NodeName string
76+
}
77+
6678
var _ NodeMetadata = &nodeMetadataManager{}
6779

6880
// NewNodeMetadata ...
69-
func NewNodeMetadata(nodeName string, logger *zap.Logger) (NodeMetadata, error) {
81+
func (nodeManager *NodeInfoManager) NewNodeMetadata(logger *zap.Logger) (NodeMetadata, error) {
7082
config, err := rest.InClusterConfig()
7183
if err != nil {
7284
return nil, err
@@ -77,7 +89,7 @@ func NewNodeMetadata(nodeName string, logger *zap.Logger) (NodeMetadata, error)
7789
return nil, err
7890
}
7991

80-
node, err := clientset.CoreV1().Nodes().Get(context.Background(), nodeName, metav1.GetOptions{})
92+
node, err := clientset.CoreV1().Nodes().Get(context.Background(), nodeManager.NodeName, metav1.GetOptions{})
8193
if err != nil {
8294
return nil, err
8395
}

pkg/metadata/metadata_test.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@ func TestNewNodeMetadata(t *testing.T) {
2828
// Creating test logger
2929
logger, teardown := cloudprovider.GetTestLogger(t)
3030
defer teardown()
31-
nodeMeta, err := NewNodeMetadata("mynode", logger)
31+
nodeInfo := NodeInfoManager{NodeName: "mynode"}
32+
nodeMeta, err := nodeInfo.NewNodeMetadata(logger)
3233

3334
// Error will be there as there is no kubernetes running
3435
assert.NotNil(t, err)

0 commit comments

Comments
 (0)