fix: omit default values in generated group resources

Author: xMoelletschi

internal/terraform/groups.go

@@ -25,16 +25,16 @@ func WriteGroups(groups []*gl.Group, w io.Writer, groupRefs groupRefMap) error {
 		if g.Description != "" {
 			body.SetAttributeValue("description", cty.StringVal(g.Description))
 		}
-		if g.Visibility != "" {
+		if g.Visibility != gl.PublicVisibility {
 			body.SetAttributeValue("visibility_level", cty.StringVal(string(g.Visibility)))
 		}
 		if g.ParentID != 0 {
 			setGroupIDAttribute(body, "parent_id", g.ParentID, groupRefs)
 		}
-		if g.LFSEnabled {
+		if !g.LFSEnabled {
 			body.SetAttributeValue("lfs_enabled", cty.BoolVal(g.LFSEnabled))
 		}
-		if g.RequestAccessEnabled {
+		if !g.RequestAccessEnabled {
 			body.SetAttributeValue("request_access_enabled", cty.BoolVal(g.RequestAccessEnabled))
 		}
 		if g.MembershipLock {
@@ -46,13 +46,13 @@ func WriteGroups(groups []*gl.Group, w io.Writer, groupRefs groupRefMap) error {
 		if g.RequireTwoFactorAuth {
 			body.SetAttributeValue("require_two_factor_authentication", cty.BoolVal(g.RequireTwoFactorAuth))
 		}
-		if g.TwoFactorGracePeriod != 0 {
+		if g.TwoFactorGracePeriod != 48 {
 			body.SetAttributeValue("two_factor_grace_period", cty.NumberIntVal(g.TwoFactorGracePeriod))
 		}
-		if g.ProjectCreationLevel != "" {
+		if g.ProjectCreationLevel != gl.DeveloperProjectCreation {
 			body.SetAttributeValue("project_creation_level", cty.StringVal(string(g.ProjectCreationLevel)))
 		}
-		if g.SubGroupCreationLevel != "" {
+		if g.SubGroupCreationLevel != gl.MaintainerSubGroupCreationLevelValue {
 			body.SetAttributeValue("subgroup_creation_level", cty.StringVal(string(g.SubGroupCreationLevel)))
 		}
 		if g.AutoDevopsEnabled {
@@ -67,13 +67,13 @@ func WriteGroups(groups []*gl.Group, w io.Writer, groupRefs groupRefMap) error {
 		if g.PreventForkingOutsideGroup {
 			body.SetAttributeValue("prevent_forking_outside_group", cty.BoolVal(g.PreventForkingOutsideGroup))
 		}
-		if g.SharedRunnersSetting != "" {
+		if g.SharedRunnersSetting != gl.EnabledSharedRunnersSettingValue {
 			body.SetAttributeValue("shared_runners_setting", cty.StringVal(string(g.SharedRunnersSetting)))
 		}
 		if g.DefaultBranch != "" {
 			body.SetAttributeValue("default_branch", cty.StringVal(g.DefaultBranch))
 		}
-		if g.WikiAccessLevel != "" {
+		if g.WikiAccessLevel != gl.EnabledAccessControl {
 			body.SetAttributeValue("wiki_access_level", cty.StringVal(string(g.WikiAccessLevel)))
 		}
 		if g.IPRestrictionRanges != "" {

internal/terraform/groups_test.go

@@ -11,9 +11,17 @@ import (
 func TestWriteGroupsDefaultsOmitted(t *testing.T) {
 	groups := []*gl.Group{
 		{
-			Name:          "My Group",
-			Path:          "my-group",
-			EmailsEnabled: true,
+			Name:                  "My Group",
+			Path:                  "my-group",
+			Visibility:            gl.PublicVisibility,
+			LFSEnabled:            true,
+			RequestAccessEnabled:  true,
+			TwoFactorGracePeriod:  48,
+			ProjectCreationLevel:  gl.DeveloperProjectCreation,
+			SubGroupCreationLevel: gl.MaintainerSubGroupCreationLevelValue,
+			SharedRunnersSetting:  gl.EnabledSharedRunnersSettingValue,
+			WikiAccessLevel:       gl.EnabledAccessControl,
+			EmailsEnabled:         true,
 		},
 	}
 
@@ -29,10 +37,18 @@ func TestWriteGroupsAllOptions(t *testing.T) {
 	level := gl.MaintainerPermissions
 	groups := []*gl.Group{
 		{
-			ID:            42,
-			Name:          "Parent Group",
-			Path:          "parent-group",
-			EmailsEnabled: true,
+			ID:                    42,
+			Name:                  "Parent Group",
+			Path:                  "parent-group",
+			Visibility:            gl.PublicVisibility,
+			LFSEnabled:            true,
+			RequestAccessEnabled:  true,
+			TwoFactorGracePeriod:  48,
+			ProjectCreationLevel:  gl.DeveloperProjectCreation,
+			SubGroupCreationLevel: gl.MaintainerSubGroupCreationLevelValue,
+			SharedRunnersSetting:  gl.EnabledSharedRunnersSettingValue,
+			WikiAccessLevel:       gl.EnabledAccessControl,
+			EmailsEnabled:         true,
 		},
 		{
 			ID:                               100,

internal/terraform/testdata/groups_full.tf

@@ -9,14 +9,11 @@ resource "gitlab_group" "full_group" {
   description                                      = "Full group description"
   visibility_level                                 = "private"
   parent_id                                        = gitlab_group.parent_group.id
-  lfs_enabled                                      = true
-  request_access_enabled                           = true
   membership_lock                                  = true
   share_with_group_lock                            = true
   require_two_factor_authentication                = true
   two_factor_grace_period                          = 7
   project_creation_level                           = "owner"
-  subgroup_creation_level                          = "maintainer"
   auto_devops_enabled                              = true
   emails_enabled                                   = false
   mentions_disabled                                = true