Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix: terragunt should call 'providers schema -json' #205

Merged
merged 1 commit into from
Oct 28, 2024
Merged

Fix: terragunt should call 'providers schema -json' #205

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 5 additions & 45 deletions internal/tfschema/tfschema.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,8 @@ import (
"encoding/json"
"errors"
"fmt"
"io/fs"
"log"
"os"
"os/exec"
"path/filepath"
"strings"
"sync"

Expand Down Expand Up @@ -90,36 +87,6 @@ type TfSchemaAttribute struct {
Type string
}

func getFolderPathHelper(dir string, suffix string) string {
ret := dir
found := false

filepath.WalkDir(dir, func(path string, d fs.DirEntry, err error) error {
if found || err != nil {
return filepath.SkipDir
}

if strings.HasSuffix(path, suffix) {
ret = strings.TrimSuffix(path, suffix)
found = true
}

return nil
})

return ret
}

func getTerragruntCacheFolderPath(dir string) string {
return getFolderPathHelper(dir, "/.terragrunt-cache")
}

func getTerragruntPluginPath(dir string) string {
dir += "/.terragrunt-cache"

return getFolderPathHelper(dir, "/.terraform")
}

func extractProviderNameFromResourceType(resourceType string) (string, error) {
s := strings.SplitN(resourceType, "_", 2)
if len(s) < 2 {
Expand All @@ -145,17 +112,6 @@ func detectProviderName(resource hclwrite.Block) (string, error) {
}

func getResourceSchema(resourceType string, resource hclwrite.Block, dir string, iacType common.IACType, defaultToTerraform bool) (*ResourceSchema, error) {
if iacType == common.Terragrunt {
// try to locate a .terragrunt-cache cache folder.
dir = getTerragruntCacheFolderPath(dir)

// which mode of terragrunt it is (with or without cache folder).
if _, err := os.Stat(dir + "/.terragrunt-cache"); err == nil {
// try to locate a .terrafrom cache folder within the .terragrunt-cache cache folder.
dir = getTerragruntPluginPath(dir)
}
}

providerSchemasMapLock.Lock()
defer providerSchemasMapLock.Unlock()

Expand All @@ -164,8 +120,12 @@ func getResourceSchema(resourceType string, resource hclwrite.Block, dir string,
providerSchemas = &ProviderSchemas{}

// Use tofu by default (if it exists).

name := "terraform"
if _, err := exec.LookPath("tofu"); !defaultToTerraform && err == nil {
// For terragrunt - use terragrunt.
if iacType == common.Terragrunt {
name = "terragrunt"
} else if _, err := exec.LookPath("tofu"); !defaultToTerraform && err == nil {
name = "tofu"
}

Expand Down
Loading