fix: add plugin generator to nested generator (#639)

* fix: add plugin generator to nested generator

#624 added support for plugin generators, but the support for it was
never added to the nested generators.

Signed-off-by: Blake Pettersson <[email protected]>

* fix: add flatten step

This needs to go the other way as well. Added test which verifies this
works E2E.

Signed-off-by: Blake Pettersson <[email protected]>

* chore: please linter

Signed-off-by: Blake Pettersson <[email protected]>

* fix(test): make sure appset name is unique

Signed-off-by: Blake Pettersson <[email protected]>

---------

Signed-off-by: Blake Pettersson <[email protected]>

Author: blakepettersson

argocd/resource_argocd_application_set_test.go

@@ -263,6 +263,46 @@ func TestAccArgoCDApplicationSet_matrix(t *testing.T) {
 	})
 }
 
+func TestAccArgoCDApplicationSet_matrixPluginGenerator(t *testing.T) {
+	resource.ParallelTest(t, resource.TestCase{
+		PreCheck:          func() { testAccPreCheck(t); testAccPreCheckFeatureSupported(t, features.ApplicationSet) },
+		ProviderFactories: testAccProviders,
+		Steps: []resource.TestStep{
+			{
+				Config: testAccArgoCDApplicationSet_matrixPluginGenerator(),
+				Check: resource.ComposeTestCheckFunc(
+					resource.TestCheckResourceAttrSet(
+						"argocd_application_set.matrix-plugin_generator",
+						"metadata.0.uid",
+					),
+					resource.TestCheckResourceAttrSet(
+						"argocd_application_set.matrix-plugin_generator",
+						"spec.0.generator.0.matrix.0.generator.1.clusters.0.selector.0.match_labels.%",
+					),
+					resource.TestCheckResourceAttrSet(
+						"argocd_application_set.matrix-plugin_generator",
+						"spec.0.generator.0.matrix.0.generator.0.plugin.0.requeue_after_seconds",
+					),
+					resource.TestCheckResourceAttrSet(
+						"argocd_application_set.matrix-plugin_generator",
+						"spec.0.generator.0.matrix.0.generator.0.plugin.0.config_map_ref",
+					),
+					resource.TestCheckResourceAttrSet(
+						"argocd_application_set.matrix-plugin_generator",
+						"spec.0.generator.0.matrix.0.generator.0.plugin.0.input.0.parameters.key1",
+					),
+				),
+			},
+			{
+				ResourceName:            "argocd_application_set.matrix-plugin_generator",
+				ImportState:             true,
+				ImportStateVerify:       true,
+				ImportStateVerifyIgnore: []string{"metadata.0.resource_version"},
+			},
+		},
+	})
+}
+
 func TestAccArgoCDApplicationSet_matrixGitPathParamPrefix(t *testing.T) {
 	resource.ParallelTest(t, resource.TestCase{
 		PreCheck:          func() { testAccPreCheck(t); testAccPreCheckFeatureSupported(t, features.ApplicationSet) },
@@ -1365,6 +1405,65 @@ resource "argocd_application_set" "matrix" {
 }`
 }
 
+func testAccArgoCDApplicationSet_matrixPluginGenerator() string {
+	return `
+resource "argocd_application_set" "matrix-plugin_generator" {
+	metadata {
+		name = "matrix-plugin-generator"
+	}
+
+	spec {
+		generator {
+			matrix {
+				generator {
+					plugin {
+						config_map_ref = "plugin"
+		
+						input {
+							parameters = {
+								key1 = "value1"
+							}
+						}
+		
+						requeue_after_seconds = 30
+					}
+				}
+				generator {
+					clusters{
+						selector{
+							match_labels = {
+								"argocd.argoproj.io/secret-type" = "cluster"
+							}
+						}
+					}
+				}
+			}
+		}
+
+		template {
+			metadata {
+				name = "{{path.basename}}-{{name}}"
+			}
+
+			spec {
+				project = "default"
+
+				source {
+					repo_url        = "https://github.com/argoproj/argo-cd.git"
+					target_revision = "HEAD"
+					path            = "{{path}}"
+				}
+
+				destination {
+					server    = "{{server}}"
+					namespace = "{{path.basename}}"
+				}
+			}
+		}
+	}
+}`
+}
+
 func testAccArgoCDApplicationSet_matrixGitPathParamPrefix() string {
 	return `
 resource "argocd_application_set" "matrix_git_path_param_prefix" {

argocd/structure_application_set.go

@@ -6,10 +6,11 @@ import (
 	"reflect"
 
 	"github.com/argoproj-labs/terraform-provider-argocd/internal/features"
-	application "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
 	meta "k8s.io/apimachinery/pkg/apis/meta/v1"
+
+	application "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
 )
 
 func expandApplicationSet(d *schema.ResourceData, featureMultipleApplicationSourcesSupported bool, featureApplicationSetIgnoreApplicationDifferences bool, featureApplicationSetTemplatePatch bool) (metadata meta.ObjectMeta, spec application.ApplicationSetSpec, err error) {
@@ -285,6 +286,7 @@ func expandApplicationSetMatrixGenerator(mg interface{}, featureMultipleApplicat
 			Clusters:                g.Clusters,
 			Git:                     g.Git,
 			List:                    g.List,
+			Plugin:                  g.Plugin,
 			PullRequest:             g.PullRequest,
 			SCMProvider:             g.SCMProvider,
 		}
@@ -354,6 +356,7 @@ func expandApplicationSetMergeGenerator(mg interface{}, featureMultipleApplicati
 			Clusters:                g.Clusters,
 			Git:                     g.Git,
 			List:                    g.List,
+			Plugin:                  g.Plugin,
 			PullRequest:             g.PullRequest,
 			SCMProvider:             g.SCMProvider,
 		}
@@ -1582,6 +1585,13 @@ func flattenNestedGenerator(g application.ApplicationSetNestedGenerator) (map[st
 		generator["scm_provider"] = flattenApplicationSetSCMProviderGenerator(g.SCMProvider)
 	} else if g.PullRequest != nil {
 		generator["pull_request"] = flattenApplicationSetPullRequestGenerator(g.PullRequest)
+	} else if g.Plugin != nil {
+		plugin, err := flattenApplicationSetPluginGenerator(g.Plugin)
+		if err != nil {
+			return nil, err
+		}
+
+		generator["plugin"] = plugin
 	}
 
 	if g.Selector != nil {