feat: linter fixes

Author: bahkauv70

internal/cmd/beta/image/create/create.go

@@ -67,17 +67,15 @@ type imageConfig struct {
 type inputModel struct {
 	*globalflags.GlobalFlagModel
 
+	Id            *string
 	Name          string
 	DiskFormat    string
 	LocalFilePath string
 	Labels        *map[string]string
 	Config        *imageConfig
 	MinDiskSize   *int64
 	MinRam        *int64
-	Owner         *string
 	Protected     *bool
-	Scope         *string
-	Status        *string
 }
 
 func NewCmd(p *print.Printer) *cobra.Command {
@@ -90,7 +88,7 @@ func NewCmd(p *print.Printer) *cobra.Command {
 			examples.NewExample(`Create a named imaged`, `$ stackit beta image create --name my-new-image --disk-format=raw --local-file-path=/my/raw/image`),
 			examples.NewExample(`Create a named image with labels`, `$ stackit beta image create --name my-new-image --disk-format=raw --local-file-path=/my/raw/image--labels dev,amd64`),
 		),
-		RunE: func(cmd *cobra.Command, _ []string) error {
+		RunE: func(cmd *cobra.Command, _ []string) (err error) {
 			ctx := context.Background()
 			model, err := parseInput(p, cmd)
 			if err != nil {
@@ -108,7 +106,11 @@ func NewCmd(p *print.Printer) *cobra.Command {
 			if err != nil {
 				return fmt.Errorf("create image: file %q is not readable: %w", model.LocalFilePath, err)
 			}
-			defer file.Close()
+			defer func() {
+				if inner := file.Close(); inner != nil {
+					err = fmt.Errorf("error closing input file: %w (%w)", inner, err)
+				}
+			}()
 
 			if !model.AssumeYes {
 				prompt := fmt.Sprintf("Are you sure you want to create the image %q?", model.Name)
@@ -125,6 +127,7 @@ func NewCmd(p *print.Printer) *cobra.Command {
 			if err != nil {
 				return fmt.Errorf("create image: %w", err)
 			}
+			model.Id = result.Id
 			url, ok := result.GetUploadUrlOk()
 			if !ok {
 				return fmt.Errorf("create image: no upload URL has been provided")
@@ -145,7 +148,7 @@ func NewCmd(p *print.Printer) *cobra.Command {
 	return cmd
 }
 
-func uploadFile(ctx context.Context, p *print.Printer, file *os.File, url string) error {
+func uploadFile(ctx context.Context, p *print.Printer, file *os.File, url string) (err error) {
 	var filesize int64
 	if stat, err := file.Stat(); err != nil {
 		p.Debug(print.DebugLevel, "create image: cannot open file %q: %w", file.Name(), err)
@@ -168,6 +171,11 @@ func uploadFile(ctx context.Context, p *print.Printer, file *os.File, url string
 	if err != nil {
 		return fmt.Errorf("create image: error contacting server for upload: %w", err)
 	}
+	defer func() {
+		if inner := uploadResponse.Body.Close(); inner != nil {
+			err = fmt.Errorf("error closing file: %wqq (%w)", inner, err)
+		}
+	}()
 	if uploadResponse.StatusCode != http.StatusOK {
 		return fmt.Errorf("create image: server rejected image upload with %s", uploadResponse.Status)
 	}
@@ -258,7 +266,7 @@ func buildRequest(ctx context.Context, model *inputModel, apiClient *iaas.APICli
 	return request
 }
 
-func createPayload(ctx context.Context, model *inputModel) iaas.CreateImagePayload {
+func createPayload(_ context.Context, model *inputModel) iaas.CreateImagePayload {
 	var labelsMap *map[string]any
 	if model.Labels != nil && len(*model.Labels) > 0 {
 		// convert map[string]string to map[string]interface{}
@@ -315,7 +323,7 @@ func outputResult(p *print.Printer, model *inputModel, resp *iaas.ImageCreateRes
 
 		return nil
 	default:
-		p.Outputf("Created image %q\n", model.Name)
+		p.Outputf("Created image %q with id %s\n", model.Name, *model.Id)
 		return nil
 	}
 }

internal/cmd/beta/image/create/create_test.go

@@ -78,14 +78,14 @@ func fixtureFlagValues(mods ...func(flagValues map[string]string)) map[string]st
 	return flagValues
 }
 
-func parseLabels(labelstring string) *map[string]string {
+func parseLabels(labelstring string) map[string]string {
 	labels := map[string]string{}
 	for _, part := range strings.Split(labelstring, ",") {
 		v := strings.Split(part, "=")
 		labels[v[0]] = v[1]
 	}
 
-	return &labels
+	return labels
 }
 
 func fixtureInputModel(mods ...func(model *inputModel)) *inputModel {
@@ -94,7 +94,7 @@ func fixtureInputModel(mods ...func(model *inputModel)) *inputModel {
 		Name:            testName,
 		DiskFormat:      testDiskFormat,
 		LocalFilePath:   testLocalImagePath,
-		Labels:          parseLabels(testLabels),
+		Labels:          utils.Ptr(parseLabels(testLabels)),
 		Config: &imageConfig{
 			BootMenu:               &testBootmenu,
 			CdromBus:               &testCdRomBus,
@@ -120,17 +120,6 @@ func fixtureInputModel(mods ...func(model *inputModel)) *inputModel {
 	return model
 }
 
-func toStringAnyMapPtr(m map[string]string) map[string]any {
-	if m == nil {
-		return nil
-	}
-	result := map[string]any{}
-	for k, v := range m {
-		result[k] = v
-	}
-	return result
-}
-
 func fixtureCreatePayload(mods ...func(payload *iaas.CreateImagePayload)) (payload iaas.CreateImagePayload) {
 	payload = iaas.CreateImagePayload{
 		Config: &iaas.ImageConfig{
@@ -162,7 +151,7 @@ func fixtureCreatePayload(mods ...func(payload *iaas.CreateImagePayload)) (paylo
 	for _, mod := range mods {
 		mod(&payload)
 	}
-	return
+	return payload
 }
 
 func fixtureRequest(mods ...func(request *iaas.ApiCreateImageRequest)) iaas.ApiCreateImageRequest {
@@ -347,7 +336,6 @@ func TestBuildRequest(t *testing.T) {
 			if diff != "" {
 				t.Fatalf("Data does not match: %s", diff)
 			}
-
 		})
 	}
 }

internal/cmd/beta/image/delete/delete.go

@@ -1,4 +1,4 @@
-	package delete
+package delete
 
 import (
 	"context"

internal/cmd/beta/image/describe/describe_test.go

@@ -18,10 +18,10 @@ var projectIdFlag = globalflags.ProjectIdFlag
 type testCtxKey struct{}
 
 var (
-	testCtx             = context.WithValue(context.Background(), testCtxKey{}, "foo")
-	testClient          = &iaas.APIClient{}
-	testProjectId       = uuid.NewString()
-	testImageId = []string{uuid.NewString()}
+	testCtx       = context.WithValue(context.Background(), testCtxKey{}, "foo")
+	testClient    = &iaas.APIClient{}
+	testProjectId = uuid.NewString()
+	testImageId   = []string{uuid.NewString()}
 )
 
 func fixtureFlagValues(mods ...func(flagValues map[string]string)) map[string]string {
@@ -37,7 +37,7 @@ func fixtureFlagValues(mods ...func(flagValues map[string]string)) map[string]st
 func fixtureInputModel(mods ...func(model *inputModel)) *inputModel {
 	model := &inputModel{
 		GlobalFlagModel: &globalflags.GlobalFlagModel{ProjectId: testProjectId, Verbosity: globalflags.VerbosityDefault},
-		ImageId: testImageId[0],
+		ImageId:         testImageId[0],
 	}
 	for _, mod := range mods {
 		mod(model)

internal/cmd/beta/image/list/list.go

@@ -150,7 +150,6 @@ func outputResult(p *print.Printer, outputFormat string, items []iaas.Image) err
 				}
 				if v := cfg.OperatingSystemDistro; v != nil && v.IsSet() {
 					distro = *v.Get()
-
 				}
 				if v := cfg.OperatingSystemVersion; v != nil && v.IsSet() {
 					version = *v.Get()