chore: migrate project and project tokens (#707)

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

Author: blakepettersson

argocd/provider.go

@@ -20,9 +20,6 @@ var tokenMutexConfiguration = &sync.RWMutex{}
 // Used to handle concurrent access to ArgoCD clusters
 var tokenMutexClusters = &sync.RWMutex{}
 
-// Used to handle concurrent access to each ArgoCD project
-var tokenMutexProjectMap = make(map[string]*sync.RWMutex, 0)
-
 // Used to handle concurrent access to ArgoCD secrets
 var tokenMutexSecrets = &sync.RWMutex{}
 
@@ -148,8 +145,6 @@ func Provider() *schema.Provider {
 			"argocd_application":     resourceArgoCDApplication(),
 			"argocd_application_set": resourceArgoCDApplicationSet(),
 			"argocd_cluster":         resourceArgoCDCluster(),
-			"argocd_project":         resourceArgoCDProject(),
-			"argocd_project_token":   resourceArgoCDProjectToken(),
 		},
 		ConfigureContextFunc: func(ctx context.Context, d *schema.ResourceData) (interface{}, diag.Diagnostics) {
 			config, diags := argoCDProviderConfigFromResourceData(ctx, d)

argocd/resource_argocd_account_token_test.go

@@ -8,6 +8,7 @@ import (
 	"time"
 
 	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
+	"github.com/hashicorp/terraform-plugin-testing/terraform"
 	"github.com/stretchr/testify/assert"
 )
 
@@ -241,3 +242,101 @@ resource "argocd_account_token" "renew_after" {
 }
 `, renewAfter)
 }
+
+func testCheckTokenIssuedAt(resourceName string) resource.TestCheckFunc {
+	return func(s *terraform.State) error {
+		rs, ok := s.RootModule().Resources[resourceName]
+		if !ok {
+			return fmt.Errorf("not found: %s", resourceName)
+		}
+
+		if rs.Primary.ID == "" {
+			return fmt.Errorf("token ID is not set")
+		}
+
+		_issuedAt, ok := rs.Primary.Attributes["issued_at"]
+		if !ok {
+			return fmt.Errorf("testCheckTokenIssuedAt: issued_at is not set")
+		}
+
+		_, err := convertStringToInt64(_issuedAt)
+		if err != nil {
+			return fmt.Errorf("testCheckTokenIssuedAt: string attribute 'issued_at' stored in state cannot be converted to int64: %s", err)
+		}
+
+		return nil
+	}
+}
+
+func testCheckTokenExpiresAt(resourceName string, expiresIn int64) resource.TestCheckFunc {
+	return func(s *terraform.State) error {
+		rs, ok := s.RootModule().Resources[resourceName]
+		if !ok {
+			return fmt.Errorf("not found: %s", resourceName)
+		}
+
+		if rs.Primary.ID == "" {
+			return fmt.Errorf("token ID is not set")
+		}
+
+		_expiresAt, ok := rs.Primary.Attributes["expires_at"]
+		if !ok {
+			return fmt.Errorf("expires_at is not set")
+		}
+
+		_issuedAt, ok := rs.Primary.Attributes["issued_at"]
+		if !ok {
+			return fmt.Errorf("testCheckTokenExpiresAt: issued_at is not set")
+		}
+
+		expiresAt, err := convertStringToInt64(_expiresAt)
+		if err != nil {
+			return fmt.Errorf("testCheckTokenExpiresAt: string attribute 'expires_at' stored in state cannot be converted to int64: %s", err)
+		}
+
+		issuedAt, err := convertStringToInt64(_issuedAt)
+		if err != nil {
+			return fmt.Errorf("testCheckTokenExpiresAt: string attribute 'issued_at' stored in state cannot be converted to int64: %s", err)
+		}
+
+		if issuedAt+expiresIn != expiresAt {
+			return fmt.Errorf("testCheckTokenExpiresAt: issuedAt + expiresIn != expiresAt : %d + %d != %d", issuedAt, expiresIn, expiresAt)
+		}
+
+		return nil
+	}
+}
+
+func testTokenIssuedAtSet(name string, count int) resource.TestCheckFunc {
+	return func(s *terraform.State) error {
+		key := "issued_at"
+
+		for i := 0; i < count; i++ {
+			ms := s.RootModule()
+			_name := fmt.Sprintf("%s.%d", name, i)
+
+			rs, ok := ms.Resources[_name]
+			if !ok {
+				return fmt.Errorf("not found: %s in %s", _name, ms.Path)
+			}
+
+			is := rs.Primary
+			if is == nil {
+				return fmt.Errorf("no primary instance: %s in %s", _name, ms.Path)
+			}
+
+			if val, ok := is.Attributes[key]; !ok || val == "" {
+				return fmt.Errorf("%s: Attribute '%s' expected to be set", _name, key)
+			}
+		}
+
+		return nil
+	}
+}
+
+func testDelay(seconds int) resource.TestCheckFunc {
+	return func(s *terraform.State) error {
+		time.Sleep(time.Duration(seconds) * time.Second)
+		return nil
+	}
+}

argocd/resource_argocd_application_set_test.go

@@ -1049,8 +1049,8 @@ func TestAccArgoCDApplicationSet_CustomNamespace(t *testing.T) {
 	name := acctest.RandomWithPrefix("appset-ns")
 
 	resource.ParallelTest(t, resource.TestCase{
-		PreCheck:          func() { testAccPreCheck(t); testAccPreCheckFeatureSupported(t, features.ApplicationSet) },
-		ProviderFactories: testAccProviders,
+		PreCheck:                 func() { testAccPreCheck(t); testAccPreCheckFeatureSupported(t, features.ApplicationSet) },
+		ProtoV6ProviderFactories: testAccProtoV6ProviderFactories,
 		Steps: []resource.TestStep{
 			{
 				Config: testAccArgoCDApplicationSetCustomNamespace(name),

argocd/resource_argocd_application_test.go

@@ -1038,8 +1038,8 @@ func TestAccArgoCDApplication_CustomNamespace(t *testing.T) {
 	name := acctest.RandomWithPrefix("test-acc")
 
 	resource.ParallelTest(t, resource.TestCase{
-		PreCheck:          func() { testAccPreCheck(t); testAccPreCheckFeatureSupported(t, features.ProjectSourceNamespaces) },
-		ProviderFactories: testAccProviders,
+		PreCheck:                 func() { testAccPreCheck(t); testAccPreCheckFeatureSupported(t, features.ProjectSourceNamespaces) },
+		ProtoV6ProviderFactories: testAccProtoV6ProviderFactories,
 		Steps: []resource.TestStep{
 			{
 				Config: testAccArgoCDApplicationCustomNamespace(name),