Merge pull request #2219 from crossplane-contrib/backport-2218-to-release-0.52

[Backport release-0.52] feat(transfer): add homedirectorymapping uptodate check

Author: anagarlau

pkg/controller/transfer/user/setup.go

@@ -167,7 +167,7 @@ func (h *hooks) isUpToDate(_ context.Context, cr *svcapitypes.User, obj *svcsdk.
 	var areTagsUpToDate bool
 	areTagsUpToDate, h.cache.tagsToAdd, h.cache.tagsToDelete = utils.DiffTags(cr.Spec.ForProvider.Tags, obj.User.Tags)
 
-	return areKeysUpToDate && areTagsUpToDate, "", nil
+	return areKeysUpToDate && areTagsUpToDate && isMappingsUpToDate(cr, obj), "", nil
 }
 
 func isSSHPublicKeysUpToDate(cr *svcapitypes.User, obj *svcsdk.DescribeUserOutput) (isUpToDate bool, toAdd, toRemove []string) {
@@ -199,6 +199,34 @@ func isSSHPublicKeysUpToDate(cr *svcapitypes.User, obj *svcsdk.DescribeUserOutpu
 	return len(toRemove) == 0 && len(toAdd) == 0, toAdd, toRemove
 }
 
+func isMappingsUpToDate(cr *svcapitypes.User, obj *svcsdk.DescribeUserOutput) bool {
+	specMap := make(map[string]string, len(cr.Spec.ForProvider.HomeDirectoryMappings))
+	for _, k := range cr.Spec.ForProvider.HomeDirectoryMappings {
+		specMap[*k.Entry] = *k.Target
+	}
+
+	curMap := make(map[string]string, len(obj.User.HomeDirectoryMappings))
+
+	for _, mapping := range obj.User.HomeDirectoryMappings {
+		body := ptr.Deref(mapping.Entry, "")
+		curMap[body] = ptr.Deref(mapping.Target, "")
+
+		if _, exists := specMap[body]; !exists {
+			return false
+		}
+	}
+
+	for key, value := range specMap {
+		if val, exists := curMap[key]; !exists {
+			return false
+		} else if value != val {
+			return false
+		}
+	}
+
+	return true
+}
+
 func preCreate(_ context.Context, cr *svcapitypes.User, obj *svcsdk.CreateUserInput) error {
 	obj.ServerId = cr.Spec.ForProvider.ServerID
 	obj.Role = cr.Spec.ForProvider.Role

pkg/controller/transfer/user/setup_test.go

@@ -1277,3 +1277,148 @@ func TestIsSSHPublicKeysUpToDate(t *testing.T) {
 		})
 	}
 }
+
+func TestIsMappingUpToDate(t *testing.T) {
+	type args struct {
+		cr  *svcapitypes.User
+		obj *svcsdk.DescribeUserOutput
+	}
+
+	type want struct {
+		isUpToDate bool
+	}
+
+	cases := map[string]struct {
+		args
+		want
+	}{
+		"NeedsUpdate": {
+			args: args{
+				cr: user(
+					withExternalName("test"),
+					withSpec(svcapitypes.UserParameters{
+						Region: "us-east-1",
+						HomeDirectoryMappings: []*svcapitypes.HomeDirectoryMapEntry{
+							{
+								Entry:  ptr.To("entry"),
+								Target: ptr.To("target"),
+							},
+						},
+						CustomUserParameters: svcapitypes.CustomUserParameters{
+							ServerID: ptr.To("server"),
+							Role:     ptr.To("role"),
+							SSHPublicKeys: []svcapitypes.SSHPublicKeySpec{
+								{
+									Body: "some-public-key",
+								},
+							},
+						},
+					}),
+					withStatus(svcapitypes.UserObservation{
+						ARN: ptr.To("ARN"),
+					}),
+				),
+				obj: &svcsdk.DescribeUserOutput{
+					User: &svcsdk.DescribedUser{
+						HomeDirectoryMappings: []*svcsdk.HomeDirectoryMapEntry{},
+					},
+				},
+			},
+			want: want{
+				isUpToDate: false,
+			},
+		},
+		"NeedsUpdateNewTarget": {
+			args: args{
+				cr: user(
+					withExternalName("test"),
+					withSpec(svcapitypes.UserParameters{
+						Region: "us-east-1",
+						HomeDirectoryMappings: []*svcapitypes.HomeDirectoryMapEntry{
+							{
+								Entry:  ptr.To("entry"),
+								Target: ptr.To("targetnew"),
+							},
+						},
+						CustomUserParameters: svcapitypes.CustomUserParameters{
+							ServerID: ptr.To("server"),
+							Role:     ptr.To("role"),
+							SSHPublicKeys: []svcapitypes.SSHPublicKeySpec{
+								{
+									Body: "some-public-key",
+								},
+							},
+						},
+					}),
+					withStatus(svcapitypes.UserObservation{
+						ARN: ptr.To("ARN"),
+					}),
+				),
+				obj: &svcsdk.DescribeUserOutput{
+					User: &svcsdk.DescribedUser{
+						HomeDirectoryMappings: []*svcsdk.HomeDirectoryMapEntry{
+							{
+								Entry:  ptr.To("entry"),
+								Target: ptr.To("target"),
+							},
+						},
+					},
+				},
+			},
+			want: want{
+				isUpToDate: false,
+			},
+		},
+		"IsUpToDate": {
+			args: args{
+				cr: user(
+					withExternalName("test"),
+					withSpec(svcapitypes.UserParameters{
+						Region: "us-east-1",
+						HomeDirectoryMappings: []*svcapitypes.HomeDirectoryMapEntry{
+							{
+								Entry:  ptr.To("entry"),
+								Target: ptr.To("target"),
+							},
+						},
+						CustomUserParameters: svcapitypes.CustomUserParameters{
+							ServerID: ptr.To("server"),
+							Role:     ptr.To("role"),
+							SSHPublicKeys: []svcapitypes.SSHPublicKeySpec{
+								{
+									Body: "some-public-key",
+								},
+							},
+						},
+					}),
+					withStatus(svcapitypes.UserObservation{
+						ARN: ptr.To("ARN"),
+					}),
+				),
+				obj: &svcsdk.DescribeUserOutput{
+					User: &svcsdk.DescribedUser{
+						HomeDirectoryMappings: []*svcsdk.HomeDirectoryMapEntry{
+							{
+								Entry:  ptr.To("entry"),
+								Target: ptr.To("target"),
+							},
+						},
+					},
+				},
+			},
+			want: want{
+				isUpToDate: true,
+			},
+		},
+	}
+
+	for name, tc := range cases {
+		t.Run(name, func(t *testing.T) {
+			isUpToDate := isMappingsUpToDate(tc.args.cr, tc.args.obj)
+
+			if diff := cmp.Diff(tc.want.isUpToDate, isUpToDate, test.EquateErrors()); diff != "" {
+				t.Errorf("isUpToDate: -want, +got:\n%s", diff)
+			}
+		})
+	}
+}