Fixed escaping dollar signs

Author: mcasperson

cmd/internal/converters/channel_converter.go

@@ -105,7 +105,7 @@ func (c ChannelConverter) toHcl(channel octopus2.Channel, recursive bool, terraf
 			for t, r := range terraformDependencies {
 				if t != "" && r != "" {
 					dependency := dependencies.GetResource(t, r)
-					dependency = hcl.RemoveInterpolation(dependency)
+					dependency = hcl.RemoveId(hcl.RemoveInterpolation(dependency))
 					manualDependencies = append(manualDependencies, dependency)
 				}
 			}

cmd/internal/converters/tenant_converter.go

@@ -137,7 +137,7 @@ func (c TenantConverter) toHcl(tenant octopus2.Tenant, recursive bool, dependenc
 		for resourceType, terraformDependencies := range tagSetDependencies {
 			for _, terraformDependency := range terraformDependencies {
 				dependency := dependencies.GetResource(resourceType, terraformDependency)
-				dependency = hcl.RemoveInterpolation(dependency)
+				dependency = hcl.RemoveId(hcl.RemoveInterpolation(dependency))
 				dependsOn = append(dependsOn, dependency)
 			}
 		}

cmd/internal/converters/variable_set_converter.go

@@ -222,7 +222,7 @@ func (c VariableSetConverter) toHcl(resource octopus2.VariableSet, recursive boo
 			for resourceType, terraformDependencies := range tagSetDependencies {
 				for _, terraformDependency := range terraformDependencies {
 					dependency := dependencies.GetResource(resourceType, terraformDependency)
-					hcl.RemoveInterpolation(dependency)
+					dependency = hcl.RemoveId(hcl.RemoveInterpolation(dependency))
 					dependsOn = append(dependsOn, dependency)
 				}
 			}

cmd/internal/hcl/unquoted_attribute_writer.go

@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"github.com/hashicorp/hcl2/hcl"
 	"github.com/hashicorp/hcl2/hclwrite"
+	"regexp"
 	"strings"
 )
 
@@ -28,7 +29,7 @@ func extractJsonAsMap(properties map[string]string) string {
 	output := "{"
 
 	for key, value := range properties {
-		output += "\n        \"" + key + "\" = " + jsonStringToHcl(fmt.Sprint(value))
+		output += "\n        \"" + key + "\" = " + jsonStringToHcl(value)
 	}
 
 	output += "\n      }"
@@ -105,3 +106,9 @@ func RemoveInterpolation(value string) string {
 	value = strings.Replace(value, "}", "", -1)
 	return value
 }
+
+func RemoveId(value string) string {
+	regex := regexp.MustCompile(`\.id$`)
+	value = regex.ReplaceAllString(value, "")
+	return value
+}

cmd/internal/strutil/string_util.go

@@ -1,6 +1,7 @@
 package strutil
 
 import (
+	"regexp"
 	"strconv"
 	"strings"
 )
@@ -92,8 +93,9 @@ func ParseBoolPointer(input *string) *bool {
 
 func UnEscapeDollar(fileMap map[string]string) map[string]string {
 	// Unescape dollar signs because of https://github.com/hashicorp/hcl/issues/323
+	regex := regexp.MustCompile(`"\$\$\{(.*?)\}"`)
 	for k, v := range fileMap {
-		fileMap[k] = strings.ReplaceAll(v, "$${", "${")
+		fileMap[k] = regex.ReplaceAllString(v, "\"${$1}\"")
 	}
 
 	return fileMap

cmd/octoterra_test.go

@@ -3403,3 +3403,46 @@ func TestProjectWithGitUsernameExport(t *testing.T) {
 		return nil
 	})
 }
+
+// TestProjectWithDollarSignsExport verifies that a project can be reimported with the correct git settings
+func TestProjectWithDollarSignsExport(t *testing.T) {
+	performTest(t, func(t *testing.T, container *octopusContainer) error {
+		// Arrange
+		newSpaceId, err := arrange(t, container, "../test/terraform/40-escapedollar", []string{})
+
+		if err != nil {
+			return err
+		}
+
+		// Act
+		recreatedSpaceId, err := act(t, container, newSpaceId, []string{})
+
+		if err != nil {
+			return err
+		}
+
+		// Assert
+		octopusClient := createClient(container, recreatedSpaceId)
+
+		collection := octopus.GeneralCollection[octopus.Project]{}
+		err = octopusClient.GetAllResources("Projects", &collection)
+
+		if err != nil {
+			return err
+		}
+
+		resourceName := "Test"
+		found := false
+		for _, v := range collection.Items {
+			if v.Name == resourceName {
+				found = true
+			}
+		}
+
+		if !found {
+			t.Fatal("Space must have an project called \"" + resourceName + "\"")
+		}
+
+		return nil
+	})
+}

test/terraform/40-escapedollar/space_creation/config.tf

@@ -0,0 +1,5 @@
+terraform {
+  required_providers {
+    octopusdeploy = { source = "OctopusDeployLabs/octopusdeploy", version = "0.10.1" }
+  }
+}

test/terraform/40-escapedollar/space_creation/provider.tf

@@ -0,0 +1,4 @@
+provider "octopusdeploy" {
+  address = "${var.octopus_server}"
+  api_key = "${var.octopus_apikey}"
+}

test/terraform/40-escapedollar/space_creation/provider_vars.tf

@@ -0,0 +1,18 @@
+variable "octopus_server" {
+  type        = string
+  nullable    = false
+  sensitive   = false
+  description = "The URL of the Octopus server e.g. https://myinstance.octopus.app."
+}
+variable "octopus_apikey" {
+  type        = string
+  nullable    = false
+  sensitive   = true
+  description = "The API key used to access the Octopus server. See https://octopus.com/docs/octopus-rest-api/how-to-create-an-api-key for details on creating an API key."
+}
+variable "octopus_space_id" {
+  type        = string
+  nullable    = false
+  sensitive   = false
+  description = "The space ID to populate"
+}

test/terraform/40-escapedollar/space_creation/space.tf

@@ -0,0 +1,19 @@
+resource "octopusdeploy_space" "octopus_space_test" {
+  name                  = "${var.octopus_space_name}"
+  is_default            = false
+  is_task_queue_stopped = false
+  description           = "My test space"
+  space_managers_teams  = ["teams-administrators"]
+}
+
+output "octopus_space_id" {
+  value = octopusdeploy_space.octopus_space_test.id
+}
+
+variable "octopus_space_name" {
+  type        = string
+  nullable    = false
+  sensitive   = false
+  description = "The name of the new space"
+  default     = "Test"
+}