fix: add emailsdisabled for backwards compatibility

Signed-off-by: Dario Zachow <[email protected]>
crossplane-contrib · Aug 21, 2024 · 7f67a17 · 7f67a17
1 parent 00cdc13
commit 7f67a17
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 4 deletions.
diff --git a/apis/groups/v1alpha1/group_types.go b/apis/groups/v1alpha1/group_types.go
@@ -111,7 +111,11 @@ type GroupParameters struct {
 	// +optional
 	SubGroupCreationLevel *SubGroupCreationLevelValue `json:"subgroupCreationLevel,omitempty"`
 
-	// Disable email notifications.
+	// Disable email notifications. Deprecated, use emailsEnabled instead.
+	// +optional
+	EmailsDisabled *bool `json:"emailsDisabled,omitempty"`
+
+	// Enable email notifications.
 	// +optional
 	EmailsEnabled *bool `json:"emailsEnabled,omitempty"`
 

diff --git a/apis/groups/v1alpha1/zz_generated.deepcopy.go b/apis/groups/v1alpha1/zz_generated.deepcopy.go
diff --git a/package/crds/groups.gitlab.crossplane.io_groups.yaml b/package/crds/groups.gitlab.crossplane.io_groups.yaml
@@ -81,8 +81,12 @@ spec:
                   description:
                     description: The group’s description.
                     type: string
+                  emailsDisabled:
+                    description: Disable email notifications. Deprecated, use emailsEnabled
+                      instead.
+                    type: boolean
                   emailsEnabled:
-                    description: Disable email notifications.
+                    description: Enable email notifications.
                     type: boolean
                   extraSharedRunnersMinutesLimit:
                     description: Extra pipeline minutes quota for this group (purchased

diff --git a/pkg/controller/groups/groups/group.go b/pkg/controller/groups/groups/group.go
@@ -126,6 +126,8 @@ func (e *external) Observe(ctx context.Context, mg resource.Managed) (managed.Ex
 		return managed.ExternalObservation{}, errors.New(errIDNotInt)
 	}
 
+	cr.Spec.ForProvider.EmailsEnabled = lateInitializeEmailsEnabled(cr.Spec.ForProvider.EmailsEnabled, cr.Spec.ForProvider.EmailsDisabled)
+
 	grp, res, err := e.client.GetGroup(groupID, nil)
 	if err != nil {
 		if clients.IsResponseNotFound(res) {
@@ -412,6 +414,15 @@ func lateInitializeSubGroupCreationLevelValue(in *v1alpha1.SubGroupCreationLevel
 	return in
 }
 
+func lateInitializeEmailsEnabled(in *bool, from *bool) *bool {
+	if in == nil && from != nil {
+		value := !(*from)
+		return &value
+	}
+
+	return in
+}
+
 // lateInitializeProjectCreationLevelValue returns in if it's non-nil, otherwise returns from
 // which is the backup for the cases in is nil.
 func lateInitializeProjectCreationLevelValue(in *v1alpha1.ProjectCreationLevelValue, from gitlab.ProjectCreationLevelValue) *v1alpha1.ProjectCreationLevelValue {

diff --git a/pkg/controller/groups/groups/group_test.go b/pkg/controller/groups/groups/group_test.go
@@ -375,7 +375,7 @@ func TestObserve(t *testing.T) {
 							Description:                    description,
 							Visibility:                     gitlabVisibilityNew,
 							ProjectCreationLevel:           *gitlabProjectCreationLevelNew,
-							SubGroupCreationLevel:          *gitlabSubGroupCreationLevelNew,
+							SubGroupCreationLevel:          gitlab.SubGroupCreationLevelValue(*gitlabSubGroupCreationLevelNew),
 							MembershipLock:                 false,
 							ShareWithGroupLock:             false,
 							RequireTwoFactorAuth:           false,
@@ -449,7 +449,7 @@ func TestObserve(t *testing.T) {
 		"Description":                    "description v2",
 		"MembershipLock":                 true,
 		"ProjectCreationLevel":           *gitlabProjectCreationLevelNew,
-		"SubGroupCreationLevel":          *gitlabSubGroupCreationLevelNew,
+		"SubGroupCreationLevel":          gitlab.SubGroupCreationLevelValue(*gitlabSubGroupCreationLevelNew),
 		"Visibility":                     gitlabVisibilityNew,
 		"ShareWithGroupLock":             true,
 		"RequireTwoFactorAuth":           true,