refactor(orchestrator): add watcher and processor folders

orchestrator/pkg/config.go

@@ -24,13 +24,13 @@ import (
 	"github.com/spf13/viper"
 
 	"github.com/openclarity/vmclarity/api/types"
-	"github.com/openclarity/vmclarity/orchestrator/pkg/assetscanestimationwatcher"
-	"github.com/openclarity/vmclarity/orchestrator/pkg/assetscanprocessor"
-	"github.com/openclarity/vmclarity/orchestrator/pkg/assetscanwatcher"
-	"github.com/openclarity/vmclarity/orchestrator/pkg/discovery"
-	"github.com/openclarity/vmclarity/orchestrator/pkg/scanconfigwatcher"
-	"github.com/openclarity/vmclarity/orchestrator/pkg/scanestimationwatcher"
-	"github.com/openclarity/vmclarity/orchestrator/pkg/scanwatcher"
+	discovery "github.com/openclarity/vmclarity/orchestrator/pkg/discoverer"
+	assetscanprocessor "github.com/openclarity/vmclarity/orchestrator/pkg/processor/assetscan"
+	assetscanwatcher "github.com/openclarity/vmclarity/orchestrator/pkg/watcher/assetscan"
+	assetscanestimationwatcher "github.com/openclarity/vmclarity/orchestrator/pkg/watcher/assetscanestimation"
+	scanwatcher "github.com/openclarity/vmclarity/orchestrator/pkg/watcher/scan"
+	scanconfigwatcher "github.com/openclarity/vmclarity/orchestrator/pkg/watcher/scanconfig"
+	scanestimationwatcher "github.com/openclarity/vmclarity/orchestrator/pkg/watcher/scanestimation"
 )
 
 const (

orchestrator/pkg/config_test.go

@@ -25,13 +25,13 @@ import (
 
 	apitypes "github.com/openclarity/vmclarity/api/types"
 
-	"github.com/openclarity/vmclarity/orchestrator/pkg/assetscanestimationwatcher"
-	"github.com/openclarity/vmclarity/orchestrator/pkg/assetscanprocessor"
-	"github.com/openclarity/vmclarity/orchestrator/pkg/assetscanwatcher"
-	"github.com/openclarity/vmclarity/orchestrator/pkg/discovery"
-	"github.com/openclarity/vmclarity/orchestrator/pkg/scanconfigwatcher"
-	"github.com/openclarity/vmclarity/orchestrator/pkg/scanestimationwatcher"
-	"github.com/openclarity/vmclarity/orchestrator/pkg/scanwatcher"
+	"github.com/openclarity/vmclarity/orchestrator/pkg/discoverer"
+	assetscanprocessor "github.com/openclarity/vmclarity/orchestrator/pkg/processor/assetscan"
+	assetscanwatcher "github.com/openclarity/vmclarity/orchestrator/pkg/watcher/assetscan"
+	assetscanestimationwatcher "github.com/openclarity/vmclarity/orchestrator/pkg/watcher/assetscanestimation"
+	scanwatcher "github.com/openclarity/vmclarity/orchestrator/pkg/watcher/scan"
+	scanconfigwatcher "github.com/openclarity/vmclarity/orchestrator/pkg/watcher/scanconfig"
+	scanestimationwatcher "github.com/openclarity/vmclarity/orchestrator/pkg/watcher/scanestimation"
 )
 
 func TestUnmarshalCloudProvider(t *testing.T) {
@@ -147,7 +147,7 @@ func TestConfig(t *testing.T) {
 				APIServerAddress:       "http://example.com:8484/api",
 				HealthCheckAddress:     "example.com:18888",
 				ControllerStartupDelay: 15 * time.Second,
-				DiscoveryConfig: discovery.Config{
+				DiscoveryConfig: discoverer.Config{
 					DiscoveryInterval: time.Minute,
 				},
 				ScanConfigWatcherConfig: scanconfigwatcher.Config{
@@ -200,8 +200,8 @@ func TestConfig(t *testing.T) {
 				APIServerAddress:       "",
 				HealthCheckAddress:     DefaultHealthCheckAddress,
 				ControllerStartupDelay: DefaultControllerStartupDelay,
-				DiscoveryConfig: discovery.Config{
-					DiscoveryInterval: discovery.DefaultInterval,
+				DiscoveryConfig: discoverer.Config{
+					DiscoveryInterval: discoverer.DefaultInterval,
 				},
 				ScanConfigWatcherConfig: scanconfigwatcher.Config{
 					PollPeriod:       scanconfigwatcher.DefaultPollInterval,

orchestrator/pkg/discovery/config.go → orchestrator/pkg/discoverer/config.go

@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package discovery
+package discoverer
 
 import (
 	"time"

orchestrator/pkg/discovery/discoverer.go → orchestrator/pkg/discoverer/discoverer.go

@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package discovery
+package discoverer
 
 import (
 	"context"

orchestrator/pkg/orchestrator.go

@@ -24,13 +24,13 @@ import (
 
 	"github.com/openclarity/vmclarity/api/client"
 	"github.com/openclarity/vmclarity/api/types"
-	"github.com/openclarity/vmclarity/orchestrator/pkg/assetscanestimationwatcher"
-	"github.com/openclarity/vmclarity/orchestrator/pkg/assetscanprocessor"
-	"github.com/openclarity/vmclarity/orchestrator/pkg/assetscanwatcher"
-	"github.com/openclarity/vmclarity/orchestrator/pkg/discovery"
-	"github.com/openclarity/vmclarity/orchestrator/pkg/scanconfigwatcher"
-	"github.com/openclarity/vmclarity/orchestrator/pkg/scanestimationwatcher"
-	"github.com/openclarity/vmclarity/orchestrator/pkg/scanwatcher"
+	discovery "github.com/openclarity/vmclarity/orchestrator/pkg/discoverer"
+	assetscanprocessor "github.com/openclarity/vmclarity/orchestrator/pkg/processor/assetscan"
+	assetscanwatcher "github.com/openclarity/vmclarity/orchestrator/pkg/watcher/assetscan"
+	assetscanestimationwatcher "github.com/openclarity/vmclarity/orchestrator/pkg/watcher/assetscanestimation"
+	scanwatcher "github.com/openclarity/vmclarity/orchestrator/pkg/watcher/scan"
+	scanconfigwatcher "github.com/openclarity/vmclarity/orchestrator/pkg/watcher/scanconfig"
+	scanestimationwatcher "github.com/openclarity/vmclarity/orchestrator/pkg/watcher/scanestimation"
 	provider "github.com/openclarity/vmclarity/provider/pkg"
 	"github.com/openclarity/vmclarity/provider/pkg/aws"
 	"github.com/openclarity/vmclarity/provider/pkg/azure"

orchestrator/pkg/assetscanprocessor/common.go → orchestrator/pkg/processor/assetscan/common.go

@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package assetscanprocessor
+package assetscan
 
 import (
 	"context"

orchestrator/pkg/assetscanprocessor/config.go → orchestrator/pkg/processor/assetscan/config.go

@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package assetscanprocessor
+package assetscan
 
 import (
 	"time"

orchestrator/pkg/assetscanprocessor/exploits.go → orchestrator/pkg/processor/assetscan/exploits.go

@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package assetscanprocessor
+package assetscan
 
 import (
 	"context"

orchestrator/pkg/assetscanprocessor/infofinder.go → orchestrator/pkg/processor/assetscan/infofinder.go

@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package assetscanprocessor
+package assetscan
 
 import (
 	"context"

orchestrator/pkg/assetscanprocessor/malware.go → orchestrator/pkg/processor/assetscan/malware.go

@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package assetscanprocessor
+package assetscan
 
 import (
 	"context"

orchestrator/pkg/assetscanprocessor/misconfigurations.go → orchestrator/pkg/processor/assetscan/misconfigurations.go

@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package assetscanprocessor
+package assetscan
 
 import (
 	"context"

orchestrator/pkg/assetscanprocessor/packages.go → orchestrator/pkg/processor/assetscan/packages.go

@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package assetscanprocessor
+package assetscan
 
 import (
 	"context"

orchestrator/pkg/assetscanprocessor/processor.go → orchestrator/pkg/processor/assetscan/processor.go

@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package assetscanprocessor
+package assetscan
 
 import (
 	"context"

orchestrator/pkg/assetscanprocessor/rootkits.go → orchestrator/pkg/processor/assetscan/rootkits.go

@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package assetscanprocessor
+package assetscan
 
 import (
 	"context"

orchestrator/pkg/assetscanprocessor/secrets.go → orchestrator/pkg/processor/assetscan/secrets.go

@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package assetscanprocessor
+package assetscan
 
 import (
 	"context"

orchestrator/pkg/assetscanprocessor/vulnerabilities.go → orchestrator/pkg/processor/assetscan/vulnerabilities.go

@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package assetscanprocessor
+package assetscan
 
 import (
 	"context"

orchestrator/pkg/assetscanwatcher/config.go → orchestrator/pkg/watcher/assetscan/config.go

@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package assetscanwatcher
+package assetscan
 
 import (
 	"time"

orchestrator/pkg/assetscanwatcher/delete_job_policy.go → orchestrator/pkg/watcher/assetscan/delete_job_policy.go

@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package assetscanwatcher
+package assetscan
 
 import (
 	"fmt"

orchestrator/pkg/assetscanwatcher/delete_job_policy_test.go → orchestrator/pkg/watcher/assetscan/delete_job_policy_test.go

@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package assetscanwatcher
+package assetscan
 
 import (
 	"testing"

orchestrator/pkg/assetscanwatcher/event.go → orchestrator/pkg/watcher/assetscan/event.go

@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package assetscanwatcher
+package assetscan
 
 import (
 	"fmt"

orchestrator/pkg/assetscanwatcher/families.go → orchestrator/pkg/watcher/assetscan/families.go

@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package assetscanwatcher
+package assetscan
 
 import (
 	"time"

orchestrator/pkg/assetscanwatcher/helpers.go → orchestrator/pkg/watcher/assetscan/helpers.go

@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package assetscanwatcher
+package assetscan
 
 import (
 	"errors"

orchestrator/pkg/assetscanwatcher/scannerconfig.go → orchestrator/pkg/watcher/assetscan/scannerconfig.go

@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package assetscanwatcher
+package assetscan
 
 import "time"
 

orchestrator/pkg/assetscanwatcher/watcher.go → orchestrator/pkg/watcher/assetscan/watcher.go

@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package assetscanwatcher
+package assetscan
 
 import (
 	"context"

orchestrator/pkg/assetscanestimationwatcher/config.go → orchestrator/pkg/watcher/assetscanestimation/config.go

@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package assetscanestimationwatcher
+package assetscanestimation
 
 import (
 	"time"

orchestrator/pkg/assetscanestimationwatcher/event.go → orchestrator/pkg/watcher/assetscanestimation/event.go

@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package assetscanestimationwatcher
+package assetscanestimation
 
 import (
 	"fmt"

orchestrator/pkg/assetscanestimationwatcher/helpers.go → orchestrator/pkg/watcher/assetscanestimation/helpers.go

@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package assetscanestimationwatcher
+package assetscanestimation
 
 import (
 	"context"

orchestrator/pkg/assetscanestimationwatcher/watcher.go → orchestrator/pkg/watcher/assetscanestimation/watcher.go

@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package assetscanestimationwatcher
+package assetscanestimation
 
 import (
 	"context"

orchestrator/pkg/scanwatcher/config.go → orchestrator/pkg/watcher/scan/config.go

@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package scanwatcher
+package scan
 
 import (
 	"time"

orchestrator/pkg/scanwatcher/event.go → orchestrator/pkg/watcher/scan/event.go

@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package scanwatcher
+package scan
 
 import (
 	"fmt"

orchestrator/pkg/scanwatcher/helpers.go → orchestrator/pkg/watcher/scan/helpers.go

@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package scanwatcher
+package scan
 
 import (
 	"errors"

orchestrator/pkg/scanwatcher/helpers_test.go → orchestrator/pkg/watcher/scan/helpers_test.go

@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package scanwatcher
+package scan
 
 import (
 	"testing"

orchestrator/pkg/scanwatcher/watcher.go → orchestrator/pkg/watcher/scan/watcher.go

@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package scanwatcher
+package scan
 
 import (
 	"context"

orchestrator/pkg/scanconfigwatcher/config.go → orchestrator/pkg/watcher/scanconfig/config.go

@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package scanconfigwatcher
+package scanconfig
 
 import (
 	"time"

orchestrator/pkg/scanconfigwatcher/event.go → orchestrator/pkg/watcher/scanconfig/event.go

@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package scanconfigwatcher
+package scanconfig
 
 import (
 	"fmt"

orchestrator/pkg/scanconfigwatcher/helpers.go → orchestrator/pkg/watcher/scanconfig/helpers.go

@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package scanconfigwatcher
+package scanconfig
 
 import (
 	"fmt"

orchestrator/pkg/scanconfigwatcher/schedule.go → orchestrator/pkg/watcher/scanconfig/schedule.go

@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package scanconfigwatcher
+package scanconfig
 
 import (
 	"fmt"

orchestrator/pkg/scanconfigwatcher/schedule_test.go → orchestrator/pkg/watcher/scanconfig/schedule_test.go

@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package scanconfigwatcher
+package scanconfig
 
 import (
 	"testing"