From f02f38b3a7b21e6e3dc852ab2ba49f2287a8d018 Mon Sep 17 00:00:00 2001
From: Mario Manno <mario.manno@suse.com>
Date: Wed, 20 Dec 2023 14:49:37 +0100
Subject: [PATCH] Move agentmanagement modules into its folder

---
 internal/cmd/controller/{ => agentmanagement}/agent/agent.go | 0
 .../cmd/controller/{ => agentmanagement}/agent/config.go     | 0
 .../cmd/controller/{ => agentmanagement}/agent/manifest.go   | 0
 .../controller/{ => agentmanagement}/agent/manifest_test.go  | 0
 .../{ => agentmanagement}/connection/connection.go           | 0
 .../controller/agentmanagement/controllers/cluster/import.go | 4 ++--
 .../agentmanagement/controllers/manageagent/manageagent.go   | 5 +++--
 internal/cmd/controller/root.go                              | 2 +-
 8 files changed, 6 insertions(+), 5 deletions(-)
 rename internal/cmd/controller/{ => agentmanagement}/agent/agent.go (100%)
 rename internal/cmd/controller/{ => agentmanagement}/agent/config.go (100%)
 rename internal/cmd/controller/{ => agentmanagement}/agent/manifest.go (100%)
 rename internal/cmd/controller/{ => agentmanagement}/agent/manifest_test.go (100%)
 rename internal/cmd/controller/{ => agentmanagement}/connection/connection.go (100%)

diff --git a/internal/cmd/controller/agent/agent.go b/internal/cmd/controller/agentmanagement/agent/agent.go
similarity index 100%
rename from internal/cmd/controller/agent/agent.go
rename to internal/cmd/controller/agentmanagement/agent/agent.go
diff --git a/internal/cmd/controller/agent/config.go b/internal/cmd/controller/agentmanagement/agent/config.go
similarity index 100%
rename from internal/cmd/controller/agent/config.go
rename to internal/cmd/controller/agentmanagement/agent/config.go
diff --git a/internal/cmd/controller/agent/manifest.go b/internal/cmd/controller/agentmanagement/agent/manifest.go
similarity index 100%
rename from internal/cmd/controller/agent/manifest.go
rename to internal/cmd/controller/agentmanagement/agent/manifest.go
diff --git a/internal/cmd/controller/agent/manifest_test.go b/internal/cmd/controller/agentmanagement/agent/manifest_test.go
similarity index 100%
rename from internal/cmd/controller/agent/manifest_test.go
rename to internal/cmd/controller/agentmanagement/agent/manifest_test.go
diff --git a/internal/cmd/controller/connection/connection.go b/internal/cmd/controller/agentmanagement/connection/connection.go
similarity index 100%
rename from internal/cmd/controller/connection/connection.go
rename to internal/cmd/controller/agentmanagement/connection/connection.go
diff --git a/internal/cmd/controller/agentmanagement/controllers/cluster/import.go b/internal/cmd/controller/agentmanagement/controllers/cluster/import.go
index 31c1f17298..f1005a25e9 100644
--- a/internal/cmd/controller/agentmanagement/controllers/cluster/import.go
+++ b/internal/cmd/controller/agentmanagement/controllers/cluster/import.go
@@ -11,9 +11,9 @@ import (
 	"github.com/sirupsen/logrus"
 
 	"github.com/rancher/fleet/internal/client"
-	"github.com/rancher/fleet/internal/cmd/controller/agent"
+	"github.com/rancher/fleet/internal/cmd/controller/agentmanagement/agent"
+	"github.com/rancher/fleet/internal/cmd/controller/agentmanagement/connection"
 	"github.com/rancher/fleet/internal/cmd/controller/agentmanagement/controllers/manageagent"
-	"github.com/rancher/fleet/internal/cmd/controller/connection"
 	fleetns "github.com/rancher/fleet/internal/cmd/controller/namespace"
 	"github.com/rancher/fleet/internal/config"
 	"github.com/rancher/fleet/internal/helmdeployer"
diff --git a/internal/cmd/controller/agentmanagement/controllers/manageagent/manageagent.go b/internal/cmd/controller/agentmanagement/controllers/manageagent/manageagent.go
index 77f57adc38..17a1e33dc7 100644
--- a/internal/cmd/controller/agentmanagement/controllers/manageagent/manageagent.go
+++ b/internal/cmd/controller/agentmanagement/controllers/manageagent/manageagent.go
@@ -11,11 +11,12 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/rancher/fleet/internal/cmd/controller/agent"
+	"github.com/sirupsen/logrus"
+
+	"github.com/rancher/fleet/internal/cmd/controller/agentmanagement/agent"
 	"github.com/rancher/fleet/internal/config"
 	fleet "github.com/rancher/fleet/pkg/apis/fleet.cattle.io/v1alpha1"
 	fleetcontrollers "github.com/rancher/fleet/pkg/generated/controllers/fleet.cattle.io/v1alpha1"
-	"github.com/sirupsen/logrus"
 
 	"github.com/rancher/wrangler/v2/pkg/apply"
 	corecontrollers "github.com/rancher/wrangler/v2/pkg/generated/controllers/core/v1"
diff --git a/internal/cmd/controller/root.go b/internal/cmd/controller/root.go
index 97d545575c..1c4f7b1912 100644
--- a/internal/cmd/controller/root.go
+++ b/internal/cmd/controller/root.go
@@ -13,12 +13,12 @@ import (
 	"time"
 
 	"github.com/rancher/fleet/internal/cmd/controller/agentmanagement"
+	"github.com/rancher/fleet/internal/cmd/controller/agentmanagement/agent"
 
 	"github.com/spf13/cobra"
 	"k8s.io/apimachinery/pkg/util/wait"
 
 	command "github.com/rancher/fleet/internal/cmd"
-	"github.com/rancher/fleet/internal/cmd/controller/agent"
 	"github.com/rancher/fleet/internal/cmd/controller/cleanup"
 	"github.com/rancher/fleet/pkg/durations"
 	"github.com/rancher/fleet/pkg/version"