Fix the errors in ci

Author: palade

apiv2/internal/server/site_test.go

@@ -156,8 +156,7 @@ func TestSite_Get(t *testing.T) {
 								},
 							},
 							RenderedMetadata: &inventory.GetResourceResponse_ResourceMetadata{
-								PhyMetadata: `[{"key":"environment","value":"production"},
-									{"key":"location","value":"datacenter-1"}]`,
+								PhyMetadata: `[{"label":{"key":"environment","value":"production"}},{"label":{"key":"location","value":"datacenter-1"}}]`,
 							},
 						}, nil).Once(),
 				}
@@ -234,8 +233,7 @@ func TestSite_List(t *testing.T) {
 										},
 									},
 									RenderedMetadata: &inventory.GetResourceResponse_ResourceMetadata{
-										PhyMetadata: `[{"key":"environment","value":"production"},
-											{"key":"location","value":"datacenter-1"}]`,
+										PhyMetadata: `[{"label":{"key":"environment","value":"production"}},{"label":{"key":"location","value":"datacenter-1"}}]`,
 									},
 								},
 							},

apiv2/internal/server/utils_test.go

@@ -33,7 +33,9 @@ func compareProtoMessages(t *testing.T, msg1, msg2 proto.Message) {
 			continue
 		}
 
-		if field1.Kind() == reflect.Struct {
+		// Handle embedded structs and interfaces by comparing their fields recursively.
+		// Special case of oneof fields in protobuf messages
+		if field1.Kind() == reflect.Struct || field1.Kind() == reflect.Interface {
 			// Handle embedded structs by comparing their fields recursively
 			if field1.CanInterface() && field2.CanInterface() {
 				// Try to convert to proto.Message first

tenant-controller/internal/testing/testing_utils.go

@@ -2,7 +2,7 @@
 //
 // SPDX-License-Identifier: Apache-2.0
 
-package testing //nolint:revive // this package is used for testing and should not be imported by other packages
+package testing //nolint:revive,nolintlint // this package is used for testing and should not be imported by other packages
 
 import (
 	"os"