Git-Mirrors/constellation
1
0
Fork 0
mirror of https://github.com/edgelesssys/constellation.git synced 2025-04-20 07:25:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix other issues caused by variable renaming

Browse Source
This commit is contained in:
miampf 2025-01-21 13:30:33 +01:00
parent 0e1e49623f
commit 3dfa405fb9
No known key found for this signature in database
GPG Key ID: EF039364B5B6886C
2 changed files with 2 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bootstrapper/internal/joinclient/joinclient.go
View File

@ -271,7 +271,7 @@ func (c *JoinClient) startNodeAndJoin(ticket *joinproto.IssueJoinTicketResponse,
return fmt.Errorf("writing kubelet key: %w", err)
}
if err := c.fileHandler.Write(constants.SSHCAKeyPath, ticket.EmergencyCaKey, file.OptMkdirAll); err != nil {
if err := c.fileHandler.Write(constants.SSHCAKeyPath, ticket.AuthorizedCaPublicKey, file.OptMkdirAll); err != nil {
return fmt.Errorf("writing ssh ca key: %w", err)
}

30
bootstrapper/internal/joinclient/joinclient_test.go
View File

@ -51,7 +51,7 @@ func TestClient(t *testing.T) {
{Role: role.ControlPlane, Name: "node-5", VPCIP: "192.0.2.3"},
}
caDerivationKey := make([]byte, 256)
respCaKey := &joinproto.IssueJoinTicketResponse{EmergencyCaKey: caDerivationKey}
respCaKey := &joinproto.IssueJoinTicketResponse{AuthorizedCaPublicKey: caDerivationKey}
testCases := map[string]struct {
role role.Role
@ -144,22 +144,6 @@ func TestClient(t *testing.T) {
wantJoin: true,
wantLock: true,
},
"on worker: no CA derivation key is given": {
role: role.Worker,
apiAnswers: []any{
selfAnswer{instance: workerSelf},
listAnswer{instances: peers},
issueJoinTicketAnswer{err: assert.AnError},
listAnswer{instances: peers},
issueJoinTicketAnswer{err: assert.AnError},
listAnswer{instances: peers},
issueJoinTicketAnswer{},
},
clusterJoiner: &stubClusterJoiner{},
nodeLock: newFakeLock(),
disk: &stubDisk{},
wantLock: true,
},
"on control plane: issueJoinTicket errors": {
role: role.ControlPlane,
apiAnswers: []any{
@ -204,18 +188,6 @@ func TestClient(t *testing.T) {
wantLock: true,
wantNumJoins: 2,
},
"on control plane: no CA derivation key is given": {
role: role.ControlPlane,
apiAnswers: []any{
selfAnswer{instance: controlSelf},
listAnswer{instances: peers},
issueJoinTicketAnswer{},
},
clusterJoiner: &stubClusterJoiner{numBadCalls: 1, joinClusterErr: assert.AnError},
nodeLock: newFakeLock(),
disk: &stubDisk{},
wantLock: true,
},
"on control plane: node already locked": {
role: role.ControlPlane,
apiAnswers: []any{