upgrade gofish to v0.19.0

dell · Sep 24, 2024 · 112410b · 112410b
1 parent 514c713
commit 112410b
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 14 deletions.
diff --git a/gofish/dell/updateService.go b/gofish/dell/updateService.go
@@ -73,7 +73,8 @@ func (u *UpdateServiceActions) UnmarshalJSON(data []byte) error {
 // UpdateService returns a Dell.UpdateServiceExtended pointer given a redfish.UpdateService pointer from gofish library
 // This is the wrapper that extracts and parses Dell UpdateService OEM actions
 func UpdateService(updateService *redfish.UpdateService) (*UpdateServiceExtended, error) {
-	dellUpdate := UpdateServiceExtended{UpdateService: updateService,
+	dellUpdate := UpdateServiceExtended{
+		UpdateService:       updateService,
 		SimpleUpdateActions: SimpleUpdateActions{},
 		FirmwareInventory:   &redfish.SoftwareInventory{}}
 	var oemUpdateService UpdateServiceActions

diff --git a/redfish/models/storage.go b/redfish/models/storage.go
@@ -119,10 +119,9 @@ type CacheSummary struct {
 
 // StorageControllers is the tfsdk model of StorageControllers
 type StorageControllers struct {
-	CacheSummary    CacheSummary `tfsdk:"cache_summary"`
-	FirmwareVersion types.String `tfsdk:"firmware_version"`
-	Manufacturer    types.String `tfsdk:"manufacturer"`
-	//MemberID                     types.String   `tfsdk:"member_id"`
+	CacheSummary                 CacheSummary   `tfsdk:"cache_summary"`
+	FirmwareVersion              types.String   `tfsdk:"firmware_version"`
+	Manufacturer                 types.String   `tfsdk:"manufacturer"`
 	Model                        types.String   `tfsdk:"model"`
 	Name                         types.String   `tfsdk:"name"`
 	SpeedGbps                    types.Int64    `tfsdk:"speed_gbps"`

diff --git a/redfish/provider/data_source_redfish_storage.go b/redfish/provider/data_source_redfish_storage.go
@@ -240,10 +240,9 @@ func newStorageControllersList(inputs []redfish.StorageController) []models.Stor
 // newStorageControllers converts redfish.StorageControllers to models.StorageControllers
 func newStorageControllers(input redfish.StorageController) models.StorageControllers {
 	return models.StorageControllers{
-		CacheSummary:    newCacheSummary(input.CacheSummary),
-		FirmwareVersion: types.StringValue(input.FirmwareVersion),
-		Manufacturer:    types.StringValue(input.Manufacturer),
-		//MemberID:                     types.StringValue("input.MemberID"),
+		CacheSummary:                 newCacheSummary(input.CacheSummary),
+		FirmwareVersion:              types.StringValue(input.FirmwareVersion),
+		Manufacturer:                 types.StringValue(input.Manufacturer),
 		Model:                        types.StringValue(input.Model),
 		Name:                         types.StringValue(input.Name),
 		SpeedGbps:                    types.Int64Value(int64(input.SpeedGbps)),
@@ -715,11 +714,6 @@ func StorageControllersSchema() map[string]schema.Attribute {
 			Description:         "manufacturer",
 			Computed:            true,
 		},
-		/*"member_id": schema.StringAttribute{
-			MarkdownDescription: "member id of storage controller",
-			Description:         "member id of storage controller",
-			Computed:            true,
-		},*/
 		"model": schema.StringAttribute{
 			MarkdownDescription: "model",
 			Description:         "model",