Fix group_share_group nil pointer reference (#555)

* Fix gitlab_group_share_group expires_at bug

Only set expires_at field when time is not nil.
Update associated tests.

* Add empty string for gitlab_group_share_group read

Add empty string when gitlab_group_share_group expires_at time is null

* Added extra check for share_group import test

Author: btyy77c

gitlab/resource_gitlab_group_share_group.go

@@ -105,7 +105,12 @@ func resourceGitlabGroupShareGroupRead(d *schema.ResourceData, meta interface{})
 			d.Set("group_id", groupId)
 			d.Set("share_group_id", sharedGroup.GroupID)
 			d.Set("group_access", accessLevel[convertedAccessLevel])
-			d.Set("expires_at", sharedGroup.ExpiresAt.String())
+
+			if sharedGroup.ExpiresAt == nil {
+				d.Set("expires_at", "")
+			} else {
+				d.Set("expires_at", sharedGroup.ExpiresAt.String())
+			}
 
 			return nil
 		}

gitlab/resource_gitlab_group_share_group_test.go

@@ -19,13 +19,19 @@ func TestAccGitlabGroupShareGroup_basic(t *testing.T) {
 		Steps: []resource.TestStep{
 			// Share a new group with another group
 			{
-				Config: testAccGitlabGroupShareGroupConfig(randName, "guest", "2099-01-01"),
-				Check:  testAccCheckGitlabGroupSharedWithGroup(randName, "2099-01-01", gitlab.GuestPermissions),
+				Config: testAccGitlabGroupShareGroupConfig(
+					randName,
+					`
+					group_access 	 = "guest"
+					expires_at     = "2099-01-01"
+					`,
+				),
+				Check: testAccCheckGitlabGroupSharedWithGroup(randName, "2099-01-01", gitlab.GuestPermissions),
 			},
 			// Update the share group
 			{
-				Config: testAccGitlabGroupShareGroupConfig(randName, "reporter", "2099-02-02"),
-				Check:  testAccCheckGitlabGroupSharedWithGroup(randName, "2099-02-02", gitlab.ReporterPermissions),
+				Config: testAccGitlabGroupShareGroupConfig(randName, `group_access = "reporter"`),
+				Check:  testAccCheckGitlabGroupSharedWithGroup(randName, "", gitlab.ReporterPermissions),
 			},
 			// Delete the gitlab_group_share_group resource
 			{
@@ -46,8 +52,14 @@ func TestAccGitlabGroupShareGroup_import(t *testing.T) {
 		Steps: []resource.TestStep{
 			{
 				// create shared groups
-				Config: testAccGitlabGroupShareGroupConfig(randName, "guest", "2099-03-03"),
-				Check:  testAccCheckGitlabGroupSharedWithGroup(randName, "2099-03-03", gitlab.GuestPermissions),
+				Config: testAccGitlabGroupShareGroupConfig(
+					randName,
+					`
+					group_access 	 = "guest"
+					expires_at     = "2099-03-03"
+					`,
+				),
+				Check: testAccCheckGitlabGroupSharedWithGroup(randName, "2099-03-03", gitlab.GuestPermissions),
 			},
 			{
 				// Verify Import
@@ -87,8 +99,10 @@ func testAccCheckGitlabGroupSharedWithGroup(
 			return fmt.Errorf("groupAccessLevel was %d (wanted %d)", sharedGroup.GroupAccessLevel, accessLevel)
 		}
 
-		if sharedGroup.ExpiresAt.String() != expireTime {
-			return fmt.Errorf("expired time was %s (wanted %s)", sharedGroup.ExpiresAt.String(), expireTime)
+		if sharedGroup.ExpiresAt == nil && expireTime != "" {
+			return fmt.Errorf("expire time was nil (wanted %s)", expireTime)
+		} else if sharedGroup.ExpiresAt != nil && sharedGroup.ExpiresAt.String() != expireTime {
+			return fmt.Errorf("expire time was %s (wanted %s)", sharedGroup.ExpiresAt.String(), expireTime)
 		}
 
 		return nil
@@ -115,8 +129,7 @@ func testAccCheckGitlabGroupIsNotShared(groupName string) resource.TestCheckFunc
 
 func testAccGitlabGroupShareGroupConfig(
 	randName string,
-	accessLevel string,
-	expireTime string,
+	shareGroupSettings string,
 ) string {
 	return fmt.Sprintf(
 		`
@@ -133,13 +146,11 @@ func testAccGitlabGroupShareGroupConfig(
 		resource "gitlab_group_share_group" "test" {
 		  group_id       = gitlab_group.test_main.id
 			share_group_id = gitlab_group.test_share.id
-			group_access 	 = "%[2]s"
-			expires_at     = "%[3]s"
+			%[2]s
 		}
 		`,
 		randName,
-		accessLevel,
-		expireTime,
+		shareGroupSettings,
 	)
 }