Skip to content

Commit 4116767

Browse files
Reinhard-Pilz-DynatraceReinhard-Pilz-Dynatrace
committed
Fixed #35 
1 parent 06936e1 commit 4116767

File tree

3 files changed

+16
-15
lines changed

3 files changed

+16
-15
lines changed

‎download.go

+13-12
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ import (
4747
func escape(s string) string {
4848
s = strings.ReplaceAll(s, ":", "_")
4949
s = strings.ReplaceAll(s, "/", "_")
50+
s = strings.ReplaceAll(s, " ", "_")
5051
return s
5152
}
5253

@@ -72,7 +73,7 @@ func importAWSCredentials(targetFolder string, environmentURL string, apiToken s
7273
return err
7374
}
7475
defer file.Close()
75-
if _, err := file.WriteString(fmt.Sprintf("resource \"%s\" \"%s\" {\n", "dynatrace_aws_credentials", config.Label)); err != nil {
76+
if _, err := file.WriteString(fmt.Sprintf("resource \"%s\" \"%s\" {\n", "dynatrace_aws_credentials", escape(config.Label))); err != nil {
7677
return err
7778
}
7879
if err := hcl.Export(config, file); err != nil {
@@ -107,7 +108,7 @@ func importAzureCredentials(targetFolder string, environmentURL string, apiToken
107108
return err
108109
}
109110
defer file.Close()
110-
if _, err := file.WriteString(fmt.Sprintf("resource \"%s\" \"%s\" {\n", "dynatrace_azure_credentials", config.Label)); err != nil {
111+
if _, err := file.WriteString(fmt.Sprintf("resource \"%s\" \"%s\" {\n", "dynatrace_azure_credentials", escape(config.Label))); err != nil {
111112
return err
112113
}
113114
if err := hcl.Export(config, file); err != nil {
@@ -142,7 +143,7 @@ func importK8sCredentials(targetFolder string, environmentURL string, apiToken s
142143
return err
143144
}
144145
defer file.Close()
145-
if _, err := file.WriteString(fmt.Sprintf("resource \"%s\" \"%s\" {\n", "dynatrace_k8s_credentials", config.Label)); err != nil {
146+
if _, err := file.WriteString(fmt.Sprintf("resource \"%s\" \"%s\" {\n", "dynatrace_k8s_credentials", escape(config.Label))); err != nil {
146147
return err
147148
}
148149
if err := hcl.Export(config, file); err != nil {
@@ -176,7 +177,7 @@ func importNotificationConfigs(targetFolder string, environmentURL string, apiTo
176177
return err
177178
}
178179
defer file.Close()
179-
if _, err := file.WriteString(fmt.Sprintf("resource \"%s\" \"%s\" {\n", "dynatrace_notification", config.NotificationConfig.GetName())); err != nil {
180+
if _, err := file.WriteString(fmt.Sprintf("resource \"%s\" \"%s\" {\n", "dynatrace_notification", escape(config.NotificationConfig.GetName()))); err != nil {
180181
return err
181182
}
182183
if err := hcl.ExtExport(config, file); err != nil {
@@ -211,7 +212,7 @@ func importManagementZones(targetFolder string, environmentURL string, apiToken
211212
return err
212213
}
213214
defer file.Close()
214-
if _, err := file.WriteString(fmt.Sprintf("resource \"%s\" \"%s\" {\n", "dynatrace_management_zone", config.Name)); err != nil {
215+
if _, err := file.WriteString(fmt.Sprintf("resource \"%s\" \"%s\" {\n", "dynatrace_management_zone", escape(config.Name))); err != nil {
215216
return err
216217
}
217218
if err := hcl.Export(config, file); err != nil {
@@ -246,7 +247,7 @@ func importAlertingProfiles(targetFolder string, environmentURL string, apiToken
246247
return err
247248
}
248249
defer file.Close()
249-
if _, err := file.WriteString(fmt.Sprintf("resource \"%s\" \"%s\" {\n", "dynatrace_alerting_profile", config.DisplayName)); err != nil {
250+
if _, err := file.WriteString(fmt.Sprintf("resource \"%s\" \"%s\" {\n", "dynatrace_alerting_profile", escape(config.DisplayName))); err != nil {
250251
return err
251252
}
252253
if err := hcl.Export(config, file); err != nil {
@@ -281,7 +282,7 @@ func importAutoTags(targetFolder string, environmentURL string, apiToken string)
281282
return err
282283
}
283284
defer file.Close()
284-
if _, err := file.WriteString(fmt.Sprintf("resource \"%s\" \"%s\" {\n", "dynatrace_autotag", config.Name)); err != nil {
285+
if _, err := file.WriteString(fmt.Sprintf("resource \"%s\" \"%s\" {\n", "dynatrace_autotag", escape(config.Name))); err != nil {
285286
return err
286287
}
287288
if err := hcl.Export(config, file); err != nil {
@@ -316,7 +317,7 @@ func importMaintenance(targetFolder string, environmentURL string, apiToken stri
316317
return err
317318
}
318319
defer file.Close()
319-
if _, err := file.WriteString(fmt.Sprintf("resource \"%s\" \"%s\" {\n", "dynatrace_maintenance_window", config.Name)); err != nil {
320+
if _, err := file.WriteString(fmt.Sprintf("resource \"%s\" \"%s\" {\n", "dynatrace_maintenance_window", escape(config.Name))); err != nil {
320321
return err
321322
}
322323
if err := hcl.Export(config, file); err != nil {
@@ -351,7 +352,7 @@ func importRequestAttributes(targetFolder string, environmentURL string, apiToke
351352
return err
352353
}
353354
defer file.Close()
354-
if _, err := file.WriteString(fmt.Sprintf("resource \"%s\" \"%s\" {\n", "dynatrace_request_attribute", config.Name)); err != nil {
355+
if _, err := file.WriteString(fmt.Sprintf("resource \"%s\" \"%s\" {\n", "dynatrace_request_attribute", escape(config.Name))); err != nil {
355356
return err
356357
}
357358
if err := hcl.Export(config, file); err != nil {
@@ -385,7 +386,7 @@ func importDashboards(targetFolder string, environmentURL string, apiToken strin
385386
return err
386387
}
387388
defer file.Close()
388-
if _, err := file.WriteString(fmt.Sprintf("resource \"%s\" \"%s\" {\n", "dynatrace_dashboard", config.Metadata.Name)); err != nil {
389+
if _, err := file.WriteString(fmt.Sprintf("resource \"%s\" \"%s\" {\n", "dynatrace_dashboard", escape(config.Metadata.Name))); err != nil {
389390
return err
390391
}
391392
if err := hcl.Export(config, file); err != nil {
@@ -438,7 +439,7 @@ func importCustomServicesTech(targetFolder string, environmentURL string, apiTok
438439
return err
439440
}
440441
defer file.Close()
441-
if _, err := file.WriteString(fmt.Sprintf("resource \"%s\" \"%s\" {\n", "dynatrace_dashboard", config.Name)); err != nil {
442+
if _, err := file.WriteString(fmt.Sprintf("resource \"%s\" \"%s\" {\n", "dynatrace_dashboard", escape(config.Name))); err != nil {
442443
return err
443444
}
444445
if err := hcl.Export(config, file); err != nil {
@@ -471,7 +472,7 @@ func importDiskAnomalies(targetFolder string, environmentURL string, apiToken st
471472
return err
472473
}
473474
defer file.Close()
474-
if _, err := file.WriteString(fmt.Sprintf("resource \"%s\" \"%s\" {\n", "dynatrace_disk_anomalies", config.Name)); err != nil {
475+
if _, err := file.WriteString(fmt.Sprintf("resource \"%s\" \"%s\" {\n", "dynatrace_disk_anomalies", escape(config.Name))); err != nil {
475476
return err
476477
}
477478
if err := hcl.ExtExport(config, file); err != nil {

‎go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ require (
1515
github.com/dtcookie/dynatrace/api/config/credentials/azure v1.0.5
1616
github.com/dtcookie/dynatrace/api/config/credentials/kubernetes v1.0.8
1717
github.com/dtcookie/dynatrace/api/config/customservices v1.0.11
18-
github.com/dtcookie/dynatrace/api/config/dashboards v1.0.5
18+
github.com/dtcookie/dynatrace/api/config/dashboards v1.0.8
1919
github.com/dtcookie/dynatrace/api/config/maintenance v1.0.3
2020
github.com/dtcookie/dynatrace/api/config/managementzones v1.0.12
2121
github.com/dtcookie/dynatrace/api/config/notifications v1.0.8

‎go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -117,8 +117,8 @@ github.com/dtcookie/dynatrace/api/config/credentials/kubernetes v1.0.8 h1:O8eQTd
117117
github.com/dtcookie/dynatrace/api/config/credentials/kubernetes v1.0.8/go.mod h1:HCW2teNhidzA/MfG8fF9ZebcIB+XMhFqU5sxYbrIEb8=
118118
github.com/dtcookie/dynatrace/api/config/customservices v1.0.11 h1:pHHhMYMjKU6u5fRSWQ0Jt0cwDp2Y6ir0aBgH8HbFwFg=
119119
github.com/dtcookie/dynatrace/api/config/customservices v1.0.11/go.mod h1:BzwQsu6ZAN0Mo9epplIhDHzfq8QK6/9TW17XlhdI8jM=
120-
github.com/dtcookie/dynatrace/api/config/dashboards v1.0.5 h1:TYG03bJu8F+kKWgKgWoc5/bLHaSgvuoBHySmEnmKx8A=
121-
github.com/dtcookie/dynatrace/api/config/dashboards v1.0.5/go.mod h1:fwFkFe39PjJm7VusVvCO5vfqaDt+X9tN5lzHREvODd8=
120+
github.com/dtcookie/dynatrace/api/config/dashboards v1.0.8 h1:/gKKCKSkNHUUsxta6wBBPk8MRQzA30+1RQxpBu1kx+g=
121+
github.com/dtcookie/dynatrace/api/config/dashboards v1.0.8/go.mod h1:fwFkFe39PjJm7VusVvCO5vfqaDt+X9tN5lzHREvODd8=
122122
github.com/dtcookie/dynatrace/api/config/entityruleengine v1.0.6 h1:L8hgldmv3aWwc5gm7q67t4pgP9rka2cFqj6cUrXOyAE=
123123
github.com/dtcookie/dynatrace/api/config/entityruleengine v1.0.6/go.mod h1:i/35V63o3h5t/8dTq14mzxxKLksAhWjk/+tLFg7ZBCI=
124124
github.com/dtcookie/dynatrace/api/config/maintenance v1.0.3 h1:jszu+dguD/4mzhLxa95iQWWR8cs07YPhDoxDN7eiOzI=

0 commit comments

Comments
 (0)