Merge pull request #139 from shalb/no-inputs-module

fix 3
shalb · Aug 18, 2021 · f1fdd28 · f1fdd28
2 parents 8477e9d + f376751
commit f1fdd28
Show file tree

Hide file tree

Showing 6 changed files with 38 additions and 35 deletions.
diff --git a/pkg/modules/terraform/helm/main.go b/pkg/modules/terraform/helm/main.go
@@ -20,7 +20,7 @@ type Module struct {
 	helmOpts        map[string]interface{}
 	sets            map[string]interface{}
 	kubeconfig      string
-	valuesFilesList [][]byte
+	valuesFilesList []string
 	valuesYAML      []map[string]interface{}
 }
 
@@ -58,16 +58,6 @@ func (m *Module) genMainCodeBlock() ([]byte, error) {
 		setBlock.Body().SetAttributeValue("name", cty.StringVal(key))
 		setBlock.Body().SetAttributeValue("value", ctyVal)
 	}
-	depMarkers, ok := m.ProjectPtr().Markers[common.RemoteStateMarkerCatName]
-	if ok {
-		for hash, marker := range depMarkers.(map[string]*project.Dependency) {
-			if marker.Module == nil {
-				continue
-			}
-			remoteStateRef := fmt.Sprintf("data.terraform_remote_state.%s-%s.outputs.%s", marker.Module.InfraName(), marker.Module.Name(), marker.Output)
-			hcltools.ReplaceStingMarkerInBody(helmBody, hash, remoteStateRef)
-		}
-	}
 	if len(m.valuesFilesList) > 0 {
 		ctyValuesList := []cty.Value{}
 		for _, v := range m.valuesFilesList {
@@ -76,6 +66,15 @@ func (m *Module) genMainCodeBlock() ([]byte, error) {
 		helmBody.SetAttributeValue("values", cty.ListVal(ctyValuesList))
 		//hcltools.ReplaceStingMarkerInBody(helmBody, marker, "file(\"./values.yaml\")")
 	}
+	for hash, m := range m.Markers() {
+		marker, ok := m.(*project.Dependency)
+		// log.Warnf("kubernetes marker HELM: %v", marker)
+		refStr := common.DependencyToRemoteStateRef(marker)
+		if !ok {
+			return nil, fmt.Errorf("generate main.tf: internal error: incorrect remote state type")
+		}
+		hcltools.ReplaceStingMarkerInBody(helmBody, hash, refStr)
+	}
 	return f.Bytes(), nil
 }
 
@@ -116,8 +115,8 @@ func (m *Module) ReadConfig(spec map[string]interface{}, infra *project.Infrastr
 		if !check {
 			return fmt.Errorf("read module config: 'values' have unknown type: %v", err)
 		}
-		m.valuesFilesList = [][]byte{}
-		log.Warnf("%v", ok)
+		m.valuesFilesList = []string{}
+		//log.Warnf("%v", ok)
 
 		for _, valuesCat := range valuesCatList {
 			valuesCatMap, check := valuesCat.(map[string]interface{})
@@ -154,7 +153,7 @@ func (m *Module) ReadConfig(spec map[string]interface{}, infra *project.Infrastr
 				return fmt.Errorf("read module config: unmarshal values file: ", err.Error())
 			}
 			m.valuesYAML = append(m.valuesYAML, vYAML)
-			m.valuesFilesList = append(m.valuesFilesList, values)
+			m.valuesFilesList = append(m.valuesFilesList, string(values))
 		}
 	}
 	pv, ok := spec["provider_version"].(string)
@@ -174,6 +173,14 @@ func (m *Module) ReplaceMarkers() error {
 	if err != nil {
 		return err
 	}
+	err = project.ScanMarkers(m.valuesFilesList, m.RemoteStatesScanner, m)
+	if err != nil {
+		return err
+	}
+	err = project.ScanMarkers(m.valuesFilesList, m.YamlBlockMarkerScanner, m)
+	if err != nil {
+		return err
+	}
 	err = project.ScanMarkers(m.helmOpts, m.RemoteStatesScanner, m)
 	if err != nil {
 		return err

diff --git a/pkg/modules/terraform/helm/state.go b/pkg/modules/terraform/helm/state.go
@@ -15,7 +15,7 @@ type State struct {
 	ModType    string      `json:"type"`
 	HelmOpts   interface{} `json:"helm_opts,omitempty"`
 	Sets       interface{} `json:"sets,omitempty"`
-	Values     [][]byte    `json:"values,omitempty"`
+	Values     []string    `json:"values,omitempty"`
 }
 
 func (m *Module) GetState() interface{} {
@@ -37,7 +37,7 @@ type StateDiff struct {
 	Source   string      `json:"source"`
 	HelmOpts interface{} `json:"helm_opts,omitempty"`
 	Sets     interface{} `json:"sets,omitempty"`
-	Values   [][]byte    `json:"values,omitempty"`
+	Values   []string    `json:"values,omitempty"`
 }
 
 func (m *Module) GetDiffData() interface{} {

diff --git a/pkg/modules/terraform/kubernetes/main.go b/pkg/modules/terraform/kubernetes/main.go
@@ -74,28 +74,24 @@ func (m *Module) genMainCodeBlock() ([]byte, error) {
 		}
 
 		moduleBody.SetAttributeValue("manifest", ctyVal)
-		depMarkers, ok := m.ProjectPtr().Markers[common.RemoteStateMarkerCatName]
-		if ok {
-			for hash, marker := range depMarkers.(map[string]*project.Dependency) {
-				if marker.Module == nil {
-					continue
-				}
-				remoteStateRef := fmt.Sprintf("data.terraform_remote_state.%s-%s.outputs.%s", marker.Module.InfraName(), marker.Module.Name(), marker.Output)
-				hcltools.ReplaceStingMarkerInBody(moduleBody, hash, remoteStateRef)
+		for hash, m := range m.Markers() {
+			marker, ok := m.(*project.Dependency)
+			refStr := common.DependencyToRemoteStateRef(marker)
+			if !ok {
+				return nil, fmt.Errorf("generate main.tf: internal error: incorrect remote state type")
 			}
+			hcltools.ReplaceStingMarkerInBody(moduleBody, hash, refStr)
 		}
 	}
-	depMarkers, ok := m.ProjectPtr().Markers[common.RemoteStateMarkerCatName]
-	if ok {
-		for hash, marker := range depMarkers.(map[string]*project.Dependency) {
-			if marker.Module == nil {
-				continue
-			}
-			remoteStateRef := fmt.Sprintf("data.terraform_remote_state.%s-%s.outputs.%s", marker.Module.InfraName(), marker.Module.Name(), marker.Output)
-			hcltools.ReplaceStingMarkerInBody(providerBody, hash, remoteStateRef)
+
+	for hash, m := range m.Markers() {
+		marker, ok := m.(*project.Dependency)
+		refStr := common.DependencyToRemoteStateRef(marker)
+		if !ok {
+			return nil, fmt.Errorf("generate main.tf: internal error: incorrect remote state type")
 		}
+		hcltools.ReplaceStingMarkerInBody(providerBody, hash, refStr)
 	}
-
 	return f.Bytes(), nil
 }
 

diff --git a/pkg/modules/terraform/printer/main.go b/pkg/modules/terraform/printer/main.go
@@ -34,6 +34,7 @@ func (m *Module) genMainCodeBlock() ([]byte, error) {
 		dataBody.SetAttributeValue("value", hclVal)
 		for hash, m := range m.Markers() {
 			marker, ok := m.(*project.Dependency)
+			// log.Warnf("kubernetes marker printer: %v", marker)
 			refStr := common.DependencyToRemoteStateRef(marker)
 			if !ok {
 				return nil, fmt.Errorf("generate main.tf: internal error: incorrect remote state type")

diff --git a/pkg/modules/terraform/tf_module/main.go b/pkg/modules/terraform/tf_module/main.go
@@ -60,7 +60,6 @@ func (m *Module) genMainCodeBlock() ([]byte, error) {
 			return nil, fmt.Errorf("generate main.tf: internal error: incorrect remote state type")
 		}
 		refStr := common.DependencyToRemoteStateRef(marker)
-		// log.Warnf("module markers:", marker.Module.Key())
 		hcltools.ReplaceStingMarkerInBody(moduleBody, hash, refStr)
 	}
 	return f.Bytes(), nil

diff --git a/pkg/project/ui/generator.go b/pkg/project/ui/generator.go
@@ -332,7 +332,7 @@ func getDirSubCats(path string, tFS TmplFS) (cats []string, err error) {
 func getTemplateSpec(catDir, templateName string, tFS TmplFS) (res templateConfSpec, err error) {
 	rs := templateConfSpec{}
 	confFileName := filepath.Join(catDir, templateName, "config.yaml")
-	log.Warn(confFileName)
+	// log.Warn(confFileName)
 	configRaw, err := tFS.ReadFile(confFileName)
 	if err != nil {
 		err = fmt.Errorf("reading template: internal error (file not found %v): %v", confFileName, err.Error())