From 3580576caa2e73cc41ab74e6257f2783bbc219bb Mon Sep 17 00:00:00 2001
From: phm07 <22707808+phm07@users.noreply.github.com>
Date: Wed, 10 Jul 2024 15:54:18 +0200
Subject: [PATCH 1/2] fix(firewall): unclear wording for apply to/remove from
 resource

---
 internal/cmd/firewall/apply_to_resource.go    | 2 +-
 internal/cmd/firewall/remove_from_resource.go | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/internal/cmd/firewall/apply_to_resource.go b/internal/cmd/firewall/apply_to_resource.go
index 7bc334d5..bbb2337c 100644
--- a/internal/cmd/firewall/apply_to_resource.go
+++ b/internal/cmd/firewall/apply_to_resource.go
@@ -84,7 +84,7 @@ var ApplyToResourceCmd = base.Cmd{
 		if err := s.WaitForActions(cmd, s, actions...); err != nil {
 			return err
 		}
-		cmd.Printf("Firewall %d applied\n", firewall.ID)
+		cmd.Printf("Firewall %d applied to resource\n", firewall.ID)
 
 		return nil
 	},
diff --git a/internal/cmd/firewall/remove_from_resource.go b/internal/cmd/firewall/remove_from_resource.go
index a7f37a94..b93385c0 100644
--- a/internal/cmd/firewall/remove_from_resource.go
+++ b/internal/cmd/firewall/remove_from_resource.go
@@ -83,7 +83,7 @@ var RemoveFromResourceCmd = base.Cmd{
 		if err := s.WaitForActions(cmd, s, actions...); err != nil {
 			return err
 		}
-		cmd.Printf("Firewall %d applied\n", firewall.ID)
+		cmd.Printf("Firewall %d removed from resource\n", firewall.ID)
 
 		return nil
 	},

From 29251a179b60c3af613d68d907592aa6980d8bbb Mon Sep 17 00:00:00 2001
From: phm07 <22707808+phm07@users.noreply.github.com>
Date: Wed, 10 Jul 2024 15:59:02 +0200
Subject: [PATCH 2/2] fix tests

---
 internal/cmd/firewall/apply_to_resource_test.go    | 4 ++--
 internal/cmd/firewall/remove_from_resource_test.go | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/internal/cmd/firewall/apply_to_resource_test.go b/internal/cmd/firewall/apply_to_resource_test.go
index 2a9b0519..2116e431 100644
--- a/internal/cmd/firewall/apply_to_resource_test.go
+++ b/internal/cmd/firewall/apply_to_resource_test.go
@@ -43,7 +43,7 @@ func TestApplyToServer(t *testing.T) {
 
 	out, errOut, err := fx.Run(cmd, []string{"--type", "server", "--server", "my-server", "test"})
 
-	expOut := "Firewall 123 applied\n"
+	expOut := "Firewall 123 applied to resource\n"
 
 	assert.NoError(t, err)
 	assert.Empty(t, errOut)
@@ -79,7 +79,7 @@ func TestApplyToLabelSelector(t *testing.T) {
 
 	out, errOut, err := fx.Run(cmd, []string{"--type", "label_selector", "--label-selector", "my-label", "test"})
 
-	expOut := "Firewall 123 applied\n"
+	expOut := "Firewall 123 applied to resource\n"
 
 	assert.NoError(t, err)
 	assert.Empty(t, errOut)
diff --git a/internal/cmd/firewall/remove_from_resource_test.go b/internal/cmd/firewall/remove_from_resource_test.go
index 862aa34f..2fb78346 100644
--- a/internal/cmd/firewall/remove_from_resource_test.go
+++ b/internal/cmd/firewall/remove_from_resource_test.go
@@ -43,7 +43,7 @@ func TestRemoveFromServer(t *testing.T) {
 
 	out, errOut, err := fx.Run(cmd, []string{"--type", "server", "--server", "my-server", "test"})
 
-	expOut := "Firewall 123 applied\n"
+	expOut := "Firewall 123 removed from resource\n"
 
 	assert.NoError(t, err)
 	assert.Empty(t, errOut)
@@ -79,7 +79,7 @@ func TestRemoveFromLabelSelector(t *testing.T) {
 
 	out, errOut, err := fx.Run(cmd, []string{"--type", "label_selector", "--label-selector", "my-label", "test"})
 
-	expOut := "Firewall 123 applied\n"
+	expOut := "Firewall 123 removed from resource\n"
 
 	assert.NoError(t, err)
 	assert.Empty(t, errOut)