Fixed incorrect depsdev getporject #1438

naveensrinivasan · 2023-10-25T14:52:52Z

Description of the PR

Fixed the issue of incorrect GetProject issue
Fixes [bug] some deps.dev GetProject RPCs fail #1413

PR Checklist

All commits have a Developer Certificate of Origin (DCO) -- they are generated using -s flag to git commit.
All new changes are covered by tests
If GraphQL schema is changed, make generate has been run
If collectsub protobuf has been changed, make proto has been run
All CI checks are passing (tests and formatting)
All dependent PRs have already been merged

- Fixed the issue of incorrect GetProject issue - Fixes guacsec#1413 Signed-off-by: naveensrinivasan <172697+naveensrinivasan@users.noreply.github.com>

mdeicas

Thanks @naveensrinivasan! A few comments

mdeicas · 2023-10-25T21:44:01Z

pkg/handler/collector/deps_dev/deps_dev.go

@@ -568,7 +567,7 @@ func (d *depsCollector) collectAdditionalMetadata(ctx context.Context, pkgType s
 				logger.Debugf("The project key was not found in the map: %v", projectReq.ProjectKey)
 				project, err = d.client.GetProject(ctx, projectReq)
 				if err != nil {
-					logger.Debugf("unable to get project for: %v, error: %v", projectReq.ProjectKey.Id, err)
+					logger.Infof("unable to get project for: %v, error: %v", projectReq.ProjectKey.Id, err)


nit: This query will still fail for various reasons, so I think it will be too verbose for Info level. Keeping it as Debug should be fine because #1422 will be merged soon.

Kept it as a debug in PR #2009

mdeicas · 2023-10-25T21:45:23Z

pkg/handler/collector/deps_dev/deps_dev_test.go

+				t.Errorf("NewDepsCollector() error = %v", err)
+				return
+			}
+			if err := c.collectAdditionalMetadata(context.Background(), tt.pkgType, tt.namespace, tt.name, tt.version, tt.pkgComponent); (err != nil) != tt.wantErr {


nit: use ctx defined above instead of context.Background()

Using ctx instead of context.Background in PR #2009.

mdeicas · 2023-10-25T21:55:44Z

pkg/handler/collector/deps_dev/deps_dev_test.go

+				t.Errorf("NewDepsCollector() error = %v", err)
+				return
+			}
+			if err := c.collectAdditionalMetadata(context.Background(), tt.pkgType, tt.namespace, tt.name, tt.version, tt.pkgComponent); (err != nil) != tt.wantErr {


If retrieving the project fails, then collectAdditionalMetadata logs the error instead of returning it. As a result, this test doesn't really capture what is intended to be tested (i.e. that the d.client.GetProject call does not fail).

You are right, collectAdditionalMetadata has logs instead of errors, so the tests are now checking the logs to see whether they contain the expected error. Again, this is in PR #2009.

mdeicas · 2023-10-25T22:01:12Z

pkg/assembler/helpers/vcs.go

+	// Based on the issue https://github.com/guacsec/guac/issues/1413, we need to ensure
+	// that the .git suffix is removed from the repository name. This is because some
+	// repository URLs might include the .git suffix which is not expected by certain endpoints.
+	m.Name = strings.TrimSuffix(m.Name, ".git")


Should we also trim .git after possibly removing the version? If there is a version specified after the .git then it won't be removed.

Yeah, the code now trims the .git after removing the version. Thanks!

stale · 2023-12-26T15:51:10Z

This pull request has been automatically marked as stale because it has not had recent activity (60 days of inactivity).
It will be closed in 30 days if no further activity occurs.
Thank you for your contribution!

lumjjb · 2024-01-02T14:32:03Z

Hi @naveensrinivasan just pinging on this from stale-bot notification - are you still looking to finish up this PR?

stale · 2024-03-02T15:18:32Z

This pull request has been automatically marked as stale because it has not had recent activity (60 days of inactivity).
It will be closed in 30 days if no further activity occurs.
Thank you for your contribution!

pxp928 · 2024-03-04T13:13:53Z

@naveensrinivasan should we close this or will you be finishing it up? Thanks

naveensrinivasan · 2024-03-04T14:20:25Z

@naveensrinivasan should we close this or will you be finishing it up? Thanks

Sorry I don't have cycles now.

stale · 2024-05-03T17:12:28Z

This pull request has been automatically marked as stale because it has not had recent activity (60 days of inactivity).
It will be closed in 30 days if no further activity occurs.
Thank you for your contribution!

stale · 2024-06-02T18:49:16Z

This pull request has been automatically closed because there has been no activity for 90 days.
Please feel free to reopen it (or open a new one) if the proposed change is still appropriate.
Thank you for your contribution!

pxp928 · 2024-06-02T21:02:11Z

Reopening as the fix may be needed.

nathannaveen · 2024-07-09T17:28:44Z

This PR is being continued in #2009.

pxp928 · 2024-07-16T12:44:17Z

Closing this as continued work in #2009.

naveensrinivasan requested a review from mihaimaruseac as a code owner October 25, 2023 14:52

pull-request-size bot added the size/M label Oct 25, 2023

Fixed incorrect depsdev getporject

1843c45

- Fixed the issue of incorrect GetProject issue - Fixes guacsec#1413 Signed-off-by: naveensrinivasan <172697+naveensrinivasan@users.noreply.github.com>

naveensrinivasan force-pushed the naveen/fix-deps-dev-project-key branch from 916ad99 to 1843c45 Compare October 25, 2023 21:15

mdeicas reviewed Oct 25, 2023

View reviewed changes

stale bot added the wontfix This will not be worked on label Dec 26, 2023

stale bot removed the wontfix This will not be worked on label Jan 2, 2024

stale bot added the wontfix This will not be worked on label Mar 2, 2024

stale bot removed the wontfix This will not be worked on label Mar 4, 2024

stale bot added the wontfix This will not be worked on label May 3, 2024

stale bot closed this Jun 2, 2024

pxp928 reopened this Jun 2, 2024

stale bot removed the wontfix This will not be worked on label Jun 2, 2024

nathannaveen mentioned this pull request Jul 9, 2024

Fixed incorrect depsdev getProject #2009

Merged

9 tasks

pxp928 closed this Jul 16, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fixed incorrect depsdev getporject #1438

Fixed incorrect depsdev getporject #1438

naveensrinivasan commented Oct 25, 2023 •

edited

Loading

mdeicas left a comment

mdeicas Oct 25, 2023

nathannaveen Jul 9, 2024

mdeicas Oct 25, 2023

nathannaveen Jul 9, 2024

mdeicas Oct 25, 2023

nathannaveen Jul 9, 2024

mdeicas Oct 25, 2023

nathannaveen Jul 9, 2024

stale bot commented Dec 26, 2023

lumjjb commented Jan 2, 2024

stale bot commented Mar 2, 2024

pxp928 commented Mar 4, 2024

naveensrinivasan commented Mar 4, 2024

stale bot commented May 3, 2024

stale bot commented Jun 2, 2024

pxp928 commented Jun 2, 2024

nathannaveen commented Jul 9, 2024

pxp928 commented Jul 16, 2024

Fixed incorrect depsdev getporject #1438

Fixed incorrect depsdev getporject #1438

Conversation

naveensrinivasan commented Oct 25, 2023 • edited Loading

Description of the PR

PR Checklist

mdeicas left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

stale bot commented Dec 26, 2023

lumjjb commented Jan 2, 2024

stale bot commented Mar 2, 2024

pxp928 commented Mar 4, 2024

naveensrinivasan commented Mar 4, 2024

stale bot commented May 3, 2024

stale bot commented Jun 2, 2024

pxp928 commented Jun 2, 2024

nathannaveen commented Jul 9, 2024

pxp928 commented Jul 16, 2024

naveensrinivasan commented Oct 25, 2023 •

edited

Loading