From 4eb3daec8e5d90cb8724cc7c38090597a9cc00b7 Mon Sep 17 00:00:00 2001
From: Roman Mingazeev <direnol@yandex.ru>
Date: Mon, 30 Nov 2020 14:01:42 +0300
Subject: [PATCH] lint

---
 builder/yandex/step_create_instance.go        |  5 ++++-
 .../yandex-export/post-processor_test.go      | 20 ++++++++++++++-----
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/builder/yandex/step_create_instance.go b/builder/yandex/step_create_instance.go
index f4858d4a7..4bc855bcb 100644
--- a/builder/yandex/step_create_instance.go
+++ b/builder/yandex/step_create_instance.go
@@ -85,9 +85,12 @@ func createDisk(ctx context.Context, c *Config, d Driver, sourceImage *Image) (*
 			if !ok {
 				return nil, err
 			}
-			sdk.Compute().Disk().Delete(ctx, &compute.DeleteDiskRequest{
+			_, err2 = sdk.Compute().Disk().Delete(ctx, &compute.DeleteDiskRequest{
 				DiskId: disk.Id,
 			})
+			if err2 != nil {
+				return nil, fmt.Errorf("%s. Clean: %s", err, err2)
+			}
 
 		}
 		return nil, err
diff --git a/post-processor/yandex-export/post-processor_test.go b/post-processor/yandex-export/post-processor_test.go
index dcc8925cd..5befec952 100644
--- a/post-processor/yandex-export/post-processor_test.go
+++ b/post-processor/yandex-export/post-processor_test.go
@@ -35,7 +35,9 @@ func TestPostProcessor_Configure(t *testing.T) {
 						ServiceAccountID: "some-srv-acc-id",
 					},
 					CommonConfig: yandex.CommonConfig{
-						FolderID: "some-folder-id",
+						CloudConfig: yandex.CloudConfig{
+							FolderID: "some-folder-id",
+						},
 					},
 				},
 			},
@@ -53,7 +55,9 @@ func TestPostProcessor_Configure(t *testing.T) {
 						ServiceAccountID: "some-srv-acc-id",
 					},
 					CommonConfig: yandex.CommonConfig{
-						FolderID: "some-folder-id",
+						CloudConfig: yandex.CloudConfig{
+							FolderID: "some-folder-id",
+						},
 					},
 				},
 			},
@@ -71,7 +75,9 @@ func TestPostProcessor_Configure(t *testing.T) {
 						ServiceAccountID: "some-srv-acc-id",
 					},
 					CommonConfig: yandex.CommonConfig{
-						FolderID: "some-folder-id",
+						CloudConfig: yandex.CloudConfig{
+							FolderID: "some-folder-id",
+						},
 					},
 				},
 			},
@@ -88,7 +94,9 @@ func TestPostProcessor_Configure(t *testing.T) {
 						ServiceAccountID: "",
 					},
 					CommonConfig: yandex.CommonConfig{
-						FolderID: "some-folder-id",
+						CloudConfig: yandex.CloudConfig{
+							FolderID: "some-folder-id",
+						},
 					},
 				},
 			},
@@ -105,7 +113,9 @@ func TestPostProcessor_Configure(t *testing.T) {
 						ServiceAccountID: "some-srv-acc-id",
 					},
 					CommonConfig: yandex.CommonConfig{
-						FolderID: "",
+						CloudConfig: yandex.CloudConfig{
+							FolderID: "",
+						},
 					},
 				},
 			},