diff --git a/internal/exec/vendor_utils.go b/internal/exec/vendor_utils.go index 63abbc59c..bb9d0b83d 100644 --- a/internal/exec/vendor_utils.go +++ b/internal/exec/vendor_utils.go @@ -10,6 +10,7 @@ import ( "github.com/bmatcuk/doublestar/v4" tea "github.com/charmbracelet/bubbletea" + l "github.com/charmbracelet/log" cp "github.com/otiai10/copy" "github.com/samber/lo" "github.com/spf13/cobra" @@ -634,7 +635,7 @@ func generateSkipFunction(atmosConfig schema.AtmosConfiguration, tempDir string, } // If 'included_paths' is not provided, include all files that were not excluded - u.LogTrace(fmt.Sprintf("Including '%s'\n", u.TrimBasePathFromPath(tempDir+"/", src))) + l.Debug("Including ", "file", u.TrimBasePathFromPath(tempDir+"/", src)) return false, nil } } diff --git a/tests/snapshots/TestCLICommands_atmos_vendor_pull_custom_detector_credentials_leakage.stderr.golden b/tests/snapshots/TestCLICommands_atmos_vendor_pull_custom_detector_credentials_leakage.stderr.golden index 0da2d9d21..5e4d8485d 100644 --- a/tests/snapshots/TestCLICommands_atmos_vendor_pull_custom_detector_credentials_leakage.stderr.golden +++ b/tests/snapshots/TestCLICommands_atmos_vendor_pull_custom_detector_credentials_leakage.stderr.golden @@ -7,164 +7,87 @@ WARN No TTY detected. Falling back to basic output. This can happen when no term DEBU CustomGitDetector.Detect called DEBU Defaulting to https scheme url="https://github.com/cloudposse/terraform-null-label.git?ref=0.25.0" DEBU Reading config param InjectGithubToken=true -DEBU Injected token env=ATMOS_GITHUB_TOKEN url="https://xxx:xxx@github.com/cloudposse/terraform-null-label.git?ref=0.25.0" -DEBU Final URL final_url="git::https://xxx:xxx@github.com/cloudposse/terraform-null-label.git?depth=1&ref=0.25.0" -DEBU Including '.github' - -DEBU Including '.github/CODEOWNERS' - -DEBU Including '.github/ISSUE_TEMPLATE' - -DEBU Including '.github/ISSUE_TEMPLATE/bug_report.md' - -DEBU Including '.github/ISSUE_TEMPLATE/config.yml' - -DEBU Including '.github/ISSUE_TEMPLATE/feature_request.md' - -DEBU Including '.github/ISSUE_TEMPLATE/question.md' - -DEBU Including '.github/PULL_REQUEST_TEMPLATE.md' - -DEBU Including '.github/auto-release.yml' - -DEBU Including '.github/workflows' - -DEBU Including '.github/workflows/auto-format.yml' - -DEBU Including '.github/workflows/auto-release.yml' - -DEBU Including '.github/workflows/chatops.yml' - -DEBU Including '.github/workflows/validate-codeowners.yml' - -DEBU Including '.gitignore' - -DEBU Including 'LICENSE' - -DEBU Including 'Makefile' - -DEBU Including 'README.md' - -DEBU Including 'README.yaml' - -DEBU Including 'descriptors.tf' - -DEBU Including 'docs' - -DEBU Including 'docs/targets.md' - -DEBU Including 'docs/terraform.md' - -DEBU Including 'examples' - -DEBU Including 'examples/autoscalinggroup' - -DEBU Including 'examples/autoscalinggroup/.gitignore' - -DEBU Including 'examples/autoscalinggroup/autoscalinggroup.auto.tfvars' - -DEBU Including 'examples/autoscalinggroup/context.tf' - -DEBU Including 'examples/autoscalinggroup/main.tf' - -DEBU Including 'examples/autoscalinggroup/outputs.tf' - -DEBU Including 'examples/autoscalinggroup/versions.tf' - -DEBU Including 'examples/complete' - -DEBU Including 'examples/complete/.gitignore' - -DEBU Including 'examples/complete/compatibility.tf' - -DEBU Including 'examples/complete/complete.auto.tfvars' - -DEBU Including 'examples/complete/context.tf' - -DEBU Including 'examples/complete/descriptors.tf' - -DEBU Including 'examples/complete/label1.tf' - -DEBU Including 'examples/complete/label1t1.tf' - -DEBU Including 'examples/complete/label1t2.tf' - -DEBU Including 'examples/complete/label2.tf' - -DEBU Including 'examples/complete/label3c.tf' - -DEBU Including 'examples/complete/label3n.tf' - -DEBU Including 'examples/complete/label4.tf' - -DEBU Including 'examples/complete/label5.tf' - -DEBU Including 'examples/complete/label6f.tf' - -DEBU Including 'examples/complete/label6t.tf' - -DEBU Including 'examples/complete/label7.tf' - -DEBU Including 'examples/complete/label8d.tf' - -DEBU Including 'examples/complete/label8dcd.tf' - -DEBU Including 'examples/complete/label8dnd.tf' - -DEBU Including 'examples/complete/label8l.tf' - -DEBU Including 'examples/complete/label8n.tf' - -DEBU Including 'examples/complete/label8t.tf' - -DEBU Including 'examples/complete/label8u.tf' - -DEBU Including 'examples/complete/module' - -DEBU Including 'examples/complete/module/compare' - -DEBU Including 'examples/complete/module/compare/compare.tf' - -DEBU Including 'examples/complete/versions.tf' - -DEBU Including 'exports' - -DEBU Including 'exports/context.tf' - -DEBU Including 'main.tf' - -DEBU Including 'outputs.tf' - -DEBU Including 'test' - -DEBU Including 'test/.gitignore' - -DEBU Including 'test/Makefile' - -DEBU Including 'test/Makefile.alpine' - -DEBU Including 'test/src' - -DEBU Including 'test/src/.gitignore' - -DEBU Including 'test/src/Makefile' - -DEBU Including 'test/src/examples_complete_test.go' - -DEBU Including 'test/src/go.mod' - -DEBU Including 'test/src/go.sum' - -DEBU Including 'variables.tf' - -DEBU Including 'versions.tf' - +DEBU Injected token in vendor URL env=ATMOS_GITHUB_TOKEN url="https://xxx:xxx@github.com/cloudposse/terraform-null-label.git?ref=0.25.0" +DEBU normalized SSH vendor URL url="git::https://xxx:xxx@github.com/cloudposse/terraform-null-label.git?depth=1&ref=0.25.0" +DEBU Including file=.github +DEBU Including file=.github/CODEOWNERS +DEBU Including file=.github/ISSUE_TEMPLATE +DEBU Including file=.github/ISSUE_TEMPLATE/bug_report.md +DEBU Including file=.github/ISSUE_TEMPLATE/config.yml +DEBU Including file=.github/ISSUE_TEMPLATE/feature_request.md +DEBU Including file=.github/ISSUE_TEMPLATE/question.md +DEBU Including file=.github/PULL_REQUEST_TEMPLATE.md +DEBU Including file=.github/auto-release.yml +DEBU Including file=.github/workflows +DEBU Including file=.github/workflows/auto-format.yml +DEBU Including file=.github/workflows/auto-release.yml +DEBU Including file=.github/workflows/chatops.yml +DEBU Including file=.github/workflows/validate-codeowners.yml +DEBU Including file=.gitignore +DEBU Including file=LICENSE +DEBU Including file=Makefile +DEBU Including file=README.md +DEBU Including file=README.yaml +DEBU Including file=descriptors.tf +DEBU Including file=docs +DEBU Including file=docs/targets.md +DEBU Including file=docs/terraform.md +DEBU Including file=examples +DEBU Including file=examples/autoscalinggroup +DEBU Including file=examples/autoscalinggroup/.gitignore +DEBU Including file=examples/autoscalinggroup/autoscalinggroup.auto.tfvars +DEBU Including file=examples/autoscalinggroup/context.tf +DEBU Including file=examples/autoscalinggroup/main.tf +DEBU Including file=examples/autoscalinggroup/outputs.tf +DEBU Including file=examples/autoscalinggroup/versions.tf +DEBU Including file=examples/complete +DEBU Including file=examples/complete/.gitignore +DEBU Including file=examples/complete/compatibility.tf +DEBU Including file=examples/complete/complete.auto.tfvars +DEBU Including file=examples/complete/context.tf +DEBU Including file=examples/complete/descriptors.tf +DEBU Including file=examples/complete/label1.tf +DEBU Including file=examples/complete/label1t1.tf +DEBU Including file=examples/complete/label1t2.tf +DEBU Including file=examples/complete/label2.tf +DEBU Including file=examples/complete/label3c.tf +DEBU Including file=examples/complete/label3n.tf +DEBU Including file=examples/complete/label4.tf +DEBU Including file=examples/complete/label5.tf +DEBU Including file=examples/complete/label6f.tf +DEBU Including file=examples/complete/label6t.tf +DEBU Including file=examples/complete/label7.tf +DEBU Including file=examples/complete/label8d.tf +DEBU Including file=examples/complete/label8dcd.tf +DEBU Including file=examples/complete/label8dnd.tf +DEBU Including file=examples/complete/label8l.tf +DEBU Including file=examples/complete/label8n.tf +DEBU Including file=examples/complete/label8t.tf +DEBU Including file=examples/complete/label8u.tf +DEBU Including file=examples/complete/module +DEBU Including file=examples/complete/module/compare +DEBU Including file=examples/complete/module/compare/compare.tf +DEBU Including file=examples/complete/versions.tf +DEBU Including file=exports +DEBU Including file=exports/context.tf +DEBU Including file=main.tf +DEBU Including file=outputs.tf +DEBU Including file=test +DEBU Including file=test/.gitignore +DEBU Including file=test/Makefile +DEBU Including file=test/Makefile.alpine +DEBU Including file=test/src +DEBU Including file=test/src/.gitignore +DEBU Including file=test/src/Makefile +DEBU Including file=test/src/examples_complete_test.go +DEBU Including file=test/src/go.mod +DEBU Including file=test/src/go.sum +DEBU Including file=variables.tf +DEBU Including file=versions.tf INFO ✓ terraform-null-label-basic (0.25.0) -DEBU Including 'terraform-null-label.git' - +DEBU Including file=terraform-null-label.git INFO ✓ terraform-null-label-direct (0.25.0) -DEBU Including 'terraform-null-label.git' - +DEBU Including file=terraform-null-label.git INFO ✓ terraform-null-label-cred (0.25.0) INFO Vendored 3 components.