refactor(context): reuse helper methods

redhat-developer · Apr 11, 2022 · 08a552b · 08a552b
1 parent bb51d04
commit 08a552b
Showing 1 changed file with 6 additions and 14 deletions.
diff --git a/pkg/shared/contextutil/util.go b/pkg/shared/contextutil/util.go
@@ -55,13 +55,9 @@ func GetCurrentKafkaInstance(f *factory.Factory) (*kafkamgmtclient.KafkaRequest,
 		return nil, err
 	}
 
-	if svcContext.CurrentContext == "" {
-		return nil, f.Localizer.MustLocalizeError("context.common.error.notSet")
-	}
-
-	currCtx, ok := svcContext.Contexts[svcContext.CurrentContext]
-	if !ok {
-		return nil, f.Localizer.MustLocalizeError("context.common.error.context.notFound", localize.NewEntry("Name", svcContext.CurrentContext))
+	currCtx, err := GetCurrentContext(svcContext, f.Localizer)
+	if err != nil {
+		return nil, err
 	}
 
 	if currCtx.KafkaID == "" {
@@ -90,13 +86,9 @@ func GetCurrentRegistryInstance(f *factory.Factory) (*registrymgmtclient.Registr
 		return nil, err
 	}
 
-	if svcContext.CurrentContext == "" {
-		return nil, f.Localizer.MustLocalizeError("context.common.error.notSet")
-	}
-
-	currCtx, ok := svcContext.Contexts[svcContext.CurrentContext]
-	if !ok {
-		return nil, f.Localizer.MustLocalizeError("context.common.error.context.notFound", localize.NewEntry("Name", svcContext.CurrentContext))
+	currCtx, err := GetCurrentContext(svcContext, f.Localizer)
+	if err != nil {
+		return nil, err
 	}
 
 	if currCtx.ServiceRegistryID == "" {