Ensure Elemental registration data includes the registration URL

Signed-off-by: David Cassany <dcassany@suse.com>
(cherry picked from commit 44335c7)

Author: davidcassany

pkg/server/api_registration.go

@@ -159,6 +159,10 @@ func (i *InventoryServer) writeMachineInventoryCloudConfig(conn *websocket.Conn,
 		registration.Spec.Config = &elementalv1.Config{}
 	}
 
+	if registration.Status.RegistrationURL == "" {
+		return fmt.Errorf("registration URL is not set")
+	}
+
 	elementalConf := elementalv1.Elemental{
 		Registration: elementalv1.Registration{
 			URL:    registration.Status.RegistrationURL,

pkg/server/api_registration_test.go

@@ -458,6 +458,13 @@ func TestRegistrationMsgGet(t *testing.T) {
 			wantRawResponse: false,
 			wantMessageType: register.MsgError,
 		},
+		{
+			name:            "returns MsgError if mregistration status has no URL",
+			machineName:     "machine-3",
+			protoVersion:    register.MsgError,
+			wantRawResponse: false,
+			wantMessageType: register.MsgError,
+		},
 	}
 
 	server := NewInventoryServer(&FakeAuthServer{})
@@ -473,6 +480,7 @@ func TestRegistrationMsgGet(t *testing.T) {
 			ServiceAccountRef: &v1.ObjectReference{
 				Name: "test-account",
 			},
+			RegistrationURL:   "https://example.machine-1.org",
 			RegistrationToken: "machine-1",
 			Conditions: []metav1.Condition{
 				{
@@ -494,6 +502,7 @@ func TestRegistrationMsgGet(t *testing.T) {
 			ServiceAccountRef: &v1.ObjectReference{
 				Name: "test-account",
 			},
+			RegistrationURL:   "https://example.machine-2.org",
 			RegistrationToken: "machine-2",
 			Conditions: []metav1.Condition{
 				{
@@ -504,6 +513,27 @@ func TestRegistrationMsgGet(t *testing.T) {
 		},
 	})
 
+	server.Client.Create(context.Background(), &elementalv1.MachineRegistration{
+		ObjectMeta: metav1.ObjectMeta{
+			Name: "machine-3",
+		},
+		Spec: elementalv1.MachineRegistrationSpec{
+			MachineName: "machine-3",
+		},
+		Status: elementalv1.MachineRegistrationStatus{
+			ServiceAccountRef: &v1.ObjectReference{
+				Name: "test-account",
+			},
+			RegistrationToken: "machine-3",
+			Conditions: []metav1.Condition{
+				{
+					Type:   "Ready",
+					Status: "True",
+				},
+			},
+		},
+	})
+
 	createDefaultResources(t, server)
 
 	wsServer := httptest.NewServer(server)