responding to PR comments, removing import state verify for acceptance test

Author: lukegriffith

gitlab/resource_gitlab_project_mirror.go

@@ -11,10 +11,10 @@ import (
 
 func resourceGitlabProjectMirror() *schema.Resource {
 	return &schema.Resource{
-		Create: resourceGitlabMirrorCreate,
+		Create: resourceGitlabProjectMirrorCreate,
 		Read:   resourceGitlabProjectMirrorRead,
-		Update: resourceGitlabMirrorUpdate,
-		Delete: resourceGitlabMirrorDelete,
+		Update: resourceGitlabProjectMirrorUpdate,
+		Delete: resourceGitlabProjectMirrorDelete,
 		Importer: &schema.ResourceImporter{
 			State: schema.ImportStatePassthrough,
 		},
@@ -53,7 +53,7 @@ func resourceGitlabProjectMirror() *schema.Resource {
 	}
 }
 
-func resourceGitlabMirrorCreate(d *schema.ResourceData, meta interface{}) error {
+func resourceGitlabProjectMirrorCreate(d *schema.ResourceData, meta interface{}) error {
 	client := meta.(*gitlab.Client)
 
 	projectID := d.Get("project").(string)
@@ -82,7 +82,7 @@ func resourceGitlabMirrorCreate(d *schema.ResourceData, meta interface{}) error
 	return resourceGitlabProjectMirrorRead(d, meta)
 }
 
-func resourceGitlabMirrorUpdate(d *schema.ResourceData, meta interface{}) error {
+func resourceGitlabProjectMirrorUpdate(d *schema.ResourceData, meta interface{}) error {
 	client := meta.(*gitlab.Client)
 
 	mirrorID := d.Get("mirror_id").(int)
@@ -106,7 +106,7 @@ func resourceGitlabMirrorUpdate(d *schema.ResourceData, meta interface{}) error
 }
 
 // Documented remote mirrors API does not support a delete method, instead mirror is disabled.
-func resourceGitlabMirrorDelete(d *schema.ResourceData, meta interface{}) error {
+func resourceGitlabProjectMirrorDelete(d *schema.ResourceData, meta interface{}) error {
 	client := meta.(*gitlab.Client)
 
 	enabled := false
@@ -167,10 +167,7 @@ func resourceGitlabProjectMirrorRead(d *schema.ResourceData, meta interface{}) e
 }
 
 func resourceGitlabProjectMirrorSetToState(d *schema.ResourceData, projectMirror *gitlab.ProjectMirror, projectID *string) {
-
-	mirrorID := strconv.Itoa(projectMirror.ID)
 	d.Set("enabled", projectMirror.Enabled)
 	d.Set("only_protected_branches", projectMirror.OnlyProtectedBranches)
 	d.Set("keep_divergent_refs", projectMirror.KeepDivergentRefs)
-	d.SetId(buildTwoPartID(projectID, &mirrorID))
 }

gitlab/resource_gitlab_project_mirror_test.go

@@ -1,7 +1,5 @@
 package gitlab
 
-// TODO convert to handle project mirror.
-
 import (
 	"errors"
 	"fmt"
@@ -79,10 +77,10 @@ func TestAccGitlabProjectMirror_import(t *testing.T) {
 				Config: testAccGitlabProjectMirrorConfig(rInt),
 			},
 			{
-				ResourceName:            "gitlab_project_mirror.foo",
-				ImportState:             true,
-				ImportStateVerify:       true,
-				ImportStateVerifyIgnore: []string{"enabled", "mirror_id", "project", "url"},
+				ResourceName:      "gitlab_project_mirror.foo",
+				ImportState:       true,
+				ImportStateVerify: true,
+				//ImportStateVerifyIgnore: []string{"enabled", "mirror_id", "project", "url"},
 			},
 		},
 	})
@@ -137,13 +135,13 @@ func testAccCheckGitlabProjectMirrorAttributes(mirror *gitlab.ProjectMirror, wan
 		}
 
 		if mirror.Enabled != want.Enabled {
-			return fmt.Errorf("got enable_ssl_verification %t; want %t", mirror.Enabled, want.Enabled)
+			return fmt.Errorf("got enabled %t; want %t", mirror.Enabled, want.Enabled)
 		}
 		if mirror.OnlyProtectedBranches != want.OnlyProtectedBranches {
-			return fmt.Errorf("got enable_ssl_verification %t; want %t", mirror.OnlyProtectedBranches, want.OnlyProtectedBranches)
+			return fmt.Errorf("got only protected branches %t; want %t", mirror.OnlyProtectedBranches, want.OnlyProtectedBranches)
 		}
 		if mirror.KeepDivergentRefs != want.KeepDivergentRefs {
-			return fmt.Errorf("got enable_ssl_verification %t; want %t", mirror.KeepDivergentRefs, want.KeepDivergentRefs)
+			return fmt.Errorf("got keep divergent refs %t; want %t", mirror.KeepDivergentRefs, want.KeepDivergentRefs)
 		}
 		return nil
 	}