Skip to content

Commit 453fe73

Browse files
authored
Fix argocd_application state upgrade for v5.0.0 (#238)
1 parent 37864fe commit 453fe73

File tree

3 files changed

+16
-8
lines changed

3 files changed

+16
-8
lines changed

argocd/schema_application.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1804,7 +1804,7 @@ func resourceArgoCDApplicationStateUpgradeV3(_ context.Context, rawState map[str
18041804

18051805
syncPolicy := _syncPolicy[0].(map[string]interface{})
18061806

1807-
if automated, ok := syncPolicy["automated"].(map[string]bool); ok {
1807+
if automated, ok := syncPolicy["automated"].(map[string]interface{}); ok {
18081808
updated := make(map[string]interface{}, 0)
18091809
for k, v := range automated {
18101810
updated[k] = v
@@ -1820,7 +1820,7 @@ func resourceArgoCDApplicationStateUpgradeV3(_ context.Context, rawState map[str
18201820

18211821
retry := _retry[0].(map[string]interface{})
18221822

1823-
if backoff, ok := retry["backoff"].(map[string]string); ok {
1823+
if backoff, ok := retry["backoff"].(map[string]interface{}); ok {
18241824
updated := make(map[string]interface{}, 0)
18251825
for k, v := range backoff {
18261826
updated[k] = v

argocd/schema_application_test.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@ func TestUpgradeSchemaApplication_V3V4(t *testing.T) {
246246
"namespace": "default",
247247
}},
248248
"sync_policy": []interface{}{map[string]interface{}{
249-
"automated": map[string]bool{
249+
"automated": map[string]interface{}{
250250
"prune": true,
251251
"self_heal": true,
252252
"allow_empty": true,
@@ -256,7 +256,7 @@ func TestUpgradeSchemaApplication_V3V4(t *testing.T) {
256256
},
257257
"retry": []interface{}{map[string]interface{}{
258258
"limit": "5",
259-
"backoff": map[string]string{
259+
"backoff": map[string]interface{}{
260260
"duration": "30s",
261261
"max_duration": "2m",
262262
"factor": "2",
@@ -336,7 +336,7 @@ func TestUpgradeSchemaApplication_V3V4(t *testing.T) {
336336
},
337337
"retry": []interface{}{map[string]interface{}{
338338
"limit": "5",
339-
"backoff": map[string]string{
339+
"backoff": map[string]interface{}{
340340
"duration": "30s",
341341
"max_duration": "2m",
342342
"factor": "2",
@@ -404,13 +404,13 @@ func TestUpgradeSchemaApplication_V3V4(t *testing.T) {
404404
"namespace": "default",
405405
}},
406406
"sync_policy": []interface{}{map[string]interface{}{
407-
"automated": map[string]bool{},
407+
"automated": map[string]interface{}{},
408408
"sync_options": []string{
409409
"Validate=false",
410410
},
411411
"retry": []interface{}{map[string]interface{}{
412412
"limit": "5",
413-
"backoff": map[string]string{
413+
"backoff": map[string]interface{}{
414414
"duration": "30s",
415415
"max_duration": "2m",
416416
"factor": "2",
@@ -479,7 +479,7 @@ func TestUpgradeSchemaApplication_V3V4(t *testing.T) {
479479
"namespace": "default",
480480
}},
481481
"sync_policy": []interface{}{map[string]interface{}{
482-
"automated": map[string]bool{
482+
"automated": map[string]interface{}{
483483
"prune": true,
484484
"self_heal": true,
485485
"allow_empty": true,

main.go

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
package main
22

33
import (
4+
"flag"
5+
46
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
57
"github.com/hashicorp/terraform-plugin-sdk/v2/plugin"
68
"github.com/oboukili/terraform-provider-argocd/argocd"
@@ -17,7 +19,13 @@ import (
1719
//go:generate go run github.com/hashicorp/terraform-plugin-docs/cmd/tfplugindocs
1820

1921
func main() {
22+
var debugMode bool
23+
flag.BoolVar(&debugMode, "debug", false, "set to true to run the provider with support for debuggers like delve")
24+
flag.Parse()
25+
2026
plugin.Serve(&plugin.ServeOpts{
27+
Debug: debugMode,
28+
ProviderAddr: "registry.terraform.io/oboukili/argocd",
2129
ProviderFunc: func() *schema.Provider {
2230
return argocd.Provider()
2331
},

0 commit comments

Comments
 (0)