Make go naming consistent with project tag resource and datasource

Author: timofurrer

docs/data-sources/project_tag.md

@@ -3,14 +3,14 @@
 page_title: "gitlab_project_tag Data Source - terraform-provider-gitlab"
 subcategory: ""
 description: |-
-  Provide details about a gitlab project tag
+  The gitlab_project_tag data source allows details of a project tag to be retrieved by its name.
   Upstream API : GitLab API docs https://docs.gitlab.com/ee/api/tags.html
 ---
 
 # gitlab_project_tag (Data Source)
 
-Provide details about a gitlab project tag
-				
+The `gitlab_project_tag` data source allows details of a project tag to be retrieved by its name.
+
 **Upstream API** : [GitLab API docs](https://docs.gitlab.com/ee/api/tags.html)
 
 ## Example Usage

docs/resources/project_tag.md

@@ -3,13 +3,13 @@
 page_title: "gitlab_project_tag Resource - terraform-provider-gitlab"
 subcategory: ""
 description: |-
-  This resource allows you to create and manage GitLab tags.
+  The gitlab_project_tag resource allows to manage the lifecycle of a tag in a project.
   Upstream API : GitLab API docs https://docs.gitlab.com/ee/api/tags.html
 ---
 
 # gitlab_project_tag (Resource)
 
-This resource allows you to create and manage GitLab tags.
+The `gitlab_project_tag` resource allows to manage the lifecycle of a tag in a project.
 
 **Upstream API** : [GitLab API docs](https://docs.gitlab.com/ee/api/tags.html)
 

internal/provider/data_source_gitlab_project_tag.go

@@ -11,11 +11,11 @@ import (
 
 var _ = registerDataSource("gitlab_project_tag", func() *schema.Resource {
 	return &schema.Resource{
-		Description: `Provide details about a gitlab project tag
-				
+		Description: `The ` + "`gitlab_project_tag`" + ` data source allows details of a project tag to be retrieved by its name.
+
 **Upstream API** : [GitLab API docs](https://docs.gitlab.com/ee/api/tags.html)`,
 
-		ReadContext: dataSourceGitlabTagRead,
+		ReadContext: dataSourceGitlabProjectTagRead,
 		Schema: map[string]*schema.Schema{
 			"name": {
 				Description: "The name of a tag.",
@@ -60,7 +60,7 @@ var _ = registerDataSource("gitlab_project_tag", func() *schema.Resource {
 	}
 })
 
-func dataSourceGitlabTagRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
+func dataSourceGitlabProjectTagRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
 	client := meta.(*gitlab.Client)
 	name := d.Get("name").(string)
 	project := d.Get("project").(string)

internal/provider/data_source_gitlab_project_tag_test.go

@@ -9,7 +9,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"
 )
 
-func TestAccDataGitlabTag_basic(t *testing.T) {
+func TestAccDataGitlabProjectTag_basic(t *testing.T) {
 	testAccCheck(t)
 	rInt := acctest.RandInt()
 	project := testAccCreateProject(t)
@@ -19,16 +19,16 @@ func TestAccDataGitlabTag_basic(t *testing.T) {
 		ProviderFactories: providerFactories,
 		Steps: []resource.TestStep{
 			{
-				Config: testAccDataGitlabTag(rInt, project.PathWithNamespace),
+				Config: testAccDataGitlabProjectTag(rInt, project.PathWithNamespace),
 				Check: resource.ComposeTestCheckFunc(
-					testAccDataSourceGitlabTag("gitlab_project_tag.foo", "data.gitlab_project_tag.foo"),
+					testAccDataSourceGitlabProjectTag("gitlab_project_tag.foo", "data.gitlab_project_tag.foo"),
 				),
 			},
 		},
 	})
 }
 
-func testAccDataSourceGitlabTag(src, n string) resource.TestCheckFunc {
+func testAccDataSourceGitlabProjectTag(src, n string) resource.TestCheckFunc {
 	return func(s *terraform.State) error {
 
 		tag := s.RootModule().Resources[src]
@@ -57,17 +57,17 @@ func testAccDataSourceGitlabTag(src, n string) resource.TestCheckFunc {
 	}
 }
 
-func testAccDataGitlabTag(rInt int, project string) string {
+func testAccDataGitlabProjectTag(rInt int, project string) string {
 	return fmt.Sprintf(`
 %s
 data "gitlab_project_tag" "foo" {
   name    = "${gitlab_project_tag.foo.name}"
   project = "%s"
 }
-`, testAccDataGitlabTagSetup(rInt, project), project)
+`, testAccDataGitlabProjectTagSetup(rInt, project), project)
 }
 
-func testAccDataGitlabTagSetup(rInt int, project string) string {
+func testAccDataGitlabProjectTagSetup(rInt int, project string) string {
 	return fmt.Sprintf(`
 resource "gitlab_project_tag" "foo" {
     name    = "tag-%[1]d"

internal/provider/resource_gitlab_project_tag.go

@@ -11,13 +11,13 @@ import (
 
 var _ = registerResource("gitlab_project_tag", func() *schema.Resource {
 	return &schema.Resource{
-		Description: `This resource allows you to create and manage GitLab tags.
+		Description: `The ` + "`gitlab_project_tag`" + ` resource allows to manage the lifecycle of a tag in a project.
 
 **Upstream API** : [GitLab API docs](https://docs.gitlab.com/ee/api/tags.html)`,
 
-		CreateContext: resourceGitlabTagCreate,
-		ReadContext:   resourceGitlabTagRead,
-		DeleteContext: resourceGitlabTagDelete,
+		CreateContext: resourceGitlabProjectTagCreate,
+		ReadContext:   resourceGitlabProjectTagRead,
+		DeleteContext: resourceGitlabProjectTagDelete,
 		Importer: &schema.ResourceImporter{
 			StateContext: schema.ImportStatePassthroughContext,
 		},
@@ -89,7 +89,7 @@ var releaseNoteSchema = &schema.Resource{
 	},
 }
 
-func resourceGitlabTagCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
+func resourceGitlabProjectTagCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
 	client := meta.(*gitlab.Client)
 	name := d.Get("name").(string)
 	project := d.Get("project").(string)
@@ -107,10 +107,10 @@ func resourceGitlabTagCreate(ctx context.Context, d *schema.ResourceData, meta i
 	}
 	d.SetId(buildTwoPartID(&project, &name))
 	d.Set("ref", ref)
-	return resourceGitlabTagRead(ctx, d, meta)
+	return resourceGitlabProjectTagRead(ctx, d, meta)
 }
 
-func resourceGitlabTagRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
+func resourceGitlabProjectTagRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
 	client := meta.(*gitlab.Client)
 	project, name, err := parseTwoPartID(d.Id())
 	if err != nil {
@@ -144,7 +144,7 @@ func resourceGitlabTagRead(ctx context.Context, d *schema.ResourceData, meta int
 	return nil
 }
 
-func resourceGitlabTagDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
+func resourceGitlabProjectTagDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
 	client := meta.(*gitlab.Client)
 	project, name, err := parseTwoPartID(d.Id())
 	if err != nil {

internal/provider/resource_gitlab_project_tag_test.go

@@ -3,14 +3,15 @@ package provider
 import (
 	"errors"
 	"fmt"
+	"testing"
+
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"
 	gitlab "github.com/xanzy/go-gitlab"
-	"testing"
 )
 
-func TestAccGitlabTag_basic(t *testing.T) {
+func TestAccGitlabProjectTag_basic(t *testing.T) {
 	testAccCheck(t)
 	var tag gitlab.Tag
 	var tag2 gitlab.Tag
@@ -21,19 +22,19 @@ func TestAccGitlabTag_basic(t *testing.T) {
 	resource.Test(t, resource.TestCase{
 		PreCheck:          func() { testAccPreCheck(t) },
 		ProviderFactories: providerFactories,
-		CheckDestroy:      testAccCheckGitlabTagDestroy,
+		CheckDestroy:      testAccCheckGitlabProjectTagDestroy,
 		Steps: []resource.TestStep{
 			{
-				Config: testAccGitlabTagConfig(rInt, rInt2, project.PathWithNamespace, branches[0].Name),
+				Config: testAccGitlabProjectTagConfig(rInt, rInt2, project.PathWithNamespace, branches[0].Name),
 				Check: resource.ComposeTestCheckFunc(
-					testAccCheckGitlabTagExists("foo", &tag, rInt),
-					testAccCheckGitlabTagExists("foo2", &tag2, rInt2),
-					testAccCheckGitlabTagAttributes("foo", &tag, &testAccGitlabTagExpectedAttributes{
+					testAccCheckGitlabProjectTagExists("foo", &tag, rInt),
+					testAccCheckGitlabProjectTagExists("foo2", &tag2, rInt2),
+					testAccCheckGitlabProjectTagAttributes("foo", &tag, &testAccGitlabProjectTagExpectedAttributes{
 						Name:    fmt.Sprintf("tag-%d", rInt),
 						Message: "",
 						Ref:     "main",
 					}),
-					testAccCheckGitlabTagAttributes("foo2", &tag2, &testAccGitlabTagExpectedAttributes{
+					testAccCheckGitlabProjectTagAttributes("foo2", &tag2, &testAccGitlabProjectTagExpectedAttributes{
 						Name:    fmt.Sprintf("tag-%d", rInt2),
 						Message: fmt.Sprintf("tag-%d", rInt2),
 						Ref:     branches[0].Name,
@@ -49,10 +50,10 @@ func TestAccGitlabTag_basic(t *testing.T) {
 			},
 			// update properties in resource
 			{
-				Config: testAccGitlabTagConfig(rInt, rInt3, project.PathWithNamespace, branches[0].Name),
+				Config: testAccGitlabProjectTagConfig(rInt, rInt3, project.PathWithNamespace, branches[0].Name),
 				Check: resource.ComposeTestCheckFunc(
-					testAccCheckGitlabTagExists("foo2", &tag2, rInt3),
-					testAccCheckGitlabTagAttributes("foo2", &tag2, &testAccGitlabTagExpectedAttributes{
+					testAccCheckGitlabProjectTagExists("foo2", &tag2, rInt3),
+					testAccCheckGitlabProjectTagAttributes("foo2", &tag2, &testAccGitlabProjectTagExpectedAttributes{
 						Name:    fmt.Sprintf("tag-%d", rInt3),
 						Message: fmt.Sprintf("tag-%d", rInt3),
 						Ref:     branches[0].Name,
@@ -63,7 +64,7 @@ func TestAccGitlabTag_basic(t *testing.T) {
 	})
 }
 
-func testAccCheckGitlabTagDestroy(s *terraform.State) error {
+func testAccCheckGitlabProjectTagDestroy(s *terraform.State) error {
 	for _, rs := range s.RootModule().Resources {
 		if rs.Type != "gitlab_project_tag" {
 			continue
@@ -82,7 +83,7 @@ func testAccCheckGitlabTagDestroy(s *terraform.State) error {
 	return nil
 }
 
-func testAccCheckGitlabTagAttributes(n string, tag *gitlab.Tag, want *testAccGitlabTagExpectedAttributes) resource.TestCheckFunc {
+func testAccCheckGitlabProjectTagAttributes(n string, tag *gitlab.Tag, want *testAccGitlabProjectTagExpectedAttributes) resource.TestCheckFunc {
 	return func(s *terraform.State) error {
 		rs := s.RootModule().Resources[fmt.Sprintf("gitlab_project_tag.%s", n)]
 		ref := rs.Primary.Attributes["ref"]
@@ -113,7 +114,7 @@ func testAccCheckGitlabTagAttributes(n string, tag *gitlab.Tag, want *testAccGit
 	}
 }
 
-func testAccCheckGitlabTagExists(n string, tag *gitlab.Tag, rInt int) resource.TestCheckFunc {
+func testAccCheckGitlabProjectTagExists(n string, tag *gitlab.Tag, rInt int) resource.TestCheckFunc {
 	return func(s *terraform.State) error {
 		rs, ok := s.RootModule().Resources[fmt.Sprintf("gitlab_project_tag.%s", n)]
 		if !ok {
@@ -132,7 +133,7 @@ func testAccCheckGitlabTagExists(n string, tag *gitlab.Tag, rInt int) resource.T
 	}
 }
 
-func testAccGitlabTagConfig(rInt int, rInt2 int, project string, branch string) string {
+func testAccGitlabProjectTagConfig(rInt int, rInt2 int, project string, branch string) string {
 	return fmt.Sprintf(`
     resource "gitlab_project_tag" "foo" {
         name    = "tag-%[1]d"
@@ -148,7 +149,7 @@ func testAccGitlabTagConfig(rInt int, rInt2 int, project string, branch string)
   `, rInt, rInt2, project, branch)
 }
 
-type testAccGitlabTagExpectedAttributes struct {
+type testAccGitlabProjectTagExpectedAttributes struct {
 	Name    string
 	Message string
 	Ref     string