From d302b3cbd4be41b71a18a881f97893c4aed78cae Mon Sep 17 00:00:00 2001 From: scaleway-bot Date: Thu, 5 Sep 2019 15:20:03 +0000 Subject: [PATCH 1/2] feat: update generated apis --- api/instance/v1/instance_sdk.go | 8 -------- 1 file changed, 8 deletions(-) diff --git a/api/instance/v1/instance_sdk.go b/api/instance/v1/instance_sdk.go index 0bb90012f..ac2a3a003 100644 --- a/api/instance/v1/instance_sdk.go +++ b/api/instance/v1/instance_sdk.go @@ -1445,10 +1445,6 @@ type CreateServerRequest struct { EnableIPv6 bool `json:"enable_ipv6,omitempty"` // PublicIP define the public IPv4 attached to the server PublicIP string `json:"public_ip,omitempty"` - // BootType define the boot type you want to use - // - // Default value: local - BootType ServerBootType `json:"boot_type"` // Organization define the server organization Organization string `json:"organization,omitempty"` // Tags define the server tags @@ -1690,10 +1686,6 @@ type updateServerRequest struct { ServerID string `json:"-"` Name *string `json:"name,omitempty"` - // BootType - // - // Default value: local - BootType ServerBootType `json:"boot_type"` Tags *[]string `json:"tags,omitempty"` From 4da4eec98ef1d437a988851513385413ed02739e Mon Sep 17 00:00:00 2001 From: Olivier CANO Date: Thu, 5 Sep 2019 17:26:14 +0200 Subject: [PATCH 2/2] fix tests --- api/instance/v1/instance_sdk_server_test.go | 1 - api/instance/v1/server_utils_test.go | 2 -- api/instance/v1/testdata/all-server-user-data.yaml | 2 +- api/instance/v1/testdata/server-test.yaml | 2 +- api/instance/v1/testdata/server-user-data.yaml | 2 +- 5 files changed, 3 insertions(+), 6 deletions(-) diff --git a/api/instance/v1/instance_sdk_server_test.go b/api/instance/v1/instance_sdk_server_test.go index 595c7c113..da8b831c9 100644 --- a/api/instance/v1/instance_sdk_server_test.go +++ b/api/instance/v1/instance_sdk_server_test.go @@ -40,7 +40,6 @@ func TestServerUpdate(t *testing.T) { Organization: organization, Image: image, EnableIPv6: enableIPv6, - BootType: bootType, CommercialType: commercialType, Tags: tags, DynamicIPRequired: dynamicIPRequired, diff --git a/api/instance/v1/server_utils_test.go b/api/instance/v1/server_utils_test.go index 9f88381d3..3d3d3d96e 100644 --- a/api/instance/v1/server_utils_test.go +++ b/api/instance/v1/server_utils_test.go @@ -49,7 +49,6 @@ func TestAPI_ServerUserData(t *testing.T) { Zone: scw.ZoneFrPar1, CommercialType: "DEV1-S", Name: namegenerator.GetRandomName("srv"), - BootType: ServerBootTypeLocal, Image: "f974feac-abae-4365-b988-8ec7d1cec10d", Organization: "14d2f7ae-9775-414c-9bed-6810e060d500", }) @@ -89,7 +88,6 @@ func TestAPI_AllServerUserData(t *testing.T) { Zone: scw.ZoneFrPar1, CommercialType: "DEV1-S", Name: namegenerator.GetRandomName("srv"), - BootType: ServerBootTypeLocal, Image: "f974feac-abae-4365-b988-8ec7d1cec10d", Organization: "14d2f7ae-9775-414c-9bed-6810e060d500", }) diff --git a/api/instance/v1/testdata/all-server-user-data.yaml b/api/instance/v1/testdata/all-server-user-data.yaml index 018e3a586..20d168fe5 100644 --- a/api/instance/v1/testdata/all-server-user-data.yaml +++ b/api/instance/v1/testdata/all-server-user-data.yaml @@ -2,7 +2,7 @@ version: 1 interactions: - request: - body: '{"name":"srv-hardcore-raman","commercial_type":"DEV1-S","image":"f974feac-abae-4365-b988-8ec7d1cec10d","boot_type":"local","organization":"14d2f7ae-9775-414c-9bed-6810e060d500"}' + body: '{"name":"srv-hardcore-raman","commercial_type":"DEV1-S","image":"f974feac-abae-4365-b988-8ec7d1cec10d","organization":"14d2f7ae-9775-414c-9bed-6810e060d500"}' form: {} headers: Content-Type: diff --git a/api/instance/v1/testdata/server-test.yaml b/api/instance/v1/testdata/server-test.yaml index 2cf1b4d4c..8ce009034 100644 --- a/api/instance/v1/testdata/server-test.yaml +++ b/api/instance/v1/testdata/server-test.yaml @@ -2,7 +2,7 @@ version: 1 interactions: - request: - body: '{"name":"instance_sdk_server_test","dynamic_ip_required":true,"commercial_type":"START1-S","image":"f974feac-abae-4365-b988-8ec7d1cec10d","enable_ipv6":true,"boot_type":"local","organization":"d429f6a1-c0a6-48cf-8b5a-1f9dfe76ffd3","tags":["foo","bar"]}' + body: '{"name":"instance_sdk_server_test","dynamic_ip_required":true,"commercial_type":"START1-S","image":"f974feac-abae-4365-b988-8ec7d1cec10d","enable_ipv6":true,"organization":"d429f6a1-c0a6-48cf-8b5a-1f9dfe76ffd3","tags":["foo","bar"]}' form: {} headers: Content-Type: diff --git a/api/instance/v1/testdata/server-user-data.yaml b/api/instance/v1/testdata/server-user-data.yaml index 7efc152f9..e43cd698d 100644 --- a/api/instance/v1/testdata/server-user-data.yaml +++ b/api/instance/v1/testdata/server-user-data.yaml @@ -2,7 +2,7 @@ version: 1 interactions: - request: - body: '{"name":"srv-wonderful-goldberg","commercial_type":"DEV1-S","image":"f974feac-abae-4365-b988-8ec7d1cec10d","boot_type":"local","organization":"14d2f7ae-9775-414c-9bed-6810e060d500"}' + body: '{"name":"srv-wonderful-goldberg","commercial_type":"DEV1-S","image":"f974feac-abae-4365-b988-8ec7d1cec10d","organization":"14d2f7ae-9775-414c-9bed-6810e060d500"}' form: {} headers: Content-Type: