remove direct pointer deref

types/node_definition.go

@@ -65,10 +65,7 @@ func (n *NodeDefinition) GetStartupConfig() string {
 }
 
 func (n *NodeDefinition) GetConfigDispatcher() *ConfigDispatcher {
-	if n == nil {
-		return nil
-	}
-	if n.Config == nil {
+	if n == nil || n.Config == nil {
 		return &ConfigDispatcher{}
 	}
 	return n.Config

types/topology.go

@@ -105,22 +105,22 @@ func (t *Topology) GetNodeEnv(name string) map[string]string {
 		return utils.MergeStringMaps(
 			utils.MergeStringMaps(t.GetDefaults().GetEnv(),
 				t.GetKind(t.GetNodeKind(name)).GetEnv()),
-			ndef.Env)
+			ndef.GetEnv())
 	}
 	return nil
 }
 
 func (t *Topology) GetNodePublish(name string) []string {
 	if ndef, ok := t.Nodes[name]; ok {
-		if len(ndef.Publish) > 0 {
-			return ndef.Publish
+		if len(ndef.GetPublish()) > 0 {
+			return ndef.GetPublish()
 		}
-		if kdef, ok := t.Kinds[ndef.Kind]; ok && kdef != nil {
-			if len(kdef.Publish) > 0 {
-				return kdef.Publish
+		if kdef, ok := t.Kinds[ndef.GetKind()]; ok && kdef != nil {
+			if len(kdef.GetPublish()) > 0 {
+				return kdef.GetPublish()
 			}
 		}
-		return t.Defaults.Publish
+		return t.Defaults.GetPublish()
 	}
 	return nil
 }
@@ -130,7 +130,7 @@ func (t *Topology) GetNodeLabels(name string) map[string]string {
 		return utils.MergeStringMaps(
 			utils.MergeStringMaps(t.Defaults.GetLabels(),
 				t.GetKind(t.GetNodeKind(name)).GetLabels()),
-			ndef.Labels)
+			ndef.GetLabels())
 	}
 	return nil
 }