From 776f0641fd227e52a2cd14e08acbb2b9e1ebab75 Mon Sep 17 00:00:00 2001
From: earl-warren <earl-warren@noreply.code.forgejo.org>
Date: Sat, 16 Aug 2025 17:59:20 +0000
Subject: [PATCH] feat: fail when using an invalid label during non interactive
 registration (#647)

* add test
* return validation error not nil from function

Reviewed-on: https://gitea.com/gitea/act_runner/pulls/683
Reviewed-by: techknowlogick <techknowlogick@noreply.gitea.com>
Co-authored-by: Christopher Homberger <christopher.homberger@web.de>
Co-committed-by: Christopher Homberger <christopher.homberger@web.de>
(cherry picked from commit f0b5aff3bbeda469a682fe21144c16485ea2189a)

<!--start release-notes-assistant-->
<!--URL:https://code.forgejo.org/forgejo/runner-->
- features
  - [PR](https://code.forgejo.org/forgejo/runner/pulls/647): <!--number 647 --><!--line 0 --><!--description ZmVhdDogZmFpbCB3aGVuIHVzaW5nIGFuIGludmFsaWQgbGFiZWwgZHVyaW5nIG5vbiBpbnRlcmFjdGl2ZSByZWdpc3RyYXRpb24=-->feat: fail when using an invalid label during non interactive registration<!--description-->
<!--end release-notes-assistant-->

Co-authored-by: Christopher Homberger <christopher.homberger@web.de>
Reviewed-on: https://code.forgejo.org/forgejo/runner/pulls/647
Reviewed-by: Gusted <gusted@noreply.code.forgejo.org>
Reviewed-by: Mathieu Fenniak <mfenniak@noreply.code.forgejo.org>
---
 internal/app/cmd/register.go      |  2 +-
 internal/app/cmd/register_test.go | 11 +++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/internal/app/cmd/register.go b/internal/app/cmd/register.go
index 5e2f5d8a..a6a3d2cf 100644
--- a/internal/app/cmd/register.go
+++ b/internal/app/cmd/register.go
@@ -276,7 +276,7 @@ func registerNoInteractive(ctx context.Context, configFile string, regArgs *regi
 	}
 	if err := inputs.validate(); err != nil {
 		log.WithError(err).Errorf("Invalid input, please re-run act command.")
-		return nil
+		return err
 	}
 	if err := doRegister(ctx, cfg, inputs); err != nil {
 		return fmt.Errorf("Failed to register runner: %w", err)
diff --git a/internal/app/cmd/register_test.go b/internal/app/cmd/register_test.go
index a69775a8..1283db97 100644
--- a/internal/app/cmd/register_test.go
+++ b/internal/app/cmd/register_test.go
@@ -6,6 +6,8 @@ package cmd
 import (
 	"slices"
 	"testing"
+
+	"github.com/stretchr/testify/assert"
 )
 
 func TestCommaSplit(t *testing.T) {
@@ -29,3 +31,12 @@ func TestCommaSplit(t *testing.T) {
 		}
 	}
 }
+
+func TestRegisterNonInteractiveReturnsLabelValidationError(t *testing.T) {
+	err := registerNoInteractive(t.Context(), "", &registerArgs{
+		Labels:       "label:invalid",
+		Token:        "token",
+		InstanceAddr: "http://localhost:3000",
+	})
+	assert.Error(t, err, "unsupported schema: invalid")
+}