Still some code review changes

Author: randomswdev

gitlab/resource_gitlab_project_access_token.go

@@ -42,11 +42,7 @@ func resourceGitlabProjectAccessToken() *schema.Resource {
 				Type:     schema.TypeString,
 				Optional: true,
 				ValidateFunc: func(i interface{}, k string) (warnings []string, errors []error) {
-					v, ok := i.(string)
-					if !ok {
-						errors = append(errors, fmt.Errorf("expected type of %q to be string", k))
-						return warnings, errors
-					}
+					v := i.(string)
 
 					if _, err := time.Parse("2006-01-02", v); err != nil {
 						errors = append(errors, fmt.Errorf("expected %q to be a valid YYYY-MM-DD date, got %q: %+v", k, i, err))
@@ -89,7 +85,7 @@ func resourceGitlabProjectAccessTokenCreate(d *schema.ResourceData, meta interfa
 		Scopes: *stringSetToStringSlice(d.Get("scopes").(*schema.Set)),
 	}
 
-	log.Printf("[DEBUG] create gitlab ProjectAccessToken %s %s", *options.Name, options.Scopes)
+	log.Printf("[DEBUG] create gitlab ProjectAccessToken %s %s for project ID %d", *options.Name, options.Scopes, project)
 
 	if v, ok := d.GetOk("expires_at"); ok {
 		parsedExpiresAt, err := time.Parse("2006-01-02", v.(string))
@@ -98,14 +94,16 @@ func resourceGitlabProjectAccessTokenCreate(d *schema.ResourceData, meta interfa
 		}
 		parsedExpiresAtISOTime := gitlab.ISOTime(parsedExpiresAt)
 		options.ExpiresAt = &parsedExpiresAtISOTime
-		log.Printf("[DEBUG] create gitlab ProjectAccessToken with expires_at %s", *options.ExpiresAt)
+		log.Printf("[DEBUG] create gitlab ProjectAccessToken %s with expires_at %s for project ID %d", *options.Name, *options.ExpiresAt, project)
 	}
 
 	projectAccessToken, _, err := client.ProjectAccessTokens.CreateProjectAccessToken(project, options)
 	if err != nil {
 		return err
 	}
 
+	log.Printf("[DEBUG] created gitlab ProjectAccessToken %d - %s for project ID %d", projectAccessToken.ID, *options.Name, project)
+
 	d.SetId(strconv.Itoa(projectAccessToken.ID))
 	d.Set("token", projectAccessToken.Token)
 

gitlab/resource_gitlab_project_access_token_test.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"strconv"
 	"testing"
+	"time"
 
 	"github.com/hashicorp/terraform-plugin-sdk/helper/acctest"
 	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
@@ -72,10 +73,37 @@ func TestAccGitlabProjectAccessToken_basic(t *testing.T) {
 					}),
 				),
 			},
+			//Destroy Project Access Token
+			{
+				Config: testAccGitlabProjectAccessTokenDestroyToken(rInt),
+				Check:  testAccCheckGitlabProjectAccessTokenDoesNotExist(&pat),
+			},
 		},
 	})
 }
 
+func testAccCheckGitlabProjectAccessTokenDoesNotExist(pat *testAccGitlabProjectAccessTokenWrapper) resource.TestCheckFunc {
+	return func(s *terraform.State) error {
+		conn := testAccProvider.Meta().(*gitlab.Client)
+
+		//Unfortunately we need to wait a bit, since the API call doesn't wait to destroy the PAT and returns immediately
+		time.Sleep(3 * time.Second) // lintignore: R018 // TODO: Resolve this tfproviderlint issue
+
+		tokens, _, err := conn.ProjectAccessTokens.ListProjectAccessTokens(pat.project, nil)
+		if err != nil {
+			return err
+		}
+
+		for _, token := range tokens {
+			if token.ID == pat.pat.ID {
+				return fmt.Errorf("Found token %d for project %s (tokens found: %d)", token.ID, pat.project, len(tokens))
+			}
+		}
+
+		return nil
+	}
+}
+
 func testAccCheckGitlabProjectAccessTokenExists(n string, pat *testAccGitlabProjectAccessTokenWrapper) resource.TestCheckFunc {
 	return func(s *terraform.State) error {
 		rs, ok := s.RootModule().Resources[n]
@@ -103,7 +131,7 @@ func testAccCheckGitlabProjectAccessTokenExists(n string, pat *testAccGitlabProj
 				return nil
 			}
 		}
-		return fmt.Errorf("Project Acces Token does not exist")
+		return fmt.Errorf("Project Access Token does not exist")
 	}
 }
 
@@ -199,6 +227,19 @@ resource "gitlab_project_access_token" "bar" {
 	`, rInt)
 }
 
+func testAccGitlabProjectAccessTokenDestroyToken(rInt int) string {
+	return fmt.Sprintf(`
+resource "gitlab_project" "foo" {
+  name = "foo-%d"
+  description = "Terraform acceptance tests"
+
+  # So that acceptance tests can be run in a gitlab organization
+  # with no billing
+  visibility_level = "public"
+}
+	`, rInt)
+}
+
 func testAccGitlabProjectAccessTokenUpdateConfig(rInt int) string {
 	return fmt.Sprintf(`
 resource "gitlab_project" "foo" {