mirror of
https://github.com/edgelesssys/constellation.git
synced 2024-10-01 01:36:09 -04:00
Add warning about non retriable error during init (#644)
Signed-off-by: Daniel Weiße <dw@edgeless.systems>
This commit is contained in:
parent
e76a87fcfc
commit
1968dfe70c
@ -9,6 +9,7 @@ package cmd
|
||||
import (
|
||||
"context"
|
||||
"encoding/hex"
|
||||
"errors"
|
||||
"fmt"
|
||||
"io"
|
||||
"net"
|
||||
@ -141,6 +142,11 @@ func initialize(cmd *cobra.Command, newDialer func(validator *cloudcmd.Validator
|
||||
resp, err := initCall(cmd.Context(), newDialer(validator), idFile.IP, req)
|
||||
spinner.Stop()
|
||||
if err != nil {
|
||||
var nonRetriable *nonRetriableError
|
||||
if errors.As(err, &nonRetriable) {
|
||||
cmd.PrintErrln("Cluster initialization failed. This error is not recoverable.")
|
||||
cmd.PrintErrln("Terminate your cluster and try again.")
|
||||
}
|
||||
return err
|
||||
}
|
||||
|
||||
@ -181,7 +187,7 @@ func (d *initDoer) Do(ctx context.Context) error {
|
||||
protoClient := initproto.NewAPIClient(conn)
|
||||
resp, err := protoClient.Init(ctx, d.req)
|
||||
if err != nil {
|
||||
return fmt.Errorf("init call: %w", err)
|
||||
return &nonRetriableError{fmt.Errorf("init call: %w", err)}
|
||||
}
|
||||
d.resp = resp
|
||||
return nil
|
||||
@ -339,3 +345,17 @@ func getMarshaledServiceAccountURI(provider cloudprovider.Provider, config *conf
|
||||
type grpcDialer interface {
|
||||
Dial(ctx context.Context, target string) (*grpc.ClientConn, error)
|
||||
}
|
||||
|
||||
type nonRetriableError struct {
|
||||
err error
|
||||
}
|
||||
|
||||
// Error returns the error message.
|
||||
func (e *nonRetriableError) Error() string {
|
||||
return e.err.Error()
|
||||
}
|
||||
|
||||
// Unwrap returns the wrapped error.
|
||||
func (e *nonRetriableError) Unwrap() error {
|
||||
return e.err
|
||||
}
|
||||
|
@ -65,6 +65,7 @@ func TestInitialize(t *testing.T) {
|
||||
configMutator func(*config.Config)
|
||||
serviceAccKey *gcpshared.ServiceAccountKey
|
||||
initServerAPI *stubInitServer
|
||||
retriable bool
|
||||
masterSecretShouldExist bool
|
||||
wantErr bool
|
||||
}{
|
||||
@ -85,20 +86,31 @@ func TestInitialize(t *testing.T) {
|
||||
idFile: &clusterid.File{IP: "192.0.2.1"},
|
||||
initServerAPI: &stubInitServer{initResp: testInitResp},
|
||||
},
|
||||
"non retriable error": {
|
||||
provider: cloudprovider.QEMU,
|
||||
idFile: &clusterid.File{IP: "192.0.2.1"},
|
||||
initServerAPI: &stubInitServer{initErr: &nonRetriableError{someErr}},
|
||||
retriable: false,
|
||||
masterSecretShouldExist: true,
|
||||
wantErr: true,
|
||||
},
|
||||
"empty id file": {
|
||||
provider: cloudprovider.GCP,
|
||||
idFile: &clusterid.File{},
|
||||
initServerAPI: &stubInitServer{},
|
||||
retriable: true,
|
||||
wantErr: true,
|
||||
},
|
||||
"no id file": {
|
||||
provider: cloudprovider.GCP,
|
||||
wantErr: true,
|
||||
provider: cloudprovider.GCP,
|
||||
retriable: true,
|
||||
wantErr: true,
|
||||
},
|
||||
"init call fails": {
|
||||
provider: cloudprovider.GCP,
|
||||
idFile: &clusterid.File{IP: "192.0.2.1"},
|
||||
initServerAPI: &stubInitServer{initErr: someErr},
|
||||
retriable: true,
|
||||
wantErr: true,
|
||||
},
|
||||
}
|
||||
@ -156,6 +168,11 @@ func TestInitialize(t *testing.T) {
|
||||
|
||||
if tc.wantErr {
|
||||
assert.Error(err)
|
||||
if !tc.retriable {
|
||||
assert.Contains(errOut.String(), "This error is not recoverable")
|
||||
} else {
|
||||
assert.Empty(errOut.String())
|
||||
}
|
||||
if !tc.masterSecretShouldExist {
|
||||
_, err = fileHandler.Stat(constants.MasterSecretFilename)
|
||||
assert.Error(err)
|
||||
|
Loading…
Reference in New Issue
Block a user