Clean up vestiges of goimports (#15652)

Author: SirGitsalot

docs/content/develop/set-up-dev-environment.md

@@ -34,10 +34,6 @@ development environment.
    # Add Go binaries to PATH
    export PATH=$PATH:$(go env GOPATH)/bin
    ```
-1. Install goimports
-   ```bash
-   go install golang.org/x/tools/cmd/goimports@latest
-   ```
 1. [Install terraform](https://developer.hashicorp.com/terraform/tutorials/aws-get-started/install-cli)
 1. Clone the `magic-modules` repository
    ```bash
@@ -57,8 +53,6 @@ development environment.
    ```
    Check for go in path...
       found!
-   Check for goimports in path...
-      found!
    Check for git in path...
       found!
    Check for terraform in path...

mmv1/main.go

@@ -40,8 +40,6 @@ var providerFlag = flag.String("provider", "", "optional provider name. If speci
 
 var openapiGenerate = flag.Bool("openapi-generate", false, "Generate MMv1 YAML from openapi directory (Experimental)")
 
-var showImportDiffsFlag = flag.Bool("show-import-diffs", false, "write go import diffs to stdout")
-
 func main() {
 
 	// Handle all flags in main. Other functions must not access flag values directly.
@@ -58,10 +56,10 @@ func main() {
 		return
 	}
 
-	GenerateProducts(*productFlag, *resourceFlag, *providerFlag, *versionFlag, *outputPathFlag, *overrideDirectoryFlag, !*doNotGenerateCode, !*doNotGenerateDocs, *showImportDiffsFlag)
+	GenerateProducts(*productFlag, *resourceFlag, *providerFlag, *versionFlag, *outputPathFlag, *overrideDirectoryFlag, !*doNotGenerateCode, !*doNotGenerateDocs)
 }
 
-func GenerateProducts(product, resource, providerName, version, outputPath, overrideDirectory string, generateCode, generateDocs, showImportDiffs bool) {
+func GenerateProducts(product, resource, providerName, version, outputPath, overrideDirectory string, generateCode, generateDocs bool) {
 	if version == "" {
 		log.Printf("No version specified, assuming ga")
 		version = "ga"
@@ -110,8 +108,6 @@ func GenerateProducts(product, resource, providerName, version, outputPath, over
 	if generateCode {
 		providerToGenerate.CompileCommonFiles(outputPath, productsForVersion, "")
 	}
-
-	provider.FixImports(outputPath, showImportDiffs)
 }
 
 // GenerateProduct generates code and documentation for a product

mmv1/provider/template_data.go

@@ -15,15 +15,10 @@ package provider
 
 import (
 	"bytes"
-	"errors"
 	"fmt"
 	"go/format"
-	"log"
 	"os"
-	"os/exec"
 	"path/filepath"
-	"strings"
-	"sync"
 	"text/template"
 
 	"github.com/GoogleCloudPlatform/magic-modules/mmv1/api"
@@ -46,8 +41,6 @@ var BETA_VERSION = "beta"
 var ALPHA_VERSION = "alpha"
 var PRIVATE_VERSION = "private"
 
-var goimportFiles sync.Map
-
 func NewTemplateData(outputFolder string, versionName string) *TemplateData {
 	td := TemplateData{OutputFolder: outputFolder, VersionName: versionName}
 	return &td
@@ -342,9 +335,6 @@ func (td *TemplateData) GenerateFile(filePath, templatePath string, input any, g
 		} else {
 			sourceByte = formattedByte
 		}
-		if !strings.Contains(templatePath, "third_party/terraform") {
-			goimportFiles.Store(filePath, struct{}{})
-		}
 	}
 
 	err = os.WriteFile(filePath, sourceByte, 0644)
@@ -353,45 +343,6 @@ func (td *TemplateData) GenerateFile(filePath, templatePath string, input any, g
 	}
 }
 
-func FixImports(outputPath string, dumpDiffs bool) {
-	log.Printf("Fixing go import paths")
-
-	baseArgs := []string{"-w"}
-	if dumpDiffs {
-		baseArgs = []string{"-d", "-w"}
-	}
-
-	// -w and -d are mutually exclusive; if dumpDiffs is requested we need to run twice.
-	for _, base := range baseArgs {
-		hasFiles := false
-		args := []string{base}
-		goimportFiles.Range(func(filePath, _ any) bool {
-			p, err := filepath.Rel(outputPath, filePath.(string))
-			if err != nil {
-				log.Fatal(err)
-			}
-			args = append(args, p)
-			hasFiles = true
-			return true
-		})
-
-		if hasFiles {
-			log.Printf("Fixing go import paths")
-			cmd := exec.Command("echo", args...)
-			cmd.Dir = outputPath
-			cmd.Stdout = os.Stdout
-			cmd.Stderr = os.Stderr
-			if err := cmd.Run(); err != nil {
-				var exitErr *exec.ExitError
-				if errors.As(err, &exitErr) && len(exitErr.Stderr) > 0 {
-					glog.Error(string(exitErr.Stderr))
-				}
-				log.Fatal(err)
-			}
-		}
-	}
-}
-
 type TestInput struct {
 	Res                  api.Resource
 	ImportPath           string

scripts/doctor

@@ -53,14 +53,6 @@ else
     fi
 fi
 
-count_in_path "goimports"
-if [ $found -eq 0 ]; then
-    exitcode=1
-    warn "yel" "   goimports not found. Run 'go install golang.org/x/tools/cmd/goimports@latest' to install it."
-else
-    warn "grn" "   found!"
-fi
-
 count_in_path "git"
 if [ $found -eq 0 ]; then
     exitcode=1