Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 2 additions & 16 deletions pkg/cluster/controller/projects/projects/zz_project.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

28 changes: 28 additions & 0 deletions pkg/cluster/controller/projects/projects/zz_project_test.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 2 additions & 16 deletions pkg/namespaced/controller/projects/projects/project.go
Original file line number Diff line number Diff line change
Expand Up @@ -374,28 +374,12 @@ func (e *external) lateInitialize(ctx context.Context, cr *v1alpha1.Project, pro
}
in.MergeRequestsTemplate = clients.LateInitializeStringPtr(in.MergeRequestsTemplate, project.MergeRequestsTemplate)

if in.Mirror == nil {
in.Mirror = &project.Mirror
}
if in.MirrorOverwritesDivergedBranches == nil {
in.MirrorOverwritesDivergedBranches = &project.MirrorOverwritesDivergedBranches
}
if in.MirrorTriggerBuilds == nil {
in.MirrorTriggerBuilds = &project.MirrorTriggerBuilds
}
if in.MirrorUserID == nil && project.MirrorUserID != 0 { // since project.MirrorUserID is non-nullable, value `0` treated as `not set`
val := project.MirrorUserID
in.MirrorUserID = &val
}
if in.OnlyAllowMergeIfAllDiscussionsAreResolved == nil {
in.OnlyAllowMergeIfAllDiscussionsAreResolved = &project.OnlyAllowMergeIfAllDiscussionsAreResolved
}
if in.OnlyAllowMergeIfPipelineSucceeds == nil {
in.OnlyAllowMergeIfPipelineSucceeds = &project.OnlyAllowMergeIfPipelineSucceeds
}
if in.OnlyMirrorProtectedBranches == nil {
in.OnlyMirrorProtectedBranches = &project.OnlyMirrorProtectedBranches
}

in.OperationsAccessLevel = clients.LateInitializeAccessControlValue(in.OperationsAccessLevel, project.OperationsAccessLevel)

Expand Down Expand Up @@ -446,6 +430,8 @@ func (e *external) lateInitialize(ctx context.Context, cr *v1alpha1.Project, pro
in.Visibility = clients.LateInitializeVisibilityValue(in.Visibility, project.Visibility)
in.WikiAccessLevel = clients.LateInitializeAccessControlValue(in.WikiAccessLevel, project.WikiAccessLevel)

// Mirror fields are deliberately not late-initialized (see TestLateInitializeSkipsMirrorFields).

if err := e.lateInitializePushRules(ctx, cr); err != nil {
return errors.Wrap(err, errLateInitializePushRules)
}
Expand Down
28 changes: 28 additions & 0 deletions pkg/namespaced/controller/projects/projects/project_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -1538,3 +1538,31 @@ func TestSanitizeImportURL(t *testing.T) {
})
}
}

// TestLateInitializeSkipsMirrorFields guards against stamping mirror_user on
// non-mirrored projects: unset mirror fields must stay nil after late-init.
func TestLateInitializeSkipsMirrorFields(t *testing.T) {
e := &external{client: &fake.MockClient{
MockGetProjectPushRules: func(pid interface{}, options ...gitlab.RequestOptionFunc) (*gitlab.ProjectPushRules, *gitlab.Response, error) {
return nil, &gitlab.Response{Response: &http.Response{StatusCode: http.StatusNotFound}}, nil
},
}}
cr := &v1alpha1.Project{}
glProject := &gitlab.Project{
Mirror: true,
MirrorUserID: 5,
MirrorTriggerBuilds: true,
OnlyMirrorProtectedBranches: true,
MirrorOverwritesDivergedBranches: true,
}

if err := e.lateInitialize(context.Background(), cr, glProject); err != nil {
t.Fatalf("lateInitialize returned error: %v", err)
}

p := cr.Spec.ForProvider
if p.Mirror != nil || p.MirrorUserID != nil || p.MirrorTriggerBuilds != nil ||
p.OnlyMirrorProtectedBranches != nil || p.MirrorOverwritesDivergedBranches != nil {
t.Errorf("mirror fields must stay nil, got %+v", p)
}
}
Loading