Merge pull request #255 from Mixaster995/bug/empty-ns-error

fixed error when using get with empty namespace
networkservicemesh · Oct 12, 2021 · 10c8425 · 10c8425
2 parents 8b5d21c + 2fb86e9
commit 10c8425
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 10 deletions.
diff --git a/pkg/registry/etcd/ns_server.go b/pkg/registry/etcd/ns_server.go
@@ -58,11 +58,24 @@ func (n *etcdNSRegistryServer) Register(ctx context.Context, request *registry.N
 		metav1.CreateOptions{},
 	)
 	if apierrors.IsAlreadyExists(err) {
-		var exist *v1.NetworkService
-		exist, err = n.client.NetworkservicemeshV1().NetworkServices("").Get(ctx, request.Name, metav1.GetOptions{})
-		if err == nil {
-			exist.Spec = *(*v1.NetworkServiceSpec)(request)
-			apiResp, err = n.client.NetworkservicemeshV1().NetworkServices(n.ns).Update(ctx, exist, metav1.UpdateOptions{})
+		var ns *v1.NetworkService
+		list, erro := n.client.NetworkservicemeshV1().NetworkServices("").List(ctx, metav1.ListOptions{})
+		if erro != nil {
+			return nil, erro
+		}
+		for i := 0; i < len(list.Items); i++ {
+			item := (*registry.NetworkService)(&list.Items[i].Spec)
+			if item.Name == "" {
+				item.Name = list.Items[i].Name
+			}
+			if request.Name == item.Name {
+				list.Items[i].Spec = *(*v1.NetworkServiceSpec)(request)
+				ns = &list.Items[i]
+			}
+		}
+
+		if ns != nil {
+			apiResp, err = n.client.NetworkservicemeshV1().NetworkServices(n.ns).Update(ctx, ns, metav1.UpdateOptions{})
 		}
 	}
 	if err != nil {

diff --git a/pkg/registry/etcd/nse_server.go b/pkg/registry/etcd/nse_server.go
@@ -62,11 +62,24 @@ func (n *etcdNSERegistryServer) Register(ctx context.Context, request *registry.
 		metav1.CreateOptions{},
 	)
 	if apierrors.IsAlreadyExists(err) {
-		var exist *v1.NetworkServiceEndpoint
-		exist, err = n.client.NetworkservicemeshV1().NetworkServiceEndpoints("").Get(ctx, request.Name, metav1.GetOptions{})
-		if err == nil {
-			exist.Spec = *(*v1.NetworkServiceEndpointSpec)(request)
-			apiResp, err = n.client.NetworkservicemeshV1().NetworkServiceEndpoints(n.ns).Update(ctx, exist, metav1.UpdateOptions{})
+		var nse *v1.NetworkServiceEndpoint
+		list, erro := n.client.NetworkservicemeshV1().NetworkServiceEndpoints("").List(ctx, metav1.ListOptions{})
+		if erro != nil {
+			return nil, erro
+		}
+		for i := 0; i < len(list.Items); i++ {
+			item := (*registry.NetworkServiceEndpoint)(&list.Items[i].Spec)
+			if item.Name == "" {
+				item.Name = list.Items[i].Name
+			}
+			if request.Name == item.Name {
+				list.Items[i].Spec = *(*v1.NetworkServiceEndpointSpec)(request)
+				nse = &list.Items[i]
+			}
+		}
+
+		if nse != nil {
+			apiResp, err = n.client.NetworkservicemeshV1().NetworkServiceEndpoints(n.ns).Update(ctx, nse, metav1.UpdateOptions{})
 		}
 	}
 	if err != nil {