-
Notifications
You must be signed in to change notification settings - Fork 125
fix(gcp): allow org-level discovery when Projects.List returns zero results #737
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,57 @@ | ||
| package gcp | ||
|
|
||
| import ( | ||
| "testing" | ||
|
|
||
| "github.com/projectdiscovery/cloudlist/pkg/schema" | ||
| "github.com/stretchr/testify/assert" | ||
| "github.com/stretchr/testify/require" | ||
| ) | ||
|
|
||
| func TestNewOrganizationProvider_NoProjectsListedFallsBackToOrgLevel(t *testing.T) { | ||
| // When organization_id is set without project_ids, the provider should be | ||
| // created successfully regardless of whether Projects.List returns results. | ||
| // Previously, the code returned "no projects available for organization discovery" | ||
| // which blocked org-level Asset API discovery for SAs without project-list permission. | ||
|
|
||
| options := schema.OptionBlock{ | ||
| "provider": "gcp", | ||
| "organization_id": "123456789", | ||
| "extended_metadata": "false", | ||
| } | ||
|
|
||
| provider, err := newOrganizationProvider(options, "test-id", "", "123456789") | ||
|
|
||
| if err != nil { | ||
| assert.NotContains(t, err.Error(), "no projects available for organization discovery", | ||
| "org-level provider should not fail just because Projects.List returns 0 projects") | ||
| t.Skipf("skipping (no GCP creds): %v", err) | ||
| } | ||
|
|
||
| require.NotNil(t, provider) | ||
| assert.Equal(t, "123456789", provider.organizationID) | ||
| assert.Nil(t, provider.projectScope, "projectScope should be nil for org-level discovery") | ||
| } | ||
|
|
||
| func TestNewOrganizationProvider_ConfiguredProjectsStillValidated(t *testing.T) { | ||
| // When project_ids are explicitly configured, we should still fail if they | ||
| // resolve to an empty list — this is a real config error. | ||
| options := schema.OptionBlock{ | ||
| "provider": "gcp", | ||
| "organization_id": "123456789", | ||
| "project_ids": "", | ||
| } | ||
|
|
||
| provider, err := newOrganizationProvider(options, "test-id", "", "123456789") | ||
|
|
||
| // With empty project_ids, getProjectIDsFromOptions returns nil, so it | ||
| // takes the org-level path (no project scope). Should not fail. | ||
| if err != nil { | ||
| assert.NotContains(t, err.Error(), "no projects available", | ||
| "empty project_ids should fall through to org-level discovery") | ||
| t.Skipf("skipping in CI (no GCP creds): %v", err) | ||
| } | ||
|
|
||
| require.NotNil(t, provider) | ||
| assert.Nil(t, provider.projectScope) | ||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.