mirror of
https://github.com/edgelesssys/constellation.git
synced 2025-06-21 04:34:22 -04:00
bazel: allow "bazel test" to work without cgo dependencies
This commit is contained in:
parent
de863aece0
commit
1f12541a36
10 changed files with 154 additions and 130 deletions
|
@ -1,5 +1,5 @@
|
||||||
load("@io_bazel_rules_go//go:def.bzl", "go_library")
|
load("@io_bazel_rules_go//go:def.bzl", "go_library")
|
||||||
load("//bazel/go:go_test.bzl", "go_ld_test", "go_test")
|
load("//bazel/go:go_test.bzl", "go_test")
|
||||||
|
|
||||||
go_library(
|
go_library(
|
||||||
name = "diskencryption",
|
name = "diskencryption",
|
||||||
|
@ -20,26 +20,13 @@ go_test(
|
||||||
srcs = ["diskencryption_test.go"],
|
srcs = ["diskencryption_test.go"],
|
||||||
embed = [":diskencryption"],
|
embed = [":diskencryption"],
|
||||||
# keep
|
# keep
|
||||||
tags = ["manual"],
|
pure = "on",
|
||||||
deps = select({
|
# keep
|
||||||
"@io_bazel_rules_go//go/platform:android": [
|
race = "off",
|
||||||
|
deps = [
|
||||||
"@com_github_spf13_afero//:afero",
|
"@com_github_spf13_afero//:afero",
|
||||||
"@com_github_stretchr_testify//assert",
|
"@com_github_stretchr_testify//assert",
|
||||||
"@com_github_stretchr_testify//require",
|
"@com_github_stretchr_testify//require",
|
||||||
"@org_uber_go_goleak//:goleak",
|
"@org_uber_go_goleak//:goleak",
|
||||||
],
|
],
|
||||||
"@io_bazel_rules_go//go/platform:linux": [
|
|
||||||
"@com_github_spf13_afero//:afero",
|
|
||||||
"@com_github_stretchr_testify//assert",
|
|
||||||
"@com_github_stretchr_testify//require",
|
|
||||||
"@org_uber_go_goleak//:goleak",
|
|
||||||
],
|
|
||||||
"//conditions:default": [],
|
|
||||||
}),
|
|
||||||
)
|
|
||||||
|
|
||||||
go_ld_test(
|
|
||||||
name = "diskencryption_ld_test",
|
|
||||||
src = "diskencryption_test",
|
|
||||||
ld = "//rpm:ld",
|
|
||||||
)
|
)
|
||||||
|
|
|
@ -1,5 +1,3 @@
|
||||||
//go:build linux && cgo
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
Copyright (c) Edgeless Systems GmbH
|
Copyright (c) Edgeless Systems GmbH
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
load("@io_bazel_rules_go//go:def.bzl", "go_library")
|
load("@io_bazel_rules_go//go:def.bzl", "go_library")
|
||||||
load("//bazel/go:go_test.bzl", "go_ld_test", "go_test")
|
load("//bazel/go:go_test.bzl", "go_test")
|
||||||
|
|
||||||
go_library(
|
go_library(
|
||||||
name = "initserver",
|
name = "initserver",
|
||||||
|
@ -36,7 +36,9 @@ go_test(
|
||||||
srcs = ["initserver_test.go"],
|
srcs = ["initserver_test.go"],
|
||||||
embed = [":initserver"],
|
embed = [":initserver"],
|
||||||
# keep
|
# keep
|
||||||
tags = ["manual"],
|
pure = "on",
|
||||||
|
# keep
|
||||||
|
race = "off",
|
||||||
deps = [
|
deps = [
|
||||||
"//bootstrapper/initproto",
|
"//bootstrapper/initproto",
|
||||||
"//internal/atls",
|
"//internal/atls",
|
||||||
|
@ -55,9 +57,3 @@ go_test(
|
||||||
"@org_uber_go_goleak//:goleak",
|
"@org_uber_go_goleak//:goleak",
|
||||||
],
|
],
|
||||||
)
|
)
|
||||||
|
|
||||||
go_ld_test(
|
|
||||||
name = "initserver_ld_test",
|
|
||||||
src = "initserver_test",
|
|
||||||
ld = "//rpm:ld",
|
|
||||||
)
|
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
load("@io_bazel_rules_go//go:def.bzl", "go_library")
|
load("@io_bazel_rules_go//go:def.bzl", "go_library")
|
||||||
load("//bazel/go:go_test.bzl", "go_ld_test", "go_test")
|
load("//bazel/go:go_test.bzl", "go_test")
|
||||||
|
|
||||||
go_library(
|
go_library(
|
||||||
name = "joinclient",
|
name = "joinclient",
|
||||||
|
@ -32,7 +32,9 @@ go_test(
|
||||||
srcs = ["joinclient_test.go"],
|
srcs = ["joinclient_test.go"],
|
||||||
embed = [":joinclient"],
|
embed = [":joinclient"],
|
||||||
# keep
|
# keep
|
||||||
tags = ["manual"],
|
pure = "on",
|
||||||
|
# keep
|
||||||
|
race = "off",
|
||||||
deps = [
|
deps = [
|
||||||
"//internal/cloud/metadata",
|
"//internal/cloud/metadata",
|
||||||
"//internal/constants",
|
"//internal/constants",
|
||||||
|
@ -53,9 +55,3 @@ go_test(
|
||||||
"@org_uber_go_goleak//:goleak",
|
"@org_uber_go_goleak//:goleak",
|
||||||
],
|
],
|
||||||
)
|
)
|
||||||
|
|
||||||
go_ld_test(
|
|
||||||
name = "joinclient_ld_test",
|
|
||||||
src = "joinclient_test",
|
|
||||||
ld = "//rpm:ld",
|
|
||||||
)
|
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
load("@io_bazel_rules_go//go:def.bzl", "go_library")
|
load("@io_bazel_rules_go//go:def.bzl", "go_library")
|
||||||
load("//bazel/go:go_test.bzl", "go_ld_test", "go_test")
|
load("//bazel/go:go_test.bzl", "go_test")
|
||||||
|
|
||||||
go_library(
|
go_library(
|
||||||
name = "cryptmapper",
|
name = "cryptmapper",
|
||||||
|
@ -36,15 +36,11 @@ go_test(
|
||||||
srcs = ["cryptmapper_test.go"],
|
srcs = ["cryptmapper_test.go"],
|
||||||
embed = [":cryptmapper"],
|
embed = [":cryptmapper"],
|
||||||
# keep
|
# keep
|
||||||
tags = ["manual"],
|
pure = "on",
|
||||||
|
# keep
|
||||||
|
race = "off",
|
||||||
deps = [
|
deps = [
|
||||||
"@com_github_stretchr_testify//assert",
|
"@com_github_stretchr_testify//assert",
|
||||||
"@org_uber_go_goleak//:goleak",
|
"@org_uber_go_goleak//:goleak",
|
||||||
],
|
],
|
||||||
)
|
)
|
||||||
|
|
||||||
go_ld_test(
|
|
||||||
name = "cryptmapper_ld_test",
|
|
||||||
src = "cryptmapper_test",
|
|
||||||
ld = "//rpm:ld",
|
|
||||||
)
|
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
load("@io_bazel_rules_go//go:def.bzl", "go_library")
|
load("@io_bazel_rules_go//go:def.bzl", "go_library")
|
||||||
load("//bazel/go:go_test.bzl", "go_ld_test", "go_test")
|
load("//bazel/go:go_test.bzl", "go_test")
|
||||||
|
|
||||||
go_library(
|
go_library(
|
||||||
name = "server",
|
name = "server",
|
||||||
|
@ -20,10 +20,16 @@ go_library(
|
||||||
|
|
||||||
go_test(
|
go_test(
|
||||||
name = "server_test",
|
name = "server_test",
|
||||||
srcs = ["server_test.go"],
|
srcs = [
|
||||||
|
"server_cgo_test.go",
|
||||||
|
"server_cross_test.go",
|
||||||
|
"server_test.go",
|
||||||
|
],
|
||||||
embed = [":server"],
|
embed = [":server"],
|
||||||
# keep
|
# keep
|
||||||
tags = ["manual"],
|
pure = "on",
|
||||||
|
# keep
|
||||||
|
race = "off",
|
||||||
deps = [
|
deps = [
|
||||||
"//hack/qemu-metadata-api/virtwrapper",
|
"//hack/qemu-metadata-api/virtwrapper",
|
||||||
"//internal/cloud/metadata",
|
"//internal/cloud/metadata",
|
||||||
|
@ -33,9 +39,3 @@ go_test(
|
||||||
"@org_libvirt_go_libvirt//:libvirt",
|
"@org_libvirt_go_libvirt//:libvirt",
|
||||||
],
|
],
|
||||||
)
|
)
|
||||||
|
|
||||||
go_ld_test(
|
|
||||||
name = "server_ld_test",
|
|
||||||
src = "server_test",
|
|
||||||
ld = "//rpm:ld",
|
|
||||||
)
|
|
||||||
|
|
41
hack/qemu-metadata-api/server/server_cgo_test.go
Normal file
41
hack/qemu-metadata-api/server/server_cgo_test.go
Normal file
|
@ -0,0 +1,41 @@
|
||||||
|
//go:build cgo
|
||||||
|
|
||||||
|
/*
|
||||||
|
Copyright (c) Edgeless Systems GmbH
|
||||||
|
|
||||||
|
SPDX-License-Identifier: AGPL-3.0-only
|
||||||
|
*/
|
||||||
|
|
||||||
|
package server
|
||||||
|
|
||||||
|
import (
|
||||||
|
"github.com/edgelesssys/constellation/v2/hack/qemu-metadata-api/virtwrapper"
|
||||||
|
"libvirt.org/go/libvirt"
|
||||||
|
)
|
||||||
|
|
||||||
|
type stubNetwork struct {
|
||||||
|
leases []libvirt.NetworkDHCPLease
|
||||||
|
getLeaseErr error
|
||||||
|
}
|
||||||
|
|
||||||
|
func newStubNetwork(leases []virtwrapper.NetworkDHCPLease, getLeaseErr error) stubNetwork {
|
||||||
|
libvirtLeases := make([]libvirt.NetworkDHCPLease, len(leases))
|
||||||
|
for i, l := range leases {
|
||||||
|
libvirtLeases[i] = libvirt.NetworkDHCPLease{
|
||||||
|
IPaddr: l.IPaddr,
|
||||||
|
Hostname: l.Hostname,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return stubNetwork{
|
||||||
|
leases: libvirtLeases,
|
||||||
|
getLeaseErr: getLeaseErr,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (n stubNetwork) GetDHCPLeases() ([]libvirt.NetworkDHCPLease, error) {
|
||||||
|
return n.leases, n.getLeaseErr
|
||||||
|
}
|
||||||
|
|
||||||
|
func (n stubNetwork) Free() error {
|
||||||
|
return nil
|
||||||
|
}
|
31
hack/qemu-metadata-api/server/server_cross_test.go
Normal file
31
hack/qemu-metadata-api/server/server_cross_test.go
Normal file
|
@ -0,0 +1,31 @@
|
||||||
|
//go:build !cgo
|
||||||
|
|
||||||
|
/*
|
||||||
|
Copyright (c) Edgeless Systems GmbH
|
||||||
|
|
||||||
|
SPDX-License-Identifier: AGPL-3.0-only
|
||||||
|
*/
|
||||||
|
|
||||||
|
package server
|
||||||
|
|
||||||
|
import "github.com/edgelesssys/constellation/v2/hack/qemu-metadata-api/virtwrapper"
|
||||||
|
|
||||||
|
type stubNetwork struct {
|
||||||
|
leases []virtwrapper.NetworkDHCPLease
|
||||||
|
getLeaseErr error
|
||||||
|
}
|
||||||
|
|
||||||
|
func newStubNetwork(leases []virtwrapper.NetworkDHCPLease, getLeaseErr error) stubNetwork {
|
||||||
|
return stubNetwork{
|
||||||
|
leases: leases,
|
||||||
|
getLeaseErr: getLeaseErr,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (n stubNetwork) GetDHCPLeases() ([]virtwrapper.NetworkDHCPLease, error) {
|
||||||
|
return n.leases, n.getLeaseErr
|
||||||
|
}
|
||||||
|
|
||||||
|
func (n stubNetwork) Free() error {
|
||||||
|
return nil
|
||||||
|
}
|
|
@ -1,5 +1,3 @@
|
||||||
//go:build cgo
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
Copyright (c) Edgeless Systems GmbH
|
Copyright (c) Edgeless Systems GmbH
|
||||||
|
|
||||||
|
@ -23,7 +21,6 @@ import (
|
||||||
"github.com/edgelesssys/constellation/v2/internal/logger"
|
"github.com/edgelesssys/constellation/v2/internal/logger"
|
||||||
"github.com/stretchr/testify/assert"
|
"github.com/stretchr/testify/assert"
|
||||||
"github.com/stretchr/testify/require"
|
"github.com/stretchr/testify/require"
|
||||||
"libvirt.org/go/libvirt"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
func TestListAll(t *testing.T) {
|
func TestListAll(t *testing.T) {
|
||||||
|
@ -35,8 +32,7 @@ func TestListAll(t *testing.T) {
|
||||||
}{
|
}{
|
||||||
"success": {
|
"success": {
|
||||||
connect: &stubConnect{
|
connect: &stubConnect{
|
||||||
network: stubNetwork{
|
network: newStubNetwork([]virtwrapper.NetworkDHCPLease{
|
||||||
leases: []libvirt.NetworkDHCPLease{
|
|
||||||
{
|
{
|
||||||
IPaddr: "192.0.100.1",
|
IPaddr: "192.0.100.1",
|
||||||
Hostname: "control-plane-0",
|
Hostname: "control-plane-0",
|
||||||
|
@ -49,8 +45,7 @@ func TestListAll(t *testing.T) {
|
||||||
IPaddr: "192.0.200.1",
|
IPaddr: "192.0.200.1",
|
||||||
Hostname: "worker-0",
|
Hostname: "worker-0",
|
||||||
},
|
},
|
||||||
},
|
}, nil),
|
||||||
},
|
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
"LookupNetworkByName error": {
|
"LookupNetworkByName error": {
|
||||||
|
@ -98,14 +93,12 @@ func TestListSelf(t *testing.T) {
|
||||||
"success": {
|
"success": {
|
||||||
remoteAddr: "192.0.100.1:1234",
|
remoteAddr: "192.0.100.1:1234",
|
||||||
connect: &stubConnect{
|
connect: &stubConnect{
|
||||||
network: stubNetwork{
|
network: newStubNetwork([]virtwrapper.NetworkDHCPLease{
|
||||||
leases: []libvirt.NetworkDHCPLease{
|
|
||||||
{
|
{
|
||||||
IPaddr: "192.0.100.1",
|
IPaddr: "192.0.100.1",
|
||||||
Hostname: "control-plane-0",
|
Hostname: "control-plane-0",
|
||||||
},
|
},
|
||||||
},
|
}, nil),
|
||||||
},
|
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
"listAll error": {
|
"listAll error": {
|
||||||
|
@ -118,28 +111,24 @@ func TestListSelf(t *testing.T) {
|
||||||
"remoteAddr error": {
|
"remoteAddr error": {
|
||||||
remoteAddr: "",
|
remoteAddr: "",
|
||||||
connect: &stubConnect{
|
connect: &stubConnect{
|
||||||
network: stubNetwork{
|
network: newStubNetwork([]virtwrapper.NetworkDHCPLease{
|
||||||
leases: []libvirt.NetworkDHCPLease{
|
|
||||||
{
|
{
|
||||||
IPaddr: "192.0.100.1",
|
IPaddr: "192.0.100.1",
|
||||||
Hostname: "control-plane-0",
|
Hostname: "control-plane-0",
|
||||||
},
|
},
|
||||||
},
|
}, nil),
|
||||||
},
|
|
||||||
},
|
},
|
||||||
wantErr: true,
|
wantErr: true,
|
||||||
},
|
},
|
||||||
"peer not found": {
|
"peer not found": {
|
||||||
remoteAddr: "192.0.200.1:1234",
|
remoteAddr: "192.0.200.1:1234",
|
||||||
connect: &stubConnect{
|
connect: &stubConnect{
|
||||||
network: stubNetwork{
|
network: newStubNetwork([]virtwrapper.NetworkDHCPLease{
|
||||||
leases: []libvirt.NetworkDHCPLease{
|
|
||||||
{
|
{
|
||||||
IPaddr: "192.0.100.1",
|
IPaddr: "192.0.100.1",
|
||||||
Hostname: "control-plane-0",
|
Hostname: "control-plane-0",
|
||||||
},
|
},
|
||||||
},
|
}, nil),
|
||||||
},
|
|
||||||
},
|
},
|
||||||
wantErr: true,
|
wantErr: true,
|
||||||
},
|
},
|
||||||
|
@ -184,8 +173,7 @@ func TestListPeers(t *testing.T) {
|
||||||
"success": {
|
"success": {
|
||||||
remoteAddr: "192.0.100.1:1234",
|
remoteAddr: "192.0.100.1:1234",
|
||||||
connect: &stubConnect{
|
connect: &stubConnect{
|
||||||
network: stubNetwork{
|
network: newStubNetwork([]virtwrapper.NetworkDHCPLease{
|
||||||
leases: []libvirt.NetworkDHCPLease{
|
|
||||||
{
|
{
|
||||||
IPaddr: "192.0.100.1",
|
IPaddr: "192.0.100.1",
|
||||||
Hostname: "control-plane-0",
|
Hostname: "control-plane-0",
|
||||||
|
@ -194,8 +182,7 @@ func TestListPeers(t *testing.T) {
|
||||||
IPaddr: "192.0.200.1",
|
IPaddr: "192.0.200.1",
|
||||||
Hostname: "worker-0",
|
Hostname: "worker-0",
|
||||||
},
|
},
|
||||||
},
|
}, nil),
|
||||||
},
|
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
"listAll error": {
|
"listAll error": {
|
||||||
|
@ -287,14 +274,12 @@ func TestPostLog(t *testing.T) {
|
||||||
|
|
||||||
func TestInitSecretHash(t *testing.T) {
|
func TestInitSecretHash(t *testing.T) {
|
||||||
defaultConnect := &stubConnect{
|
defaultConnect := &stubConnect{
|
||||||
network: stubNetwork{
|
network: newStubNetwork([]virtwrapper.NetworkDHCPLease{
|
||||||
leases: []libvirt.NetworkDHCPLease{
|
|
||||||
{
|
{
|
||||||
IPaddr: "192.0.100.1",
|
IPaddr: "192.0.100.1",
|
||||||
Hostname: "control-plane-0",
|
Hostname: "control-plane-0",
|
||||||
},
|
},
|
||||||
},
|
}, nil),
|
||||||
},
|
|
||||||
}
|
}
|
||||||
testCases := map[string]struct {
|
testCases := map[string]struct {
|
||||||
connect *stubConnect
|
connect *stubConnect
|
||||||
|
@ -345,16 +330,3 @@ type stubConnect struct {
|
||||||
func (c stubConnect) LookupNetworkByName(_ string) (*virtwrapper.Network, error) {
|
func (c stubConnect) LookupNetworkByName(_ string) (*virtwrapper.Network, error) {
|
||||||
return &virtwrapper.Network{Net: c.network}, c.getNetworkErr
|
return &virtwrapper.Network{Net: c.network}, c.getNetworkErr
|
||||||
}
|
}
|
||||||
|
|
||||||
type stubNetwork struct {
|
|
||||||
leases []libvirt.NetworkDHCPLease
|
|
||||||
getLeaseErr error
|
|
||||||
}
|
|
||||||
|
|
||||||
func (n stubNetwork) GetDHCPLeases() ([]libvirt.NetworkDHCPLease, error) {
|
|
||||||
return n.leases, n.getLeaseErr
|
|
||||||
}
|
|
||||||
|
|
||||||
func (n stubNetwork) Free() error {
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
|
@ -20,14 +20,21 @@ func (c *Connect) LookupNetworkByName(_ string) (*Network, error) {
|
||||||
}
|
}
|
||||||
|
|
||||||
// Network wraps a libvirt network.
|
// Network wraps a libvirt network.
|
||||||
type Network struct{}
|
type Network struct {
|
||||||
|
Net Net
|
||||||
|
}
|
||||||
|
|
||||||
// GetDHCPLeases returns the underlying DHCP leases.
|
// GetDHCPLeases returns the underlying DHCP leases.
|
||||||
// This function errors if CGO is disabled.
|
// This function errors if CGO is disabled.
|
||||||
func (n *Network) GetDHCPLeases() ([]NetworkDHCPLease, error) {
|
func (n *Network) GetDHCPLeases() ([]NetworkDHCPLease, error) {
|
||||||
return nil, errors.New("using virtwrapper requires building with CGO")
|
return n.Net.GetDHCPLeases()
|
||||||
}
|
}
|
||||||
|
|
||||||
// Free the network resource.
|
// Free the network resource.
|
||||||
// This function does nothing if CGO is disabled.
|
// This function does nothing if CGO is disabled.
|
||||||
func (n *Network) Free() {}
|
func (n *Network) Free() {}
|
||||||
|
|
||||||
|
// Net is a libvirt Network.
|
||||||
|
type Net interface {
|
||||||
|
GetDHCPLeases() ([]NetworkDHCPLease, error)
|
||||||
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue