Refactor Instance Watcher

api/grpc/mpi/v1/files.proto

@@ -166,7 +166,7 @@ message FileMeta {
     // The hash of the file contents sha256, hex encoded
     string hash = 2;
     // Last modified time of the file (created time if never modified)
-    google.protobuf.Timestamp modified_time = 3 [(buf.validate.field).timestamp.lt_now = true];
+    google.protobuf.Timestamp modified_time = 3;
     // The permission set associated with a particular file
     string permissions = 4 [(buf.validate.field).string.pattern = "0[0-7]{3}"];
     // The size of the file in bytes

internal/bus/topics.go

@@ -6,9 +6,7 @@
 package bus
 
 const (
-	AddInstancesTopic                = "add-instances"
 	UpdatedInstancesTopic            = "updated-instances"
-	DeletedInstancesTopic            = "deleted-instances"
 	ResourceUpdateTopic              = "resource-update"
 	NginxConfigUpdateTopic           = "nginx-config-update"
 	InstanceHealthTopic              = "instance-health"

internal/resource/nginx_instance_operator.go → internal/nginx/nginx_instance_operator.go

@@ -3,7 +3,7 @@
 // This source code is licensed under the Apache License, Version 2.0 license found in the
 // LICENSE file in the root directory of this source tree.
 
-package resource
+package nginx
 
 import (
 	"bytes"

internal/resource/nginx_instance_operator_test.go → internal/nginx/nginx_instance_operator_test.go

@@ -3,7 +3,7 @@
 // This source code is licensed under the Apache License, Version 2.0 license found in the
 // LICENSE file in the root directory of this source tree.
 
-package resource
+package nginx
 
 import (
 	"bytes"
@@ -16,7 +16,7 @@ import (
 	"time"
 
 	"github.com/nginx/agent/v3/internal/config"
-	"github.com/nginx/agent/v3/internal/resource/resourcefakes"
+	"github.com/nginx/agent/v3/internal/nginx/nginxfakes"
 	"github.com/nginx/agent/v3/pkg/nginxprocess"
 	"github.com/nginx/agent/v3/test/stub"
 
@@ -393,7 +393,7 @@ func TestInstanceOperator_checkWorkers(t *testing.T) {
 			mockExec.RunCmdReturnsOnCall(2, bytes.NewBufferString(nginxVersionCommandOutput), nil)
 			mockExec.RunCmdReturnsOnCall(3, bytes.NewBufferString(nginxVersionCommandOutput), nil)
 
-			mockProcessOp := &resourcefakes.FakeProcessOperator{}
+			mockProcessOp := &nginxfakes.FakeProcessOperator{}
 			allProcesses := slices.Concat(test.workers, test.masterProcess)
 			mockProcessOp.FindNginxProcessesReturnsOnCall(0, allProcesses, nil)
 			mockProcessOp.NginxWorkerProcessesReturnsOnCall(0, test.workers)

internal/resource/nginx_instance_process_operator.go → internal/nginx/nginx_instance_process_operator.go

@@ -3,7 +3,7 @@
 // This source code is licensed under the Apache License, Version 2.0 license found in the
 // LICENSE file in the root directory of this source tree.
 
-package resource
+package nginx
 
 import (
 	"context"

internal/resource/nginx_instance_process_operator_test.go → internal/nginx/nginx_instance_process_operator_test.go

@@ -3,7 +3,7 @@
 // This source code is licensed under the Apache License, Version 2.0 license found in the
 // LICENSE file in the root directory of this source tree.
 
-package resource
+package nginx
 
 import (
 	"bytes"

internal/resource/nginx_log_tailer_operator.go → internal/nginx/nginx_log_tailer_operator.go

@@ -3,7 +3,7 @@
 // This source code is licensed under the Apache License, Version 2.0 license found in the
 // LICENSE file in the root directory of this source tree.
 
-package resource
+package nginx
 
 import (
 	"context"

internal/resource/nginx_log_tailer_operator_test.go → internal/nginx/nginx_log_tailer_operator_test.go

@@ -3,7 +3,7 @@
 // This source code is licensed under the Apache License, Version 2.0 license found in the
 // LICENSE file in the root directory of this source tree.
 
-package resource
+package nginx
 
 import (
 	"bytes"