[Export] Removed flag import-state-v2 - version 2 of import-state is now default

Author: Reinhard-Pilz-Dynatrace

dynatrace/export.go

@@ -76,7 +76,7 @@ func runExport() (err error) {
 		fmt.Println("Executing 'terraform init'")
 		defer func() {
 			cmd.Wait()
-			if environment.Flags.ImportState || environment.Flags.ImportStateV2 {
+			if environment.Flags.ImportStateV2 {
 				fmt.Println("Importing Resources into Terraform State ...")
 				if err = environment.ExecuteImport(); err != nil {
 					return

dynatrace/export/environment.go

@@ -20,7 +20,6 @@ package export
 import (
 	"bytes"
 	"encoding/json"
-	"errors"
 	"fmt"
 	"os"
 	"os/exec"
@@ -522,28 +521,13 @@ func (me *Environment) WriteMainFile() error {
 }
 
 func (me *Environment) ExecuteImport() error {
-	if me.Flags.ImportState {
-		return me.executeImportV1()
-	}
 	if me.Flags.ImportStateV2 {
 		return me.executeImportV2()
 	}
 
 	return nil
 }
 
-func (me *Environment) executeImportV1() error {
-	for _, module := range me.Modules {
-		if shutdown.System.Stopped() {
-			return errors.New("import was stopped")
-		}
-		if err := module.ExecuteImportV1(); err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
 type state struct {
 	Version           int         `json:"version"`
 	Terraform_version string      `json:"terraform_version"`

dynatrace/export/initialize.go

@@ -181,10 +181,12 @@ func createFlags() (flags Flags, tailArgs []string) {
 	linkArg := flag.Bool("link", false, "enable hard links for .requires_attention and .flawed")
 	preview := flag.Bool("preview", false, "preview resource statistics for environment export")
 	flat := flag.Bool("flat", false, "prevent creating a module structure")
+	importStateV2 := flag.Bool("import-state-v2", false, "deprecated - use `import-state`")
 	importState := flag.Bool("import-state", false, "automatically initialize the terraform module and import downloaded resources to the state")
-	importStateV2 := flag.Bool("import-state-v2", false, "automatically initialize the terraform module and import downloaded resources to the state")
 	exclude := flag.Bool("exclude", false, "exclude specified resources")
 
+	importStateFlag := (importState != nil && *importState) || (importStateV2 != nil && *importStateV2)
+
 	flag.Parse()
 
 	return Flags{
@@ -195,8 +197,7 @@ func createFlags() (flags Flags, tailArgs []string) {
 		FlagHardLinks:       *linkArg,
 		FlagPreviewOnly:     *preview,
 		Flat:                *flat,
-		ImportState:         *importState,
-		ImportStateV2:       *importStateV2,
+		ImportStateV2:       importStateFlag,
 		Exclude:             *exclude,
 		DataSources:         *dataSourceArg,
 	}, flag.Args()
@@ -226,7 +227,6 @@ type Flags struct {
 	FlagHardLinks       bool
 	FlagPreviewOnly     bool
 	Flat                bool
-	ImportState         bool
 	ImportStateV2       bool
 	Exclude             bool
 	DataSources         bool

dynatrace/export/module.go

@@ -31,7 +31,6 @@ import (
 
 	"github.com/dynatrace-oss/terraform-provider-dynatrace/dynatrace/api"
 	"github.com/dynatrace-oss/terraform-provider-dynatrace/dynatrace/settings"
-	"github.com/dynatrace-oss/terraform-provider-dynatrace/dynatrace/settings/services/cache"
 	"github.com/dynatrace-oss/terraform-provider-dynatrace/dynatrace/shutdown"
 	"github.com/dynatrace-oss/terraform-provider-dynatrace/provider/version"
 	"github.com/spf13/afero"
@@ -666,85 +665,6 @@ func (me *Module) Discover() error {
 	return nil
 }
 
-func (me *Module) ExecuteImportV1() (err error) {
-	if !me.Environment.Flags.ImportState {
-		return nil
-	}
-	if me.Status.IsOneOf(ModuleStati.Imported, ModuleStati.Erronous, ModuleStati.Untouched) {
-		return nil
-	}
-	referencedResourceTypes := me.GetReferencedResourceTypes()
-	if len(referencedResourceTypes) > 0 {
-		for _, resourceType := range referencedResourceTypes {
-			if err := me.Environment.Module(resourceType).ExecuteImportV1(); err != nil {
-				return err
-			}
-		}
-	}
-	length := 0
-	for _, resource := range me.Resources {
-		if !resource.Status.IsOneOf(ResourceStati.PostProcessed) {
-			continue
-		}
-		length++
-	}
-	fmt.Printf("  - %s (0 of %d)", me.Type, length)
-	exePath, _ := exec.LookPath("terraform")
-	const ClearLine = "\033[2K"
-	idx := 0
-	for _, resource := range me.Resources {
-		if !resource.Status.IsOneOf(ResourceStati.PostProcessed) {
-			continue
-		}
-		statement := fmt.Sprintf("module.%s.%s.%s", me.Type.Trim(), me.Type, resource.UniqueName)
-		if me.Environment.Flags.Flat {
-			statement = fmt.Sprintf("%s.%s", me.Type, resource.UniqueName)
-		}
-		// fmt.Println("terraform", "import", statement, resource.ID, me.Environment.OutputFolder)
-		cmd := exec.Command(
-			exePath,
-			"import",
-			"-lock=false",
-			"-input=false",
-			"-no-color",
-			statement,
-			resource.ID,
-		)
-		var outb, errb bytes.Buffer
-		cmd.Stdout = &outb
-		cmd.Stderr = &errb
-		cmd.Dir = me.Environment.OutputFolder
-		var cacheFolder string
-		if cacheFolder, err = filepath.Abs(cache.GetCacheFolder()); err != nil {
-			return err
-		}
-		cmd.Env = []string{
-			// "TF_LOG_PROVIDER=INFO",
-			"DYNATRACE_ENV_URL=" + me.Environment.Credentials.URL,
-			"DYNATRACE_API_TOKEN=" + me.Environment.Credentials.Token,
-			"DT_CACHE_FOLDER=" + cacheFolder,
-			"CACHE_OFFLINE_MODE=true",
-			"DT_CACHE_DELETE_ON_LAUNCH=false",
-			"DT_NO_CACHE_CLEANUP=true",
-			"DT_TERRAFORM_IMPORT=true",
-		}
-		cmd.Start()
-		if err := cmd.Wait(); err != nil {
-			fmt.Println("out:", outb.String())
-			fmt.Println("err:", errb.String())
-		}
-		idx++
-		fmt.Print(ClearLine)
-		fmt.Print("\r")
-		fmt.Printf("  - %s (%d of %d)", me.Type, idx, length)
-	}
-	fmt.Print(ClearLine)
-	fmt.Print("\r")
-	fmt.Printf("  - %s\n", me.Type)
-	me.Status = ModuleStati.Imported
-	return nil
-}
-
 type resources []resource
 
 type resource struct {