Skip to content

Commit 740cb68

Browse files
riccardo-angelilliknee-naMark-Kulube
authored
Projects issue #2672 - "Terraform sees inputs as changed when they have not" (#5042)
* typo * typo * terraform * terraform * terraform * terraform * terraform * terraform * terraform * terraform * terraform * terraform * add wait for create and delete * add wait for create and delete * . * fix integration tests * fix integration tests * fix integration tests * fix integration tests * fix integration tests * regenerate * new code generation * new generated code * point to latest sdk * point to latest sdk * adjust test cases and doc * adjust samples * update to latest node sdk * merge with master * Update project_instance.html.markdown Fixing formatting issues * Update project_event_notification.html.markdown * Update README.md * Update variables.tf * Update project_event_notification.html.markdown * new version * terraform * terraform * terraform * terraform * terraform * terraform * terraform * terraform * terraform * terraform * feat: projects graph fragment pattern * align with origin/master * update test cases * restore README.md and versions.tf to master branch * remove duplicated entries * feat: graph fragment pattern poc * feat: restore definition blocks * regenerate the terraform code based on latest YAML * regenerate the terraform code based on latest YAML * regenerate the terraform code based on latest YAML * update doc * update doc * fix test cases * commit generated code * commit fix * commit fix * test cases * test cases * test cases * test cases * updates * upgrade to latest go sdk * update generated doc * update generated code * updated secrets baseline * update code to latest API changes * secrets * fix secrets * update samples with real values * update secrets * update secrets * update generated code to the latest API definition * update secrets baseline * merge with master * merge with master * merge with master * update code to the latest SDK level * address some review comments * address PR comments * address PR comments * update to latest sdk level * update to latest sdk level * update to latest sdk level * merge with master * update to the latest sdk level * format test case * regenerate the code with generator fixes * regenerate code * fix "inputs" and "settings" properties * regenerated doc and samples * fix samples * terraform * terraform * terraform * terraform * terraform * fix marshal strings * secrets * resolve conflicts --------- Co-authored-by: knee-na <[email protected]> Co-authored-by: Mark-Kulube <[email protected]>
1 parent f9222a6 commit 740cb68

File tree

5 files changed

+35
-101
lines changed

5 files changed

+35
-101
lines changed

‎.secrets.baseline‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"files": "go.mod|go.sum|.*.map|^.secrets.baseline$",
44
"lines": null
55
},
6-
"generated_at": "2024-01-16T23:03:03Z",
6+
"generated_at": "2024-01-17T17:15:00Z",
77
"plugins_used": [
88
{
99
"name": "AWSKeyDetector"
@@ -760,23 +760,23 @@
760760
"hashed_secret": "731438016c5ab94431f61820f35e3ae5f8ad6004",
761761
"is_secret": false,
762762
"is_verified": false,
763-
"line_number": 436,
763+
"line_number": 434,
764764
"type": "Secret Keyword",
765765
"verified_result": null
766766
},
767767
{
768768
"hashed_secret": "12da2e35d6b50c902c014f1ab9e3032650368df7",
769769
"is_secret": false,
770770
"is_verified": false,
771-
"line_number": 442,
771+
"line_number": 440,
772772
"type": "Secret Keyword",
773773
"verified_result": null
774774
},
775775
{
776776
"hashed_secret": "813274ccae5b6b509379ab56982d862f7b5969b6",
777777
"is_secret": false,
778778
"is_verified": false,
779-
"line_number": 1165,
779+
"line_number": 1175,
780780
"type": "Base64 High Entropy String",
781781
"verified_result": null
782782
}
@@ -794,39 +794,39 @@
794794
"hashed_secret": "c427f185ddcb2440be9b77c8e45f1cd487a2e790",
795795
"is_secret": false,
796796
"is_verified": false,
797-
"line_number": 1451,
797+
"line_number": 1454,
798798
"type": "Base64 High Entropy String",
799799
"verified_result": null
800800
},
801801
{
802802
"hashed_secret": "1f7e33de15e22de9d2eaf502df284ed25ca40018",
803803
"is_secret": false,
804804
"is_verified": false,
805-
"line_number": 1518,
805+
"line_number": 1521,
806806
"type": "Secret Keyword",
807807
"verified_result": null
808808
},
809809
{
810810
"hashed_secret": "1f614c2eb6b3da22d89bd1b9fd47d7cb7c8fc670",
811811
"is_secret": false,
812812
"is_verified": false,
813-
"line_number": 3338,
813+
"line_number": 3342,
814814
"type": "Secret Keyword",
815815
"verified_result": null
816816
},
817817
{
818818
"hashed_secret": "7abfce65b8504403afc25c9790f358d513dfbcc6",
819819
"is_secret": false,
820820
"is_verified": false,
821-
"line_number": 3351,
821+
"line_number": 3355,
822822
"type": "Secret Keyword",
823823
"verified_result": null
824824
},
825825
{
826826
"hashed_secret": "0c2d85bf9a9b1579b16f220a4ea8c3d62b2e24b1",
827827
"is_secret": false,
828828
"is_verified": false,
829-
"line_number": 3392,
829+
"line_number": 3396,
830830
"type": "Secret Keyword",
831831
"verified_result": null
832832
}
@@ -846,15 +846,15 @@
846846
"hashed_secret": "da8cae6284528565678de15e03d461e23fe22538",
847847
"is_secret": false,
848848
"is_verified": false,
849-
"line_number": 1858,
849+
"line_number": 1884,
850850
"type": "Secret Keyword",
851851
"verified_result": null
852852
},
853853
{
854854
"hashed_secret": "1a0334cfa65f4be58b9d914b8e96e9d9478bfbac",
855855
"is_secret": false,
856856
"is_verified": false,
857-
"line_number": 3239,
857+
"line_number": 3265,
858858
"type": "Secret Keyword",
859859
"verified_result": null
860860
}
@@ -2900,15 +2900,15 @@
29002900
"hashed_secret": "3046d9f6cfaaeea6eed9bb7a4ab010fe49b0cfd4",
29012901
"is_secret": false,
29022902
"is_verified": false,
2903-
"line_number": 342,
2903+
"line_number": 341,
29042904
"type": "Secret Keyword",
29052905
"verified_result": null
29062906
},
29072907
{
29082908
"hashed_secret": "92f08f2d9a0dc3f0d4cb3796435a48508cf59ecd",
29092909
"is_secret": false,
29102910
"is_verified": false,
2911-
"line_number": 700,
2911+
"line_number": 687,
29122912
"type": "Secret Keyword",
29132913
"verified_result": null
29142914
}
@@ -2928,15 +2928,15 @@
29282928
"hashed_secret": "3046d9f6cfaaeea6eed9bb7a4ab010fe49b0cfd4",
29292929
"is_secret": false,
29302930
"is_verified": false,
2931-
"line_number": 125,
2931+
"line_number": 124,
29322932
"type": "Secret Keyword",
29332933
"verified_result": null
29342934
},
29352935
{
29362936
"hashed_secret": "92f08f2d9a0dc3f0d4cb3796435a48508cf59ecd",
29372937
"is_secret": false,
29382938
"is_verified": false,
2939-
"line_number": 307,
2939+
"line_number": 302,
29402940
"type": "Secret Keyword",
29412941
"verified_result": null
29422942
}
@@ -2964,7 +2964,7 @@
29642964
"hashed_secret": "92f08f2d9a0dc3f0d4cb3796435a48508cf59ecd",
29652965
"is_secret": false,
29662966
"is_verified": false,
2967-
"line_number": 1091,
2967+
"line_number": 1107,
29682968
"type": "Secret Keyword",
29692969
"verified_result": null
29702970
}
@@ -3062,7 +3062,7 @@
30623062
"hashed_secret": "3c2ecad9b250fd6d99893e4d05ec02ca19aa95d0",
30633063
"is_secret": false,
30643064
"is_verified": false,
3065-
"line_number": 389,
3065+
"line_number": 396,
30663066
"type": "Secret Keyword",
30673067
"verified_result": null
30683068
}
@@ -4954,15 +4954,15 @@
49544954
"hashed_secret": "d47dcacc720a39e236679ac3e311a0d58bb6519e",
49554955
"is_secret": false,
49564956
"is_verified": false,
4957-
"line_number": 191,
4957+
"line_number": 192,
49584958
"type": "Secret Keyword",
49594959
"verified_result": null
49604960
},
49614961
{
49624962
"hashed_secret": "e66e7d67fdf3c596c435fc7828b13205e4950a0f",
49634963
"is_secret": false,
49644964
"is_verified": false,
4965-
"line_number": 193,
4965+
"line_number": 194,
49664966
"type": "Secret Keyword",
49674967
"verified_result": null
49684968
}

‎ibm/service/project/data_source_ibm_project_config.go‎

Lines changed: 7 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ package project
55

66
import (
77
"context"
8-
"encoding/json"
98
"fmt"
109
"log"
1110

@@ -531,11 +530,7 @@ func dataSourceIbmProjectConfigOutputValueToMap(model *projectv1.OutputValue) (m
531530
if model.Value != nil {
532531
value := make(map[string]interface{})
533532
for k, v := range model.Value {
534-
bytes, err := json.Marshal(v)
535-
if err != nil {
536-
return modelMap, err
537-
}
538-
value[k] = string(bytes)
533+
value[k] = fmt.Sprintf("%v", v)
539534
}
540535
modelMap["value"] = value
541536
}
@@ -650,22 +645,14 @@ func dataSourceIbmProjectConfigProjectConfigResponseDefinitionToMap(model projec
650645
if model.Inputs != nil {
651646
inputs := make(map[string]interface{})
652647
for k, v := range model.Inputs {
653-
bytes, err := json.Marshal(v)
654-
if err != nil {
655-
return modelMap, err
656-
}
657-
inputs[k] = string(bytes)
648+
inputs[k] = fmt.Sprintf("%v", v)
658649
}
659650
modelMap["inputs"] = inputs
660651
}
661652
if model.Settings != nil {
662653
settings := make(map[string]interface{})
663654
for k, v := range model.Settings {
664-
bytes, err := json.Marshal(v)
665-
if err != nil {
666-
return modelMap, err
667-
}
668-
settings[k] = string(bytes)
655+
settings[k] = fmt.Sprintf("%v", v)
669656
}
670657
modelMap["settings"] = settings
671658
}
@@ -743,22 +730,14 @@ func dataSourceIbmProjectConfigProjectConfigResponseDefinitionDAConfigDefinition
743730
if model.Inputs != nil {
744731
inputs := make(map[string]interface{})
745732
for k, v := range model.Inputs {
746-
bytes, err := json.Marshal(v)
747-
if err != nil {
748-
return modelMap, err
749-
}
750-
inputs[k] = string(bytes)
733+
inputs[k] = fmt.Sprintf("%v", v)
751734
}
752735
modelMap["inputs"] = inputs
753736
}
754737
if model.Settings != nil {
755738
settings := make(map[string]interface{})
756739
for k, v := range model.Settings {
757-
bytes, err := json.Marshal(v)
758-
if err != nil {
759-
return modelMap, err
760-
}
761-
settings[k] = string(bytes)
740+
settings[k] = fmt.Sprintf("%v", v)
762741
}
763742
modelMap["settings"] = settings
764743
}
@@ -796,22 +775,14 @@ func dataSourceIbmProjectConfigProjectConfigResponseDefinitionResourceConfigDefi
796775
if model.Inputs != nil {
797776
inputs := make(map[string]interface{})
798777
for k, v := range model.Inputs {
799-
bytes, err := json.Marshal(v)
800-
if err != nil {
801-
return modelMap, err
802-
}
803-
inputs[k] = string(bytes)
778+
inputs[k] = fmt.Sprintf("%v", v)
804779
}
805780
modelMap["inputs"] = inputs
806781
}
807782
if model.Settings != nil {
808783
settings := make(map[string]interface{})
809784
for k, v := range model.Settings {
810-
bytes, err := json.Marshal(v)
811-
if err != nil {
812-
return modelMap, err
813-
}
814-
settings[k] = string(bytes)
785+
settings[k] = fmt.Sprintf("%v", v)
815786
}
816787
modelMap["settings"] = settings
817788
}

‎ibm/service/project/data_source_ibm_project_environment.go‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ package project
55

66
import (
77
"context"
8-
"encoding/json"
98
"fmt"
109
"log"
1110

@@ -277,11 +276,7 @@ func dataSourceIbmProjectEnvironmentEnvironmentDefinitionRequiredPropertiesToMap
277276
if model.Inputs != nil {
278277
inputs := make(map[string]interface{})
279278
for k, v := range model.Inputs {
280-
bytes, err := json.Marshal(v)
281-
if err != nil {
282-
return modelMap, err
283-
}
284-
inputs[k] = string(bytes)
279+
inputs[k] = fmt.Sprintf("%v", v)
285280
}
286281
modelMap["inputs"] = inputs
287282
}

‎ibm/service/project/resource_ibm_project_config.go‎

Lines changed: 7 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1059,11 +1059,7 @@ func resourceIbmProjectConfigProjectConfigResponseDefinitionToMap(model projectv
10591059
if model.Inputs != nil {
10601060
inputs := make(map[string]interface{})
10611061
for k, v := range model.Inputs {
1062-
bytes, err := json.Marshal(v)
1063-
if err != nil {
1064-
return modelMap, err
1065-
}
1066-
inputs[k] = string(bytes)
1062+
inputs[k] = fmt.Sprintf("%v", v)
10671063
}
10681064
if len(inputs) > 0 {
10691065
modelMap["inputs"] = inputs
@@ -1072,11 +1068,7 @@ func resourceIbmProjectConfigProjectConfigResponseDefinitionToMap(model projectv
10721068
if model.Settings != nil {
10731069
settings := make(map[string]interface{})
10741070
for k, v := range model.Settings {
1075-
bytes, err := json.Marshal(v)
1076-
if err != nil {
1077-
return modelMap, err
1078-
}
1079-
settings[k] = string(bytes)
1071+
settings[k] = fmt.Sprintf("%v", v)
10801072
}
10811073
if len(settings) > 0 {
10821074
modelMap["settings"] = settings
@@ -1160,11 +1152,7 @@ func resourceIbmProjectConfigProjectConfigResponseDefinitionDAConfigDefinitionPr
11601152
if model.Inputs != nil {
11611153
inputs := make(map[string]interface{})
11621154
for k, v := range model.Inputs {
1163-
bytes, err := json.Marshal(v)
1164-
if err != nil {
1165-
return modelMap, err
1166-
}
1167-
inputs[k] = string(bytes)
1155+
inputs[k] = fmt.Sprintf("%v", v)
11681156
}
11691157
if len(inputs) > 0 {
11701158
modelMap["inputs"] = inputs
@@ -1173,11 +1161,7 @@ func resourceIbmProjectConfigProjectConfigResponseDefinitionDAConfigDefinitionPr
11731161
if model.Settings != nil {
11741162
settings := make(map[string]interface{})
11751163
for k, v := range model.Settings {
1176-
bytes, err := json.Marshal(v)
1177-
if err != nil {
1178-
return modelMap, err
1179-
}
1180-
settings[k] = string(bytes)
1164+
settings[k] = fmt.Sprintf("%v", v)
11811165
}
11821166
if len(settings) > 0 {
11831167
modelMap["settings"] = settings
@@ -1219,11 +1203,7 @@ func resourceIbmProjectConfigProjectConfigResponseDefinitionResourceConfigDefini
12191203
if model.Inputs != nil {
12201204
inputs := make(map[string]interface{})
12211205
for k, v := range model.Inputs {
1222-
bytes, err := json.Marshal(v)
1223-
if err != nil {
1224-
return modelMap, err
1225-
}
1226-
inputs[k] = string(bytes)
1206+
inputs[k] = fmt.Sprintf("%v", v)
12271207
}
12281208
if len(inputs) > 0 {
12291209
modelMap["inputs"] = inputs
@@ -1232,11 +1212,7 @@ func resourceIbmProjectConfigProjectConfigResponseDefinitionResourceConfigDefini
12321212
if model.Settings != nil {
12331213
settings := make(map[string]interface{})
12341214
for k, v := range model.Settings {
1235-
bytes, err := json.Marshal(v)
1236-
if err != nil {
1237-
return modelMap, err
1238-
}
1239-
settings[k] = string(bytes)
1215+
settings[k] = fmt.Sprintf("%v", v)
12401216
}
12411217
if len(settings) > 0 {
12421218
modelMap["settings"] = settings
@@ -1257,11 +1233,7 @@ func resourceIbmProjectConfigOutputValueToMap(model *projectv1.OutputValue) (map
12571233
if model.Value != nil {
12581234
value := make(map[string]interface{})
12591235
for k, v := range model.Value {
1260-
bytes, err := json.Marshal(v)
1261-
if err != nil {
1262-
return modelMap, err
1263-
}
1264-
value[k] = string(bytes)
1236+
value[k] = fmt.Sprintf("%v", v)
12651237
}
12661238
modelMap["value"] = value
12671239
}

‎ibm/service/project/resource_ibm_project_environment.go‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -479,11 +479,7 @@ func resourceIbmProjectEnvironmentEnvironmentDefinitionRequiredPropertiesToMap(m
479479
if model.Inputs != nil {
480480
inputs := make(map[string]interface{})
481481
for k, v := range model.Inputs {
482-
bytes, err := json.Marshal(v)
483-
if err != nil {
484-
return modelMap, err
485-
}
486-
inputs[k] = string(bytes)
482+
inputs[k] = fmt.Sprintf("%v", v)
487483
}
488484
if len(inputs) > 0 {
489485
modelMap["inputs"] = inputs

0 commit comments

Comments
 (0)