Fix the tests

Author: randomswdev

gitlab/resource_gitlab_project_access_token.go

@@ -82,13 +82,13 @@ func resourceGitlabProjectAccessToken() *schema.Resource {
 func resourceGitlabProjectAccessTokenCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
 	client := meta.(*gitlab.Client)
 
-	project := d.Get("project").(int)
+	project := d.Get("project").(string)
 	options := &gitlab.CreateProjectAccessTokenOptions{
 		Name:   gitlab.String(d.Get("name").(string)),
 		Scopes: *stringSetToStringSlice(d.Get("scopes").(*schema.Set)),
 	}
 
-	log.Printf("[DEBUG] create gitlab ProjectAccessToken %s %s for project ID %d", *options.Name, options.Scopes, project)
+	log.Printf("[DEBUG] create gitlab ProjectAccessToken %s %s for project ID %s", *options.Name, options.Scopes, project)
 
 	if v, ok := d.GetOk("expires_at"); ok {
 		parsedExpiresAt, err := time.Parse("2006-01-02", v.(string))
@@ -97,44 +97,38 @@ func resourceGitlabProjectAccessTokenCreate(ctx context.Context, d *schema.Resou
 		}
 		parsedExpiresAtISOTime := gitlab.ISOTime(parsedExpiresAt)
 		options.ExpiresAt = &parsedExpiresAtISOTime
-		log.Printf("[DEBUG] create gitlab ProjectAccessToken %s with expires_at %s for project ID %d", *options.Name, *options.ExpiresAt, project)
+		log.Printf("[DEBUG] create gitlab ProjectAccessToken %s with expires_at %s for project ID %s", *options.Name, *options.ExpiresAt, project)
 	}
 
 	projectAccessToken, _, err := client.ProjectAccessTokens.CreateProjectAccessToken(project, options, gitlab.WithContext(ctx))
 	if err != nil {
 		return diag.FromErr(err)
 	}
 
-	log.Printf("[DEBUG] created gitlab ProjectAccessToken %d - %s for project ID %d", projectAccessToken.ID, *options.Name, project)
+	log.Printf("[DEBUG] created gitlab ProjectAccessToken %d - %s for project ID %s", projectAccessToken.ID, *options.Name, project)
 
-	projectString := strconv.Itoa(project)
 	PATstring := strconv.Itoa(projectAccessToken.ID)
-	d.SetId(buildTwoPartID(&projectString, &PATstring))
+	d.SetId(buildTwoPartID(&project, &PATstring))
 	d.Set("token", projectAccessToken.Token)
 
 	return resourceGitlabProjectAccessTokenRead(ctx, d, meta)
 }
 
 func resourceGitlabProjectAccessTokenRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
 
-	projectString, PATstring, err := parseTwoPartID(d.Id())
+	project, PATstring, err := parseTwoPartID(d.Id())
 	if err != nil {
 		return diag.Errorf("Error parsing ID: %s", d.Id())
 	}
 
 	client := meta.(*gitlab.Client)
 
-	project, err := strconv.Atoi(projectString)
-	if err != nil {
-		return diag.Errorf("%s cannot be converted to int", projectString)
-	}
-
 	projectAccessTokenID, err := strconv.Atoi(PATstring)
 	if err != nil {
 		return diag.Errorf("%s cannot be converted to int", PATstring)
 	}
 
-	log.Printf("[DEBUG] read gitlab ProjectAccessToken %d, project ID %d", projectAccessTokenID, project)
+	log.Printf("[DEBUG] read gitlab ProjectAccessToken %d, project ID %s", projectAccessTokenID, project)
 
 	//there is a slight possibility to not find an existing item, for example
 	// 1. item is #101 (ie, in the 2nd page)
@@ -172,25 +166,20 @@ func resourceGitlabProjectAccessTokenRead(ctx context.Context, d *schema.Resourc
 		page = response.NextPage
 	}
 
-	log.Printf("[DEBUG] failed to read gitlab ProjectAccessToken %d, project ID %d", projectAccessTokenID, project)
+	log.Printf("[DEBUG] failed to read gitlab ProjectAccessToken %d, project ID %s", projectAccessTokenID, project)
 	d.SetId("")
 	return nil
 }
 
 func resourceGitlabProjectAccessTokenDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
 
-	projectString, PATstring, err := parseTwoPartID(d.Id())
+	project, PATstring, err := parseTwoPartID(d.Id())
 	if err != nil {
 		return diag.Errorf("Error parsing ID: %s", d.Id())
 	}
 
 	client := meta.(*gitlab.Client)
 
-	project, err := strconv.Atoi(projectString)
-	if err != nil {
-		return diag.Errorf("%s cannot be converted to int", projectString)
-	}
-
 	projectAccessTokenID, err := strconv.Atoi(PATstring)
 	if err != nil {
 		return diag.Errorf("%s cannot be converted to int", PATstring)

gitlab/resource_gitlab_project_access_token_test.go

@@ -110,7 +110,7 @@ func testAccCheckGitlabProjectAccessTokenExists(n string, pat *testAccGitlabProj
 			return fmt.Errorf("Not Found: %s", n)
 		}
 
-		projectString, PATstring, err := parseTwoPartID(rs.Primary.ID)
+		project, PATstring, err := parseTwoPartID(rs.Primary.ID)
 		if err != nil {
 			return fmt.Errorf("Error parsing ID: %s", rs.Primary.ID)
 		}
@@ -123,8 +123,8 @@ func testAccCheckGitlabProjectAccessTokenExists(n string, pat *testAccGitlabProj
 		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)
+		if repoName != project {
+			return fmt.Errorf("Project [%s] in project identifier [%s] it's different from project stored into the state [%s]", project, rs.Primary.ID, repoName)
 		}
 
 		conn := testAccProvider.Meta().(*gitlab.Client)