merge v3

Author: aphralG

go.mod

@@ -308,7 +308,7 @@ require (
 	go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.32.0 // indirect
 	go.opentelemetry.io/otel/sdk/metric v1.32.0
 	golang.org/x/crypto v0.31.0 // indirect
-	golang.org/x/net v0.31.0 // indirect
+	golang.org/x/net v0.33.0 // indirect
 	golang.org/x/sys v0.28.0 // indirect
 	golang.org/x/text v0.21.0 // indirect
 	google.golang.org/grpc v1.68.0

go.sum

@@ -831,8 +831,8 @@ golang.org/x/net v0.0.0-20201202161906-c7110b5ffcbb/go.mod h1:sp8m0HH+o8qH0wwXwY
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
 golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
-golang.org/x/net v0.31.0 h1:68CPQngjLL0r2AlUKiSxtQFKvzRVbnzLwMUn5SzcLHo=
-golang.org/x/net v0.31.0/go.mod h1:P4fl1q7dY2hnZFxEk4pPSkDHF+QqjitcnDjUQyMM+pM=
+golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I=
+golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.23.0 h1:PbgcYx2W7i4LvjJWEbf0ngHV6qJYr86PkAV3bXdLEbs=
 golang.org/x/oauth2 v0.23.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=

internal/resource/resource_plugin_test.go

@@ -589,6 +589,51 @@ func TestResource_Process_APIAction_GetStreamUpstreams(t *testing.T) {
 			topic:    []string{bus.DataPlaneResponseTopic},
 			instance: protos.GetNginxPlusInstance([]string{}),
 		},
+		{
+			name: "Test 3: Fail, No Instance",
+			message: &bus.Message{
+				Topic: bus.APIActionRequestTopic,
+				Data: protos.CreatAPIActionRequestNginxPlusGetHTTPServers("test_upstream",
+					protos.GetNginxOssInstance([]string{}).GetInstanceMeta().GetInstanceId()),
+			},
+			err: errors.New("failed to preform API action, could not find instance with ID: " +
+				"e1374cb1-462d-3b6c-9f3b-f28332b5f10c"),
+			upstreams: &client.StreamUpstreams{
+				"upstream_1": client.StreamUpstream{
+					Zone: "zone_1",
+					Peers: []client.StreamPeer{
+						{
+							Server: "server_1",
+						},
+					},
+					Zombies: 0,
+				},
+			},
+			topic:    []string{bus.DataPlaneResponseTopic},
+			instance: inValidInstance,
+		},
+		{
+			name: "Test 4: Fail, OSS Instance",
+			message: &bus.Message{
+				Topic: bus.APIActionRequestTopic,
+				Data: protos.CreatAPIActionRequestNginxPlusGetHTTPServers("test_upstream",
+					protos.GetNginxOssInstance([]string{}).GetInstanceMeta().GetInstanceId()),
+			},
+			err: errors.New("failed to preform API action, instance is not NGINX Plus"),
+			upstreams: &client.StreamUpstreams{
+				"upstream_1": client.StreamUpstream{
+					Zone: "zone_1",
+					Peers: []client.StreamPeer{
+						{
+							Server: "server_1",
+						},
+					},
+					Zombies: 0,
+				},
+			},
+			topic:    []string{bus.DataPlaneResponseTopic},
+			instance: protos.GetNginxOssInstance([]string{}),
+		},
 	}
 
 	for _, test := range tests {
@@ -690,6 +735,55 @@ func TestResource_Process_APIAction_GetUpstreams(t *testing.T) {
 			topic:    []string{bus.DataPlaneResponseTopic},
 			instance: protos.GetNginxPlusInstance([]string{}),
 		},
+		{
+			name: "Test 3: Fail, No Instance",
+			message: &bus.Message{
+				Topic: bus.APIActionRequestTopic,
+				Data: protos.CreatAPIActionRequestNginxPlusGetHTTPServers("test_upstream",
+					protos.GetNginxOssInstance([]string{}).GetInstanceMeta().GetInstanceId()),
+			},
+			err: errors.New("failed to preform API action, could not find instance with ID: " +
+				"e1374cb1-462d-3b6c-9f3b-f28332b5f10c"),
+			upstreams: &client.Upstreams{
+				"upstream_1": client.Upstream{
+					Zone: "zone_1",
+					Peers: []client.Peer{
+						{
+							Server: "server_1",
+						},
+					},
+					Queue:     client.Queue{},
+					Keepalive: 6,
+					Zombies:   0,
+				},
+			},
+			topic:    []string{bus.DataPlaneResponseTopic},
+			instance: inValidInstance,
+		},
+		{
+			name: "Test 4: Fail, OSS Instance",
+			message: &bus.Message{
+				Topic: bus.APIActionRequestTopic,
+				Data: protos.CreatAPIActionRequestNginxPlusGetHTTPServers("test_upstream",
+					protos.GetNginxOssInstance([]string{}).GetInstanceMeta().GetInstanceId()),
+			},
+			err: errors.New("failed to preform API action, instance is not NGINX Plus"),
+			upstreams: &client.Upstreams{
+				"upstream_1": client.Upstream{
+					Zone: "zone_1",
+					Peers: []client.Peer{
+						{
+							Server: "server_1",
+						},
+					},
+					Queue:     client.Queue{},
+					Keepalive: 6,
+					Zombies:   0,
+				},
+			},
+			topic:    []string{bus.DataPlaneResponseTopic},
+			instance: protos.GetNginxOssInstance([]string{}),
+		},
 	}
 
 	for _, test := range tests {