feat: Adds new ip_addresses computed attribute in mongodbatlas_project resource and data sources
#1850
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -30,15 +30,16 @@ type projectDS struct { | |
| config.DSCommon | ||
| } | ||
|
|
||
| type TFProjectDSModel struct { | ||
| IPAddresses types.Object `tfsdk:"ip_addresses"` | ||
| Created types.String `tfsdk:"created"` | ||
| OrgID types.String `tfsdk:"org_id"` | ||
| RegionUsageRestrictions types.String `tfsdk:"region_usage_restrictions"` | ||
| ID types.String `tfsdk:"id"` | ||
| Name types.String `tfsdk:"name"` | ||
| ProjectID types.String `tfsdk:"project_id"` | ||
| Teams []*TFTeamDSModel `tfsdk:"teams"` | ||
| Limits []*TFLimitModel `tfsdk:"limits"` | ||
| ClusterCount types.Int64 `tfsdk:"cluster_count"` | ||
| IsCollectDatabaseSpecificsStatisticsEnabled types.Bool `tfsdk:"is_collect_database_specifics_statistics_enabled"` | ||
| IsRealtimePerformancePanelEnabled types.Bool `tfsdk:"is_realtime_performance_panel_enabled"` | ||
|
|
@@ -48,7 +49,7 @@ type TfProjectDSModel struct { | |
| IsDataExplorerEnabled types.Bool `tfsdk:"is_data_explorer_enabled"` | ||
| } | ||
|
|
||
| type TFTeamDSModel struct { | ||
| TeamID types.String `tfsdk:"team_id"` | ||
| RoleNames types.List `tfsdk:"role_names"` | ||
| } | ||
|
|
@@ -137,12 +138,40 @@ func (d *projectDS) Schema(ctx context.Context, req datasource.SchemaRequest, re | |
| }, | ||
| }, | ||
| }, | ||
| "ip_addresses": schema.SingleNestedAttribute{ | ||
|
There was a problem hiding this comment. can something be used from project_ip_access_list resource/ds or they're different concepts? There was a problem hiding this comment. They seem to be different concepts. From testing I can see that it provides the IP address of each cluster node. This scope document gives some more details as to users that would leverage these ip addresses |
||
| Computed: true, | ||
| Attributes: map[string]schema.Attribute{ | ||
| "services": schema.SingleNestedAttribute{ | ||
|
There was a problem hiding this comment. what is services adding as opposed to not having it? There was a problem hiding this comment. Here I am sticking to the structure defined in the API. From the scope doc:
I believe sticking to this structure will avoid breaking changes in the future as more services are added. Also synced with Zuhair on this in the jira comments. |
||
| Computed: true, | ||
| Attributes: map[string]schema.Attribute{ | ||
| "clusters": schema.ListNestedAttribute{ | ||
| Computed: true, | ||
| NestedObject: schema.NestedAttributeObject{ | ||
|
There was a problem hiding this comment. it seems like IP addresses are associated to clusters in the project? wouldn't it make more sense then that IP addresses are returned in the clustest/adv_cluster resource instead of project? or in addition to be returned in project? There was a problem hiding this comment. This a fair point. The main reason I see for including in the project resource is due to the endpoint being tagged in the project section (https://www.mongodb.com/docs/atlas/reference/api-resources-spec/v2/#tag/Projects/operation/returnAllIPAddresses). |
||
| Attributes: map[string]schema.Attribute{ | ||
| "cluster_name": schema.StringAttribute{ | ||
| Computed: true, | ||
| }, | ||
| "inbound": schema.ListAttribute{ | ||
| ElementType: types.StringType, | ||
| Computed: true, | ||
| }, | ||
| "outbound": schema.ListAttribute{ | ||
| ElementType: types.StringType, | ||
| Computed: true, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| } | ||
| } | ||
|
|
||
| func (d *projectDS) Read(ctx context.Context, req datasource.ReadRequest, resp *datasource.ReadResponse) { | ||
| var projectState TFProjectDSModel | ||
| connV2 := d.Client.AtlasV2 | ||
|
|
||
| resp.Diagnostics.Append(req.Config.Get(ctx, &projectState)...) | ||
|
|
@@ -173,15 +202,19 @@ func (d *projectDS) Read(ctx context.Context, req datasource.ReadRequest, resp * | |
| } | ||
| } | ||
|
|
||
| projectProps, err := GetProjectPropsFromAPI(ctx, ServiceFromClient(connV2), project.GetId()) | ||
| if err != nil { | ||
| resp.Diagnostics.AddError("error when getting project properties", fmt.Sprintf(ErrorProjectRead, project.GetId(), err.Error())) | ||
| return | ||
| } | ||
|
|
||
| newProjectState, diags := NewTFProjectDataSourceModel(ctx, project, *projectProps) | ||
| resp.Diagnostics.Append(diags...) | ||
| if resp.Diagnostics.HasError() { | ||
| return | ||
| } | ||
|
|
||
| resp.Diagnostics.Append(resp.State.Set(ctx, &newProjectState)...) | ||
| if resp.Diagnostics.HasError() { | ||
| return | ||
| } | ||
|
|
||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
mockery config file was not working as expected, only the last package (in this case
advancedcluster) was used for generating mocks.