feat(appsets): add state upgrade logic for appsets in any namespace (#644)

* feat(appsets): add state upgrade logic for appsets in any namespace

Signed-off-by: Nathanael Liechti <[email protected]>

* Update argocd/schema_application_set.go

Co-authored-by: Brian Fox <[email protected]>
Signed-off-by: Nathanael Liechti <[email protected]>

---------

Signed-off-by: Nathanael Liechti <[email protected]>
Co-authored-by: Brian Fox <[email protected]>

Author: the-technat

argocd/resource_argocd_application_set.go

@@ -26,7 +26,15 @@ func resourceArgoCDApplicationSet() *schema.Resource {
 		},
 		Schema: map[string]*schema.Schema{
 			"metadata": metadataSchema("applicationsets.argoproj.io"),
-			"spec":     applicationSetSpecSchemaV0(),
+			"spec":     applicationSetSpecSchemaV1(),
+		},
+		SchemaVersion: 1,
+		StateUpgraders: []schema.StateUpgrader{
+			{
+				Type:    resourceArgoCDApplicationV1().CoreConfigSchema().ImpliedType(),
+				Upgrade: resourceArgoCDApplicationSetStateUpgradeV0,
+				Version: 0,
+			},
 		},
 	}
 }

argocd/resource_argocd_application_set_test.go

@@ -2,6 +2,7 @@ package argocd
 
 import (
 	"fmt"
+	"reflect"
 	"regexp"
 	"testing"
 
@@ -1070,6 +1071,52 @@ func TestAccArgoCDApplicationSet_CustomNamespace(t *testing.T) {
 	})
 }
 
+func TestUpgradeSchemaApplicationSet_V0V1_Default_NoChange(t *testing.T) {
+	t.Parallel()
+
+	v0 := map[string]interface{}{
+		"metadata": []interface{}{
+			map[string]interface{}{
+				"name":      "test",
+				"namespace": "argocd",
+			},
+		},
+		"spec": []interface{}{
+			map[string]interface{}{
+				"generator": []interface{}{
+					map[string]interface{}{
+						"clusters": []interface{}{map[string]interface{}{}},
+					},
+				},
+				"template": []interface{}{
+					map[string]interface{}{
+						"metadata": []interface{}{map[string]interface{}{
+							"name": "{{ name }}-clusters",
+						}},
+						"spec": []interface{}{map[string]interface{}{
+							"source": []interface{}{map[string]interface{}{
+								"repo_url":        "https://github.com/argoproj/argocd-example-apps",
+								"target_revision": "HEAD",
+								"path":            "guestbook",
+							}},
+							"destination": []interface{}{map[string]interface{}{
+								"server":    "{{ server }}",
+								"namespace": "default",
+							}},
+						}},
+					},
+				},
+			},
+		},
+	}
+
+	actual, _ := resourceArgoCDApplicationStateUpgradeV0(t.Context(), v0, nil)
+
+	if !reflect.DeepEqual(v0, actual) {
+		t.Fatalf("\n\nexpected:\n\n%#v\n\ngot:\n\n%#v\n\n", v0, actual)
+	}
+}
+
 func testAccArgoCDApplicationSet_clusters() string {
 	return `
 resource "argocd_application_set" "clusters" {

argocd/schema_application_set.go

@@ -1,6 +1,9 @@
 package argocd
 
 import (
+	"context"
+	"fmt"
+
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
 
@@ -136,6 +139,15 @@ func applicationSetSpecSchemaV0() *schema.Schema {
 	}
 }
 
+func applicationSetSpecSchemaV1() *schema.Schema {
+	// To support deploying applicationsets to non-default namespaces we need to
+	// do a state migration to ensure that the Id on existing resources is
+	// updated to include the namespace. For this to happen, we need to trigger
+	// a schema version upgrade on the applicationset resource however, the
+	// schema of the applicationset `spec` has not changed from `v0`.
+	return applicationSetSpecSchemaV0()
+}
+
 func applicationSetGeneratorSchemaV0() *schema.Schema {
 	return &schema.Schema{
 		Type:        schema.TypeList,
@@ -146,6 +158,18 @@ func applicationSetGeneratorSchemaV0() *schema.Schema {
 	}
 }
 
+func resourceArgoCDApplicationSetStateUpgradeV0(_ context.Context, rawState map[string]interface{}, _ interface{}) (map[string]interface{}, error) {
+	_metadata, ok := rawState["metadata"].([]interface{})
+	if !ok || len(_metadata) == 0 {
+		return nil, fmt.Errorf("failed to read metadata during state migration v0 to v1")
+	}
+
+	metadata := _metadata[0].(map[string]interface{})
+	rawState["id"] = fmt.Sprintf("%s:%s", metadata["name"].(string), metadata["namespace"].(string))
+
+	return rawState, nil
+}
+
 func generatorResourceV0(level int) *schema.Resource {
 	if level > 1 {
 		return &schema.Resource{