Fix template issues for managed stores

Author: mvantellingen

CHANGELOG.md

@@ -1,3 +1,7 @@
+# 0.1.5 (2023-02-02)
+ - Fix newline error in template when rendering store variables
+ - Remove duplicate `enabled` property in the `messages` block
+
 # 0.1.4 (2023-02-02)
  - Fix template error when using managed stores
 

internal/plugin.go

@@ -169,19 +169,18 @@ func terraformRenderComponentVars(cfg *SiteConfig, componentCfg *ComponentConfig
 		{{ renderProperty "ct_api_url" .Site.APIURL }}
 		{{ renderProperty "ct_auth_url" .Site.TokenURL }}
 		ct_stores = {
-			{{ $component := .Component -}}
 			{{ range $store := .Site.Stores -}}
 				{{ $store.Key }} =  {
 					{{ renderProperty "key" $store.Key }}
 					variables = {
-						{{  range $key, $value := index $component.StoreVariables $store.Key -}}
-						{{ renderProperty $key $value -}}
-						{{- end -}}
+						{{  range $key, $value := index $.Component.StoreVariables $store.Key }}
+						{{ renderProperty $key $value }}
+						{{ end }}
 					}
 					secrets = {
-						{{  range $key, $value := index $component.StoreSecrets $store.Key -}}
+						{{  range $key, $value := index $.Component.StoreSecrets $store.Key }}
 						{{ renderProperty $key $value }}
-						{{- end -}}
+						{{ end }}
 					}
 				}
 			{{ end }}

internal/templates/main.tf.gtpl

@@ -15,7 +15,6 @@ resource "commercetools_project_settings" "project" {
     {{ renderOptionalProperty "currencies" .Config.ProjectSettings.Currencies }}
     {{ renderOptionalProperty "languages" .Config.ProjectSettings.Languages }}
     messages {{ if hasPrefix .ProviderVersion "0" }}= {{ end }}{
-        enabled = {{ .Config.ProjectSettings.MessagesEnabled }}
         {{ renderProperty "enabled" .Config.ProjectSettings.MessagesEnabled }}
     }
     {{ renderProperty "enable_search_index_products" .Config.ProjectSettings.EnableSearchIndexProducts }}