Rename SetInProgress type to SetInProgressState

bougou · bougou · commit b40e60691f48 · 2025-01-11T22:16:29.000+08:00
diff --git a/cmd/goipmi/commands/x.go b/cmd/goipmi/commands/x.go
@@ -62,7 +62,7 @@ func NewCmdXGetSDRs() *cobra.Command {
 				fmt.Printf("\n\nGet SDRs at %s\n", time.Now().Format(timeFormat))
 				res, err := client.GetSDRs(ctx)
 				if err != nil {
-					fmt.Printf("GetSDRs failed, err: %w", err)
+					fmt.Printf("GetSDRs failed, err: %s", err)
 					if loop {
 						goto WAIT
 					} else {
@@ -107,7 +107,7 @@ func NewCmdXGetSensors() *cobra.Command {
 				fmt.Printf("\n\nGet Sensors at %s\n", time.Now().Format(timeFormat))
 				res, err := client.GetSensors(ctx)
 				if err != nil {
-					fmt.Printf("GetSensors failed, err: %w", err)
+					fmt.Printf("GetSensors failed, err: %s", err)
 					if loop {
 						goto WAIT
 					} else {
@@ -149,7 +149,7 @@ func NewCmdXGetDeviceSDRs() *cobra.Command {
 			fmt.Printf("\n\nGet Device SDR at %s\n", time.Now().Format(timeFormat))
 			res, err := client.GetDeviceSDRs(ctx)
 			if err != nil {
-				fmt.Printf("GetDeviceSDRs failed, err: %w", err)
+				fmt.Printf("GetDeviceSDRs failed, err: %s", err)
 				return
 			}
 
diff --git a/cmd_set_system_boot_options_others.go b/cmd_set_system_boot_options_others.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 )
 
-func (c *Client) SetBootParamSetInProgress(ctx context.Context, setInProgress SetInProgress) error {
+func (c *Client) SetBootParamSetInProgress(ctx context.Context, setInProgress SetInProgressState) error {
 	param := &BootOptionParam_SetInProgress{
 		Value: setInProgress,
 	}
diff --git a/helpers_hmac_test.go b/helpers_hmac_test.go
@@ -48,7 +48,7 @@ func Test_encryptAES(t *testing.T) {
 	for _, v := range cases {
 		got, err := encryptAES(v.ipmiRequestBody, v.key, v.iv)
 		if err != nil {
-			t.Errorf("encryptAES failed, err: %w", err)
+			t.Errorf("encryptAES failed, err: %s", err)
 		}
 		if !isByteSliceEqual(got, v.expected) {
 			t.Errorf("got does not match expected, got: %v, want: %v", got, v.expected)
diff --git a/interface_system.go b/interface_system.go
@@ -110,7 +110,7 @@ func (c *Client) exchangeOpen(ctx context.Context, request Request, response Res
 	if err := response.Unpack(unpackData); err != nil {
 		return &ResponseError{
 			completionCode: CompletionCode(recv[0]),
-			description:    fmt.Sprintf("unpack response failed, err: %w", err),
+			description:    fmt.Sprintf("unpack response failed, err: %s", err),
 		}
 	}
 
diff --git a/types_boot_option_params.go b/types_boot_option_params.go
@@ -120,7 +120,7 @@ func (bootOptionsParams *BootOptionsParams) Format() string {
 }
 
 type BootOptionParam_SetInProgress struct {
-	Value SetInProgress
+	Value SetInProgressState
 }
 
 func (p *BootOptionParam_SetInProgress) BootOptionParameter() (paramSelector BootOptionParamSelector, setSelector uint8, blockSelector uint8) {
@@ -132,7 +132,7 @@ func (p *BootOptionParam_SetInProgress) Unpack(paramData []byte) error {
 		return fmt.Errorf("the parameter data length must be 1 byte")
 	}
 
-	p.Value = SetInProgress(paramData[0])
+	p.Value = SetInProgressState(paramData[0])
 	return nil
 }
 
diff --git a/types_lan_config.go b/types_lan_config.go
@@ -5,17 +5,17 @@ import (
 	"net"
 )
 
-type SetInProgress uint8
+type SetInProgressState uint8
 
 const (
-	SetInProgress_SetComplete   SetInProgress = 0x00
-	SetInProgress_SetInProgress SetInProgress = 0x01
-	SetInProgress_CommitWrite   SetInProgress = 0x02
-	SetInProgress_Reserved      SetInProgress = 0x03
+	SetInProgress_SetComplete   SetInProgressState = 0x00
+	SetInProgress_SetInProgress SetInProgressState = 0x01
+	SetInProgress_CommitWrite   SetInProgressState = 0x02
+	SetInProgress_Reserved      SetInProgressState = 0x03
 )
 
-func (p SetInProgress) String() string {
-	m := map[SetInProgress]string{
+func (p SetInProgressState) String() string {
+	m := map[SetInProgressState]string{
 		0x00: "set complete",
 		0x01: "set in progress",
 		0x02: "commit write",
@@ -331,7 +331,7 @@ type LanConfigParams struct {
 }
 
 type LanConfig struct {
-	SetInProgress                 SetInProgress                        // #0, Read Only
+	SetInProgress                 SetInProgressState                   // #0, Read Only
 	AuthTypeSupport               LanConfigParam_AuthTypeSupport       // #1
 	AuthTypeEnables               LanConfigParam_AuthTypeEnables       // #2
 	IP                            net.IP                               // #3
diff --git a/types_lan_config_params.go b/types_lan_config_params.go
@@ -336,7 +336,7 @@ func isNilLanConfigParameter(param LanConfigParameter) bool {
 }
 
 type LanConfigParam_SetInProgress struct {
-	Value SetInProgress
+	Value SetInProgressState
 }
 
 func (param *LanConfigParam_SetInProgress) LanConfigParameter() (paramSelector LanConfigParamSelector, setSelector uint8, blockSelector uint8) {
@@ -352,7 +352,7 @@ func (param *LanConfigParam_SetInProgress) Unpack(data []byte) error {
 		return ErrUnpackedDataTooShortWith(len(data), 1)
 	}
 
-	param.Value = SetInProgress(data[0])
+	param.Value = SetInProgressState(data[0])
 	return nil
 }
 
diff --git a/types_pef_params.go b/types_pef_params.go
@@ -214,7 +214,7 @@ func (pefConfigParams *PEFConfigParams) Format() string {
 }
 
 type PEFConfigParam_SetInProgress struct {
-	Value SetInProgress
+	Value SetInProgressState
 }
 
 func (param *PEFConfigParam_SetInProgress) PEFConfigParameter() (paramSelector PEFConfigParamSelector, setSelector uint8, blockSelector uint8) {
@@ -226,7 +226,7 @@ func (param *PEFConfigParam_SetInProgress) Unpack(data []byte) error {
 		return ErrUnpackedDataTooShortWith(len(data), 1)
 	}
 
-	param.Value = SetInProgress(data[0])
+	param.Value = SetInProgressState(data[0])
 	return nil
 }
 
diff --git a/types_rmcp.go b/types_rmcp.go
@@ -375,7 +375,7 @@ func (c *Client) ParseRmcpResponse(ctx context.Context, msg []byte, response Res
 		if err := response.Unpack(ipmiRes.Data); err != nil {
 			return &ResponseError{
 				completionCode: 0x00,
-				description:    fmt.Sprintf("unpack response failed, err: %w", err),
+				description:    fmt.Sprintf("unpack response failed, err: %s", err),
 			}
 		}
 	}
@@ -426,7 +426,7 @@ func (c *Client) ParseRmcpResponse(ctx context.Context, msg []byte, response Res
 			if err := response.Unpack(ipmiRes.Data); err != nil {
 				return &ResponseError{
 					completionCode: 0x00,
-					description:    fmt.Sprintf("unpack response failed, err: %w", err),
+					description:    fmt.Sprintf("unpack response failed, err: %s", err),
 				}
 			}
 		}
diff --git a/types_sol_config_params.go b/types_sol_config_params.go
@@ -119,7 +119,7 @@ func (p *SOLConfigParams) Format() string {
 }
 
 type SOLConfigParam_SetInProgress struct {
-	Value SetInProgress
+	Value SetInProgressState
 }
 
 func (p *SOLConfigParam_SetInProgress) SOLConfigParameter() (paramSelector SOLConfigParamSelector, setSelector uint8, blockSelector uint8) {
@@ -130,7 +130,7 @@ func (p *SOLConfigParam_SetInProgress) Unpack(paramData []byte) error {
 	if len(paramData) != 1 {
 		return fmt.Errorf("the parameter data length must be 1 byte")
 	}
-	p.Value = SetInProgress(paramData[0])
+	p.Value = SetInProgressState(paramData[0])
 	return nil
 }
 
diff --git a/types_system_info_params.go b/types_system_info_params.go
@@ -86,7 +86,7 @@ type SystemInfoParams struct {
 }
 
 type SystemInfo struct {
-	SetInProgress         SetInProgress
+	SetInProgress         SetInProgressState
 	SystemFirmwareVersion string
 	SystemName            string
 	PrimaryOSName         string
@@ -184,7 +184,7 @@ Management URL          : %s
 }
 
 type SystemInfoParam_SetInProgress struct {
-	Value SetInProgress
+	Value SetInProgressState
 }
 
 func (p *SystemInfoParam_SetInProgress) SystemInfoParameter() (paramSelector SystemInfoParamSelector, setSelector uint8, blockSelector uint8) {
@@ -199,7 +199,7 @@ func (p *SystemInfoParam_SetInProgress) Unpack(data []byte) error {
 	if len(data) < 1 {
 		return ErrUnpackedDataTooShortWith(len(data), 1)
 	}
-	p.Value = SetInProgress(data[0])
+	p.Value = SetInProgressState(data[0])
 	return nil
 }
 

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ import (`
`5`	`5`	`"fmt"`
`6`	`6`	`)`
`7`	`7`
`8`		`-func (c *Client) SetBootParamSetInProgress(ctx context.Context, setInProgress SetInProgress) error {`
	`8`	`+func (c *Client) SetBootParamSetInProgress(ctx context.Context, setInProgress SetInProgressState) error {`
`9`	`9`	`param := &BootOptionParam_SetInProgress{`
`10`	`10`	`Value: setInProgress,`
`11`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ func Test_encryptAES(t *testing.T) {`
`48`	`48`	`for _, v := range cases {`
`49`	`49`	`got, err := encryptAES(v.ipmiRequestBody, v.key, v.iv)`
`50`	`50`	`if err != nil {`
`51`		`- t.Errorf("encryptAES failed, err: %w", err)`
	`51`	`+ t.Errorf("encryptAES failed, err: %s", err)`
`52`	`52`	`}`
`53`	`53`	`if !isByteSliceEqual(got, v.expected) {`
`54`	`54`	`t.Errorf("got does not match expected, got: %v, want: %v", got, v.expected)`
Original file line number	Diff line number	Diff line change
`@@ -110,7 +110,7 @@ func (c *Client) exchangeOpen(ctx context.Context, request Request, response Res`
`110`	`110`	`if err := response.Unpack(unpackData); err != nil {`
`111`	`111`	`return &ResponseError{`
`112`	`112`	`completionCode: CompletionCode(recv[0]),`
`113`		`- description: fmt.Sprintf("unpack response failed, err: %w", err),`
	`113`	`+ description: fmt.Sprintf("unpack response failed, err: %s", err),`
`114`	`114`	`}`
`115`	`115`	`}`
`116`	`116`
Original file line number	Diff line number	Diff line change
`@@ -120,7 +120,7 @@ func (bootOptionsParams *BootOptionsParams) Format() string {`
`120`	`120`	`}`
`121`	`121`
`122`	`122`	`type BootOptionParam_SetInProgress struct {`
`123`		`- Value SetInProgress`
	`123`	`+ Value SetInProgressState`
`124`	`124`	`}`
`125`	`125`
`126`	`126`	`func (p *BootOptionParam_SetInProgress) BootOptionParameter() (paramSelector BootOptionParamSelector, setSelector uint8, blockSelector uint8) {`
`@@ -132,7 +132,7 @@ func (p *BootOptionParam_SetInProgress) Unpack(paramData []byte) error {`
`132`	`132`	`return fmt.Errorf("the parameter data length must be 1 byte")`
`133`	`133`	`}`
`134`	`134`
`135`		`- p.Value = SetInProgress(paramData[0])`
	`135`	`+ p.Value = SetInProgressState(paramData[0])`
`136`	`136`	`return nil`
`137`	`137`	`}`
`138`	`138`
Original file line number	Diff line number	Diff line change
`@@ -336,7 +336,7 @@ func isNilLanConfigParameter(param LanConfigParameter) bool {`
`336`	`336`	`}`
`337`	`337`
`338`	`338`	`type LanConfigParam_SetInProgress struct {`
`339`		`- Value SetInProgress`
	`339`	`+ Value SetInProgressState`
`340`	`340`	`}`
`341`	`341`
`342`	`342`	`func (param *LanConfigParam_SetInProgress) LanConfigParameter() (paramSelector LanConfigParamSelector, setSelector uint8, blockSelector uint8) {`
`@@ -352,7 +352,7 @@ func (param *LanConfigParam_SetInProgress) Unpack(data []byte) error {`
`352`	`352`	`return ErrUnpackedDataTooShortWith(len(data), 1)`
`353`	`353`	`}`
`354`	`354`
`355`		`- param.Value = SetInProgress(data[0])`
	`355`	`+ param.Value = SetInProgressState(data[0])`
`356`	`356`	`return nil`
`357`	`357`	`}`
`358`	`358`
Original file line number	Diff line number	Diff line change
`@@ -214,7 +214,7 @@ func (pefConfigParams *PEFConfigParams) Format() string {`
`214`	`214`	`}`
`215`	`215`
`216`	`216`	`type PEFConfigParam_SetInProgress struct {`
`217`		`- Value SetInProgress`
	`217`	`+ Value SetInProgressState`
`218`	`218`	`}`
`219`	`219`
`220`	`220`	`func (param *PEFConfigParam_SetInProgress) PEFConfigParameter() (paramSelector PEFConfigParamSelector, setSelector uint8, blockSelector uint8) {`
`@@ -226,7 +226,7 @@ func (param *PEFConfigParam_SetInProgress) Unpack(data []byte) error {`
`226`	`226`	`return ErrUnpackedDataTooShortWith(len(data), 1)`
`227`	`227`	`}`
`228`	`228`
`229`		`- param.Value = SetInProgress(data[0])`
	`229`	`+ param.Value = SetInProgressState(data[0])`
`230`	`230`	`return nil`
`231`	`231`	`}`
`232`	`232`
Original file line number	Diff line number	Diff line change
`@@ -375,7 +375,7 @@ func (c *Client) ParseRmcpResponse(ctx context.Context, msg []byte, response Res`
`375`	`375`	`if err := response.Unpack(ipmiRes.Data); err != nil {`
`376`	`376`	`return &ResponseError{`
`377`	`377`	`completionCode: 0x00,`
`378`		`- description: fmt.Sprintf("unpack response failed, err: %w", err),`
	`378`	`+ description: fmt.Sprintf("unpack response failed, err: %s", err),`
`379`	`379`	`}`
`380`	`380`	`}`
`381`	`381`	`}`
`@@ -426,7 +426,7 @@ func (c *Client) ParseRmcpResponse(ctx context.Context, msg []byte, response Res`
`426`	`426`	`if err := response.Unpack(ipmiRes.Data); err != nil {`
`427`	`427`	`return &ResponseError{`
`428`	`428`	`completionCode: 0x00,`
`429`		`- description: fmt.Sprintf("unpack response failed, err: %w", err),`
	`429`	`+ description: fmt.Sprintf("unpack response failed, err: %s", err),`
`430`	`430`	`}`
`431`	`431`	`}`
`432`	`432`	`}`
Original file line number	Diff line number	Diff line change
`@@ -119,7 +119,7 @@ func (p *SOLConfigParams) Format() string {`
`119`	`119`	`}`
`120`	`120`
`121`	`121`	`type SOLConfigParam_SetInProgress struct {`
`122`		`- Value SetInProgress`
	`122`	`+ Value SetInProgressState`
`123`	`123`	`}`
`124`	`124`
`125`	`125`	`func (p *SOLConfigParam_SetInProgress) SOLConfigParameter() (paramSelector SOLConfigParamSelector, setSelector uint8, blockSelector uint8) {`
`@@ -130,7 +130,7 @@ func (p *SOLConfigParam_SetInProgress) Unpack(paramData []byte) error {`
`130`	`130`	`if len(paramData) != 1 {`
`131`	`131`	`return fmt.Errorf("the parameter data length must be 1 byte")`
`132`	`132`	`}`
`133`		`- p.Value = SetInProgress(paramData[0])`
	`133`	`+ p.Value = SetInProgressState(paramData[0])`
`134`	`134`	`return nil`
`135`	`135`	`}`
`136`	`136`