Skip to content

Commit

Permalink
[ipcapi] Refactored ipcapi to be inside of pkg, rather than in APIs.
Browse files Browse the repository at this point in the history 
Signed-off by: Kendall Tauser <[email protected]>
  • Loading branch information
@fire833
fire833 committed Aug 4, 2022
1 parent 98d8552 commit 62f5ce1
Show file tree
Hide file tree
Showing 52 changed files with 60 additions and 53 deletions.
7 changes: 7 additions & 0 deletions Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,13 @@ binary:
GOOS=linux GOARCH=arm ${GO} build -o bin/morfic-linux-arm -ldflags "-X 'main.version=${VERSION}' -X 'main.commit=${COMMIT}' -X 'main.buildTime=${DATE}'" cmd/morfic/main.go
@echo "Success!"

.PHONY: codegen
codegen: ipcapigen

.PHONY: ipcapigen
ipcapigen:
make -C pkg/ipcapi/v1alpha1

.PHONY: test
test:
@echo "Testing morfic packages..."
Expand Down
0 pkg/apis/ipcapi/v1alpha1/Makefile → pkg/ipcapi/v1alpha1/Makefile
View file
File renamed without changes.
0 pkg/apis/ipcapi/v1alpha1/node_control.pb.go → pkg/ipcapi/v1alpha1/node_control.pb.go
View file
File renamed without changes.
0 pkg/apis/ipcapi/v1alpha1/node_control.proto → pkg/ipcapi/v1alpha1/node_control.proto
View file
File renamed without changes.
0 ...s/ipcapi/v1alpha1/node_control_grpc.pb.go → pkg/ipcapi/v1alpha1/node_control_grpc.pb.go
View file
File renamed without changes.
0 ...pis/ipcapi/v1alpha1/service_control.proto → pkg/ipcapi/v1alpha1/service_control.proto
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion pkg/localapis/node_client.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (
"log"
"time"

ipcapi "github.com/fire833/morfic/pkg/apis/ipcapi/v1alpha1"
ipcapi "github.com/fire833/morfic/pkg/ipcapi/v1alpha1"
"google.golang.org/grpc"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/node/comparators/address_comparator.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
package comparator

import (
api "github.com/fire833/morfic/pkg/apis/ipcapi/v1alpha1"
api "github.com/fire833/morfic/pkg/ipcapi/v1alpha1"
)

// Returns true if the link addresses are equivalent. Otherwise returns false.
Expand Down
2 changes: 1 addition & 1 deletion pkg/node/comparators/address_comparator_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ package comparator
import (
"testing"

api "github.com/fire833/morfic/pkg/apis/ipcapi/v1alpha1"
api "github.com/fire833/morfic/pkg/ipcapi/v1alpha1"
)

func TestCompareLinkAddress(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion pkg/node/comparators/link_comparator.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
package comparator

import (
api "github.com/fire833/morfic/pkg/apis/ipcapi/v1alpha1"
api "github.com/fire833/morfic/pkg/ipcapi/v1alpha1"
)

// Returns true if the link objects are equivalent. Otherwise returns false.
Expand Down
2 changes: 1 addition & 1 deletion pkg/node/comparators/link_comparator_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ package comparator
import (
"testing"

api "github.com/fire833/morfic/pkg/apis/ipcapi/v1alpha1"
api "github.com/fire833/morfic/pkg/ipcapi/v1alpha1"
)

func TestCompareLink(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion pkg/node/converters/address_converters.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (
"github.com/jsimonetti/rtnetlink"
"github.com/vishvananda/netlink"

api "github.com/fire833/morfic/pkg/apis/ipcapi/v1alpha1"
api "github.com/fire833/morfic/pkg/ipcapi/v1alpha1"
)

func ConvertAPIAddrtoNetlinkAddrNew(addr *api.LinkAddress) *netlink.Addr {
Expand Down
2 changes: 1 addition & 1 deletion pkg/node/converters/address_converters_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (
"reflect"
"testing"

api "github.com/fire833/morfic/pkg/apis/ipcapi/v1alpha1"
api "github.com/fire833/morfic/pkg/ipcapi/v1alpha1"
"github.com/jsimonetti/rtnetlink"
"github.com/vishvananda/netlink"
)
Expand Down
2 changes: 1 addition & 1 deletion pkg/node/converters/link_converters.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ package converters
import (
"net"

api "github.com/fire833/morfic/pkg/apis/ipcapi/v1alpha1"
api "github.com/fire833/morfic/pkg/ipcapi/v1alpha1"
"github.com/jsimonetti/rtnetlink"
"github.com/vishvananda/netlink"
"golang.org/x/sys/unix"
Expand Down
2 changes: 1 addition & 1 deletion pkg/node/converters/link_converters_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
"reflect"
"testing"

api "github.com/fire833/morfic/pkg/apis/ipcapi/v1alpha1"
api "github.com/fire833/morfic/pkg/ipcapi/v1alpha1"
"github.com/jsimonetti/rtnetlink"
"github.com/vishvananda/netlink"
)
Expand Down
2 changes: 1 addition & 1 deletion pkg/node/converters/neighbor_converters.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
"github.com/jsimonetti/rtnetlink"
"github.com/vishvananda/netlink"

api "github.com/fire833/morfic/pkg/apis/ipcapi/v1alpha1"
api "github.com/fire833/morfic/pkg/ipcapi/v1alpha1"
)

func ConvertAPINeighborToNetlinkNeighborNew(neigh *api.Neighbor) *netlink.Neigh {
Expand Down
2 changes: 1 addition & 1 deletion pkg/node/converters/neighbor_converters_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
"reflect"
"testing"

api "github.com/fire833/morfic/pkg/apis/ipcapi/v1alpha1"
api "github.com/fire833/morfic/pkg/ipcapi/v1alpha1"
"github.com/jsimonetti/rtnetlink"
"github.com/vishvananda/netlink"
)
Expand Down
2 changes: 1 addition & 1 deletion pkg/node/converters/route_converters.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
"github.com/jsimonetti/rtnetlink"
"github.com/vishvananda/netlink"

api "github.com/fire833/morfic/pkg/apis/ipcapi/v1alpha1"
api "github.com/fire833/morfic/pkg/ipcapi/v1alpha1"
)

func ConvertAPIRouteToNetlinkRouteNew(route *api.Route) *netlink.Route {
Expand Down
2 changes: 1 addition & 1 deletion pkg/node/converters/route_converters_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
"reflect"
"testing"

api "github.com/fire833/morfic/pkg/apis/ipcapi/v1alpha1"
api "github.com/fire833/morfic/pkg/ipcapi/v1alpha1"
"github.com/jsimonetti/rtnetlink"
"github.com/vishvananda/netlink"
)
Expand Down
2 changes: 1 addition & 1 deletion pkg/node/netlink/address.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ package netlink
import (
"context"

api "github.com/fire833/morfic/pkg/apis/ipcapi/v1alpha1"
api "github.com/fire833/morfic/pkg/ipcapi/v1alpha1"
)

func (s *NetlinkNodeServer) GetAddress(ctx context.Context, req *api.GetAddressRequest) (resp *api.GetAddressResponse, err error) {
Expand Down
4 changes: 2 additions & 2 deletions pkg/node/netlink/address_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ import (
"reflect"
"testing"

"github.com/fire833/morfic/pkg/apis/ipcapi/v1alpha1"
api "github.com/fire833/morfic/pkg/apis/ipcapi/v1alpha1"
"github.com/fire833/morfic/pkg/ipcapi/v1alpha1"
api "github.com/fire833/morfic/pkg/ipcapi/v1alpha1"
)

func TestNetlinkNodeServer_GetAddress(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion pkg/node/netlink/chains.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ package netlink
import (
"context"

api "github.com/fire833/morfic/pkg/apis/ipcapi/v1alpha1"
api "github.com/fire833/morfic/pkg/ipcapi/v1alpha1"
)

func (s *NetlinkNodeServer) GetChain(ctx context.Context, req *api.GetChainRequest) (resp *api.GetChainResponse, err error) {
Expand Down
4 changes: 2 additions & 2 deletions pkg/node/netlink/chains_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ import (
"reflect"
"testing"

"github.com/fire833/morfic/pkg/apis/ipcapi/v1alpha1"
api "github.com/fire833/morfic/pkg/apis/ipcapi/v1alpha1"
"github.com/fire833/morfic/pkg/ipcapi/v1alpha1"
api "github.com/fire833/morfic/pkg/ipcapi/v1alpha1"
)

func TestNetlinkNodeServer_GetChain(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion pkg/node/netlink/ipsec.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ package netlink
import (
"context"

api "github.com/fire833/morfic/pkg/apis/ipcapi/v1alpha1"
api "github.com/fire833/morfic/pkg/ipcapi/v1alpha1"
)

func GetIPSecTunnel(ctx context.Context, req *api.GetIPSecTunnelRequest) (resp *api.GetIPSecTunnelResponse, err error) {
Expand Down
2 changes: 1 addition & 1 deletion pkg/node/netlink/ipsec_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (
"reflect"
"testing"

api "github.com/fire833/morfic/pkg/apis/ipcapi/v1alpha1"
api "github.com/fire833/morfic/pkg/ipcapi/v1alpha1"
)

func TestGetIPSecTunnel(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion pkg/node/netlink/l2tp.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ package netlink
import (
"context"

api "github.com/fire833/morfic/pkg/apis/ipcapi/v1alpha1"
api "github.com/fire833/morfic/pkg/ipcapi/v1alpha1"
)

func GetL2TPTunnel(ctx context.Context, req *api.GetL2TPTunnelRequest) (resp *api.GetL2TPTunnelResponse, err error) {
Expand Down
2 changes: 1 addition & 1 deletion pkg/node/netlink/l2tp_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (
"reflect"
"testing"

api "github.com/fire833/morfic/pkg/apis/ipcapi/v1alpha1"
api "github.com/fire833/morfic/pkg/ipcapi/v1alpha1"
)

func TestGetL2TPTunnel(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion pkg/node/netlink/links.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (
"errors"
"net"

api "github.com/fire833/morfic/pkg/apis/ipcapi/v1alpha1"
api "github.com/fire833/morfic/pkg/ipcapi/v1alpha1"
"github.com/fire833/morfic/pkg/node/converters"
"github.com/fire833/morfic/pkg/node/locks"
"github.com/fire833/morfic/pkg/node/validators"
Expand Down
4 changes: 2 additions & 2 deletions pkg/node/netlink/links_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ import (
"reflect"
"testing"

"github.com/fire833/morfic/pkg/apis/ipcapi/v1alpha1"
api "github.com/fire833/morfic/pkg/apis/ipcapi/v1alpha1"
"github.com/fire833/morfic/pkg/ipcapi/v1alpha1"
api "github.com/fire833/morfic/pkg/ipcapi/v1alpha1"
)

func TestNetlinkNodeServer_CreateLink(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion pkg/node/netlink/neighbors.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ package netlink
import (
"context"

api "github.com/fire833/morfic/pkg/apis/ipcapi/v1alpha1"
api "github.com/fire833/morfic/pkg/ipcapi/v1alpha1"
)

func (s *NetlinkNodeServer) GetNeighbor(ctx context.Context, req *api.GetNeighborRequest) (resp *api.GetNeighborResponse, err error) {
Expand Down
4 changes: 2 additions & 2 deletions pkg/node/netlink/neighbors_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ import (
"reflect"
"testing"

"github.com/fire833/morfic/pkg/apis/ipcapi/v1alpha1"
api "github.com/fire833/morfic/pkg/apis/ipcapi/v1alpha1"
"github.com/fire833/morfic/pkg/ipcapi/v1alpha1"
api "github.com/fire833/morfic/pkg/ipcapi/v1alpha1"
)

func TestNetlinkNodeServer_GetNeighbor(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion pkg/node/netlink/routes.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ package netlink
import (
"context"

api "github.com/fire833/morfic/pkg/apis/ipcapi/v1alpha1"
api "github.com/fire833/morfic/pkg/ipcapi/v1alpha1"
"github.com/fire833/morfic/pkg/node/converters"
"github.com/fire833/morfic/pkg/node/locks"
"github.com/fire833/morfic/pkg/node/validators"
Expand Down
4 changes: 2 additions & 2 deletions pkg/node/netlink/routes_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ import (
"reflect"
"testing"

"github.com/fire833/morfic/pkg/apis/ipcapi/v1alpha1"
api "github.com/fire833/morfic/pkg/apis/ipcapi/v1alpha1"
"github.com/fire833/morfic/pkg/ipcapi/v1alpha1"
api "github.com/fire833/morfic/pkg/ipcapi/v1alpha1"
)

func TestNetlinkNodeServer_CreateStaticRoute(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion pkg/node/netlink/rules.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ package netlink
import (
"context"

api "github.com/fire833/morfic/pkg/apis/ipcapi/v1alpha1"
api "github.com/fire833/morfic/pkg/ipcapi/v1alpha1"
"github.com/fire833/morfic/pkg/node/locks"

"github.com/vishvananda/netlink"
Expand Down
4 changes: 2 additions & 2 deletions pkg/node/netlink/rules_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ import (
"reflect"
"testing"

"github.com/fire833/morfic/pkg/apis/ipcapi/v1alpha1"
api "github.com/fire833/morfic/pkg/apis/ipcapi/v1alpha1"
"github.com/fire833/morfic/pkg/ipcapi/v1alpha1"
api "github.com/fire833/morfic/pkg/ipcapi/v1alpha1"
)

func TestNetlinkNodeServer_GetRule(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion pkg/node/netlink/sysctl.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (
"fmt"
"strconv"

api "github.com/fire833/morfic/pkg/apis/ipcapi/v1alpha1"
api "github.com/fire833/morfic/pkg/ipcapi/v1alpha1"

sysctl "github.com/lorenzosaino/go-sysctl"
)
Expand Down
2 changes: 1 addition & 1 deletion pkg/node/netlink/tables.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ package netlink
import (
"context"

api "github.com/fire833/morfic/pkg/apis/ipcapi/v1alpha1"
api "github.com/fire833/morfic/pkg/ipcapi/v1alpha1"
)

func (s *NetlinkNodeServer) GetTable(ctx context.Context, req *api.GetTableRequest) (resp *api.GetTableResponse, err error) {
Expand Down
4 changes: 2 additions & 2 deletions pkg/node/netlink/tables_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ import (
"reflect"
"testing"

"github.com/fire833/morfic/pkg/apis/ipcapi/v1alpha1"
api "github.com/fire833/morfic/pkg/apis/ipcapi/v1alpha1"
"github.com/fire833/morfic/pkg/ipcapi/v1alpha1"
api "github.com/fire833/morfic/pkg/ipcapi/v1alpha1"
)

func TestNetlinkNodeServer_GetTable(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion pkg/node/netlink/types.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

package netlink

import "github.com/fire833/morfic/pkg/apis/ipcapi/v1alpha1"
import "github.com/fire833/morfic/pkg/ipcapi/v1alpha1"

// NetlinkNodeServer is the handlers that satisfy the
// NodeControllerSeriver and NodeFirewallControllerService interfaces.
Expand Down
2 changes: 1 addition & 1 deletion pkg/node/netlink/wireguard.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ package netlink
import (
"context"

api "github.com/fire833/morfic/pkg/apis/ipcapi/v1alpha1"
api "github.com/fire833/morfic/pkg/ipcapi/v1alpha1"
)

func GetWireguardTunnel(ctx context.Context, req *api.GetWireguardTunnelRequest) (resp *api.GetWireguardTunnelResponse, err error) {
Expand Down
2 changes: 1 addition & 1 deletion pkg/node/netlink/wireguard_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (
"reflect"
"testing"

api "github.com/fire833/morfic/pkg/apis/ipcapi/v1alpha1"
api "github.com/fire833/morfic/pkg/ipcapi/v1alpha1"
)

func TestGetWireguardTunnel(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion pkg/node/server.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ import (
"time"

"github.com/fire833/morfic/pkg"
"github.com/fire833/morfic/pkg/apis/ipcapi/v1alpha1"
"github.com/fire833/morfic/pkg/config"
"github.com/fire833/morfic/pkg/ipcapi/v1alpha1"
"github.com/fire833/morfic/pkg/node/netlink"
"google.golang.org/grpc"
"google.golang.org/grpc/credentials"
Expand Down
2 changes: 1 addition & 1 deletion pkg/node/validators/address_validator.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ package validators
import (
"net"

api "github.com/fire833/morfic/pkg/apis/ipcapi/v1alpha1"
api "github.com/fire833/morfic/pkg/ipcapi/v1alpha1"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion pkg/node/validators/address_validator_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import (
"net"
"testing"

api "github.com/fire833/morfic/pkg/apis/ipcapi/v1alpha1"
api "github.com/fire833/morfic/pkg/ipcapi/v1alpha1"
)

func init() {
Expand Down
2 changes: 1 addition & 1 deletion pkg/node/validators/errors.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

package validators

import api "github.com/fire833/morfic/pkg/apis/ipcapi/v1alpha1"
import api "github.com/fire833/morfic/pkg/ipcapi/v1alpha1"

// A custom error for validators to use that still conforms to the error interface.
type ValidatorStatus struct {
Expand Down
2 changes: 1 addition & 1 deletion pkg/node/validators/errors_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (
"math/rand"
"testing"

"github.com/fire833/morfic/pkg/apis/ipcapi/v1alpha1"
"github.com/fire833/morfic/pkg/ipcapi/v1alpha1"
)

func init() {
Expand Down
2 changes: 1 addition & 1 deletion pkg/node/validators/link_validator.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (
"net"
"strconv"

api "github.com/fire833/morfic/pkg/apis/ipcapi/v1alpha1"
api "github.com/fire833/morfic/pkg/ipcapi/v1alpha1"
)

// wrapper for validating the integrity of a link object.
Expand Down
Loading

0 comments on commit 62f5ce1

Please sign in to comment.