feat: add dashboard URL to service instance (#865)

SAP · Jul 26, 2024 · ec29a47 · ec29a47
1 parent 021d3c9
commit ec29a47
Show file tree

Hide file tree

Showing 23 changed files with 3,029 additions and 3,008 deletions.
diff --git a/docs/data-sources/subaccount_service_instance.md b/docs/data-sources/subaccount_service_instance.md
@@ -46,6 +46,7 @@ data "btp_subaccount_service_instance" "by_name" {
 
 - `context` (String) Contextual data for the resource.
 - `created_date` (String) The date and time when the resource was created in [RFC3339](https://www.ietf.org/rfc/rfc3339.txt) format.
+- `dashboard_url` (String) The URL of the web-based management UI for the service instance.
 - `labels` (Map of Set of String) The set of words or phrases assigned to the service instance.
 - `last_modified` (String) The date and time when the resource was last modified in [RFC3339](https://www.ietf.org/rfc/rfc3339.txt) format.
 - `parameters` (String) The configuration parameters for the service instance.

diff --git a/docs/data-sources/subaccount_service_instances.md b/docs/data-sources/subaccount_service_instances.md
@@ -59,6 +59,7 @@ Read-Only:
 
 - `context` (String) Contextual data for the resource.
 - `created_date` (String) The date and time when the resource was created in [RFC3339](https://www.ietf.org/rfc/rfc3339.txt) format.
+- `dashboard_url` (String) The URL of the web-based management UI for the service instance.
 - `id` (String) The ID of the service instance.
 - `labels` (Map of Set of String) The set of words or phrases assigned to the service instance.
 - `last_modified` (String) The date and time when the resource was last modified in [RFC3339](https://www.ietf.org/rfc/rfc3339.txt) format.

diff --git a/docs/resources/subaccount_service_instance.md b/docs/resources/subaccount_service_instance.md
@@ -81,6 +81,7 @@ resource "btp_subaccount_service_instance" "xsuaa_application" {
 
 - `context` (String) Contextual data for the resource.
 - `created_date` (String) The date and time when the resource was created in [RFC3339](https://www.ietf.org/rfc/rfc3339.txt) format.
+- `dashboard_url` (String) The URL of the web-based management UI for the service instance.
 - `id` (String) The ID of the service instance.
 - `last_modified` (String) The date and time when the resource was last modified in [RFC3339](https://www.ietf.org/rfc/rfc3339.txt) format.
 - `platform_id` (String) The platform ID.

diff --git a/internal/provider/datasource_subaccount_service_instance.go b/internal/provider/datasource_subaccount_service_instance.go
@@ -118,6 +118,10 @@ You must be assigned to the admin or viewer role of the subaccount.`,
 				MarkdownDescription: "The set of words or phrases assigned to the service instance.",
 				Computed:            true,
 			},
+			"dashboard_url": schema.StringAttribute{
+				MarkdownDescription: "The URL of the web-based management UI for the service instance.",
+				Computed:            true,
+			},
 		},
 	}
 }

diff --git a/internal/provider/datasource_subaccount_service_instances.go b/internal/provider/datasource_subaccount_service_instances.go
@@ -29,6 +29,7 @@ type subaccountServiceInstancesValueConfig struct {
 	CreatedDate   types.String `tfsdk:"created_date"`
 	LastModified  types.String `tfsdk:"last_modified"`
 	Labels        types.Map    `tfsdk:"labels"`
+	DashboardUrl  types.String `tfsdk:"dashboard_url"`
 }
 
 type subaccountServiceInstancesDataSourceConfig struct {
@@ -136,6 +137,10 @@ You must be assigned to the admin or viewer role of the subaccount.`,
 							MarkdownDescription: "The set of words or phrases assigned to the service instance.",
 							Computed:            true,
 						},
+						"dashboard_url": schema.StringAttribute{
+							MarkdownDescription: "The URL of the web-based management UI for the service instance.",
+							Computed:            true,
+						},
 					},
 				},
 				Computed: true,
@@ -181,6 +186,7 @@ func (ds *subaccountServiceInstancesDataSource) Read(ctx context.Context, req da
 			Context:       types.StringValue(string(serviceInstance.Context)),
 			CreatedDate:   timeToValue(serviceInstance.CreatedAt),
 			LastModified:  timeToValue(serviceInstance.UpdatedAt),
+			DashboardUrl:  types.StringValue(serviceInstance.DashboardUrl),
 		}
 
 		val.Labels, diags = types.MapValueFrom(ctx, types.SetType{ElemType: types.StringType}, serviceInstance.Labels)

diff --git a/internal/provider/fixtures/datasource_subaccount_service_instance.by_id.yaml b/internal/provider/fixtures/datasource_subaccount_service_instance.by_id.yaml
diff --git a/internal/provider/fixtures/datasource_subaccount_service_instance.by_name.yaml b/internal/provider/fixtures/datasource_subaccount_service_instance.by_name.yaml
diff --git a/internal/provider/fixtures/datasource_subaccount_service_instances.all.yaml b/internal/provider/fixtures/datasource_subaccount_service_instances.all.yaml
diff --git a/internal/provider/fixtures/datasource_subaccount_service_instances.labelsfilter.yaml b/internal/provider/fixtures/datasource_subaccount_service_instances.labelsfilter.yaml
diff --git a/internal/provider/fixtures/datasource_subaccount_service_instances.namefilter.yaml b/internal/provider/fixtures/datasource_subaccount_service_instances.namefilter.yaml
diff --git a/internal/provider/fixtures/datasource_subaccount_service_instances.namefilter_variant.yaml b/internal/provider/fixtures/datasource_subaccount_service_instances.namefilter_variant.yaml
diff --git a/internal/provider/fixtures/resource_subaccount_service_instance.creation_error.yaml b/internal/provider/fixtures/resource_subaccount_service_instance.creation_error.yaml
diff --git a/internal/provider/fixtures/resource_subaccount_service_instance.import_error.yaml b/internal/provider/fixtures/resource_subaccount_service_instance.import_error.yaml
diff --git a/internal/provider/fixtures/resource_subaccount_service_instance.sharing_error.yaml b/internal/provider/fixtures/resource_subaccount_service_instance.sharing_error.yaml
diff --git a/internal/provider/fixtures/resource_subaccount_service_instance.with_labels.yaml b/internal/provider/fixtures/resource_subaccount_service_instance.with_labels.yaml
diff --git a/internal/provider/fixtures/resource_subaccount_service_instance.with_labels_change.yaml b/internal/provider/fixtures/resource_subaccount_service_instance.with_labels_change.yaml
diff --git a/internal/provider/fixtures/resource_subaccount_service_instance.with_parameters.yaml b/internal/provider/fixtures/resource_subaccount_service_instance.with_parameters.yaml
diff --git a/...nal/provider/fixtures/resource_subaccount_service_instance.with_sharing_conf_changed.yaml b/...nal/provider/fixtures/resource_subaccount_service_instance.with_sharing_conf_changed.yaml
diff --git a/internal/provider/fixtures/resource_subaccount_service_instance.with_sharing_enabled.yaml b/internal/provider/fixtures/resource_subaccount_service_instance.with_sharing_enabled.yaml
diff --git a/internal/provider/fixtures/resource_subaccount_service_instance.wo_parameters.yaml b/internal/provider/fixtures/resource_subaccount_service_instance.wo_parameters.yaml
diff --git a/internal/provider/fixtures/resource_subaccount_service_instance_with_timeouts.yaml b/internal/provider/fixtures/resource_subaccount_service_instance_with_timeouts.yaml
diff --git a/internal/provider/resource_subaccount_service_instance.go b/internal/provider/resource_subaccount_service_instance.go
@@ -150,6 +150,10 @@ You must be assigned to the admin or the service administrator role of the subac
 				MarkdownDescription: "The date and time when the resource was last modified in [RFC3339](https://www.ietf.org/rfc/rfc3339.txt) format.",
 				Computed:            true,
 			},
+			"dashboard_url": schema.StringAttribute{
+				MarkdownDescription: "The URL of the web-based management UI for the service instance.",
+				Computed:            true,
+			},
 		},
 	}
 }

diff --git a/internal/provider/type_subaccount_service_instance.go b/internal/provider/type_subaccount_service_instance.go
@@ -28,6 +28,7 @@ type subaccountServiceInstanceType struct {
 	LastModified         types.String   `tfsdk:"last_modified"`
 	Labels               types.Map      `tfsdk:"labels"`
 	Timeouts             timeouts.Value `tfsdk:"timeouts"`
+	DashboardUrl         types.String   `tfsdk:"dashboard_url"`
 }
 
 func subaccountServiceInstanceValueFrom(ctx context.Context, value servicemanager.ServiceInstanceResponseObject) (subaccountServiceInstanceType, diag.Diagnostics) {
@@ -45,6 +46,7 @@ func subaccountServiceInstanceValueFrom(ctx context.Context, value servicemanage
 		State:                types.StringValue(value.LastOperation.State),
 		CreatedDate:          timeToValue(value.CreatedAt),
 		LastModified:         timeToValue(value.UpdatedAt),
+		DashboardUrl:         types.StringValue(value.DashboardUrl),
 	}
 
 	var diags, diagnostics diag.Diagnostics
@@ -74,6 +76,7 @@ type subaccountServiceInstanceDataSourceType struct {
 	CreatedDate          types.String `tfsdk:"created_date"`
 	LastModified         types.String `tfsdk:"last_modified"`
 	Labels               types.Map    `tfsdk:"labels"`
+	DashboardUrl         types.String `tfsdk:"dashboard_url"`
 }
 
 func subaccountServiceInstanceDataSourceValueFrom(ctx context.Context, value servicemanager.ServiceInstanceResponseObject) (subaccountServiceInstanceDataSourceType, diag.Diagnostics) {
@@ -92,6 +95,7 @@ func subaccountServiceInstanceDataSourceValueFrom(ctx context.Context, value ser
 		Context:              types.StringValue(string(value.Context)),
 		CreatedDate:          timeToValue(value.CreatedAt),
 		LastModified:         timeToValue(value.UpdatedAt),
+		DashboardUrl:         types.StringValue(value.DashboardUrl),
 	}
 
 	var diags, diagnostics diag.Diagnostics