@@ -11,7 +11,11 @@ import (
1111 "time"
1212
1313 gomock "github.com/golang/mock/gomock"
14+ "github.com/google/uuid"
1415 embeddedclusterv1beta1 "github.com/replicatedhq/embedded-cluster/kinds/apis/v1beta1"
16+ "github.com/replicatedhq/embedded-cluster/kinds/types/join"
17+ versionTypes "github.com/replicatedhq/kots/pkg/api/version/types"
18+ appTypes "github.com/replicatedhq/kots/pkg/app/types"
1519 "github.com/replicatedhq/kots/pkg/handlers/kubeclient"
1620 "github.com/replicatedhq/kots/pkg/store"
1721 mockstore "github.com/replicatedhq/kots/pkg/store/mock"
@@ -33,13 +37,15 @@ type testNodeJoinCommandHarness struct {
3337 token string
3438 getRoles func (t * testing.T , token string ) ([]string , error )
3539 embeddedClusterID string
36- validateBody func (t * testing.T , h * testNodeJoinCommandHarness , r * GetEmbeddedClusterNodeJoinCommandResponse )
40+ appVersionLabel string
41+ validateBody func (t * testing.T , h * testNodeJoinCommandHarness , r * join.JoinCommandResponse )
3742}
3843
3944func TestGetEmbeddedClusterNodeJoinCommand (t * testing.T ) {
4045 scheme := runtime .NewScheme ()
4146 corev1 .AddToScheme (scheme )
4247 embeddedclusterv1beta1 .AddToScheme (scheme )
48+ ecUUID := uuid .New ().String ()
4349
4450 tests := []testNodeJoinCommandHarness {
4551 {
@@ -50,15 +56,15 @@ func TestGetEmbeddedClusterNodeJoinCommand(t *testing.T) {
5056 {
5157 name : "store returns error" ,
5258 httpStatus : http .StatusInternalServerError ,
53- embeddedClusterID : "cluster-id" ,
59+ embeddedClusterID : ecUUID ,
5460 getRoles : func (* testing.T , string ) ([]string , error ) {
5561 return nil , fmt .Errorf ("some error" )
5662 },
5763 },
5864 {
5965 name : "store gets passed the provided token" ,
6066 httpStatus : http .StatusInternalServerError ,
61- embeddedClusterID : "cluster-id" ,
67+ embeddedClusterID : ecUUID ,
6268 token : "some-token" ,
6369 getRoles : func (t * testing.T , token string ) ([]string , error ) {
6470 require .Equal (t , "some-token" , token )
@@ -68,8 +74,9 @@ func TestGetEmbeddedClusterNodeJoinCommand(t *testing.T) {
6874 {
6975 name : "bootstrap token secret creation succeeds and it matches returned K0SToken" ,
7076 httpStatus : http .StatusOK ,
71- embeddedClusterID : "cluster-id" ,
72- validateBody : func (t * testing.T , h * testNodeJoinCommandHarness , r * GetEmbeddedClusterNodeJoinCommandResponse ) {
77+ embeddedClusterID : ecUUID ,
78+ appVersionLabel : "test-app-version" ,
79+ validateBody : func (t * testing.T , h * testNodeJoinCommandHarness , r * join.JoinCommandResponse ) {
7380 req := require .New (t )
7481 // Check that a secret was created with the cluster bootstrap token
7582 var secrets corev1.SecretList
@@ -91,7 +98,11 @@ func TestGetEmbeddedClusterNodeJoinCommand(t *testing.T) {
9198 decompressed , err := util .GunzipData (decodedK0SToken )
9299 req .NoError (err )
93100
94- require .Containsf (t , string (decompressed ), fmt .Sprintf ("token: %s" , expectedToken ), "expected K0sToken:\n %s\n to contain the generated bootstrap token: %s" , string (decompressed ), expectedToken )
101+ req .Containsf (string (decompressed ), fmt .Sprintf ("token: %s" , expectedToken ), "expected K0sToken:\n %s\n to contain the generated bootstrap token: %s" , string (decompressed ), expectedToken )
102+
103+ // returned embedded cluster and app version should match the expected values
104+ req .Equal (r .AppVersionLabel , "test-app-version" )
105+ req .Equal (r .ClusterID .String (), ecUUID )
95106 },
96107 kbClient : fake .NewClientBuilder ().WithScheme (scheme ).WithObjects (
97108 & embeddedclusterv1beta1.Installation {
@@ -100,6 +111,7 @@ func TestGetEmbeddedClusterNodeJoinCommand(t *testing.T) {
100111 },
101112 Spec : embeddedclusterv1beta1.InstallationSpec {
102113 BinaryName : "my-app" ,
114+ ClusterID : ecUUID ,
103115 Config : & embeddedclusterv1beta1.ConfigSpec {
104116 Version : "v1.100.0" ,
105117 Roles : embeddedclusterv1beta1.Roles {
@@ -144,8 +156,9 @@ func TestGetEmbeddedClusterNodeJoinCommand(t *testing.T) {
144156 {
145157 name : "tcp connections required are returned based on the controller role provided" ,
146158 httpStatus : http .StatusOK ,
147- embeddedClusterID : "cluster-id" ,
148- validateBody : func (t * testing.T , h * testNodeJoinCommandHarness , r * GetEmbeddedClusterNodeJoinCommandResponse ) {
159+ embeddedClusterID : ecUUID ,
160+ appVersionLabel : "test-app-version" ,
161+ validateBody : func (t * testing.T , h * testNodeJoinCommandHarness , r * join.JoinCommandResponse ) {
149162 req := require .New (t )
150163
151164 req .Equal ([]string {
@@ -166,6 +179,7 @@ func TestGetEmbeddedClusterNodeJoinCommand(t *testing.T) {
166179 },
167180 Spec : embeddedclusterv1beta1.InstallationSpec {
168181 BinaryName : "my-app" ,
182+ ClusterID : ecUUID ,
169183 Config : & embeddedclusterv1beta1.ConfigSpec {
170184 Version : "v1.100.0" ,
171185 Roles : embeddedclusterv1beta1.Roles {
@@ -227,6 +241,65 @@ func TestGetEmbeddedClusterNodeJoinCommand(t *testing.T) {
227241 },
228242 ).Build (),
229243 },
244+ {
245+ name : "If there is no installed app, the app version label should be empty" ,
246+ httpStatus : http .StatusOK ,
247+ embeddedClusterID : ecUUID ,
248+ validateBody : func (t * testing.T , h * testNodeJoinCommandHarness , r * join.JoinCommandResponse ) {
249+ req := require .New (t )
250+ // returned embedded cluster and app version should match the expected values
251+ req .Equal (r .AppVersionLabel , "" )
252+ req .Equal (r .ClusterID .String (), ecUUID )
253+ },
254+ kbClient : fake .NewClientBuilder ().WithScheme (scheme ).WithObjects (
255+ & embeddedclusterv1beta1.Installation {
256+ ObjectMeta : metav1.ObjectMeta {
257+ Name : time .Now ().Format ("20060102150405" ),
258+ },
259+ Spec : embeddedclusterv1beta1.InstallationSpec {
260+ BinaryName : "my-app" ,
261+ ClusterID : ecUUID ,
262+ Config : & embeddedclusterv1beta1.ConfigSpec {
263+ Version : "v1.100.0" ,
264+ Roles : embeddedclusterv1beta1.Roles {
265+ Controller : embeddedclusterv1beta1.NodeRole {
266+ Name : "controller-role" ,
267+ },
268+ },
269+ },
270+ },
271+ },
272+ & corev1.ConfigMap {
273+ ObjectMeta : metav1.ObjectMeta {
274+ Name : "kube-root-ca.crt" ,
275+ Namespace : "kube-system" ,
276+ },
277+ Data : map [string ]string {"ca.crt" : "some-ca-cert" },
278+ },
279+ & corev1.Node {
280+ ObjectMeta : metav1.ObjectMeta {
281+ Name : "controller 1" ,
282+ Labels : map [string ]string {
283+ "node-role.kubernetes.io/control-plane" : "true" ,
284+ },
285+ },
286+ Status : corev1.NodeStatus {
287+ Conditions : []corev1.NodeCondition {
288+ {
289+ Type : corev1 .NodeReady ,
290+ Status : corev1 .ConditionTrue ,
291+ },
292+ },
293+ Addresses : []corev1.NodeAddress {
294+ {
295+ Type : corev1 .NodeInternalIP ,
296+ Address : "192.168.0.100" ,
297+ },
298+ },
299+ },
300+ },
301+ ).Build (),
302+ },
230303 }
231304 for _ , test := range tests {
232305 t .Run (test .name , func (t * testing.T ) {
@@ -251,6 +324,24 @@ func TestGetEmbeddedClusterNodeJoinCommand(t *testing.T) {
251324 return []string {"controller-role" , "worker-role" }, nil
252325 })
253326
327+ if test .appVersionLabel != "" {
328+ mockStore .EXPECT ().ListInstalledApps ().AnyTimes ().DoAndReturn (func () ([]* appTypes.App , error ) {
329+ return []* appTypes.App {
330+ {
331+ ID : "test-app-id" ,
332+ CurrentSequence : 1 ,
333+ },
334+ }, nil
335+ })
336+ mockStore .EXPECT ().GetAppVersion ("test-app-id" , int64 (1 )).AnyTimes ().DoAndReturn (func (appID string , sequence int64 ) (* versionTypes.AppVersion , error ) {
337+ return & versionTypes.AppVersion {
338+ VersionLabel : test .appVersionLabel ,
339+ }, nil
340+ })
341+ } else if test .httpStatus == http .StatusOK {
342+ mockStore .EXPECT ().ListInstalledApps ().AnyTimes ().Return ([]* appTypes.App {}, nil )
343+ }
344+
254345 // There's an early check in the handler for the presence of `EMBEDDED_CLUSTER_ID` env var
255346 // so we need to set it here whenever the test requires it
256347 if test .embeddedClusterID != "" {
@@ -274,7 +365,7 @@ func TestGetEmbeddedClusterNodeJoinCommand(t *testing.T) {
274365 }
275366
276367 // Run the body validation function if provided
277- var body GetEmbeddedClusterNodeJoinCommandResponse
368+ var body join. JoinCommandResponse
278369 req .NoError (json .NewDecoder (response .Body ).Decode (& body ))
279370 if test .validateBody != nil {
280371 test .validateBody (t , & test , & body )
0 commit comments