fix: adjust priority for config namespace

chengjoey · Sep 25, 2024 · b7446bf · b7446bf
1 parent 154b5f3
commit b7446bf
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/internal/apps/dop/endpoints/pipeline.go b/internal/apps/dop/endpoints/pipeline.go
@@ -97,8 +97,10 @@ func (e *Endpoints) pipelineCreate(ctx context.Context, r *http.Request, vars ma
 	}
 
 	// also add project/org default config namespace
-	reqPipeline.ConfigManageNamespaces = append(reqPipeline.ConfigManageNamespaces, makeOrgDefaultLevelCmsNs(app.OrgID)...)
-	reqPipeline.ConfigManageNamespaces = append(reqPipeline.ConfigManageNamespaces, makeProjectDefaultLevelCmsNs(app.ProjectID)...)
+	// priority: org->project->app->user
+	reqPipeline.ConfigManageNamespaces = append(append(makeOrgDefaultLevelCmsNs(app.OrgID),
+		makeProjectDefaultLevelCmsNs(app.ProjectID)...),
+		reqPipeline.ConfigManageNamespaces...)
 
 	rules, err := e.branchRule.Query(apistructs.ProjectScope, int64(app.ProjectID))
 	if err != nil {