Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
1e4d56e
Update default and max count for maxCookieNumber
zvlb Aug 4, 2023
0595d0c
fix(ui): Fixes health icon positioning (#14708) (#14852)
ashinsabu3 Aug 4, 2023
41975ca
chore: fix non-deterministic test (#14905)
crenshaw-dev Aug 4, 2023
3db0522
fix: Change underscore (_) back to plus (+) to get valid SemVer when …
xashr Aug 4, 2023
5f4e08c
fix(appset): typo in ARGOCD_APPLICATIONSET_CONTROLLER_ALLOWED_SCM_PRO…
speedfl Aug 7, 2023
aba4206
feat: provide short revision in ARGOCD_APP_REVISION_SHORT env variabl…
alexmt Aug 7, 2023
2961bba
chore(deps): bump github.com/aws/aws-sdk-go from 1.44.312 to 1.44.317…
dependabot[bot] Aug 7, 2023
66d61b2
chore(deps): bump golang.org/x/oauth2 from 0.10.0 to 0.11.0 (#14922)
dependabot[bot] Aug 7, 2023
2d4ff36
docs: Update Generators-Git.md (#14921)
Zebradil Aug 7, 2023
70b3e50
docs: Update helm.md - add missing syntax highlighting for YAML and D…
jessebot Aug 7, 2023
348f734
fix(ui): COPY JSON for ArgoCD version should include trailing newlin…
vipin-m-s Aug 7, 2023
c38a397
[Bot] docs: Update Snyk reports (#14919)
github-actions[bot] Aug 7, 2023
3ba1ae3
chore: give context to error logs (#10592) (#14915)
vipin-m-s Aug 7, 2023
a58f4c1
Fix test for http util
zvlb Aug 9, 2023
f3451cb
feat(appset): Add SCM Provider option for Gitlab generator to filter …
prune998 Aug 8, 2023
ec20f16
fix(cmp): send sigterm to cmp commands before sigkill to allow for po…
ashinsabu3 Aug 8, 2023
18906e2
Add test for MakeCookieMetadata with attributes
zvlb Aug 9, 2023
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
4 changes: 2 additions & 2 deletions applicationset/controllers/applicationset_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -448,7 +448,7 @@ func (r *ApplicationSetReconciler) validateGeneratedApplications(ctx context.Con

conditions, err := argoutil.ValidatePermissions(ctx, &app.Spec, proj, r.ArgoDB)
if err != nil {
return nil, err
return nil, fmt.Errorf("error validating permissions: %s", err)
}
if len(conditions) > 0 {
errorsByIndex[i] = fmt.Errorf("application spec is invalid: %s", argoutil.FormatAppConditions(conditions))
Expand Down Expand Up @@ -692,7 +692,7 @@ func (r *ApplicationSetReconciler) getCurrentApplications(_ context.Context, app
err := r.Client.List(context.Background(), &current, client.MatchingFields{".metadata.controller": applicationSet.Name})

if err != nil {
return nil, err
return nil, fmt.Errorf("error retrieving applications: %w", err)
}

return current.Items, nil
Expand Down
4 changes: 2 additions & 2 deletions applicationset/generators/duck_type.go
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ func (g *DuckTypeGenerator) GenerateParams(appSetGenerator *argoprojiov1alpha1.A
// ListCluster from Argo CD's util/db package will include the local cluster in the list of clusters
clustersFromArgoCD, err := utils.ListClusters(g.ctx, g.clientset, g.namespace)
if err != nil {
return nil, err
return nil, fmt.Errorf("error listing clusters: %w", err)
}

if clustersFromArgoCD == nil {
Expand All @@ -85,7 +85,7 @@ func (g *DuckTypeGenerator) GenerateParams(appSetGenerator *argoprojiov1alpha1.A
cm, err := g.clientset.CoreV1().ConfigMaps(g.namespace).Get(g.ctx, appSetGenerator.ClusterDecisionResource.ConfigMapRef, metav1.GetOptions{})

if err != nil {
return nil, err
return nil, fmt.Errorf("error reading configMapRef: %w", err)
}

// Extract GVK data for the dynamic client to use
Expand Down
2 changes: 1 addition & 1 deletion applicationset/generators/generator_spec_processor.go
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ func GetRelevantGenerators(requestedGenerator *argoprojiov1alpha1.ApplicationSet
func flattenParameters(in map[string]interface{}) (map[string]string, error) {
flat, err := flatten.Flatten(in, "", flatten.DotStyle)
if err != nil {
return nil, err
return nil, fmt.Errorf("error flatenning parameters: %w", err)
}

out := make(map[string]string, len(flat))
Expand Down
4 changes: 2 additions & 2 deletions applicationset/generators/matrix.go
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ func (m *MatrixGenerator) GenerateParams(appSetGenerator *argoprojiov1alpha1.App

g0, err := m.getParams(appSetGenerator.Matrix.Generators[0], appSet, nil)
if err != nil {
return nil, err
return nil, fmt.Errorf("error failed to get params for first generator in matrix generator: %w", err)
}
for _, a := range g0 {
g1, err := m.getParams(appSetGenerator.Matrix.Generators[1], appSet, a)
Expand Down Expand Up @@ -94,7 +94,7 @@ func (m *MatrixGenerator) getParams(appSetBaseGenerator argoprojiov1alpha1.Appli
}
mergeGen, err := getMergeGenerator(appSetBaseGenerator)
if err != nil {
return nil, err
return nil, fmt.Errorf("error retrieving merge generator: %w", err)
}
if mergeGen != nil && !appSet.Spec.ApplyNestedSelectors {
foundSelector := dropDisabledNestedSelectors(mergeGen.Generators)
Expand Down
2 changes: 1 addition & 1 deletion applicationset/generators/merge.go
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,7 @@ func getMergeGenerator(r argoprojiov1alpha1.ApplicationSetNestedGenerator) (*arg
}
merge, err := argoprojiov1alpha1.ToNestedMergeGenerator(r.Merge)
if err != nil {
return nil, err
return nil, fmt.Errorf("error converting to nested merge generator: %w", err)
}
return merge.ToMergeGenerator(), nil
}
Expand Down
2 changes: 1 addition & 1 deletion applicationset/generators/plugin.go
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ func (g *PluginGenerator) GenerateParams(appSetGenerator *argoprojiov1alpha1.App

res, err := g.generateParams(appSetGenerator, applicationSetInfo, list.Output.Parameters, appSetGenerator.Plugin.Input.Parameters, applicationSetInfo.Spec.GoTemplate)
if err != nil {
return nil, err
return nil, fmt.Errorf("error generating params: %w", err)
}

return res, nil
Expand Down
2 changes: 1 addition & 1 deletion applicationset/generators/scm_provider.go
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ func (g *SCMProviderGenerator) GenerateParams(appSetGenerator *argoprojiov1alpha
if err != nil {
return nil, fmt.Errorf("error fetching Gitlab token: %v", err)
}
provider, err = scm_provider.NewGitlabProvider(ctx, providerConfig.Gitlab.Group, token, providerConfig.Gitlab.API, providerConfig.Gitlab.AllBranches, providerConfig.Gitlab.IncludeSubgroups, providerConfig.Gitlab.Insecure, g.scmRootCAPath)
provider, err = scm_provider.NewGitlabProvider(ctx, providerConfig.Gitlab.Group, token, providerConfig.Gitlab.API, providerConfig.Gitlab.AllBranches, providerConfig.Gitlab.IncludeSubgroups, providerConfig.Gitlab.WillIncludeSharedProjects(), providerConfig.Gitlab.Insecure, g.scmRootCAPath)
if err != nil {
return nil, fmt.Errorf("error initializing Gitlab service: %v", err)
}
Expand Down
8 changes: 4 additions & 4 deletions applicationset/services/repo_service.go
Original file line number Diff line number Diff line change
Expand Up @@ -58,13 +58,13 @@ func (a *argoCDService) GetFiles(ctx context.Context, repoURL string, revision s
}
closer, client, err := a.repoServerClientSet.NewRepoServerClient()
if err != nil {
return nil, err
return nil, fmt.Errorf("error initialising new repo server client: %w", err)
}
defer io.Close(closer)

fileResponse, err := client.GetGitFiles(ctx, fileRequest)
if err != nil {
return nil, err
return nil, fmt.Errorf("error retrieving Git files: %w", err)
}
return fileResponse.GetMap(), nil
}
Expand All @@ -83,13 +83,13 @@ func (a *argoCDService) GetDirectories(ctx context.Context, repoURL string, revi

closer, client, err := a.repoServerClientSet.NewRepoServerClient()
if err != nil {
return nil, err
return nil, fmt.Errorf("error initialising new repo server client: %w", err)
}
defer io.Close(closer)

dirResponse, err := client.GetGitDirectories(ctx, dirRequest)
if err != nil {
return nil, err
return nil, fmt.Errorf("error retrieving Git Directories: %w", err)
}
return dirResponse.GetPaths(), nil

Expand Down
16 changes: 10 additions & 6 deletions applicationset/services/scm_provider/gitlab.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,16 @@ import (
)

type GitlabProvider struct {
client *gitlab.Client
organization string
allBranches bool
includeSubgroups bool
client *gitlab.Client
organization string
allBranches bool
includeSubgroups bool
includeSharedProjects bool
}

var _ SCMProviderService = &GitlabProvider{}

func NewGitlabProvider(ctx context.Context, organization string, token string, url string, allBranches, includeSubgroups, insecure bool, scmRootCAPath string) (*GitlabProvider, error) {
func NewGitlabProvider(ctx context.Context, organization string, token string, url string, allBranches, includeSubgroups, includeSharedProjects, insecure bool, scmRootCAPath string) (*GitlabProvider, error) {
// Undocumented environment variable to set a default token, to be used in testing to dodge anonymous rate limits.
if token == "" {
token = os.Getenv("GITLAB_TOKEN")
Expand All @@ -47,7 +48,8 @@ func NewGitlabProvider(ctx context.Context, organization string, token string, u
return nil, err
}
}
return &GitlabProvider{client: client, organization: organization, allBranches: allBranches, includeSubgroups: includeSubgroups}, nil

return &GitlabProvider{client: client, organization: organization, allBranches: allBranches, includeSubgroups: includeSubgroups, includeSharedProjects: includeSharedProjects}, nil
}

func (g *GitlabProvider) GetBranches(ctx context.Context, repo *Repository) ([]*Repository, error) {
Expand Down Expand Up @@ -75,7 +77,9 @@ func (g *GitlabProvider) ListRepos(ctx context.Context, cloneProtocol string) ([
opt := &gitlab.ListGroupProjectsOptions{
ListOptions: gitlab.ListOptions{PerPage: 100},
IncludeSubGroups: &g.includeSubgroups,
WithShared: &g.includeSharedProjects,
}

repos := []*Repository{}
for {
gitlabRepos, resp, err := g.client.Groups.ListGroupProjects(g.organization, opt)
Expand Down
Loading