feat: Project scoped repo (argoproj#6943)

feat: Project scoped repo (argoproj#6943)

Signed-off-by: pashavictorovich <[email protected]>

assets/swagger.json

@@ -2081,6 +2081,37 @@
  }
  }
  },
+ "/api/v1/projects/{name}/detailed": {
+ "get": {
+ "tags": [
+ "ProjectService"
+ ],
+ "summary": "GetDetailedProject returns a project that include project, global project and scoped resources by name",
+ "operationId": "ProjectService_GetDetailedProject",
+ "parameters": [
+ {
+ "type": "string",
+ "name": "name",
+ "in": "path",
+ "required": true
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "A successful response.",
+ "schema": {
+ "$ref": "#/definitions/projectDetailedProjectsResponse"
+ }
+ },
+ "default": {
+ "description": "An unexpected error response.",
+ "schema": {
+ "$ref": "#/definitions/runtimeError"
+ }
+ }
+ }
+ }
+ },
  "/api/v1/projects/{name}/events": {
  "get": {
  "tags": [
@@ -2863,6 +2894,12 @@
  "description": "HTTP/HTTPS proxy to access the repository.",
  "name": "proxy",
  "in": "query"
+ },
+ {
+ "type": "string",
+ "description": "Reference between project and repository that allow you automatically to be added as item inside SourceRepos project entity.",
+ "name": "project",
+ "in": "query"
  }
  ],
  "responses": {
@@ -3674,6 +3711,26 @@
  }
  }
  },
+ "projectDetailedProjectsResponse": {
+ "type": "object",
+ "properties": {
+ "globalProjects": {
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/v1alpha1AppProject"
+ }
+ },
+ "project": {
+ "$ref": "#/definitions/v1alpha1AppProject"
+ },
+ "repositories": {
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/v1alpha1Repository"
+ }
+ }
+ }
+ },
  "projectEmptyResponse": {
  "type": "object"
  },
@@ -5846,6 +5903,10 @@
  "type": "string",
  "title": "Password contains the password or PAT used for authenticating at the remote repository"
  },
+ "project": {
+ "type": "string",
+ "title": "Reference between project and repository that allow you automatically to be added as item inside SourceRepos project entity"
+ },
  "proxy": {
  "type": "string",
  "title": "Proxy specifies the HTTP/HTTPS proxy used to access the repo"

cmd/argocd/commands/repo.go

@@ -182,6 +182,7 @@ func NewRepoAddCommand(clientOpts *argocdclient.ClientOptions) *cobra.Command {
  GithubAppInstallationID: repoOpts.Repo.GithubAppInstallationId,
  GithubAppEnterpriseBaseUrl: repoOpts.Repo.GitHubAppEnterpriseBaseURL,
  Proxy: repoOpts.Proxy,
+ Project: repoOpts.Repo.Project,
  }
  _, err := repoIf.ValidateAccess(context.Background(), &repoAccessReq)
  errors.CheckError(err)

cmd/util/repo.go

@@ -27,6 +27,7 @@ type RepoOptions struct {
 func AddRepoFlags(command *cobra.Command, opts *RepoOptions) {
  command.Flags().StringVar(&opts.Repo.Type, "type", common.DefaultRepoType, "type of the repository, \"git\" or \"helm\"")
  command.Flags().StringVar(&opts.Repo.Name, "name", "", "name of the repository, mandatory for repositories of type helm")
+ command.Flags().StringVar(&opts.Repo.Project, "project", "", "project of the repository")
  command.Flags().StringVar(&opts.Repo.Username, "username", "", "username to the repository")
  command.Flags().StringVar(&opts.Repo.Password, "password", "", "password to the repository")
  command.Flags().StringVar(&opts.SshPrivateKeyPath, "ssh-private-key-path", "", "path to the private ssh key (e.g. ~/.ssh/id_rsa)")

controller/appcontroller.go

@@ -231,7 +231,7 @@ func isSelfReferencedApp(app *appv1.Application, ref v1.ObjectReference) bool {
 }
 
 func (ctrl *ApplicationController) getAppProj(app *appv1.Application) (*appv1.AppProject, error) {
- return argo.GetAppProject(&app.Spec, applisters.NewAppProjectLister(ctrl.projInformer.GetIndexer()), ctrl.namespace, ctrl.settingsMgr)
+ return argo.GetAppProject(&app.Spec, applisters.NewAppProjectLister(ctrl.projInformer.GetIndexer()), ctrl.namespace, ctrl.settingsMgr, ctrl.db, context.TODO())
 }
 
 func (ctrl *ApplicationController) handleObjectUpdated(managedByApp map[string]bool, ref v1.ObjectReference) {
@@ -316,7 +316,7 @@ func isKnownOrphanedResourceExclusion(key kube.ResourceKey, proj *appv1.AppProje
 func (ctrl *ApplicationController) getResourceTree(a *appv1.Application, managedResources []*appv1.ResourceDiff) (*appv1.ApplicationTree, error) {
  nodes := make([]appv1.ResourceNode, 0)
 
- proj, err := argo.GetAppProject(&a.Spec, applisters.NewAppProjectLister(ctrl.projInformer.GetIndexer()), ctrl.namespace, ctrl.settingsMgr)
+ proj, err := argo.GetAppProject(&a.Spec, applisters.NewAppProjectLister(ctrl.projInformer.GetIndexer()), ctrl.namespace, ctrl.settingsMgr, ctrl.db, context.TODO())
  if err != nil {
  return nil, err
  }

controller/sync.go

@@ -87,7 +87,7 @@ func (m *appStateManager) SyncAppState(app *v1alpha1.Application, state *v1alpha
  revision = syncOp.Revision
  }
 
- proj, err := argo.GetAppProject(&app.Spec, listersv1alpha1.NewAppProjectLister(m.projInformer.GetIndexer()), m.namespace, m.settingsMgr)
+ proj, err := argo.GetAppProject(&app.Spec, listersv1alpha1.NewAppProjectLister(m.projInformer.GetIndexer()), m.namespace, m.settingsMgr, m.db, context.TODO())
  if err != nil {
  state.Phase = common.OperationError
  state.Message = fmt.Sprintf("Failed to load application project: %v", err)

docs/user-guide/commands/argocd_admin_repo_generate-spec.md

@@ -48,6 +48,7 @@ argocd admin repo generate-spec REPOURL [flags]
  --name string name of the repository, mandatory for repositories of type helm
  -o, --output string Output format. One of: json|yaml (default "yaml")
  --password string password to the repository
+ --project string project of the repository
  --proxy string use proxy to access repository
  --ssh-private-key-path string path to the private ssh key (e.g. ~/.ssh/id_rsa)
  --tls-client-cert-key-path string path to the TLS client cert's key path (must be PEM format)

docs/user-guide/commands/argocd_repo_add.md

@@ -52,6 +52,7 @@ argocd repo add REPOURL [flags]
  --insecure-skip-server-verification disables server certificate and host key checks
  --name string name of the repository, mandatory for repositories of type helm
  --password string password to the repository
+ --project string project of the repository
  --proxy string use proxy to access repository
  --ssh-private-key-path string path to the private ssh key (e.g. ~/.ssh/id_rsa)
  --tls-client-cert-key-path string path to the TLS client cert's key path (must be PEM format)

hack/generate-proto.sh

@@ -125,7 +125,7 @@ clean_swagger() {
 }
 
 echo "If additional types are added, the number of expected collisions may need to be increased"
-EXPECTED_COLLISION_COUNT=55
+EXPECTED_COLLISION_COUNT=57
 collect_swagger server ${EXPECTED_COLLISION_COUNT}
 clean_swagger server
 clean_swagger reposerver