refactor: adjust project_api_key to new file structure #1676
Conversation
This file contains 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
gssbzn
reviewed
Nov 28, 2023
| @@ -108,8 +109,8 @@ func getDataSourcesMap() map[string]*schema.Resource { | |||
| "mongodbatlas_api_keys": mongodbatlas.DataSourceAPIKeys(), | |||
| "mongodbatlas_access_list_api_key": mongodbatlas.DataSourceAccessListAPIKey(), | |||
| "mongodbatlas_access_list_api_keys": mongodbatlas.DataSourceAccessListAPIKeys(), | |||
| "mongodbatlas_project_api_key": mongodbatlas.DataSourceProjectAPIKey(), | |||
| "mongodbatlas_project_api_keys": mongodbatlas.DataSourceProjectAPIKeys(), | |||
| "mongodbatlas_project_api_key": projectapikey.DataSourceProjectAPIKey(), | |||
There was a problem hiding this comment.
[nit-non-blocking] given the decision on one package per resource and to follow the "don't stutter" general recommendation of go
Suggested change
| "mongodbatlas_project_api_key": projectapikey.DataSourceProjectAPIKey(), | |
| "mongodbatlas_project_api_key": projectapikey.DataSource(), |
There was a problem hiding this comment.
this makes sense, will do a followup PR to adjust all of the resources that have already been adjusted to new structure.
gssbzn
reviewed
Nov 28, 2023
mongodbatlas/data_source_org_id.go
Outdated
| @@ -42,7 +43,7 @@ func dataSourceMongoDBAtlasOrgIDRead(ctx context.Context, d *schema.ResourceData | |||
| for idx, role := range apiKeyOrgList.APIKey.Roles { | |||
| if strings.HasPrefix(role.RoleName, "ORG_") { | |||
| if err := d.Set("org_id", apiKeyOrgList.APIKey.Roles[idx].OrgID); err != nil { | |||
| return diag.Errorf(ErrorProjectSetting, `org_id`, root.APIKey.ID, err) | |||
| return diag.Errorf(projectapikey.ErrorProjectSetting, `org_id`, root.APIKey.ID, err) | |||
There was a problem hiding this comment.
this error seems to be defined in the wrong package
There was a problem hiding this comment.
yeah this message was not accurate, adjusted and left a new constant to help with consistency in error messages
gssbzn
approved these changes
Nov 28, 2023
…setting attribute errors
|
lantoli
approved these changes
Nov 29, 2023
|
the failing test is the flaky test so feel free to merge even if that failing test |
12 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Description
Link to any related issue(s): INTMDB-1387
Type of change:
Required Checklist:
Further comments