Git-Mirrors/constellation
1
0
Fork 0
mirror of https://github.com/edgelesssys/constellation.git synced 2024-10-01 01:36:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

Move cli/status to internal/statuswaiter

Browse Source
This commit is contained in:
katexochen 2022-06-08 09:19:15 +02:00
parent 0627b14445
commit b3a51cca64
4 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cli/internal/cmd/init.go
View File

@ -15,7 +15,6 @@ import (
"github.com/edgelesssys/constellation/cli/internal/cloudcmd" "github.com/edgelesssys/constellation/cli/internal/cloudcmd"
"github.com/edgelesssys/constellation/cli/internal/gcp" "github.com/edgelesssys/constellation/cli/internal/gcp"
"github.com/edgelesssys/constellation/cli/internal/proto" "github.com/edgelesssys/constellation/cli/internal/proto"
"github.com/edgelesssys/constellation/cli/internal/status"
"github.com/edgelesssys/constellation/cli/internal/vpn" "github.com/edgelesssys/constellation/cli/internal/vpn"
"github.com/edgelesssys/constellation/coordinator/atls" "github.com/edgelesssys/constellation/coordinator/atls"
"github.com/edgelesssys/constellation/coordinator/pubapi/pubproto" "github.com/edgelesssys/constellation/coordinator/pubapi/pubproto"
@ -28,6 +27,7 @@ import (
"github.com/edgelesssys/constellation/internal/deploy/ssh" "github.com/edgelesssys/constellation/internal/deploy/ssh"
"github.com/edgelesssys/constellation/internal/file" "github.com/edgelesssys/constellation/internal/file"
"github.com/edgelesssys/constellation/internal/state" "github.com/edgelesssys/constellation/internal/state"
"github.com/edgelesssys/constellation/internal/statuswaiter"
"github.com/kr/text" "github.com/kr/text"
wgquick "github.com/nmiculinic/wg-quick-go" wgquick "github.com/nmiculinic/wg-quick-go"
"github.com/spf13/afero" "github.com/spf13/afero"
@ -58,7 +58,7 @@ func runInitialize(cmd *cobra.Command, args []string) error {
fileHandler := file.NewHandler(afero.NewOsFs()) fileHandler := file.NewHandler(afero.NewOsFs())
vpnHandler := vpn.NewConfigHandler() vpnHandler := vpn.NewConfigHandler()
serviceAccountCreator := cloudcmd.NewServiceAccountCreator() serviceAccountCreator := cloudcmd.NewServiceAccountCreator()
waiter := status.NewWaiter() waiter := statuswaiter.New()
protoClient := &proto.Client{} protoClient := &proto.Client{}
defer protoClient.Close() defer protoClient.Close()

4
hack/pcr-reader/main.go
View File

@ -14,7 +14,6 @@ import (
"os" "os"
"time" "time"
"github.com/edgelesssys/constellation/cli/status"
"github.com/edgelesssys/constellation/coordinator/atls" "github.com/edgelesssys/constellation/coordinator/atls"
"github.com/edgelesssys/constellation/coordinator/attestation/azure" "github.com/edgelesssys/constellation/coordinator/attestation/azure"
"github.com/edgelesssys/constellation/coordinator/attestation/gcp" "github.com/edgelesssys/constellation/coordinator/attestation/gcp"
@ -22,6 +21,7 @@ import (
"github.com/edgelesssys/constellation/coordinator/oid" "github.com/edgelesssys/constellation/coordinator/oid"
"github.com/edgelesssys/constellation/coordinator/pubapi/pubproto" "github.com/edgelesssys/constellation/coordinator/pubapi/pubproto"
"github.com/edgelesssys/constellation/coordinator/state" "github.com/edgelesssys/constellation/coordinator/state"
"github.com/edgelesssys/constellation/internal/statuswaiter"
"github.com/spf13/afero" "github.com/spf13/afero"
"google.golang.org/grpc" "google.golang.org/grpc"
"google.golang.org/grpc/credentials" "google.golang.org/grpc/credentials"
@ -44,7 +44,7 @@ func main() {
defer cancel() defer cancel()
// wait for coordinator to come online // wait for coordinator to come online
waiter := status.NewWaiter() waiter := statuswaiter.New()
if err := waiter.InitializeValidators([]atls.Validator{ if err := waiter.InitializeValidators([]atls.Validator{
azure.NewValidator(map[uint32][]byte{}), azure.NewValidator(map[uint32][]byte{}),
gcp.NewValidator(map[uint32][]byte{}), gcp.NewValidator(map[uint32][]byte{}),

8
cli/internal/status/status.go → internal/statuswaiter/statuswaiter.go
View File

@ -1,4 +1,4 @@
package status package statuswaiter
import ( import (
"context" "context"
@ -15,8 +15,6 @@ import (
grpcstatus "google.golang.org/grpc/status" grpcstatus "google.golang.org/grpc/status"
) )
// TODO(katexochen): Use protoClient for waiter?
// Waiter waits for PeerStatusServer to reach a specific state. The waiter needs // Waiter waits for PeerStatusServer to reach a specific state. The waiter needs
// to be initialized before usage. // to be initialized before usage.
type Waiter struct { type Waiter struct {
@ -26,9 +24,9 @@ type Waiter struct {
newClient func(cc grpc.ClientConnInterface) pubproto.APIClient newClient func(cc grpc.ClientConnInterface) pubproto.APIClient
} }
// NewWaiter returns a default Waiter with probing inteval of 10 seconds, // New returns a default Waiter with probing inteval of 10 seconds,
// attested gRPC connection and PeerStatusClient. // attested gRPC connection and PeerStatusClient.
func NewWaiter() *Waiter { func New() *Waiter {
return &Waiter{ return &Waiter{
interval: 10 * time.Second, interval: 10 * time.Second,
newClient: pubproto.NewAPIClient, newClient: pubproto.NewAPIClient,

2
cli/internal/status/status_test.go → internal/statuswaiter/statuswaiter_test.go
View File

@ -1,4 +1,4 @@
package status package statuswaiter
import ( import (
"context" "context"