feat: support Argo CD v3 (#641)

the-technat · web-flow · commit 7bd8a0d516f2 · 2025-05-08T11:32:36.000+02:00
Signed-off-by: Nathanael Liechti &lt;technat@technat.ch&gt;
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -63,7 +63,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        argocd_version: ["v2.12.10", "v2.13.5", "v2.14.5"]
+        argocd_version: ["v2.13.5", "v2.14.5", "v3.0.0"]
         terraform_version: ["1.4.*"]
     steps:
       - name: Check out code
diff --git a/GNUmakefile b/GNUmakefile
@@ -4,7 +4,7 @@ ARGOCD_INSECURE?=true
 ARGOCD_SERVER?=127.0.0.1:8080
 ARGOCD_AUTH_USERNAME?=admin
 ARGOCD_AUTH_PASSWORD?=acceptancetesting
-ARGOCD_VERSION?=v2.14.5
+ARGOCD_VERSION?=v3.0.0
 
 export
 
diff --git a/README.md b/README.md
@@ -37,6 +37,7 @@ The following table shows the versions of Argo CD that are tested with each vers
 
 | Provider version | Argo CD versions |
 |---|---|
+| 7.7 | v2.13, v2.14, v3.0 | 
 | 7.5 | v2.12, v2.13, v2.14 | 
 | 7.4 | v2.11, v2.12, v2.13 | 
 | 7.2 | v2.10, v2.11, v2.12 | 
diff --git a/argocd/resource_argocd_account_token.go b/argocd/resource_argocd_account_token.go
@@ -8,8 +8,8 @@ import (
 	"time"
 
 	"github.com/argoproj-labs/terraform-provider-argocd/internal/provider"
-	"github.com/argoproj/argo-cd/v2/pkg/apiclient/account"
-	"github.com/argoproj/argo-cd/v2/pkg/apiclient/session"
+	"github.com/argoproj/argo-cd/v3/pkg/apiclient/account"
+	"github.com/argoproj/argo-cd/v3/pkg/apiclient/session"
 	"github.com/cristalhq/jwt/v5"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
diff --git a/argocd/resource_argocd_application.go b/argocd/resource_argocd_application.go
@@ -10,8 +10,8 @@ import (
 
 	"github.com/argoproj-labs/terraform-provider-argocd/internal/features"
 	"github.com/argoproj-labs/terraform-provider-argocd/internal/provider"
-	applicationClient "github.com/argoproj/argo-cd/v2/pkg/apiclient/application"
-	application "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
+	applicationClient "github.com/argoproj/argo-cd/v3/pkg/apiclient/application"
+	application "github.com/argoproj/argo-cd/v3/pkg/apis/application/v1alpha1"
 	"github.com/argoproj/gitops-engine/pkg/health"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry"
diff --git a/argocd/resource_argocd_application_set.go b/argocd/resource_argocd_application_set.go
@@ -7,8 +7,8 @@ import (
 
 	"github.com/argoproj-labs/terraform-provider-argocd/internal/features"
 	"github.com/argoproj-labs/terraform-provider-argocd/internal/provider"
-	"github.com/argoproj/argo-cd/v2/pkg/apiclient/applicationset"
-	application "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
+	"github.com/argoproj/argo-cd/v3/pkg/apiclient/applicationset"
+	application "github.com/argoproj/argo-cd/v3/pkg/apis/application/v1alpha1"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
diff --git a/argocd/resource_argocd_cluster.go b/argocd/resource_argocd_cluster.go
@@ -6,7 +6,7 @@ import (
 	"strings"
 
 	"github.com/argoproj-labs/terraform-provider-argocd/internal/provider"
-	clusterClient "github.com/argoproj/argo-cd/v2/pkg/apiclient/cluster"
+	clusterClient "github.com/argoproj/argo-cd/v3/pkg/apiclient/cluster"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
diff --git a/argocd/resource_argocd_cluster_test.go b/argocd/resource_argocd_cluster_test.go
@@ -11,7 +11,7 @@ import (
 	"time"
 
 	"github.com/argoproj-labs/terraform-provider-argocd/internal/provider"
-	"github.com/argoproj/argo-cd/v2/pkg/apiclient/cluster"
+	"github.com/argoproj/argo-cd/v3/pkg/apiclient/cluster"
 	"github.com/hashicorp/terraform-plugin-framework/types"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
diff --git a/argocd/resource_argocd_project.go b/argocd/resource_argocd_project.go
@@ -9,8 +9,8 @@ import (
 
 	"github.com/argoproj-labs/terraform-provider-argocd/internal/features"
 	"github.com/argoproj-labs/terraform-provider-argocd/internal/provider"
-	projectClient "github.com/argoproj/argo-cd/v2/pkg/apiclient/project"
-	application "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
+	projectClient "github.com/argoproj/argo-cd/v3/pkg/apiclient/project"
+	application "github.com/argoproj/argo-cd/v3/pkg/apis/application/v1alpha1"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
diff --git a/argocd/resource_argocd_project_token.go b/argocd/resource_argocd_project_token.go
@@ -9,7 +9,7 @@ import (
 	"time"
 
 	"github.com/argoproj-labs/terraform-provider-argocd/internal/provider"
-	"github.com/argoproj/argo-cd/v2/pkg/apiclient/project"
+	"github.com/argoproj/argo-cd/v3/pkg/apiclient/project"
 	"github.com/cristalhq/jwt/v5"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
diff --git a/argocd/resource_argocd_repository.go b/argocd/resource_argocd_repository.go
@@ -7,8 +7,8 @@ import (
 	"strings"
 
 	"github.com/argoproj-labs/terraform-provider-argocd/internal/provider"
-	"github.com/argoproj/argo-cd/v2/pkg/apiclient/repository"
-	application "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
+	"github.com/argoproj/argo-cd/v3/pkg/apiclient/repository"
+	application "github.com/argoproj/argo-cd/v3/pkg/apis/application/v1alpha1"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
diff --git a/argocd/resource_argocd_repository_certificate.go b/argocd/resource_argocd_repository_certificate.go
@@ -6,8 +6,8 @@ import (
 	"strings"
 
 	"github.com/argoproj-labs/terraform-provider-argocd/internal/provider"
-	"github.com/argoproj/argo-cd/v2/pkg/apiclient/certificate"
-	application "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
+	"github.com/argoproj/argo-cd/v3/pkg/apiclient/certificate"
+	application "github.com/argoproj/argo-cd/v3/pkg/apis/application/v1alpha1"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
diff --git a/argocd/resource_argocd_repository_credentials.go b/argocd/resource_argocd_repository_credentials.go
@@ -6,8 +6,8 @@ import (
 	"strings"
 
 	"github.com/argoproj-labs/terraform-provider-argocd/internal/provider"
-	"github.com/argoproj/argo-cd/v2/pkg/apiclient/repocreds"
-	application "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
+	"github.com/argoproj/argo-cd/v3/pkg/apiclient/repocreds"
+	application "github.com/argoproj/argo-cd/v3/pkg/apis/application/v1alpha1"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
diff --git a/argocd/structure_application.go b/argocd/structure_application.go
@@ -4,7 +4,7 @@ import (
 	"encoding/json"
 	"fmt"
 
-	application "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
+	application "github.com/argoproj/argo-cd/v3/pkg/apis/application/v1alpha1"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	meta "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
diff --git a/argocd/structure_application_set.go b/argocd/structure_application_set.go
@@ -10,7 +10,7 @@ import (
 	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"
+	application "github.com/argoproj/argo-cd/v3/pkg/apis/application/v1alpha1"
 )
 
 func expandApplicationSet(d *schema.ResourceData, featureMultipleApplicationSourcesSupported bool, featureApplicationSetIgnoreApplicationDifferences bool, featureApplicationSetTemplatePatch bool) (metadata meta.ObjectMeta, spec application.ApplicationSetSpec, err error) {
diff --git a/argocd/structure_cluster.go b/argocd/structure_cluster.go
@@ -3,7 +3,7 @@ package argocd
 import (
 	"fmt"
 
-	application "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
+	application "github.com/argoproj/argo-cd/v3/pkg/apis/application/v1alpha1"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
 
diff --git a/argocd/structure_project.go b/argocd/structure_project.go
@@ -4,7 +4,7 @@ import (
 	"encoding/json"
 	"fmt"
 
-	application "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
+	application "github.com/argoproj/argo-cd/v3/pkg/apis/application/v1alpha1"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	meta "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
diff --git a/argocd/structure_repository.go b/argocd/structure_repository.go
@@ -1,7 +1,7 @@
 package argocd
 
 import (
-	application "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
+	application "github.com/argoproj/argo-cd/v3/pkg/apis/application/v1alpha1"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
diff --git a/argocd/structure_repository_certificate.go b/argocd/structure_repository_certificate.go
@@ -3,7 +3,7 @@ package argocd
 import (
 	"context"
 
-	application "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
+	application "github.com/argoproj/argo-cd/v3/pkg/apis/application/v1alpha1"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
diff --git a/argocd/structure_repository_credentials.go b/argocd/structure_repository_credentials.go
@@ -3,7 +3,7 @@ package argocd
 import (
 	"fmt"
 
-	application "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
+	application "github.com/argoproj/argo-cd/v3/pkg/apis/application/v1alpha1"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
diff --git a/argocd/structures.go b/argocd/structures.go
@@ -5,7 +5,7 @@ import (
 	"strconv"
 	"strings"
 
-	application "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
+	application "github.com/argoproj/argo-cd/v3/pkg/apis/application/v1alpha1"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	meta "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/util/intstr"
diff --git a/argocd/utils.go b/argocd/utils.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/argoproj-labs/terraform-provider-argocd/internal/features"
 
-	"github.com/argoproj/argo-cd/v2/util/rbac"
+	"github.com/argoproj/argo-cd/v3/util/rbac"
 
 	fwdiag "github.com/hashicorp/terraform-plugin-framework/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
diff --git a/go.mod b/go.mod
diff --git a/go.sum b/go.sum
diff --git a/internal/provider/data_source_application.go b/internal/provider/data_source_application.go
diff --git a/internal/provider/model_application.go b/internal/provider/model_application.go
diff --git a/internal/provider/model_gpg_key.go b/internal/provider/model_gpg_key.go
diff --git a/internal/provider/model_provider.go b/internal/provider/model_provider.go
diff --git a/internal/provider/resource_gpg_key.go b/internal/provider/resource_gpg_key.go
diff --git a/internal/provider/server_interface.go b/internal/provider/server_interface.go
diff --git a/internal/provider/server_interface_test.go b/internal/provider/server_interface_test.go

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ import (`
`6`	`6`	`"strings"`
`7`	`7`
`8`	`8`	`"github.com/argoproj-labs/terraform-provider-argocd/internal/provider"`
`9`		`- clusterClient "github.com/argoproj/argo-cd/v2/pkg/apiclient/cluster"`
	`9`	`+ clusterClient "github.com/argoproj/argo-cd/v3/pkg/apiclient/cluster"`
`10`	`10`	`"github.com/hashicorp/terraform-plugin-sdk/v2/diag"`
`11`	`11`	`"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"`
`12`	`12`	`)`