Fix JSON output variable and provider file (GoogleCloudPlatform#910)

* fix json output format

* lint

cmd/import.go

@@ -304,9 +304,9 @@ func printService(provider terraformutils.ProviderGenerator, serviceName string,
 					}
 					variables["data"]["terraform_remote_state"][k] = map[string]interface{}{
 						"backend": "local",
-						"config": [1]interface{}{map[string]interface{}{
+						"config": map[string]interface{}{
 							"path": strings.Repeat("../", strings.Count(path, "/")) + strings.ReplaceAll(path, serviceName, k) + "terraform.tfstate",
-						}},
+						},
 					}
 				}
 			}

terraformutils/hcl.go

@@ -207,16 +207,18 @@ func terraform12Adjustments(formatted []byte, mapsObjects map[string]struct{}) [
 
 func terraform13Adjustments(formatted []byte) []byte {
 	s := string(formatted)
+	requiredProvidersRe := regexp.MustCompile("required_providers \".*\" {")
 	oldRequiredProviders := "\"required_providers\""
 	newRequiredProviders := "required_providers"
 	lines := strings.Split(s, "\n")
-	providerRequirementDefinition := false
 	for i, line := range lines {
-		if providerRequirementDefinition {
-			line = strings.ReplaceAll(line, " {", " = {")
+		if requiredProvidersRe.MatchString(line) {
+			parts := strings.Split(strings.TrimSpace(line), " ")
+			provider := strings.ReplaceAll(parts[1], "\"", "")
+			lines[i] = "\t" + newRequiredProviders + " {"
+			lines[i+1] = "\t\t" + provider + " = {\n\t" + lines[i+1] + "\n\t\t}"
 		}
-		providerRequirementDefinition = strings.Contains(line, newRequiredProviders)
-		lines[i] = strings.Replace(line, oldRequiredProviders, newRequiredProviders, 1)
+		lines[i] = strings.Replace(lines[i], oldRequiredProviders, newRequiredProviders, 1)
 	}
 	s = strings.Join(lines, "\n")
 	return []byte(s)

terraformutils/terraformoutput/hcl.go

@@ -33,9 +33,9 @@ func OutputHclFiles(resources []terraformutils.Resource, provider terraformutils
 	providerData := provider.GetProviderData()
 	providerData["terraform"] = map[string]interface{}{
 		"required_providers": []map[string]interface{}{{
-			provider.GetName(): []map[string]interface{}{{
+			provider.GetName(): map[string]interface{}{
 				"version": providerwrapper.GetProviderVersion(provider.GetName()),
-			}},
+			},
 		}},
 	}