return nil instead of empty map (#13)

klothoplatform · Dec 21, 2022 · 25449d6 · 25449d6
1 parent 9ef83c5
commit 25449d6
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 9 deletions.
diff --git a/pkg/annotation/directive.go b/pkg/annotation/directive.go
@@ -87,7 +87,7 @@ func (d Directives) Int(key string) (int, bool) {
 func (d Directives) Object(key string) Directives {
 	v, ok := d[key]
 	if !ok {
-		return make(Directives)
+		return nil
 	}
 	m, ok := v.(map[string]interface{})
 	if !ok {

diff --git a/pkg/lang/javascript/plugin_persist.go b/pkg/lang/javascript/plugin_persist.go
@@ -168,12 +168,11 @@ func (p *persister) handleFile(f *core.SourceFile, unit *core.ExecutionUnit) ([]
 			continue
 		}
 
-		if annot.Capability.Directives.Object(core.EnvironmentVariableDirective) != nil {
-			continue
-		}
-
 		keyType, pResult := p.determinePersistType(f, annot)
 		if pResult == nil {
+			if annot.Capability.Directives.Object(core.EnvironmentVariableDirective) != nil {
+				continue
+			}
 			log.Warn("Could not determine persist type")
 			continue
 		}

diff --git a/pkg/lang/python/plugin_persist.go b/pkg/lang/python/plugin_persist.go
@@ -101,12 +101,11 @@ func (p *persister) handleFile(f *core.SourceFile, unit *core.ExecutionUnit) ([]
 			continue
 		}
 
-		if annot.Capability.Directives.Object(core.EnvironmentVariableDirective) != nil {
-			continue
-		}
-
 		keyType, pResult := p.determinePersistType(f, annot)
 		if pResult == nil {
+			if annot.Capability.Directives.Object(core.EnvironmentVariableDirective) != nil {
+				continue
+			}
 			log.Warn("Could not determine persist type")
 			continue
 		}