Skip to content

Fix issue with token not being associated with account, replace hardc… #27

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

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Fix issue with token not being associated with account, replace hardc… #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
70ab762
Fix issue with token not being associated with account, replace hardc…
adrianburusdbt Apr 8, 2025
440a545
Removed hardcoded values
adrianburusdbt Apr 11, 2025
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
11 changes: 6 additions & 5 deletions internal/app/dbtcloud-terraforming/cmd/generate_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,6 @@ var (
"c": "d",
"e": "f",
}

// TODO see if we want to keep this
dbtCloudTestAccountID = "31"
)

func TestGenerate_writeAttrLine(t *testing.T) {
Expand Down Expand Up @@ -80,7 +77,8 @@ func TestGenerate_writeAttrLine(t *testing.T) {
}

func TestGenerate_ResourceNotSupported(t *testing.T) {
output, err := executeCommandC(rootCmd, "--terraform-binary-path", "/opt/homebrew/bin/terraform", "--terraform-install-path", "/Users/bper/dev/dbtcloud-terraforming", "generate", "--resource-types", "notreal")
path := viper.GetString("terraforming-install-path")
output, err := executeCommandC(rootCmd, "--terraform-binary-path", "/opt/homebrew/bin/terraform", "--terraform-install-path", path, "generate", "--resource-types", "notreal")

assert.Nil(t, err)
assert.Equal(t, output, `"notreal" is not yet supported for automatic generation`)
Expand Down Expand Up @@ -155,7 +153,10 @@ func TestResourceGeneration(t *testing.T) {
resourceTypes = []string{}
listLinkedResources = []string{}

output, err = executeCommandC(rootCmd, "--terraform-binary-path", "/opt/homebrew/bin/terraform", "--terraform-install-path", "/Users/bper/dev/dbtcloud-terraforming", "generate", "--resource-types", tc.resourceType, "--account", dbtCloudTestAccountID)
path := viper.GetString("terraforming-install-path")
output, err = executeCommandC(rootCmd, "--terraform-binary-path", "/opt/homebrew/bin/terraform",
"--terraform-install-path", path, "generate", "--resource-types",
tc.resourceType, "--account", viper.GetString("account"))
if err != nil {
log.Fatal(err)
}
Expand Down
5 changes: 3 additions & 2 deletions internal/app/dbtcloud-terraforming/cmd/import_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,8 @@ func TestResourceImport(t *testing.T) {
resourceTypes = []string{}
listLinkedResources = []string{}
listFilterProjects = []int{}
argsGenerate := []string{"--terraform-binary-path", "/opt/homebrew/bin/terraform", "--terraform-install-path", "/Users/bper/dev/dbtcloud-terraforming", "generate", "--resource-types", tc.resourceTypes, "--linked-resource-types", tc.listLinkedResources, "--account", dbtCloudTestAccountID}
path := viper.GetString("terraforming-install-path")
argsGenerate := []string{"--terraform-binary-path", "/opt/homebrew/bin/terraform", "--terraform-install-path", path, "generate", "--resource-types", tc.resourceTypes, "--linked-resource-types", tc.listLinkedResources, "--account", viper.GetString("account")}
combinedArgsGenerate := append(argsGenerate, projectsParam...)
outputGenerate, err := executeCommandC(rootCmd, combinedArgsGenerate...)
if err != nil {
Expand All @@ -92,7 +93,7 @@ func TestResourceImport(t *testing.T) {
resourceTypes = []string{}
listLinkedResources = []string{}
listFilterProjects = []int{}
argsImport := []string{"--terraform-binary-path", "/opt/homebrew/bin/terraform", "--terraform-install-path", "/Users/bper/dev/dbtcloud-terraforming", "import", "--modern-import-block", "--resource-types", tc.resourceTypes, "--linked-resource-types", tc.listLinkedResources, "--account", dbtCloudTestAccountID}
argsImport := []string{"--terraform-binary-path", "/opt/homebrew/bin/terraform", "--terraform-install-path", path, "import", "--modern-import-block", "--resource-types", tc.resourceTypes, "--linked-resource-types", tc.listLinkedResources, "--account", viper.GetString("account")}
combinedArgsImport := append(argsImport, projectsParam...)
outputImport, err = executeCommandC(rootCmd, combinedArgsImport...)
if err != nil {
Expand Down
10 changes: 9 additions & 1 deletion internal/app/dbtcloud-terraforming/cmd/root.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
)

var log = logrus.New()
var zoneID, hostURL, apiToken, accountID, terraformInstallPath, terraformBinaryPath string
var zoneID, hostURL, apiToken, accountID, terraformInstallPath, terraformingInstallPath, terraformBinaryPath string
var listFilterProjects []int
var verbose, useModernImportBlock bool
var dbtCloudClient *dbtcloud.DbtCloudHTTPClient
Expand Down Expand Up @@ -75,6 +75,14 @@ func init() {
log.Fatal(err)
}

rootCmd.PersistentFlags().StringVarP(&terraformingInstallPath, "terraforming-install-path", "", "", "Path to installation [env var: TERRAFORMING_INSTALL_PATH]")
if err = viper.BindPFlag("terraforming-install-path", rootCmd.PersistentFlags().Lookup("terraforming-install-path")); err != nil {
log.Fatal(err)
}
if err = viper.BindEnv("terraforming-install-path", "TERRAFORMING_INSTALL_PATH"); err != nil {
log.Fatal(err)
}

rootCmd.PersistentFlags().IntSliceVarP(&listFilterProjects, "projects", "p", []int{}, "Project IDs to limit the import for. Imports all projects if not set. [env var: DBT_CLOUD_PROJECTS]")
if err = viper.BindPFlag("projects", rootCmd.PersistentFlags().Lookup("projects")); err != nil {
log.Fatal(err)
Expand Down