Modify the ID of the project access token resource

Author: randomswdev

gitlab/resource_gitlab_project_access_token.go

@@ -104,19 +104,31 @@ func resourceGitlabProjectAccessTokenCreate(d *schema.ResourceData, meta interfa
 
 	log.Printf("[DEBUG] created gitlab ProjectAccessToken %d - %s for project ID %d", projectAccessToken.ID, *options.Name, project)
 
-	d.SetId(strconv.Itoa(projectAccessToken.ID))
+	projectString := strconv.Itoa(project)
+	PATstring := strconv.Itoa(projectAccessToken.ID)
+	d.SetId(buildTwoPartID(&projectString, &PATstring))
 	d.Set("token", projectAccessToken.Token)
 
 	return resourceGitlabProjectAccessTokenRead(d, meta)
 }
 
 func resourceGitlabProjectAccessTokenRead(d *schema.ResourceData, meta interface{}) error {
+
+	projectString, PATstring, err := parseTwoPartID(d.Id())
+	if err != nil {
+		return fmt.Errorf("Error parsing ID: %s", d.Id())
+	}
+
 	client := meta.(*gitlab.Client)
-	project := d.Get("project").(int)
-	projectAccessTokenID, err := strconv.Atoi(d.Id())
 
+	project, err := strconv.Atoi(projectString)
 	if err != nil {
-		return fmt.Errorf("%s cannot be converted to int", d.Id())
+		return fmt.Errorf("%s cannot be converted to int", projectString)
+	}
+
+	projectAccessTokenID, err := strconv.Atoi(PATstring)
+	if err != nil {
+		return fmt.Errorf("%s cannot be converted to int", PATstring)
 	}
 
 	log.Printf("[DEBUG] read gitlab ProjectAccessToken %d, project ID %d", projectAccessTokenID, project)
@@ -163,16 +175,25 @@ func resourceGitlabProjectAccessTokenRead(d *schema.ResourceData, meta interface
 }
 
 func resourceGitlabProjectAccessTokenDelete(d *schema.ResourceData, meta interface{}) error {
+
+	projectString, PATstring, err := parseTwoPartID(d.Id())
+	if err != nil {
+		return fmt.Errorf("Error parsing ID: %s", d.Id())
+	}
+
 	client := meta.(*gitlab.Client)
-	project := d.Get("project").(int)
-	log.Printf("[DEBUG] Delete gitlab ProjectAccessToken %s", d.Id())
 
-	projectAccessTokenID, err := strconv.Atoi(d.Id())
+	project, err := strconv.Atoi(projectString)
+	if err != nil {
+		return fmt.Errorf("%s cannot be converted to int", projectString)
+	}
 
+	projectAccessTokenID, err := strconv.Atoi(PATstring)
 	if err != nil {
-		return fmt.Errorf("%s cannot be converted to int", d.Id())
+		return fmt.Errorf("%s cannot be converted to int", PATstring)
 	}
 
+	log.Printf("[DEBUG] Delete gitlab ProjectAccessToken %s", d.Id())
 	_, err = client.ProjectAccessTokens.DeleteProjectAccessToken(project, projectAccessTokenID)
 	return err
 }

gitlab/resource_gitlab_project_access_token_test.go

@@ -111,11 +111,23 @@ func testAccCheckGitlabProjectAccessTokenExists(n string, pat *testAccGitlabProj
 			return fmt.Errorf("Not Found: %s", n)
 		}
 
-		patID := rs.Primary.ID
+		projectString, PATstring, err := parseTwoPartID(rs.Primary.ID)
+		if err != nil {
+			return fmt.Errorf("Error parsing ID: %s", rs.Primary.ID)
+		}
+		projectAccessTokenID, err := strconv.Atoi(PATstring)
+		if err != nil {
+			return fmt.Errorf("%s cannot be converted to int", PATstring)
+		}
+
 		repoName := rs.Primary.Attributes["project"]
 		if repoName == "" {
 			return fmt.Errorf("No project ID is set")
 		}
+		if repoName != projectString {
+			return fmt.Errorf("Project [%s] in project identifier [%s] it's different from project stored into the state [%s]", projectString, rs.Primary.ID, repoName)
+		}
+
 		conn := testAccProvider.Meta().(*gitlab.Client)
 
 		tokens, _, err := conn.ProjectAccessTokens.ListProjectAccessTokens(repoName, nil)
@@ -124,7 +136,7 @@ func testAccCheckGitlabProjectAccessTokenExists(n string, pat *testAccGitlabProj
 		}
 
 		for _, token := range tokens {
-			if strconv.Itoa(token.ID) == patID {
+			if token.ID == projectAccessTokenID {
 				pat.pat = token
 				pat.project = repoName
 				pat.token = rs.Primary.Attributes["token"]